diff --git a/dashboard-ui/edititemimages.html b/dashboard-ui/edititemimages.html
index eb5680075..3eecd402c 100644
--- a/dashboard-ui/edititemimages.html
+++ b/dashboard-ui/edititemimages.html
@@ -105,7 +105,7 @@
 
                 <div style="text-align: center;">
                     <div style="margin: 0; display: inline-block;">
-                        <label for="selectImageProvider">Provider:</label>
+                        <label for="selectImageProvider">Source:</label>
                     </div>
                     <div style="margin: 0; display: inline-block;">
                         <select id="selectImageProvider" name="selectImageProvider" data-mini="true" data-inline="true">
@@ -113,7 +113,7 @@
                         </select>
                     </div>
                     <div style="margin: 0; display: inline-block;">
-                        <label for="selectBrowsableImageType">Image type:</label>
+                        <label for="selectBrowsableImageType">Image:</label>
                     </div>
                     <div style="margin: 0; display: inline-block;">
                         <select id="selectBrowsableImageType" name="selectBrowsableImageType" data-mini="true" data-inline="true">
@@ -131,6 +131,10 @@
                         </select>
                     </div>
                     <div class="availableImagesPaging" style="margin: 0; display: inline-block;"></div>
+                    <div style="margin: 0; display: inline-block; vertical-align: middle; margin-left: 10px;">
+                        <label for="chkAllLanguages">All Languages</label>
+                        <input type="checkbox" id="chkAllLanguages" data-mini="true" />
+                    </div>
                 </div>
 
                 <div class="availableImagesList"></div>
diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html
index d5398685a..f4aa625a7 100644
--- a/dashboard-ui/edititemmetadata.html
+++ b/dashboard-ui/edititemmetadata.html
@@ -428,10 +428,6 @@
                         <div data-role="collapsible" data-mini="true" id="metadataSettingsCollapsible" style="display: none; margin-top: 1em;">
                             <h3>Metadata Settings</h3>
                             <div>
-                                <p>
-                                    <label for="enableInternetProviders">Enable internet metadata providers for this item.</label>
-                                    <input data-mini="true" type="checkbox" id="enableInternetProviders" onchange="EditItemMetadataPage.setProviderSettingsContainerVisibility(this)" />
-                                </p>
                                 <div data-role="fieldcontain">
                                     <label for="selectLanguage">Preferred language: </label>
                                     <select id="selectLanguage" data-mini="true"></select>
@@ -443,8 +439,12 @@
                                     <select id="selectCountry" data-mini="true"></select>
                                 </div>
                                 <div class="fieldDescription editorfieldDescription">Leave empty to inherit settings from a parent item, or the global default value.</div>
-                                <br />
 
+                                <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)" />
+                                </p>
                                 <div id="providerSettingsContainer" style="display: none">
                                 </div>
                             </div>
diff --git a/dashboard-ui/scripts/edititemimages.js b/dashboard-ui/scripts/edititemimages.js
index cfaf490b6..ed1cca916 100644
--- a/dashboard-ui/scripts/edititemimages.js
+++ b/dashboard-ui/scripts/edititemimages.js
@@ -7,6 +7,7 @@
     var browsableImageStartIndex = 0;
     var browsableImageType = 'Primary';
     var selectedProvider;
+    var allLanguages = false;
 
     function updateTabs(page, item) {
 
@@ -56,6 +57,7 @@
         options.type = browsableImageType;
         options.startIndex = browsableImageStartIndex;
         options.limit = browsableImagePageSize;
+        options.IncludeAllLanguages = allLanguages;
 
         var provider = selectedProvider || '';
 
@@ -574,6 +576,14 @@
             reloadBrowsableImages(page);
         });
 
+        $('#chkAllLanguages', page).on('change', function () {
+
+            browsableImageStartIndex = 0;
+            allLanguages = this.checked;
+
+            reloadBrowsableImages(page);
+        });
+
     }).on('pagebeforeshow', "#editItemImagesPage", function () {
 
         var page = this;
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index cd143dcd5..b7866c3f5 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -864,7 +864,7 @@
         populateListView($('#listKeywords', page), item.Keywords);
 
         var enableInternetProviders = (item.EnableInternetProviders || false);
-        $("#enableInternetProviders", page).attr('checked', enableInternetProviders).checkboxradio('refresh');
+        $("#enableInternetProviders", page).attr('checked', !enableInternetProviders).checkboxradio('refresh');
         if (enableInternetProviders) {
             $('#providerSettingsContainer', page).show();
         } else {
@@ -1301,7 +1301,7 @@
         };
 
         self.setProviderSettingsContainerVisibility = function (source) {
-            if ($(source).prop('checked')) {
+            if (!$(source).prop('checked')) {
                 $('#providerSettingsContainer').show();
             } else {
                 $('#providerSettingsContainer').hide();