diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/AndroidBotColorPicker.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/AndroidBotColorPicker.kt
index 599a5ba0..44067472 100644
--- a/feature/creation/src/main/java/com/android/developers/androidify/creation/AndroidBotColorPicker.kt
+++ b/feature/creation/src/main/java/com/android/developers/androidify/creation/AndroidBotColorPicker.kt
@@ -33,7 +33,9 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.requiredSize
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -61,6 +63,7 @@ fun AndroidBotColorPicker(
     onBotColorSelected: (BotColor) -> Unit,
     listBotColor: List<BotColor>,
 ) {
+    val scrollState = rememberScrollState()
     Column(
         modifier
             .fillMaxWidth()
@@ -73,7 +76,9 @@ fun AndroidBotColorPicker(
         FlowRow(
             horizontalArrangement = Arrangement.spacedBy(12.dp),
             verticalArrangement = Arrangement.spacedBy(12.dp),
-            modifier = Modifier.align(Alignment.CenterHorizontally),
+            modifier = Modifier
+                .align(Alignment.CenterHorizontally)
+                .verticalScroll(scrollState),
         ) {
             listBotColors.forEach {
                 AndroidBotIndividualColor(
diff --git a/feature/home/src/main/java/com/android/developers/androidify/home/AboutScreen.kt b/feature/home/src/main/java/com/android/developers/androidify/home/AboutScreen.kt
index 3ee69b15..393d7b17 100644
--- a/feature/home/src/main/java/com/android/developers/androidify/home/AboutScreen.kt
+++ b/feature/home/src/main/java/com/android/developers/androidify/home/AboutScreen.kt
@@ -92,7 +92,8 @@ fun AboutScreen(
         Scaffold(
             topBar = {
                 IconButton(
-                    modifier = Modifier.safeDrawingPadding()
+                    modifier = Modifier
+                        .safeDrawingPadding()
                         .padding(16.dp),
                     shape = CircleShape,
                     colors = IconButtonDefaults.iconButtonColors(
@@ -162,7 +163,7 @@ fun AboutScreen(
                             )
                         }
                         Spacer(Modifier.size(48.dp))
-                        FooterButtons()
+                        FooterButtons(modifier = Modifier.padding(bottom = 8.dp))
                     }
                 }
             } else {
@@ -196,7 +197,7 @@ fun AboutScreen(
                         stringResource(R.string.about_step3_label),
                     )
                     Spacer(modifier = Modifier.size(24.dp))
-                    FooterButtons()
+                    FooterButtons(modifier = Modifier.padding(bottom = 8.dp))
                 }
             }
         }
@@ -204,9 +205,9 @@ fun AboutScreen(
 }
 
 @Composable
-private fun FooterButtons() {
+private fun FooterButtons(modifier: Modifier = Modifier) {
     val uriHandler = LocalUriHandler.current
-    Row {
+    Row(modifier) {
         SecondaryOutlinedButton(
             onClick = {
                 uriHandler.openUri("https://policies.google.com/terms")