diff --git a/dashboard-ui/css/metadataeditor.css b/dashboard-ui/css/metadataeditor.css
index 108929df2e..aa1e7aef95 100644
--- a/dashboard-ui/css/metadataeditor.css
+++ b/dashboard-ui/css/metadataeditor.css
@@ -91,6 +91,9 @@
     padding-right: 0 !important;
 }
 
+.chkAirDay {
+    padding: 0 2em 1em 0;
+}
 
 .searchImage {
     background-position: center bottom;
diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html
index 7f0c1065d1..917356ad5a 100644
--- a/dashboard-ui/edititemmetadata.html
+++ b/dashboard-ui/edititemmetadata.html
@@ -41,126 +41,98 @@
                                         <paper-button raised class="subdued notext btnMore"><iron-icon icon="more-vert"></iron-icon></paper-button>
                                     </div>
 
-                                    <div style="padding: 10px 0;">
-                                        <div data-role="fieldcontain" id="fldContentType" style="display:none;">
+                                    <div style="padding: 0 0 10px;">
+                                        <h1>${HeaderMetadata}</h1>
+                                        <div id="fldContentType" style="display:none;">
                                             <label for="selectContentType">${LabelContentType}</label>
                                             <select id="selectContentType" data-mini="true"></select>
                                         </div>
-                                        <div data-role="fieldcontain" id="fldPath">
-                                            <label for="txtPath">${LabelPath}</label>
-                                            <input type="text" id="txtPath" readonly="readonly" />
+                                        <div id="fldPath">
+                                            <paper-input id="txtPath" type="text" label="${LabelPath}" readonly></paper-input>
                                         </div>
-                                        <div data-role="fieldcontain">
-                                            <label for="txtName">${LabelName}</label>
-                                            <input type="text" id="txtName" required="required" />
+                                        <div>
+                                            <paper-input id="txtName" type="text" label="${LabelName}" required="required"></paper-input>
                                         </div>
-                                        <div data-role="fieldcontain" id="fldSortName" style="display: none;">
-                                            <label for="txtSortName">${LabelSortName}</label>
-                                            <input type="text" id="txtSortName" />
+                                        <div id="fldSortName" style="display: none;">
+                                            <paper-input id="txtSortName" type="text" label="${LabelSortName}"></paper-input>
                                         </div>
-                                        <div data-role="fieldcontain" id="fldDateAdded" style="display: none;">
-                                            <label for="txtDateAdded">${LabelDateAdded}</label>
-                                            <input type="date" id="txtDateAdded" />
+                                        <div id="fldDateAdded" style="display: none;">
+                                            <paper-input id="txtDateAdded" type="date" label="${LabelDateAdded}"></paper-input>
                                         </div>
-                                        <div data-role="fieldcontain" id="fldStatus" style="display: none;">
+                                        <div id="fldStatus" style="display: none;">
                                             <label for="selectStatus">${LabelStatus}</label>
                                             <select id="selectStatus" data-mini="true"></select>
                                         </div>
-                                        <div data-role="fieldcontain" id="fldArtist" style="display: none;">
-                                            <label for="txtArtist">${LabelArtists}</label>
-                                            <input type="text" id="txtArtist" placeholder="${LabelArtistsHelp}" />
+                                        <div id="fldArtist" style="display: none;">
+                                            <paper-input id="txtArtist" type="text" label="${LabelArtists}" placeholder="${LabelArtistsHelp}"></paper-input>
                                         </div>
-                                        <div data-role="fieldcontain" id="fldAlbumArtist" style="display: none;">
-                                            <label for="txtAlbumArtist">${LabelAlbumArtists}</label>
-                                            <input type="text" id="txtAlbumArtist" placeholder="${LabelArtistsHelp}" />
+                                        <div id="fldAlbumArtist" style="display: none;">
+                                            <paper-input id="txtAlbumArtist" type="text" label="${LabelAlbumArtists}" placeholder="${LabelArtistsHelp}"></paper-input>
                                         </div>
-                                        <div data-role="fieldcontain" id="fldAlbum" style="display: none;">
-                                            <label for="txtAlbum">${LabelAlbum}</label>
-                                            <input type="text" id="txtAlbum" />
+                                        <div id="fldAlbum" style="display: none;">
+                                            <paper-input id="txtAlbum" type="text" label="${LabelAlbum}"></paper-input>
                                         </div>
-                                        <div data-role="fieldcontain" id="fldParentIndexNumber" style="display: none;">
-                                            <label id="lblParentIndexNumber" for="txtParentIndexNumber"></label>
-                                            <input type="number" id="txtParentIndexNumber" pattern="[0-9]*" />
+                                        <div id="fldParentIndexNumber" style="display: none;">
+                                            <paper-input id="txtParentIndexNumber" type="number"></paper-input>
                                         </div>
-                                        <div data-role="fieldcontain" id="fldIndexNumber" style="display: none;">
-                                            <label id="lblIndexNumber" for="txtIndexNumber"></label>
-                                            <input type="number" id="txtIndexNumber" pattern="[0-9]*" />
+                                        <div id="fldIndexNumber" style="display: none;">
+                                            <paper-input id="txtIndexNumber" type="number" pattern="[0-9]*"></paper-input>
                                         </div>
-                                        <div id="fldCommunityRating" style="display: none;" data-role="fieldcontain">
-                                            <label for="txtCommunityRating">${LabelCommunityRating}</label>
-                                            <input type="number" id="txtCommunityRating" step=".1" min="0" max="10" />
+                                        <div id="fldCommunityRating" style="display: none;">
+                                            <paper-input id="txtCommunityRating" type="number" step=".1" min="0" max="10" label="${LabelCommunityRating}"></paper-input>
                                         </div>
-                                        <div id="fldCommunityVoteCount" style="display: none;" data-role="fieldcontain">
-                                            <label for="txtCommunityVoteCount">${LabelVoteCount}</label>
-                                            <input type="number" id="txtCommunityVoteCount" />
+                                        <div id="fldCommunityVoteCount" style="display: none;">
+                                            <paper-input id="txtCommunityVoteCount" type="number" step="1" label="${LabelVoteCount}"></paper-input>
                                         </div>
-                                        <div id="fldMetascore" style="display: none;" data-role="fieldcontain">
-                                            <label for="txtMetascore">${LabelMetascore}</label>
-                                            <input type="number" id="txtMetascore" step="1" min="0" max="100" />
+                                        <div id="fldMetascore" style="display: none;">
+                                            <paper-input id="txtMetascore" type="number" step="1" min="0" max="100" label="${LabelMetascore}"></paper-input>
                                         </div>
-                                        <div data-role="fieldcontain" id="fldCriticRating" style="display: none;">
-                                            <label for="txtCriticRating">${LabelCriticRating}</label>
-                                            <input type="number" id="txtCriticRating" step=".1" />
+                                        <div id="fldCriticRating" style="display: none;">
+                                            <paper-input id="txtCriticRating" type="number" step=".1" label="${LabelCriticRating}"></paper-input>
                                         </div>
-                                        <div data-role="fieldcontain" id="fldCriticRatingSummary" style="display: none;">
-                                            <label for="txtCriticRatingSummary">${LabelCriticRatingSummary}</label>
-                                            <input type="text" id="txtCriticRatingSummary" />
+                                        <div id="fldCriticRatingSummary" style="display: none;">
+                                            <paper-input id="txtCriticRatingSummary" type="text" label="${LabelCriticRatingSummary}"></paper-input>
                                         </div>
-                                        <div data-role="fieldcontain" id="fldAwardSummary" style="display: none;">
-                                            <label for="txtAwardSummary">${LabelAwardSummary}</label>
-                                            <input type="text" id="txtAwardSummary" />
+                                        <div id="fldAwardSummary" style="display: none;">
+                                            <paper-input id="txtAwardSummary" type="text" label="${LabelAwardSummary}"></paper-input>
                                         </div>
-                                        <div data-role="fieldcontain">
-                                            <label for="txtHomePageUrl">${LabelWebsite}</label>
-                                            <input type="url" id="txtHomePageUrl" />
+                                        <div>
+                                            <paper-input id="txtHomePageUrl" type="text" label="${LabelWebsite}"></paper-input>
                                         </div>
-                                        <div data-role="fieldcontain" id="fldTagline" style="display: none;">
-                                            <label for="txtTagline">${LabelTagline}</label>
-                                            <input type="text" id="txtTagline" />
+                                        <div id="fldTagline" style="display: none;">
+                                            <paper-input id="txtTagline" type="text" label="${LabelTagline}"></paper-input>
                                         </div>
-                                        <div data-role="fieldcontain">
-                                            <label for="txtOverview">${LabelOverview}</label>
-                                            <textarea id="txtOverview"></textarea>
+                                        <div>
+                                            <paper-textarea id="txtOverview" label="${LabelOverview}"></paper-textarea>
                                         </div>
-                                        <div data-role="fieldcontain" id="fldShortOverview" style="display: none;">
-                                            <label for="txtShortOverview">${LabelShortOverview}</label>
-                                            <textarea id="txtShortOverview"></textarea>
+                                        <div id="fldShortOverview" style="display: none;">
+                                            <paper-input id="txtShortOverview" type="text" label="${LabelShortOverview}"></paper-input>
                                         </div>
-                                        <div data-role="fieldcontain" id="fldPremiereDate" style="display: none;">
-                                            <label id="lblPremiereDate" for="txtPremiereDate">${LabelReleaseDate}</label>
-                                            <input type="date" id="txtPremiereDate" />
+                                        <div id="fldPremiereDate" style="display: none;">
+                                            <paper-input id="txtPremiereDate" type="date" label="${LabelReleaseDate}"></paper-input>
                                         </div>
-                                        <div data-role="fieldcontain" id="fldYear" style="display: none;">
-                                            <label id="lblYear" for="txtProductionYear">${LabelYear}</label>
-                                            <input type="number" id="txtProductionYear" />
+                                        <div id="fldYear" style="display: none;">
+                                            <paper-input id="txtProductionYear" type="number" label="${LabelYear}"></paper-input>
                                         </div>
-                                        <div data-role="fieldcontain" id="fldPlaceOfBirth" style="display: none;">
-                                            <label for="txtPlaceOfBirth">${LabelPlaceOfBirth}</label>
-                                            <input type="text" id="txtPlaceOfBirth" />
+                                        <div id="fldPlaceOfBirth" style="display: none;">
+                                            <paper-input id="txtPlaceOfBirth" type="text" label="${LabelPlaceOfBirth}"></paper-input>
                                         </div>
-                                        <div data-role="fieldcontain" id="fldEndDate" style="display: none;">
-                                            <label id="lblEndDate" for="txtEndDate">${LabelEndDate}</label>
-                                            <input type="date" id="txtEndDate" />
+                                        <div id="fldEndDate" style="display: none;">
+                                            <paper-input id="txtEndDate" type="date" label="${LabelEndDate}"></paper-input>
                                         </div>
-                                        <div data-role="fieldcontain" id="fldAirDays" style="display: none;">
-                                            <label for="selectAirDays">${LabelAirDays}</label>
+                                        <div id="fldAirDays" style="display: none;">
+                                            <p>${LabelAirDays}</p>
 
-                                            <div data-role="controlgroup" data-mini="true">
-                                                <input type="checkbox" class="chkAirDay" id="chkSunday" data-day="Sunday">
-                                                <label for="chkSunday">${OptionSunday}</label>
-                                                <input type="checkbox" class="chkAirDay" id="chkMonday" data-day="Monday">
-                                                <label for="chkMonday">${OptionMonday}</label>
-                                                <input type="checkbox" class="chkAirDay" id="chkTuesday" data-day="Tuesday">
-                                                <label for="chkTuesday">${OptionTuesday}</label>
-                                                <input type="checkbox" class="chkAirDay" id="chkWednesday" data-day="Wednesday">
-                                                <label for="chkWednesday">${OptionWednesday}</label>
-                                                <input type="checkbox" class="chkAirDay" id="chkThursday" data-day="Thursday">
-                                                <label for="chkThursday">${OptionThursday}</label>
-                                                <input type="checkbox" class="chkAirDay" id="chkFriday" data-day="Friday">
-                                                <label for="chkFriday">${OptionFriday}</label>
-                                                <input type="checkbox" class="chkAirDay" id="chkSaturday" data-day="Saturday">
-                                                <label for="chkSaturday">${OptionSaturday}</label>
+                                            <div>
+                                                <paper-checkbox class="chkAirDay" data-day="Sunday">${OptionSunday}</paper-checkbox>
+                                                <paper-checkbox class="chkAirDay" data-day="Monday">${OptionMonday}</paper-checkbox>
+                                                <paper-checkbox class="chkAirDay" data-day="Tuesday">${OptionTuesday}</paper-checkbox>
+                                                <paper-checkbox class="chkAirDay" data-day="Wednesday">${OptionWednesday}</paper-checkbox>
+                                                <paper-checkbox class="chkAirDay" data-day="Thursday">${OptionThursday}</paper-checkbox>
+                                                <paper-checkbox class="chkAirDay" data-day="Friday">${OptionFriday}</paper-checkbox>
+                                                <paper-checkbox class="chkAirDay" data-day="Saturday">${OptionSaturday}</paper-checkbox>
                                             </div>
+                                            <br />
 
                                         </div>
                                         <div id="fldAirTime" style="display: none;">
@@ -258,8 +230,7 @@
                                                 <paper-input id="txtDisplayMediaType" type="text" label="${LabelTreatImageAs}"></paper-input>
                                             </div>
                                             <div id="fldDisplaySpecialsInline" class="fldDisplaySetting">
-                                                <label for="chkDisplaySpecialsInline">${LabelDisplaySpecialsWithinSeasons}</label>
-                                                <input data-mini="true" type="checkbox" id="chkDisplaySpecialsInline" />
+                                                <paper-checkbox id="chkDisplaySpecialsInline">${LabelDisplaySpecialsWithinSeasons}</paper-checkbox>
                                             </div>
                                             <div id="fldDisplayOrder" class="fldDisplaySetting">
                                                 <label for="selectDisplayOrder" id="labelDisplayOrder">${LabelDisplayOrder}</label>
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index 62bfb28e0e..600629d349 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -6,24 +6,6 @@
 <body>
     <div id="itemDetailPage" data-role="page" class="page libraryPage itemDetailPage lightBackdropPage" data-theme="b" data-require="scripts/itemdetailpage,paperbuttonstyle,tileitemcss,scripts/livetvcomponents">
 
-        <div class="itemTabs homeTabs" style="display: none;">
-            <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="index.html" class="lnkHomeHome"><iron-icon icon="home"></iron-icon>${TabHome}</a>
-                <a href="index.html?tab=1" class="lnkHomeNextUp"><iron-icon icon="navigate-next"></iron-icon>${TabNextUp}</a>
-                <a href="index.html?tab=2" class="lnkHomeFavorites"><iron-icon icon="favorite"></iron-icon>${TabFavorites}</a>
-                <a href="index.html?tab=3" class="lnkHomeUpcoming"><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</a>
-            </div>
-        </div>
-
-        <div class="itemTabs homeTabs" style="display: none;">
-            <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="index.html" class="lnkHomeHome"><iron-icon icon="home"></iron-icon>${TabHome}</a>
-                <a href="index.html?tab=1" class="lnkHomeNextUp"><iron-icon icon="navigate-next"></iron-icon>${TabNextUp}</a>
-                <a href="index.html?tab=2" class="lnkHomeFavorites"><iron-icon icon="favorite"></iron-icon>${TabFavorites}</a>
-                <a href="index.html?tab=3" class="lnkHomeUpcoming"><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</a>
-            </div>
-        </div>
-
         <div class="itemTabs photoTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
                 <a href="photos.html" class="ui-btn-active lnkPhotoAlbums"><iron-icon icon="photo-album"></iron-icon>${TabAlbums}</a>
@@ -43,48 +25,6 @@
                 <a href="tvstudios.html" class="tvStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabNetworks}</a>
             </div>
         </div>
-        <div id="songTabs" class="itemTabs" style="display: none;">
-            <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="musicrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
-                <a href="musicalbums.html"><iron-icon icon="album"></iron-icon>${TabAlbums}</a>
-                <a href="musicalbumartists.html"><iron-icon icon="music-note"></iron-icon>${TabAlbumArtists}</a>
-                <a href="musicartists.html" class="musicArtistsTab"><iron-icon icon="music-note"></iron-icon>${TabArtists}</a>
-                <a href="songs.html" class="ui-btn-active musicSongsTab"><iron-icon icon="music-note"></iron-icon>${TabSongs}</a>
-                <a href="musicgenres.html"><iron-icon icon="library-music"></iron-icon>${TabGenres}</a>
-                <a href="musicvideos.html"><iron-icon icon="video-library"></iron-icon>${TabMusicVideos}</a>
-            </div>
-        </div>
-        <div id="albumTabs" class="itemTabs" style="display: none;">
-            <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="musicrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
-                <a href="musicalbums.html" class="ui-btn-active"><iron-icon icon="album"></iron-icon>${TabAlbums}</a>
-                <a href="musicalbumartists.html"><iron-icon icon="music-note"></iron-icon>${TabAlbumArtists}</a>
-                <a href="musicartists.html" class="musicArtistsTab"><iron-icon icon="music-note"></iron-icon>${TabArtists}</a>
-                <a href="songs.html" class="musicSongsTab"><iron-icon icon="music-note"></iron-icon>${TabSongs}</a>
-                <a href="musicgenres.html"><iron-icon icon="library-music"></iron-icon>${TabGenres}</a>
-                <a href="musicvideos.html"><iron-icon icon="video-library"></iron-icon>${TabMusicVideos}</a>
-            </div>
-        </div>
-        <div id="musicVideoTabs" class="itemTabs" style="display: none;">
-            <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="musicrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
-                <a href="musicalbums.html">${TabAlbums}</a>
-                <a href="musicalbumartists.html"><iron-icon icon="music-note"></iron-icon>${TabAlbumArtists}</a>
-                <a href="musicartists.html" class="musicArtistsTab"><iron-icon icon="music-note"></iron-icon>${TabArtists}</a>
-                <a href="songs.html" class="musicSongsTab"><iron-icon icon="music-note"></iron-icon>${TabSongs}</a>
-                <a href="musicgenres.html"><iron-icon icon="library-music"></iron-icon>${TabGenres}</a>
-                <a href="musicvideos.html" class="ui-btn-active"><iron-icon icon="video-library"></iron-icon>${TabMusicVideos}</a>
-            </div>
-        </div>
-        <div id="gameTabs" class="itemTabs" style="display: none;">
-            <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="gamesrecommended.html">${TabSuggestions}</a>
-                <a href="games.html" class="ui-btn-active">${TabGames}</a>
-                <a href="gamesystems.html">Game Systems</a>
-                <a href="gamegenres.html">${TabGenres}</a>
-                <a href="gamestudios.html">${TabStudios}</a>
-            </div>
-        </div>
 
         <div id="itemBackdrop" class="itemBackdrop noBackdrop">
             <div class="itemBackdropContent">
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index 8df663597e..90f6dfab4f 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -341,13 +341,13 @@
             $('#fldIndexNumber', page).show();
 
             if (item.Type == "Episode") {
-                $('#lblIndexNumber', page).html(Globalize.translate('LabelEpisodeNumber'));
+                page.querySelector('#txtIndexNumber').label = Globalize.translate('LabelEpisodeNumber');
             } else if (item.Type == "Season") {
-                $('#lblIndexNumber', page).html(Globalize.translate('LabelSeasonNumber'));
+                page.querySelector('#txtIndexNumber').label = Globalize.translate('LabelSeasonNumber');
             } else if (item.Type == "Audio") {
-                $('#lblIndexNumber', page).html(Globalize.translate('LabelTrackNumber'));
+                page.querySelector('#txtIndexNumber').label = Globalize.translate('LabelTrackNumber');
             } else {
-                $('#lblIndexNumber', page).html(Globalize.translate('LabelNumber'));
+                page.querySelector('#txtIndexNumber').label = Globalize.translate('LabelNumber');
             }
         } else {
             $('#fldIndexNumber', page).hide();
@@ -357,11 +357,11 @@
             $('#fldParentIndexNumber', page).show();
 
             if (item.Type == "Episode") {
-                $('#lblParentIndexNumber', page).html(Globalize.translate('LabelSeasonNumber'));
+                page.querySelector('#txtParentIndexNumber').label = Globalize.translate('LabelSeasonNumber');
             } else if (item.Type == "Audio") {
-                $('#lblParentIndexNumber', page).html(Globalize.translate('LabelDiscNumber'));
+                page.querySelector('#txtParentIndexNumber').label = Globalize.translate('LabelDiscNumber');
             } else {
-                $('#lblParentIndexNumber', page).html(Globalize.translate('LabelParentNumber'));
+                page.querySelector('#txtParentIndexNumber').label = Globalize.translate('LabelParentNumber');
             }
         } else {
             $('#fldParentIndexNumber', page).hide();
@@ -419,7 +419,7 @@
 
             this.checked = (item.AirDays || []).indexOf(this.getAttribute('data-day')) != -1;
 
-        }).checkboxradio('refresh');
+        });
 
         populateListView($('#listCountries', page), item.ProductionLocations || []);
         populateListView($('#listGenres', page), item.Genres);
@@ -440,7 +440,7 @@
         }
         populateInternetProviderSettings(page, item, item.LockedFields);
 
-        $("#chkDisplaySpecialsInline", page).checked(item.DisplaySpecialsWithSeasons || false).checkboxradio('refresh');
+        page.querySelector('#chkDisplaySpecialsInline').checked = item.DisplaySpecialsWithSeasons || false;
 
         $('#txtPath', page).val(item.Path || '');
         $('#txtName', page).val(item.Name || "");
@@ -824,7 +824,7 @@
                 CriticRating: $('#txtCriticRating', form).val(),
                 CriticRatingSummary: $('#txtCriticRatingSummary', form).val(),
                 IndexNumber: $('#txtIndexNumber', form).val() || null,
-                DisplaySpecialsWithSeasons: $('#chkDisplaySpecialsInline', form).checked(),
+                DisplaySpecialsWithSeasons: form.querySelector('#chkDisplaySpecialsInline').checked,
                 AbsoluteEpisodeNumber: $('#txtAbsoluteEpisodeNumber', form).val(),
                 DvdEpisodeNumber: $('#txtDvdEpisodeNumber', form).val(),
                 DvdSeasonNumber: $('#txtDvdSeasonNumber', form).val(),
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index 2f0bc40d75..54230b6fc4 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -213,41 +213,10 @@
 
         $('.itemTabs', page).hide();
 
-        $(page).removeClass('noSecondaryNavPage');
+        if (context == 'photos' || context == 'photos-photos') {
+            $(page).removeClass('noSecondaryNavPage');
 
-        var elem;
-
-        if (!context) {
-            $(page).addClass('noSecondaryNavPage');
-            LibraryMenu.setBackButtonVisible(true);
-            LibraryMenu.setMenuButtonVisible(false);
-        }
-        else if (context == 'home') {
-            elem = $('.homeTabs', page).show();
-            $('a', elem).removeClass('ui-btn-active');
-            $('.lnkHomeHome', page).addClass('ui-btn-active');
-        }
-        else if (context == 'home-nextup') {
-            elem = $('.homeTabs', page).show();
-            $('a', elem).removeClass('ui-btn-active');
-            $('.lnkHomeNextUp', page).addClass('ui-btn-active');
-        }
-        else if (context == 'home-favorites') {
-            elem = $('.homeTabs', page).show();
-            $('a', elem).removeClass('ui-btn-active');
-            $('.lnkHomeFavorites', page).addClass('ui-btn-active');
-        }
-        else if (context == 'home-upcoming') {
-            elem = $('.homeTabs', page).show();
-            $('a', elem).removeClass('ui-btn-active');
-            $('.lnkHomeUpcoming', page).addClass('ui-btn-active');
-        }
-        else if (context == 'home-latest') {
-            elem = $('.homeTabs', page).show();
-            $('a', elem).removeClass('ui-btn-active');
-        }
-        else if (context == 'photos' || context == 'photos-photos') {
-            elem = $('.photoTabs', page).show();
+            var elem = $('.photoTabs', page).show();
             $('a', elem).removeClass('ui-btn-active');
 
             if (context == 'photos-photos') {
@@ -260,10 +229,14 @@
             }
         }
         else if (context == 'tv') {
-            elem = $('#tvShowsTabs', page).show();
+            $(page).removeClass('noSecondaryNavPage');
+
+            $('#tvShowsTabs', page).show();
         }
-        else if (context == 'games') {
-            elem = $('#gameTabs', page).show();
+        else {
+            $(page).addClass('noSecondaryNavPage');
+            LibraryMenu.setBackButtonVisible(true);
+            LibraryMenu.setMenuButtonVisible(false);
         }
     }
 
diff --git a/dashboard-ui/strings/html/server.json b/dashboard-ui/strings/html/server.json
index be8c3b1632..748c2e3234 100644
--- a/dashboard-ui/strings/html/server.json
+++ b/dashboard-ui/strings/html/server.json
@@ -1520,5 +1520,6 @@
     "HeaderEmbyGuide": "Emby Guide",
     "LabelSyncPath": "Synced content path:",
     "OptionSyncOnlyOnWifi": "Sync only on Wifi",
-    "OptionSyncLosslessAudioOriginal": "Sync lossless audio at original quality"
+    "OptionSyncLosslessAudioOriginal": "Sync lossless audio at original quality",
+    "HeaderMetadata": "Metadata"
 }
diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css
index 90eec82977..93b9acc47f 100644
--- a/dashboard-ui/thirdparty/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button-style.css
@@ -373,20 +373,21 @@ paper-menu-item {
     border-color: #2ad;
 }
 
-.ui-page-theme-b paper-input label {
-    color: #ddd !important;
+.ui-page-theme-b paper-input label, .ui-page-theme-b paper-textarea label {
+    color: #ccc !important;
+    font-size: 20px !important;
+    font-family: inherit !important;
 }
 
-.ui-page-theme-b paper-input input {
+.ui-page-theme-b paper-input input, .ui-page-theme-b paper-textarea textarea {
     color: #fff !important;
 }
 
-.ui-page-theme-b paper-input .focused-line {
+.ui-page-theme-b paper-input .focused-line, .ui-page-theme-b paper-textarea .focused-line {
     background-color: #52B54B !important;
 }
 
-.ui-page-theme-b .unfocused-line.paper-input-container {
-    background: #858585;
+.ui-page-theme-b .unfocused-line.paper-input-container, .ui-page-theme-b .unfocused-line.paper-textarea-container {
 }
 
 paper-textarea.mono textarea {
@@ -416,6 +417,6 @@ paper-dropdown-menu {
     display: inline-block;
 }
 
-paper-dropdown-menu paper-item {
-    display: block;
-}
+    paper-dropdown-menu paper-item {
+        display: block;
+    }