diff --git a/server/server.js b/server/server.js
index d2b0e0f6..341ec323 100755
--- a/server/server.js
+++ b/server/server.js
@@ -327,18 +327,20 @@ function change_song_post(coll)
       {$match:{now_playing:false}},
       {$sort:{votes:-1, added:1}},
       {$limit:1}], function(err, docs){
-        db.collection(coll).update({id:docs[0]["id"]},
-        {$set:{
-          now_playing:true,
-          votes:0,
-          guids:[],
-          added:get_time()}}, function(err, docs){
-            db.collection(coll).update({views:{$exists:true}},
-              {$set:{startTime:get_time()}}, function(err, docs){
-                sort_list(coll,undefined,true);
-            });
+        if(docs.length > 0){
+          db.collection(coll).update({id:docs[0]["id"]},
+          {$set:{
+            now_playing:true,
+            votes:0,
+            guids:[],
+            added:get_time()}}, function(err, docs){
+              db.collection(coll).update({views:{$exists:true}},
+                {$set:{startTime:get_time()}}, function(err, docs){
+                  sort_list(coll,undefined,true);
+              });
 
-    });
+            });
+        }
   });
 }
 
diff --git a/static/js/list.js b/static/js/list.js
index e280a2e9..3bb6334a 100755
--- a/static/js/list.js
+++ b/static/js/list.js
@@ -82,7 +82,7 @@ function populate_list(msg)
 				{
 					player_name = "#jplayer";
 				}else player_name = "#player";
-				$("#playlist").css({height: $(player_name).height()-$("#adminPanel").outerHeight(true)-$("#findform").outerHeight(true)+30});
+				$("#playlist").css({height: $(".video-container").height()});
 				$("#playlist").css({overflow: "hidden"});
 				if(scroller === false)
 				{
diff --git a/static/js/nochan.js b/static/js/nochan.js
index 8a866f65..25f1c006 100644
--- a/static/js/nochan.js
+++ b/static/js/nochan.js
@@ -34,7 +34,6 @@ function populate_channels(lists)
         card.find(".chan-songs").text(song_count);
         card.find(".chan-bg").attr("style", img);
         card.find(".chan-link").attr("href", chan);
-
         output+="<option value='"+chan+"'> ";
     }
     document.getElementById("searches").innerHTML = output;
diff --git a/static/js/youtube.js b/static/js/youtube.js
index 63589c9d..ce6f9ea2 100755
--- a/static/js/youtube.js
+++ b/static/js/youtube.js
@@ -51,11 +51,17 @@ socket.on(chan.toLowerCase()+",np", function(obj)
 	seekTo = time - conf["startTime"];
 	song_title = obj[0][0]["title"];
 	getTitle(song_title, viewers);
-	if(player_ready)
+	if(player_ready && !window.mobilecheck())
 	{
 		if(ytplayer.getVideoUrl().split('v=')[1] != video_id)
+		{
 			ytplayer.loadVideoById(video_id);
-		ytplayer.playVideo();
+			notifyUser(video_id, song_title);
+			if(paused)
+				ytplayer.pauseVideo();
+		}
+		if(!paused)
+			ytplayer.playVideo();
 		ytplayer.seekTo(seekTo);
 	}
 });
@@ -139,14 +145,15 @@ function onPlayerStateChange(newState) {
 		case 0:
 			socket.emit("end", video_id);
 			playing = false;
+			paused = false;
 			break;
 		case 1:
 			playing = true;
-			if(document.getElementById("playpause").className == "play")
+			/*if(document.getElementById("playpause").className == "play")
 			{
 				$("#playpause").toggleClass("play");
 				$("#playpause").toggleClass("pause");
-			}
+			}*/
 			if(paused)
 			{
 				socket.emit('pos');
@@ -155,11 +162,11 @@ function onPlayerStateChange(newState) {
 			break;
 		case 2:
 			paused = true;
-			if(document.getElementById("playpause").className == "pause")
+			/*if(document.getElementById("playpause").className == "pause")
 			{
 				$("#playpause").toggleClass("play");
 				$("#playpause").toggleClass("pause");
-			}
+			}*/
 			break;
 		case 3:
 			break;