diff --git a/dashboard-ui/css/detailtable.css b/dashboard-ui/css/detailtable.css
index 9698334db..c7ade3fa7 100644
--- a/dashboard-ui/css/detailtable.css
+++ b/dashboard-ui/css/detailtable.css
@@ -43,7 +43,7 @@
 }
 
 .detailTable tr:hover {
-    background: #444;
+    background: #555;
 }
 
 .detailTable .imgUserItemRating {
diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html
index e3f90be28..1d6848b41 100644
--- a/dashboard-ui/itembynamedetails.html
+++ b/dashboard-ui/itembynamedetails.html
@@ -49,6 +49,7 @@
             <div id="tvGenreTabs" class="itemTabs" style="display: none;">
                 <div data-role="controlgroup" data-type="horizontal" class="libraryViewNav" data-mini="true">
                     <a href="tvrecommended.html" data-role="button">Suggested</a>
+                    <a href="tvnextup.html" data-role="button">Next Up</a>
                     <a href="tvshows.html" data-role="button">Shows</a>
                     <a href="tvgenres.html" data-role="button" class="ui-btn-active">Genres</a>
                     <a href="tvpeople.html" data-role="button">Actors</a>
@@ -58,6 +59,7 @@
             <div id="tvPeopleTabs" class="itemTabs" style="display: none;">
                 <div data-role="controlgroup" data-type="horizontal" class="libraryViewNav" data-mini="true">
                     <a href="tvrecommended.html" data-role="button">Suggested</a>
+                    <a href="tvnextup.html" data-role="button">Next Up</a>
                     <a href="tvshows.html" data-role="button">Shows</a>
                     <a href="tvgenres.html" data-role="button">Genres</a>
                     <a href="tvpeople.html" data-role="button" class="ui-btn-active">Actors</a>
@@ -67,6 +69,7 @@
             <div id="tvStudioTabs" class="itemTabs" style="display: none;">
                 <div data-role="controlgroup" data-type="horizontal" class="libraryViewNav" data-mini="true">
                     <a href="tvrecommended.html" data-role="button">Suggested</a>
+                    <a href="tvnextup.html" data-role="button">Next Up</a>
                     <a href="tvshows.html" data-role="button">Shows</a>
                     <a href="tvgenres.html" data-role="button">Genres</a>
                     <a href="tvpeople.html" data-role="button">Actors</a>
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index 700ccca8c..2a8225abd 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -48,6 +48,7 @@
             <div id="tvShowsTabs" class="itemTabs" style="display: none;">
                 <div data-role="controlgroup" data-type="horizontal" class="libraryViewNav" data-mini="true">
                     <a href="tvrecommended.html" data-role="button">Suggested</a>
+                    <a href="tvnextup.html" data-role="button">Next Up</a>
                     <a href="tvshows.html" data-role="button" class="ui-btn-active">Shows</a>
                     <a href="tvgenres.html" data-role="button">Genres</a>
                     <a href="tvpeople.html" data-role="button">Actors</a>
@@ -108,8 +109,8 @@
 
                     <div class="itemDetailBlock">
 
-                        <h1 id="albumArtist" class="detailPageName hide"></h1>
-                        <h1 id="seriesName" class="detailPageName hide"></h1>
+                        <h1 id="grandParentName" class="detailPageName hide"></h1>
+                        <h1 id="parentName" class="detailPageName hide"></h1>
                         <h1 id="itemName" class="detailPageName"></h1>
 
                         <p id="itemMiscInfo" class="itemMiscInfo"></p>
diff --git a/dashboard-ui/scripts/Itemdetailpage.js b/dashboard-ui/scripts/Itemdetailpage.js
index 58e20a81d..d900f8aa6 100644
--- a/dashboard-ui/scripts/Itemdetailpage.js
+++ b/dashboard-ui/scripts/Itemdetailpage.js
@@ -19,7 +19,7 @@
             if (item.IndexNumber != null) {
                 name = item.IndexNumber + " - " + name;
             }
-            if (item.ParentIndexNumber != null) {
+            if (item.ParentIndexNumber != null && item.Type != "Episode") {
                 name = item.ParentIndexNumber + "." + name;
             }
 
@@ -30,30 +30,41 @@
             $('#itemName', page).html(name);
 
             if (item.AlbumArtist && item.Type == "Audio") {
-                $('#albumArtist', page).html('<a class="detailPageParentLink" href="itembynamedetails.html?context=music&artist=' + ApiClient.encodeName(item.AlbumArtist) + '">' + item.AlbumArtist + '</a>').show().trigger('create');
+                $('#grandParentName', page).html('<a class="detailPageParentLink" href="itembynamedetails.html?context=music&artist=' + ApiClient.encodeName(item.AlbumArtist) + '">' + item.AlbumArtist + '</a>').show().trigger('create');
+            }
+            else if (item.AlbumArtist && item.Type == "MusicAlbum") {
+                $('#grandParentName', page).html('<a class="detailPageParentLink" href="itembynamedetails.html?context=music&artist=' + ApiClient.encodeName(item.AlbumArtist) + '">' + item.AlbumArtist + '</a>').show().trigger('create');
+            }
+            else if (item.SeriesName && item.Type == "Episode") {
+
+                $('#grandParentName', page).html('<a class="detailPageParentLink" href="itemdetails.html?id=' + item.SeriesId + '">' + item.SeriesName + '</a>').show().trigger('create');
             }
             else {
-                $('#albumArtist', page).hide();
+                $('#grandParentName', page).hide();
             }
 
-            if (item.SeriesName) {
+            if (item.SeriesName && item.Type == "Season") {
 
-                $('#seriesName', page).html('<a class="detailPageParentLink" href="itemdetails.html?id=' + item.SeriesId + '">' + item.SeriesName + '</a>').show().trigger('create');
+                $('#parentName', page).html('<a class="detailPageParentLink" href="itemdetails.html?id=' + item.SeriesId + '">' + item.SeriesName + '</a>').show().trigger('create');
+            }
+            else if (item.ParentIndexNumber && item.Type == "Episode") {
+
+                $('#parentName', page).html('<a class="detailPageParentLink" href="itemdetails.html?id=' + item.ParentId + '">Season ' + item.ParentIndexNumber + '</a>').show().trigger('create');
             }
             else if (item.Album && item.Type == "Audio" && item.ParentId) {
-                $('#seriesName', page).html('<a class="detailPageParentLink" href="itemdetails.html?id=' + item.ParentId + '">' + item.Album + '</a>').show().trigger('create');
+                $('#parentName', page).html('<a class="detailPageParentLink" href="itemdetails.html?id=' + item.ParentId + '">' + item.Album + '</a>').show().trigger('create');
 
             }
             else if (item.AlbumArtist && item.Type == "MusicAlbum") {
-                $('#albumArtist', page).html('<a class="detailPageParentLink" href="itembynamedetails.html?context=music&artist=' + ApiClient.encodeName(item.AlbumArtist) + '">' + item.AlbumArtist + '</a>').show().trigger('create');
+                $('#grandParentName', page).html('<a class="detailPageParentLink" href="itembynamedetails.html?context=music&artist=' + ApiClient.encodeName(item.AlbumArtist) + '">' + item.AlbumArtist + '</a>').show().trigger('create');
 
             }
             else if (item.Album) {
-                $('#seriesName', page).html(item.Album).show();
+                $('#parentName', page).html(item.Album).show();
 
             }
             else {
-                $('#seriesName', page).hide();
+                $('#parentName', page).hide();
             }
 
             var context = getContext(item);
@@ -68,7 +79,7 @@
                 $('#playButtonShadow', page).hide();
             }
 
-	        $(".autoNumeric").autoNumeric('init');
+            $(".autoNumeric").autoNumeric('init');
 
             Dashboard.hideLoadingMsg();
         });
diff --git a/dashboard-ui/scripts/songs.js b/dashboard-ui/scripts/songs.js
index 5b0a4d836..1fc02e2b2 100644
--- a/dashboard-ui/scripts/songs.js
+++ b/dashboard-ui/scripts/songs.js
@@ -3,7 +3,7 @@
     // The base query options
     var query = {
 
-        SortBy: "Artist,Album,SortName",
+        SortBy: "Album,SortName",
         SortOrder: "Ascending",
         IncludeItemTypes: "Audio",
         Recursive: true,
diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js
index d09090980..05b06f990 100644
--- a/dashboard-ui/scripts/tvrecommended.js
+++ b/dashboard-ui/scripts/tvrecommended.js
@@ -1,64 +1,63 @@
 (function ($, document) {
 
-	$(document).on('pagebeforeshow', "#tvRecommendedPage", function () {
+    $(document).on('pagebeforeshow', "#tvRecommendedPage", function () {
 
-		var page = this;
+        var page = this;
 
-		var options = {
+        var options = {
 
-			SortBy: "DateCreated",
-			SortOrder: "Descending",
-			IncludeItemTypes: "Episode",
-			Limit: 6,
-			Recursive: true,
-			Fields: "PrimaryImageAspectRatio,SeriesInfo",
-			Filters: "IsUnplayed"
-		};
+            SortBy: "DateCreated",
+            SortOrder: "Descending",
+            IncludeItemTypes: "Episode",
+            Limit: 6,
+            Recursive: true,
+            Fields: "PrimaryImageAspectRatio,SeriesInfo",
+            Filters: "IsUnplayed"
+        };
 
-		ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) {
+        ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) {
 
-		    $('#recentlyAddedItems', page).html(LibraryBrowser.getPosterViewHtml({
-				items: result.Items,
-				useAverageAspectRatio: true,
-				showNewIndicator: false,
-				shape: "backdrop",
-				showTitle: true,
-				showParentTitle: true
-			}));
+            $('#recentlyAddedItems', page).html(LibraryBrowser.getPosterViewHtml({
+                items: result.Items,
+                useAverageAspectRatio: true,
+                showNewIndicator: false,
+                shape: "backdrop",
+                showTitle: true,
+                showParentTitle: true
+            }));
 
-		});
+        });
 
+        options = {
 
-		options = {
+            SortBy: "DatePlayed",
+            SortOrder: "Descending",
+            IncludeItemTypes: "Episode",
+            Filters: "IsResumable",
+            Limit: 6,
+            Recursive: true,
+            Fields: "PrimaryImageAspectRatio,SeriesInfo,DateCreated"
+        };
 
-			SortBy: "DatePlayed",
-			SortOrder: "Descending",
-			IncludeItemTypes: "Episode",
-			Filters: "IsResumable",
-			Limit: 6,
-			Recursive: true,
-			Fields: "PrimaryImageAspectRatio,SeriesInfo,DateCreated"
-		};
+        ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) {
 
-		ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) {
+            if (result.Items.length) {
+                $('#resumableSection', page).show();
+            } else {
+                $('#resumableSection', page).hide();
+            }
 
-			if (result.Items.length) {
-				$('#resumableSection', page).show();
-			} else {
-				$('#resumableSection', page).hide();
-			}
+            $('#resumableItems', page).html(LibraryBrowser.getPosterViewHtml({
+                items: result.Items,
+                useAverageAspectRatio: true,
+                shape: "backdrop",
+                showTitle: true,
+                showParentTitle: true
+            }));
 
-			$('#resumableItems', page).html(LibraryBrowser.getPosterViewHtml({
-				items: result.Items,
-				useAverageAspectRatio: true,
-				shape: "backdrop",
-				showTitle: true,
-				showParentTitle: true
-			}));
+        });
 
-		});
-
-	});
+    });
 
 
 })(jQuery, document);
\ No newline at end of file
diff --git a/dashboard-ui/songs.html b/dashboard-ui/songs.html
index 2a5c6babe..4ab16ce99 100644
--- a/dashboard-ui/songs.html
+++ b/dashboard-ui/songs.html
@@ -33,10 +33,7 @@
                         <strong>Sort By:</strong>
                     </legend>
 
-                    <input class="radioSortBy" data-theme="c" type="radio" name="radioSortBy" id="radioArtistAlbumSortName" value="on" checked="checked" data-sortby="Artist,Album,SortName" data-mini="true">
-                    <label for="radioArtistAlbumSortName">Artist, Album, Track</label>
-
-                    <input class="radioSortBy" data-theme="c" type="radio" name="radioSortBy" id="radioAlbum" value="on" checked="checked" data-sortby="Album" data-mini="true">
+                    <input class="radioSortBy" data-theme="c" type="radio" name="radioSortBy" id="radioAlbum" value="on" checked="checked" data-sortby="Album,SortName" data-mini="true">
                     <label for="radioAlbum">Album</label>
 
                     <input class="radioSortBy" data-theme="c" type="radio" name="radioSortBy" id="radioArtist" value="on" checked="checked" data-sortby="Artist" data-mini="true">
diff --git a/dashboard-ui/tvgenres.html b/dashboard-ui/tvgenres.html
index 07d43ad15..2b2a314ed 100644
--- a/dashboard-ui/tvgenres.html
+++ b/dashboard-ui/tvgenres.html
@@ -10,6 +10,7 @@
         <div data-role="content">
             <div data-role="controlgroup" data-type="horizontal" class="libraryViewNav" data-mini="true">
                 <a href="tvrecommended.html" data-role="button">Suggested</a>
+                <a href="tvnextup.html" data-role="button">Next Up</a>
                 <a href="tvshows.html" data-role="button">Shows</a>
                 <a href="tvgenres.html" data-role="button" class="ui-btn-active">Genres</a>
                 <a href="tvpeople.html" data-role="button">Actors</a>
diff --git a/dashboard-ui/tvpeople.html b/dashboard-ui/tvpeople.html
index fb8fa086e..7464091fd 100644
--- a/dashboard-ui/tvpeople.html
+++ b/dashboard-ui/tvpeople.html
@@ -10,6 +10,7 @@
         <div data-role="content">
             <div data-role="controlgroup" data-type="horizontal" class="libraryViewNav" data-mini="true">
                 <a href="tvrecommended.html" data-role="button">Suggested</a>
+                <a href="tvnextup.html" data-role="button">Next Up</a>
                 <a href="tvshows.html" data-role="button">Shows</a>
                 <a href="tvgenres.html" data-role="button">Genres</a>
                 <a href="tvpeople.html" data-role="button" class="ui-btn-active">Actors</a>
diff --git a/dashboard-ui/tvrecommended.html b/dashboard-ui/tvrecommended.html
index 00aaacc53..a0931ae18 100644
--- a/dashboard-ui/tvrecommended.html
+++ b/dashboard-ui/tvrecommended.html
@@ -10,6 +10,7 @@
         <div data-role="content">
             <div data-role="controlgroup" data-type="horizontal" class="libraryViewNav" data-mini="true">
                 <a href="tvrecommended.html" data-role="button" class="ui-btn-active">Suggested</a>
+                <a href="tvnextup.html" data-role="button">Next Up</a>
                 <a href="tvshows.html" data-role="button">Shows</a>
                 <a href="tvgenres.html" data-role="button">Genres</a>
                 <a href="tvpeople.html" data-role="button">Actors</a>
diff --git a/dashboard-ui/tvshows.html b/dashboard-ui/tvshows.html
index d19e58853..e5857fc78 100644
--- a/dashboard-ui/tvshows.html
+++ b/dashboard-ui/tvshows.html
@@ -10,6 +10,7 @@
         <div data-role="content">
             <div data-role="controlgroup" data-type="horizontal" class="libraryViewNav" data-mini="true">
                 <a href="tvrecommended.html" data-role="button">Suggested</a>
+                <a href="tvnextup.html" data-role="button">Next Up</a>
                 <a href="tvshows.html" data-role="button" class="ui-btn-active">Shows</a>
                 <a href="tvgenres.html" data-role="button">Genres</a>
                 <a href="tvpeople.html" data-role="button">Actors</a>
diff --git a/dashboard-ui/tvstudios.html b/dashboard-ui/tvstudios.html
index 50cd62735..067a4301c 100644
--- a/dashboard-ui/tvstudios.html
+++ b/dashboard-ui/tvstudios.html
@@ -10,6 +10,7 @@
         <div data-role="content">
             <div data-role="controlgroup" data-type="horizontal" class="libraryViewNav" data-mini="true">
                 <a href="tvrecommended.html" data-role="button">Suggested</a>
+                <a href="tvnextup.html" data-role="button">Next Up</a>
                 <a href="tvshows.html" data-role="button">Shows</a>
                 <a href="tvgenres.html" data-role="button">Genres</a>
                 <a href="tvpeople.html" data-role="button">Actors</a>