diff --git a/360/main.c b/360/main.c
index 888ac0ef06..879aa5947d 100644
--- a/360/main.c
+++ b/360/main.c
@@ -148,7 +148,7 @@ int main(int argc, char *argv[])
 	xdk360_video_init();
 
 	menu_init();
-	menu_loop();
+	//menu_loop();
 
    char arg1[] = "ssnes";
    char arg2[] = "d:\\roms\\mario.sfc";
diff --git a/360/media/ssnes_main.xui b/360/media/ssnes_main.xui
index 76055197b9..5dcbd90c53 100644
--- a/360/media/ssnes_main.xui
+++ b/360/media/ssnes_main.xui
@@ -17,6 +17,8 @@
 <Width>215.000000</Width>
 <Height>38.000000</Height>
 <Position>76.000000,91.000000,0.000000</Position>
+<NavUp>XuiBtnQuit</NavUp>
+<NavDown>XuiBtnSettings</NavDown>
 <Text>ROM Browser</Text>
 </Properties>
 </XuiButton>
@@ -33,5 +35,27 @@
 <TextStyle>21</TextStyle>
 </Properties>
 </XuiText>
+<XuiButton>
+<Properties>
+<Id>XuiBtnSettings</Id>
+<Width>215.000000</Width>
+<Height>38.000000</Height>
+<Position>76.000000,142.399994,0.000000</Position>
+<NavUp>XuiBtnRomBrowser</NavUp>
+<NavDown>XuiBtnQuit</NavDown>
+<Text>Settings</Text>
+</Properties>
+</XuiButton>
+<XuiButton>
+<Properties>
+<Id>XuiBtnQuit</Id>
+<Width>215.000000</Width>
+<Height>38.000000</Height>
+<Position>76.200012,191.399994,0.000000</Position>
+<NavUp>XuiBtnSettings</NavUp>
+<NavDown>XuiBtnRomBrowser</NavDown>
+<Text>Quit</Text>
+</Properties>
+</XuiButton>
 </XuiScene>
 </XuiCanvas>
diff --git a/360/menu.cpp b/360/menu.cpp
index 09ef3b53f1..2bcf7c758d 100644
--- a/360/menu.cpp
+++ b/360/menu.cpp
@@ -16,12 +16,14 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdint.h>
 #include <xtl.h>
 #include "xdk360_video.h"
 #include "menu.h"
 
 CSSNES		app;
 HXUIOBJ		hMainScene;
+uint32_t	menu_is_running;
 
 /* Register custom classes */
 HRESULT CSSNES::RegisterXuiClasses (void)
@@ -76,6 +78,8 @@ int menu_init (void)
 
 void menu_loop(void)
 {
+	menu_is_running = true;
+
 	HRESULT hr;
 	xdk360_video_t *vid = (xdk360_video_t*)g_d3d;
 
@@ -90,7 +94,6 @@ void menu_loop(void)
 		hr = XuiTimersRun();	/* Update XUI timers */
 
 		/* Present the frame */
-		vid->xdk360_render_device->Present(NULL, NULL, NULL, NULL);
-		
-	}while(1);
+		vid->xdk360_render_device->Present(NULL, NULL, NULL, NULL);	
+	}while(menu_is_running);
 }
\ No newline at end of file