diff --git a/android-app/res/layout/cpp_wizard.xml b/android-app/res/layout/cpp_wizard.xml
index bb97d22f..b43842ad 100644
--- a/android-app/res/layout/cpp_wizard.xml
+++ b/android-app/res/layout/cpp_wizard.xml
@@ -5,12 +5,14 @@
 	style="?cpp_dialog_style"
 	a:orientation="vertical">
 
-	<FrameLayout
+	<LinearLayout
 		a:orientation="vertical"
 		a:id="@+id/wizard_content"
 		a:layout_width="match_parent"
 		a:layout_height="0dp"
-		a:layout_weight="1" />
+		a:layout_weight="1"
+		a:gravity="center"
+		a:minHeight="150dp"/>
 
 	<LinearLayout
 		a:orientation="horizontal"
diff --git a/android-app/res/layout/cpp_wizard_step_choose_mode.xml b/android-app/res/layout/cpp_wizard_step_choose_mode.xml
index 62b59ffd..a66dbf72 100644
--- a/android-app/res/layout/cpp_wizard_step_choose_mode.xml
+++ b/android-app/res/layout/cpp_wizard_step_choose_mode.xml
@@ -7,34 +7,40 @@
 
 	<RadioGroup
 			a:orientation="horizontal"
-			a:layout_width="wrap_content"
+			a:layout_width="match_parent"
 			a:layout_height="wrap_content"
 			a:gravity="center_vertical|top">
 
-		<RadioButton a:layout_width="200dp"
+		<RadioButton a:layout_width="0dp"
+					 a:layout_weight="1"
+					 a:layout_margin="6dp"
 					 a:id="@+id/wizard_simple_mode_radiobutton"
 					 a:text="@string/cpp_wizard_mode_simple"
 					 a:layout_height="wrap_content"/>
 
-		<RadioButton a:layout_width="200dp"
+		<RadioButton a:layout_width="0dp"
+					 a:layout_weight="1"
+					 a:layout_margin="6dp"
 					 a:id="@+id/wizard_engineer_mode_radiobutton"
 					 a:text="@string/cpp_wizard_mode_engineer"
 					 a:layout_height="wrap_content"/>
 
 	</RadioGroup>
 
-	<LinearLayout a:layout_width="wrap_content"
+	<LinearLayout a:layout_width="match_parent"
 				  a:layout_height="wrap_content"
 				  a:orientation="horizontal">
 
 		<TextView
-				a:layout_width="200dp"
+				a:layout_width="0dp"
+				a:layout_weight="1"
 				a:layout_height="wrap_content"
 				a:padding="6dp"
 				a:text="@string/cpp_wizard_mode_simple_description"/>
 
 		<TextView
-				a:layout_width="200dp"
+				a:layout_width="0dp"
+				a:layout_weight="1"
 				a:layout_height="wrap_content"
 				a:padding="6dp"
 				a:text="@string/cpp_wizard_mode_engineer_description"/>