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 879bd099..62b59ffd 100644
--- a/android-app/res/layout/cpp_wizard_step_choose_mode.xml
+++ b/android-app/res/layout/cpp_wizard_step_choose_mode.xml
@@ -1,59 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-	a:layout_width="match_parent"
-	a:layout_height="match_parent"
-	a:orientation="vertical">
+			  a:layout_width="wrap_content"
+			  a:layout_height="match_parent"
+			  a:orientation="vertical">
 
-	<TextView
-		a:text="Choose layout"
-		a:layout_height="wrap_content"
-		a:layout_width="match_parent" />
-
-	<LinearLayout
-		a:layout_width="match_parent"
-		a:layout_height="match_parent"
-		a:orientation="vertical">
-
-		<RadioGroup
+	<RadioGroup
 			a:orientation="horizontal"
-			a:layout_width="match_parent"
+			a:layout_width="wrap_content"
 			a:layout_height="wrap_content"
 			a:gravity="center_vertical|top">
 
-			<RadioButton a:layout_width="0dp"
-				a:id="@+id/wizard_simple_mode_radiobutton"
-				a:layout_weight="1"
-				a:text="@string/cpp_wizard_mode_simple"
-				a:layout_height="wrap_content"/>
+		<RadioButton a:layout_width="200dp"
+					 a:id="@+id/wizard_simple_mode_radiobutton"
+					 a:text="@string/cpp_wizard_mode_simple"
+					 a:layout_height="wrap_content"/>
 
-			<RadioButton a:layout_width="0dp"
-				a:id="@+id/wizard_engineer_mode_radiobutton"
-				a:layout_weight="1"
-				a:text="@string/cpp_wizard_mode_engineer"
-				a:layout_height="wrap_content"/>
+		<RadioButton a:layout_width="200dp"
+					 a:id="@+id/wizard_engineer_mode_radiobutton"
+					 a:text="@string/cpp_wizard_mode_engineer"
+					 a:layout_height="wrap_content"/>
 
-		</RadioGroup>
+	</RadioGroup>
 
-		<LinearLayout a:layout_width="match_parent"
-			a:layout_height="wrap_content"
-			a:orientation="horizontal">
+	<LinearLayout a:layout_width="wrap_content"
+				  a:layout_height="wrap_content"
+				  a:orientation="horizontal">
 
-			<TextView
-				a:layout_width="0dp"
-				a:layout_weight="1"
-				a:layout_height="match_parent"
-				a:text="@string/cpp_wizard_mode_simple_description"
-				a:padding="10dp"/>
+		<TextView
+				a:layout_width="200dp"
+				a:layout_height="wrap_content"
+				a:padding="6dp"
+				a:text="@string/cpp_wizard_mode_simple_description"/>
 
-			<TextView
-				a:layout_width="0dp"
-				a:layout_weight="1"
-				a:layout_height="match_parent"
-				a:text="@string/cpp_wizard_mode_engineer_description"
-				a:padding="10dp"/>
-
-		</LinearLayout>
+		<TextView
+				a:layout_width="200dp"
+				a:layout_height="wrap_content"
+				a:padding="6dp"
+				a:text="@string/cpp_wizard_mode_engineer_description"/>
 
 	</LinearLayout>