diff --git a/.gitignore b/.gitignore
index 36b843f02..98aa2d974 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,9 @@ dist
 web
 node_modules
 
+# config
+config.json
+
 # ide
 .idea
 .vscode
diff --git a/package.json b/package.json
index f1cb13f3c..1af5d483b 100644
--- a/package.json
+++ b/package.json
@@ -245,7 +245,7 @@
           "src/controllers/dashboard/plugins/installed/index.js",
           "src/controllers/dashboard/plugins/available/index.js",
           "src/controllers/dashboard/plugins/repositories/index.js",
-          "src/controllers/dashboard/quickconnect.js",
+          "src/controllers/dashboard/quickConnect.js",
           "src/controllers/dashboard/scheduledtasks/scheduledtask.js",
           "src/controllers/dashboard/scheduledtasks/scheduledtasks.js",
           "src/controllers/dashboard/serveractivity.js",
diff --git a/src/config.json b/src/config.json
deleted file mode 120000
index f1bd2db71..000000000
--- a/src/config.json
+++ /dev/null
@@ -1 +0,0 @@
-config.template.json
\ No newline at end of file
diff --git a/src/config.json b/src/config.json
new file mode 100644
index 000000000..864e1f365
--- /dev/null
+++ b/src/config.json
@@ -0,0 +1,39 @@
+{
+  "multiserver": false,
+  "themes": [
+    {
+      "name": "Apple TV",
+      "id": "appletv"
+    }, {
+      "name": "Blue Radiance",
+      "id": "blueradiance"
+    }, {
+      "name": "Dark",
+      "id": "dark",
+      "default": true
+    }, {
+      "name": "Light",
+      "id": "light"
+    }, {
+      "name": "Purple Haze",
+      "id": "purplehaze"
+    }, {
+      "name": "WMC",
+      "id": "wmc"
+    }
+  ],
+  "plugins": [
+    "plugins/playAccessValidation/plugin",
+    "plugins/experimentalWarnings/plugin",
+    "plugins/htmlAudioPlayer/plugin",
+    "plugins/htmlVideoPlayer/plugin",
+    "plugins/photoPlayer/plugin",
+    "plugins/comicsPlayer/plugin",
+    "plugins/bookPlayer/plugin",
+    "plugins/youtubePlayer/plugin",
+    "plugins/backdropScreensaver/plugin",
+    "plugins/logoScreensaver/plugin",
+    "plugins/sessionPlayer/plugin",
+    "plugins/chromecastPlayer/plugin"
+  ]
+}
diff --git a/src/config.template.json b/src/config.template.json
deleted file mode 100644
index 0f308ccc1..000000000
--- a/src/config.template.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "multiserver": false,
-    "themes": [
-        {
-            "name": "Apple TV",
-            "id": "appletv"
-        }, {
-            "name": "Blue Radiance",
-            "id": "blueradiance"
-        }, {
-            "name": "Dark",
-            "id": "dark",
-            "default": true
-        }, {
-            "name": "Light",
-            "id": "light"
-        }, {
-            "name": "Purple Haze",
-            "id": "purplehaze"
-        }, {
-            "name": "WMC",
-            "id": "wmc"
-        }
-    ],
-    "plugins": [
-        "plugins/playAccessValidation/plugin",
-        "plugins/experimentalWarnings/plugin",
-        "plugins/htmlAudioPlayer/plugin",
-        "plugins/htmlVideoPlayer/plugin",
-        "plugins/photoPlayer/plugin",
-        "plugins/comicsPlayer/plugin",
-        "plugins/bookPlayer/plugin",
-        "plugins/youtubePlayer/plugin",
-        "plugins/backdropScreensaver/plugin",
-        "plugins/logoScreensaver/plugin",
-        "plugins/sessionPlayer/plugin",
-        "plugins/chromecastPlayer/plugin"
-    ]
-}
diff --git a/src/controllers/dashboard/dashboard.html b/src/controllers/dashboard/dashboard.html
index ec0d60a74..83d30495e 100644
--- a/src/controllers/dashboard/dashboard.html
+++ b/src/controllers/dashboard/dashboard.html
@@ -16,6 +16,9 @@
                     </div>
 
                     <div style="margin-top:1em;">
+                        <button is="emby-button" type="button" class="raised btnRefresh">
+                            <span>${ButtonScanAllLibraries}</span>
+                        </button>
                         <button is="emby-button" type="button" id="btnRestartServer" class="raised" onclick="DashboardPage.restart(this);" style="margin-left:0;">
                             <span>${Restart}</span>
                         </button>
diff --git a/src/controllers/dashboard/dashboard.js b/src/controllers/dashboard/dashboard.js
index fc7c178ee..855ce3ff0 100644
--- a/src/controllers/dashboard/dashboard.js
+++ b/src/controllers/dashboard/dashboard.js
@@ -3,6 +3,7 @@ import events from 'events';
 import itemHelper from 'itemHelper';
 import serverNotifications from 'serverNotifications';
 import dom from 'dom';
+import taskButton from 'scripts/taskbutton';
 import globalize from 'globalize';
 import * as datefns from 'date-fns';
 import dfnshelper from 'dfnshelper';
@@ -550,13 +551,13 @@ import 'emby-itemscontainer';
                 row.classList.remove('playingSession');
             }
 
-            if (session.ServerId && session.SupportedCommands.indexOf('DisplayMessage') !== -1 && session.DeviceId !== window.connectionManager.deviceId()) {
+            if (session.ServerId && session.SupportedCommands.indexOf('DisplayMessage') !== -1) {
                 row.querySelector('.btnSessionSendMessage').classList.remove('hide');
             } else {
                 row.querySelector('.btnSessionSendMessage').classList.add('hide');
             }
 
-            if (session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons && session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons.length) {
+            if (session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons && session.TranscodingInfo) {
                 row.querySelector('.btnSessionInfo').classList.remove('hide');
             } else {
                 row.querySelector('.btnSessionInfo').classList.add('hide');
@@ -564,7 +565,7 @@ import 'emby-itemscontainer';
 
             const btnSessionPlayPause = row.querySelector('.btnSessionPlayPause');
 
-            if (session.ServerId && nowPlayingItem && session.SupportsRemoteControl && session.DeviceId !== window.connectionManager.deviceId()) {
+            if (session.ServerId && nowPlayingItem && session.SupportsRemoteControl) {
                 btnSessionPlayPause.classList.remove('hide');
                 row.querySelector('.btnSessionStop').classList.remove('hide');
             } else {
@@ -827,9 +828,17 @@ import 'emby-itemscontainer';
                 refreshActiveRecordings(view, apiClient);
                 loading.hide();
             }
+
+            taskButton({
+                mode: 'on',
+                taskKey: 'RefreshLibrary',
+                button: page.querySelector('.btnRefresh')
+            });
         });
         view.addEventListener('viewbeforehide', function () {
             const apiClient = ApiClient;
+            const page = this;
+
             events.off(serverNotifications, 'RestartRequired', onRestartRequired);
             events.off(serverNotifications, 'ServerShuttingDown', onServerShuttingDown);
             events.off(serverNotifications, 'ServerRestarting', onServerRestarting);
@@ -841,6 +850,12 @@ import 'emby-itemscontainer';
             if (apiClient) {
                 DashboardPage.stopInterval(apiClient);
             }
+
+            taskButton({
+                mode: 'off',
+                taskKey: 'RefreshLibrary',
+                button: page.querySelector('.btnRefresh')
+            });
         });
         view.addEventListener('viewdestroy', function () {
             const page = this;
diff --git a/src/quickconnect.html b/src/controllers/dashboard/quickConnect.html
similarity index 100%
rename from src/quickconnect.html
rename to src/controllers/dashboard/quickConnect.html
diff --git a/src/controllers/dashboard/quickconnect.js b/src/controllers/dashboard/quickConnect.js
similarity index 100%
rename from src/controllers/dashboard/quickconnect.js
rename to src/controllers/dashboard/quickConnect.js
diff --git a/src/scripts/routes.js b/src/scripts/routes.js
index 565110265..ebe6f3cf5 100644
--- a/src/scripts/routes.js
+++ b/src/scripts/routes.js
@@ -159,10 +159,11 @@ import 'detailtablecss';
     });
 
     defineRoute({
-        path: '/quickconnect.html',
+        alias: '/quickConnect.html',
+        path: '/controllers/dashboard/quickConnect.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/quickconnect'
+        controller: 'dashboard/quickConnect'
     });
 
     defineRoute({
diff --git a/src/scripts/settings/userSettings.js b/src/scripts/settings/userSettings.js
index 1235e0fa5..263d74ed3 100644
--- a/src/scripts/settings/userSettings.js
+++ b/src/scripts/settings/userSettings.js
@@ -209,7 +209,7 @@ export class UserSettings {
         }
 
         val = this.get('enableBackdrops', false);
-        return val !== 'false';
+        return val === 'true';
     }
 
     /**
diff --git a/src/scripts/taskbutton.js b/src/scripts/taskbutton.js
index 163bcb5a1..43a46301a 100644
--- a/src/scripts/taskbutton.js
+++ b/src/scripts/taskbutton.js
@@ -13,7 +13,7 @@ export default function (options) {
 
     function updateTasks(tasks) {
         const task = tasks.filter(function (t) {
-            return t.ScheduledTask.Key == options.taskKey;
+            return t.Key == options.taskKey;
         })[0];
 
         if (options.panel) {
diff --git a/src/strings/.en-us.json.swp b/src/strings/.en-us.json.swp
deleted file mode 100644
index bbb5d9ab1..000000000
Binary files a/src/strings/.en-us.json.swp and /dev/null differ