diff --git a/android/phoenix/AndroidManifest.xml b/android/phoenix/AndroidManifest.xml
index 4c91b2e1ea..f6166bedd4 100644
--- a/android/phoenix/AndroidManifest.xml
+++ b/android/phoenix/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.retroarch"
-    android:versionCode="19"
-    android:versionName="0.9.9.4" >
+    android:versionCode="20"
+    android:versionName="0.9.9.5" >
 	<uses-feature android:glEsVersion="0x00020000" />
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
     <uses-sdk
@@ -15,16 +15,15 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:hasCode="true">
-        <activity android:name=".browser.RetroArch">
+        <activity android:name=".browser.RetroArch"></activity>
+        <activity android:name=".browser.DisplayRefreshRateTest"></activity>
+        <activity android:name=".browser.RefreshRateSetOS"></activity>
+        <activity android:name=".browser.MainMenuActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-        </activity>
-        
-        <activity android:name=".browser.DisplayRefreshRateTest"></activity>
-        <activity android:name=".browser.RefreshRateSetOS"></activity>
-        <activity android:name=".browser.SettingsActivity"></activity>
+         </activity>
         <activity android:name=".browser.HelpActivity"></activity>
         <activity android:name=".browser.DirectoryActivity"></activity>
         <activity android:name=".browser.ROMActivity"></activity>
diff --git a/android/phoenix/res/menu/context_menu.xml b/android/phoenix/res/menu/context_menu.xml
index c916dc89ce..4edd379631 100644
--- a/android/phoenix/res/menu/context_menu.xml
+++ b/android/phoenix/res/menu/context_menu.xml
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:id="@+id/rarch_settings" android:title="@string/rarch_settings" android:showAsAction="ifRoom" />
-    <item android:id="@+id/help" android:title="@string/help"></item>
     <item android:id="@+id/input_method_select" android:title="@string/input_method" android:showAsAction="ifRoom" />
     <item android:id="@+id/report_ime" android:title="@string/report_ime"></item>
     <item android:id="@+id/report_refreshrate" android:title="@string/report_refreshrate"></item>
-    <item android:id="@+id/retroarch_guide" android:title="@string/retroarch_guide"></item>
-    <item android:id="@+id/cores_guide" android:title="@string/cores_guide"></item>
-    <item android:id="@+id/overlay_guide" android:title="@string/overlay_guide"></item>
     <item android:id="@+id/optimal_settings_device" android:title="@string/optimal_settings_device"></item>
 </menu>
diff --git a/android/phoenix/res/menu/directory_list.xml b/android/phoenix/res/menu/directory_list.xml
index d39e614c9d..3b02ee8a45 100644
--- a/android/phoenix/res/menu/directory_list.xml
+++ b/android/phoenix/res/menu/directory_list.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
     <item android:id="@+id/settings"
-        android:title="@string/settings"
+        android:title="Options"
         android:icon="@drawable/ic_file"
         android:showAsAction="ifRoom" />
 </menu>
diff --git a/android/phoenix/res/values/strings.xml b/android/phoenix/res/values/strings.xml
index fcfc178403..e37ebf04c3 100644
--- a/android/phoenix/res/values/strings.xml
+++ b/android/phoenix/res/values/strings.xml
@@ -3,18 +3,8 @@
     <string name="app_name">RetroArch</string>
     <string name="input_method">Input Method</string>
     <string name="file_type_icon">File type icon</string>
-    <string name="video_settings">Video Settings</string>
-    <string name="rarch_settings">Settings</string>
-    <string name="audio_settings">Audio Settings</string>
-    <string name="input_settings">Input Settings</string>
-    <string name="general_settings">General Settings</string>
-    <string name="settings">Settings</string>
-    <string name="retroarch_guide">RetroArch Guide</string>
-    <string name="cores_guide">Cores Guide</string>
-    <string name="overlay_guide">Overlay How-to Guide</string>
     <string name="key_bind_title">Select the button to use</string>
     <string name="key_bind_clear">Unbind</string>
-    <string name="help">Help</string>
     <string name="report_ime">Report IME</string>
     <string name="report_refreshrate">Report Refresh Rate</string>
     <string name="key_bind_detect">Detect</string>
diff --git a/android/phoenix/res/xml/prefs.xml b/android/phoenix/res/xml/prefs.xml
index ccb8cca9b8..1d7eab953f 100644
--- a/android/phoenix/res/xml/prefs.xml
+++ b/android/phoenix/res/xml/prefs.xml
@@ -1,79 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="RetroArch Settings" >
+    android:title="RetroArch 0.9.9.5 - Main Menu" >
 
-    <PreferenceScreen android:title="Path Settings">
-        <PreferenceCategory android:title="ROM paths">
-            <Preference android:title="ROM directory"
-                android:summary="Sets directory where ROM browser will first browse for ROM files.">
-                <intent
-                    android:targetClass="org.retroarch.browser.ROMDirActivity"
-                    android:targetPackage="org.retroarch" />
-            </Preference>
-        </PreferenceCategory>
-        
-        <PreferenceCategory android:title="Save files">
-            <CheckBoxPreference android:title="Enable custom directory"
-                android:summary="Enables use of custom save file folder. (.srm) save files will be saved and loaded to configured directory. If not enabled, save files will reside in ROM folder."
-                android:key="savefile_directory_enable"
-                android:defaultValue="false"/>
-            <Preference android:title="Savefile directory"
-                android:summary="Sets directory where to save and load game save files."
-                android:dependency="savefile_directory_enable">
-                <intent
-                    android:targetClass="org.retroarch.browser.SRMDirActivity"
-                    android:targetPackage="org.retroarch" />
-            </Preference>            
-        </PreferenceCategory>
-        <PreferenceCategory android:title="Save states">
-            <CheckBoxPreference android:title="Enable custom directory"
-                android:summary="Enables use of custom save state folder. (.state) save states will be saved and loaded to configured directory. If not enabled, save states will reside in ROM folder."
-                android:key="savestate_directory_enable"
-                android:defaultValue="false"/>
-            <Preference android:title="Save state directory"
-                android:summary="Sets directory where to save and load game save states."
-                android:dependency="savestate_directory_enable">
-                <intent
-                    android:targetClass="org.retroarch.browser.StateDirActivity"
-                    android:targetPackage="org.retroarch" />
-            </Preference>
-        </PreferenceCategory>
-        <PreferenceCategory android:title="System">
-            <CheckBoxPreference android:title="Enable custom directory"
-                android:summary="Enables use of custom system folder. Cores will look for system specific files, like BIOSes, in this folder. If not enabled, it will look in the ROM folder."
-                android:key="system_directory_enable"
-                android:defaultValue="false"/>
-            <Preference android:title="System directory"
-                android:summary="Sets directory where system files are loaded from."
-                android:dependency="system_directory_enable">
-                <intent
-                    android:targetClass="org.retroarch.browser.SystemDirActivity"
-                    android:targetPackage="org.retroarch" />
-            </Preference>
-        </PreferenceCategory>
+    <PreferenceScreen android:title="Select Game">
+       <intent
+          android:targetClass="org.retroarch.browser.RetroArch"
+          android:targetPackage="org.retroarch" />
     </PreferenceScreen>
-    <PreferenceScreen android:title="System Settings" >
-        <PreferenceCategory android:title="General" >
-            <CheckBoxPreference
-                android:defaultValue="true"
-                android:key="savestate_auto_load"
-                android:summary="Loads an automatically created savestate (*.state.auto) at startup."
-                android:title="Auto load state" />
-            <CheckBoxPreference
-                android:defaultValue="false"
-                android:key="savestate_auto_save"
-                android:summary="Automatically saves state (*.state.auto) when exiting game."
-                android:title="Auto save state" />
-        </PreferenceCategory>
-        <PreferenceCategory android:title="Rewinding" >
-            <CheckBoxPreference
-                android:defaultValue="false"
-                android:key="rewind_enable"
-                android:summary="Enable real-time rewinding of gameplay. (WARNING: Very CPU intensive - will decrease ingame performance by a lot - only use this option on a powerful device)."
-                android:title="Enable" />
-        </PreferenceCategory>
-    </PreferenceScreen>
-    <PreferenceScreen android:title="Video Settings" >
+    <PreferenceScreen android:title="Video Options" >
         <PreferenceCategory android:title="General" >
             <CheckBoxPreference
                 android:defaultValue="true"
@@ -152,7 +86,7 @@
                 android:defaultValue="true"/>
         </PreferenceCategory>
     </PreferenceScreen>
-    <PreferenceScreen android:title="Audio Settings" >
+    <PreferenceScreen android:title="Audio Options" >
         <PreferenceCategory android:title="Audio" >
             <CheckBoxPreference
                 android:defaultValue="true"
@@ -166,7 +100,7 @@
                 android:dependency="audio_enable" />
         </PreferenceCategory>
     </PreferenceScreen>
-    <PreferenceScreen android:title="Input Settings" >
+    <PreferenceScreen android:title="Input Options" >
        <PreferenceCategory android:title="General" >
             <ListPreference
                 android:entries="@array/back_options"
@@ -450,4 +384,112 @@
 	        </PreferenceScreen>
         </PreferenceCategory>
     </PreferenceScreen>
+    <PreferenceScreen android:title="Path Options">
+        <PreferenceCategory android:title="ROM paths">
+            <Preference android:title="ROM directory"
+                android:summary="Sets directory where ROM browser will first browse for ROM files.">
+                <intent
+                    android:targetClass="org.retroarch.browser.ROMDirActivity"
+                    android:targetPackage="org.retroarch" />
+            </Preference>
+        </PreferenceCategory>
+        
+        <PreferenceCategory android:title="Save files">
+            <CheckBoxPreference android:title="Enable custom directory"
+                android:summary="Enables use of custom save file folder. (.srm) save files will be saved and loaded to configured directory. If not enabled, save files will reside in ROM folder."
+                android:key="savefile_directory_enable"
+                android:defaultValue="false"/>
+            <Preference android:title="Savefile directory"
+                android:summary="Sets directory where to save and load game save files."
+                android:dependency="savefile_directory_enable">
+                <intent
+                    android:targetClass="org.retroarch.browser.SRMDirActivity"
+                    android:targetPackage="org.retroarch" />
+            </Preference>            
+        </PreferenceCategory>
+        <PreferenceCategory android:title="Save states">
+            <CheckBoxPreference android:title="Enable custom directory"
+                android:summary="Enables use of custom save state folder. (.state) save states will be saved and loaded to configured directory. If not enabled, save states will reside in ROM folder."
+                android:key="savestate_directory_enable"
+                android:defaultValue="false"/>
+            <Preference android:title="Save state directory"
+                android:summary="Sets directory where to save and load game save states."
+                android:dependency="savestate_directory_enable">
+                <intent
+                    android:targetClass="org.retroarch.browser.StateDirActivity"
+                    android:targetPackage="org.retroarch" />
+            </Preference>
+        </PreferenceCategory>
+        <PreferenceCategory android:title="System">
+            <CheckBoxPreference android:title="Enable custom directory"
+                android:summary="Enables use of custom system folder. Cores will look for system specific files, like BIOSes, in this folder. If not enabled, it will look in the ROM folder."
+                android:key="system_directory_enable"
+                android:defaultValue="false"/>
+            <Preference android:title="System directory"
+                android:summary="Sets directory where system files are loaded from."
+                android:dependency="system_directory_enable">
+                <intent
+                    android:targetClass="org.retroarch.browser.SystemDirActivity"
+                    android:targetPackage="org.retroarch" />
+            </Preference>
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="Settings" >
+        <PreferenceCategory android:title="General" >
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="savestate_auto_load"
+                android:summary="Loads an automatically created savestate (*.state.auto) at startup."
+                android:title="Auto load state" />
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="savestate_auto_save"
+                android:summary="Automatically saves state (*.state.auto) when exiting game."
+                android:title="Auto save state" />
+        </PreferenceCategory>
+        <PreferenceCategory android:title="Rewinding" >
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="rewind_enable"
+                android:summary="Enable real-time rewinding of gameplay. (WARNING: Very CPU intensive - will decrease ingame performance by a lot - only use this option on a powerful device)."
+                android:title="Enable" />
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="Help">
+       <intent
+          android:targetClass="org.retroarch.browser.HelpActivity"
+          android:targetPackage="org.retroarch" />
+    </PreferenceScreen>
+    <PreferenceScreen android:title="About">
+        <PreferenceCategory android:title="Websites">
+           <Preference android:title="RetroArch/libretro homepage"
+              android:summary="The official homepage of the RetroArch/libretro project.">
+                <intent
+                    android:action="android.intent.action.VIEW"
+                    android:data="http://www.libretro.com" />
+            </Preference>
+        </PreferenceCategory>
+        <PreferenceCategory android:title="Manuals">
+           <Preference android:title="RetroArch Guide (PDF)"
+              android:summary="The manual to RetroArch Android in PDF format.">
+                <intent
+                    android:action="android.intent.action.VIEW"
+                    android:data="http://www.libretro.com/documents/retroarch-manual.pdf" />
+            </Preference>
+           <Preference android:title="Cores Guide (PDF)"
+              android:summary="The manual to most libretro cores in PDF format.">
+                <intent
+                    android:action="android.intent.action.VIEW"
+                    android:data="http://www.libretro.com/documents/retroarch-cores-manual.pdf" />
+            </Preference>
+        </PreferenceCategory>
+        <PreferenceCategory android:title="Development">
+           <Preference android:title="Overlay Guide (PDF)"
+              android:summary="Explains howto make your own overlays.">
+                <intent
+                    android:action="android.intent.action.VIEW"
+                    android:data="http://www.libretro.com/documents/overlay.pdf" />
+            </Preference>
+        </PreferenceCategory>
+    </PreferenceScreen>
 </PreferenceScreen>
diff --git a/android/phoenix/src/org/retroarch/browser/SettingsActivity.java b/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java
similarity index 89%
rename from android/phoenix/src/org/retroarch/browser/SettingsActivity.java
rename to android/phoenix/src/org/retroarch/browser/MainMenuActivity.java
index aba497a593..c78386faec 100644
--- a/android/phoenix/src/org/retroarch/browser/SettingsActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java
@@ -7,7 +7,7 @@ import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
 
-public class SettingsActivity extends PreferenceActivity {
+public class MainMenuActivity extends PreferenceActivity {
 	@SuppressWarnings("deprecation")
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
diff --git a/android/phoenix/src/org/retroarch/browser/RetroArch.java b/android/phoenix/src/org/retroarch/browser/RetroArch.java
index 51c02b52d7..dc18fd4be6 100644
--- a/android/phoenix/src/org/retroarch/browser/RetroArch.java
+++ b/android/phoenix/src/org/retroarch/browser/RetroArch.java
@@ -11,7 +11,6 @@ import android.annotation.TargetApi;
 import android.app.*;
 import android.media.AudioManager;
 import android.media.AudioTrack;
-import android.net.Uri;
 import android.os.*;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
@@ -609,16 +608,6 @@ public class RetroArch extends Activity implements
 			InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 			imm.showInputMethodPicker();
 			return true;
-			
-		case R.id.rarch_settings:		
-			Intent rset = new Intent(this, SettingsActivity.class);
-			startActivity(rset);
-			return true;
-		case R.id.help:		
-			Intent help = new Intent(this, HelpActivity.class);
-			startActivity(help);
-			return true;
-			
 		case R.id.report_ime:
 			String current_ime = Settings.Secure.getString(getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
 			new AlertDialog.Builder(this).setMessage(current_ime).setNeutralButton("Close", null).show();
@@ -627,21 +616,6 @@ public class RetroArch extends Activity implements
 			String current_rate = "Screen Refresh Rate: " + Double.valueOf(report_refreshrate).toString();
 			new AlertDialog.Builder(this).setMessage(current_rate).setNeutralButton("Close", null).show();
 			return true;
-
-		case R.id.retroarch_guide:
-			Intent rguide = new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.libretro.com/documents/retroarch-manual.pdf"));
-			startActivity(rguide);
-			return true;
-
-		case R.id.cores_guide:
-			Intent cguide = new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.libretro.com/documents/retroarch-cores-manual.pdf"));
-			startActivity(cguide);
-			return true;
-			
-		case R.id.overlay_guide:
-			Intent mguide = new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.libretro.com/documents/overlay.pdf"));
-			startActivity(mguide);
-			return true;
 		case R.id.optimal_settings_device:
 			detectDevice(true);
 			return true;