diff --git a/Mac/English.lproj/MainMenu.xib b/Mac/English.lproj/MainMenu.xib
index a64c31f..5a0bacb 100644
--- a/Mac/English.lproj/MainMenu.xib
+++ b/Mac/English.lproj/MainMenu.xib
@@ -891,7 +891,7 @@
 					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="690752143"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<string key="NSFrameAutosaveName">bungloo</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -970,7 +970,7 @@
 					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="126069112"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<string key="NSFrameAutosaveName">mentions</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -1029,7 +1029,7 @@
 					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="352293288"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<string key="NSFrameAutosaveName">conversation</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -1088,7 +1088,7 @@
 					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="106985301"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<string key="NSFrameAutosaveName">profile</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -1258,7 +1258,7 @@
 					<reference key="NSNextKeyView" ref="433812480"/>
 					<string key="NSReuseIdentifierKey">_NS:20</string>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<string key="NSFrameAutosaveName">preferences</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -1350,7 +1350,7 @@
 					<reference key="NSNextKeyView" ref="98105857"/>
 					<string key="NSReuseIdentifierKey">_NS:21</string>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">NO</bool>
 			</object>
diff --git a/WebKit/css/default.css b/WebKit/css/default.css
index aaef22c..ad31028 100644
--- a/WebKit/css/default.css
+++ b/WebKit/css/default.css
@@ -345,4 +345,21 @@ header.profile button {
 
 header.profile button.following {
 	background: #D84A38;
+}
+
+a.youtube {
+	position: relative;
+	display: inline-block;
+}
+
+a.youtube:before {
+	content: " ";
+	background: url(../img/play.png) no-repeat;
+	width: 37px;
+	height: 24px;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+	margin-left: -19px;
+	margin-top: -12px;
 }
\ No newline at end of file
diff --git a/WebKit/img/play.png b/WebKit/img/play.png
new file mode 100644
index 0000000..85e255a
Binary files /dev/null and b/WebKit/img/play.png differ
diff --git a/WebKit/scripts/controller/Profile.js b/WebKit/scripts/controller/Profile.js
index 623c2dc..972c0e9 100644
--- a/WebKit/scripts/controller/Profile.js
+++ b/WebKit/scripts/controller/Profile.js
@@ -246,7 +246,6 @@ function(HostApp, Core, Paths, URI) {
     Profile.prototype.showProfile = function(profile) {
 
         var basic = profile["https://tent.io/types/info/basic/v0.1.0"];
-        debug(basic)
 
         if (profile && basic) {
 
diff --git a/WebKit/scripts/helper/Core.js b/WebKit/scripts/helper/Core.js
index 65cd16e..eff5cec 100644
--- a/WebKit/scripts/helper/Core.js
+++ b/WebKit/scripts/helper/Core.js
@@ -934,19 +934,32 @@ function(jQuery, Paths, URI, HostApp, Cache) {
     }
 
     Core.prototype.addYouTube = function(id, images) {
-        var iframe = $('<iframe class="youtube" type="text/html" width="100%" height="200" frameborder="0" webkitAllowFullScreen allowFullScreen />')
-        iframe.appendTo(images);
-
-        // This is a workaround without it it in the Mentions view it scrolls
-        // down to the first video on load.
-        iframe.load(function() {
-            iframe.contents().find('*').each(function () {
-                $(this).removeAttr("tabindex");
-            });
+        var a = $("<a>", {
+            href: "http://youtu.be/" + id,
+            class: "youtube"
         });
 
-        // Appending the src
-        iframe.attr("src", 'http://www.youtube.com/embed/' + id + '?rel=0&showsearch=0&version=3&modestbranding=1');
+        var img = $("<img>", {src: "http://img.youtube.com/vi/" + id + "/0.jpg"});
+        var h = 200;
+        img.load(function() {
+            h = img.height();
+        });
+
+        a.click(function() {
+            var iframe = $('<iframe />', {
+                class: "youtube",
+                type: "text/html",
+                width: "100%",
+                height: h,
+                frameborder: 0,
+                src: 'http://www.youtube.com/embed/' + id + '?rel=0&showsearch=0&version=3&modestbranding=1&autoplay=1'
+            })
+            a.replaceWith(iframe);
+            return false;
+        })
+
+        img.appendTo(a);
+        a.appendTo(images);
     }
 
     Core.prototype.addVimeo = function(id, images) {