diff --git a/app/src/main/res/color/nav_selector.xml b/app/src/main/res/color/nav_selector.xml
index 306dd53f3..8297b43b4 100644
--- a/app/src/main/res/color/nav_selector.xml
+++ b/app/src/main/res/color/nav_selector.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Based on mtrl_bottom_nav_colored_item_tint
+  Based on mtrl_bottom_nav_colored_item_tint
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="1.0" android:color="?attr/colorAccentOnPrimary" android:state_checked="true"/>
-    <item android:alpha="0.6" android:color="?attr/colorOnPrimary"/>
+    <item android:alpha="1.0" android:color="?attr/colorAccentOnPrimary" android:state_checked="true" />
+    <item android:alpha="0.6" android:color="?attr/colorOnPrimary" />
 </selector>
diff --git a/app/src/main/res/color/tabs_selector.xml b/app/src/main/res/color/tabs_selector.xml
index ea2bc90d6..4a70bc2f4 100644
--- a/app/src/main/res/color/tabs_selector.xml
+++ b/app/src/main/res/color/tabs_selector.xml
@@ -6,6 +6,6 @@
   it (i.e. blue themes).
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorAccentOnPrimary" android:state_selected="true"/>
-    <item android:alpha="0.60" android:color="?attr/colorOnPrimary"/>
+    <item android:color="?attr/colorAccentOnPrimary" android:state_selected="true" />
+    <item android:alpha="0.60" android:color="?attr/colorOnPrimary" />
 </selector>
diff --git a/app/src/main/res/color/tabs_selector_background.xml b/app/src/main/res/color/tabs_selector_background.xml
index 8d9eca6f0..2824c4f0d 100644
--- a/app/src/main/res/color/tabs_selector_background.xml
+++ b/app/src/main/res/color/tabs_selector_background.xml
@@ -5,6 +5,6 @@
   Ensures visibility on top of the background color.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorAccent" android:state_selected="true"/>
-    <item android:alpha="0.60" android:color="?attr/colorOnBackground"/>
+    <item android:color="?attr/colorAccent" android:state_selected="true" />
+    <item android:alpha="0.60" android:color="?attr/colorOnBackground" />
 </selector>
diff --git a/app/src/main/res/color/text_input_stroke.xml b/app/src/main/res/color/text_input_stroke.xml
index 006464ff2..016705af1 100644
--- a/app/src/main/res/color/text_input_stroke.xml
+++ b/app/src/main/res/color/text_input_stroke.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-The regular version uses ?attr/colorPrimary when focused, which doesn't work well with our themes.
-https://github.com/material-components/material-components-android/blob/master/lib/java/com/google/android/material/textfield/res/color/mtrl_filled_stroke_color.xml
+  The regular version uses ?attr/colorPrimary when focused, which doesn't work well with our themes.
+  https://github.com/material-components/material-components-android/blob/master/lib/java/com/google/android/material/textfield/res/color/mtrl_filled_stroke_color.xml
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="?attr/colorSecondary" android:state_focused="true" />
diff --git a/app/src/main/res/layout-sw600dp/manga_controller.xml b/app/src/main/res/layout-sw600dp/manga_controller.xml
index fda6b1056..c1a233365 100644
--- a/app/src/main/res/layout-sw600dp/manga_controller.xml
+++ b/app/src/main/res/layout-sw600dp/manga_controller.xml
@@ -29,12 +29,12 @@
                 android:id="@+id/info_recycler"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/chapters_recycler"
-                app:layout_constraintWidth_percent="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintWidth_max="450dp"
+                app:layout_constraintWidth_percent="0.5"
                 tools:itemCount="1"
                 tools:listitem="@layout/manga_info_header" />
 
@@ -44,10 +44,10 @@
                 android:layout_height="match_parent"
                 android:clipToPadding="false"
                 android:paddingBottom="@dimen/fab_list_padding"
-                app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/info_recycler"
+                app:layout_constraintTop_toTopOf="parent"
                 tools:listitem="@layout/chapters_item" />
 
             <eu.kanade.tachiyomi.widget.MaterialFastScroll
@@ -57,9 +57,9 @@
                 android:layout_centerHorizontal="true"
                 android:layout_gravity="end"
                 app:fastScrollerBubbleEnabled="false"
-                app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
                 tools:visibility="visible" />
 
             <eu.kanade.tachiyomi.widget.ActionToolbar
@@ -68,8 +68,8 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="@+id/chapters_recycler"
                 app:layout_constraintEnd_toEndOf="@+id/chapters_recycler"
+                app:layout_constraintStart_toStartOf="@+id/chapters_recycler"
                 app:layout_dodgeInsetEdges="bottom" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/menu/download_single.xml b/app/src/main/res/menu/download_single.xml
index 39d0c2dc6..806a561b5 100644
--- a/app/src/main/res/menu/download_single.xml
+++ b/app/src/main/res/menu/download_single.xml
@@ -13,7 +13,8 @@
         android:id="@+id/cancel_download"
         android:title="@string/action_cancel" />
 
-    <item android:id="@+id/cancel_series"
+    <item
+        android:id="@+id/cancel_series"
         android:title="@string/cancel_all_for_series" />
 
 </menu>