diff --git a/src/components/dialog/dialog.template.html b/src/components/dialog/dialog.template.html
index bee0ef7f73..6d4310c0f4 100644
--- a/src/components/dialog/dialog.template.html
+++ b/src/components/dialog/dialog.template.html
@@ -4,12 +4,8 @@
 
 <div class="formDialogContent smoothScrollY">
     <div class="dialogContentInner dialog-content-centered" style="padding-top:1em;padding-bottom: 1em; text-align: center;">
-
-        <div class="text">
-
-        </div>
+        <div class="text"></div>
     </div>
 </div>
 
-<div class="formDialogFooter formDialogFooter-clear formDialogFooter-flex" style="padding-bottom: 1.5em;">
-</div>
+<div class="formDialogFooter formDialogFooter-clear formDialogFooter-flex" style="margin:1em"></div>
diff --git a/src/components/formdialog.css b/src/components/formdialog.css
index 94695f4865..d7cb162e8c 100644
--- a/src/components/formdialog.css
+++ b/src/components/formdialog.css
@@ -55,7 +55,7 @@
     /* Without this emby-checkbox is able to appear on top */
     z-index: 1;
     align-items: flex-end;
-    justify-content: flex-end;
+    justify-content: center;
     flex-wrap: wrap;
 }
 
diff --git a/src/components/metadataEditor/personEditor.template.html b/src/components/metadataEditor/personEditor.template.html
index 40b29767fa..d2ad6a78d2 100644
--- a/src/components/metadataEditor/personEditor.template.html
+++ b/src/components/metadataEditor/personEditor.template.html
@@ -7,7 +7,6 @@
 
 <div class="formDialogContent smoothScrollY" style="padding-top:2em;">
     <form class="popupEditPersonForm dialogContentInner dialog-content-centered">
-
         <div class="inputContainer">
             <input type="text" is="emby-input" class="txtPersonName" required="required" label="${LabelName}" />
         </div>
@@ -23,6 +22,7 @@
                 <option value="Writer">${Writer}</option>
             </select>
         </div>
+
         <div class="inputContainer fldRole hide">
             <input is="emby-input" type="text" class="txtPersonRole" label="${LabelPersonRole}" />
             <div class="fieldDescription">${LabelPersonRoleHelp}</div>
@@ -33,6 +33,5 @@
                 <span>${Save}</span>
             </button>
         </div>
-
     </form>
 </div>
diff --git a/src/components/prompt/prompt.template.html b/src/components/prompt/prompt.template.html
index 981fa9f102..a07629ae7e 100644
--- a/src/components/prompt/prompt.template.html
+++ b/src/components/prompt/prompt.template.html
@@ -2,12 +2,12 @@
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
         <span class="material-icons arrow_back"></span>
     </button>
+
     <h3 class="formDialogHeaderTitle"></h3>
 </div>
 
 <div class="formDialogContent smoothScrollY">
     <div class="dialogContentInner dialog-content-centered" style="padding-top:2em;">
-
         <form>
             <div class="inputContainer">
                 <input is="emby-input" type="text" id="txtInput" label="" />
@@ -19,7 +19,6 @@
                     <span class="submitText"></span>
                 </button>
             </div>
-
         </form>
     </div>
 </div>
diff --git a/src/controllers/dashboard/plugins/installed.js b/src/controllers/dashboard/plugins/installed.js
index f03312b422..eb521c2fd6 100644
--- a/src/controllers/dashboard/plugins/installed.js
+++ b/src/controllers/dashboard/plugins/installed.js
@@ -41,7 +41,7 @@ define(['loading', 'libraryMenu', 'dom', 'globalize', 'cardStyle', 'emby-button'
         html += '<div class="cardBox visualCardBox">';
         html += '<div class="cardScalable">';
         html += '<div class="cardPadder cardPadder-backdrop"></div>';
-        html += configPageUrl ? '<a class="cardContent cardImageContainer" is="emby-linkbutton" href="' + configPageUrl + '">' : '<div class="cardContent noConfigPluginCard noHoverEffect cardImageContainer">';
+        html += configPageUrl ? '<a class="cardContent cardImageContainer" is="emby-linkbutton" href="' + configPageUrl + '">' : '<div class="cardContent noConfigPluginCard noHoverEffect cardImageContainer emby-button">';
         html += '<span class="cardImageIcon material-icons folder"></span>';
         html += configPageUrl ? '</a>' : '</div>';
         html += '</div>';
diff --git a/src/controllers/dashboard/plugins/repositories.js b/src/controllers/dashboard/plugins/repositories.js
index cfb71284b6..3b87dc17ce 100644
--- a/src/controllers/dashboard/plugins/repositories.js
+++ b/src/controllers/dashboard/plugins/repositories.js
@@ -12,6 +12,17 @@ let repositories = [];
 
 function reloadList(page) {
     loading.show();
+
+    if (repositories.length) {
+        populateList({
+            listElement: page.querySelector('#repositories'),
+            noneElement: page.querySelector('#none'),
+            repositories: repositories
+        });
+
+        return;
+    }
+
     ApiClient.getJSON(ApiClient.getUrl('Repositories')).then(list => {
         repositories = list;
         populateList({
@@ -20,6 +31,7 @@ function reloadList(page) {
             repositories: repositories
         });
     }).catch(error => {
+        console.error('error loading repositories');
         page.querySelector('#none').classList.remove('hide');
         loading.hide();
     });
@@ -33,6 +45,7 @@ function saveList() {
         data: JSON.stringify(repositories),
         contentType: 'application/json'
     }).catch(error => {
+        console.error('error saving repositories');
         loading.hide();
     });
 }
@@ -58,11 +71,12 @@ function getRepositoryHtml(repository) {
     var html = '';
 
     html += '<div class="listItem listItem-border">';
+    html += `<a is="emby-linkbutton" style="margin:0;padding:0" class="clearLink listItemIconContainer" href="${repository.Url}">`;
+    html += '<span class="material-icons listItemIcon open_in_new"></span>';
+    html += '</a>';
     html += '<div class="listItemBody two-line">';
-    html += `<a is="emby-linkbutton" class="clearLink" style="margin:0;padding:0;display:block;text-align:left" href="${repository.Url}" target="_blank">`;
     html += `<h3 class='listItemBodyText'>${repository.Name}</h3>`;
     html += `<div class="listItemBodyText secondary">${repository.Url}</div>`;
-    html += '</a>';
     html += '</div>';
     html += `<button type="button" is="paper-icon-button-light" id="${repository.Url}" class="btnDelete" title="${globalize.translate('ButtonDelete')}"><span class="material-icons delete"></span></button>`;
     html += '</div>';
@@ -90,7 +104,11 @@ export default function(view, params) {
 
         var save = this;
         $('#repositories', view).on('click', '.btnDelete', function() {
-            repositories = repositories.splice(repositories.indexOf(this.id), 1);
+            var button = this;
+            repositories = repositories.filter(function (r) {
+                return r.Url !== button.id;
+            });
+
             saveList();
             reloadList(save);
         });
@@ -138,6 +156,7 @@ export default function(view, params) {
             saveList();
             reloadList(view);
             dialogHelper.close(dialog);
+            return false;
         });
 
         dialogHelper.open(dialog);
diff --git a/src/repositories.html b/src/repositories.html
index e119e753dc..ff3406fb95 100644
--- a/src/repositories.html
+++ b/src/repositories.html
@@ -12,7 +12,7 @@
 
             <div id="none" class="noItemsMessage centerMessage hide">
                 <h1>${MessageNoRepositories}</h1>
-                <p>${MessagePleaseEnsureInternetMetadata}</p>
+                <p>${MessageAddRepository}</p>
             </div>
         </div>
     </div>
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 0a6fc9aa9e..06f66051dc 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1029,6 +1029,7 @@
     "LabelRepositoryUrlHelp": "The location of the repository manifest you want to include.",
     "LabelRepositoryName": "Repository Name",
     "LabelRepositoryNameHelp": "A custom name to distinguish this repository from any others added to your server.",
+    "MessageAddRepository": "If you wish to add a repository, click the button next to the header and fill out the requested information.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, and Albums. Click the + button to start creating collections.",
     "MessageNoGenresAvailable": "Enable some metadata providers to pull genres from the internet.",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",