diff --git a/dashboard-ui/css/remotecontrol.css b/dashboard-ui/css/remotecontrol.css
index 4d0171058..4f8a7d112 100644
--- a/dashboard-ui/css/remotecontrol.css
+++ b/dashboard-ui/css/remotecontrol.css
@@ -1,4 +1,4 @@
-#remoteControlFlyout {
+.remoteControlFlyout {
     width: 300px;
     min-height: 400px;
 }
@@ -69,13 +69,13 @@
 }
 
 @media all and (min-height: 500px) {
-    #remoteControlFlyout {
+    .remoteControlFlyout {
         min-height: 450px;
     }
 }
 
 @media all and (min-height: 600px) {
-    #remoteControlFlyout {
+    .remoteControlFlyout {
         min-height: 500px;
     }
 }
@@ -87,19 +87,19 @@
 }
 
 @media all and (min-width: 400px) {
-    #remoteControlFlyout {
+    .remoteControlFlyout {
         width: 360px;
     }
 }
 
 @media all and (min-width: 500px) {
-    #remoteControlFlyout {
+    .remoteControlFlyout {
         width: 450px;
     }
 }
 
 @media all and (min-width: 600px) {
-    #remoteControlFlyout {
+    .remoteControlFlyout {
         width: 550px;
     }
 }
\ No newline at end of file
diff --git a/dashboard-ui/edititemimages.html b/dashboard-ui/edititemimages.html
index 3eecd402c..155716d94 100644
--- a/dashboard-ui/edititemimages.html
+++ b/dashboard-ui/edititemimages.html
@@ -25,10 +25,10 @@
                 <div style="margin: -25px 0 1em;">
 
                     <div style="display: inline-block;">
-                        <a class="lnkBrowseImages lnkBrowseAllImages hide" href="#popupDownload" data-rel="popup" data-position-to="window" data-role="button" data-inline="true" data-icon="cloud" data-mini="true" data-transition="pop">Browse Online Images</a>
+                        <a class="lnkBrowseImages lnkBrowseAllImages hide" href="#popupDownload" data-rel="popup" data-position-to="window" data-role="button" data-inline="true" data-icon="cloud" data-mini="true" data-transition="pop">Browse Images</a>
                     </div>
                     <div style="display: inline-block;">
-                        <a href="#popupUpload" data-rel="popup" data-position-to="window" data-role="button" data-inline="true" data-icon="plus" data-mini="true" data-transition="pop">Upload Image</a>
+                        <a href="#popupUpload" data-rel="popup" data-position-to="window" data-role="button" data-inline="true" data-icon="plus" data-mini="true" data-transition="pop">Upload</a>
                     </div>
                 </div>
 
diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html
index c92065aee..84bc32f86 100644
--- a/dashboard-ui/edititemmetadata.html
+++ b/dashboard-ui/edititemmetadata.html
@@ -442,8 +442,8 @@
 
                                 <p>
                                     <br />
-                                    <label for="enableInternetProviders">Lock this item to prevent future changes.</label>
-                                    <input data-mini="true" type="checkbox" id="enableInternetProviders" onchange="EditItemMetadataPage.setProviderSettingsContainerVisibility(this)" />
+                                    <label for="chkLockData">Lock this item to prevent future changes.</label>
+                                    <input data-mini="true" type="checkbox" id="chkLockData" onchange="EditItemMetadataPage.setProviderSettingsContainerVisibility(this)" />
                                 </p>
                                 <div id="providerSettingsContainer" style="display: none">
                                 </div>
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index 09a506912..30f789b29 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -22,7 +22,7 @@
 
         var htmlName = "<div class='" + cssClass + "'>";
 
-        if (item.EnableInternetProviders === false) {
+        if (item.LockData) {
             htmlName += '<img src="css/images/editor/lock.png" />';
         }
 
@@ -858,12 +858,12 @@
         populateListView($('#listTags', page), item.Tags);
         populateListView($('#listKeywords', page), item.Keywords);
 
-        var enableInternetProviders = (item.EnableInternetProviders || false);
-        $("#enableInternetProviders", page).attr('checked', !enableInternetProviders).checkboxradio('refresh');
-        if (enableInternetProviders) {
-            $('#providerSettingsContainer', page).show();
-        } else {
+        var lockData = (item.LockData || false);
+        var chkLockData = $("#chkLockData", page).attr('checked', lockData).checkboxradio('refresh');
+        if (chkLockData.checked()) {
             $('#providerSettingsContainer', page).hide();
+        } else {
+            $('#providerSettingsContainer', page).show();
         }
         populateInternetProviderSettings(page, item, item.LockedFields);
 
@@ -1222,7 +1222,7 @@
                 OfficialRating: $('#selectOfficialRating', form).val(),
                 CustomRating: $('#selectCustomRating', form).val(),
                 People: currentItem.People,
-                EnableInternetProviders: !$("#enableInternetProviders", form).prop('checked'),
+                LockData: $("#chkLockData", form).prop('checked'),
                 LockedFields: $('.selectLockedField', form).map(function () {
                     var value = $(this).val();
                     if (value != '') return value;
diff --git a/dashboard-ui/scripts/remotecontrol.js b/dashboard-ui/scripts/remotecontrol.js
index 189121b7e..0a39b3a95 100644
--- a/dashboard-ui/scripts/remotecontrol.js
+++ b/dashboard-ui/scripts/remotecontrol.js
@@ -64,7 +64,7 @@
 
         var item = options.item;
 
-        var html = '<div data-role="popup" id="remoteControlFlyout" data-transition="slidedown" data-theme="a">';
+        var html = '<div data-role="popup" class="remoteControlFlyout" data-transition="slidedown" data-theme="a">';
 
         html += '<a href="#" data-rel="back" data-role="button" data-icon="delete" data-iconpos="notext" class="ui-btn-right" data-theme="b">Close</a>';
 
@@ -100,7 +100,7 @@
 
         $(document.body).append(html);
 
-        var popup = $('#remoteControlFlyout').popup({ history: false, tolerance: 0, corners: false }).trigger('create').popup("open").on("popupafterclose", function () {
+        var popup = $('.remoteControlFlyout').popup({ history: false, tolerance: 0, corners: false }).trigger('create').popup("open").on("popupafterclose", function () {
 
             if (ApiClient.isWebSocketOpen()) {
                 ApiClient.sendWebSocketMessage("SessionsStop");
@@ -109,6 +109,8 @@
             $(ApiClient).off("websocketmessage.remotecontrol");
 
             $(this).off("popupafterclose").remove();
+
+            $('.remoteControlFlyout').popup("destroy").remove();
         });
 
         popup.on('click', '.trSession', function () {
@@ -131,7 +133,7 @@
             var checkboxes = $('.chkClient', popup);
 
             if (!checkboxes.length) {
-                $('#remoteControlFlyout').popup("close");
+                $('.remoteControlFlyout').popup("close");
                 return false;
             }
 
@@ -356,7 +358,7 @@
 
                             renderVideos(themeSongsElem, result.Items, 'Theme Songs');
 
-                            $('#remoteControlFlyout').popup("reposition", { tolerance: 0 });
+                            $('.remoteControlFlyout').popup("reposition", { tolerance: 0 });
                         });
                     }
                 }
@@ -445,7 +447,7 @@
 
         if (!sessions.length) {
             elem.html('<p>There are currently no available media browser sessions to control.</p>');
-            $('#remoteControlFlyout').popup("reposition", {});
+            $('.remoteControlFlyout').popup("reposition", {});
             return;
         }
 
@@ -542,8 +544,6 @@
         $('.tdSelectSession', elem).html('<input type="radio" class="chkClient" name="chkClient" />');
 
         $('.chkClient:first', elem).checked(true);
-
-        $('#remoteControlFlyout').popup("reposition", { tolerance: 0 });
     }
 
     function getSessionNowPlayingTime(session) {
@@ -642,7 +642,7 @@
 
     function showMenu(sessions, options) {
 
-        var html = '<div data-role="popup" data-transition="slidedown" id="remoteControlFlyout" data-theme="a">';
+        var html = '<div data-role="popup" data-transition="slidedown" class="remoteControlFlyout" data-theme="a">';
 
         html += '<a href="#" data-rel="back" data-role="button" data-icon="delete" data-iconpos="notext" class="ui-btn-right" data-theme="b">Close</a>';
 
@@ -702,7 +702,7 @@
 
         $(document.body).append(html);
 
-        var popup = $('#remoteControlFlyout').popup({ history: false, tolerance: 0, corners: false }).trigger('create').popup("open").on("popupafterclose", function () {
+        var popup = $('.remoteControlFlyout').popup({ history: false, tolerance: 0, corners: false }).trigger('create').popup("open").on("popupafterclose", function () {
 
             if (ApiClient.isWebSocketOpen()) {
                 ApiClient.sendWebSocketMessage("SessionsStop");
@@ -711,6 +711,8 @@
             $(ApiClient).off("websocketmessage.remotecontrol");
 
             $(this).off("popupafterclose").remove();
+
+            $('.remoteControlFlyout').popup("destroy").remove();
         });
 
         renderSessionsInControlMenu(popup, sessions, options);