diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.js b/dashboard-ui/components/metadataeditor/metadataeditor.js
index 898c333c7..9a248d202 100644
--- a/dashboard-ui/components/metadataeditor/metadataeditor.js
+++ b/dashboard-ui/components/metadataeditor/metadataeditor.js
@@ -1056,7 +1056,7 @@
                     var template = this.response;
                     var dlg = paperDialogHelper.createDialog({
                         removeOnClose: true,
-                        size: 'small'
+                        size: 'medium'
                     });
 
                     dlg.classList.add('ui-body-b');
diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.template.html b/dashboard-ui/components/metadataeditor/metadataeditor.template.html
index 1dc2c6844..5084a1fba 100644
--- a/dashboard-ui/components/metadataeditor/metadataeditor.template.html
+++ b/dashboard-ui/components/metadataeditor/metadataeditor.template.html
@@ -9,7 +9,7 @@
     </paper-button>
 </div>
 
-<form class="editItemMetadataForm editMetadataForm ">
+<form class="editItemMetadataForm editMetadataForm" style="margin:0;">
     <div class="metadataFormFields">
 
         <div style="padding: 0 0 10px;">
diff --git a/dashboard-ui/components/metadataeditor/personeditor.js b/dashboard-ui/components/metadataeditor/personeditor.js
index e33e75673..6e20fa420 100644
--- a/dashboard-ui/components/metadataeditor/personeditor.js
+++ b/dashboard-ui/components/metadataeditor/personeditor.js
@@ -12,7 +12,7 @@
                     var template = this.response;
                     var dlg = paperDialogHelper.createDialog({
                         removeOnClose: true,
-                        size: 'small'
+                        size: 'medium'
                     });
 
                     dlg.classList.add('ui-body-b');
@@ -28,9 +28,9 @@
                     dlg.innerHTML = html;
                     document.body.appendChild(dlg);
 
-                    $('#txtPersonName', dlg).val(person.Name || '');
-                    $('#selectPersonType', dlg).val(person.Type || '');
-                    $('#txtPersonRole', dlg).val(person.Role || '');
+                    $('.txtPersonName', dlg).val(person.Name || '');
+                    $('.selectPersonType', dlg).val(person.Type || '');
+                    $('.txtPersonRole', dlg).val(person.Role || '');
 
                     paperDialogHelper.open(dlg);
 
@@ -52,9 +52,9 @@
 
                         submitted = true;
 
-                        person.Name = $('#txtPersonName', dlg).val();
-                        person.Type = $('#selectPersonType', dlg).val();
-                        person.Role = $('#txtPersonRole', dlg).val() || null;
+                        person.Name = $('.txtPersonName', dlg).val();
+                        person.Type = $('.selectPersonType', dlg).val();
+                        person.Role = $('.txtPersonRole', dlg).val() || null;
 
                         paperDialogHelper.close(dlg);
 
diff --git a/dashboard-ui/components/metadataeditor/personeditor.template.html b/dashboard-ui/components/metadataeditor/personeditor.template.html
index 7fe50e5a4..cf8fb5d60 100644
--- a/dashboard-ui/components/metadataeditor/personeditor.template.html
+++ b/dashboard-ui/components/metadataeditor/personeditor.template.html
@@ -8,13 +8,13 @@
 <form class="popupEditPersonForm" style="max-width: none;margin:0;">
 
     <div>
-        <paper-input type="text" id="txtPersonName" required="required" label="${LabelName}"></paper-input>
+        <paper-input type="text" class="txtPersonName" required="required" label="${LabelName}"></paper-input>
     </div>
 
     <br />
     <div>
         <label for="selectPersonType" class="selectLabel">${LabelType}</label>
-        <select id="selectPersonType" data-mini="true">
+        <select id="selectPersonType" class="selectPersonType" data-mini="true">
             <option value=""></option>
             <option value="Actor">${OptionActor}</option>
             <option value="Composer">${OptionComposer}</option>
@@ -25,7 +25,7 @@
         </select>
     </div>
     <div>
-        <paper-input type="text" id="txtPersonRole" label="${LabelPersonRole}"></paper-input>
+        <paper-input type="text" class="txtPersonRole" label="${LabelPersonRole}"></paper-input>
         <div class="fieldDescription">${LabelPersonRoleHelp}</div>
     </div>
     <br />
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index 4f9c547e2..5fef25d81 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -792,6 +792,21 @@
         }
     }
 
+    pageClassOn('pageinit', 'page', function () {
+
+        var page = this;
+
+        var isLibraryPage = page.classList.contains('libraryPage');
+
+        if (isLibraryPage) {
+
+            var navs = page.querySelectorAll('.libraryViewNav');
+            for (var i = 0, length = navs.length; i < length; i++) {
+                initHeadRoom(navs[i]);
+            }
+        }
+    });
+
     pageClassOn('pagebeforeshow', 'page', function () {
 
         var page = this;
@@ -823,11 +838,6 @@
             document.body.classList.add('libraryDocument');
             document.body.classList.remove('dashboardDocument');
             document.body.classList.remove('hideMainDrawer');
-
-            var navs = page.querySelectorAll('.libraryViewNav');
-            for (var i = 0, length = navs.length; i < length; i++) {
-                initHeadRoom(navs[i]);
-            }
         }
         else if (page.classList.contains('type-interior')) {
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index eaaaab12e..28cb97ebe 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1640,7 +1640,7 @@ var AppInfo = {};
     function initializeApiClient(apiClient) {
 
         if (AppInfo.enableAppStorePolicy) {
-            apiClient.getAvailablePlugins = function() {
+            apiClient.getAvailablePlugins = function () {
                 return Promise.resolve([]);
             };
             apiClient.getInstalledPlugins = function () {