diff --git a/app/src/main/res/layout/manga_info_header.xml b/app/src/main/res/layout/manga_info_header.xml
index 59b48fe57..69f85920c 100644
--- a/app/src/main/res/layout/manga_info_header.xml
+++ b/app/src/main/res/layout/manga_info_header.xml
@@ -125,10 +125,9 @@
                 tools:text="Source" />
 
         </LinearLayout>
+
     </LinearLayout>
 
-
-
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_favorite"
         style="@style/Theme.Widget.Button.Action"
diff --git a/app/src/main/res/xml/manga_info_header_scene.xml b/app/src/main/res/xml/manga_info_header_scene.xml
index 5e29f7a44..de2df81be 100644
--- a/app/src/main/res/xml/manga_info_header_scene.xml
+++ b/app/src/main/res/xml/manga_info_header_scene.xml
@@ -1,81 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
-<MotionScene
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:motion="http://schemas.android.com/apk/res-auto">
 
     <Transition
         motion:constraintSetEnd="@+id/end"
         motion:constraintSetStart="@id/start"
         motion:duration="@android:integer/config_mediumAnimTime">
-       <KeyFrameSet>
-           <KeyPosition
-               motion:motionTarget="@+id/manga_detail"
-               motion:keyPositionType="pathRelative" />
-       </KeyFrameSet>
+        <KeyFrameSet>
+            <KeyPosition
+                motion:keyPositionType="pathRelative"
+                motion:motionTarget="@+id/manga_detail" />
+        </KeyFrameSet>
         <OnClick motion:targetId="@+id/manga_cover" />
     </Transition>
 
     <ConstraintSet android:id="@+id/start">
         <Constraint
             android:id="@+id/manga_info_toggle_more"
-            motion:layout_constraintEnd_toEndOf="parent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             motion:layout_constraintBottom_toBottomOf="@+id/manga_summary_text"
+            motion:layout_constraintEnd_toEndOf="parent"
             motion:visibilityMode="ignore" />
         <Constraint
             android:id="@+id/manga_genres_tags_compact"
-            motion:layout_constraintEnd_toEndOf="parent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            motion:layout_constraintTop_toBottomOf="@+id/manga_summary_text"
+            motion:layout_constraintEnd_toEndOf="parent"
             motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toBottomOf="@+id/manga_summary_text"
             motion:visibilityMode="ignore" />
         <Constraint
             android:id="@+id/manga_info_toggle_more_scrim"
-            motion:layout_constraintEnd_toStartOf="@+id/manga_info_toggle_more"
             android:layout_width="20dp"
             android:layout_height="0dp"
             motion:layout_constraintBottom_toBottomOf="@+id/manga_info_toggle_more"
+            motion:layout_constraintEnd_toStartOf="@+id/manga_info_toggle_more"
             motion:layout_constraintTop_toTopOf="@+id/manga_info_toggle_more"
             motion:visibilityMode="ignore" />
         <Constraint
             android:id="@+id/manga_info_toggle_less"
-            motion:layout_constraintEnd_toEndOf="parent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:visibility="gone"
+            motion:layout_constraintEnd_toEndOf="parent"
             motion:layout_constraintTop_toBottomOf="@+id/manga_summary_text"
             motion:visibilityMode="ignore" />
         <Constraint
             android:id="@+id/manga_genres_tags_full_chips"
-            motion:layout_constraintEnd_toEndOf="parent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:layout_marginEnd="16dp"
-            motion:layout_constraintTop_toBottomOf="@id/manga_info_toggle_less"
             android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:visibility="gone"
+            motion:layout_constraintEnd_toEndOf="parent"
             motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toBottomOf="@id/manga_info_toggle_less"
             motion:visibilityMode="ignore" />
         <Constraint
             android:id="@+id/btn_tracking"
-            motion:layout_constraintEnd_toStartOf="@+id/btn_webview"
-            motion:layout_constraintStart_toEndOf="@+id/btn_favorite"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:visibility="visible"
+            motion:layout_constraintEnd_toStartOf="@+id/btn_webview"
             motion:layout_constraintHorizontal_bias="0.5"
+            motion:layout_constraintStart_toEndOf="@+id/btn_favorite"
             motion:layout_constraintTop_toTopOf="@+id/btn_favorite"
             motion:visibilityMode="ignore" />
         <Constraint
             android:id="@+id/btn_webview"
-            motion:layout_constraintEnd_toEndOf="parent"
-            motion:layout_constraintStart_toEndOf="@+id/btn_tracking"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:visibility="visible"
+            motion:layout_constraintEnd_toEndOf="parent"
             motion:layout_constraintHorizontal_bias="0.5"
+            motion:layout_constraintStart_toEndOf="@+id/btn_tracking"
             motion:layout_constraintTop_toTopOf="@+id/btn_favorite"
             motion:visibilityMode="ignore" />
     </ConstraintSet>
@@ -83,139 +82,139 @@
     <ConstraintSet android:id="@+id/end">
         <Constraint
             android:id="@+id/backdrop"
-            motion:layout_constraintEnd_toEndOf="parent"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            motion:layout_constraintBottom_toBottomOf="@+id/manga_cover"
             android:layout_marginBottom="-8dp"
             android:alpha="0"
-            motion:layout_constraintTop_toTopOf="parent"
+            motion:layout_constraintBottom_toBottomOf="@+id/manga_cover"
+            motion:layout_constraintEnd_toEndOf="parent"
             motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toTopOf="parent"
             motion:transitionEasing="cubic(0,1,0,1)" />
         <Constraint
             android:id="@+id/backdrop_overlay"
             android:layout_width="match_parent"
             android:layout_height="160dp"
-            motion:layout_constraintBottom_toBottomOf="@+id/backdrop"
             android:layout_marginBottom="-16dp"
             android:alpha="0"
+            motion:layout_constraintBottom_toBottomOf="@+id/backdrop"
             motion:transitionEasing="cubic(0,1,0,1)" />
         <Constraint
-            android:layout_marginStart="0dp"
-            motion:layout_constraintTop_toTopOf="parent"
-            motion:layout_constraintStart_toStartOf="parent"
-            android:layout_marginTop="0dp"
             android:id="@+id/manga_cover"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="0dp"
+            motion:layout_constraintDimensionRatio="2:3"
             motion:layout_constraintEnd_toEndOf="parent"
-            motion:layout_constraintDimensionRatio="2:3" />
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toTopOf="parent" />
         <Constraint
             android:id="@+id/btn_favorite"
-            motion:layout_constraintEnd_toStartOf="@+id/btn_tracking"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            motion:layout_constraintTop_toBottomOf="@id/manga_detail"
-            motion:layout_constraintHorizontal_bias="0.5"
-            motion:layout_constraintStart_toStartOf="parent" />
-        <Constraint
-            android:id="@+id/btn_favorite"
             motion:layout_constraintEnd_toStartOf="@+id/btn_tracking"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            motion:layout_constraintTop_toBottomOf="@id/manga_detail"
             motion:layout_constraintHorizontal_bias="0.5"
             motion:layout_constraintStart_toStartOf="parent"
-            android:layout_marginTop="8dp" />
+            motion:layout_constraintTop_toBottomOf="@id/manga_detail" />
+        <Constraint
+            android:id="@+id/btn_favorite"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            motion:layout_constraintEnd_toStartOf="@+id/btn_tracking"
+            motion:layout_constraintHorizontal_bias="0.5"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toBottomOf="@id/manga_detail" />
         <Constraint
             android:id="@+id/manga_detail"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            motion:layout_constraintTop_toBottomOf="@id/manga_cover"
-            motion:layout_constraintStart_toStartOf="parent"
-            motion:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="24dp"
             android:layout_marginEnd="16dp"
-            android:layout_marginTop="24dp" />
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toBottomOf="@id/manga_cover" />
         <Constraint
             android:id="@+id/manga_info_toggle_less"
-            motion:layout_constraintEnd_toEndOf="parent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:visibility="visible"
+            motion:layout_constraintEnd_toEndOf="parent"
             motion:layout_constraintTop_toBottomOf="@+id/manga_summary_text"
             motion:visibilityMode="ignore" />
         <Constraint
             android:id="@+id/btn_tracking"
-            motion:layout_constraintEnd_toStartOf="@+id/btn_webview"
-            motion:layout_constraintStart_toEndOf="@+id/btn_favorite"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:visibility="visible"
+            motion:layout_constraintEnd_toStartOf="@+id/btn_webview"
             motion:layout_constraintHorizontal_bias="0.5"
+            motion:layout_constraintStart_toEndOf="@+id/btn_favorite"
             motion:layout_constraintTop_toTopOf="@+id/btn_favorite"
             motion:visibilityMode="ignore" />
         <Constraint
             android:id="@+id/btn_tracking"
-            motion:layout_constraintEnd_toStartOf="@+id/btn_webview"
-            motion:layout_constraintStart_toEndOf="@+id/btn_favorite"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:visibility="visible"
-            motion:visibilityMode="ignore"
+            motion:layout_constraintEnd_toStartOf="@+id/btn_webview"
             motion:layout_constraintHorizontal_bias="0.5"
-            motion:layout_constraintTop_toTopOf="@+id/btn_favorite" />
+            motion:layout_constraintStart_toEndOf="@+id/btn_favorite"
+            motion:layout_constraintTop_toTopOf="@+id/btn_favorite"
+            motion:visibilityMode="ignore" />
         <Constraint
             android:id="@+id/btn_webview"
-            motion:layout_constraintEnd_toEndOf="parent"
-            motion:layout_constraintStart_toEndOf="@+id/btn_tracking"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:visibility="visible"
+            motion:layout_constraintEnd_toEndOf="parent"
             motion:layout_constraintHorizontal_bias="0.5"
+            motion:layout_constraintStart_toEndOf="@+id/btn_tracking"
             motion:layout_constraintTop_toTopOf="@+id/btn_favorite"
             motion:visibilityMode="ignore" />
         <Constraint
             android:id="@+id/manga_summary_text"
-            motion:layout_constraintEnd_toEndOf="parent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
-            motion:layout_constraintTop_toBottomOf="@+id/btn_favorite"
             android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            motion:layout_constraintEnd_toEndOf="parent"
             motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toBottomOf="@+id/btn_favorite"
             motion:visibilityMode="ignore" />
         <Constraint
             android:id="@+id/manga_info_toggle_more_scrim"
-            motion:layout_constraintEnd_toStartOf="@+id/manga_info_toggle_more"
             android:layout_width="20dp"
             android:layout_height="0dp"
             motion:layout_constraintBottom_toBottomOf="@+id/manga_info_toggle_more"
+            motion:layout_constraintEnd_toStartOf="@+id/manga_info_toggle_more"
             motion:layout_constraintTop_toTopOf="@+id/manga_info_toggle_more"
             motion:visibilityMode="ignore" />
         <Constraint
             android:id="@+id/manga_info_toggle_more"
-            motion:layout_constraintEnd_toEndOf="parent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             motion:layout_constraintBottom_toBottomOf="@+id/manga_summary_text"
+            motion:layout_constraintEnd_toEndOf="parent"
             motion:visibilityMode="ignore" />
         <Constraint
             android:id="@+id/manga_genres_tags_compact"
-            motion:layout_constraintEnd_toEndOf="parent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            motion:layout_constraintTop_toBottomOf="@+id/manga_summary_text"
+            motion:layout_constraintEnd_toEndOf="parent"
             motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toBottomOf="@+id/manga_summary_text"
             motion:visibilityMode="ignore" />
         <Constraint
             android:id="@+id/manga_genres_tags_full_chips"
-            motion:layout_constraintEnd_toEndOf="parent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="visible"
-            android:layout_marginEnd="16dp"
-            motion:layout_constraintTop_toBottomOf="@+id/manga_info_toggle_less"
             android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:visibility="visible"
+            motion:layout_constraintEnd_toEndOf="parent"
             motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toBottomOf="@+id/manga_info_toggle_less"
             motion:visibilityMode="ignore" />
     </ConstraintSet>
-</MotionScene>
\ No newline at end of file
+</MotionScene>