diff --git a/calculatorpp/res/layout-land/main_first_pane.xml b/calculatorpp/res/layout-land/main_first_pane.xml
index 8b628ebf..fdc46780 100644
--- a/calculatorpp/res/layout-land/main_first_pane.xml
+++ b/calculatorpp/res/layout-land/main_first_pane.xml
@@ -34,7 +34,6 @@
                  a:layout_weight="1"/>
 
         <LinearLayout a:id="@+id/displayContainer"
-                      a:layout_margin="@dimen/display_margin"
                       a:layout_weight="4"
                       a:layout_width="0dp"
                       a:layout_height="match_parent"/>
diff --git a/calculatorpp/res/layout-large-land/calc_keyboard.xml b/calculatorpp/res/layout-large-land/calc_keyboard.xml
new file mode 100644
index 00000000..7304e802
--- /dev/null
+++ b/calculatorpp/res/layout-large-land/calc_keyboard.xml
@@ -0,0 +1,51 @@
+<?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">
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/calc_left_button"/>
+        <include layout="@layout/calc_vars_button"/>
+        <include layout="@layout/calc_copy_button"/>
+        <include layout="@layout/calc_six_digit_button"/>
+        <include layout="@layout/calc_seven_digit_button"/>
+        <include layout="@layout/calc_eight_digit_button"/>
+        <include layout="@layout/calc_nine_digit_button"/>
+        <include layout="@layout/calc_zero_digit_button"/>
+        <include layout="@layout/calc_multiplication_button"/>
+        <include layout="@layout/calc_division_button"/>
+        <include layout="@layout/calc_equals_button"/>
+        <include layout="@layout/calc_operators_button"/>
+        <include layout="@layout/calc_donate_button"/>
+        <include layout="@layout/calc_right_button"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/calc_erase_button"/>
+        <include layout="@layout/calc_functions_button"/>
+        <include layout="@layout/calc_paste_button"/>
+        <include layout="@layout/calc_one_digit_button"/>
+        <include layout="@layout/calc_two_digit_button"/>
+        <include layout="@layout/calc_three_digit_button"/>
+        <include layout="@layout/calc_four_digit_button"/>
+        <include layout="@layout/calc_five_digit_button"/>
+        <include layout="@layout/calc_plus_button"/>
+        <include layout="@layout/calc_subtraction_button"/>
+        <include layout="@layout/calc_round_brackets_button"/>
+        <include layout="@layout/calc_dot_button"/>
+        <include layout="@layout/calc_history_button"/>
+        <include layout="@layout/calc_clear_button"/>
+
+    </LinearLayout>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/calculatorpp/res/layout-large-land/main_calculator.xml b/calculatorpp/res/layout-large-land/main_calculator.xml
index 49b7358c..4650dcff 100644
--- a/calculatorpp/res/layout-large-land/main_calculator.xml
+++ b/calculatorpp/res/layout-large-land/main_calculator.xml
@@ -1,84 +1,60 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
-  ~ For more information, please, contact se.solovyev@gmail.com
-  ~ or visit 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="horizontal"
-        a:layout_gravity="center"
-        a:background="@color/default_background"
-        a:baselineAligned="false">
-
-    <LinearLayout
-            a:layout_height="match_parent"
-            a:layout_width="0dp"
-            a:layout_weight="1"
-            a:orientation="vertical"
-            style="?fragmentLayoutStyle"
-            a:layout_gravity="center">
-
-        <LinearLayout a:id="@+id/editorContainer"
-                      a:layout_weight="4"
-                      a:layout_width="match_parent"
-                      a:layout_height="0dp"/>
-
-        <LinearLayout a:layout_weight="1"
-                      a:layout_width="match_parent"
-                      a:layout_height="0dp">
-
-            <include layout="@layout/calc_left_button"
-                     a:layout_margin="@dimen/button_margin"
-                     a:layout_width="0dp"
-                     a:layout_height="match_parent"
-                     a:layout_weight="1"/>
-
-            <include layout="@layout/calc_erase_button"
-                     a:layout_margin="@dimen/button_margin"
-                     a:layout_width="0dp"
-                     a:layout_height="match_parent"
-                     a:layout_weight="1"/>
-
-            <LinearLayout a:id="@+id/displayContainer"
-                          a:layout_margin="@dimen/display_margin"
-                          a:layout_weight="4"
-                          a:layout_width="0dp"
-                          a:layout_height="match_parent"/>
-
-            <include layout="@layout/calc_clear_button"
-                     a:layout_margin="@dimen/button_margin"
-                     a:layout_width="0dp"
-                     a:layout_height="match_parent"
-                     a:layout_weight="1"/>
-
-            <include layout="@layout/calc_right_button"
-                     a:layout_margin="@dimen/button_margin"
-                     a:layout_width="0dp"
-                     a:layout_height="match_parent"
-                     a:layout_weight="1"/>
-
-        </LinearLayout>
-
-        <LinearLayout a:id="@+id/keyboardContainer"
-                      a:layout_weight="3"
-                      a:layout_width="match_parent"
-                      a:layout_height="0dp"/>
-
-
-    </LinearLayout>
-
-
-    <LinearLayout a:id="@+id/main_second_pane"
-                  a:orientation="vertical"
-                  a:layout_height="match_parent"
-                  style="?secondPaneStyle"
-                  a:layout_width="0dp"
-                  a:layout_weight="1"/>
-
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
+  ~ For more information, please, contact se.solovyev@gmail.com
+  ~ or visit 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"
+        a:background="@color/default_background"
+        a:baselineAligned="false">
+
+    <LinearLayout
+            a:layout_height="0dp"
+            a:layout_width="match_parent"
+            a:layout_weight="5"
+            a:orientation="horizontal"
+            a:baselineAligned="false">
+
+        <LinearLayout
+                a:layout_height="match_parent"
+                a:layout_width="0dp"
+                a:layout_weight="1"
+                a:orientation="vertical"
+                a:layout_gravity="center">
+
+            <LinearLayout a:id="@+id/editorContainer"
+                          a:layout_height="0dp"
+                          a:layout_width="match_parent"
+                          style="?paneStyle"
+                          a:layout_weight="4"/>
+
+            <LinearLayout a:id="@+id/displayContainer"
+                          a:layout_height="0dp"
+                          a:layout_width="match_parent"
+                          style="?paneStyle"
+                          a:layout_weight="1"/>
+
+        </LinearLayout>
+
+        <LinearLayout a:id="@+id/main_second_pane"
+                      a:layout_height="match_parent"
+                      a:layout_width="0dp"
+                      a:layout_weight="1"
+                      a:orientation="vertical"
+                      style="?secondPaneStyle"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:id="@+id/keyboardContainer"
+                  a:layout_height="0dp"
+                  a:layout_width="match_parent"
+                  a:layout_weight="1"
+                  style="?fragmentLayoutStyle"/>
+
+</LinearLayout>
diff --git a/calculatorpp/res/layout/main_calculator.xml b/calculatorpp/res/layout/main_calculator.xml
index a33f6497..c976ad8e 100644
--- a/calculatorpp/res/layout/main_calculator.xml
+++ b/calculatorpp/res/layout/main_calculator.xml
@@ -1,46 +1,45 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
-  ~ For more information, please, contact se.solovyev@gmail.com
-  ~ or visit 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"
-        a:layout_gravity="center"
-        a:background="@color/default_background">
-
-    <LinearLayout a:id="@+id/editorContainer"
-                  a:layout_weight="2"
-                  a:layout_width="match_parent"
-                  a:layout_height="0dp"/>
-
-    <LinearLayout a:layout_weight="1"
-                  a:layout_width="match_parent"
-                  a:layout_height="0dp">
-
-        <include layout="@layout/calc_equals_button"
-                 a:layout_margin="@dimen/button_margin"
-                 a:layout_weight="1"
-                 a:layout_width="0dp"
-                 a:layout_height="match_parent"/>
-
-        <LinearLayout a:id="@+id/displayContainer"
-                      a:layout_margin="@dimen/display_margin"
-                      a:layout_weight="4"
-                      a:layout_width="0dp"
-                      a:layout_height="match_parent"/>
-
-    </LinearLayout>
-
-    <LinearLayout a:id="@+id/keyboardContainer"
-                  a:layout_weight="5"
-                  a:layout_width="match_parent"
-                  a:layout_height="0dp"/>
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
+  ~ For more information, please, contact se.solovyev@gmail.com
+  ~ or visit 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"
+        a:layout_gravity="center"
+        a:background="@color/default_background">
+
+    <LinearLayout a:id="@+id/editorContainer"
+                  a:layout_weight="2"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp"/>
+
+    <LinearLayout a:layout_weight="1"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp">
+
+        <include layout="@layout/calc_equals_button"
+                 a:layout_margin="@dimen/button_margin"
+                 a:layout_weight="1"
+                 a:layout_width="0dp"
+                 a:layout_height="match_parent"/>
+
+        <LinearLayout a:id="@+id/displayContainer"
+                      a:layout_weight="4"
+                      a:layout_width="0dp"
+                      a:layout_height="match_parent"/>
+
+    </LinearLayout>
+
+    <LinearLayout a:id="@+id/keyboardContainer"
+                  a:layout_weight="5"
+                  a:layout_width="match_parent"
+                  a:layout_height="0dp"/>
+
+</LinearLayout>
diff --git a/calculatorpp/res/values/attributes.xml b/calculatorpp/res/values/attributes.xml
index da21f92c..235e557d 100644
--- a/calculatorpp/res/values/attributes.xml
+++ b/calculatorpp/res/values/attributes.xml
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-	<attr name="digitButtonStyle" format="reference" />
-	<attr name="controlButtonStyle" format="reference" />
-	<attr name="controlImageButtonStyle" format="reference" />
-	<attr name="operationButtonStyle" format="reference" />
-	<attr name="fragmentLayoutStyle" format="reference" />
-	<attr name="secondPaneStyle" format="reference" />
-	<attr name="fragmentTitleStyle" format="reference" />
-	<attr name="fragmentListViewStyle" format="reference" />
-	<attr name="buttonStyle" format="reference" />
-
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<attr name="digitButtonStyle" format="reference" />
+	<attr name="controlButtonStyle" format="reference" />
+	<attr name="controlImageButtonStyle" format="reference" />
+	<attr name="operationButtonStyle" format="reference" />
+	<attr name="fragmentLayoutStyle" format="reference" />
+	<attr name="secondPaneStyle" format="reference" />
+	<attr name="fragmentTitleStyle" format="reference" />
+	<attr name="fragmentListViewStyle" format="reference" />
+	<attr name="buttonStyle" format="reference" />
+	<attr name="paneStyle" format="reference" />
+
+</resources>
diff --git a/calculatorpp/res/values/dimensions.xml b/calculatorpp/res/values/dimensions.xml
index 44e73a6c..4341d69a 100644
--- a/calculatorpp/res/values/dimensions.xml
+++ b/calculatorpp/res/values/dimensions.xml
@@ -1,5 +1,3 @@
 <resources>
     <dimen name="button_margin">0.5dp</dimen>
-    <dimen name="display_margin">2.0dp</dimen>
-    <dimen name="display_margin_land">2.5dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/calculatorpp/res/values/styles-common.xml b/calculatorpp/res/values/styles-common.xml
index d0690e9d..ffc99c8e 100644
--- a/calculatorpp/res/values/styles-common.xml
+++ b/calculatorpp/res/values/styles-common.xml
@@ -1,43 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
-  ~ For more information, please, contact se.solovyev@gmail.com
-  ~ or visit http://se.solovyev.org
-  -->
-
-<resources>
-
-	<style name="button_style" parent="button_style_parent">
-		<item name="android:layout_width">fill_parent</item>
-		<item name="android:layout_height">fill_parent</item>
-		<item name="android:layout_weight">1</item>
-		<item name="android:focusable">true</item>
-		<item name="android:background">@drawable/default_button_dark</item>
-		<item name="android:layout_margin">@dimen/button_margin</item>
-	</style>
-
-	<style name="editor_style" parent="editor_style_parent">
-		<item name="android:gravity">left|top</item>
-		<item name="android:layout_width">fill_parent</item>
-		<item name="android:layout_height">fill_parent</item>
-	</style>
-
-	<style name="display_style" parent="display_style_parent">
-		<item name="android:gravity">top|right</item>
-		<item name="android:layout_width">match_parent</item>
-		<item name="android:layout_height">match_parent</item>
-        <item name="android:layout_margin">@dimen/display_margin</item>
-	</style>
-
-	<style name="about_style" parent="about_style_parent">
-		<item name="android:gravity">center</item>
-		<item name="android:layout_width">fill_parent</item>
-		<item name="android:layout_height">fill_parent</item>
-	</style>
-
-	<style name="default_text">
-		<item name="android:background">@color/default_background</item>
-		<item name="android:textColor">@color/default_text_color</item>
-	</style>
-
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
+  ~ For more information, please, contact se.solovyev@gmail.com
+  ~ or visit http://se.solovyev.org
+  -->
+
+<resources>
+
+	<style name="button_style" parent="button_style_parent">
+		<item name="android:layout_width">fill_parent</item>
+		<item name="android:layout_height">fill_parent</item>
+		<item name="android:layout_weight">1</item>
+		<item name="android:focusable">true</item>
+		<item name="android:background">@drawable/default_button_dark</item>
+		<item name="android:layout_margin">@dimen/button_margin</item>
+	</style>
+
+	<style name="editor_style" parent="editor_style_parent">
+		<item name="android:gravity">left|top</item>
+		<item name="android:layout_width">fill_parent</item>
+		<item name="android:layout_height">fill_parent</item>
+	</style>
+
+	<style name="display_style" parent="display_style_parent">
+		<item name="android:gravity">top|right</item>
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">match_parent</item>
+	</style>
+
+	<style name="about_style" parent="about_style_parent">
+		<item name="android:gravity">center</item>
+		<item name="android:layout_width">fill_parent</item>
+		<item name="android:layout_height">fill_parent</item>
+	</style>
+
+	<style name="default_text">
+		<item name="android:background">@android:color/transparent</item>
+		<item name="android:textColor">@color/default_text_color</item>
+	</style>
+
+</resources>
diff --git a/calculatorpp/res/values/styles-default-theme.xml b/calculatorpp/res/values/styles-default-theme.xml
index 003ad879..6375d17c 100644
--- a/calculatorpp/res/values/styles-default-theme.xml
+++ b/calculatorpp/res/values/styles-default-theme.xml
@@ -20,9 +20,9 @@
 		<item name="android:padding">6dp</item>
 	</style>
 
-    <style name="default_second_pane_style">
+    <style name="default_pane_style" parent="default_fragment_layout_style">
         <item name="android:background">@drawable/second_pane_background</item>
-        <item name="android:layout_margin">5dp</item>
+        <item name="android:padding">5dp</item>
     </style>
 
     <style name="default_fragment_list_view_style">
@@ -46,7 +46,7 @@
     </style>
 
     <style name="default_fragment_layout_style">
-        <item name="android:layout_marginBottom">5dp</item>
+        <item name="android:layout_marginBottom">0dp</item>
         <item name="android:layout_marginTop">5dp</item>
         <item name="android:layout_marginLeft">5dp</item>
         <item name="android:layout_marginRight">0dp</item>
@@ -58,7 +58,8 @@
 		<item name="controlImageButtonStyle">@style/default_control_image_button_style</item>
 		<item name="operationButtonStyle">@style/default_operation_button_style</item>
 		<item name="fragmentLayoutStyle">@style/default_fragment_layout_style</item>
-		<item name="secondPaneStyle">@style/default_second_pane_style</item>
+		<item name="paneStyle">@style/default_pane_style</item>
+		<item name="secondPaneStyle">@style/default_pane_style</item>
 		<item name="fragmentTitleStyle">@style/default_fragment_title_style</item>
 		<item name="fragmentListViewStyle">@style/default_fragment_list_view_style</item>
 		<item name="buttonStyle">@style/default_button_style</item>