diff --git a/03-building-layout-groups-in-compose/projects/final/app/src/main/java/com/yourcompany/android/jetpackcompose/screens/ColumnScreen.kt b/03-building-layout-groups-in-compose/projects/final/app/src/main/java/com/yourcompany/android/jetpackcompose/screens/ColumnScreen.kt
index 92cd0b6..18f5e43 100644
--- a/03-building-layout-groups-in-compose/projects/final/app/src/main/java/com/yourcompany/android/jetpackcompose/screens/ColumnScreen.kt
+++ b/03-building-layout-groups-in-compose/projects/final/app/src/main/java/com/yourcompany/android/jetpackcompose/screens/ColumnScreen.kt
@@ -57,11 +57,11 @@ fun ColumnScreen() {
 }
 
 @Composable
-fun MyColumn() {
+fun MyColumn(modifier: Modifier = Modifier) {
   Column(
     horizontalAlignment = Alignment.CenterHorizontally,
     verticalArrangement = Arrangement.SpaceEvenly,
-    modifier = Modifier.fillMaxSize()
+    modifier = modifier.fillMaxSize()
   ) {
 
     THREE_ELEMENT_LIST.forEach { textResId ->
diff --git a/03-building-layout-groups-in-compose/projects/final/app/src/main/java/com/yourcompany/android/jetpackcompose/screens/RowScreen.kt b/03-building-layout-groups-in-compose/projects/final/app/src/main/java/com/yourcompany/android/jetpackcompose/screens/RowScreen.kt
index a6251e5..79e2a65 100644
--- a/03-building-layout-groups-in-compose/projects/final/app/src/main/java/com/yourcompany/android/jetpackcompose/screens/RowScreen.kt
+++ b/03-building-layout-groups-in-compose/projects/final/app/src/main/java/com/yourcompany/android/jetpackcompose/screens/RowScreen.kt
@@ -60,10 +60,12 @@ fun RowScreen() {
 }
 
 @Composable
-fun MyRow() {
-  Row(verticalAlignment = Alignment.CenterVertically,
+fun MyRow(modifier: Modifier = Modifier) {
+  Row(
+    verticalAlignment = Alignment.CenterVertically,
     horizontalArrangement = Arrangement.SpaceEvenly,
-    modifier = Modifier.fillMaxSize()) {
+    modifier = modifier.fillMaxSize()
+  ) {
 
     THREE_ELEMENT_LIST.forEach { textResId ->
       Text(
diff --git a/03-building-layout-groups-in-compose/projects/final/app/src/main/java/com/yourcompany/android/jetpackcompose/screens/ScaffoldScreen.kt b/03-building-layout-groups-in-compose/projects/final/app/src/main/java/com/yourcompany/android/jetpackcompose/screens/ScaffoldScreen.kt
index f2a7523..579b750 100644
--- a/03-building-layout-groups-in-compose/projects/final/app/src/main/java/com/yourcompany/android/jetpackcompose/screens/ScaffoldScreen.kt
+++ b/03-building-layout-groups-in-compose/projects/final/app/src/main/java/com/yourcompany/android/jetpackcompose/screens/ScaffoldScreen.kt
@@ -34,11 +34,13 @@
 
 package com.yourcompany.android.jetpackcompose.screens
 
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Menu
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
@@ -66,7 +68,12 @@ fun MyScaffold() {
   Scaffold(
     scaffoldState = scaffoldState,
     contentColor = colorResource(id = R.color.colorPrimary),
-    content = { MyRow() },
+    content = { paddingValues ->
+      MyRow(
+        modifier = Modifier
+          .padding(bottom = paddingValues.calculateBottomPadding())
+      )
+    },
     topBar = { MyTopAppBar(scaffoldState = scaffoldState, scope = scope) },
     bottomBar = { MyBottomAppBar() },
     drawerContent = { MyColumn() }
diff --git a/03-building-layout-groups-in-compose/projects/starter/app/src/main/java/com/yourcompany/android/jetpackcompose/screens/ColumnScreen.kt b/03-building-layout-groups-in-compose/projects/starter/app/src/main/java/com/yourcompany/android/jetpackcompose/screens/ColumnScreen.kt
index 0b32e7f..599351d 100644
--- a/03-building-layout-groups-in-compose/projects/starter/app/src/main/java/com/yourcompany/android/jetpackcompose/screens/ColumnScreen.kt
+++ b/03-building-layout-groups-in-compose/projects/starter/app/src/main/java/com/yourcompany/android/jetpackcompose/screens/ColumnScreen.kt
@@ -35,6 +35,7 @@
 package com.yourcompany.android.jetpackcompose.screens
 
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import com.yourcompany.android.jetpackcompose.router.BackButtonHandler
 import com.yourcompany.android.jetpackcompose.router.JetFundamentalsRouter
 import com.yourcompany.android.jetpackcompose.router.Screen
@@ -49,6 +50,6 @@ fun ColumnScreen() {
 }
 
 @Composable
-fun MyColumn() {
+fun MyColumn(modifier: Modifier = Modifier) {
   //TODO write your code here
 }
\ No newline at end of file
diff --git a/03-building-layout-groups-in-compose/projects/starter/app/src/main/java/com/yourcompany/android/jetpackcompose/screens/RowScreen.kt b/03-building-layout-groups-in-compose/projects/starter/app/src/main/java/com/yourcompany/android/jetpackcompose/screens/RowScreen.kt
index c0fc40c..0695cdb 100644
--- a/03-building-layout-groups-in-compose/projects/starter/app/src/main/java/com/yourcompany/android/jetpackcompose/screens/RowScreen.kt
+++ b/03-building-layout-groups-in-compose/projects/starter/app/src/main/java/com/yourcompany/android/jetpackcompose/screens/RowScreen.kt
@@ -35,6 +35,7 @@
 package com.yourcompany.android.jetpackcompose.screens
 
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import com.yourcompany.android.jetpackcompose.R
 import com.yourcompany.android.jetpackcompose.router.BackButtonHandler
 import com.yourcompany.android.jetpackcompose.router.JetFundamentalsRouter
@@ -52,6 +53,6 @@ fun RowScreen() {
 }
 
 @Composable
-fun MyRow() {
+fun MyRow(modifier: Modifier = Modifier) {
   //TODO write your code here
 }
\ No newline at end of file