diff --git a/android-app/src/main/res/layout-land/cpp_app_keyboard.xml b/android-app/src/main/res/layout-land/cpp_app_keyboard.xml
index 0dbc7132..bc434b57 100644
--- a/android-app/src/main/res/layout-land/cpp_app_keyboard.xml
+++ b/android-app/src/main/res/layout-land/cpp_app_keyboard.xml
@@ -23,76 +23,82 @@
   -->
 
 <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="match_parent"
+	a:layout_height="match_parent"
+	a:orientation="vertical">
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1"
+		a:baselineAligned="false"
+		a:orientation="horizontal">
 
-		<include layout="@layout/cpp_drag_button_vars"/>
+		<include layout="@layout/cpp_drag_button_vars" />
 
-		<include layout="@layout/cpp_app_button_copy"/>
+		<include layout="@layout/cpp_app_button_copy" />
 
-		<include layout="@layout/cpp_drag_button_7"/>
+		<include layout="@layout/cpp_drag_button_7" />
 
-		<include layout="@layout/cpp_drag_button_8"/>
+		<include layout="@layout/cpp_drag_button_8" />
 
-		<include layout="@layout/cpp_drag_button_9"/>
+		<include layout="@layout/cpp_drag_button_9" />
 
-		<include layout="@layout/cpp_drag_button_multiplication"/>
+		<include layout="@layout/cpp_drag_button_multiplication" />
 
-		<include layout="@layout/cpp_drag_button_division"/>
+		<include layout="@layout/cpp_drag_button_division" />
 
-		<include layout="@layout/cpp_drag_button_equals"/>
+		<include layout="@layout/cpp_drag_button_equals" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1"
+		a:baselineAligned="false"
+		a:orientation="horizontal">
 
-		<include layout="@layout/cpp_drag_button_functions"/>
+		<include layout="@layout/cpp_drag_button_functions" />
 
-		<include layout="@layout/cpp_app_button_paste"/>
+		<include layout="@layout/cpp_app_button_paste" />
 
-		<include layout="@layout/cpp_drag_button_4"/>
+		<include layout="@layout/cpp_drag_button_4" />
 
-		<include layout="@layout/cpp_drag_button_5"/>
+		<include layout="@layout/cpp_drag_button_5" />
 
-		<include layout="@layout/cpp_drag_button_6"/>
+		<include layout="@layout/cpp_drag_button_6" />
 
-		<include layout="@layout/cpp_drag_button_plus"/>
+		<include layout="@layout/cpp_drag_button_plus" />
 
-		<include layout="@layout/cpp_drag_button_subtraction"/>
+		<include layout="@layout/cpp_drag_button_subtraction" />
 
-		<include layout="@layout/cpp_drag_button_round_brackets"/>
+		<include layout="@layout/cpp_drag_button_round_brackets" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1"
+		a:baselineAligned="false"
+		a:orientation="horizontal">
 
-		<include layout="@layout/cpp_drag_button_operators"/>
+		<include layout="@layout/cpp_drag_button_operators" />
 
-		<include layout="@layout/cpp_app_button_donate"/>
+		<include layout="@layout/cpp_app_button_donate" />
 
-		<include layout="@layout/cpp_drag_button_1"/>
+		<include layout="@layout/cpp_drag_button_1" />
 
-		<include layout="@layout/cpp_drag_button_2"/>
+		<include layout="@layout/cpp_drag_button_2" />
 
-		<include layout="@layout/cpp_drag_button_3"/>
+		<include layout="@layout/cpp_drag_button_3" />
 
-		<include layout="@layout/cpp_drag_button_0"/>
+		<include layout="@layout/cpp_drag_button_0" />
 
-		<include layout="@layout/cpp_drag_button_dot"/>
+		<include layout="@layout/cpp_drag_button_dot" />
 
-		<include layout="@layout/cpp_drag_button_history"/>
+		<include layout="@layout/cpp_drag_button_history" />
 
 	</LinearLayout>
 
diff --git a/android-app/src/main/res/layout/cpp_drag_button_equals.xml b/android-app/src/main/res/layout/cpp_drag_button_equals.xml
index 0e9ad24e..6e928580 100644
--- a/android-app/src/main/res/layout/cpp_drag_button_equals.xml
+++ b/android-app/src/main/res/layout/cpp_drag_button_equals.xml
@@ -28,7 +28,5 @@
 													a:text="="
 													c:textDown="@string/cpp_plot_button_text"
 													c:directionTextScale="0.5;0.5;0.33;0.5"
-													a:layout_width="fill_parent"
-													a:layout_height="fill_parent"
 													style="?cpp_control_button_style"
 													a:onClick="equalsButtonClickHandler"/>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/main_calculator.xml b/android-app/src/main/res/layout/main_calculator.xml
index 1147ce44..da0698f7 100644
--- a/android-app/src/main/res/layout/main_calculator.xml
+++ b/android-app/src/main/res/layout/main_calculator.xml
@@ -22,42 +22,45 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
-			  a:id="@+id/main_layout"
-			  a:orientation="vertical"
-			  style="?cpp_main_layout_style">
+<LinearLayout a:id="@+id/main_layout"
+	style="?cpp_main_layout_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:layout_width="match_parent"
+	a:layout_height="match_parent"
+	a:orientation="vertical">
 
 	<LinearLayout
-			a:id="@+id/editorContainer"
-			a:layout_weight="2"
-			a:layout_width="match_parent"
-			a:layout_height="0dp"/>
+		a:id="@+id/editorContainer"
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="2"
+		a:orientation="horizontal" />
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1"
+		a:baselineAligned="false">
 
 		<include
-				layout="@layout/cpp_drag_button_equals"
-				a:layout_weight="1"
-				a:layout_width="0dp"
-				a:layout_height="match_parent"/>
+			layout="@layout/cpp_drag_button_equals"
+			a:layout_width="0dp"
+			a:layout_height="match_parent"
+			a:layout_weight="1" />
 
 		<FrameLayout
-				a:id="@+id/displayContainer"
-				a:layout_weight="4"
-				a:layout_width="0dp"
-				a:layout_height="match_parent"/>
+			a:id="@+id/displayContainer"
+			a:layout_width="0dp"
+			a:layout_height="match_parent"
+			a:layout_weight="4" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:id="@+id/keyboardContainer"
-			a:layout_weight="5"
-			a:layout_width="match_parent"
-			a:layout_height="0dp"/>
+		a:id="@+id/keyboardContainer"
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="5"
+		a:orientation="vertical" />
 
 </LinearLayout>
diff --git a/android-app/src/main/res/values/styles.xml b/android-app/src/main/res/values/styles.xml
index 216b16d1..9ac25fc7 100644
--- a/android-app/src/main/res/values/styles.xml
+++ b/android-app/src/main/res/values/styles.xml
@@ -50,8 +50,8 @@
 	</style>
 
 	<style name="cpp_keyboard_button_style">
-		<item name="android:layout_width">fill_parent</item>
-		<item name="android:layout_height">fill_parent</item>
+		<item name="android:layout_width">0dp</item>
+		<item name="android:layout_height">match_parent</item>
 		<item name="android:layout_weight">1</item>
 		<item name="android:focusable">true</item>
 		<item name="android:background">@drawable/metro_button_dark</item>