diff --git a/app/src/main/res/layout-h480dp/fragment_playback_panel.xml b/app/src/main/res/layout-h480dp/fragment_playback_panel.xml
index f9bb8ffd4..bcf2e70a8 100644
--- a/app/src/main/res/layout-h480dp/fragment_playback_panel.xml
+++ b/app/src/main/res/layout-h480dp/fragment_playback_panel.xml
@@ -12,12 +12,12 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:menu="@menu/toolbar_playback"
-        app:titleCentered="true"
-        app:subtitleCentered="true"
-        app:titleTextAppearance="@style/TextAppearance.Auxio.LabelLarge"
-        app:subtitleTextAppearance="@style/TextAppearance.Auxio.BodySmall"
         app:navigationIcon="@drawable/ic_down_24"
+        app:subtitleCentered="true"
+        app:subtitleTextAppearance="@style/TextAppearance.Auxio.BodySmall"
         app:title="@string/lbl_playback"
+        app:titleCentered="true"
+        app:titleTextAppearance="@style/TextAppearance.Auxio.LabelLarge"
         tools:subtitle="@string/lbl_all_songs" />
 
     <org.oxycblt.auxio.playback.ui.SwipeCoverView
@@ -26,45 +26,60 @@
         android:layout_margin="@dimen/spacing_medium"
         app:enablePlaybackIndicator="false"
         app:enableSelectionBadge="false"
-        app:layout_constraintBottom_toTopOf="@+id/playback_song"
+        app:layout_constraintBottom_toTopOf="@+id/playback_info_container"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/playback_toolbar" />
+        app:layout_constraintTop_toBottomOf="@+id/playback_toolbar"
+        app:layout_constraintVertical_chainStyle="packed" />
 
-    <TextView
-        android:id="@+id/playback_song"
-        style="@style/Widget.Auxio.TextView.Primary"
+    <LinearLayout
+        android:id="@+id/playback_info_container"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/spacing_medium"
-        android:layout_marginHorizontal="@dimen/spacing_tiny"
         android:layout_marginEnd="@dimen/spacing_medium"
-        app:layout_constraintBottom_toTopOf="@+id/playback_artist"
-        app:layout_constraintEnd_toStartOf="@+id/playback_more"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="Song Name" />
-
-    <TextView
-        android:id="@+id/playback_artist"
-        style="@style/Widget.Auxio.TextView.Secondary.Marquee"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@+id/playback_album"
-        app:layout_constraintEnd_toEndOf="@+id/playback_song"
-        app:layout_constraintStart_toStartOf="@+id/playback_song"
-        tools:text="Artist Name" />
-
-    <TextView
-        android:id="@+id/playback_album"
-        style="@style/Widget.Auxio.TextView.Secondary.Marquee"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:orientation="vertical"
         app:layout_constraintBottom_toTopOf="@+id/playback_seek_bar"
-        app:layout_constraintEnd_toEndOf="@+id/playback_song"
-        app:layout_constraintStart_toStartOf="@+id/playback_song"
-        tools:text="Album Name" />
+        app:layout_constraintEnd_toStartOf="@+id/playback_more"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/playback_toolbar"
+        app:layout_constraintVertical_bias="1.0"
+        app:layout_constraintVertical_chainStyle="packed">
 
+        <TextView
+            android:id="@+id/playback_song"
+            style="@style/Widget.Auxio.TextView.Primary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:text="Song Name" />
+
+        <TextView
+            android:id="@+id/playback_artist"
+            style="@style/Widget.Auxio.TextView.Secondary.Marquee"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:text="Artist Name" />
+
+        <TextView
+            android:id="@+id/playback_album"
+            style="@style/Widget.Auxio.TextView.Secondary.Marquee"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:text="Album Name" />
+
+    </LinearLayout>
+
+    <org.oxycblt.auxio.ui.RippleFixMaterialButton
+        android:id="@+id/playback_more"
+        style="@style/Widget.Auxio.Button.Icon.Medium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/spacing_medium"
+        app:icon="@drawable/ic_more_24"
+        app:layout_constraintBottom_toBottomOf="@+id/playback_info_container"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/playback_info_container" />
 
     <org.oxycblt.auxio.playback.ui.StyledSeekBar
         android:id="@+id/playback_seek_bar"
@@ -73,27 +88,21 @@
         app:layout_constraintBottom_toTopOf="@+id/playback_controls_container"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <org.oxycblt.auxio.ui.RippleFixMaterialButton
-        android:id="@+id/playback_more"
-        style="@style/Widget.Auxio.Button.Icon.Medium"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:icon="@drawable/ic_more_24"
-        android:layout_marginEnd="@dimen/spacing_medium"
-        app:layout_constraintBottom_toBottomOf="@+id/playback_album"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/playback_song" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/playback_info_container" />
 
     <org.oxycblt.auxio.playback.ui.ForcedLTRFrameLayout
         android:id="@+id/playback_controls_container"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/spacing_medium"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium"
+        app:layout_constraintTop_toBottomOf="@+id/playback_seek_bar"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintWidth_max="400dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -163,7 +172,6 @@
                 app:tint="@color/sel_activatable_icon" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
-
     </org.oxycblt.auxio.playback.ui.ForcedLTRFrameLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml b/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml
deleted file mode 100644
index 2d5e62307..000000000
--- a/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/playback_toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:menu="@menu/toolbar_playback"
-        app:navigationIcon="@drawable/ic_down_24"
-        app:subtitleCentered="true"
-        app:subtitleTextAppearance="@style/TextAppearance.Auxio.BodySmall"
-        app:title="@string/lbl_playback"
-        app:titleCentered="true"
-        app:titleTextAppearance="@style/TextAppearance.Auxio.LabelLarge"
-        tools:subtitle="@string/lbl_all_songs" />
-
-    <org.oxycblt.auxio.playback.ui.SwipeCoverView
-        android:id="@+id/playback_cover"
-        style="@style/Widget.Auxio.Image.Full"
-        android:layout_margin="@dimen/spacing_medium"
-        app:enablePlaybackIndicator="false"
-        app:enableSelectionBadge="false"
-        app:layout_constraintBottom_toTopOf="@+id/playback_info_container"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/playback_toolbar"
-        app:layout_constraintVertical_chainStyle="packed" />
-
-    <LinearLayout
-        android:id="@+id/playback_info_container"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_medium"
-        android:layout_marginEnd="@dimen/spacing_medium"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toTopOf="@+id/playback_seek_bar"
-        app:layout_constraintEnd_toStartOf="@+id/playback_more"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/playback_toolbar"
-        app:layout_constraintVertical_bias="1.0"
-        app:layout_constraintVertical_chainStyle="packed">
-
-        <TextView
-            android:id="@+id/playback_song"
-            style="@style/Widget.Auxio.TextView.Primary"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:text="Song Name" />
-
-        <TextView
-            android:id="@+id/playback_artist"
-            style="@style/Widget.Auxio.TextView.Secondary.Marquee"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:text="Artist Name" />
-
-        <TextView
-            android:id="@+id/playback_album"
-            style="@style/Widget.Auxio.TextView.Secondary.Marquee"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:text="Album Name" />
-
-    </LinearLayout>
-
-    <org.oxycblt.auxio.ui.RippleFixMaterialButton
-        android:id="@+id/playback_more"
-        style="@style/Widget.Auxio.Button.Icon.Medium"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/spacing_medium"
-        app:icon="@drawable/ic_more_24"
-        app:layout_constraintBottom_toBottomOf="@+id/playback_info_container"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/playback_info_container" />
-
-    <org.oxycblt.auxio.playback.ui.StyledSeekBar
-        android:id="@+id/playback_seek_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_tiny"
-        android:layout_marginEnd="@dimen/spacing_tiny"
-        app:layout_constraintBottom_toTopOf="@+id/playback_controls_container"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/playback_info_container" />
-
-    <org.oxycblt.auxio.playback.ui.ForcedLTRFrameLayout
-        android:id="@+id/playback_controls_container"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_medium"
-        android:layout_marginEnd="@dimen/spacing_medium"
-        android:layout_marginBottom="@dimen/spacing_medium"
-        app:layout_constraintTop_toBottomOf="@+id/playback_seek_bar"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintWidth_max="400dp">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <org.oxycblt.auxio.ui.RippleFixMaterialButton
-                android:id="@+id/playback_repeat"
-                style="@style/Widget.Auxio.Button.Icon.Medium"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/desc_change_repeat"
-                app:icon="@drawable/ic_repeat_off_24"
-                app:iconTint="@color/sel_activatable_icon"
-                app:layout_constraintBottom_toBottomOf="@+id/playback_skip_prev"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/playback_skip_prev" />
-
-            <org.oxycblt.auxio.ui.RippleFixMaterialButton
-                android:id="@+id/playback_skip_prev"
-                style="@style/Widget.Auxio.Button.Icon.Huge"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/desc_skip_prev"
-                app:icon="@drawable/ic_skip_prev_40"
-                app:iconSize="40dp"
-                app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
-                app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
-                app:layout_constraintStart_toEndOf="@+id/playback_repeat"
-                app:layout_constraintTop_toTopOf="@+id/playback_play_pause" />
-
-            <org.oxycblt.auxio.playback.ui.AnimatedMaterialButton
-                android:id="@+id/playback_play_pause"
-                style="@style/Widget.Auxio.Button.PlayPause"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/desc_play_pause"
-                app:icon="@drawable/sel_playing_state_48"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:icon="@drawable/ic_play_24" />
-
-            <org.oxycblt.auxio.ui.RippleFixMaterialButton
-                android:id="@+id/playback_skip_next"
-                style="@style/Widget.Auxio.Button.Icon.Huge"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/desc_skip_next"
-                app:icon="@drawable/ic_skip_next_40"
-                app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
-                app:layout_constraintEnd_toStartOf="@+id/playback_shuffle"
-                app:layout_constraintStart_toEndOf="@+id/playback_play_pause"
-                app:layout_constraintTop_toTopOf="@+id/playback_play_pause" />
-
-            <org.oxycblt.auxio.ui.RippleFixMaterialButton
-                android:id="@+id/playback_shuffle"
-                style="@style/Widget.Auxio.Button.Icon.Medium"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/desc_shuffle"
-                app:icon="@drawable/sel_shuffle_state_24"
-                app:iconTint="@color/sel_activatable_icon"
-                app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/playback_skip_next"
-                app:tint="@color/sel_activatable_icon" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </org.oxycblt.auxio.playback.ui.ForcedLTRFrameLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-w670dp/fragment_main.xml b/app/src/main/res/layout-w720dp/fragment_main.xml
similarity index 100%
rename from app/src/main/res/layout-w670dp/fragment_main.xml
rename to app/src/main/res/layout-w720dp/fragment_main.xml