diff --git a/dashboard-ui/css/detailtable.css b/dashboard-ui/css/detailtable.css
index b6c0e155a6..c12e620fa6 100644
--- a/dashboard-ui/css/detailtable.css
+++ b/dashboard-ui/css/detailtable.css
@@ -51,6 +51,14 @@
     margin: 0;
 }
 
+.detailTableButtonsCell {
+    white-space: nowrap;
+}
+
+    .detailTableButtonsCell button + button {
+        margin-left: .5em;
+    }
+
 @media all and (min-width: 600px) {
     .tabletColumn {
         display: table-cell;
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index b65856f96a..51872cdc8e 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -422,7 +422,10 @@
 
                 html += '<tr>';
 
-                html += '<td><button class="btnPlay" data-icon="play" type="button" data-iconpos="notext" onclick="LibraryBrowser.showPlayMenu(this, \'' + item.Id + '\', \'Audio\', \'Audio\');">Play</button></td>';
+                html += '<td class="detailTableButtonsCell">';
+                html += '<button class="btnPlay" data-icon="play" type="button" data-iconpos="notext" onclick="LibraryBrowser.showPlayMenu(this, \'' + item.Id + '\', \'Audio\', \'Audio\');" data-inline="true" title="Play">Play</button>';
+                html += '<button class="btnQueue" data-icon="plus" type="button" data-iconpos="notext" onclick="MediaPlayer.queue(\'' + item.Id + '\');" data-inline="true" title="Queue">Queue</button>';
+                html += '</td>';
 
                 var num = item.IndexNumber;
 
@@ -2465,6 +2468,7 @@
 
         var isSmallItem = $(posterItem).hasClass('smallBackdropPosterItem');
         var isPortrait = $(posterItem).hasClass('portraitPosterItem');
+        var isSquare = $(posterItem).hasClass('squarePosterItem');
 
         var parentName = isSmallItem || isPortrait ? null : item.SeriesName;
         var name = LibraryBrowser.getPosterViewDisplayName(item, true);
@@ -2530,7 +2534,7 @@
 
         html += '<div>';
 
-        var buttonMargin = isPortrait ? "margin:0 7px 0 0;" : "margin:0 10px 0 0;";
+        var buttonMargin = isPortrait || isSquare ? "margin:0 7px 0 0;" : "margin:0 10px 0 0;";
 
         var buttonCount = 0;
 
@@ -2541,6 +2545,11 @@
 
             html += '<button type="button" data-mini="true" data-inline="true" data-icon="play" data-iconpos="notext" title="Play" onclick="' + onPlayClick + '" style="' + buttonMargin + '">Play</button>';
             buttonCount++;
+
+            if (item.MediaType == "Audio" || item.Type == "MusicAlbum") {
+                html += '<button type="button" data-mini="true" data-inline="true" data-icon="plus" data-iconpos="notext" title="Queue" onclick="MediaPlayer.queue(\'' + item.Id + '\');return false;" style="' + buttonMargin + '">Queue</button>';
+                buttonCount++;
+            }
         }
 
         if (item.LocalTrailerCount) {
@@ -2642,7 +2651,7 @@
             return this;
         }
 
-        return this.on('mouseenter', '.backdropPosterItem,.smallBackdropPosterItem,.portraitPosterItem', onHoverIn).on('mouseleave', '.backdropPosterItem,.smallBackdropPosterItem,.portraitPosterItem', onHoverOut);
+        return this.on('mouseenter', '.backdropPosterItem,.smallBackdropPosterItem,.portraitPosterItem,.squarePosterItem', onHoverIn).on('mouseleave', '.backdropPosterItem,.smallBackdropPosterItem,.portraitPosterItem,.squarePosterItem', onHoverOut);
     };
 
 })(jQuery, document, window);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 42f8ef7ce9..11203d4f57 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -616,7 +616,6 @@
 
             // Some 1080- videos are reported as 1912?
             if (maxAllowedWidth >= 1910) {
-                options.push({ name: '1080p - 15Mbps', maxWidth: 1920, bitrate: 15000000 });
                 options.push({ name: '1080p - 10Mbps', maxWidth: 1920, bitrate: 10000000 });
                 options.push({ name: '1080p - 8Mbps', maxWidth: 1920, bitrate: 8000000 });
                 options.push({ name: '1080p - 6Mbps', maxWidth: 1920, bitrate: 6000000 });
@@ -892,6 +891,17 @@
                 var errorCode = this.error ? this.error.code : '';
                 console.log('Html5 Video error code: ' + errorCode);
 
+                var errorMsg = 'There was an error playing the video.';
+                
+                if (item.Type == "Channel") {
+                    errorMsg += " Please ensure there is an open tuner availalble.";
+                }
+
+                Dashboard.alert({
+                    title: 'Video Error',
+                    message: errorMsg
+                });
+
             }).on("ended.playbackstopped", onPlaybackStopped)
                 .on('ended.playnext', playNextAfterEnded);
 
@@ -1467,6 +1477,11 @@
 
         self.queue = function (id) {
 
+            if (!currentMediaElement) {
+                self.playById(id);
+                return;
+            }
+            
             ApiClient.getItem(Dashboard.getCurrentUserId(), id).done(function (item) {
 
                 if (item.IsFolder) {
diff --git a/dashboard-ui/scripts/musicalbumartists.js b/dashboard-ui/scripts/musicalbumartists.js
index 2ee4dd72c6..57151a75b1 100644
--- a/dashboard-ui/scripts/musicalbumartists.js
+++ b/dashboard-ui/scripts/musicalbumartists.js
@@ -40,7 +40,7 @@
 
             html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
 
-            $('#items', page).html(html).trigger('create');
+            $('#items', page).html(html).trigger('create').createPosterItemHoverMenu();
 
             $('.selectPage', page).on('change', function () {
                 query.StartIndex = (parseInt(this.value) - 1) * query.Limit;
diff --git a/dashboard-ui/scripts/musicalbums.js b/dashboard-ui/scripts/musicalbums.js
index 718474ef71..1e4b09d1b6 100644
--- a/dashboard-ui/scripts/musicalbums.js
+++ b/dashboard-ui/scripts/musicalbums.js
@@ -57,7 +57,7 @@
 
             html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
 
-            $('#items', page).html(html).trigger('create');
+            $('#items', page).html(html).trigger('create').createPosterItemHoverMenu();
 
             $('.selectPage', page).on('change', function () {
                 query.StartIndex = (parseInt(this.value) - 1) * query.Limit;
diff --git a/dashboard-ui/scripts/musicartists.js b/dashboard-ui/scripts/musicartists.js
index 79a7a74451..e2b920db07 100644
--- a/dashboard-ui/scripts/musicartists.js
+++ b/dashboard-ui/scripts/musicartists.js
@@ -39,7 +39,7 @@
 
             html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
 
-            $('#items', page).html(html).trigger('create');
+            $('#items', page).html(html).trigger('create').createPosterItemHoverMenu();
 
             $('.selectPage', page).on('change', function () {
                 query.StartIndex = (parseInt(this.value) - 1) * query.Limit;