diff --git a/web/static/js/objects.js b/web/static/js/objects.js
index c62f6c5..07816a9 100644
--- a/web/static/js/objects.js
+++ b/web/static/js/objects.js
@@ -100,7 +100,9 @@ const actions = {
         }
         if (data['is_joined']) {
             player.addUser(user);
-            player.showToast(user["user_id"], "Joined your channel!");
+            if (user["user_id"] != player.userId) {
+                player.showToast(user["user_id"], "Joined your channel!");
+            }
         } else {
             if (player.users.hasOwnProperty(user["user_id"])) {
                 player.showToast(user["user_id"], "Left your channel!");
@@ -183,7 +185,9 @@ const actions = {
         player.queue.forEach((track, index) => {
             if (positions.includes(index)) {
                 if (trackIds.includes(track.track_id)) {
-                    console.log("removed" + index);
+                    if (index < player.current_queue_position) {
+                        player.current_queue_position -= 1;
+                    }
                     removeTracks.push(track);
                 } else {
                     return player.send({ "op": "initPlayer" })
@@ -314,6 +318,7 @@ class Player {
     }
 
     moveTrack(target, to) {
+        const c = this.current_queue_position;
         let element = this.queue.splice(target, 1)[0];
         this.queue.splice(to, 0, element);
 
@@ -322,6 +327,14 @@ class Player {
         $li.detach();
         $ul.children().eq(to).before($li);
 
+        if (target > c && to <= c) {
+            this.current_queue_position += 1;
+        } else if (target < c && to >= c) {
+            this.current_queue_position -= 1;
+        } else if (target == c) {
+            this.current_queue_position = to;
+        }
+        
         this.send({ "op": "moveTrack", "position": target, "newPosition": to })
     }
 
diff --git a/web/templates/index.html b/web/templates/index.html
index 51a4026..0f0aa46 100644
--- a/web/templates/index.html
+++ b/web/templates/index.html
@@ -44,15 +44,13 @@
             </div>
             <div class="right">
                 <div class="dropdown-container">
-                    <div class="account">
+                    <div class="dropdown-content">
                         <img src="{{ user.avatar.url }}" />
                         <p>{{ user.username }}</p>
                     </div>
-                    <ul>
-                        <a class="dropdown-item" href="logout">
-                            <li><i class="fa-solid fa-right-from-bracket"></i> Log Out</li>
-                        </a>
-                    </ul>
+                    <div class="dropdown-item">
+                        <a href="logout"><i class="fa-solid fa-right-from-bracket"></i>Log Out</a>
+                    </div>
                 </div>
             </div>
         </div>