diff --git a/src/scripts/routes.js b/src/scripts/routes.js
index 0e4544bb6f..9f3c794863 100644
--- a/src/scripts/routes.js
+++ b/src/scripts/routes.js
@@ -23,113 +23,12 @@ define([
 
     console.log("defining core routes");
 
-    // authentication
     defineRoute({
-        path: "/selectserver.html",
+        path: "/addplugin.html",
         autoFocus: false,
-        anonymous: true,
-        startup: true,
-        controller: "auth/selectserver"
+        roles: "admin",
+        controller: "dashboard/plugins/add"
     });
-    defineRoute({
-        path: "/addserver.html",
-        autoFocus: false,
-        anonymous: true,
-        startup: true,
-        controller: "auth/addserver"
-    });
-    defineRoute({
-        path: "/login.html",
-        autoFocus: false,
-        anonymous: true,
-        startup: true,
-        controller: "auth/login"
-    });
-    defineRoute({
-        path: "/forgotpassword.html",
-        anonymous: true,
-        startup: true,
-        controller: "auth/forgotpassword"
-    });
-    defineRoute({
-        path: "/forgotpasswordpin.html",
-        autoFocus: false,
-        anonymous: true,
-        startup: true,
-        controller: "auth/forgotpasswordpin"
-    });
-
-    // playback
-    defineRoute({
-        path: "/nowplaying.html",
-        controller: "playback/nowplaying",
-        autoFocus: false,
-        transition: "fade",
-        fullscreen: true,
-        supportsThemeMedia: true,
-        enableMediaControl: false
-    });
-    defineRoute({
-        path: "/videoosd.html",
-        transition: "fade",
-        controller: "playback/videoosd",
-        autoFocus: false,
-        type: "video-osd",
-        supportsThemeMedia: true,
-        fullscreen: true,
-        enableMediaControl: false
-    });
-
-    // media
-    defineRoute({
-        path: "/home.html",
-        autoFocus: false,
-        controller: "home",
-        transition: "fade",
-        type: "home"
-    });
-    defineRoute({
-        path: "/list.html",
-        autoFocus: false,
-        controller: "list",
-        transition: "fade"
-    });
-    defineRoute({
-        path: "/search.html",
-        controller: "searchpage"
-    });
-    defineRoute({
-        path: "/itemdetails.html",
-        controller: "itemdetailpage",
-        autoFocus: false,
-        transition: "fade"
-    });
-    defineRoute({
-        path: "/livetv.html",
-        controller: "livetv/livetvsuggested",
-        autoFocus: false,
-        transition: "fade"
-    });
-    defineRoute({
-        path: "/movies.html",
-        autoFocus: false,
-        controller: "movies/moviesrecommended",
-        transition: "fade"
-    });
-    defineRoute({
-        path: "/music.html",
-        controller: "music/musicrecommended",
-        autoFocus: false,
-        transition: "fade"
-    });
-    defineRoute({
-        path: "/tv.html",
-        autoFocus: false,
-        controller: "shows/tvrecommended",
-        transition: "fade"
-    });
-
-    // user
     defineRoute({
         path: "/mypreferencesmenu.html",
         autoFocus: false,
@@ -142,6 +41,13 @@ define([
         transition: "fade",
         controller: "user/profile"
     });
+    defineRoute({
+        path: "/addserver.html",
+        autoFocus: false,
+        anonymous: true,
+        startup: true,
+        controller: "auth/addserver"
+    });
     defineRoute({
         path: "/mypreferencesdisplay.html",
         autoFocus: false,
@@ -167,7 +73,6 @@ define([
         controller: "user/subtitles"
     });
 
-    // dashboard
     defineRoute({
         path: "/dashboard.html",
         autoFocus: false,
@@ -227,6 +132,43 @@ define([
         roles: "admin",
         controller: "encodingsettings"
     });
+    defineRoute({
+        path: "/forgotpassword.html",
+        anonymous: true,
+        startup: true,
+        controller: "auth/forgotpassword"
+    });
+    defineRoute({
+        path: "/forgotpasswordpin.html",
+        autoFocus: false,
+        anonymous: true,
+        startup: true,
+        controller: "auth/forgotpasswordpin"
+    });
+    defineRoute({
+        path: "/home.html",
+        autoFocus: false,
+        controller: "home",
+        transition: "fade",
+        type: "home"
+    });
+    defineRoute({
+        path: "/list.html",
+        autoFocus: false,
+        controller: "list",
+        transition: "fade"
+    });
+    defineRoute({
+        path: "/index.html",
+        autoFocus: false,
+        isDefaultRoute: true
+    });
+    defineRoute({
+        path: "/itemdetails.html",
+        controller: "itemdetailpage",
+        autoFocus: false,
+        transition: "fade"
+    });
     defineRoute({
         path: "/library.html",
         autoFocus: false,
@@ -245,6 +187,12 @@ define([
         roles: "admin",
         controller: "librarysettings"
     });
+    defineRoute({
+        path: "/livetv.html",
+        controller: "livetv/livetvsuggested",
+        autoFocus: false,
+        transition: "fade"
+    });
     defineRoute({
         path: "/livetvguideprovider.html",
         autoFocus: false,
@@ -273,6 +221,13 @@ define([
         roles: "admin",
         controller: "dashboard/logs"
     });
+    defineRoute({
+        path: "/login.html",
+        autoFocus: false,
+        anonymous: true,
+        startup: true,
+        controller: "auth/login"
+    });
     defineRoute({
         path: "/metadataimages.html",
         autoFocus: false,
@@ -285,6 +240,18 @@ define([
         roles: "admin",
         controller: "metadatanfo"
     });
+    defineRoute({
+        path: "/movies.html",
+        autoFocus: false,
+        controller: "movies/moviesrecommended",
+        transition: "fade"
+    });
+    defineRoute({
+        path: "/music.html",
+        controller: "music/musicrecommended",
+        autoFocus: false,
+        transition: "fade"
+    });
     defineRoute({
         path: "/notificationsetting.html",
         autoFocus: false,
@@ -297,18 +264,21 @@ define([
         autoFocus: false,
         roles: "admin"
     });
+    defineRoute({
+        path: "/nowplaying.html",
+        controller: "playback/nowplaying",
+        autoFocus: false,
+        transition: "fade",
+        fullscreen: true,
+        supportsThemeMedia: true,
+        enableMediaControl: false
+    });
     defineRoute({
         path: "/playbackconfiguration.html",
         autoFocus: false,
         roles: "admin",
         controller: "playbackconfiguration"
     });
-    defineRoute({
-        path: "/addplugin.html",
-        autoFocus: false,
-        roles: "admin",
-        controller: "dashboard/plugins/add"
-    });
     defineRoute({
         path: "/availableplugins.html",
         autoFocus: false,
@@ -333,6 +303,17 @@ define([
         roles: "admin",
         controller: "dashboard/scheduledtasks/scheduledtasks"
     });
+    defineRoute({
+        path: "/search.html",
+        controller: "searchpage"
+    });
+    defineRoute({
+        path: "/selectserver.html",
+        autoFocus: false,
+        anonymous: true,
+        startup: true,
+        controller: "auth/selectserver"
+    });
     defineRoute({
         path: "/serveractivity.html",
         autoFocus: false,
@@ -351,6 +332,12 @@ define([
         roles: "admin",
         controller: "streamingsettings"
     });
+    defineRoute({
+        path: "/tv.html",
+        autoFocus: false,
+        controller: "shows/tvrecommended",
+        transition: "fade"
+    });
     defineRoute({
         path: "/useredit.html",
         autoFocus: false,
@@ -387,16 +374,6 @@ define([
         controller: "userprofilespage"
     });
 
-    // plugins
-    defineRoute({
-        path: "/configurationpage",
-        autoFocus: false,
-        enableCache: false,
-        enableContentQueryString: true,
-        roles: "admin"
-    });
-
-    // startup wizard
     defineRoute({
         path: "/wizardremoteaccess.html",
         autoFocus: false,
@@ -434,15 +411,27 @@ define([
         anonymous: true
     });
 
-    // root
+    defineRoute({
+        path: "/videoosd.html",
+        transition: "fade",
+        controller: "playback/videoosd",
+        autoFocus: false,
+        type: "video-osd",
+        supportsThemeMedia: true,
+        fullscreen: true,
+        enableMediaControl: false
+    });
+    defineRoute({
+        path: "/configurationpage",
+        autoFocus: false,
+        enableCache: false,
+        enableContentQueryString: true,
+        roles: "admin"
+    });
+
     defineRoute({
         path: "/",
         isDefaultRoute: true,
         autoFocus: false
     });
-    defineRoute({
-        path: "/index.html",
-        autoFocus: false,
-        isDefaultRoute: true
-    });
 });