diff --git a/android/src/main/cpp/main.cpp b/android/src/main/cpp/main.cpp
index 6cdb76b..285111d 100755
--- a/android/src/main/cpp/main.cpp
+++ b/android/src/main/cpp/main.cpp
@@ -667,6 +667,9 @@ static int engine_init_display(struct engine* engine) {
     //LOG("PROP: %s", os_props[""].c_str());
 
     // Initialize GL state.
+
+    android_async_lock(engine);
+
     //glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
     //glEnable(GL_CULL_FACE);
     //glShadeModel(GL_SMOOTH);
@@ -690,6 +693,7 @@ static int engine_init_display(struct engine* engine) {
     LOG("All ready");
     engine->animating = 1;
 
+    android_async_unlock(engine);
     return 0;
 }
 
diff --git a/data/layout.xml b/data/layout.xml
index 1ccd02b..678d3f9 100644
--- a/data/layout.xml
+++ b/data/layout.xml
@@ -1523,17 +1523,6 @@ Here's a list of what's available in this release.
       <!-- content panel -->
       <!-- menu bar -->
       <border flood-events="1" margin="0 0 0 0" pad="0 0 0 0" color=".1" width="100%" height="30" dir="row" align="center" mouse-capture="true">
-        <!--
-        <button-custom id="menu-file" height="100%" margin="0 0 0 0" justify="center" align="center" pad="8" color=".1">
-          <text text="File"/>
-        </button-custom>
-        <button-custom id="menu-edit" height="100%" margin="0 0 0 0" justify="center" align="center" pad="8" color=".1">
-          <text text="Edit"/>
-        </button-custom>
-        <button-custom id="menu-layers" height="100%" margin="0 0 0 0" justify="center" align="center" pad="8" color=".1">
-          <text text="Layers"/>
-        </button-custom>
-        -->
         <text id="txt-docname" text="Panodoc: no-name" margin="0 20 0 10" color=".6 .6 .6 1"/>
         <node height="100%" color="1" grow="1" align="center" justify="flex-end" dir="row">
           <text id="txt-rec" text="" margin="0 10 0 0" color=".6 .6 .6 1"/>