diff --git a/app/src/main/java/org/oxycblt/auxio/playback/NotificationUtils.kt b/app/src/main/java/org/oxycblt/auxio/playback/NotificationUtils.kt
index fe03cee0b..1cdfdb6f7 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/NotificationUtils.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/NotificationUtils.kt
@@ -40,7 +40,7 @@ fun NotificationManager.createMediaNotification(
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
         val channel = NotificationChannel(
             NotificationUtils.CHANNEL_ID,
-            context.getString(R.string.label_notification_playback),
+            context.getString(R.string.label_channel),
             NotificationManager.IMPORTANCE_DEFAULT
         )
 
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueAdapter.kt b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueAdapter.kt
index e5c3cce94..8ce149eb0 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueAdapter.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueAdapter.kt
@@ -81,6 +81,19 @@ class QueueAdapter(
         data.removeAt(adapterIndex)
 
         notifyItemRemoved(adapterIndex)
+
+        // Check for two things:
+        // If the data from the next queue is now entirely empty [Signified by a header at the end]
+        // Or if the data from the last queue is now entirely empty [Signified by there being 2 headers with no items in between]
+        if (data[data.lastIndex] is Header) {
+            val lastIndex = data.lastIndex
+
+            data.removeAt(lastIndex)
+            notifyItemRemoved(lastIndex)
+        } else if (data.lastIndex >= 1 && data[0] is Header && data[1] is Header) {
+            data.removeAt(0)
+            notifyItemRemoved(0)
+        }
     }
 
     // Generic ViewHolder for a queue item
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
index 208503330..5859082a0 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
@@ -302,8 +302,6 @@ class PlaybackStateManager private constructor() {
 
         mUserQueue.removeAt(index)
 
-        Log.d(this::class.simpleName, mUserQueue.toString())
-
         forceUserQueueUpdate()
     }
 
diff --git a/app/src/main/res/layout/fragment_playback.xml b/app/src/main/res/layout/fragment_playback.xml
index 50c9264b9..5433e37a9 100644
--- a/app/src/main/res/layout/fragment_playback.xml
+++ b/app/src/main/res/layout/fragment_playback.xml
@@ -216,7 +216,7 @@
             app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/playback_play_pause"
-            android:contentDescription="@string/description_loop" />
+            android:contentDescription="@string/description_change_loop" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e8dcdd985..81685a0f8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,8 +32,7 @@
     <string name="label_queue_add">Add to queue</string>
     <string name="label_queue_added">Added to queue</string>
     <string name="label_next_user_queue">Next in Queue</string>
-    <string name="label_queue_already_added">Already in queue!</string>
-    <string name="label_notification_playback">Music Playback</string>
+    <string name="label_channel">Music Playback</string>
     <string name="label_service_playback">The music playback service for Auxio.</string>
 
     <!-- Hint Namespace | EditText Hints -->
@@ -55,7 +54,7 @@
     <string name="description_skip_prev">Skip to last song</string>
     <string name="description_shuffle_on">Turn shuffle on</string>
     <string name="description_shuffle_off">Turn shuffle off</string>
-    <string name="description_loop">Loop</string>
+    <string name="description_change_loop">Change Repeat Mode</string>
 
     <!-- Placeholder Namespace | Placeholder values -->
     <string name="placeholder_genre">Unknown Genre</string>