diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index a194d24b33..d94bf269ad 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -1,17 +1,5 @@
 <div id="itemDetailPage" data-role="page" class="page libraryPage itemDetailPage noSecondaryNavPage selfBackdropPage" data-theme="b" data-require="scripts/itemdetailpage,tileitemcss,scripts/livetvcomponents,paper-fab,paper-item-body,paper-icon-item">
 
-    <div id="tvShowsTabs" class="itemTabs" style="display: none;">
-        <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="tv.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
-            <a href="tv.html?tab=1"><iron-icon icon="new-releases"></iron-icon>${TabLatest}</a>
-            <a href="tv.html?tab=2"><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</a>
-            <a href="tv.html?tab=3" class="ui-btn-active"><iron-icon icon="live-tv"></iron-icon>${TabShows}</a>
-            <a href="tv.html?tab=4" class="tvEpisodesTab"><iron-icon icon="slideshow"></iron-icon>${TabEpisodes}</a>
-            <a href="tv.html?tab=5"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
-            <a href="tv.html?tab=6" class="tvStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabNetworks}</a>
-        </div>
-    </div>
-
     <div id="itemBackdrop" class="itemBackdrop noBackdrop">
         <div class="itemBackdropContent">
         </div>
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index d1af83ae12..1177c262f1 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -55,7 +55,8 @@
 
         var context = getContext(item);
 
-        renderHeader(page, item, context);
+        LibraryMenu.setBackButtonVisible(true);
+        LibraryMenu.setMenuButtonVisible(false);
 
         LibraryBrowser.renderName(item, $('.itemName', page), false, context);
         LibraryBrowser.renderParentName(item, $('.parentName', page), context);
@@ -306,24 +307,6 @@
         return getParameterByName('context');
     }
 
-    function renderHeader(page, item, context) {
-
-        $('.itemTabs', page).hide();
-
-        if (context == 'tv') {
-
-            $(page).removeClass('noSecondaryNavPage');
-
-            $('#tvShowsTabs', page).show();
-            LibraryMenu.setMenuButtonVisible(true);
-        }
-        else {
-            $(page).addClass('noSecondaryNavPage');
-            LibraryMenu.setBackButtonVisible(true);
-            LibraryMenu.setMenuButtonVisible(false);
-        }
-    }
-
     function renderNextUp(page, item, user) {
 
         var section = page.querySelector('.nextUpSection');
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index 920e270316..a3092af251 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -192,7 +192,8 @@
                 modal: false,
                 autoFocus: false,
                 entryAnimationDuration: 160,
-                exitAnimationDuration: 160
+                exitAnimationDuration: 160,
+                enableHistory: false
             });
 
             dlg.classList.add('ui-body-a');
@@ -226,21 +227,13 @@
             dlg.innerHTML = html;
             document.body.appendChild(dlg);
 
-            var destination;
             dlg.addEventListener('click', function (e) {
                 var link = parentWithTag(e.target, 'A');
                 if (link) {
-                    destination = link.href;
                     dialogHelper.close(dlg);
-                    e.preventDefault();
-                    return false;
-                }
-            });
-            dialogHelper.open(dlg).then(function () {
-                if (destination) {
-                    Dashboard.navigate(destination);
                 }
             });
+            dialogHelper.open(dlg);
 
         });
     }
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index b1cf66e7e5..8d72b04d65 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -691,10 +691,11 @@ var Dashboard = {
             if (item.items) {
 
                 var style = item.color ? ' iconstyle="color:' + item.color + '"' : '';
+                var expanded = item.expanded ? (' expanded') : '';
                 if (item.icon) {
-                    menuHtml += '<emby-collapsible icon="' + item.icon + '" title="' + item.name + '"' + style + '>';
+                    menuHtml += '<emby-collapsible icon="' + item.icon + '" title="' + item.name + '"' + style + expanded + '>';
                 } else {
-                    menuHtml += '<emby-collapsible title="' + item.name + '"' + style + '>';
+                    menuHtml += '<emby-collapsible title="' + item.name + '"' + style + expanded + '>';
                 }
                 menuHtml += item.items.map(Dashboard.getToolsLinkHtml).join('');
                 menuHtml += '</emby-collapsible>';
@@ -720,6 +721,7 @@ var Dashboard = {
             name: Globalize.translate('TabServer'),
             icon: 'dashboard',
             color: '#38c',
+            expanded: true,
             items: [
                 {
                     name: Globalize.translate('TabDashboard'),
@@ -747,6 +749,7 @@ var Dashboard = {
             name: Globalize.translate('TabLibrary'),
             icon: 'folder',
             color: '#ECA403',
+            expanded: true,
             items: [
                 {
                     name: Globalize.translate('TabFolders'),