diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.js b/dashboard-ui/components/metadataeditor/metadataeditor.js
index 9329a2df9f..c661b036f3 100644
--- a/dashboard-ui/components/metadataeditor/metadataeditor.js
+++ b/dashboard-ui/components/metadataeditor/metadataeditor.js
@@ -757,34 +757,36 @@
         var lastType = '';
         var html = '';
 
-        var elem = $('#peopleList', context);
+        var elem = context.querySelector('#peopleList');
 
         for (var i = 0, length = people.length; i < length; i++) {
 
             var person = people[i];
 
-            var type = person.Type || Globalize.translate('PersonTypePerson');
+            html += '<paper-icon-item>';
 
-            if (type != lastType) {
-                html += '<li data-role="list-divider">' + type + '</li>';
-                lastType = type;
-            }
+            html += '<paper-fab class="btnEditPerson" data-index="' + i + '" mini style="background-color:#444;" icon="person" item-icon></paper-fab>';
 
-            html += '<li><a class="btnEditPerson" href="#" data-index="' + i + '">';
+            html += '<paper-item-body>';
+            html += '<a class="btnEditPerson clearLink" href="#" data-index="' + i + '">';
 
-            html += '<h3>' + (person.Name || '') + '</h3>';
+            html += '<div class="textValue">';
+            html += (person.Name || '');
+            html += '</div>';
 
             if (person.Role && person.Role != lastType) {
-                html += '<p>' + (person.Role) + '</p>';
+                html += '<div secondary>' + (person.Role) + '</div>';
             }
+
             html += '</a>';
+            html += '</paper-item-body>';
 
-            html += '<a class="btnDeletePerson" href="#" data-icon="delete" data-index="' + i + '">' + Globalize.translate('Delete') + '</a>';
+            html += '<paper-icon-button icon="delete" data-index="' + i + '" class="btnDeletePerson"></paper-icon-button>';
 
-            html += '</li>';
+            html += '</paper-icon-item>';
         }
 
-        //elem.html(html);
+        elem.innerHTML = html;
 
         $('.btnDeletePerson', elem).on('click', function () {
 
diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.template.html b/dashboard-ui/components/metadataeditor/metadataeditor.template.html
index 073feaa129..55cc0c02f0 100644
--- a/dashboard-ui/components/metadataeditor/metadataeditor.template.html
+++ b/dashboard-ui/components/metadataeditor/metadataeditor.template.html
@@ -1,5 +1,5 @@
 <div class="dialogHeader">
-    <paper-icon-button icon="close" class="btnCancel"></paper-icon-button>
+    <paper-icon-button icon="close" class="btnCancel" tabindex="-1"></paper-icon-button>
     <div class="dialogHeaderTitle">
         ${ButtonEdit}
     </div>
@@ -236,8 +236,7 @@
                 <iron-icon icon="add"></iron-icon>
                 <span>${ButtonAdd}</span>
             </paper-button>
-            <div>
-                <ul data-role="listview" data-inset="true" data-split-icon="delete" id="peopleList"></ul>
+            <div id="peopleList" class="paperList">
             </div>
         </div>
         <div id="keywordsCollapsible" class="editableListviewContainer" style="display: none; margin-top: 3em;">
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index d0cbfbc862..4fc088b099 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -902,12 +902,12 @@
 
         editMetadata: function (itemId) {
 
-           Dashboard.navigate('edititemmetadata.html?id=' + itemId);
+            //Dashboard.navigate('edititemmetadata.html?id=' + itemId);
 
-            //require(['components/metadataeditor/metadataeditor'], function (metadataeditor) {
+            require(['components/metadataeditor/metadataeditor'], function (metadataeditor) {
 
-            //    metadataeditor.show(itemId);
-            //});
+                metadataeditor.show(itemId);
+            });
         },
 
         showMoreCommands: function (positionTo, itemId, commands) {