diff --git a/dashboard-ui/css/images/editor/lock.png b/dashboard-ui/css/images/editor/lock.png
new file mode 100644
index 000000000..51169e503
Binary files /dev/null and b/dashboard-ui/css/images/editor/lock.png differ
diff --git a/dashboard-ui/css/metadataeditor.css b/dashboard-ui/css/metadataeditor.css
index d4aa5faa6..90f9277cb 100644
--- a/dashboard-ui/css/metadataeditor.css
+++ b/dashboard-ui/css/metadataeditor.css
@@ -14,6 +14,18 @@
     display: none;
 }
 
+.offlineEditorNode {
+    color: #cc3333;
+}
+
+.editorNode img {
+    height: 18px;
+    margin: 0 .35em;
+    vertical-align: middle;
+    position: relative;
+    top: -2px;
+}
+
 @media all and (min-width: 600px) {
 
     .editPageSidebar {
diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html
index 345bc543f..18c6bd102 100644
--- a/dashboard-ui/edititemmetadata.html
+++ b/dashboard-ui/edititemmetadata.html
@@ -260,7 +260,7 @@
                                 </div>
                             </div>
                         </div>
-                        <ul data-role="listview" class="ulForm">
+                        <ul id="ulSave" data-role="listview" class="ulForm" style="display: none;">
                             <li>
                                 <button type="submit" data-theme="b" data-icon="ok">
                                     Save
diff --git a/dashboard-ui/edititempeople.html b/dashboard-ui/edititempeople.html
index 75fba4b81..14aea7764 100644
--- a/dashboard-ui/edititempeople.html
+++ b/dashboard-ui/edititempeople.html
@@ -20,7 +20,9 @@
                     <a href="#" data-role="button" class="ui-btn-active">People</a>
                     <a href="#" data-role="button" id="btnEditImages">Images</a>
                 </div>
-                <button type="button" data-icon="plus" data-inline="true" onclick="EditItemPeoplePage.addPerson();">Add Person</button>
+                <div id="divAddPerson" style="display: none;">
+                    <button type="button" data-icon="plus" data-inline="true" onclick="EditItemPeoplePage.addPerson();">Add Person</button>
+                </div>
                 <div class="itemsContainer" id="peopleContainer" style="text-align: left;"></div>
             </div>
         </div>
diff --git a/dashboard-ui/scripts/Itemdetailpage.js b/dashboard-ui/scripts/Itemdetailpage.js
index 72f1296a5..a5d9d55df 100644
--- a/dashboard-ui/scripts/Itemdetailpage.js
+++ b/dashboard-ui/scripts/Itemdetailpage.js
@@ -38,7 +38,7 @@
 
             Dashboard.getCurrentUser().done(function (user) {
 
-                if (user.Configuration.IsAdministrator && item.LocationType !== "Offline") {
+                if (user.Configuration.IsAdministrator) {
                     $('#editButtonContainer', page).show();
                 } else {
                     $('#editButtonContainer', page).hide();
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index 022412ef9..f78de4d15 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -9,9 +9,26 @@
         if (item.IndexNumber != null && item.Type != "Season") {
             name = item.IndexNumber + " - " + name;
         }
+
+        var cssClass = "editorNode";
+
+        if (item.LocationType == "Offline") {
+            cssClass += " offlineEditorNode";
+        }
+
+        var htmlName = "<div class='" + cssClass + "'>";
+
+        if (item.DontFetchMeta) {
+            htmlName += '<img src="css/images/editor/lock.png" />';
+        }
+
+        htmlName += name;
+
+        htmlName += "</div>";
+
         var rel = item.IsFolder ? 'folder' : 'default';
 
-        return { attr: { id: item.Id, rel: rel, itemtype: item.Type }, data: name, state: state };
+        return { attr: { id: item.Id, rel: rel, itemtype: item.Type }, data: htmlName, state: state };
     }
 
     function loadNode(page, node, openItems, selectedId, callback) {
@@ -88,7 +105,7 @@
 
             },
 
-            core: { initially_open: [], load_open: true },
+            core: { initially_open: [], load_open: true, html_titles: true },
             ui: { initially_select: [] },
 
             themes: {
@@ -293,12 +310,18 @@
 
         MetadataEditor.getItemPromise().done(function (item) {
 
+            if (item.LocationType == "Offline") {
+                $('#ulSave', page).hide();
+            } else {
+                $('#ulSave', page).show();
+            }
+
             $('#btnRefresh', page).button('enable');
 
             $('#refreshLoading', page).hide();
 
             currentItem = item;
-            
+
             if (item.IsFolder) {
                 $('#fldRecursive', page).css("display", "inline-block")
             } else {
diff --git a/dashboard-ui/scripts/edititempeople.js b/dashboard-ui/scripts/edititempeople.js
index c8bacfd18..a0f3ca737 100644
--- a/dashboard-ui/scripts/edititempeople.js
+++ b/dashboard-ui/scripts/edititempeople.js
@@ -17,6 +17,12 @@
         MetadataEditor.getItemPromise().done(function (item) {
 
             $('#btnRefresh', page).button('enable');
+            
+            if (item.LocationType == "Offline") {
+                $('#divAddPerson', page).hide();
+            } else {
+                $('#divAddPerson', page).show();
+            }
 
             $('#refreshLoading', page).hide();
 
@@ -25,22 +31,22 @@
             LibraryBrowser.renderName(item, $('.itemName', page), true);
             updateTabs(page, item);
 
-            fillPeopleContainer(item.People, $('#peopleContainer', page));
+            fillPeopleContainer(item, item.People, $('#peopleContainer', page));
             Dashboard.hideLoadingMsg();
         });
     }
 
-    function fillPeopleContainer(people, container) {
+    function fillPeopleContainer(item, people, container) {
         people = people || new Array();
         var html = '';
         for (var i = 0; i < people.length; i++) {
-            html += constructPerson(people[i]);
+            html += constructPerson(item, people[i]);
         }
 
         container.html(html).trigger('create');
     }
 
-    function constructPerson(person) {
+    function constructPerson(item, person) {
         var html = '<div class="tileItem posterTileItem">';
         var imgUrl;
         var name = person.Name || "";
@@ -85,9 +91,14 @@
         html += '</span>';
         html += '</div>';
         html += '<p>';
-        html += '<span class="read">';
-        html += '<button type="button" class="edit" data-mini="true" data-inline="true"  onclick="EditItemPeoplePage.displayEdit(this)">Edit</button>';
-        html += '</span><span style="display:none;" class="edit">';
+        
+        if (item.LocationType !== "Offline") {
+            html += '<span class="read">';
+            html += '<button type="button" class="edit" data-mini="true" data-inline="true"  onclick="EditItemPeoplePage.displayEdit(this)">Edit</button>';
+            html += '</span>';
+        }
+        
+        html += '<span style="display:none;" class="edit">';
         html += '<button type="button" data-mini="true" data-inline="true" onclick="EditItemPeoplePage.hideEdit(this)">Cancel</button>';
         html += '<button type="button" data-icon="check" data-mini="true" data-inline="true" data-theme="b" onclick="EditItemPeoplePage.savePerson(this)">Save</button>';
         html += '<button type="button" data-icon="delete" data-mini="true" data-inline="true" onclick="EditItemPeoplePage.removePerson(this)">Delete</button>';