diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index 859853c770..4176cc51cf 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -272,9 +272,9 @@ form, .readOnlyContent {
         color: #fff!important;
     }
 
-	.invalidEntry {
-		background-color: lightpink!important;
-	}
+.invalidEntry {
+    background-color: lightpink!important;
+}
 
 /* Tabs (e.g. advanced metadata page) */
 .localnav {
@@ -714,23 +714,23 @@ progress {
     border-top: 2px solid #D7742B;
 }
 
-#nowPlayingBar .highPosition {
-    z-index: 99999;
-    position: relative;
-}
+    #nowPlayingBar .highPosition {
+        z-index: 99999;
+        position: relative;
+    }
 
-#nowPlayingBar .barBackground {
-    border-top: 2px solid #D7742B;
-    background: #4C4C4C;
-    position: absolute;
-    margin: -8px -0.5em !important;
-    width: 100%;
-    height: 100%;
-}
+    #nowPlayingBar .barBackground {
+        border-top: 2px solid #D7742B;
+        background: #4C4C4C;
+        position: absolute;
+        margin: -8px -0.5em !important;
+        width: 100%;
+        height: 100%;
+    }
 
-#nowPlayingBar > *:not(#mediaElement):not(.mediaFlyoutContainer) {
-    margin: 0 1em;
-}
+    #nowPlayingBar > *:not(#mediaElement):not(.mediaFlyoutContainer) {
+        margin: 0 1em;
+    }
 
 .nowPlayingBarImage {
     border: 1px solid #a7a7a7!important;
@@ -989,6 +989,16 @@ input[type="range"]::-ms-fill-upper {
     display: inline-block;
 }
 
+@media (min-width: 750px) {
+    .installedPluginTitle {
+        max-width: 110px;
+    }
+
+    .itemVideo:not(.fullscreenVideo) {
+        width: 320px;
+    }
+}
+
 @media (min-width: 1200px) {
     .installedPluginTitle {
         max-width: 110px;
@@ -1007,6 +1017,14 @@ input[type="range"]::-ms-fill-upper {
     .itemVideo:not(.fullscreenVideo) {
         width: 400px;
     }
+
+    .positionSlider {
+        width: 400px;
+    }
+
+    .itemVideo {
+        left: -560px;
+    }
 }
 
 #editItemMetadataPage #txtOverview {
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 6b36b28f3c..36bf0595eb 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -31,7 +31,7 @@
 
             if (requestMethod) { // Native full screen.
                 requestMethod.call(element);
-            } else{ 
+            } else {
                 $('.itemVideo').addClass('fullscreenVideo');
             }
         }
@@ -89,7 +89,7 @@
 
             ApiClient.reportPlaybackStopped(Dashboard.getCurrentUserId(), currentItem.Id, position);
         }
-        
+
         function playNextAfterEnded() {
 
             $(this).off('ended.playnext');
@@ -159,7 +159,7 @@
                 $(element).off('ended.playbackstopped').off('ended.playnext').on("play.onceafterseek", function () {
 
                     $(this).off('play.onceafterseek').on('ended.playbackstopped', onPlaybackStopped).on('ended.playnext', playNextAfterEnded);
-                    
+
                     startProgressInterval(currentItem.Id);
                     sendProgressUpdate(currentItem.Id);
 
@@ -695,7 +695,7 @@
 
             return null;
         }
-        
+
         function idleHandler() {
             var nowPlayingBar = $("#nowPlayingBar");
             if (timeout) {
@@ -710,7 +710,7 @@
                 $(".mediaButton,.currentTime,.nowPlayingMediaInfo,.mediaSlider,.barBackground", nowPlayingBar).removeClass("highPosition");
             }, 4000);
         }
-        
+
         self.canPlay = function (item) {
 
             if (item.Type == "MusicAlbum" || item.Type == "MusicArtist") {
@@ -788,7 +788,7 @@
         self.playWithWarning = function (items, startPosition, user, localStorageKeyName, header) {
 
             localStorageKeyName += new Date().getMonth();
-            
+
             if (localStorage.getItem(localStorageKeyName) == "1") {
 
                 self.playInternal(items[0], startPosition, user);
@@ -834,7 +834,7 @@
             if (item == null) {
                 throw new Error("item cannot be null");
             }
-            
+
             if (self.isPlaying()) {
                 self.stop();
             }
@@ -951,7 +951,7 @@
         };
 
         self.toggleFullscreen = function () {
-            
+
             $('.itemVideo').unbind('mousemove keydown scroll', idleHandler);
             if (isFullScreen()) {
                 if (document.cancelFullScreen) { document.cancelFullScreen(); }
@@ -996,11 +996,13 @@
             var newIndex = currentPlaylistIndex + 1;
             var newItem = self.playlist[newIndex];
 
-            Dashboard.getCurrentUser().done(function (user) {
+            if (newItem) {
+                Dashboard.getCurrentUser().done(function (user) {
 
-                self.playInternal(newItem, 0, user);
-                currentPlaylistIndex = newIndex;
-            });
+                    self.playInternal(newItem, 0, user);
+                    currentPlaylistIndex = newIndex;
+                });
+            }
         };
 
         self.queueItem = function (item) {