diff --git a/.gitignore b/.gitignore
index cb9b773756..ce35528e1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,9 +71,6 @@ coverage
 # Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
 
-# Bower dependency directory (https://bower.io/)
-bower_components
-
 # node-waf configuration
 .lock-wscript
 
diff --git a/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.css b/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.css
index 1392541e16..80f078d880 100644
--- a/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.css
+++ b/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.css
@@ -119,38 +119,66 @@
     height: 1.2em !important;
 }
 
-@media all and (max-width: 87.5em) {
 
-    .nowPlayingBarUserDataButtons {
+@media all and (max-width: 70em) {
+
+    .nowPlayingBarRight .nowPlayingBarUserDataButtons {
         display: none;
     }
 }
 
-@media all and (max-width: 68.75em) {
-
-    .nowPlayingBarVolumeSliderContainer, .nowPlayingBar .muteButton, .nowPlayingBar .unmuteButton {
+@media all and (max-width: 66em) {
+    .toggleRepeatButton {
         display: none !important;
     }
 }
 
-@media all and (max-width: 50em) {
+
+@media all and (max-width: 62em) {
+
+    .nowPlayingBarCenter .nowPlayingBarCurrentTime {
+        display: none !important;
+    }
+
+}
+
+@media all and (max-width: 56em) {
 
     .nowPlayingBarCenter {
         display: none !important;
     }
 
-    .toggleRepeatButton {
-        display: none;
-    }
 }
 
-@media all and (min-width: 50em) {
+
+@media all and (min-width: 56em) {
 
     .nowPlayingBarRight .playPauseButton {
         display: none;
     }
 
-    .nowPlayingBarInfoContainer {
-        max-width: 40%;
-    }
+}
+
+@media all and (max-width: 40em) {
+
+    .nowPlayingBarInfoContainer .nowPlayingImage {
+        display: none;
+    }
+
+}
+
+@media all and (max-width: 36em) {
+
+    .nowPlayingBarRight .nowPlayingBarVolumeSliderContainer {
+        display: none !important;
+    }
+
+}
+
+@media all and (max-width: 24em) {
+
+  .nowPlayingBar .muteButton, .nowPlayingBar .unmuteButton {
+    display: none;
+  }
+
 }
diff --git a/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.js b/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.js
index 331b178b39..01c920a501 100644
--- a/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.js
+++ b/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.js
@@ -56,7 +56,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
 
         html += '<button is="paper-icon-button-light" class="muteButton mediaButton"><i class="md-icon">&#xE050;</i></button>';
 
-        html += '<div class="sliderContainer nowPlayingBarVolumeSliderContainer hide" style="width:100px;vertical-align:middle;display:inline-flex;">';
+        html += '<div class="sliderContainer nowPlayingBarVolumeSliderContainer hide" style="width:9em;vertical-align:middle;display:inline-flex;">';
         html += '<input type="range" is="emby-slider" pin step="1" min="0" max="100" value="0" class="slider-medium-thumb nowPlayingBarVolumeSlider"/>';
         html += '</div>';
 
@@ -191,9 +191,9 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
                 currentPlayer.setVolume(this.value);
             }
         }
-        volumeSlider.addEventListener('change', setVolume.bind(this));
-        volumeSlider.addEventListener('mousemove', setVolume.bind(this));
-        volumeSlider.addEventListener('touchmove', setVolume.bind(this));
+        volumeSlider.addEventListener('change', setVolume);
+        volumeSlider.addEventListener('mousemove', setVolume);
+        volumeSlider.addEventListener('touchmove', setVolume);
 
 
         positionSlider = elem.querySelector('.nowPlayingBarPositionSlider');
diff --git a/src/components/remotecontrol.js b/src/components/remotecontrol.js
index 58e69961e7..76f0d673d0 100644
--- a/src/components/remotecontrol.js
+++ b/src/components/remotecontrol.js
@@ -429,6 +429,7 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
             if (!state.NextMediaType) {
                 updatePlayerState(player, dlg, {});
                 loadPlaylist(dlg);
+                Emby.Page.back();
             }
         }
 
diff --git a/src/css/nowplaying.css b/src/css/nowplaying.css
index 93765d541b..ab8695deed 100644
--- a/src/css/nowplaying.css
+++ b/src/css/nowplaying.css
@@ -186,14 +186,26 @@
 }
 
 .nowPlayingVolumeSliderContainer {
-    width: 6em
+    width: 9em
+}
+
+@media all and (max-width:50em) {
+    .nowPlayingInfoButtons .nowPlayingPageUserDataButtons {
+        display: none !important
+    }
+}
+
+@media all and (max-width:47em) {
+    .nowPlayingInfoButtons .repeatToggleButton {
+        display: none !important
+    }
 }
 
 @media all and (max-width:34em) {
 
-    .btnNowPlayingFastForward,
-    .btnNowPlayingRewind,
-    .playlist .listItemMediaInfo {
+    .nowPlayingInfoButtons .btnNowPlayingFastForward,
+    .nowPlayingInfoButtons .btnNowPlayingRewind,
+    .nowPlayingInfoButtons .playlist .listItemMediaInfo {
         display: none !important
     }
-}
\ No newline at end of file
+}
diff --git a/src/css/videoosd.css b/src/css/videoosd.css
index a8904b9945..bd24e41309 100644
--- a/src/css/videoosd.css
+++ b/src/css/videoosd.css
@@ -138,7 +138,7 @@
 }
 
 .osdVolumeSliderContainer {
-    width: 6.5em;
+    width: 9em;
     -webkit-box-flex: 1;
     -webkit-flex-grow: 1;
     flex-grow: 1
@@ -244,14 +244,19 @@
     }
 }
 
-@media all and (max-width:37.5em) {
+@media all and (max-width:43em) {
     .videoOsdBottom .volumeButtons {
         display: none !important
     }
 }
+@media all and (max-width:50em) {
+    .videoOsdBottom .btnFastForward, .videoOsdBottom .btnRewind {
+        display: none !important
+    }
+}
 
 @media all and (max-width:75em) {
     .videoOsdBottom .endsAtText {
         display: none !important
     }
-}
\ No newline at end of file
+}