diff --git a/dashboard-ui/css/mediaplayer-video.css b/dashboard-ui/css/mediaplayer-video.css
index 9775745218..fcf1970031 100644
--- a/dashboard-ui/css/mediaplayer-video.css
+++ b/dashboard-ui/css/mediaplayer-video.css
@@ -15,9 +15,7 @@
 
 #videoPlayer {
     z-index: 99997;
-    background-color: #1d1d1d;
     position: fixed;
-    border: 1px solid #333;
     top: 50%;
     left: 50%;
     margin-left: -170px;
@@ -26,20 +24,21 @@
 
 .itemVideo {
     background-color: #000;
-    margin: 5px 5px 75px;
+    margin: 0 0 70px;
     width: 320px;
     height: 181px;
 }
 
 #videoControls {
     z-index: 99999;
-    padding: 0 5px 5px;
+    padding: 0 5px 0;
     height: 75px;
     position: absolute;
     top: auto;
     right: 0;
     bottom: 0;
     left: 0;
+    background-color: #222;
 }
 
     #videoControls .positionSliderContainer .ui-slider-track {
diff --git a/dashboard-ui/edititemsubtitles.html b/dashboard-ui/edititemsubtitles.html
index 26d6a439fc..918c85d330 100644
--- a/dashboard-ui/edititemsubtitles.html
+++ b/dashboard-ui/edititemsubtitles.html
@@ -44,7 +44,7 @@
             </div>
         </div>
 
-        <div data-role="popup" class="ui-content popupSubtitleViewer" data-history="false">
+        <div data-role="popup" class="ui-content popupSubtitleViewer">
             <a href="#" data-rel="back" data-role="button" class="ui-btn ui-corner-all ui-shadow ui-btn-b ui-icon-delete ui-btn-icon-notext ui-btn-right">Close</a>
             <div class="subtitleViewerContent">
                 <pre class="subtitleContent" style="margin: 0; border-radius: 0;"></pre>
diff --git a/dashboard-ui/nowplaying.html b/dashboard-ui/nowplaying.html
index be2bf9fe53..68470e60bf 100644
--- a/dashboard-ui/nowplaying.html
+++ b/dashboard-ui/nowplaying.html
@@ -128,11 +128,11 @@
             </div>
         </div>
 
-        <div data-role="popup" id="popupAudioTrackMenu" data-history="false" data-transition="flip">
+        <div data-role="popup" id="popupAudioTrackMenu" data-transition="flip">
             <div class="trackList"></div>
         </div>
 
-        <div data-role="popup" id="popupSubtitleTrackMenu" data-history="false" data-transition="flip">
+        <div data-role="popup" id="popupSubtitleTrackMenu" data-transition="flip">
             <div class="trackList"></div>
         </div>
         
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index 6d869617ad..b5d79c8cc6 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -45,10 +45,8 @@
 
         Dashboard.getCurrentUser().done(function (user) {
 
-            var imageHref = user.Configuration.IsAdministrator ? "edititemimages.html?id=" + item.Id : "";
-
-            $('#itemImage', page).html(LibraryBrowser.getDetailImageHtml(item, imageHref));
-
+            renderImage(page, item, user);
+            
             setInitialCollapsibleState(page, item, context, user);
             renderDetails(page, item, context);
             LibraryBrowser.renderDetailPageBackdrop(page, item);
@@ -140,6 +138,13 @@
 
         Dashboard.hideLoadingMsg();
     }
+    
+    function renderImage(page, item, user) {
+        
+        var imageHref = user.Configuration.IsAdministrator ? "edititemimages.html?id=" + item.Id : "";
+
+        $('#itemImage', page).html(LibraryBrowser.getDetailImageHtml(item, imageHref));
+    }
 
     function onWebSocketMessage(e, data) {
 
@@ -158,8 +163,14 @@
                 })[0];
 
                 if (userData) {
+
                     currentItem.UserData = userData;
                     renderUserDataIcons(page, currentItem);
+
+                    Dashboard.getCurrentUser().done(function (user) {
+
+                        renderImage(page, currentItem, user);
+                    });
                 }
             }
         }
@@ -879,6 +890,7 @@
     }
 
     function renderUserDataIcons(page, item) {
+        
         $('.userDataIcons', page).html(LibraryBrowser.getUserDataIconsHtml(item));
     }
 
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 54e530b93e..9d54d82441 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -301,10 +301,10 @@
 
             $('.playFlyout').popup("close").remove();
 
-            var html = '<div data-role="popup" class="playFlyout" style="max-width:300px;" data-theme="a" data-history="false">';
+            var html = '<div data-role="popup" class="playFlyout" data-transition="fade" data-history="false">';
 
-            html += '<ul data-role="listview" style="min-width: 150px;">';
-            html += '<li data-role="list-divider" data-theme="b">Play Menu</li>';
+            html += '<ul data-role="listview" style="min-width: 180px;">';
+            html += '<li data-role="list-divider">Play Menu</li>';
 
             html += '<li><a href="#" onclick="MediaController.play(\'' + itemId + '\');LibraryBrowser.closePlayMenu();">Play</a></li>';
 
@@ -334,7 +334,7 @@
 
                 $(this).off("popupafterclose").remove();
 
-            }).parents(".ui-popup-container").css("margin-left", 100).css("margin-top", 35);
+            }).parents(".ui-popup-container").css("margin-left", 55);
         },
 
         closePlayMenu: function () {
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 583777ebe2..1e820ef5ea 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -104,13 +104,15 @@
 
         self.showQualityFlyout = function () {
 
-            var flyout = $('#video-qualityFlyout');
+            var flyout = $('.video-qualityFlyout');
 
             if (!flyout.is(':visible')) {
                 flyout.html(getQualityFlyoutHtml()).scrollTop(0);
             }
 
-            toggleFlyout(flyout, '#video-qualityButton');
+            toggleFlyout(flyout, '.video-qualityButton');
+            
+            //$('.videoQualityPopup').html(getQualityFlyoutHtml()).trigger('create').popup('open');
         };
 
         self.showChaptersFlyout = function () {
@@ -311,7 +313,7 @@
                 hideFlyout($('#video-subtitleFlyout'));
             });
 
-            $('#video-qualityFlyout').on('click', '.mediaFlyoutOption', function () {
+            $('.video-qualityFlyout').on('click', '.mediaFlyoutOption', function () {
 
                 if (!$(this).hasClass('selectedMediaFlyoutOption')) {
 
@@ -327,7 +329,7 @@
                     });
                 }
 
-                hideFlyout($('#video-qualityFlyout'));
+                hideFlyout($('.video-qualityFlyout'));
             });
 
             var trackChange = false;
@@ -359,12 +361,9 @@
                 tooltip.remove();
             });
 
-            $(".mediaFlyoutContainer").on("click", "a", function (e) {
-                if (confirm("This option will close the video player. Proceed?")) {
-                    self.stop();
-                } else {
-                    e.preventDefault();
-                }
+            $('.video-qualityButton').on('click', function () {
+
+                self.showQualityFlyout();
             });
         });
 
@@ -1003,7 +1002,7 @@
 
             var videoElement = $('#videoElement', mediaPlayerContainer).prepend(html);
 
-            $('#video-qualityButton', videoControls).show();
+            $('.video-qualityButton', videoControls).show();
 
             if (mediaStreams.filter(function (s) {
                 return s.Type == "Audio";
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 8e16f43bd0..57dc1980a0 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -572,7 +572,7 @@ var Dashboard = {
 
             //html += '<p class="libraryPanelHeader" style="margin: 25px 0 20px 20px;"><a href="index.html" class="imageLink"><img src="css/images/mblogoicon.png" style="height:28px;" /><span>MEDIA</span><span class="mediaBrowserAccent">BROWSER</span></a></p>';
             html += '<br/>';
-            
+
             html += '<div class="sidebarLinks">';
 
             var links = Dashboard.getToolsMenuLinks(page);
@@ -1250,17 +1250,18 @@ $(function () {
     videoPlayerHtml += '</div>'; // video-basic-controls
     videoPlayerHtml += '<div id="video-advanced-controls">';
 
-    videoPlayerHtml += '<button onclick="MediaPlayer.showQualityFlyout();" id="video-qualityButton" class="mediaButton qualityButton" title="Quality" type="button" data-icon="gear" data-iconpos="notext" data-inline="true">Quality</button>';
-    videoPlayerHtml += '<div class="mediaFlyoutContainer"><div id="video-qualityFlyout" style="display:none;" class="mediaPlayerFlyout"></div></div>';
+    videoPlayerHtml += '<button class="mediaButton video-qualityButton" title="Quality" type="button" data-icon="gear" data-iconpos="notext" data-inline="true">Quality</button>';
+    //videoPlayerHtml += '<div data-role="popup" class="videoQualityPopup videoPlayerPopup" data-transition="flip"></div>';
+    videoPlayerHtml += '<div style="display:none;" id="video-qualityFlyout" class="video-qualityFlyout mediaPlayerFlyout"></div>';
 
     videoPlayerHtml += '<button onclick="MediaPlayer.showAudioTracksFlyout();" id="video-audioTracksButton" class="imageButton mediaButton audioTracksButton" title="Audio tracks" type="button" data-icon="audiocd" data-iconpos="notext" data-inline="true">Audio Tracks</button>';
-    videoPlayerHtml += '<div class="mediaFlyoutContainer"><div id="video-audioTracksFlyout" style="display:none;" class="mediaPlayerFlyout audioTracksFlyout"></div></div>';
+    videoPlayerHtml += '<div id="video-audioTracksFlyout" style="display:none;" class="mediaPlayerFlyout audioTracksFlyout"></div>';
 
     videoPlayerHtml += '<button onclick="MediaPlayer.showSubtitleMenu();" id="video-subtitleButton" class="imageButton mediaButton subtitleButton" title="Subtitles" type="button" data-icon="subtitles" data-iconpos="notext" data-inline="true">Subtitles</button>';
-    videoPlayerHtml += '<div class="mediaFlyoutContainer"><div id="video-subtitleFlyout" style="display:none;" class="mediaPlayerFlyout subtitleFlyout"></div></div>';
+    videoPlayerHtml += '<div id="video-subtitleFlyout" style="display:none;" class="mediaPlayerFlyout subtitleFlyout"></div>';
 
     videoPlayerHtml += '<button onclick="MediaPlayer.showChaptersFlyout();" id="video-chaptersButton" class="mediaButton chaptersButton" title="Scenes" type="button" data-icon="video" data-iconpos="notext" data-inline="true">Scenes</button>';
-    videoPlayerHtml += '<div class="mediaFlyoutContainer"><div id="video-chaptersFlyout" style="display:none;" class="mediaPlayerFlyout chaptersFlyout"></div></div>';
+    videoPlayerHtml += '<div id="video-chaptersFlyout" style="display:none;" class="mediaPlayerFlyout chaptersFlyout"></div>';
 
     videoPlayerHtml += '<button onclick="MediaPlayer.toggleFullscreen();" id="video-fullscreenButton" class="mediaButton fullscreenButton" title="Fullscreen" type="button" data-icon="expand" data-iconpos="notext" data-inline="true">Fullscreen</button>';