diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/pages/SaveFolderPage.kt b/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/pages/SaveFolderPage.kt
index 65ec0c2..6302632 100644
--- a/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/pages/SaveFolderPage.kt
+++ b/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/pages/SaveFolderPage.kt
@@ -92,7 +92,7 @@ fun SaveFolderPage(
         verticalArrangement = Arrangement.SpaceBetween,
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
-        Spacer(modifier = Modifier.weight(1f))
+        Spacer(modifier = Modifier.height(40.dp))
         Column(
             modifier = Modifier
                 .padding(horizontal = 32.dp),
@@ -113,11 +113,16 @@ fun SaveFolderPage(
             Spacer(modifier = Modifier.height(16.dp))
             Text(
                 stringResource(R.string.ui_welcome_saveFolder_message),
+                fontStyle = MaterialTheme.typography.bodySmall.fontStyle,
+                fontSize = MaterialTheme.typography.bodySmall.fontSize,
+                color = MaterialTheme.typography.bodySmall.color,
             )
         }
-        Spacer(modifier = Modifier.weight(1f))
+        Spacer(modifier = Modifier.height(40.dp))
         Box(
-            modifier = Modifier.widthIn(max = 400.dp)
+            modifier = Modifier
+                .widthIn(max = 400.dp)
+                .padding(horizontal = 16.dp)
         ) {
             SaveFolderSelection(
                 saveFolder = saveFolder,
@@ -125,7 +130,7 @@ fun SaveFolderPage(
                 onSaveFolderChange = { saveFolder = it },
             )
         }
-        Spacer(modifier = Modifier.weight(1f))
+        Spacer(modifier = Modifier.height(40.dp))
         Row(
             verticalAlignment = Alignment.CenterVertically,
             modifier = Modifier
diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/pages/TimeSettingsPage.kt b/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/pages/TimeSettingsPage.kt
index 454b90f..35aa0a9 100644
--- a/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/pages/TimeSettingsPage.kt
+++ b/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/pages/TimeSettingsPage.kt
@@ -44,7 +44,7 @@ fun TimeSettingsPage(
         verticalArrangement = Arrangement.SpaceBetween,
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
-        Spacer(modifier = Modifier.weight(1f))
+        Spacer(modifier = Modifier.height(40.dp))
         Column(
             modifier = Modifier
                 .padding(horizontal = 32.dp),
@@ -65,17 +65,24 @@ fun TimeSettingsPage(
             Spacer(modifier = Modifier.height(16.dp))
             Text(
                 stringResource(R.string.ui_welcome_timeSettings_message),
+                fontStyle = MaterialTheme.typography.bodySmall.fontStyle,
+                fontSize = MaterialTheme.typography.bodySmall.fontSize,
+                color = MaterialTheme.typography.bodySmall.color,
             )
         }
-        Spacer(modifier = Modifier.weight(2f))
+        Spacer(modifier = Modifier.height(40.dp))
         Box(
-            modifier = Modifier.widthIn(max = 400.dp)
+            modifier = Modifier
+                .widthIn(max = 400.dp)
+                .padding(horizontal = 16.dp)
         ) {
             TimeSelector()
         }
-        Spacer(modifier = Modifier.weight(1f))
+        Spacer(modifier = Modifier.height(20.dp))
         Box(
-            modifier = Modifier.widthIn(max = 400.dp)
+            modifier = Modifier
+                .widthIn(max = 400.dp)
+                .padding(horizontal = 16.dp)
         ) {
             MessageBox(
                 type = MessageType.INFO,
@@ -83,7 +90,7 @@ fun TimeSettingsPage(
                 density = VisualDensity.DENSE,
             )
         }
-        Spacer(modifier = Modifier.weight(2f))
+        Spacer(modifier = Modifier.height(40.dp))
         Button(
             onClick = { onContinue() },
             modifier = Modifier