diff --git a/mobile/res/menu/main.xml b/mobile/res/menu/main.xml
index 6df399c1..20de94d0 100644
--- a/mobile/res/menu/main.xml
+++ b/mobile/res/menu/main.xml
@@ -85,11 +85,17 @@
             <item
                 android:id="@+id/cache_clear"
                 android:icon="@drawable/content_remove"
-                android:orderInCategory="200"
+                android:orderInCategory="150"
                 android:showAsAction="never"
                 android:title="@string/cache_clear">
             </item>
-        </menu>
+            <item
+                android:id="@+id/menu_exit"
+                android:orderInCategory="200"
+                android:showAsAction="never"
+                android:title="@string/menu_exit">
+            </item>
+            </menu>
     </item>
 
 </menu>
\ No newline at end of file
diff --git a/mobile/res/values/strings.xml b/mobile/res/values/strings.xml
index 8cb7e05d..8fd875cd 100644
--- a/mobile/res/values/strings.xml
+++ b/mobile/res/values/strings.xml
@@ -53,4 +53,5 @@
     <string name="menu_public">Public</string>
     <string name="menu_faction">Faction</string>
     <string name="menu_info">Info</string>
+    <string name="menu_exit">Exit</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
index 9a598aa1..f34e1fab 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
@@ -281,6 +281,7 @@ public class IITC_Mobile extends Activity {
             return true;
         // get the users current location and focus it on map
         case R.id.locate:
+        	iitc_view.loadUrl("javascript: window.smartphone.mapButton.click();");
             iitc_view.loadUrl("javascript: window.map.locate({setView : true, maxZoom: 13});");
         	actionBar.setTitle(getString(R.string.menu_map));
             return true;
@@ -310,6 +311,9 @@ public class IITC_Mobile extends Activity {
         	iitc_view.loadUrl("javascript: window.chat.choose('faction');");
             actionBar.setTitle(getString(R.string.menu_faction));
         	return true;
+        case R.id.menu_exit:
+        	super.onBackPressed();
+        	return true;
         default:
             return super.onOptionsItemSelected(item);
         }