diff --git a/app/src/main/res/layout/fragment_onboarding_1.xml b/app/src/main/res/layout/fragment_onboarding_1.xml
index 64daa9664..5debb06b9 100644
--- a/app/src/main/res/layout/fragment_onboarding_1.xml
+++ b/app/src/main/res/layout/fragment_onboarding_1.xml
@@ -1,61 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:background="#002B54">
+	android:background="#002B54"
+	android:orientation="vertical">
 
-	<LinearLayout
+	<ImageView
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:orientation="vertical">
+		android:adjustViewBounds="true"
+		android:src="@drawable/onboarding_1" />
 
-		<ImageView
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:adjustViewBounds="true"
-			android:src="@drawable/onboarding_1" />
+	<TextView
+		style="@style/TextAppearance.MaterialComponents.Headline6"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="center_horizontal"
+		android:text="@string/Onboarding_WhatIsOONIProbe_Title"
+		android:textColor="@color/color_white" />
 
-		<TextView
-			style="@style/TextAppearance.MaterialComponents.Headline6"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal"
-			android:text="@string/Onboarding_WhatIsOONIProbe_Title"
-			android:textColor="@color/color_white" />
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_marginHorizontal="16dp"
+		android:layout_marginVertical="8dp"
+		android:layout_weight="1">
 
 		<TextView
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginHorizontal="16dp"
-			android:layout_marginTop="8dp"
 			android:text="@string/Onboarding_WhatIsOONIProbe_Paragraph"
 			android:textColor="@color/color_white" />
+	</ScrollView>
 
-	</LinearLayout>
-
-	<LinearLayout
+	<Button
+		android:id="@+id/master"
+		style="@style/TextAppearance.MaterialComponents.Body1"
 		android:layout_width="match_parent"
+		android:layout_height="64dp"
+		android:layout_marginHorizontal="64dp"
+		android:text="@string/Onboarding_WhatIsOONIProbe_GotIt"
+		android:textAllCaps="false"
+		android:textColor="#002B54"
+		app:cornerRadius="32dp" />
+
+	<ImageView
+		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_gravity="bottom"
-		android:orientation="vertical">
-
-		<Button
-			android:id="@+id/master"
-			style="@style/TextAppearance.MaterialComponents.Body1"
-			android:layout_width="match_parent"
-			android:layout_height="64dp"
-			android:layout_marginHorizontal="64dp"
-			android:text="@string/Onboarding_WhatIsOONIProbe_GotIt"
-			android:textAllCaps="false"
-			android:textColor="#002B54"
-			app:cornerRadius="32dp" />
-
-		<ImageView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal"
-			android:layout_margin="16dp"
-			android:src="@drawable/dots_1" />
-	</LinearLayout>
-</FrameLayout>
\ No newline at end of file
+		android:layout_gravity="center_horizontal"
+		android:layout_margin="16dp"
+		android:src="@drawable/dots_1" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_onboarding_2.xml b/app/src/main/res/layout/fragment_onboarding_2.xml
index 9d9003833..90a9ae813 100644
--- a/app/src/main/res/layout/fragment_onboarding_2.xml
+++ b/app/src/main/res/layout/fragment_onboarding_2.xml
@@ -1,87 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:background="#0F3E74">
+	android:background="#0F3E74"
+	android:orientation="vertical">
 
-	<LinearLayout
+	<ImageView
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:orientation="vertical">
+		android:adjustViewBounds="true"
+		android:src="@drawable/onboarding_2" />
 
-		<ImageView
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:adjustViewBounds="true"
-			android:src="@drawable/onboarding_2" />
+	<TextView
+		style="@style/TextAppearance.MaterialComponents.Headline6"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="center_horizontal"
+		android:text="@string/Onboarding_ThingsToKnow_Title"
+		android:textColor="@color/color_white" />
 
-		<TextView
-			style="@style/TextAppearance.MaterialComponents.Headline6"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal"
-			android:text="@string/Onboarding_ThingsToKnow_Title"
-			android:textColor="@color/color_white" />
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_marginHorizontal="16dp"
+		android:layout_marginVertical="8dp"
+		android:layout_weight="1">
 
-		<TextView
-			android:id="@+id/bullet1"
+		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginHorizontal="16dp"
-			android:layout_marginTop="8dp"
-			android:text="@string/Onboarding_ThingsToKnow_Bullet_1"
-			android:textColor="@color/color_white" />
+			android:orientation="vertical">
 
-		<TextView
-			android:id="@+id/bullet2"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginHorizontal="16dp"
-			android:text="@string/Onboarding_ThingsToKnow_Bullet_2"
-			android:textColor="@color/color_white" />
+			<TextView
+				android:id="@+id/bullet1"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="@string/Onboarding_ThingsToKnow_Bullet_1"
+				android:textColor="@color/color_white" />
 
-		<TextView
-			android:id="@+id/bullet3"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginHorizontal="16dp"
-			android:text="@string/Onboarding_ThingsToKnow_Bullet_3"
-			android:textColor="@color/color_white" />
-	</LinearLayout>
+			<TextView
+				android:id="@+id/bullet2"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="@string/Onboarding_ThingsToKnow_Bullet_2"
+				android:textColor="@color/color_white" />
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_gravity="bottom"
-		android:orientation="vertical">
+			<TextView
+				android:id="@+id/bullet3"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="@string/Onboarding_ThingsToKnow_Bullet_3"
+				android:textColor="@color/color_white" />
+		</LinearLayout>
+	</ScrollView>
 
-		<Button
-			android:id="@+id/master"
-			style="@style/TextAppearance.MaterialComponents.Body1"
-			android:layout_width="match_parent"
-			android:layout_height="64dp"
-			android:layout_marginHorizontal="64dp"
-			android:text="@string/Onboarding_ThingsToKnow_Button"
-			android:textAllCaps="false"
-			android:textColor="#002B54"
-			app:backgroundTint="@color/color_white"
-			app:cornerRadius="32dp" />
+	<Button
+		android:id="@+id/master"
+		style="@style/TextAppearance.MaterialComponents.Body1"
+		android:layout_width="match_parent"
+		android:layout_height="64dp"
+		android:layout_marginHorizontal="64dp"
+		android:text="@string/Onboarding_ThingsToKnow_Button"
+		android:textAllCaps="false"
+		android:textColor="#002B54"
+		app:backgroundTint="@color/color_white"
+		app:cornerRadius="32dp" />
 
-		<Button
-			android:id="@+id/slave"
-			style="@style/Widget.MaterialComponents.Button.TextButton"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="@string/Onboarding_ThingsToKnow_LearnMore"
-			android:textAllCaps="false"
-			android:textColor="@color/color_white" />
+	<Button
+		android:id="@+id/slave"
+		style="@style/Widget.MaterialComponents.Button.TextButton"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/Onboarding_ThingsToKnow_LearnMore"
+		android:textAllCaps="false"
+		android:textColor="@color/color_white" />
 
-		<ImageView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal"
-			android:layout_marginBottom="16dp"
-			android:src="@drawable/dots_2" />
-	</LinearLayout>
-</FrameLayout>
\ No newline at end of file
+	<ImageView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_horizontal"
+		android:layout_marginBottom="16dp"
+		android:src="@drawable/dots_2" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_onboarding_3.xml b/app/src/main/res/layout/fragment_onboarding_3.xml
index 508e6c6c4..6abf15841 100644
--- a/app/src/main/res/layout/fragment_onboarding_3.xml
+++ b/app/src/main/res/layout/fragment_onboarding_3.xml
@@ -1,103 +1,100 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:background="#001A33">
+	android:background="#001A33"
+	android:orientation="vertical">
 
-	<LinearLayout
+	<ImageView
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:orientation="vertical">
+		android:adjustViewBounds="true"
+		android:background="#002B54"
+		android:src="@drawable/onboarding_3" />
 
-		<ImageView
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:adjustViewBounds="true"
-			android:background="#002B54"
-			android:src="@drawable/onboarding_3" />
+	<TextView
+		style="@style/TextAppearance.MaterialComponents.Headline6"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="center_horizontal"
+		android:text="@string/Onboarding_DefaultSettings_Title"
+		android:textColor="@color/color_white" />
 
-		<TextView
-			style="@style/TextAppearance.MaterialComponents.Headline6"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal"
-			android:text="@string/Onboarding_DefaultSettings_Title"
-			android:textColor="@color/color_white" />
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_marginHorizontal="16dp"
+		android:layout_marginVertical="8dp"
+		android:layout_weight="1">
 
-		<TextView
+		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginHorizontal="16dp"
-			android:layout_marginTop="8dp"
-			android:text="@string/Onboarding_DefaultSettings_Header"
-			android:textColor="@color/color_white"
-			android:textStyle="bold" />
+			android:orientation="vertical">
 
-		<TextView
-			android:id="@+id/bullet1"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginHorizontal="16dp"
-			android:text="@string/Onboarding_DefaultSettings_Bullet_1"
-			android:textColor="@color/color_white" />
+			<TextView
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
 
-		<TextView
-			android:id="@+id/bullet2"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginHorizontal="16dp"
-			android:text="@string/Onboarding_DefaultSettings_Bullet_2"
-			android:textColor="@color/color_white" />
+				android:text="@string/Onboarding_DefaultSettings_Header"
+				android:textColor="@color/color_white"
+				android:textStyle="bold" />
 
-		<TextView
-			android:id="@+id/bullet3"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginHorizontal="16dp"
-			android:text="@string/Onboarding_DefaultSettings_Bullet_3"
-			android:textColor="@color/color_white" />
+			<TextView
+				android:id="@+id/bullet1"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="@string/Onboarding_DefaultSettings_Bullet_1"
+				android:textColor="@color/color_white" />
 
-		<TextView
-			android:id="@+id/paragraph"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginHorizontal="16dp"
-			android:text="@string/Onboarding_DefaultSettings_Paragraph"
-			android:textColor="@color/color_white" />
-	</LinearLayout>
+			<TextView
+				android:id="@+id/bullet2"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="@string/Onboarding_DefaultSettings_Bullet_2"
+				android:textColor="@color/color_white" />
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_gravity="bottom"
-		android:orientation="vertical">
+			<TextView
+				android:id="@+id/bullet3"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="@string/Onboarding_DefaultSettings_Bullet_3"
+				android:textColor="@color/color_white" />
 
-		<Button
-			android:id="@+id/master"
-			style="@style/TextAppearance.MaterialComponents.Body1"
-			android:layout_width="match_parent"
-			android:layout_height="64dp"
-			android:layout_marginHorizontal="64dp"
-			android:text="@string/Onboarding_DefaultSettings_Button_Go"
-			android:textAllCaps="false"
-			android:textColor="#002B54"
-			app:cornerRadius="32dp" />
+			<TextView
+				android:id="@+id/paragraph"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="@string/Onboarding_DefaultSettings_Paragraph"
+				android:textColor="@color/color_white" />
+		</LinearLayout>
+	</ScrollView>
 
-		<Button
-			android:id="@+id/slave"
-			style="@style/Widget.MaterialComponents.Button.TextButton"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="@string/Onboarding_DefaultSettings_Button_Change"
-			android:textAllCaps="false"
-			android:textColor="@color/color_white" />
+	<Button
+		android:id="@+id/master"
+		style="@style/TextAppearance.MaterialComponents.Body1"
+		android:layout_width="match_parent"
+		android:layout_height="64dp"
+		android:layout_marginHorizontal="64dp"
+		android:text="@string/Onboarding_DefaultSettings_Button_Go"
+		android:textAllCaps="false"
+		android:textColor="#002B54"
+		app:cornerRadius="32dp" />
 
-		<ImageView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal"
-			android:layout_marginBottom="16dp"
-			android:src="@drawable/dots_3" />
-	</LinearLayout>
-</FrameLayout>
\ No newline at end of file
+	<Button
+		android:id="@+id/slave"
+		style="@style/Widget.MaterialComponents.Button.TextButton"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/Onboarding_DefaultSettings_Button_Change"
+		android:textAllCaps="false"
+		android:textColor="@color/color_white" />
+
+	<ImageView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_horizontal"
+		android:layout_marginBottom="16dp"
+		android:src="@drawable/dots_3" />
+</LinearLayout>
\ No newline at end of file