diff --git a/src/addplugin.html b/src/addplugin.html
index 309f0f96c4..83640033bb 100644
--- a/src/addplugin.html
+++ b/src/addplugin.html
@@ -1,10 +1,7 @@
 <div id="addPluginPage" data-role="page" class="page type-interior pluginConfigurationPage" data-backbutton="true">
-
     <div>
         <div class="content-primary">
-
             <div class="readOnlyContent">
-
                 <div class="verticalSection">
                     <div class="sectionTitleContainer flex align-items-center">
                         <h1 class="sectionTitle pluginName"></h1>
@@ -13,9 +10,7 @@
 
                     <p id="tagline" style="font-style: italic;"></p>
                     <p id="pPreviewImage"></p>
-
                     <p id="overview"></p>
-
                 </div>
 
                 <div class="verticalSection">
@@ -27,12 +22,12 @@
                             <select id="selectVersion" name="selectVersion" is="emby-select" label="${LabelSelectVersionToInstall}"></select>
                         </div>
 
-                        <p id="btnInstallDiv" class="hide">
+                        <div id="btnInstallDiv" class="hide">
                             <button is="emby-button" type="submit" id="btnInstall" class="raised button-submit block">
                                 <span>${Install}</span>
                             </button>
                             <div class="fieldDescription">${ServerRestartNeededAfterPluginInstall}</div>
-                        </p>
+                        </div>
                         <p id="nonServerMsg"></p>
                     </form>
                 </div>
diff --git a/src/apikeys.html b/src/apikeys.html
index 43cfae5b13..47f032c1f4 100644
--- a/src/apikeys.html
+++ b/src/apikeys.html
@@ -2,9 +2,7 @@
     <div>
         <div class="content-primary">
             <div class="detailSectionHeader">
-                <h2 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
-                    ${HeaderApiKeys}
-                </h2>
+                <h2 style="margin:.6em 0;vertical-align:middle;display:inline-block;">${HeaderApiKeys}</h2>
                 <button is="emby-button" type="button" class="fab btnNewKey submit" style="margin-left:1em;" title="${ButtonAdd}">
                     <i class="md-icon">add</i>
                 </button>
@@ -24,4 +22,4 @@
             </table>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/controllers/addserver.js b/src/controllers/auth/addserver.js
similarity index 100%
rename from src/controllers/addserver.js
rename to src/controllers/auth/addserver.js
diff --git a/src/controllers/forgotpassword.js b/src/controllers/auth/forgotpassword.js
similarity index 100%
rename from src/controllers/forgotpassword.js
rename to src/controllers/auth/forgotpassword.js
diff --git a/src/controllers/forgotpasswordpin.js b/src/controllers/auth/forgotpasswordpin.js
similarity index 100%
rename from src/controllers/forgotpasswordpin.js
rename to src/controllers/auth/forgotpasswordpin.js
diff --git a/src/controllers/loginpage.js b/src/controllers/auth/login.js
similarity index 100%
rename from src/controllers/loginpage.js
rename to src/controllers/auth/login.js
diff --git a/src/controllers/selectserver.js b/src/controllers/auth/selectserver.js
similarity index 100%
rename from src/controllers/selectserver.js
rename to src/controllers/auth/selectserver.js
diff --git a/src/controllers/dashboardpage.js b/src/controllers/dashboard/dashboard.js
similarity index 100%
rename from src/controllers/dashboardpage.js
rename to src/controllers/dashboard/dashboard.js
diff --git a/src/controllers/dashboardgeneral.js b/src/controllers/dashboard/general.js
similarity index 100%
rename from src/controllers/dashboardgeneral.js
rename to src/controllers/dashboard/general.js
diff --git a/src/controllers/logpage.js b/src/controllers/dashboard/logs.js
similarity index 100%
rename from src/controllers/logpage.js
rename to src/controllers/dashboard/logs.js
diff --git a/src/controllers/networking.js b/src/controllers/dashboard/networking.js
similarity index 100%
rename from src/controllers/networking.js
rename to src/controllers/dashboard/networking.js
diff --git a/src/controllers/notificationsetting.js b/src/controllers/dashboard/notifications/notification.js
similarity index 100%
rename from src/controllers/notificationsetting.js
rename to src/controllers/dashboard/notifications/notification.js
diff --git a/src/controllers/notificationsettings.js b/src/controllers/dashboard/notifications/notifications.js
similarity index 100%
rename from src/controllers/notificationsettings.js
rename to src/controllers/dashboard/notifications/notifications.js
diff --git a/src/controllers/addpluginpage.js b/src/controllers/dashboard/plugins/add.js
similarity index 100%
rename from src/controllers/addpluginpage.js
rename to src/controllers/dashboard/plugins/add.js
diff --git a/src/controllers/availableplugins.js b/src/controllers/dashboard/plugins/available.js
similarity index 100%
rename from src/controllers/availableplugins.js
rename to src/controllers/dashboard/plugins/available.js
diff --git a/src/controllers/installedplugins.js b/src/controllers/dashboard/plugins/installed.js
similarity index 100%
rename from src/controllers/installedplugins.js
rename to src/controllers/dashboard/plugins/installed.js
diff --git a/src/controllers/scheduledtaskpage.js b/src/controllers/dashboard/scheduledtasks/scheduledtask.js
similarity index 100%
rename from src/controllers/scheduledtaskpage.js
rename to src/controllers/dashboard/scheduledtasks/scheduledtask.js
diff --git a/src/controllers/scheduledtaskspage.js b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js
similarity index 100%
rename from src/controllers/scheduledtaskspage.js
rename to src/controllers/dashboard/scheduledtasks/scheduledtasks.js
diff --git a/src/controllers/nowplayingpage.js b/src/controllers/playback/nowplayingpage.js
similarity index 100%
rename from src/controllers/nowplayingpage.js
rename to src/controllers/playback/nowplayingpage.js
diff --git a/src/controllers/videoosd.js b/src/controllers/playback/videoosd.js
similarity index 100%
rename from src/controllers/videoosd.js
rename to src/controllers/playback/videoosd.js
diff --git a/src/controllers/wizardfinishpage.js b/src/controllers/wizard/finish.js
similarity index 100%
rename from src/controllers/wizardfinishpage.js
rename to src/controllers/wizard/finish.js
diff --git a/src/controllers/wizardremoteaccess.js b/src/controllers/wizard/remoteaccess.js
similarity index 100%
rename from src/controllers/wizardremoteaccess.js
rename to src/controllers/wizard/remoteaccess.js
diff --git a/src/controllers/wizardsettings.js b/src/controllers/wizard/settings.js
similarity index 100%
rename from src/controllers/wizardsettings.js
rename to src/controllers/wizard/settings.js
diff --git a/src/controllers/wizardstart.js b/src/controllers/wizard/start.js
similarity index 100%
rename from src/controllers/wizardstart.js
rename to src/controllers/wizard/start.js
diff --git a/src/controllers/wizarduserpage.js b/src/controllers/wizard/user.js
similarity index 100%
rename from src/controllers/wizarduserpage.js
rename to src/controllers/wizard/user.js
diff --git a/src/dashboard.html b/src/dashboard.html
index b724ebff46..dc9a56abbc 100644
--- a/src/dashboard.html
+++ b/src/dashboard.html
@@ -105,10 +105,8 @@
                             </div>
                         </div>
                     </div>
-
                 </div>
             </div>
-
         </div>
 
         <div class="dashboardFooter">
@@ -118,5 +116,4 @@
             </div>
         </div>
     </div>
-
 </div>
diff --git a/src/dashboardgeneral.html b/src/dashboardgeneral.html
index 91708f382a..6387128d5e 100644
--- a/src/dashboardgeneral.html
+++ b/src/dashboardgeneral.html
@@ -1,10 +1,7 @@
 <div id="dashboardGeneralPage" data-role="page" class="page type-interior dashboardHomePage">
-
     <div>
         <div class="content-primary">
-
             <form class="dashboardGeneralForm">
-
                 <div class="verticalSection">
                     <div class="sectionTitleContainer flex align-items-center">
                         <h2 class="sectionTitle">${TabSettings}</h2>
@@ -31,9 +28,7 @@
                             <input is="emby-checkbox" type="checkbox" id="chkAutoRunWebApp" />
                             <span>${LaunchWebAppOnStartup}</span>
                         </label>
-                        <div class="fieldDescription checkboxFieldDescription">
-                            ${LaunchWebAppOnStartupHelp}
-                        </div>
+                        <div class="fieldDescription checkboxFieldDescription">${LaunchWebAppOnStartupHelp}</div>
                     </div>
                 </div>
 
@@ -94,7 +89,6 @@
                     </button>
                 </div>
             </form>
-
         </div>
     </div>
 </div>
diff --git a/src/device.html b/src/device.html
index b63d298ca6..11fc9671b1 100644
--- a/src/device.html
+++ b/src/device.html
@@ -1,11 +1,7 @@
 <div id="devicePage" data-role="page" class="page type-interior devicesPage noSecondaryNavPage">
-
     <div>
         <div class="content-primary">
-
-
             <form class="deviceForm">
-
                 <div class="verticalSection verticalSection-extrabottompadding">
                     <div class="sectionTitleContainer flex align-items-center">
                         <h2 class="sectionTitle reportedName"></h2>
@@ -18,10 +14,11 @@
                     </div>
                 </div>
                 <div>
-                    <button is="emby-button" type="submit" class="raised button-submit block"><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block">
+                        <span>${ButtonSave}</span>
+                    </button>
                 </div>
             </form>
-
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/devices.html b/src/devices.html
index b05f10fa19..4e6552f05e 100644
--- a/src/devices.html
+++ b/src/devices.html
@@ -7,9 +7,7 @@
                     <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://docs.jellyfin.org/general/server/devices.html">${Help}</a>
                 </div>
             </div>
-
-            <div is="emby-itemscontainer" class="devicesList vertical-wrap" data-multiselect="false">
-            </div>
+            <div is="emby-itemscontainer" class="devicesList vertical-wrap" data-multiselect="false"></div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/encodingsettings.html b/src/encodingsettings.html
index da7f6c9c6c..3d67544c0b 100644
--- a/src/encodingsettings.html
+++ b/src/encodingsettings.html
@@ -22,6 +22,7 @@
                     </select>
                     <div class="fieldDescription">${LabelHardwareAccelerationTypeHelp}</div>
                 </div>
+
                 <div class="inputContainer hide fldVaapiDevice">
                     <input is="emby-input" type="text" id="txtVaapiDevice" label="${LabelVaapiDevice}" />
                     <div class="fieldDescription">${LabelVaapiDeviceHelp}</div>
@@ -142,9 +143,11 @@
                 </div>
 
                 <div>
-                    <button is="emby-button" type="submit" class="raised button-submit block"><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block">
+                        <span>${ButtonSave}</span>
+                    </button>
                 </div>
             </form>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/forgotpassword.html b/src/forgotpassword.html
index aac53ed296..d4ed0d4170 100644
--- a/src/forgotpassword.html
+++ b/src/forgotpassword.html
@@ -1,9 +1,6 @@
 <div data-role="page" id="forgotPasswordPage" class="page standalonePage forgotPasswordPage">
-
     <div>
-
         <form class="forgotPasswordForm" style="text-align: center; margin: 0 auto;">
-
             <div style="text-align: left;">
                 <h1>${HeaderForgotPassword}</h1>
 
@@ -23,6 +20,5 @@
                 </div>
             </div>
         </form>
-
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/forgotpasswordpin.html b/src/forgotpasswordpin.html
index 0eb8b8a1a5..3b1ba0d37b 100644
--- a/src/forgotpasswordpin.html
+++ b/src/forgotpasswordpin.html
@@ -1,9 +1,6 @@
 <div data-role="page" class="page standalonePage forgotPasswordPinPage">
-
     <div>
-
         <form class="forgotPasswordPinForm" style="text-align: center; margin: 0 auto;">
-
             <div style="text-align: left;">
                 <h2>${HeaderPasswordReset}</h2>
 
@@ -22,6 +19,5 @@
                 </div>
             </div>
         </form>
-
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/librarydisplay.html b/src/librarydisplay.html
index b5510ddb14..25dce48223 100644
--- a/src/librarydisplay.html
+++ b/src/librarydisplay.html
@@ -47,11 +47,11 @@
                     <div class="fieldDescription checkboxFieldDescription">${OptionSaveMetadataAsHiddenHelp}</div>
                 </div>
 
-                <br />
+                <br/>
                 <button is="emby-button" type="submit" class="raised button-submit block">
                     <span>${ButtonSave}</span>
                 </button>
             </form>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/login.html b/src/login.html
index 629f434313..21c9d8a347 100644
--- a/src/login.html
+++ b/src/login.html
@@ -1,11 +1,7 @@
 <div id="loginPage" data-role="page" class="page standalonePage" data-backbutton="false">
-
     <div class="padded-left padded-right padded-bottom-page">
-
         <form class="manualLoginForm hide" style="margin: 0 auto;">
-
             <h1 style="margin-top:1em;text-align: left;">${HeaderPleaseSignIn}</h1>
-
             <div style="height:0; overflow: hidden;">
                 <input type="text" name="fakeusernameremembered" tabindex="-1" />
                 <input type="password" name="fakepasswordremembered" tabindex="-1" />
@@ -27,13 +23,14 @@
             <button is="emby-button" type="submit" class="raised button-submit block">
                 <span>${ButtonSignIn}</span>
             </button>
+
             <div style="margin-top:.5em;">
                 <button is="emby-button" type="button" class="raised cancel block btnCancel">
                     <span>${ButtonCancel}</span>
                 </button>
             </div>
-            <br />
-            <br />
+            <br/>
+            <br/>
         </form>
 
         <div class="visualLoginForm" style="text-align: center;">
@@ -56,6 +53,5 @@
 
             <p class="disclaimer" style="text-align: center; margin-top: 2em;"></p>
         </div>
-
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/manifest.json b/src/manifest.json
index a87b086dac..fed1177e24 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,5 +1,4 @@
 {
-
     "name": "Jellyfin",
     "description": "Jellyfin: the Free Software Media System.",
     "lang": "en-US",
@@ -8,7 +7,8 @@
     "theme_color": "#101010",
     "background_color": "#101010",
     "display": "standalone",
-    "icons": [{
+    "icons": [
+        {
             "sizes": "72x72",
             "src": "touchicon72.png",
             "type": "image/png"
diff --git a/src/scheduledtask.html b/src/scheduledtask.html
index ee2a2c3420..8ecaf04dbe 100644
--- a/src/scheduledtask.html
+++ b/src/scheduledtask.html
@@ -1,7 +1,6 @@
 <div id="scheduledTaskPage" data-role="page" class="page type-interior scheduledTasksConfigurationPage">
     <div>
         <div class="content-primary">
-
             <div class="verticalSection">
                 <div class="sectionTitleContainer flex align-items-center">
                     <h2 class="sectionTitle taskName"></h2>
@@ -12,9 +11,7 @@
 
             <div class="readOnlyContent">
                 <div>
-                    <h2 style="vertical-align: middle; display: inline-block;">
-                        ${HeaderTaskTriggers}
-                    </h2>
+                    <h2 style="vertical-align: middle; display: inline-block;">${HeaderTaskTriggers}</h2>
                     <button is="emby-button" type="button" class="fab fab-mini btnAddTrigger submit" style="margin-left: 1em;" title="${ButtonAddScheduledTaskTrigger}">
                         <i class="md-icon">add</i>
                     </button>
diff --git a/src/scheduledtasks.html b/src/scheduledtasks.html
index ce4405bab0..cbff6bcd9d 100644
--- a/src/scheduledtasks.html
+++ b/src/scheduledtasks.html
@@ -1,5 +1,4 @@
 <div id="scheduledTasksPage" data-role="page" class="page type-interior scheduledTasksConfigurationPage">
-
     <style>
         .taskProgressOuter {
             height: 6px;
@@ -15,8 +14,7 @@
     </style>
     <div>
         <div class="content-primary">
-
             <div class="divScheduledTasks readOnlyContent"></div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/scripts/routes.js b/src/scripts/routes.js
index a72e7e0566..a3427c6551 100644
--- a/src/scripts/routes.js
+++ b/src/scripts/routes.js
@@ -16,44 +16,72 @@ define([
 
     function defineRoute(newRoute) {
         var path = newRoute.path;
-        console.log("Defining route: " + path);
+        console.log("defining route: " + path);
         newRoute.dictionary = "core";
         Emby.Page.addRoute(path, newRoute);
     }
 
-    console.log("Defining core routes");
+    console.log("defining core routes");
 
     defineRoute({
         path: "/addplugin.html",
         autoFocus: false,
         roles: "admin",
-        controller: "addpluginpage"
+        controller: "dashboard/plugins/add"
     });
     defineRoute({
-        path: "/autoorganizelog.html",
-        roles: "admin"
-    });
-    defineRoute({
-        path: "/channelsettings.html",
+        path: "/mypreferencesmenu.html",
         autoFocus: false,
-        roles: "admin"
+        transition: "fade",
+        controller: "user/menu"
+    });
+    defineRoute({
+        path: "/myprofile.html",
+        autoFocus: false,
+        transition: "fade",
+        controller: "user/profile"
     });
     defineRoute({
         path: "/addserver.html",
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: "addserver"
+        controller: "auth/addserver"
     });
+    defineRoute({
+        path: "/mypreferencesdisplay.html",
+        autoFocus: false,
+        transition: "fade",
+        controller: "user/display"
+    });
+    defineRoute({
+        path: "/mypreferenceshome.html",
+        autoFocus: false,
+        transition: "fade",
+        controller: "user/home"
+    });
+    defineRoute({
+        path: "/mypreferencesplayback.html",
+        autoFocus: false,
+        transition: "fade",
+        controller: "user/playback"
+    });
+    defineRoute({
+        path: "/mypreferencessubtitles.html",
+        autoFocus: false,
+        transition: "fade",
+        controller: "user/subtitles"
+    });
+
     defineRoute({
         path: "/dashboard.html",
         autoFocus: false,
         roles: "admin",
-        controller: "dashboardpage"
+        controller: "dashboard/dashboard"
     });
     defineRoute({
         path: "/dashboardgeneral.html",
-        controller: "dashboardgeneral",
+        controller: "dashboard/general",
         autoFocus: false,
         roles: "admin"
     });
@@ -61,7 +89,7 @@ define([
         path: "/networking.html",
         autoFocus: false,
         roles: "admin",
-        controller: "networking"
+        controller: "dashboard/networking"
     });
     defineRoute({
         path: "/devices.html",
@@ -108,14 +136,14 @@ define([
         path: "/forgotpassword.html",
         anonymous: true,
         startup: true,
-        controller: "forgotpassword"
+        controller: "auth/forgotpassword"
     });
     defineRoute({
         path: "/forgotpasswordpin.html",
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: "forgotpasswordpin"
+        controller: "auth/forgotpasswordpin"
     });
     defineRoute({
         path: "/home.html",
@@ -191,19 +219,14 @@ define([
     defineRoute({
         path: "/log.html",
         roles: "admin",
-        controller: "logpage"
+        controller: "dashboard/logs"
     });
     defineRoute({
         path: "/login.html",
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: "loginpage"
-    });
-    defineRoute({
-        path: "/metadataadvanced.html",
-        autoFocus: false,
-        roles: "admin"
+        controller: "auth/login"
     });
     defineRoute({
         path: "/metadataimages.html",
@@ -229,57 +252,21 @@ define([
         autoFocus: false,
         transition: "fade"
     });
-    defineRoute({
-        path: "/mypreferencesmenu.html",
-        autoFocus: false,
-        transition: "fade",
-        controller: "user/menu"
-    });
-    defineRoute({
-        path: "/myprofile.html",
-        autoFocus: false,
-        transition: "fade",
-        controller: "user/profile"
-    });
-    defineRoute({
-        path: "/mypreferencesdisplay.html",
-        autoFocus: false,
-        transition: "fade",
-        controller: "user/display"
-    });
-    defineRoute({
-        path: "/mypreferenceshome.html",
-        autoFocus: false,
-        transition: "fade",
-        controller: "user/home"
-    });
-    defineRoute({
-        path: "/mypreferencesplayback.html",
-        autoFocus: false,
-        transition: "fade",
-        controller: "user/playback"
-    });
-    defineRoute({
-        path: "/mypreferencessubtitles.html",
-        autoFocus: false,
-        transition: "fade",
-        controller: "user/subtitles"
-    });
     defineRoute({
         path: "/notificationsetting.html",
         autoFocus: false,
         roles: "admin",
-        controller: "notificationsetting"
+        controller: "dashboard/notifications/notification"
     });
     defineRoute({
         path: "/notificationsettings.html",
-        controller: "notificationsettings",
+        controller: "dashboard/notifications/notifications",
         autoFocus: false,
         roles: "admin"
     });
     defineRoute({
         path: "/nowplaying.html",
-        controller: "nowplayingpage",
+        controller: "playback/nowplaying",
         autoFocus: false,
         transition: "fade",
         fullscreen: true,
@@ -296,25 +283,25 @@ define([
         path: "/availableplugins.html",
         autoFocus: false,
         roles: "admin",
-        controller: "availableplugins"
+        controller: "dashboard/plugins/available"
     });
     defineRoute({
         path: "/installedplugins.html",
         autoFocus: false,
         roles: "admin",
-        controller: "installedplugins"
+        controller: "dashboard/plugins/installed"
     });
     defineRoute({
         path: "/scheduledtask.html",
         autoFocus: false,
         roles: "admin",
-        controller: "scheduledtaskpage"
+        controller: "dashboard/scheduledtasks/scheduledtask"
     });
     defineRoute({
         path: "/scheduledtasks.html",
         autoFocus: false,
         roles: "admin",
-        controller: "scheduledtaskspage"
+        controller: "dashboard/scheduledtasks/scheduledtasks"
     });
     defineRoute({
         path: "/search.html",
@@ -325,7 +312,7 @@ define([
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: "selectserver"
+        controller: "auth/selectserver"
     });
     defineRoute({
         path: "/serveractivity.html",
@@ -345,11 +332,6 @@ define([
         roles: "admin",
         controller: "streamingsettings"
     });
-    defineRoute({
-        path: "/support.html",
-        autoFocus: false,
-        roles: "admin"
-    });
     defineRoute({
         path: "/tv.html",
         autoFocus: false,
@@ -391,17 +373,18 @@ define([
         roles: "admin",
         controller: "userprofilespage"
     });
+
     defineRoute({
         path: "/wizardremoteaccess.html",
         autoFocus: false,
         anonymous: true,
-        controller: "wizardremoteaccess"
+        controller: "wizard/remoteaccess"
     });
     defineRoute({
         path: "/wizardfinish.html",
         autoFocus: false,
         anonymous: true,
-        controller: "wizardfinishpage"
+        controller: "wizard/finish"
     });
     defineRoute({
         path: "/wizardlibrary.html",
@@ -413,24 +396,25 @@ define([
         path: "/wizardsettings.html",
         autoFocus: false,
         anonymous: true,
-        controller: "wizardsettings"
+        controller: "wizard/settings"
     });
     defineRoute({
         path: "/wizardstart.html",
         autoFocus: false,
         anonymous: true,
-        controller: "wizardstart"
+        controller: "wizard/start"
     });
     defineRoute({
         path: "/wizarduser.html",
-        controller: "wizarduserpage",
+        controller: "wizard/user",
         autoFocus: false,
         anonymous: true
     });
+
     defineRoute({
         path: "/videoosd.html",
         transition: "fade",
-        controller: "videoosd",
+        controller: "playback/videoosd",
         autoFocus: false,
         type: "video-osd",
         supportsThemeMedia: true,
@@ -444,6 +428,7 @@ define([
         enableContentQueryString: true,
         roles: "admin"
     });
+
     defineRoute({
         path: "/",
         isDefaultRoute: true,
diff --git a/src/serveractivity.html b/src/serveractivity.html
index e2e1795691..29cacd300e 100644
--- a/src/serveractivity.html
+++ b/src/serveractivity.html
@@ -2,13 +2,11 @@
     <div>
         <div class="content-primary">
             <div class="verticalSection">
-                <h2 class="sectionTitle">
-                </h2>
+                <h2 class="sectionTitle"></h2>
             </div>
             <div class="readOnlyContent">
-                <div class="paperList activityItems" data-activitylimit="100">
-                </div>
+                <div class="paperList activityItems" data-activitylimit="100"></div>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/videoosd.html b/src/videoosd.html
index e4089468b8..4d18787a5d 100644
--- a/src/videoosd.html
+++ b/src/videoosd.html
@@ -1,27 +1,19 @@
 <div id="videoOsdPage" data-role="page" class="page libraryPage" data-backbutton="true">
-    <div class="pageContainer flex">
-
-    </div>
-    <div class="upNextContainer hide">
-    </div>
-
+    <div class="pageContainer flex"></div>
+    <div class="upNextContainer hide"></div>
     <div class="videoOsdBottom videoOsdBottom-maincontrols">
-
-        <div class="osdPoster">
-
-        </div>
+        <div class="osdPoster"></div>
         <div class="osdControls">
-
             <div class="osdTextContainer osdMainTextContainer">
                 <h3 class="osdTitle"></h3>
                 <div class="osdMediaInfo"></div>
                 <div class="osdMediaStatus hide">
-                    <i class="md-icon animate">autorenew</i> <span>${FetchingData}</span>
+                    <i class="md-icon animate">autorenew</i>
+                    <span>${FetchingData}</span>
                 </div>
             </div>
 
-            <div class="osdTextContainer osdSecondaryMediaInfo">
-            </div>
+            <div class="osdTextContainer osdSecondaryMediaInfo"></div>
 
             <div class="flex flex-direction-row align-items-center">
                 <div class="osdTextContainer startTimeText" style="margin: 0 .25em 0 0;"></div>
@@ -76,7 +68,11 @@
                     <i class="xlargePaperIconButton md-icon">airplay</i>
                 </button>
 
-                <div class="osdTimeText"><span class="osdPositionText"></span><span class="osdDurationText"></span><span class="endsAtText"></span></div>
+                <div class="osdTimeText">
+                    <span class="osdPositionText"></span>
+                    <span class="osdDurationText"></span>
+                    <span class="endsAtText"></span>
+                </div>
 
                 <div class="volumeButtons hide-mouse-idle-tv">
                     <button is="paper-icon-button-light" class="buttonMute autoSize" title="${Mute} (m)">