diff --git a/Appcast.xml b/Appcast.xml
index 0cf1559..56b3958 100755
--- a/Appcast.xml
+++ b/Appcast.xml
@@ -9,10 +9,10 @@
         <title>Version 2.0.2 (Added twittia: url scheme)</title>
 				<sparkle:minimumSystemVersion>10.5.0</sparkle:minimumSystemVersion>
 				<sparkle:releaseNotesLink>
-					http://github.com/downloads/jeena/Twittia/ReleaseNotes.html
+					http://jeenaparadies.net/twittia/ReleaseNotes.html
 				</sparkle:releaseNotesLink>
 	      <pubDate>Wed, 19 Apr 2010 0:30:00 +0000</pubDate>
-	      <enclosure	url="http://github.com/downloads/jeena/Twittia/Twittia.app.zip"
+	      <enclosure	url="http://jeenaparadies.net/twittia/Twittia.app.zip"
 										sparkle:version="2.0.2"
 										length="490687"
 										type="application/octet-stream"
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 0fd0496..df643b3 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -2,10 +2,10 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10C540</string>
+		<string key="IBDocument.SystemVersion">10D573</string>
 		<string key="IBDocument.InterfaceBuilderVersion">740</string>
-		<string key="IBDocument.AppKitVersion">1038.25</string>
-		<string key="IBDocument.HIToolboxVersion">458.00</string>
+		<string key="IBDocument.AppKitVersion">1038.29</string>
+		<string key="IBDocument.HIToolboxVersion">460.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<object class="NSArray" key="dict.sortedKeys">
@@ -22,7 +22,7 @@
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<integer value="535"/>
-			<integer value="57"/>
+			<integer value="29"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -193,7 +193,7 @@
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMenuItem" id="705341025">
 									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">New</string>
+									<string key="NSTitle">New Tweet</string>
 									<string key="NSKeyEquiv">n</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
@@ -220,6 +220,15 @@
 									<reference key="NSOnImage" ref="1033313550"/>
 									<reference key="NSMixedImage" ref="310636482"/>
 								</object>
+								<object class="NSMenuItem" id="281587867">
+									<reference key="NSMenu" ref="720053764"/>
+									<string key="NSTitle">Timeline</string>
+									<string key="NSKeyEquiv">t</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1033313550"/>
+									<reference key="NSMixedImage" ref="310636482"/>
+								</object>
 								<object class="NSMenuItem" id="776162233">
 									<reference key="NSMenu" ref="720053764"/>
 									<string key="NSTitle">Close</string>
@@ -1192,6 +1201,14 @@
 					</object>
 					<int key="connectionID">543</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">makeKeyAndOrderFront:</string>
+						<reference key="source" ref="1010634651"/>
+						<reference key="destination" ref="281587867"/>
+					</object>
+					<int key="connectionID">547</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -1279,6 +1296,7 @@
 							<reference ref="705341025"/>
 							<reference ref="776162233"/>
 							<reference ref="425164168"/>
+							<reference ref="281587867"/>
 						</object>
 						<reference key="parent" ref="379814623"/>
 					</object>
@@ -1797,6 +1815,11 @@
 						<reference key="object" ref="1073310099"/>
 						<reference key="parent" ref="110575045"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">544</int>
+						<reference key="object" ref="281587867"/>
+						<reference key="parent" ref="720053764"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1945,8 +1968,8 @@
 					<string>535.NSWindowTemplate.visibleAtLaunch</string>
 					<string>536.IBPluginDependency</string>
 					<string>537.IBPluginDependency</string>
-					<string>541.IBPluginDependency</string>
 					<string>542.IBPluginDependency</string>
+					<string>544.IBPluginDependency</string>
 					<string>56.IBPluginDependency</string>
 					<string>56.ImportedFromIB2</string>
 					<string>57.IBEditorWindowLastContentRect</string>
@@ -2016,7 +2039,7 @@
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{316, 248}, {254, 283}}</string>
+					<string>{{813, 671}, {254, 283}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{197, 734}, {243, 243}}</string>
@@ -2062,11 +2085,11 @@
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{410, 458}, {194, 73}}</string>
+					<string>{{907, 881}, {194, 73}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{525, 802}, {197, 73}}</string>
-					<string>{{1077, 485}, {349, 20}}</string>
+					<string>{{690, 954}, {349, 20}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{74, 862}</string>
@@ -2110,9 +2133,9 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{1032, -341}, {397, 581}}</string>
+					<string>{{907, 115}, {397, 581}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{1032, -341}, {397, 581}}</string>
+					<string>{{907, 115}, {397, 581}}</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.WebKitIBPlugin</string>
@@ -2132,7 +2155,7 @@
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{1158, 812}, {181, 73}}</string>
+					<string>{{771, 861}, {181, 93}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{155, 774}, {199, 203}}</string>
@@ -2160,7 +2183,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">543</int>
+			<int key="maxID">547</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/ReleaseNotes.html b/ReleaseNotes.html
index 80bbfb1..d4fceb9 100644
--- a/ReleaseNotes.html
+++ b/ReleaseNotes.html
@@ -13,6 +13,9 @@
 
 <h1>Twittia Release Notes</h1>
 
+<h2>Twittia 2.0.3</h2>
+<p>Fixed some wrong links.</p>
+
 <h2>Twittia 2.0.2</h2>
 <p>Added the <code>twittia:</code> URL scheme.</p>
 <p>Added a JavaScript-plugin API.</p>
diff --git a/Twittia_2-Info.plist b/Twittia_2-Info.plist
index 6f0ca2f..897a95e 100644
--- a/Twittia_2-Info.plist
+++ b/Twittia_2-Info.plist
@@ -54,7 +54,7 @@
 	<key>CFBundleHelpBookName</key>
 	<string>net.jeena.apps.twittia.help</string>
 	<key>SUFeedURL</key>
-	<string>http://github.com/downloads/jeena/Twittia/Appcast.xml</string>
+	<string>http://jeenaparadies.net/twittia/Appcast.xml</string>
 	<key>SUPublicDSAKeyFile</key>
 	<string>dsa_pub.pem</string>
 	<key>CFBundleURLTypes</key>
diff --git a/index.html b/index.html
index b7e1e34..0369d35 100644
--- a/index.html
+++ b/index.html
@@ -59,7 +59,7 @@ Twittia.prototype.getItem = function(status) {
 		retweeted.appendChild(retweeted_icon);
 		var retweeted_by = document.createElement("a");
 		retweeted_by.innerText = original_status.user.screen_name + " ";
-		retweeted_by.href = "http://twitter.com/" + original_status.in_reply_to_screen_name;
+		retweeted_by.href = "http://twitter.com/" + original_status.user.screen_name;
 		retweeted.appendChild(document.createTextNode("@"));
 		retweeted.appendChild(retweeted_by);
 		template.in_reply.parentNode.parentNode.insertBefore(retweeted, template.in_reply.parent);
@@ -67,7 +67,7 @@ Twittia.prototype.getItem = function(status) {
 	
 	if(status.in_reply_to_screen_name != null) template.in_reply.innerText = status.in_reply_to_screen_name;
 	else template.in_reply.parentNode.className = "hidden";
-	template.in_reply.href = "http://twitter.com/" + status.in_reply_to_screen_name;
+	template.in_reply.href = "http://twitter.com/" + status.in_reply_to_screen_name + "/status/" + status.in_reply_to_status_id;
 
 	template.message.innerHTML = replaceTwitterLinks(replaceURLWithHTMLLinks(status.text));
 	
@@ -744,8 +744,10 @@ $(document).ready(function() {
 <body>
 <ol id="body" class="messages"></ol>
 <script type="text/javascript">
-var twittia_instance = new Twittia();
-loadPlugin(controller.pluginURL());
+$(document).ready(function() {
+	var twittia_instance = new Twittia();
+	loadPlugin(controller.pluginURL());
+});
 </script>
 </body>
 </html>
\ No newline at end of file