diff --git a/dashboard-ui/appservices.html b/dashboard-ui/appservices.html
index b42fee4965..3f307cf8f4 100644
--- a/dashboard-ui/appservices.html
+++ b/dashboard-ui/appservices.html
@@ -4,7 +4,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="appServicesPage" data-role="page" class="page type-interior appServicesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync">
+    <div id="appServicesPage" data-role="page" class="page type-interior appServicesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync" data-require="scripts/appservices">
 
         <div data-role="content">
             <div class="content-primary">
diff --git a/dashboard-ui/css/mediaplayer.css b/dashboard-ui/css/mediaplayer.css
index a61ced8b57..70e0752513 100644
--- a/dashboard-ui/css/mediaplayer.css
+++ b/dashboard-ui/css/mediaplayer.css
@@ -157,7 +157,7 @@ input[type="range"]::-ms-fill-upper {
         margin-bottom: 0;
     }
 
-        .nowPlayingBar .mediaButton:not(.unpauseButton):not(.pauseButton):not(.remoteControlButton):not(.stopButton) {
+        .nowPlayingBar .mediaButton:not(.unpauseButton):not(.pauseButton):not(.remoteControlButton) {
             display: none;
         }
 
@@ -165,7 +165,7 @@ input[type="range"]::-ms-fill-upper {
         float: right;
     }
 
-    .nowPlayingBar .unpauseButton, .nowPlayingBar .pauseButton, .nowPlayingBar .stopButton {
+    .nowPlayingBar .unpauseButton, .nowPlayingBar .pauseButton {
         float: right;
     }
 
diff --git a/dashboard-ui/editcollectionitems.html b/dashboard-ui/editcollectionitems.html
index 6a27c76549..357bbf93bf 100644
--- a/dashboard-ui/editcollectionitems.html
+++ b/dashboard-ui/editcollectionitems.html
@@ -4,12 +4,11 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="editCollectionTitlesPage" data-role="page" class="page libraryPage metadataEditorPage" data-contextname="${HeaderMetadataManager}" data-require="scripts/editcollectionitems">
+    <div id="editCollectionTitlesPage" data-role="page" class="page libraryPage metadataEditorPage" data-contextname="${HeaderMetadataManager}" data-require="scripts/editorsidebar,scripts/editcollectionitems">
         <div data-role="content editPageContent">
             <div class="editPageSidebar">
                 <div class="libraryTree">
-                    <ul>
-                    </ul>
+                    <ul></ul>
                 </div>
             </div>
 
@@ -38,7 +37,8 @@
         <div data-role="popup" class="popupIdentify popup" data-theme="a">
 
             <div class="ui-bar-a" style="text-align: center; padding: 0 20px;">
-                <h3>${HeaderAddTitles}
+                <h3>
+                    ${HeaderAddTitles}
                 </h3>
             </div>
 
diff --git a/dashboard-ui/edititemimages.html b/dashboard-ui/edititemimages.html
index 588d26c3bc..0b79066bfa 100644
--- a/dashboard-ui/edititemimages.html
+++ b/dashboard-ui/edititemimages.html
@@ -4,7 +4,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="editItemImagesPage" data-role="page" class="page libraryPage metadataEditorPage" data-contextname="${HeaderMetadataManager}" data-require="scripts/edititemimages">
+    <div id="editItemImagesPage" data-role="page" class="page libraryPage metadataEditorPage" data-contextname="${HeaderMetadataManager}" data-require="scripts/editorsidebar,scripts/edititemimages">
         <div data-role="content editPageContent">
             <div class="editPageSidebar smoothScrollY">
                 <div class="libraryTree">
diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html
index 4ba32ec7ca..99b8a18273 100644
--- a/dashboard-ui/edititemmetadata.html
+++ b/dashboard-ui/edititemmetadata.html
@@ -4,7 +4,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="editItemMetadataPage" data-role="page" class="page libraryPage metadataEditorPage" data-contextname="${HeaderMetadataManager}">
+    <div id="editItemMetadataPage" data-role="page" class="page libraryPage metadataEditorPage" data-contextname="${HeaderMetadataManager}" data-require="scripts/editorsidebar,scripts/edititemmetadata">
         <div data-role="content editPageContent">
             <div class="editPageSidebar smoothScrollY">
                 <div class="libraryTree">
@@ -540,15 +540,6 @@
             </div>
 
         </div>
-
-        <script type="text/javascript">
-            $('.editItemMetadataForm').off('submit', EditItemMetadataPage.onSubmit).on('submit', EditItemMetadataPage.onSubmit);
-            $('.popupIdentifyForm').off('submit', EditItemMetadataPage.onIdentificationFormSubmitted).on('submit', EditItemMetadataPage.onIdentificationFormSubmitted);
-            $('.popupEditPersonForm').off('submit', EditItemMetadataPage.onPersonInfoFormSubmit).on('submit', EditItemMetadataPage.onPersonInfoFormSubmit);
-            $('.popupAdvancedRefreshForm').off('submit', EditItemMetadataPage.onRefreshFormSubmit).on('submit', EditItemMetadataPage.onRefreshFormSubmit);
-            $('.identifyOptionsForm').off('submit', EditItemMetadataPage.onIdentificationOptionsSubmit).on('submit', EditItemMetadataPage.onIdentificationOptionsSubmit);
-        </script>
-
     </div>
 </body>
 </html>
diff --git a/dashboard-ui/edititemsubtitles.html b/dashboard-ui/edititemsubtitles.html
index 8b941825d7..ed3e3e8250 100644
--- a/dashboard-ui/edititemsubtitles.html
+++ b/dashboard-ui/edititemsubtitles.html
@@ -4,7 +4,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="editItemSubtitlesPage" data-role="page" class="page libraryPage metadataEditorPage" data-contextname="${HeaderMetadataManager}" data-require="scripts/edititemsubtitles">
+    <div id="editItemSubtitlesPage" data-role="page" class="page libraryPage metadataEditorPage" data-contextname="${HeaderMetadataManager}" data-require="scripts/editorsidebar,scripts/edititemsubtitles">
         <div data-role="content editPageContent">
             <div class="editPageSidebar smoothScrollY">
                 <div class="libraryTree">
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index bb37cd8415..a1ece03db1 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -4,7 +4,7 @@
     <title></title>
 </head>
 <body>
-    <div id="itemDetailPage" data-role="page" class="page libraryPage itemDetailPage" data-theme="b">
+    <div id="itemDetailPage" data-role="page" class="page libraryPage itemDetailPage" data-theme="b" data-require="scripts/itemdetailpage">
 
         <div class="itemTabs homeTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
diff --git a/dashboard-ui/scripts/dlnaserversettings.js b/dashboard-ui/scripts/dlnaserversettings.js
index bd666c6504..5bd47993d6 100644
--- a/dashboard-ui/scripts/dlnaserversettings.js
+++ b/dashboard-ui/scripts/dlnaserversettings.js
@@ -39,7 +39,7 @@
         return false;
     }
 
-    $(document).on('pageinitpdepends', "#dlnaServerSettingsPage", function () {
+    $(document).on('pageinitdepends', "#dlnaServerSettingsPage", function () {
 
         $('.dlnaServerSettingsForm').off('submit', onSubmit).on('submit', onSubmit);
 
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index 0b77479c0e..592d62bda9 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -32,6 +32,7 @@
 
             if (item.Type == "UserRootFolder") {
                 $('.editPageInnerContent', page).hide();
+                Dashboard.hideLoadingMsg();
                 return;
             } else {
                 $('.editPageInnerContent', page).show();
@@ -1378,7 +1379,7 @@
         $(ApiClient).off("websocketmessage", onWebSocketMessageReceived);
     }
 
-    $(document).on('pageinit', "#editItemMetadataPage", function () {
+    $(document).on('pageinitdepends', "#editItemMetadataPage", function () {
 
         var page = this;
 
@@ -1437,7 +1438,13 @@
             editPerson(page, {});
         });
 
-    }).on('pagebeforeshow', "#editItemMetadataPage", function () {
+        $('.editItemMetadataForm').off('submit', EditItemMetadataPage.onSubmit).on('submit', EditItemMetadataPage.onSubmit);
+        $('.popupIdentifyForm').off('submit', EditItemMetadataPage.onIdentificationFormSubmitted).on('submit', EditItemMetadataPage.onIdentificationFormSubmitted);
+        $('.popupEditPersonForm').off('submit', EditItemMetadataPage.onPersonInfoFormSubmit).on('submit', EditItemMetadataPage.onPersonInfoFormSubmit);
+        $('.popupAdvancedRefreshForm').off('submit', EditItemMetadataPage.onRefreshFormSubmit).on('submit', EditItemMetadataPage.onRefreshFormSubmit);
+        $('.identifyOptionsForm').off('submit', EditItemMetadataPage.onIdentificationOptionsSubmit).on('submit', EditItemMetadataPage.onIdentificationOptionsSubmit);
+
+    }).on('pageshowready', "#editItemMetadataPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/edititemsubtitles.js b/dashboard-ui/scripts/edititemsubtitles.js
index 6ecdcd2a06..e1812d763c 100644
--- a/dashboard-ui/scripts/edititemsubtitles.js
+++ b/dashboard-ui/scripts/edititemsubtitles.js
@@ -326,7 +326,7 @@
 
         $('.subtitleSearchForm').off('submit', onSearchSubmit).on('submit', onSearchSubmit);
 
-    }).on('pagebeforeshowready', "#editItemSubtitlesPage", function () {
+    }).on('pageshowready', "#editItemSubtitlesPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index 7e75445162..a387e72541 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -1604,7 +1604,7 @@
         });
     }
 
-    $(document).on('pageinit', "#itemDetailPage", function () {
+    $(document).on('pageinitdepends', "#itemDetailPage", function () {
 
         var page = this;
 
@@ -1661,7 +1661,7 @@
 
         });
 
-    }).on('pageshow', "#itemDetailPage", function () {
+    }).on('pageshowready', "#itemDetailPage", function () {
 
         var page = this;
 
@@ -1720,5 +1720,4 @@
 
     window.ItemDetailPage = new itemDetailPage();
 
-
 })(jQuery, document, LibraryBrowser, window);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js
index a99f163c2e..b56de40193 100644
--- a/dashboard-ui/scripts/librarylist.js
+++ b/dashboard-ui/scripts/librarylist.js
@@ -128,7 +128,7 @@
             buttonCount++;
         }
 
-        html += '<button data-role="button" class="btnMoreCommands" data-mini="true" data-inline="true" data-icon="ellipsis-v" data-iconpos="notext" title="' + Globalize.translate('ButtonMore') + '" style="' + buttonMargin + '">' + Globalize.translate('ButtonMore') + '</button>';
+        html += '<button type="button" class="btnMoreCommands" data-mini="true" data-inline="true" data-icon="ellipsis-v" data-iconpos="notext" title="' + Globalize.translate('ButtonMore') + '" style="' + buttonMargin + '">' + Globalize.translate('ButtonMore') + '</button>';
         buttonCount++;
 
         html += '</div>';
diff --git a/dashboard-ui/scripts/useredit.js b/dashboard-ui/scripts/useredit.js
index 6978e3f397..44b8083a2e 100644
--- a/dashboard-ui/scripts/useredit.js
+++ b/dashboard-ui/scripts/useredit.js
@@ -52,6 +52,64 @@
         Dashboard.hideLoadingMsg();
     }
 
+    function updateUserInfo(user, newConnectUsername, actionCallback, noActionCallback) {
+        var currentConnectUsername = user.ConnectUserName || '';
+        var enteredConnectUsername = newConnectUsername;
+
+        var linkUrl = ApiClient.getUrl('Users/' + user.Id + '/Connect/Link');
+
+        if (currentConnectUsername && !enteredConnectUsername) {
+
+            // Remove connect info
+            // Add/Update connect info
+            ApiClient.ajax({
+
+                type: "DELETE",
+                url: linkUrl
+
+            }).done(function () {
+
+                Dashboard.alert({
+
+                    message: Globalize.translate('MessageEmbyAccontRemoved'),
+                    title: Globalize.translate('HeaderEmbyAccountRemoved'),
+
+                    callback: actionCallback
+
+                });
+            });
+
+        }
+        else if (currentConnectUsername != enteredConnectUsername) {
+
+            // Add/Update connect info
+            ApiClient.ajax({
+                type: "POST",
+                url: linkUrl,
+                data: {
+                    ConnectUsername: enteredConnectUsername
+                },
+                dataType: 'json'
+
+            }).done(function (result) {
+
+                var msgKey = result.IsPending ? 'MessagePendingEmbyAccountAdded' : 'MessageEmbyAccountAdded';
+
+                Dashboard.alert({
+                    message: Globalize.translate(msgKey),
+                    title: Globalize.translate('HeaderEmbyAccountAdded'),
+
+                    callback: actionCallback
+
+                });
+            });
+        } else {
+            if (noActionCallback) {
+                noActionCallback();
+            }
+        }
+    }
+
     function onSaveComplete(page, user) {
 
         Dashboard.hideLoadingMsg();
@@ -63,7 +121,7 @@
             Dashboard.alert(Globalize.translate('SettingsSaved'));
         } else {
 
-            ConnectHelper.updateUserInfo(user, $('#txtConnectUserName', page).val(), function () {
+            updateUserInfo(user, $('#txtConnectUserName', page).val(), function () {
 
                 loadData(page);
             });
@@ -103,23 +161,17 @@
         });
     }
 
-    function editUserPage() {
+    function onSubmit() {
+        var page = $(this).parents('.page');
 
-        var self = this;
+        Dashboard.showLoadingMsg();
 
-        self.onSubmit = function () {
+        getUser().done(function (result) {
+            saveUser(result, page);
+        });
 
-            var page = $(this).parents('.page');
-
-            Dashboard.showLoadingMsg();
-
-            getUser().done(function (result) {
-                saveUser(result, page);
-            });
-
-            // Disable default form submission
-            return false;
-        };
+        // Disable default form submission
+        return false;
     }
 
     function getUser() {
@@ -136,13 +188,14 @@
         getUser().done(function (user) {
 
             loadUser(page, user);
-
         });
     }
 
-    window.EditUserPage = new editUserPage();
+    $(document).on('pageinitdepends', "#editUserPage", function () {
 
-    $(document).on('pagebeforeshow', "#editUserPage", function () {
+        $('.editUserProfileForm').off('submit', onSubmit).on('submit', onSubmit);
+
+    }).on('pagebeforeshowready', "#editUserPage", function () {
 
         var page = this;
 
@@ -150,73 +203,4 @@
 
     });
 
-})(jQuery, window, document);
-
-(function () {
-
-    window.ConnectHelper = {
-
-        updateUserInfo: function (user, newConnectUsername, actionCallback, noActionCallback) {
-
-            var currentConnectUsername = user.ConnectUserName || '';
-            var enteredConnectUsername = newConnectUsername;
-
-            var linkUrl = ApiClient.getUrl('Users/' + user.Id + '/Connect/Link');
-
-            if (currentConnectUsername && !enteredConnectUsername) {
-
-                // Remove connect info
-                // Add/Update connect info
-                ApiClient.ajax({
-
-                    type: "DELETE",
-                    url: linkUrl
-
-                }).done(function () {
-
-                    Dashboard.alert({
-
-                        message: Globalize.translate('MessageEmbyAccontRemoved'),
-                        title: Globalize.translate('HeaderEmbyAccountRemoved'),
-
-                        callback: actionCallback
-
-                    });
-                });
-
-            }
-            else if (currentConnectUsername != enteredConnectUsername) {
-
-                // Add/Update connect info
-                ApiClient.ajax({
-                    type: "POST",
-                    url: linkUrl,
-                    data: {
-                        ConnectUsername: enteredConnectUsername
-                    },
-                    dataType: 'json'
-
-                }).done(function (result) {
-
-                    var msgKey = result.IsPending ? 'MessagePendingEmbyAccountAdded' : 'MessageEmbyAccountAdded';
-
-                    Dashboard.alert({
-                        message: Globalize.translate(msgKey),
-                        title: Globalize.translate('HeaderEmbyAccountAdded'),
-
-                        callback: actionCallback
-
-                    });
-                });
-            } else {
-                if (noActionCallback) {
-                    noActionCallback();
-                }
-            }
-
-        }
-
-    };
-
-
-})();
\ No newline at end of file
+})(jQuery, window, document);
\ No newline at end of file
diff --git a/dashboard-ui/thirdparty/cordova/android/appstorage.js b/dashboard-ui/thirdparty/cordova/android/appstorage.js
index 0f801bad12..d1064047ba 100644
--- a/dashboard-ui/thirdparty/cordova/android/appstorage.js
+++ b/dashboard-ui/thirdparty/cordova/android/appstorage.js
@@ -62,20 +62,6 @@
 
             AndroidSharedPreferences.remove(name);
         };
-
-        function migrateKey(key) {
-            var json = localStorage.getItem(key);
-            if (json) {
-                self.setItem(key, json);
-                localStorage.removeItem(key);
-            }
-        }
-
-        function migrate() {
-            migrateKey('servercredentials3');
-        }
-
-        migrate();
     }
 
     globalScope.appStorage = new preferencesStore();
diff --git a/dashboard-ui/thirdparty/cordova/chromecast.js b/dashboard-ui/thirdparty/cordova/chromecast.js
index e266e8bd20..89939ca5c1 100644
--- a/dashboard-ui/thirdparty/cordova/chromecast.js
+++ b/dashboard-ui/thirdparty/cordova/chromecast.js
@@ -302,7 +302,7 @@
 
         self.getTargets = function () {
 
-            return ConnectHelper.getDeviceList().filter(function (d) {
+            return ConnectSDKHelper.getDeviceList().filter(function (d) {
 
                 return isChromecast(d.getModelName()) || isChromecast(d.getFriendlyName());
 
@@ -590,7 +590,7 @@
 
             var deferred = $.Deferred();
 
-            var device = ConnectHelper.getDeviceList().filter(function (d) {
+            var device = ConnectSDKHelper.getDeviceList().filter(function (d) {
 
                 return d.getId() == target.id;
             })[0];
diff --git a/dashboard-ui/thirdparty/cordova/connectsdk.js b/dashboard-ui/thirdparty/cordova/connectsdk.js
index f787dc0a67..7b3a4416b5 100644
--- a/dashboard-ui/thirdparty/cordova/connectsdk.js
+++ b/dashboard-ui/thirdparty/cordova/connectsdk.js
@@ -26,7 +26,7 @@
         return ConnectSDK.discoveryManager.getDeviceList();
     }
 
-    window.ConnectHelper = {
+    window.ConnectSDKHelper = {
 
         getDeviceList: getDeviceList
     };
diff --git a/dashboard-ui/thirdparty/cordova/generaldevice.js b/dashboard-ui/thirdparty/cordova/generaldevice.js
index a3f286974b..83a0c93ee2 100644
--- a/dashboard-ui/thirdparty/cordova/generaldevice.js
+++ b/dashboard-ui/thirdparty/cordova/generaldevice.js
@@ -400,7 +400,7 @@
 
         self.getTargets = function () {
 
-            return ConnectHelper.getDeviceList().filter(function (d) {
+            return ConnectSDKHelper.getDeviceList().filter(function (d) {
 
                 return isValid(d);
 
@@ -504,7 +504,7 @@
 
             var deferred = $.Deferred();
 
-            var device = ConnectHelper.getDeviceList().filter(function (d) {
+            var device = ConnectSDKHelper.getDeviceList().filter(function (d) {
 
                 return d.getId() == target.id;
             })[0];
diff --git a/dashboard-ui/useredit.html b/dashboard-ui/useredit.html
index 54da57cd30..0bfb741a43 100644
--- a/dashboard-ui/useredit.html
+++ b/dashboard-ui/useredit.html
@@ -4,7 +4,7 @@
     <title></title>
 </head>
 <body>
-    <div id="editUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users">
+    <div id="editUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/useredit">
 
         <div data-role="content">
             <div class="content-primary">
@@ -19,7 +19,7 @@
                     <a class="lnkEditUserPreferences" href="#" target="_blank">${ButtonEditOtherUserPreferences}</a>
                 </p>
                 <br />
-                <form id="editUserProfileForm">
+                <form class="editUserProfileForm">
 
                     <div class="disabledUserBanner" style="display:none;">
                         <div class="btn btnDarkAccent btnStatic">
@@ -130,9 +130,6 @@
                 </form>
             </div>
         </div>
-        <script type="text/javascript">
-            $('#editUserProfileForm').on('submit', EditUserPage.onSubmit);
-        </script>
     </div>
 </body>
 </html>
