diff --git a/Mac/Controller.m b/Mac/Controller.m
index bd6fd4b..7d18c3b 100644
--- a/Mac/Controller.m
+++ b/Mac/Controller.m
@@ -346,7 +346,8 @@
 
 - (void)userNotificationCenter:(NSUserNotificationCenter *)center didActivateNotification:(NSUserNotification *)notification
 {
-    [self showConversationForPostId:[notification.userInfo objectForKey:@"postId"] andEntity:[notification.userInfo objectForKey:@"entity"]];
+    //[self showConversationForPostId:[notification.userInfo objectForKey:@"postId"] andEntity:[notification.userInfo objectForKey:@"entity"]];
+    [[self mentionsViewWindow] makeKeyAndOrderFront:self];
 }
 
 /* CARBON */
diff --git a/Mac/English.lproj/MainMenu.xib b/Mac/English.lproj/MainMenu.xib
index 7e9d721..1826672 100644
--- a/Mac/English.lproj/MainMenu.xib
+++ b/Mac/English.lproj/MainMenu.xib
@@ -729,6 +729,15 @@
 							<string key="NSTitle">Window</string>
 							<object class="NSMutableArray" key="NSMenuItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSMenuItem" id="163233745">
+									<reference key="NSMenu" ref="835318025"/>
+									<string key="NSTitle">Timeline</string>
+									<string key="NSKeyEquiv">1</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="1011231497">
 									<reference key="NSMenu" ref="835318025"/>
 									<string key="NSTitle">Minimize</string>
@@ -920,7 +929,7 @@
 							<reference key="NSNextKeyView"/>
 							<string key="FrameName"/>
 							<string key="GroupName"/>
-							<object class="WebPreferences" key="Preferences" id="607433003">
+							<object class="WebPreferences" key="Preferences" id="561166140">
 								<string key="Identifier">12</string>
 								<object class="NSMutableDictionary" key="Values">
 									<bool key="EncodedWithXMLCoder">YES</bool>
@@ -942,7 +951,7 @@
 				<string key="NSFrameAutosaveName">mentions</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
-			<object class="NSWindowTemplate" id="134856599">
+			<object class="NSWindowTemplate" id="919859780">
 				<int key="NSWindowStyleMask">15</int>
 				<int key="NSWindowBacking">2</int>
 				<string key="NSWindowRect">{{1292, 328}, {376, 581}}</string>
@@ -951,13 +960,13 @@
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
 				<nil key="NSUserInterfaceItemIdentifier"/>
-				<object class="NSView" key="NSWindowView" id="894500">
+				<object class="NSView" key="NSWindowView" id="469460548">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="WebView" id="462377329">
-							<reference key="NSNextResponder" ref="894500"/>
+						<object class="WebView" id="352293288">
+							<reference key="NSNextResponder" ref="469460548"/>
 							<int key="NSvFlags">274</int>
 							<object class="NSMutableSet" key="NSDragTypes">
 								<bool key="EncodedWithXMLCoder">YES</bool>
@@ -981,12 +990,12 @@
 								</object>
 							</object>
 							<string key="NSFrameSize">{376, 581}</string>
-							<reference key="NSSuperview" ref="894500"/>
+							<reference key="NSSuperview" ref="469460548"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView"/>
 							<string key="FrameName"/>
 							<string key="GroupName"/>
-							<reference key="Preferences" ref="607433003"/>
+							<reference key="Preferences" ref="561166140"/>
 							<bool key="UseBackForwardList">NO</bool>
 							<bool key="AllowsUndo">YES</bool>
 						</object>
@@ -994,7 +1003,7 @@
 					<string key="NSFrameSize">{376, 581}</string>
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
-					<reference key="NSNextKeyView" ref="462377329"/>
+					<reference key="NSNextKeyView" ref="352293288"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
@@ -1626,7 +1635,7 @@
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">conversationView</string>
 						<reference key="source" ref="408500656"/>
-						<reference key="destination" ref="462377329"/>
+						<reference key="destination" ref="352293288"/>
 					</object>
 					<int key="connectionID">632</int>
 				</object>
@@ -1634,7 +1643,7 @@
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">conversationViewWindow</string>
 						<reference key="source" ref="408500656"/>
-						<reference key="destination" ref="134856599"/>
+						<reference key="destination" ref="919859780"/>
 					</object>
 					<int key="connectionID">633</int>
 				</object>
@@ -1646,6 +1655,14 @@
 					</object>
 					<int key="connectionID">547</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">makeKeyAndOrderFront:</string>
+						<reference key="source" ref="1010634651"/>
+						<reference key="destination" ref="163233745"/>
+					</object>
+					<int key="connectionID">642</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">checkForUpdates:</string>
@@ -1697,7 +1714,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
-						<reference key="source" ref="134856599"/>
+						<reference key="source" ref="919859780"/>
 						<reference key="destination" ref="408500656"/>
 					</object>
 					<int key="connectionID">631</int>
@@ -1789,8 +1806,8 @@
 							<reference ref="705341025"/>
 							<reference ref="776162233"/>
 							<reference ref="425164168"/>
-							<reference ref="281587867"/>
 							<reference ref="295904906"/>
+							<reference ref="281587867"/>
 							<reference ref="157409543"/>
 							<reference ref="1007514384"/>
 						</object>
@@ -2046,6 +2063,7 @@
 							<reference ref="625202149"/>
 							<reference ref="575023229"/>
 							<reference ref="1011231497"/>
+							<reference ref="163233745"/>
 						</object>
 						<reference key="parent" ref="713487014"/>
 					</object>
@@ -2441,6 +2459,30 @@
 						<reference key="object" ref="776162233"/>
 						<reference key="parent" ref="720053764"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">628</int>
+						<reference key="object" ref="919859780"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="469460548"/>
+						</object>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Mentions</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">629</int>
+						<reference key="object" ref="469460548"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="352293288"/>
+						</object>
+						<reference key="parent" ref="919859780"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">630</int>
+						<reference key="object" ref="352293288"/>
+						<reference key="parent" ref="469460548"/>
+					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">551</int>
 						<reference key="object" ref="295904906"/>
@@ -2452,28 +2494,9 @@
 						<reference key="parent" ref="720053764"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">628</int>
-						<reference key="object" ref="134856599"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="894500"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Mentions</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">629</int>
-						<reference key="object" ref="894500"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="462377329"/>
-						</object>
-						<reference key="parent" ref="134856599"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">630</int>
-						<reference key="object" ref="462377329"/>
-						<reference key="parent" ref="894500"/>
+						<int key="objectID">641</int>
+						<reference key="object" ref="163233745"/>
+						<reference key="parent" ref="835318025"/>
 					</object>
 				</object>
 			</object>
@@ -2591,6 +2614,7 @@
 					<string>628.NSWindowTemplate.visibleAtLaunch</string>
 					<string>629.IBPluginDependency</string>
 					<string>630.IBPluginDependency</string>
+					<string>641.IBPluginDependency</string>
 					<string>72.IBPluginDependency</string>
 					<string>73.IBPluginDependency</string>
 					<string>79.IBPluginDependency</string>
@@ -2718,6 +2742,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -2732,7 +2757,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">633</int>
+			<int key="maxID">642</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">