diff --git a/dashboard-ui/bower_components/emby-webcomponents/router.js b/dashboard-ui/bower_components/emby-webcomponents/router.js
index fa9560b73b..e0349789d7 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/router.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/router.js
@@ -203,7 +203,7 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b
             return;
             //}
         }
-        viewManager.tryRestoreView(currentRequest).then(function () {
+        viewManager.tryRestoreView(currentRequest, function () {
 
             // done
             currentRouteInfo = {
@@ -211,7 +211,12 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b
                 path: ctx.path
             };
 
-        }, onNewViewNeeded);
+        }).catch(function (result) {
+
+            if (!result || !result.cancelled) {
+                onNewViewNeeded();
+            }
+        });
     }
 
     var firstConnectionResult;
diff --git a/dashboard-ui/bower_components/emby-webcomponents/viewmanager/viewmanager.js b/dashboard-ui/bower_components/emby-webcomponents/viewmanager/viewmanager.js
index c47efcc62d..ae7666acb6 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/viewmanager/viewmanager.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/viewmanager/viewmanager.js
@@ -35,8 +35,6 @@ define(['viewcontainer', 'focusManager', 'queryString', 'layoutManager'], functi
 
     function onViewChange(view, options, isRestore) {
 
-        var viewType = options.type;
-
         var lastView = currentView;
         if (lastView) {
             dispatchViewEvent(lastView, 'viewhide');
@@ -123,67 +121,54 @@ define(['viewcontainer', 'focusManager', 'queryString', 'layoutManager'], functi
     //events.on(connectionManager, 'localusersignedin', resetCachedViews);
     //events.on(connectionManager, 'localusersignedout', resetCachedViews);
 
-    function tryRestoreInternal(viewcontainer, options, resolve, reject) {
+    function ViewManager() {
+    }
+
+    ViewManager.prototype.loadView = function (options) {
+
+        var lastView = currentView;
+
+        // Record the element that has focus
+        if (lastView) {
+            lastView.activeElement = document.activeElement;
+        }
 
         if (options.cancel) {
             return;
         }
 
-        viewcontainer.tryRestoreView(options).then(function (view) {
+        viewcontainer.loadView(options).then(function (view) {
 
+            onViewChange(view, options);
+        });
+    };
+
+    ViewManager.prototype.tryRestoreView = function (options, onViewChanging) {
+
+        if (options.cancel) {
+            return Promise.reject({ cancelled: true });
+        }
+
+        // Record the element that has focus
+        if (currentView) {
+            currentView.activeElement = document.activeElement;
+        }
+
+        return viewcontainer.tryRestoreView(options).then(function (view) {
+
+            onViewChanging();
             onViewChange(view, options, true);
-            resolve();
 
-        }, reject);
-    }
+        });
+    };
 
-    function ViewManager() {
+    ViewManager.prototype.currentView = function () {
+        return currentView;
+    };
 
-        var self = this;
-
-        self.loadView = function (options) {
-
-            var lastView = currentView;
-
-            // Record the element that has focus
-            if (lastView) {
-                lastView.activeElement = document.activeElement;
-            }
-
-            if (options.cancel) {
-                return;
-            }
-
-            viewcontainer.loadView(options).then(function (view) {
-
-                onViewChange(view, options);
-            });
-        };
-
-        self.tryRestoreView = function (options) {
-            return new Promise(function (resolve, reject) {
-
-                if (options.cancel) {
-                    return;
-                }
-
-                // Record the element that has focus
-                if (currentView) {
-                    currentView.activeElement = document.activeElement;
-                }
-
-                tryRestoreInternal(viewcontainer, options, resolve, reject);
-            });
-        };
-
-        self.currentView = function () {
-            return currentView;
-        };
-
-        self.dispatchPageEvents = function (value) {
-            dispatchPageEvents = value;
-        };
-    }
+    ViewManager.prototype.dispatchPageEvents = function (value) {
+        dispatchPageEvents = value;
+    };
 
     return new ViewManager();
 });
diff --git a/dashboard-ui/camerauploadsettings.html b/dashboard-ui/camerauploadsettings.html
index be983af99d..23db249355 100644
--- a/dashboard-ui/camerauploadsettings.html
+++ b/dashboard-ui/camerauploadsettings.html
@@ -1,4 +1,4 @@
-<div id="syncPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${ButtonSyncSettings}" data-backbutton="true" data-menubutton="false">
+<div id="syncPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${ButtonSyncSettings}" data-menubutton="false">
 
     <div data-role="content">
         <form class="userProfileSettingsForm" style="margin: 0 auto;">
diff --git a/dashboard-ui/channelitems.html b/dashboard-ui/channelitems.html
index 50ad9fcd0f..ff26c6c913 100644
--- a/dashboard-ui/channelitems.html
+++ b/dashboard-ui/channelitems.html
@@ -1,4 +1,4 @@
-<div id="channelItemsPage" data-role="page" class="page libraryPage channelsPage noSecondaryNavPage" data-require="scripts/channelitems" data-backbutton="true" data-menubutton="false">
+<div id="channelItemsPage" data-role="page" class="page libraryPage channelsPage noSecondaryNavPage" data-require="scripts/channelitems" data-menubutton="false">
 
     <div data-role="content">
         <div class="viewSettings">
diff --git a/dashboard-ui/channels.html b/dashboard-ui/channels.html
index 4063a3e060..b429637f0b 100644
--- a/dashboard-ui/channels.html
+++ b/dashboard-ui/channels.html
@@ -1,4 +1,4 @@
-<div id="channelsPage" data-role="page" data-dom-cache="true" class="page libraryPage channelsPage pageWithAbsoluteTabs" data-contextname="${HeaderChannels}">
+<div id="channelsPage" data-role="page" data-dom-cache="true" class="page libraryPage channelsPage pageWithAbsoluteTabs" data-title="${HeaderChannels}">
 
     <div is="emby-tabs" class="libraryViewNav">
         <div class="emby-tabs-slider">
diff --git a/dashboard-ui/components/favoriteitems.js b/dashboard-ui/components/favoriteitems.js
index c730e3693f..7541bb83a5 100644
--- a/dashboard-ui/components/favoriteitems.js
+++ b/dashboard-ui/components/favoriteitems.js
@@ -75,7 +75,7 @@
                 html += '<h1 style="display:inline-block; vertical-align:middle;" class="listHeader">' + Globalize.translate(section.name) + '</h1>';
 
                 if (options.Limit && result.Items.length >= options.Limit) {
-                    var href = "secondaryitems.html?type=" + section.types + "&filters=IsFavorite&titlekey=" + section.name;
+                    var href = "secondaryitems.html?type=" + section.types + "&filters=IsFavorite";
 
                     html += '<a class="clearLink" href="' + href + '" style="margin-left:2em;"><button is="emby-button" type="button" class="raised more mini">' + Globalize.translate('ButtonMore') + '</button></a>';
                 }
diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css
index 5929d69cc7..1ff32f990c 100644
--- a/dashboard-ui/css/librarymenu.css
+++ b/dashboard-ui/css/librarymenu.css
@@ -91,7 +91,7 @@
 
 .libraryMenuButtonText {
     text-decoration: none;
-    font-weight: 500 !important;
+    font-weight: 400 !important;
     display: inline-flex;
     vertical-align: middle;
     padding-left: 0 !important;
@@ -102,7 +102,7 @@
     overflow: hidden;
     text-overflow: ellipsis;
     align-items: center;
-    margin-left: .5em;
+    margin-left: .75em;
     font-size: 108%;
 }
 
diff --git a/dashboard-ui/devices/android/android.css b/dashboard-ui/devices/android/android.css
index a723091cf8..0e84f3622b 100644
--- a/dashboard-ui/devices/android/android.css
+++ b/dashboard-ui/devices/android/android.css
@@ -1,4 +1,8 @@
-@media all and (min-width: 300px) {
+.libraryMenuButtonText {
+    font-weight: 500 !important;
+}
+
+@media all and (min-width: 300px) {
 
     .libraryViewNav, .emby-tabs-slider {
         display: flex;
diff --git a/dashboard-ui/devices/ios/ios.css b/dashboard-ui/devices/ios/ios.css
index 146e33ba91..57fc14cbc6 100644
--- a/dashboard-ui/devices/ios/ios.css
+++ b/dashboard-ui/devices/ios/ios.css
@@ -72,6 +72,10 @@ h1, h1 a {
     font-weight: 400 !important;
 }
 
+.libraryMenuButtonText {
+    font-weight: 500 !important;
+}
+
 .btnNotificationsInner {
     font-weight: 400;
 }
diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html
index f3905adfa0..0b47befd16 100644
--- a/dashboard-ui/edititemmetadata.html
+++ b/dashboard-ui/edititemmetadata.html
@@ -1,4 +1,4 @@
-<div id="editItemMetadataPage" data-role="page" class="page libraryPage metadataEditorPage noSecondaryNavPage" data-contextname="${MetadataManager}" data-require="scripts/editorsidebar,scripts/edititemmetadata">
+<div id="editItemMetadataPage" data-role="page" class="page libraryPage metadataEditorPage noSecondaryNavPage" data-title="${MetadataManager}" data-require="scripts/editorsidebar,scripts/edititemmetadata">
 
     <style>
         #editItemMetadataPage .editMetadataForm {
diff --git a/dashboard-ui/livetv.html b/dashboard-ui/livetv.html
index 82bf5d23e8..102215d77a 100644
--- a/dashboard-ui/livetv.html
+++ b/dashboard-ui/livetv.html
@@ -1,4 +1,4 @@
-<div id="liveTvSuggestedPage" data-dom-cache="true" data-role="page" class="page libraryPage liveTvPage pageWithAbsoluteTabs" data-contextname="${HeaderLiveTv}" data-backdroptype="series,movie">
+<div id="liveTvSuggestedPage" data-dom-cache="true" data-role="page" class="page libraryPage liveTvPage pageWithAbsoluteTabs" data-title="${HeaderLiveTv}" data-backdroptype="series,movie">
 
     <div is="emby-tabs" class="libraryViewNav">
         <div class="emby-tabs-slider">
diff --git a/dashboard-ui/livetvitems.html b/dashboard-ui/livetvitems.html
index 26369026a4..5b863d87f8 100644
--- a/dashboard-ui/livetvitems.html
+++ b/dashboard-ui/livetvitems.html
@@ -1,4 +1,4 @@
-<div id="liveTvItemsPage" data-role="page" class="page libraryPage liveTvPage noSecondaryNavPage" data-contextname="${HeaderLiveTv}" data-require="scripts/livetvitems,livetvcss" data-backbutton="true" data-menubutton="false">
+<div id="liveTvItemsPage" data-role="page" class="page libraryPage liveTvPage noSecondaryNavPage" data-title="${HeaderLiveTv}" data-require="scripts/livetvitems,livetvcss" data-menubutton="false">
 
     <div data-role="content">
         <div class="viewSettings">
diff --git a/dashboard-ui/livetvrecordinglist.html b/dashboard-ui/livetvrecordinglist.html
index e310884e2a..74e4e77d85 100644
--- a/dashboard-ui/livetvrecordinglist.html
+++ b/dashboard-ui/livetvrecordinglist.html
@@ -1,4 +1,4 @@
-<div id="liveTvRecordingListPage" data-role="page" class="page libraryPage liveTvPage noSecondaryNavPage" data-contextname="${HeaderLiveTv}" data-require="scripts/livetvrecordinglist,livetvcss" data-backbutton="true" data-menubutton="false">
+<div id="liveTvRecordingListPage" data-role="page" class="page libraryPage liveTvPage noSecondaryNavPage" data-title="${HeaderLiveTv}" data-require="scripts/livetvrecordinglist,livetvcss" data-menubutton="false">
 
     <div data-role="content">
         <div class="viewSettings" style="margin:.5em 0;">
diff --git a/dashboard-ui/livetvseriestimer.html b/dashboard-ui/livetvseriestimer.html
index edb515d29e..d9e013c2b1 100644
--- a/dashboard-ui/livetvseriestimer.html
+++ b/dashboard-ui/livetvseriestimer.html
@@ -1,4 +1,4 @@
-<div id="liveTvSeriesTimerPage" data-role="page" class="page libraryPage liveTvPage noSecondaryNavPage" data-contextname="${HeaderLiveTv}" data-backbutton="true" data-menubutton="false">
+<div id="liveTvSeriesTimerPage" data-role="page" class="page libraryPage liveTvPage noSecondaryNavPage" data-title="${HeaderLiveTv}" data-menubutton="false">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/mypreferencesdisplay.html b/dashboard-ui/mypreferencesdisplay.html
index c1ff8120a5..b682bbf2b8 100644
--- a/dashboard-ui/mypreferencesdisplay.html
+++ b/dashboard-ui/mypreferencesdisplay.html
@@ -1,4 +1,4 @@
-<div id="displayPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderDisplaySettings}" data-backbutton="true" data-menubutton="false">
+<div id="displayPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderDisplaySettings}" data-menubutton="false">
     <div data-role="content">
         <form class="displayPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">
             <div class="detailSection languageSection hide">
diff --git a/dashboard-ui/mypreferenceshome.html b/dashboard-ui/mypreferenceshome.html
index 69a87dd438..510d6b00c0 100644
--- a/dashboard-ui/mypreferenceshome.html
+++ b/dashboard-ui/mypreferenceshome.html
@@ -1,4 +1,4 @@
-<div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderHomeScreenSettings}" data-backbutton="true" data-menubutton="false">
+<div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderHomeScreenSettings}" data-menubutton="false">
 
     <div data-role="content">
         <form class="homeScreenPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">
diff --git a/dashboard-ui/mypreferenceslanguages.html b/dashboard-ui/mypreferenceslanguages.html
index 6cc3e85bd0..de6e463c7c 100644
--- a/dashboard-ui/mypreferenceslanguages.html
+++ b/dashboard-ui/mypreferenceslanguages.html
@@ -1,4 +1,4 @@
-<div id="languagePreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderPlaybackSettings}" data-backbutton="true" data-menubutton="false">
+<div id="languagePreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderPlaybackSettings}" data-menubutton="false">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/mypreferencesmenu.html b/dashboard-ui/mypreferencesmenu.html
index c909c06c7b..a6ba6b2e82 100644
--- a/dashboard-ui/mypreferencesmenu.html
+++ b/dashboard-ui/mypreferencesmenu.html
@@ -1,4 +1,4 @@
-<div id="myPreferencesMenuPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-contextname="${HeaderSettings}">
+<div id="myPreferencesMenuPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderSettings}">
 
     <div data-role="content">
         <div class="readOnlyContent" style="margin: 0 auto;">
diff --git a/dashboard-ui/myprofile.html b/dashboard-ui/myprofile.html
index 9d83330fbd..84c6ba2e52 100644
--- a/dashboard-ui/myprofile.html
+++ b/dashboard-ui/myprofile.html
@@ -1,4 +1,4 @@
-<div id="userImagePage" data-role="page" class="page libraryPage userPreferencesPage userPasswordPage noSecondaryNavPage" data-title="${HeaderProfile}" data-backbutton="true" data-menubutton="false">
+<div id="userImagePage" data-role="page" class="page libraryPage userPreferencesPage userPasswordPage noSecondaryNavPage" data-title="${HeaderProfile}" data-menubutton="false">
 
     <div data-role="content">
         <br />
diff --git a/dashboard-ui/mysync.html b/dashboard-ui/mysync.html
index a64f2e9c5d..6fba76f601 100644
--- a/dashboard-ui/mysync.html
+++ b/dashboard-ui/mysync.html
@@ -1,4 +1,4 @@
-<div id="mySyncActivityPage" data-role="page" class="page libraryPage syncActivityPage mySyncPage noSecondaryNavPage" data-contextname="${TitleSync}">
+<div id="mySyncActivityPage" data-role="page" class="page libraryPage syncActivityPage mySyncPage noSecondaryNavPage" data-title="${TitleSync}">
 
     <style>
         .status-text-icon {
diff --git a/dashboard-ui/mysyncjob.html b/dashboard-ui/mysyncjob.html
index 1c537cfc77..33a694b997 100644
--- a/dashboard-ui/mysyncjob.html
+++ b/dashboard-ui/mysyncjob.html
@@ -1,4 +1,4 @@
-<div id="mySyncJobPage" data-role="page" class="page libraryPage syncJobPage mySyncPage noSecondaryNavPage" data-contextname="${TitleSync}" data-backbutton="true" data-menubutton="false">
+<div id="mySyncJobPage" data-role="page" class="page libraryPage syncJobPage mySyncPage noSecondaryNavPage" data-title="${TitleSync}" data-menubutton="false">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/mysyncsettings.html b/dashboard-ui/mysyncsettings.html
index 14bb2eb68c..1f1b793b2c 100644
--- a/dashboard-ui/mysyncsettings.html
+++ b/dashboard-ui/mysyncsettings.html
@@ -1,4 +1,4 @@
-<div id="syncPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${ButtonSyncSettings}" data-backbutton="true" data-menubutton="false">
+<div id="syncPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${ButtonSyncSettings}" data-menubutton="false">
 
     <div data-role="content">
         <form class="userProfileSettingsForm" style="margin: 0 auto;">
diff --git a/dashboard-ui/nowplaying.html b/dashboard-ui/nowplaying.html
index 484a3cbc36..c7559eb01c 100644
--- a/dashboard-ui/nowplaying.html
+++ b/dashboard-ui/nowplaying.html
@@ -1,4 +1,4 @@
-<div id="nowPlayingPage" data-role="page" class="page libraryPage nowPlayingPage noSecondaryNavPage selfBackdropPage" data-contextname="${TitleRemoteControl}" data-theme="b" style="padding:0;">
+<div id="nowPlayingPage" data-role="page" class="page libraryPage nowPlayingPage noSecondaryNavPage selfBackdropPage" data-title="${TitleRemoteControl}" data-theme="b" style="padding:0;">
 
     <div class="remoteControlContent">
 
diff --git a/dashboard-ui/reports.html b/dashboard-ui/reports.html
index 3d6390dc4c..c5a8b0f545 100644
--- a/dashboard-ui/reports.html
+++ b/dashboard-ui/reports.html
@@ -1,4 +1,4 @@
-<div id="libraryReportManagerPage" data-role="page" class="page libraryPage noSecondaryNavPage reportsPage" data-contextname="${HeaderReports}" data-require="jQuery,paper-icon-button-light,jqmcheckbox,jqmpanel,jqmcollapsible,jqmtable,scripts/reports,detailtablecss">
+<div id="libraryReportManagerPage" data-role="page" class="page libraryPage noSecondaryNavPage reportsPage" data-title="${HeaderReports}" data-require="jQuery,paper-icon-button-light,jqmcheckbox,jqmpanel,jqmcollapsible,jqmtable,scripts/reports,detailtablecss">
     <style>
         /* Page and overlay */
         .ui-page-theme-b .ui-panel-wrapper {
diff --git a/dashboard-ui/scripts/addpluginpage.js b/dashboard-ui/scripts/addpluginpage.js
index 3bd2225e71..e58ae2cd29 100644
--- a/dashboard-ui/scripts/addpluginpage.js
+++ b/dashboard-ui/scripts/addpluginpage.js
@@ -303,23 +303,23 @@
 
         if (context == 'sync') {
             page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Sync');
-            Dashboard.setPageTitle(Globalize.translate('TitleSync'));
+            LibraryMenu.setTitle(Globalize.translate('TitleSync'));
         }
         else if (context == 'livetv') {
 
-            Dashboard.setPageTitle(Globalize.translate('TitleLiveTV'));
+            LibraryMenu.setTitle(Globalize.translate('TitleLiveTV'));
             page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Live%20TV');
         }
         else if (context == 'notifications') {
 
             $('.notificationsTabs', page).show();
 
-            Dashboard.setPageTitle(Globalize.translate('TitleNotifications'));
+            LibraryMenu.setTitle(Globalize.translate('TitleNotifications'));
             page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Notifications');
         }
         else {
             page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Plugins');
-            Dashboard.setPageTitle(Globalize.translate('TitlePlugins'));
+            LibraryMenu.setTitle(Globalize.translate('TitlePlugins'));
         }
 
     });
diff --git a/dashboard-ui/scripts/appservices.js b/dashboard-ui/scripts/appservices.js
index 93946a9adb..6bdb20d41c 100644
--- a/dashboard-ui/scripts/appservices.js
+++ b/dashboard-ui/scripts/appservices.js
@@ -83,15 +83,15 @@
         var context = getParameterByName('context');
 
         if (context == 'sync') {
-            Dashboard.setPageTitle(Globalize.translate('TitleSync'));
+            LibraryMenu.setTitle(Globalize.translate('TitleSync'));
             page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Sync');
         }
         else if (context == 'livetv') {
-            Dashboard.setPageTitle(Globalize.translate('TitleLiveTV'));
+            LibraryMenu.setTitle(Globalize.translate('TitleLiveTV'));
             page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Live%20TV');
         }
         else if (context == 'notifications') {
-            Dashboard.setPageTitle(Globalize.translate('TitleNotifications'));
+            LibraryMenu.setTitle(Globalize.translate('TitleNotifications'));
             page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Notifications');
         }
 
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index a9f12fc3d7..c4789b0bbf 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -100,8 +100,6 @@
 
         var context = params.context;
 
-        LibraryMenu.setBackButtonVisible(true);
-
         LibraryBrowser.renderName(item, page.querySelector('.itemName'), false, context);
         LibraryBrowser.renderParentName(item, page.querySelector('.parentName'), context);
         LibraryMenu.setTitle(item.SeriesName || item.Name);
diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js
index dfb3bf3213..74eb1ee5de 100644
--- a/dashboard-ui/scripts/itemlistpage.js
+++ b/dashboard-ui/scripts/itemlistpage.js
@@ -361,7 +361,6 @@
         view.addEventListener('viewbeforeshow', function (e) {
             reloadItems(view);
             updateFilterControls();
-            LibraryMenu.setBackButtonVisible(params.context);
         });
 
         view.addEventListener('viewdestroy', function (e) {
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index fb2150ed62..e183e69565 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -423,7 +423,7 @@
                     includeParentInfo: false
                 });
 
-                Dashboard.setPageTitle(name);
+                LibraryMenu.setTitle(name);
 
                 if (linkToElement) {
                     nameElem.innerHTML = '<a class="detailPageParentLink" href="' + LibraryBrowser.getHref(item, context) + '">' + name + '</a>';
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index b41164eeda..cabf0d1dab 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -368,7 +368,7 @@
 
                 var documentTitle = secondaryTitle;
 
-                Dashboard.setPageTitle(title, documentTitle);
+                LibraryMenu.setTitle(title, documentTitle);
 
             } else {
                 link.classList.remove('selectedSidebarLink');
@@ -697,19 +697,8 @@
             if (libraryMenuButtonText) {
                 libraryMenuButtonText.innerHTML = html;
             }
-        },
 
-        setBackButtonVisible: function (visible) {
-
-            var backButton = document.querySelector('.headerBackButton');
-
-            if (backButton) {
-                if (visible) {
-                    backButton.classList.remove('hide');
-                } else {
-                    backButton.classList.add('hide');
-                }
-            }
+            document.title = title;
         },
 
         setTransparentMenu: function (transparent) {
@@ -908,15 +897,8 @@
     });
 
     function updateTitle(page) {
-        var title = page.getAttribute('data-title') || page.getAttribute('data-contextname');
 
-        if (!title) {
-            var titleKey = getParameterByName('titlekey');
-
-            if (titleKey) {
-                title = Globalize.translate(titleKey);
-            }
-        }
+        var title = page.getAttribute('data-title');
 
         if (title) {
             LibraryMenu.setTitle(title);
@@ -925,18 +907,10 @@
 
     function updateBackButton(page) {
 
-        var canGoBack = !page.classList.contains('homePage') && history.length > 0;
-
         var backButton = document.querySelector('.headerBackButton');
 
-        var showBackButton = AppInfo.enableBackButton;
-
-        if (!showBackButton) {
-            showBackButton = page.getAttribute('data-backbutton') == 'true';
-        }
-
         if (backButton) {
-            if (canGoBack && showBackButton) {
+            if (Emby.Page.canGoBack()) {
                 backButton.classList.remove('hide');
             } else {
                 backButton.classList.add('hide');
diff --git a/dashboard-ui/scripts/myprofile.js b/dashboard-ui/scripts/myprofile.js
index fc56600e49..31b30e6078 100644
--- a/dashboard-ui/scripts/myprofile.js
+++ b/dashboard-ui/scripts/myprofile.js
@@ -15,7 +15,7 @@
             uploadUserImage.value = '';
             uploadUserImage.dispatchEvent(new CustomEvent('change', {}));
 
-            Dashboard.setPageTitle(user.Name);
+            LibraryMenu.setTitle(user.Name);
 
             var imageUrl;
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 8d93390aa4..426d1f79ee 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -591,16 +591,6 @@ var Dashboard = {
         }
     },
 
-    setPageTitle: function (title, documentTitle) {
-
-        LibraryMenu.setTitle(title || 'Emby');
-
-        documentTitle = documentTitle || title;
-        if (documentTitle) {
-            document.title = documentTitle;
-        }
-    },
-
     getSupportedRemoteCommands: function () {
 
         // Full list
@@ -966,8 +956,6 @@ var AppInfo = {};
 
         AppInfo.hasPhysicalVolumeButtons = isCordova || browserInfo.mobile;
 
-        AppInfo.enableBackButton = isIOS && (window.navigator.standalone || AppInfo.isNativeApp);
-
         if (isCordova && isIOS) {
             AppInfo.moreIcon = 'more-horiz';
         } else {
@@ -2111,7 +2099,8 @@ var AppInfo = {};
             dependencies: [],
             autoFocus: false,
             controller: 'scripts/indexpage',
-            transition: 'fade'
+            transition: 'fade',
+            type: 'home'
         });
 
         defineRoute({
diff --git a/dashboard-ui/scripts/useredit.js b/dashboard-ui/scripts/useredit.js
index 661b61216f..fc0205f9e0 100644
--- a/dashboard-ui/scripts/useredit.js
+++ b/dashboard-ui/scripts/useredit.js
@@ -22,7 +22,7 @@
 
         $('.lnkEditUserPreferences', page).attr('href', 'mypreferencesmenu.html?userId=' + user.Id);
 
-        Dashboard.setPageTitle(user.Name);
+        LibraryMenu.setTitle(user.Name);
 
         $('#txtUserName', page).val(user.Name);
         $('#txtConnectUserName', page).val(currentUser.ConnectUserName);
diff --git a/dashboard-ui/scripts/userlibraryaccess.js b/dashboard-ui/scripts/userlibraryaccess.js
index 65d83a020a..7dab292ebd 100644
--- a/dashboard-ui/scripts/userlibraryaccess.js
+++ b/dashboard-ui/scripts/userlibraryaccess.js
@@ -90,7 +90,7 @@
 
         $(page).trigger('userloaded', [user]);
 
-        Dashboard.setPageTitle(user.Name);
+        LibraryMenu.setTitle(user.Name);
 
         loadChannels(page, user, channels);
         loadMediaFolders(page, user, mediaFolders);
diff --git a/dashboard-ui/scripts/userparentalcontrol.js b/dashboard-ui/scripts/userparentalcontrol.js
index 58fbb23f8b..f07d97dcc4 100644
--- a/dashboard-ui/scripts/userparentalcontrol.js
+++ b/dashboard-ui/scripts/userparentalcontrol.js
@@ -75,7 +75,7 @@
 
     function loadUser(page, user, allParentalRatings) {
 
-        Dashboard.setPageTitle(user.Name);
+        LibraryMenu.setTitle(user.Name);
 
         loadUnratedItems(page, user);
         loadBlockedTags(page, user.Policy.BlockedTags);
diff --git a/dashboard-ui/scripts/userpassword.js b/dashboard-ui/scripts/userpassword.js
index 384a858600..87389832c1 100644
--- a/dashboard-ui/scripts/userpassword.js
+++ b/dashboard-ui/scripts/userpassword.js
@@ -2,7 +2,7 @@
 
     function loadUser(page, user) {
 
-        Dashboard.setPageTitle(user.Name);
+        LibraryMenu.setTitle(user.Name);
 
         if (user.ConnectLinkType == 'Guest') {
 
diff --git a/dashboard-ui/scripts/userpasswordpage.js b/dashboard-ui/scripts/userpasswordpage.js
index 366b5838b1..fdcf24bb71 100644
--- a/dashboard-ui/scripts/userpasswordpage.js
+++ b/dashboard-ui/scripts/userpasswordpage.js
@@ -8,7 +8,7 @@
 
             Dashboard.getCurrentUser().then(function (loggedInUser) {
 
-                Dashboard.setPageTitle(user.Name);
+                LibraryMenu.setTitle(user.Name);
 
                 var showPasswordSection = true;
                 var showLocalAccessSection = false;
diff --git a/dashboard-ui/search.html b/dashboard-ui/search.html
index c36df327a5..445eb2c6a0 100644
--- a/dashboard-ui/search.html
+++ b/dashboard-ui/search.html
@@ -1,4 +1,4 @@
-<div id="searchPage" data-role="page" class="page libraryPage allLibraryPage noSecondaryNavPage" data-title="${ButtonSearch}" data-backbutton="true" style="padding-top:0!important;">
+<div id="searchPage" data-role="page" class="page libraryPage allLibraryPage noSecondaryNavPage" data-title="${ButtonSearch}" style="padding-top:0!important;">
 
     <style>
         @media all and (max-width: 800px) {
diff --git a/dashboard-ui/secondaryitems.html b/dashboard-ui/secondaryitems.html
index e128feec7e..d59b6896d5 100644
--- a/dashboard-ui/secondaryitems.html
+++ b/dashboard-ui/secondaryitems.html
@@ -1,4 +1,4 @@
-<div id="secondaryItemsPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-backbutton="true" data-menubutton="false">
+<div id="secondaryItemsPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-menubutton="false">
 
     <div data-role="content">
         <div class="viewSettings">