diff --git a/dashboard-ui/css/detailtable.css b/dashboard-ui/css/detailtable.css
index 5111c8dae7..5bc058f096 100644
--- a/dashboard-ui/css/detailtable.css
+++ b/dashboard-ui/css/detailtable.css
@@ -56,6 +56,11 @@
     white-space: nowrap;
 }
 
+.detailTableButtonsCell button {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+
     .detailTableButtonsCell button + button {
         margin-left: .5em;
     }
diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index cbb232c96d..80f23b85c4 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -590,7 +590,7 @@ a.itemTag:hover {
 }
 
 .lblDetailTab {
-    font-size: 16px!important;
+    font-size: 15px!important;
     font-weight: 400!important;
     font-family: 'Open Sans';
     padding: .5em 1em;
@@ -710,14 +710,12 @@ a.itemTag:hover {
     }
 
     .itemBackdrop {
-        background-image: none!important;
         height: auto;
     }
 
     .itemBackdropContent {
         position: static;
-        padding: 1em 1em 0;
-        background-color: transparent;
+        padding: 1em 1em .5em;
     }
 
     .itemDetailImage {
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index 6a3c280f00..d51220ae4b 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -138,19 +138,18 @@
                     <a class="btnPlayExternal hide" data-role="button" data-icon="play" data-inline="true" data-mini="true" href="#" target="_blank">${ButtonPlay}</a>
                     <a class="btnEdit hide" data-role="button" data-icon="edit" data-inline="true" data-mini="true" href="#">${ButtonEdit}</a>
                 </div>
+                <p class="itemGenres mobileGenres"></p>
+                <p class="itemOverview mobileOverview"></p>
             </div>
             <a href="#" id="lnkPreviousItem" class="lnkPreviousItem lnkSibling hide" data-role="button" title="${ButtonPrevious}" data-icon="carat-l" data-mini="true" data-inline="true" data-iconpos="notext">${ButtonPrevious}</a>
             <a href="#" id="lnkNextItem" class="lnkNextItem lnkSibling hide" data-role="button" title="${ButtonNext}" data-icon="carat-r" data-mini="true" data-inline="true" data-iconpos="notext">${ButtonNext}</a>
-            <p class="itemGenres mobileGenres"></p>
-            <p class="itemOverview mobileOverview"></p>
         </div>
         <div data-role="content">
             <div class="detailPageContent">
 
                 <div id="detailsSection" class="detailSection hide">
 
-                    <br />
-                    <div class="tabButtons"></div>
+                    <div class="tabButtons" style="margin-top: .75em;"></div>
 
                     <div class="detailSectionContent" style="padding: .25em .7em 0;">
 
diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js
index 9310224b65..3ded84809f 100644
--- a/dashboard-ui/scripts/itembynamedetailpage.js
+++ b/dashboard-ui/scripts/itembynamedetailpage.js
@@ -426,7 +426,8 @@
 
                 html += LibraryBrowser.getSongTableHtml(result.Items, {
                     showAlbum: true,
-                    showArtist: true
+                    showArtist: true,
+                    showAlbumArtist: true
                 });
 
             }
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index 4122b9740a..a6402773f1 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -912,7 +912,7 @@
 
                 $('#themeSongsCollapsible', page).show();
 
-                $('#themeSongsContent', page).html(LibraryBrowser.getSongTableHtml(result.Items, { showArtist: true, showAlbum: true })).trigger('create');
+                $('#themeSongsContent', page).html(LibraryBrowser.getSongTableHtml(result.Items, { showArtist: true, showAlbum: true, showAlbumArtist: true })).trigger('create');
             } else {
                 $('#themeSongsCollapsible', page).hide();
             }
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 6c18da00f3..f71a426a52 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -185,14 +185,17 @@
             html += '<tr>';
 
             html += LibraryBrowser.getSongHeaderCellHtml('', '', options.enableColumnSorting);
-            html += LibraryBrowser.getSongHeaderCellHtml('', '', options.enableColumnSorting);
+            html += LibraryBrowser.getSongHeaderCellHtml('Disc', 'desktopColumn', options.enableColumnSorting);
+            html += LibraryBrowser.getSongHeaderCellHtml('#', 'desktopColumn', options.enableColumnSorting);
             html += LibraryBrowser.getSongHeaderCellHtml('Track', '', options.enableColumnSorting, 'Name', options.sortBy, options.sortOrder);
 
             if (options.showAlbum) {
                 html += LibraryBrowser.getSongHeaderCellHtml('Album', '', options.enableColumnSorting, 'Album,SortName', options.sortBy, options.sortOrder);
             }
             if (options.showArtist) {
-                html += LibraryBrowser.getSongHeaderCellHtml('Artist', '', options.enableColumnSorting, 'Artist,Album,SortName', options.sortBy, options.sortOrder);
+                html += LibraryBrowser.getSongHeaderCellHtml('Artist', 'tabletColumn', options.enableColumnSorting, 'Artist,Album,SortName', options.sortBy, options.sortOrder);
+            }
+            if (options.showAlbumArtist) {
                 html += LibraryBrowser.getSongHeaderCellHtml('Album Artist', 'tabletColumn', options.enableColumnSorting, 'AlbumArtist,Album,SortName', options.sortBy, options.sortOrder);
             }
 
@@ -214,12 +217,8 @@
                 html += '<button class="btnQueue" data-icon="plus" type="button" data-iconpos="notext" onclick="MediaController.queue(\'' + item.Id + '\');" data-inline="true" title="Queue">Queue</button>';
                 html += '</td>';
 
-                var num = item.IndexNumber;
-
-                if (num && item.ParentIndexNumber) {
-                    num = item.ParentIndexNumber + "." + num;
-                }
-                html += '<td>' + (num || "") + '</td>';
+                html += '<td class="desktopColumn">' + (item.ParentIndexNumber || "") + '</td>';
+                html += '<td class="desktopColumn">' + (item.IndexNumber || "") + '</td>';
 
                 html += '<td><a href="' + LibraryBrowser.getHref(item, "music") + '">' + (item.Name || "") + '</a></td>';
 
@@ -237,14 +236,14 @@
 
                         var artistLinksHtml = LibraryBrowser.getArtistLinksHtml(item.Artists);
 
-                        html += '<td>' + artistLinksHtml + '</td>';
+                        html += '<td class="tabletColumn">' + artistLinksHtml + '</td>';
                     }
                     else {
-                        html += '<td></td>';
+                        html += '<td class="tabletColumn"></td>';
                     }
                 }
 
-                if (options.showArtist) {
+                if (options.showAlbumArtist) {
 
                     if (item.AlbumArtist) {
 
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 66d94bd5aa..1b5e513efa 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -649,7 +649,7 @@
             }
 
             // Just use the first audio stream
-            return audioStreams[0].Index;
+            return audioStreams.length ? audioStreams[0].Index : null;
         }
 
         function getVideoQualityOptions(mediaStreams) {
diff --git a/dashboard-ui/scripts/songs.js b/dashboard-ui/scripts/songs.js
index 8dd595c3cc..09c6c579df 100644
--- a/dashboard-ui/scripts/songs.js
+++ b/dashboard-ui/scripts/songs.js
@@ -50,6 +50,7 @@
             html += LibraryBrowser.getSongTableHtml(result.Items, {
                 showAlbum: true,
                 showArtist: true,
+                showAlbumArtist: true,
                 enableColumnSorting: true,
                 sortBy: query.SortBy,
                 sortOrder: query.SortOrder