diff --git a/dashboard-ui/playlist.html b/dashboard-ui/playlist.html
index 42a3cce4ab..0779d94fe1 100644
--- a/dashboard-ui/playlist.html
+++ b/dashboard-ui/playlist.html
@@ -6,7 +6,7 @@
 <body>
 <div id="playlistPage" data-role="page" class="page libraryPage noLogoPage" data-theme="a">
 	<h1 class="libraryPageHeader"><a href="index.html" class="imageLink">
-		<img src="css/images/home.png"></a>Playlist</h1>
+		<img src="css/images/home.png"></a>Now Playing</h1>
 
 	<div data-role="content">
 
diff --git a/dashboard-ui/scripts/Itemdetailpage.js b/dashboard-ui/scripts/Itemdetailpage.js
index 094c7c7ff7..3fb91253e3 100644
--- a/dashboard-ui/scripts/Itemdetailpage.js
+++ b/dashboard-ui/scripts/Itemdetailpage.js
@@ -38,7 +38,10 @@
             if (MediaPlayer.canPlay(item)) {
                 $('#btnPlayMenu', page).show();
                 $('#playButtonShadow', page).show();
-                $('#btnQueueMenu', page).show();
+                if (MediaPlayer.isPlaying())
+	                $('#btnQueueMenu', page).show();
+	            else
+	                $('#btnQueueMenu', page).hide();
             } else {
                 $('#btnPlayMenu', page).hide();
                 $('#playButtonShadow', page).hide();
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 54dead500c..bb15d92952 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -153,8 +153,14 @@
                 // HLS must be at the top for safari
                 // Webm must be ahead of mp4 due to the issue of mp4 playing too fast in chrome
 
+	            var mkvVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.mkv', $.extend({}, baseParams, {
+		            videoCodec: 'h264',
+		            audioCodec: 'aac'
+	            }));
+
                 (this).src([
                     { type: "application/x-mpegURL", src: hlsVideoUrl },
+	                { type: "video/x-matroska", src: mkvVideoUrl },
                     { type: "video/webm", src: webmVideoUrl },
                     { type: "video/mp4", src: mp4VideoUrl },
                     { type: "video/mp2t; codecs='h264, aac'", src: tsVideoUrl },
@@ -310,7 +316,7 @@
                 seriesName = item.SeriesName || item.Album || item.ProductionYear;
             }
 
-            html += "<div><img class='nowPlayingBarImage ' alt='' title='' src='" + url + "' style='height:36px;display:inline-block;' /></div>";
+            html += "<div><a href='itemdetails.html?id="+item.Id+"'><img class='nowPlayingBarImage ' alt='' title='' src='" + url + "' style='height:36px;display:inline-block;' /></a></div>";
             if (item.Type == "Movie")
                 html += '<div>' + name + '<br/>' + seriesName + '</div>';
             else
