diff --git a/src/nowplaying.html b/src/nowplaying.html
index 59b6a4b78..1d81f69ef 100644
--- a/src/nowplaying.html
+++ b/src/nowplaying.html
@@ -1,57 +1,71 @@
-<div id="nowPlayingPage" data-role="page" class="page libraryPage nowPlayingPage noSecondaryNavPage selfBackdropPage" data-title="-" style="padding:6em 0 0!important;">
+<div id="nowPlayingPage" data-role="page" class="page libraryPage nowPlayingPage noSecondaryNavPage selfBackdropPage" data-title="-" style="padding:5em 0 0!important;">
 
     <div class="remoteControlContent padded-left padded-right">
 
         <div class="nowPlayingInfoContainer">
             <div class="nowPlayingPageImageContainer"></div>
             <div class="nowPlayingInfoControls">
+            
+                <div style="display: flex;">
 
-                <h2 class="nowPlayingPageTitle"></h2>
-
-                <div class="sliderContainer nowPlayingPositionSliderContainer">
-                    <input type="range" is="emby-slider" pin step="1" min="0" max="100" value="0" class="nowPlayingPositionSlider" data-slider-keep-progress="true" />
+                    <div class="nowPlayingInfoContainerMedia">
+                        <h2 class="nowPlayingPageTitle"></h2>
+                        <div style="font-weight:bold;" class="nowPlayingSongName"></div>
+                        <div class="nowPlayingAlbum"></div>
+                        <div class="nowPlayingArtist"></div>
+                    </div>
+                    <div class="nowPlayingPageUserDataButtonsTitle"></div>
+                    
                 </div>
+                
+                <div class="sliderContainer" style="display:flex;">
+                    <div class="positionTime"></div>
+                        <div class="nowPlayingPositionSliderContainer">
+                            <input type="range" is="emby-slider" pin step="1" min="0" max="100" value="0" class="nowPlayingPositionSlider" data-slider-keep-progress="true" />
+                        </div>
+                    <div class="runtime"></div>
+                </div>
+                
+                <div class="nowPlayingButtonsContainer">
+                
+                    <div class="nowPlayingInfoButtons focuscontainer-x">
+                    
+                        <button is="paper-icon-button-light" class="btnRewind btnNowPlayingRewind btnPlayStateCommand autoSize" title="${Rewind}">
+                            <i class="material-icons replay_10"></i>
+                        </button>
+                        
+                        <button is="paper-icon-button-light" class="btnPreviousTrack btnPlayStateCommand autoSize" title="${ButtonPreviousTrack}">
+                            <i class="material-icons skip_previous"></i>
+                        </button>
 
-                <div class="nowPlayingInfoButtons focuscontainer-x">
-                    <button is="paper-icon-button-light" class="btnPreviousTrack btnPlayStateCommand autoSize" title="${ButtonPreviousTrack}">
-                        <i class="material-icons skip_previous"></i>
-                    </button>
+                        <button is="paper-icon-button-light" class="btnPlayPause btnPlayStateCommand autoSize" title="${ButtonPause}">
+                            <i class="material-icons">pause</i>
+                        </button>
 
-                    <button is="paper-icon-button-light" class="btnRewind btnNowPlayingRewind btnPlayStateCommand autoSize" title="${Rewind}">
-                        <i class="material-icons fast_rewind"></i>
-                    </button>
+                        <button is="paper-icon-button-light" class="btnPlayStateCommand btnStop autoSize" title="${ButtonStop}">
+                            <i class="material-icons">stop</i>
+                        </button>
 
-                    <button is="paper-icon-button-light" class="btnPlayPause btnPlayStateCommand autoSize" title="${ButtonPause}">
-                        <i class="material-icons">pause</i>
-                    </button>
-
-                    <button is="paper-icon-button-light" class="btnPlayStateCommand btnStop autoSize" title="${ButtonStop}">
-                        <i class="material-icons">stop</i>
-                    </button>
-
-                    <button is="paper-icon-button-light" class="btnPlayStateCommand btnFastForward btnNowPlayingFastForward autoSize" title="${FastForward}">
-                        <i class="material-icons fast_forward"></i>
-                    </button>
-
-                    <button is="paper-icon-button-light" class="btnPlayStateCommand btnNextTrack autoSize" title="${ButtonNextTrack}">
-                        <i class="material-icons skip_next"></i>
-                    </button>
-
-                    <button is="paper-icon-button-light" class="btnAudioTracks videoButton btnPlayStateCommand autoSize" title="${ButtonAudioTracks}" data-command="GoToSearch">
-                        <i class="material-icons">audiotrack</i>
-                    </button>
-
-                    <button is="paper-icon-button-light" class="btnSubtitles videoButton btnPlayStateCommand autoSize" title="${ButtonSubtitles}" data-command="GoToSearch">
-                        <i class="material-icons closed_caption"></i>
-                    </button>
-
-                    <div class="nowPlayingTime">
-                        <div class="positionTime"></div>
-                        <div style="margin: 0 .25em;">/</div>
-                        <div class="runtime"></div>
+                        <button is="paper-icon-button-light" class="btnPlayStateCommand btnNextTrack autoSize" title="${ButtonNextTrack}">
+                            <i class="material-icons skip_next"></i>
+                        </button>
+                        
+                        <button is="paper-icon-button-light" class="btnPlayStateCommand btnFastForward btnNowPlayingFastForward autoSize" title="${FastForward}">
+                            <i class="material-icons forward_30"></i>
+                        </button>
+                    
                     </div>
 
                     <div class="nowPlayingSecondaryButtons">
+                    
+                        <button is="paper-icon-button-light" class="btnAudioTracks videoButton btnPlayStateCommand autoSize" title="${ButtonAudioTracks}" data-command="GoToSearch">
+                            <i class="material-icons">audiotrack</i>
+                        </button>
+
+                        <button is="paper-icon-button-light" class="btnSubtitles videoButton btnPlayStateCommand autoSize" title="${ButtonSubtitles}" data-command="GoToSearch">
+                            <i class="material-icons closed_caption"></i>
+                        </button>
+                    
                         <div class="nowPlayingPageUserDataButtons"></div>
 
                         <button is="paper-icon-button-light" class="btnToggleFullscreen videoButton btnPlayStateCommand autoSize" title="${ButtonFullscreen}" data-command="ToggleFullscreen">
@@ -72,7 +86,7 @@
                 </div>
             </div>
         </div>
-        <div>
+        <div class="remoteControlSection">
             <div class="navigationSection">
                 <div is="emby-collapse" title="${HeaderNavigation}">
                     <div class="collapseContent">
@@ -120,8 +134,6 @@
                     </div>
                 </div>
             </div>
-        </div>
-        <div>
             <div class="sendMessageSection">
                 <div is="emby-collapse" title="${HeaderSendMessage}">
                     <div class="collapseContent" style="text-align: left;">
@@ -155,21 +167,26 @@
                 </div>
             </div>
         </div>
-
-        <br />
         <div class="playlistSection hide">
-            <div style="display: flex; align-items: center;margin:2em 0 1em">
-                <h2 style="margin:0;">${TabPlaylist}</h2>
-                <button is="paper-icon-button-light" class="btnSavePlaylist" title="${ButtonSave}" style="margin-left:1em;">
-                    <i class="material-icons">save</i>
+            <div class="playlistSectionButton" style="display: flex; align-items: center;">
+                <!--<h2 style="margin:0;">${TabPlaylist}</h2>-->
+                <button id="togglePlaylist" is="paper-icon-button-light" class="btnTooglePlaylist" title="${ButtonTooglePlaylist}">
+                    <i class="material-icons">queue_music</i>   
+                </button>
+                <button is="paper-icon-button-light" class="btnSavePlaylist" title="${ButtonSave}">
+                    <i class="material-icons">save</i>  
+                </button>
+                <button id="toggleContextMenu" is="paper-icon-button-light" class="btnToogleContextMenu" title="${ButtonToogleContextMenu}">
+                    <i class="material-icons more_vert"></i>    
                 </button>
             </div>
-            <div class="playlist itemsContainer vertical-list" is="emby-itemscontainer" data-dragreorder="true">
+            <div id="playlist" class="playlist itemsContainer vertical-list" is="emby-itemscontainer" data-dragreorder="true"></div>
+            <div id="contextMenu" class="contextMenu itemsContainer vertical-list" is="emby-itemscontainer">
+                <div class="listItem listItem-border contextMenuList contextMenuArtist">
+                </div>
+                <div class="listItem listItem-border contextMenuList contextMenuAlbum">
+                </div>
             </div>
         </div>
-        <br />
-        <br />
-        <br />
-        <br />
     </div>
 </div>