diff --git a/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
index 860ac391f..29b172673 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
@@ -113,7 +113,7 @@ class AlbumDetailFragment :
                 true
             }
             R.id.action_go_artist -> {
-                navModel.exploreNavigateTo(unlikelyToBeNull(detailModel.currentAlbum.value))
+                navModel.exploreNavigateTo(unlikelyToBeNull(detailModel.currentAlbum.value).artist)
                 true
             }
             else -> false
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 092412231..7e8785e2b 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
@@ -45,8 +45,6 @@ import org.oxycblt.auxio.util.logW
  *
  * All access should be done with [PlaybackStateManager.getInstance].
  * @author OxygenCobalt
- *
- * TODO: Bug test app behavior when playback stops
  */
 class PlaybackStateManager private constructor() {
     private val musicStore = MusicStore.getInstance()
diff --git a/app/src/main/java/org/oxycblt/auxio/ui/BottomSheetLayout.kt b/app/src/main/java/org/oxycblt/auxio/ui/BottomSheetLayout.kt
index f7767bbc6..26e70dc45 100644
--- a/app/src/main/java/org/oxycblt/auxio/ui/BottomSheetLayout.kt
+++ b/app/src/main/java/org/oxycblt/auxio/ui/BottomSheetLayout.kt
@@ -77,6 +77,8 @@ import org.oxycblt.auxio.util.stateList
  * @author OxygenCobalt (With help from Umano and Hai Zhang)
  *
  * TODO: Implement rounded corners on the bar (when rounded covers is enabled)
+ *
+ * TODO: Fix several issues with a full-collapse event (blocks automatic rescanning)
  */
 class BottomSheetLayout
 @JvmOverloads
diff --git a/app/src/main/res/layout-sw600dp/fragment_playback_bar.xml b/app/src/main/res/layout-sw600dp/fragment_playback_bar.xml
index 2e15a7da9..38deca085 100644
--- a/app/src/main/res/layout-sw600dp/fragment_playback_bar.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_playback_bar.xml
@@ -21,7 +21,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/spacing_small"
-        android:layout_marginEnd="@dimen/spacing_small"
+        android:layout_marginEnd="@dimen/spacing_tiny"
         app:layout_constraintBottom_toTopOf="@+id/playback_info"
         app:layout_constraintEnd_toStartOf="@+id/playback_controls_wrapper"
         app:layout_constraintStart_toEndOf="@+id/playback_cover"
@@ -35,7 +35,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/spacing_small"
-        android:layout_marginEnd="@dimen/spacing_small"
+        android:layout_marginEnd="@dimen/spacing_tiny"
         android:ellipsize="end"
         app:layout_constraintBottom_toBottomOf="@+id/playback_cover"
         app:layout_constraintEnd_toStartOf="@+id/playback_controls_wrapper"
diff --git a/app/src/main/res/layout/fragment_playback_bar.xml b/app/src/main/res/layout/fragment_playback_bar.xml
index d6cef2ade..8594fb160 100644
--- a/app/src/main/res/layout/fragment_playback_bar.xml
+++ b/app/src/main/res/layout/fragment_playback_bar.xml
@@ -21,7 +21,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/spacing_small"
-        android:layout_marginEnd="@dimen/spacing_small"
+        android:layout_marginEnd="@dimen/spacing_tiny"
         app:layout_constraintBottom_toTopOf="@+id/playback_info"
         app:layout_constraintEnd_toStartOf="@+id/playback_controls_wrapper"
         app:layout_constraintStart_toEndOf="@+id/playback_cover"
@@ -35,7 +35,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/spacing_small"
-        android:layout_marginEnd="@dimen/spacing_small"
+        android:layout_marginEnd="@dimen/spacing_tiny"
         android:ellipsize="end"
         app:layout_constraintBottom_toBottomOf="@+id/playback_cover"
         app:layout_constraintEnd_toStartOf="@+id/playback_controls_wrapper"
diff --git a/app/src/main/res/menu/menu_album_detail.xml b/app/src/main/res/menu/menu_album_detail.xml
index 9bf6ba0a6..4c5d8d7d5 100644
--- a/app/src/main/res/menu/menu_album_detail.xml
+++ b/app/src/main/res/menu/menu_album_detail.xml
@@ -9,7 +9,4 @@
     <item
         android:id="@+id/action_go_artist"
         android:title="@string/lbl_go_artist" />
-    <item
-        android:id="@+id/action_song_detail"
-        android:title="@string/lbl_song_detail" />
 </menu>
\ No newline at end of file