diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index a26e2b2a..b5e838a5 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -643,7 +643,7 @@ Callbacks = {
     },
 
     queue: function(data) {
-        var li = makeQueueEntry(data.media, false);
+        var li = makeQueueEntry(data.media, true);
         li.hide();
         var idx = data.pos;
         var q = $("#queue");
@@ -690,6 +690,12 @@ Callbacks = {
     },
 
     moveVideo: function(data) {
+        if(data.from < POSITION && data.to >= POSITION)
+            POSITION--;
+        else if(data.from > POSITION && data.to <= POSITION)
+            POSITION++;
+        else if(data.from == POSITION)
+            POSITION = data.to;
         if(data.moveby != CLIENT.name)
             playlistMove(data.from, data.to);
     },
diff --git a/www/assets/js/util.js b/www/assets/js/util.js
index 827e2cd0..499ebee2 100644
--- a/www/assets/js/util.js
+++ b/www/assets/js/util.js
@@ -294,19 +294,19 @@ function rebuildPlaylist() {
     if(REBUILDING)
         return;
 
+    var qli = $("#queue li");
+    if(qli.length == 0)
+        return;
     REBUILDING = true;
     var i = 0;
-    var qli = $("#queue li");
     qli.each(function() {
         var li = $(this);
         setTimeout(function() {
             addQueueButtons(li);
-        }, 10*i);
-        if(i == qli.length - 1) {
-            setTimeout(function() {
+            if(i == qli.length - 1) {
                 REBUILDING = false;
-            }, 10*i);
-        }
+            }
+        }, 10*i);
         i++;
     });
 }
diff --git a/www/index.html b/www/index.html
index 008cf435..e7f0510e 100644
--- a/www/index.html
+++ b/www/index.html
@@ -33,7 +33,6 @@
               <li class="active"><a href="index.html">Home</a></li>
               <li><a href="https://github.com/calzoneman/sync/wiki/Beginner%27s-Guide-and-FAQ" target="_blank">Help</a></li>
               <li><a href="account.html">Account</a></li>
-              <li><a href="javascript:void(0)" id="optlink">Options</a></li>
             </ul>
           </div>
         </div>