diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
index 8930210..4fa774b 100644
--- a/app/src/main/res/layout/activity_setup.xml
+++ b/app/src/main/res/layout/activity_setup.xml
@@ -1,39 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/setup_box"
     android:layout_width="match_parent"
-    android:paddingVertical="0dp"
     android:layout_height="match_parent"
+    android:layout_margin="0dp"
+    android:padding="0dp"
     app:fitsSystemWindowsInsets="start|end|bottom|top"
     tools:context=".SetupActivity">
 
     <ScrollView
         android:id="@+id/setupNestedScrollView"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@id/bottom_navigation"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_marginHorizontal="12dp"
+        android:layout_height="0dp">
 
         <LinearLayout
             android:id="@+id/setup_box_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingHorizontal="10dp"
-            android:paddingBottom="84dp"
-            android:paddingTop="42dp"
-            app:layout_constraintTop_toTopOf="@id/setup_box"
-            app:layout_constraintBottom_toTopOf="@id/bottom_navigation">
+            app:layout_constraintBottom_toTopOf="@id/bottom_navigation"
+            app:layout_constraintTop_toTopOf="@id/setup_box">
 
             <!-- Title -->
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/setup_title"
                 android:layout_width="match_parent"
+                android:paddingTop="16dp"
                 android:layout_height="wrap_content"
                 android:text="@string/setup_title"
                 android:textAppearance="@style/TextAppearance.Material3.HeadlineLarge" />
@@ -196,9 +193,9 @@
                 android:layout_marginBottom="4dp"
                 android:drawableStart="@drawable/ic_baseline_info_24"
                 android:drawablePadding="8dp"
-                app:dependency="pref_background_update_check"
                 android:text="@string/setup_background_update_check_summary"
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
+                app:dependency="pref_background_update_check"
                 app:icon="@drawable/ic_baseline_info_24" />
 
             <!-- require wifi switch -->
@@ -245,11 +242,12 @@
         android:id="@+id/bottom_navigation"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="visible"
         android:paddingBottom="0dp"
+        android:visibility="visible"
         app:compatShadowEnabled="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/setupNestedScrollView"
         app:menu="@menu/setup_bottom_nav" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file