diff --git a/android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenView.java b/android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenView.java
index 713f646e..08da30cd 100644
--- a/android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenView.java
+++ b/android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenView.java
@@ -13,7 +13,11 @@ import android.view.WindowManager;
 import android.widget.ImageView;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.solovyev.android.calculator.*;
+import org.solovyev.android.calculator.AndroidCalculatorDisplayView;
+import org.solovyev.android.calculator.AndroidCalculatorEditorView;
+import org.solovyev.android.calculator.CalculatorButton;
+import org.solovyev.android.calculator.CalculatorDisplayViewState;
+import org.solovyev.android.calculator.CalculatorEditorViewState;
 import org.solovyev.android.prefs.Preference;
 
 /**
@@ -40,7 +44,7 @@ public class CalculatorOnscreenView {
     **********************************************************************
     */
 
-    private static final Preference<CalculatorOnscreenViewState> viewStatePreference = new CalculatorOnscreenViewState.Preference("calculator_onscreen_view_state", CalculatorOnscreenViewState.newDefaultState());
+    private static final Preference<CalculatorOnscreenViewState> viewStatePreference = new CalculatorOnscreenViewState.Preference("onscreen_view_state", CalculatorOnscreenViewState.newDefaultState());
 
     /*
     **********************************************************************
@@ -446,11 +450,6 @@ public class CalculatorOnscreenView {
 
                     if ( currentTime - time >= TIME_EPS ) {
                         time = currentTime;
-/*                        for (int i = 0; i < event.getHistorySize(); i++) {
-                            final float xi = event.getHistoricalX(i);
-                            final float yi = event.getHistoricalY(i);
-                            processMove(xi, yi);
-                        }*/
                         processMove(x1, y1);
                     }
                     return true;
@@ -466,7 +465,7 @@ public class CalculatorOnscreenView {
             wm.getDefaultDisplay().getMetrics(displayMetrics);
 
             this.displayWidth = displayMetrics.widthPixels;
-            this.displayHeight = (int) (displayMetrics.heightPixels - 25 * displayMetrics.density);
+            this.displayHeight = displayMetrics.heightPixels;
         }
 
         private void processMove(float x1, float y1) {
diff --git a/android-app/project.properties b/android-app/project.properties
index 542cf64d..1b8a55be 100644
--- a/android-app/project.properties
+++ b/android-app/project.properties
@@ -12,19 +12,19 @@ target=android-15
 android.library.reference.1=../android-app-core
 android.library.reference.2=../android-app-widget
 android.library.reference.3=../android-app-onscreen
-android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-all_1.0.6
-android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.6
-android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-core_1.0.6
-android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-billing_1.0.6
-android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-db_1.0.6
-android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-http_1.0.6
-android.library.reference.10=gen-external-apklibs/org.solovyev.android_android-common-list_1.0.6
-android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.6
-android.library.reference.12=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.6
-android.library.reference.13=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.6
-android.library.reference.14=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.6
-android.library.reference.15=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.0.6
-android.library.reference.16=gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.2.0
-android.library.reference.17=gen-external-apklibs/org.solovyev.android_android-common-keyboard_1.0.6
+android.library.reference.4=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-all_1.0.6
+android.library.reference.5=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.6
+android.library.reference.6=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-core_1.0.6
+android.library.reference.7=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-billing_1.0.6
+android.library.reference.8=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-db_1.0.6
+android.library.reference.9=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-http_1.0.6
+android.library.reference.10=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-list_1.0.6
+android.library.reference.11=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-view_1.0.6
+android.library.reference.12=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.6
+android.library.reference.13=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.6
+android.library.reference.14=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-other_1.0.6
+android.library.reference.15=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.0.6
+android.library.reference.16=../android-app-core/gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.2.0
+android.library.reference.17=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-keyboard_1.0.6