diff --git a/app/src/main/res/layout-land/partial_now_playing.xml b/app/src/main/res/layout-land/partial_now_playing.xml
index d8198a0..9e202fd 100644
--- a/app/src/main/res/layout-land/partial_now_playing.xml
+++ b/app/src/main/res/layout-land/partial_now_playing.xml
@@ -97,97 +97,105 @@
     android:id="@+id/now_playing_details"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:layout_marginStart="32dp"
+    android:layout_marginEnd="32dp"
+    android:orientation="vertical"
+    android:paddingTop="16dp">
+
+    <TextView
+      android:id="@+id/now_playing_details_title"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:textColor="@color/itemTitle"
+      android:textSize="18sp"
+      tools:text="Supermassive Black Hole" />
+
+    <TextView
+      android:id="@+id/now_playing_details_artist"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      tools:text="Muse" />
+
+    <SeekBar
+      android:id="@+id/now_playing_details_progress"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="16dp"
+      android:max="100"
+      android:progressBackgroundTint="#cacaca"
+      android:progressTint="@color/controlForeground"
+      android:thumbTint="@color/controlForeground" />
 
     <LinearLayout
-      android:id="@+id/now_playing_details_controls"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_marginStart="32dp"
-      android:layout_marginEnd="32dp"
-      android:orientation="vertical"
-      android:paddingTop="32dp">
+      android:orientation="horizontal">
 
       <TextView
-        android:id="@+id/now_playing_details_title"
+        android:id="@+id/now_playing_details_progress_current"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@color/itemTitle"
-        android:textSize="18sp"
-        tools:text="Supermassive Black Hole" />
+        android:layout_weight="1" />
 
       <TextView
-        android:id="@+id/now_playing_details_artist"
+        android:id="@+id/now_playing_details_progress_duration"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:text="Muse" />
+        android:layout_weight="1"
+        android:textAlignment="textEnd" />
 
-      <SeekBar
-        android:id="@+id/now_playing_details_progress"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:max="100"
-        android:progressBackgroundTint="#cacaca"
-        android:progressTint="@color/controlForeground"
-        android:thumbTint="@color/controlForeground" />
+    </LinearLayout>
 
-      <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
-        android:orientation="horizontal">
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="64dp"
+      android:layout_marginBottom="8dp"
+      android:gravity="center"
+      android:orientation="horizontal">
 
-        <TextView
-          android:id="@+id/now_playing_details_progress_current"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_weight="1" />
+      <ImageButton
+        android:id="@+id/now_playing_details_previous"
+        style="@style/IconButton"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginEnd="16dp"
+        android:contentDescription="@string/control_previous"
+        android:src="@drawable/previous" />
 
-        <TextView
-          android:id="@+id/now_playing_details_progress_duration"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:textAlignment="textEnd" />
+      <com.google.android.material.button.MaterialButton
+        android:id="@+id/now_playing_details_toggle"
+        style="@style/AppTheme.OutlinedButton"
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        app:cornerRadius="64dp"
+        app:icon="@drawable/play"
+        app:iconSize="32dp" />
 
-      </LinearLayout>
+      <ImageButton
+        android:id="@+id/now_playing_details_next"
+        style="@style/IconButton"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginStart="16dp"
+        android:contentDescription="@string/control_next"
+        android:src="@drawable/next" />
 
-      <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:layout_marginBottom="16dp"
-        android:gravity="center"
-        android:orientation="horizontal">
-
-        <ImageButton
-          android:id="@+id/now_playing_details_previous"
-          style="@style/IconButton"
-          android:layout_width="48dp"
-          android:layout_height="48dp"
-          android:layout_marginEnd="16dp"
-          android:contentDescription="@string/control_previous"
-          android:src="@drawable/previous" />
-
-        <com.google.android.material.button.MaterialButton
-          android:id="@+id/now_playing_details_toggle"
-          style="@style/AppTheme.OutlinedButton"
-          android:layout_width="64dp"
-          android:layout_height="64dp"
-          app:cornerRadius="64dp"
-          app:icon="@drawable/play"
-          app:iconSize="32dp" />
-
-        <ImageButton
-          android:id="@+id/now_playing_details_next"
-          style="@style/IconButton"
-          android:layout_width="48dp"
-          android:layout_height="48dp"
-          android:layout_marginStart="16dp"
-          android:contentDescription="@string/control_next"
-          android:src="@drawable/next" />
+    </LinearLayout>
 
-      </LinearLayout>
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginBottom="16dp"
+      android:gravity="center"
+      android:orientation="horizontal">
+
+      <ImageButton
+        android:id="@+id/now_playing_details_repeat"
+        style="@style/IconButton"
+        android:layout_width="28dp"
+        android:layout_height="28dp"
+        android:contentDescription="@string/control_next"
+        android:src="@drawable/repeat" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/partial_now_playing.xml b/app/src/main/res/layout/partial_now_playing.xml
index aab9237..5721610 100644
--- a/app/src/main/res/layout/partial_now_playing.xml
+++ b/app/src/main/res/layout/partial_now_playing.xml
@@ -176,7 +176,6 @@
       <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="0dp"
         android:orientation="horizontal">
 
         <TextView