diff --git a/dashboard-ui/episodes.html b/dashboard-ui/episodes.html
index 91175dbd21..042dfced3b 100644
--- a/dashboard-ui/episodes.html
+++ b/dashboard-ui/episodes.html
@@ -7,6 +7,7 @@
     <div id="episodesPage" data-role="page" class="page libraryPage" data-theme="b">
 
         <div class="libraryViewNav scopedLibraryViewNav">
+            <a href="tvrecommended.html">${TabSuggested}</a>
             <a href="tvlatest.html">${TabLatest}</a>
             <a href="tvshows.html">${TabShows}</a>
             <a href="#" class="ui-btn-active">${TabEpisodes}</a>
diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html
index 907be279cb..854f4ef0c8 100644
--- a/dashboard-ui/itembynamedetails.html
+++ b/dashboard-ui/itembynamedetails.html
@@ -37,6 +37,7 @@
         </div>
         <div id="tvGenreTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
+                <a href="tvrecommended.html">${TabSuggested}</a>
                 <a href="tvlatest.html">${TabLatest}</a>
                 <a href="tvshows.html">${TabShows}</a>
                 <a href="episodes.html">${TabEpisodes}</a>
@@ -47,6 +48,7 @@
         </div>
         <div id="tvPeopleTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
+                <a href="tvrecommended.html">${TabSuggested}</a>
                 <a href="tvlatest.html">${TabLatest}</a>
                 <a href="tvshows.html">${TabShows}</a>
                 <a href="episodes.html">${TabEpisodes}</a>
@@ -57,6 +59,7 @@
         </div>
         <div id="tvStudioTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
+                <a href="tvrecommended.html">${TabSuggested}</a>
                 <a href="tvlatest.html">${TabLatest}</a>
                 <a href="tvshows.html">${TabShows}</a>
                 <a href="episodes.html">${TabEpisodes}</a>
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index f0b99c0a3f..7848f5aa79 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -39,6 +39,7 @@
         </div>
         <div id="tvShowsTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
+                <a href="tvrecommended.html">${TabSuggested}</a>
                 <a href="tvlatest.html">${TabLatest}</a>
                 <a href="tvshows.html" class="ui-btn-active">${TabShows}</a>
                 <a href="episodes.html">${TabEpisodes}</a>
diff --git a/dashboard-ui/mypreferenceswebclient.html b/dashboard-ui/mypreferenceswebclient.html
index 002fea201f..797f6bcc5d 100644
--- a/dashboard-ui/mypreferenceswebclient.html
+++ b/dashboard-ui/mypreferenceswebclient.html
@@ -27,9 +27,10 @@
                     <select id="selectHomeSection1" data-mini="true">
                         <option value="">${OptionAuto}</option>
                         <option value="latestmedia">${OptionLatestMedia}</option>
-                        <option value="librarybuttons">${OptionLibraryButtons}</option>
-                        <option value="librarytiles">${OptionLibraryTiles}</option>
-                        <option value="smalllibrarytiles">${OptionSmallLibraryTiles}</option>
+                        <option value="librarytiles">${OptionMyLibrary}</option>
+                        <option value="smalllibrarytiles">${OptionMyLibrarySmall}</option>
+                        <option value="librarybuttons">${OptionMyLibraryButtons}</option>
+                        <option value="folders">${OptionLibraryFolders}</option>
                         <option value="resume">${OptionResumablemedia}</option>
                     </select>
                 </li>
@@ -38,9 +39,10 @@
                     <select id="selectHomeSection2" data-mini="true">
                         <option value="">${OptionAuto}</option>
                         <option value="latestmedia">${OptionLatestMedia}</option>
-                        <option value="librarybuttons">${OptionLibraryButtons}</option>
-                        <option value="librarytiles">${OptionLibraryTiles}</option>
-                        <option value="smalllibrarytiles">${OptionSmallLibraryTiles}</option>
+                        <option value="librarytiles">${OptionMyLibrary}</option>
+                        <option value="smalllibrarytiles">${OptionMyLibrarySmall}</option>
+                        <option value="librarybuttons">${OptionMyLibraryButtons}</option>
+                        <option value="folders">${OptionLibraryFolders}</option>
                         <option value="resume">${OptionResumablemedia}</option>
                         <option value="none">${OptionNone}</option>
                     </select>
@@ -50,9 +52,10 @@
                     <select id="selectHomeSection3" data-mini="true">
                         <option value="">${OptionAuto}</option>
                         <option value="latestmedia">${OptionLatestMedia}</option>
-                        <option value="librarybuttons">${OptionLibraryButtons}</option>
-                        <option value="librarytiles">${OptionLibraryTiles}</option>
-                        <option value="smalllibrarytiles">${OptionSmallLibraryTiles}</option>
+                        <option value="librarytiles">${OptionMyLibrary}</option>
+                        <option value="smalllibrarytiles">${OptionMyLibrarySmall}</option>
+                        <option value="librarybuttons">${OptionMyLibraryButtons}</option>
+                        <option value="folders">${OptionLibraryFolders}</option>
                         <option value="resume">${OptionResumablemedia}</option>
                         <option value="none">${OptionNone}</option>
                     </select>
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index 3ad19b9b35..b83ea768b2 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -103,7 +103,7 @@
         switch (index) {
 
             case 0:
-                return 'librarybuttons';
+                return 'smalllibrarytiles';
             case 1:
                 return 'resume';
             case 2:
@@ -179,14 +179,16 @@
         });
     }
 
-    function loadLibraryTiles(elem, userId, shape) {
+    function loadLibraryTiles(elem, userId, shape, index) {
 
         getUserViews(userId).done(function (items) {
 
             var html = '';
 
             if (items.length) {
+
                 html += '<h1 class="listHeader">' + Globalize.translate('HeaderMyLibrary') + '</h1>';
+
                 html += '<div>';
                 html += LibraryBrowser.getPosterViewHtml({
                     items: items,
@@ -205,6 +207,42 @@
         });
     }
 
+    function loadLibraryFolders(elem, userId, shape, index) {
+
+        ApiClient.getItems(userId, {
+
+            SortBy: "SortName"
+
+        }).done(function (result) {
+
+            var html = '';
+            var items = result.Items;
+
+            for (var i = 0, length = items.length; i < length; i++) {
+                items[i].url = 'itemlist.html?parentid=' + items[i].Id;
+            }
+
+            if (items.length) {
+
+                html += '<h1 class="listHeader">' + Globalize.translate('HeaderLibraryFolders') + '</h1>';
+
+                html += '<div>';
+                html += LibraryBrowser.getPosterViewHtml({
+                    items: items,
+                    shape: shape,
+                    showTitle: true,
+                    centerText: true,
+                    lazy: true
+                });
+                html += '</div>';
+            }
+
+            $(elem).html(html).trigger('create').createPosterItemMenus();
+
+            handleLibraryLinkNavigations(elem);
+        });
+    }
+
     function loadResume(elem, userId) {
 
         var screenWidth = $(window).width();
@@ -256,10 +294,10 @@
             loadRecentlyAdded(elem, userId);
         }
         else if (section == 'librarytiles') {
-            loadLibraryTiles(elem, userId, 'backdrop');
+            loadLibraryTiles(elem, userId, 'backdrop', index);
         }
         else if (section == 'smalllibrarytiles') {
-            loadLibraryTiles(elem, userId, 'smallBackdrop');
+            loadLibraryTiles(elem, userId, 'smallBackdrop', index);
         }
         else if (section == 'resume') {
             loadResume(elem, userId);
@@ -267,6 +305,9 @@
         else if (section == 'librarybuttons') {
             loadlibraryButtons(elem, userId, index);
 
+        } else if (section == 'folders') {
+            loadLibraryFolders(elem, userId, 'backdrop', index);
+
         } else {
 
             elem.empty();
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index d79f3984dc..eab5a30f84 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -390,7 +390,7 @@
             }
 
             if (item.CollectionType == 'tvshows') {
-                return 'tvlatest.html?topParentId=' + item.Id;
+                return 'tvrecommended.html?topParentId=' + item.Id;
             }
 
             if (item.CollectionType == 'music') {
diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js
index 45f65c8f2e..fd01c1ddf2 100644
--- a/dashboard-ui/scripts/tvrecommended.js
+++ b/dashboard-ui/scripts/tvrecommended.js
@@ -4,7 +4,7 @@
 
         var screenWidth = $(window).width();
 
-        var options = {
+        var query = {
 
             Limit: 24,
             Fields: "PrimaryImageAspectRatio,SeriesInfo,DateCreated",
@@ -12,7 +12,19 @@
             ExcludeLocationTypes: "Virtual"
         };
 
-        ApiClient.getNextUpEpisodes(options).done(function (result) {
+        query.ParentId = LibraryMenu.getTopParentId();
+        
+        if (query.ParentId) {
+
+            $('.scopedLibraryViewNav', page).show();
+            $('.globalNav', page).hide();
+
+        } else {
+            $('.scopedLibraryViewNav', page).hide();
+            $('.globalNav', page).show();
+        }
+
+        ApiClient.getNextUpEpisodes(query).done(function (result) {
 
             if (result.Items.length) {
                 $('.noNextUpItems', page).hide();
diff --git a/dashboard-ui/scripts/tvupcoming.js b/dashboard-ui/scripts/tvupcoming.js
index e2419f64bd..e14c2e4449 100644
--- a/dashboard-ui/scripts/tvupcoming.js
+++ b/dashboard-ui/scripts/tvupcoming.js
@@ -11,6 +11,8 @@
             UserId: Dashboard.getCurrentUserId()
         };
 
+        query.ParentId = LibraryMenu.getTopParentId();
+
         $.getJSON(ApiClient.getUrl("Shows/Upcoming", query)).done(function (result) {
 
             var items = result.Items;
diff --git a/dashboard-ui/tvgenres.html b/dashboard-ui/tvgenres.html
index 0a50005865..082b04222d 100644
--- a/dashboard-ui/tvgenres.html
+++ b/dashboard-ui/tvgenres.html
@@ -6,6 +6,7 @@
 <body>
     <div id="tvGenresPage" data-role="page" class="page libraryPage" data-theme="b">
         <div class="libraryViewNav scopedLibraryViewNav">
+            <a href="tvrecommended.html">${TabSuggested}</a>
             <a href="tvlatest.html">${TabLatest}</a>
             <a href="tvshows.html">${TabShows}</a>
             <a href="episodes.html">${TabEpisodes}</a>
diff --git a/dashboard-ui/tvlatest.html b/dashboard-ui/tvlatest.html
index 05522db80e..2d49ad1664 100644
--- a/dashboard-ui/tvlatest.html
+++ b/dashboard-ui/tvlatest.html
@@ -6,6 +6,7 @@
 <body>
     <div id="tvNextUpPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="series" data-theme="b">
         <div class="libraryViewNav scopedLibraryViewNav">
+            <a href="tvrecommended.html">${TabSuggested}</a>
             <a href="#" class="ui-btn-active">${TabLatest}</a>
             <a href="tvshows.html">${TabShows}</a>
             <a href="episodes.html">${TabEpisodes}</a>
diff --git a/dashboard-ui/tvpeople.html b/dashboard-ui/tvpeople.html
index d323f757a3..331b86a0e6 100644
--- a/dashboard-ui/tvpeople.html
+++ b/dashboard-ui/tvpeople.html
@@ -6,6 +6,7 @@
 <body>
     <div id="tvPeoplePage" data-role="page" class="page libraryPage" data-theme="b">
         <div class="libraryViewNav scopedLibraryViewNav">
+            <a href="tvrecommended.html">${TabSuggested}</a>
             <a href="tvlatest.html">${TabLatest}</a>
             <a href="tvshows.html">${TabShows}</a>
             <a href="episodes.html">${TabEpisodes}</a>
diff --git a/dashboard-ui/tvrecommended.html b/dashboard-ui/tvrecommended.html
index b0acaf09dc..96f57bd089 100644
--- a/dashboard-ui/tvrecommended.html
+++ b/dashboard-ui/tvrecommended.html
@@ -6,12 +6,21 @@
 <body>
     <div id="tvRecommendedPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="series" data-theme="b">
 
-        <div class="libraryViewNav scopedLibraryViewNav">
+        <div class="libraryViewNav globalNav" style="display: none;">
             <a href="index.html">${TabHome}</a>
             <a href="#" class="ui-btn-active">${TabNextUp}</a>
             <a href="favorites.html">${TabFavorites}</a>
             <a href="tvupcoming.html">${TabUpcoming}</a>
         </div>
+        <div class="libraryViewNav scopedLibraryViewNav" style="display: none;">
+            <a href="tvrecommended.html" class="ui-btn-active">${TabSuggested}</a>
+            <a href="tvlatest.html">${TabLatest}</a>
+            <a href="tvshows.html">${TabShows}</a>
+            <a href="episodes.html">${TabEpisodes}</a>
+            <a href="tvgenres.html">${TabGenres}</a>
+            <a href="tvpeople.html">${TabPeople}</a>
+            <a href="tvstudios.html">${TabNetworks}</a>
+        </div>
         <br />
         <div data-role="content">
             <table class="ehsContent homeEhsContent" style="text-align: center;">
diff --git a/dashboard-ui/tvshows.html b/dashboard-ui/tvshows.html
index 43651dc23c..304d780d94 100644
--- a/dashboard-ui/tvshows.html
+++ b/dashboard-ui/tvshows.html
@@ -6,6 +6,7 @@
 <body>
     <div id="tvShowsPage" data-role="page" class="page libraryPage" data-theme="b">
         <div class="libraryViewNav scopedLibraryViewNav">
+            <a href="tvrecommended.html">${TabSuggested}</a>
             <a href="tvlatest.html">${TabLatest}</a>
             <a href="#" class="ui-btn-active">${TabShows}</a>
             <a href="episodes.html">${TabEpisodes}</a>
diff --git a/dashboard-ui/tvstudios.html b/dashboard-ui/tvstudios.html
index 1626877297..6ecfc4b7c6 100644
--- a/dashboard-ui/tvstudios.html
+++ b/dashboard-ui/tvstudios.html
@@ -6,6 +6,7 @@
 <body>
     <div id="tvStudiosPage" data-role="page" class="page libraryPage" data-theme="b">
         <div class="libraryViewNav scopedLibraryViewNav">
+            <a href="tvrecommended.html">${TabSuggested}</a>
             <a href="tvlatest.html">${TabLatest}</a>
             <a href="tvshows.html">${TabShows}</a>
             <a href="episodes.html">${TabEpisodes}</a>