diff --git a/android/jni/main_native.cpp b/android/jni/main_native.cpp
index 34a320463f..d67e5dd2ce 100644
--- a/android/jni/main_native.cpp
+++ b/android/jni/main_native.cpp
@@ -21,7 +21,7 @@ extern "C"
 
     GetAndroidPlatform().Initialize(env, thiz, path);
 
-    g_work = new AndroidFramework();
+    //g_work = new AndroidFramework();
   }
 
   ///////////////////////////////////////////////////////////////////////////////////
@@ -31,7 +31,7 @@ extern "C"
   JNIEXPORT void JNICALL
   Java_com_mapswithme_maps_MainGLView_nativeInit(JNIEnv * env, jobject thiz)
   {
-    g_work->SetParentView(env, thiz);
+    //g_work->SetParentView(env, thiz);
   }
 
   JNIEXPORT void JNICALL
diff --git a/android/src/com/mapswithme/maps/MWMActivity.java b/android/src/com/mapswithme/maps/MWMActivity.java
index b570022e8f..8b8dd70714 100644
--- a/android/src/com/mapswithme/maps/MWMActivity.java
+++ b/android/src/com/mapswithme/maps/MWMActivity.java
@@ -8,9 +8,12 @@ import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.util.Log;
 
 public class MWMActivity extends Activity
 {
+  private static String TAG = "MWMActivity";
+  
   private MainGLView m_view;
 
   private String getResourcePath()
@@ -45,23 +48,28 @@ public class MWMActivity extends Activity
   }
 
   @Override
-  public boolean onCreateOptionsMenu(Menu menu) {
-      MenuInflater inflater = getMenuInflater();
-      inflater.inflate(R.menu.main, menu);
-      return true;
+  public boolean onCreateOptionsMenu(Menu menu)
+  {
+    MenuInflater inflater = getMenuInflater();
+    inflater.inflate(R.menu.main, menu);
+    return true;
   }
 
   @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-      // Handle item selection
-      switch (item.getItemId()) {
-      case R.id.my_position:
-          return true;
-      case R.id.download_maps:
-          return true;
-      default:
-          return super.onOptionsItemSelected(item);
-      }
+  public boolean onOptionsItemSelected(MenuItem item)
+  {
+    // Handle item selection
+    switch (item.getItemId())
+    {
+    case R.id.my_position:
+      Log.i(TAG, "onMyPosition");
+      return true;
+    case R.id.download_maps:
+      Log.i(TAG, "onDownloadMaps");
+      return true;
+    default:
+      return super.onOptionsItemSelected(item);
+    }
   }
 
   static