diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 378983521c..079dcc5a74 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -524,8 +524,10 @@
             // HLS must be at the top for safari
             // Webm must be ahead of mp4 due to the issue of mp4 playing too fast in chrome
 
+            var requiresControls = $.browser.msie || $.browser.android || $.browser.iphone || $.browser.ipad;
+
             // Can't autoplay in these browsers so we need to use the full controls
-            if ($.browser.msie || $.browser.android || $.browser.iphone || $.browser.ipad) {
+            if (requiresControls) {
                 html += '<video class="itemVideo" autoplay controls preload="none">';
             } else {
                 html += '<video class="itemVideo" autoplay preload="none">';
@@ -572,7 +574,11 @@
                 $('#chaptersButton', nowPlayingBar).hide();
             }
 
-            $('#fullscreenButton', nowPlayingBar).show();
+            if (requiresControls) {
+                $('#fullscreenButton', nowPlayingBar).hide();
+            } else {
+                $('#fullscreenButton', nowPlayingBar).show();
+            }
 
             var videoElement = $("video", nowPlayingBar);
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 8c3b06444a..88276d4e47 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -790,9 +790,8 @@ var Dashboard = {
             });
 
         }
-        else if (msg.MessageType === "UpdatePlaystate") {
+        else if (msg.MessageType === "Playstate") {
 
-            // TODO for Craig
         }
     },