diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index 08fc90c6c..8dd3f253b 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -532,7 +532,7 @@
     }
 
     .posterTileItem {
-        width: 15.9%;
+        width: 15.8%;
     }
 
         .posterTileItem .tileImage {
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index d20416613..f8c53565c 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -57,7 +57,7 @@
             <div id="songTabs" style="display: none;">
                 <div data-role="controlgroup" data-type="horizontal" class="libraryViewNav" data-mini="true">
                     <a href="musicrecommended.html" data-role="button">Suggested</a>
-                    <a href="#" data-role="button" class="ui-btn-active">Songs</a>
+                    <a href="songs.html" data-role="button" class="ui-btn-active">Songs</a>
                     <a href="musicalbums.html" data-role="button">Albums</a>
                     <a href="musicartists.html" data-role="button">Artists</a>
                     <a href="musicgenres.html" data-role="button">Genres</a>
@@ -66,7 +66,7 @@
             <div id="albumTabs" style="display: none;">
                 <div data-role="controlgroup" data-type="horizontal" class="libraryViewNav" data-mini="true">
                     <a href="musicrecommended.html" data-role="button">Suggested</a>
-                    <a href="#" data-role="button">Songs</a>
+                    <a href="songs.html" data-role="button">Songs</a>
                     <a href="musicalbums.html" class="ui-btn-active" data-role="button">Albums</a>
                     <a href="musicartists.html" data-role="button">Artists</a>
                     <a href="musicgenres.html" data-role="button">Genres</a>
diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js
index 6cb0b6aa9..2cdb12fba 100644
--- a/dashboard-ui/scripts/itembynamedetailpage.js
+++ b/dashboard-ui/scripts/itembynamedetailpage.js
@@ -1,6 +1,7 @@
 (function ($, document, LibraryBrowser) {
 
     var currentItem;
+    var shape;
 
     function reload(page) {
 
@@ -209,38 +210,72 @@
 
         $("#radioMovies", page).on("click", function () {
 
-            loadItems(page, { IncludeItemTypes: "Movie" });
+            shape = "backdrop";
+            loadItems(page, {
+                IncludeItemTypes: "Movie",
+                PersonTypes: "",
+                Artists: ""
+            });
 
         });
 
         $("#radioShows", page).on("click", function () {
 
-            loadItems(page, { IncludeItemTypes: "Series" });
+            shape = "backdrop";
+            loadItems(page, {
+                IncludeItemTypes: "Series",
+                PersonTypes: "",
+                Artists: ""
+            });
         });
 
         $("#radioTrailers", page).on("click", function () {
 
-            loadItems(page, { IncludeItemTypes: "Trailer" });
+            shape = "poster";
+            loadItems(page, {
+                IncludeItemTypes: "Trailer",
+                PersonTypes: "",
+                Artists: ""
+            });
         });
 
         $("#radioGames", page).on("click", function () {
 
-            loadItems(page, { IncludeItemTypes: "Game" });
+            shape = "poster";
+            loadItems(page, {
+                IncludeItemTypes: "Game",
+                PersonTypes: "",
+                Artists: ""
+            });
         });
 
         $("#radioGuestStar", page).on("click", function () {
 
-            loadItems(page, { IncludeItemTypes: "Episode", PersonTypes: "GuestStar" });
+            shape = "backdrop";
+            loadItems(page, {
+                IncludeItemTypes: "Episode",
+                PersonTypes: "GuestStar",
+                Artists: ""
+            });
         });
 
         $("#radioAlbums", page).on("click", function () {
 
-            loadItems(page, { IncludeItemTypes: "MusicAlbum", PersonTypes: "Artist" });
+            shape = "cd";
+            loadItems(page, {
+                IncludeItemTypes: "MusicAlbum",
+                PersonTypes: "Artist",
+                Artists: ""
+            });
         });
 
         $("#radioSongs", page).on("click", function () {
 
-            loadItems(page, { IncludeItemTypes: "Audio", PersonTypes: "Artist" });
+            loadItems(page, {
+                IncludeItemTypes: "Audio",
+                PersonTypes: "Artist",
+                Artists: ""
+            });
         });
     }
 
@@ -303,7 +338,10 @@
         else if (currentItem.Type == "Studio") {
             query.Studios = currentItem.Name;
         }
-    }
+        else if (currentItem.Type == "Artist") {
+            query.Artists = currentItem.Name;
+        }
+}
 
     function loadItems(page, options) {
 
@@ -338,7 +376,8 @@
             html += LibraryBrowser.getPosterDetailViewHtml({
                 items: result.Items,
                 useAverageAspectRatio: true,
-                preferBackdrop: true
+                preferBackdrop: true,
+                shape: shape
             });
 
             html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 0cf04c6e0..d0279c611 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -245,11 +245,20 @@
                 html += '<td><a href="' + LibraryBrowser.getHref(item, "music") + '">' + (item.Name || "") + '</a></td>';
 
                 if (options.showAlbum) {
-                    html += '<td><a href="itemdetails.html?id=' + item.ParentId + '">' + item.Album + '</a></td>';
+                    if (item.Album) {
+                        html += '<td><a href="itemdetails.html?id=' + item.ParentId + '">' + item.Album + '</a></td>';
+                    } else {
+                        html += '<td></td>';
+                    }
                 }
 
                 if (options.showArtist) {
-                    html += '<td>' + item.Artist + '</td>';
+                    
+                    if (item.Artist) {
+                        html += '<td><a href="itembynamedetails.html?context=music&artist=' + item.Artist + '">' + item.Artist + '</a></td>';
+                    } else {
+                        html += '<td></td>';
+                    }
                 }
 
                 var time = DashboardPage.getDisplayText(item.RunTimeTicks || 0);