diff --git a/dashboard-ui/playlist.html b/dashboard-ui/playlist.html
index 3d47c29104..db2b0e42b2 100644
--- a/dashboard-ui/playlist.html
+++ b/dashboard-ui/playlist.html
@@ -10,12 +10,12 @@
 
         <div data-role="content">
 
-            <table id="playlistTable">
+            <table id="playlistTable" style="margin:auto;width:90%;">
                 <thead>
                     <tr>
                         <th></th>
                         <th>Name</th>
-                        <th>Series/Album/Year</th>
+                        <th>Album</th>
                         <th>Time</th>
                         <th>Rating</th>
                         <th></th>
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 08a36e815a..574969a302 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -395,11 +395,15 @@
         };
 
         self.playLast = function (itemId) {
-
+	        ApiClient.getItem(Dashboard.getCurrentUserId(), itemId).done(function (item) {
+				Playlist.add(item);
+	        });
         };
 
         self.playNext = function (itemId) {
-
+	        ApiClient.getItem(Dashboard.getCurrentUserId(), itemId).done(function (item) {
+		        Playlist.playNext(item);
+	        });
         };
 
         self.stop = function () {
diff --git a/dashboard-ui/scripts/playlist.js b/dashboard-ui/scripts/playlist.js
index 598f3efd75..f43b977408 100644
--- a/dashboard-ui/scripts/playlist.js
+++ b/dashboard-ui/scripts/playlist.js
@@ -29,10 +29,13 @@
 	        self.queue.splice(index, 1);
         };
 
-	    self.playNext = function () {
+	    self.playNext = function (item) {
 		    if (typeof self.queue[0] != "undefined") {
-			    MediaPlayer.play(new Array(self.queue[0]));
-			    self.queue.shift();
+			    //MediaPlayer.play(new Array(self.queue[0]));
+			    //self.queue.shift();
+			    self.queue.unshift(item);
+		    }else {
+			    self.add(item);
 		    }
 	    };
 
@@ -85,7 +88,7 @@
 			html += '<td>' + name + '</td>';
 			html += '<td>' + seriesName + '</td>';
 			html += '<td>' + ticks_to_human(item.RunTimeTicks) + '</td>';
-			html += '<td></td>';
+			html += '<td>' + LibraryBrowser.getUserDataIconsHtml(item) + '</td>';
 			html += '<td><a href="" data-queue-index="'+i+'" onclick="Playlist.remove(this)">remove</a></td>';
 			html += '</tr>';