diff --git a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
index 330a1ab70..82b7b14be 100644
--- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
+++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
@@ -28,6 +28,13 @@ var AIRTIME = (function(AIRTIME){
 	mod.fnRowCallback = function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
 		var $nRow = $(nRow);
 		
+		if (aData.ftype === "audioclip") {
+			$nRow.addClass("lib-audio");
+		}
+		else {
+			$nRow.addClass("lib-pl");
+		}
+		
 		$nRow.attr("id", aData["tr_id"])
 	    	.data("aData", aData)
 	    	.data("screen", "playlist");
@@ -38,7 +45,7 @@ var AIRTIME = (function(AIRTIME){
 		mod.redrawChosen();
 		mod.checkToolBarIcons();
 		
-		$('#library_display tr[id ^= "au"]').draggable({
+		$('#library_display tr.lib-audio').draggable({
 			helper: function(){
 				
 				mod.selectItem($(this));
diff --git a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
index 4126852a9..56a96ef5d 100644
--- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
+++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
@@ -28,6 +28,13 @@ var AIRTIME = (function(AIRTIME){
 	mod.fnRowCallback = function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
 		var $nRow = $(nRow);
 		
+		if (aData.ftype === "audioclip") {
+			$nRow.addClass("lib-audio");
+		}
+		else {
+			$nRow.addClass("lib-pl");
+		}
+		
 		$nRow.attr("id", aData["tr_id"])
 	    	.data("aData", aData)
 	    	.data("screen", "timeline");
@@ -38,7 +45,7 @@ var AIRTIME = (function(AIRTIME){
 		mod.redrawChosen();
 		mod.checkToolBarIcons();
 		
-		$('#library_display tr:not(:first)').draggable({
+		$('#library_display tr.lib-audio, tr.lib-pl').draggable({
 			helper: function(){
 				
 				mod.selectItem($(this));
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index 9540a1085..e98674ed9 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -241,10 +241,7 @@ var AIRTIME = (function(AIRTIME) {
             "bServerSide": true,
             
             "aLengthMenu": [[5, 10, 15, 20, 25, 50, 100], [5, 10, 15, 20, 25, 50, 100]],
-            
-            //"sScrollX": "100%",
-            //"sScrollXInner": "110%",
-                    
+                 
             "bStateSave": true,
             "fnStateSaveParams": function (oSettings, oData) {
                 //remove oData components we don't want to save.