diff --git a/src/components/remotecontrol/remotecontrol.css b/src/components/remotecontrol/remotecontrol.css
index 21342bff7..9cdfcde15 100644
--- a/src/components/remotecontrol/remotecontrol.css
+++ b/src/components/remotecontrol/remotecontrol.css
@@ -1,3 +1,7 @@
+.nowPlayingPage {
+    padding: 5em 0 0 0 !important;
+}
+
 .nowPlayingInfoContainer {
     display: -webkit-box;
     display: -webkit-flex;
@@ -168,6 +172,10 @@
 }
 
 @media all and (min-width: 63em) {
+    .nowPlayingPage {
+        padding: 8em 0 0 0 !important;
+    }
+
     .nowPlayingSecondaryButtons {
         -webkit-box-flex: 1;
         -webkit-flex-grow: 1;
@@ -180,6 +188,12 @@
     .nowPlayingPageUserDataButtonsTitle {
         display: none !important;
     }
+
+    .playlistSectionButton,
+    .nowPlayingPlaylist,
+    .nowPlayingContextMenu {
+        background: unset !important;
+    }
 }
 
 @media all and (min-width: 80em) {
@@ -338,8 +352,6 @@
         display: inline-block;
         left: 0;
         right: 0;
-
-        /* background: #202020; */
         z-index: 1000;
     }
 
@@ -351,8 +363,6 @@
         right: 0;
         padding-left: 7.3%;
         padding-right: 7.3%;
-
-        /* background-color: #101010; */
     }
 
     .playlistSectionButton .btnTogglePlaylist {
@@ -532,8 +542,6 @@
         display: inline-block;
         left: 0;
         right: 0;
-
-        /* background: #202020; */
         z-index: 1000;
     }
 
@@ -545,8 +553,6 @@
         right: 0;
         padding-left: 4.3%;
         padding-right: 4.3%;
-
-        /* background-color: #101010; */
     }
 
     .playlistSectionButton .btnTogglePlaylist {
diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index a4f04ef41..8e2a382d1 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -243,29 +243,30 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
             var supportedCommands = playerInfo.supportedCommands;
             currentPlayerSupportedCommands = supportedCommands;
             var playState = state.PlayState || {};
-            buttonVisible(context.querySelector(".btnToggleFullscreen"), item && "Video" == item.MediaType && -1 != supportedCommands.indexOf("ToggleFullscreen"));
+            var isSupportedCommands = supportedCommands.includes("DisplayMessage") || supportedCommands.includes("SendString") || supportedCommands.includes("Select");
+            buttonVisible(context.querySelector(".btnToggleFullscreen"), item && "Video" == item.MediaType && supportedCommands.includes("ToggleFullscreen"));
             updateAudioTracksDisplay(player, context);
             updateSubtitleTracksDisplay(player, context);
 
-            if (-1 != supportedCommands.indexOf("DisplayMessage") && !currentPlayer.isLocalPlayer) {
+            if (supportedCommands.includes("DisplayMessage") && !currentPlayer.isLocalPlayer) {
                 context.querySelector(".sendMessageSection").classList.remove("hide");
             } else {
                 context.querySelector(".sendMessageSection").classList.add("hide");
             }
 
-            if (-1 != supportedCommands.indexOf("SendString") && !currentPlayer.isLocalPlayer) {
+            if (supportedCommands.includes("SendString") && !currentPlayer.isLocalPlayer) {
                 context.querySelector(".sendTextSection").classList.remove("hide");
             } else {
                 context.querySelector(".sendTextSection").classList.add("hide");
             }
 
-            if (-1 != supportedCommands.indexOf("Select") && !currentPlayer.isLocalPlayer) {
+            if (supportedCommands.includes("Select") && !currentPlayer.isLocalPlayer) {
                 context.querySelector(".navigationSection").classList.remove("hide");
             } else {
                 context.querySelector(".navigationSection").classList.add("hide");
             }
 
-            if ((-1 != supportedCommands.indexOf("DisplayMessage") || -1 != supportedCommands.indexOf("SendString") || -1 != supportedCommands.indexOf("Select")) && !currentPlayer.isLocalPlayer) {
+            if (isSupportedCommands && !currentPlayer.isLocalPlayer) {
                 context.querySelector(".remoteControlSection").classList.remove("hide");
             } else {
                 context.querySelector(".remoteControlSection").classList.add("hide");
diff --git a/src/nowplaying.html b/src/nowplaying.html
index 7bfde2d9e..0f34e5ba3 100644
--- a/src/nowplaying.html
+++ b/src/nowplaying.html
@@ -1,4 +1,4 @@
-<div id="nowPlayingPage" data-role="page" class="page libraryPage nowPlayingPage noSecondaryNavPage selfBackdropPage" data-title="-" style="padding: 5em 0 0 !important;">
+<div id="nowPlayingPage" data-role="page" class="page libraryPage nowPlayingPage noSecondaryNavPage selfBackdropPage" data-title="-">
 
     <div class="remoteControlContent padded-left padded-right">
 
diff --git a/src/themes/appletv/theme.css b/src/themes/appletv/theme.css
index 6a91dcf8c..760038ad7 100644
--- a/src/themes/appletv/theme.css
+++ b/src/themes/appletv/theme.css
@@ -188,7 +188,8 @@ html {
 }
 
 .appfooter,
-.formDialogFooter:not(.formDialogFooter-clear) {
+.formDialogFooter:not(.formDialogFooter-clear),
+.playlistSectionButton {
     color: rgba(0, 0, 0, 0.7);
     background: #303030;
     background: -webkit-gradient(linear, left top, right top, from(#bcbcbc), color-stop(#a7b4b7), color-stop(#beb5a5), color-stop(#adbec2), to(#b9c7cb));
diff --git a/src/themes/blueradiance/theme.css b/src/themes/blueradiance/theme.css
index d7c47b1a2..3e86782f3 100644
--- a/src/themes/blueradiance/theme.css
+++ b/src/themes/blueradiance/theme.css
@@ -181,7 +181,8 @@ html {
     color: rgba(255, 255, 255, 0.87);
 }
 
-.appfooter {
+.appfooter,
+.playlistSectionButton {
     background: #033664;
     color: #ccc;
     color: rgba(255, 255, 255, 0.78);
diff --git a/src/themes/dark/theme.css b/src/themes/dark/theme.css
index 291a0b8b5..f9163d82f 100644
--- a/src/themes/dark/theme.css
+++ b/src/themes/dark/theme.css
@@ -163,7 +163,8 @@ html {
     color: rgba(255, 255, 255, 0.87);
 }
 
-.appfooter {
+.appfooter,
+.playlistSectionButton {
     background: #202020;
     color: #ccc;
     color: rgba(255, 255, 255, 0.78);
diff --git a/src/themes/light/theme.css b/src/themes/light/theme.css
index ad9695c6e..114ef7c3b 100644
--- a/src/themes/light/theme.css
+++ b/src/themes/light/theme.css
@@ -185,7 +185,8 @@ html {
     color: rgba(255, 255, 255, 0.87);
 }
 
-.appfooter {
+.appfooter,
+.playlistSectionButton {
     background: #282828;
     color: #ccc;
     color: rgba(255, 255, 255, 0.78);
diff --git a/src/themes/purplehaze/theme.css b/src/themes/purplehaze/theme.css
index f01c0c640..82b774a73 100644
--- a/src/themes/purplehaze/theme.css
+++ b/src/themes/purplehaze/theme.css
@@ -271,7 +271,8 @@ a[data-role=button] {
     color: rgba(255, 255, 255, 0.87);
 }
 
-.appfooter {
+.appfooter,
+.playlistSectionButton {
     background: #06256f;
     color: #ccc;
     color: rgba(255, 255, 255, 0.78);
diff --git a/src/themes/wmc/theme.css b/src/themes/wmc/theme.css
index 2cdae4dd2..e7d4c0371 100644
--- a/src/themes/wmc/theme.css
+++ b/src/themes/wmc/theme.css
@@ -174,7 +174,8 @@ html {
 }
 
 .appfooter,
-.formDialogFooter:not(.formDialogFooter-clear) {
+.formDialogFooter:not(.formDialogFooter-clear),
+.playlistSectionButton {
     background: #0c2450;
     background: -webkit-gradient(linear, left bottom, left top, from(#0c2450), to(#081b3b));
     background: -webkit-linear-gradient(bottom, #0c2450, #081b3b);