diff --git a/menu.c b/menu.c
index fa8ce64..92a2cf7 100644
--- a/menu.c
+++ b/menu.c
@@ -302,7 +302,7 @@ static void SelectFile(char* pFileExt, unsigned char Options, unsigned char Menu
 }
 
 
-static void substrcpy(char *d, char *s, char idx) {
+void substrcpy(char *d, char *s, char idx) {
 	char p = 0;
 
 	while (*s) {
@@ -645,7 +645,14 @@ void HandleUI(void)
 				}
 				else
 				{
-					menustate = MENU_8BIT_MAIN1;
+					if (get_key_mod() & (LGUI | RGUI)) //Alt+Menu
+					{
+						menustate = MENU_8BIT_SYSTEM1;
+					}
+					else
+					{
+						menustate = MENU_8BIT_MAIN1;
+					}
 				}
 			}
 			menusub = 0;
@@ -1040,11 +1047,11 @@ void HandleUI(void)
 		OsdWrite(OsdIsBig ? 3 : 1, " Define joystick buttons", menusub == 1, 0);
 		OsdWrite(OsdIsBig ? 4 : 2, "", 0, 0);
 		if (OsdIsBig) OsdWrite(5, "", 0, 0);
-		OsdWrite(OsdIsBig ? 6 : 3, m ? " Reset" : " Reset settings", menusub == 3, 0);
+		OsdWrite(OsdIsBig ? 6 : 3, m ? " Reset" : " Reset settings", menusub == 3, !has_menu());
 		if (m)
 			OsdWrite(OsdIsBig ? 7 : 4, "", 0, 0);
 		else
-			OsdWrite(OsdIsBig ? 7 : 4, " Save settings", menusub == 4, 0); // Minimig saves settings elsewhere
+			OsdWrite(OsdIsBig ? 7 : 4, " Save settings", menusub == 4, !has_menu()); // Minimig saves settings elsewhere
 		if (OsdIsBig) OsdWrite(8, "", 0, 0);
 		OsdWrite(OsdIsBig ? 9 : 5, " Cold reset", menusub == (5 - m), 0);
 		if (OsdIsBig) OsdWrite(10, "", 0, 0);
@@ -1085,8 +1092,11 @@ void HandleUI(void)
 			case 2:
 				break;
 			case 3:
-				menustate = MENU_RESET1;
-				menusub = 1;
+				if (has_menu())
+				{
+					menustate = MENU_RESET1;
+					menusub = 1;
+				}
 				break;
 			case 4:
 				if (m)
@@ -1095,14 +1105,17 @@ void HandleUI(void)
 				}
 				else
 				{
-					// Save settings
-					char *filename = user_io_create_config_name();
-					unsigned long status = user_io_8bit_set_status(0, 0);
-					iprintf("Saving config to %s\n", filename);
-					FileSaveConfig(filename, &status, 4);
-					if (is_x86_core()) x86_config_save();
-					menustate = MENU_8BIT_MAIN1;
-					menusub = 0;
+					if (has_menu())
+					{
+						// Save settings
+						char *filename = user_io_create_config_name();
+						unsigned long status = user_io_8bit_set_status(0, 0);
+						iprintf("Saving config to %s\n", filename);
+						FileSaveConfig(filename, &status, 4);
+						if (is_x86_core()) x86_config_save();
+						menustate = MENU_8BIT_MAIN1;
+						menusub = 0;
+					}
 				}
 				break;
 			case 5:
@@ -1149,8 +1162,11 @@ void HandleUI(void)
 					menustate = MENU_ARCHIE_MAIN1;
 					break;
 				case CORE_TYPE_8BIT:
-					menusub = 0;
-					menustate = MENU_8BIT_MAIN1;
+					if (has_menu())
+					{
+						menusub = 0;
+						menustate = MENU_8BIT_MAIN1;
+					}
 					break;
 				}
 			}
diff --git a/menu.h b/menu.h
index 82ccf09..e23f2a7 100644
--- a/menu.h
+++ b/menu.h
@@ -28,4 +28,8 @@ unsigned long getStatus(char *opt, unsigned long status);
 void menu_key_set(uint32_t c);
 void menu_mod_set(uint32_t m);
 
+void substrcpy(char *d, char *s, char idx);
+extern char joy_bnames[12][32];
+extern int  joy_bcount;
+
 #endif
diff --git a/user_io.c b/user_io.c
index 2c68f79..930dcd8 100644
--- a/user_io.c
+++ b/user_io.c
@@ -144,8 +144,11 @@ char is_x86_core()
 }
 
 static int is_no_type = 0;
+static int disable_osd = 0;
 char has_menu()
 {
+	if (disable_osd) return 0;
+
 	if (!is_no_type) is_no_type = core_name[0] ? 1 : 2;
 	return (is_no_type == 1);
 }
@@ -200,12 +203,23 @@ static void parse_config()
 			p = user_io_8bit_get_string(i);
 			if (i && p && p[0])
 			{
-				if (p[0] == 'J' && p[1] == '1')
+				if (p[0] == 'J')
 				{
-					joy_force = 1;
-					emu_mode = EMU_JOY0;
-					input_notify_mode();
-					set_kbd_led(HID_LED_NUM_LOCK, true);
+					if (p[1] == '1')
+					{
+						joy_force = 1;
+						emu_mode = EMU_JOY0;
+						input_notify_mode();
+						set_kbd_led(HID_LED_NUM_LOCK, true);
+					}
+
+					joy_bcount = 0;
+					for (int n = 0; n < 12; n++)
+					{
+						substrcpy(joy_bnames[n], p, n + 1);
+						if (!joy_bnames[n][0]) break;
+						joy_bcount++;
+					}
 				}
 
 				if (p[0] == 'O' && p[1] == 'X')
@@ -220,6 +234,21 @@ static void parse_config()
 						if (p[2] == '2') x86_set_fdd_boot(!(x&1));
 					}
 				}
+
+				if (p[0] == 'X')
+				{
+					disable_osd = 1;
+				}
+
+				if (p[0] == 'V')
+				{
+					// get version string
+					char s[40];
+					strcpy(s, OsdCoreName());
+					strcat(s, " ");
+					substrcpy(s + strlen(s), p, 1);
+					OsdCoreNameSet(s);
+				}
 			}
 			i++;
 		} while (p);
@@ -258,6 +287,7 @@ void user_io_detect_core_type()
 	char *name;
 	char mainpath[32];
 	core_name[0] = 0;
+	disable_osd = 0;
 
 	core_type = (fpga_core_id() & 0xFF);
 	fio_size = fpga_get_fio_size();
@@ -324,6 +354,8 @@ void user_io_detect_core_type()
 		name = user_io_create_config_name();
 		if(strlen(name) > 0)
 		{
+			OsdCoreNameSet(user_io_get_core_name());
+
 			iprintf("Loading config %s\n", name);
 			unsigned long status = 0;
 			if (FileLoadConfig(name, &status, 4))
@@ -1707,11 +1739,8 @@ void user_io_kbd(uint16_t key, int press)
 			{
 				if (is_menu_core()) printf("PS2 code(break)%s for core: %d(0x%X)\n", (code & EXT) ? "(ext)" : "", code & 255, code & 255);
 
-				if (osd_is_visible)
-				{
-					if(key == KEY_MENU && has_menu()) menu_key_set(UPSTROKE | KEY_F12);
-						else menu_key_set(UPSTROKE | key);
-				}
+				if (key == KEY_MENU) key = KEY_F12;
+				if (osd_is_visible) menu_key_set(UPSTROKE | key);
 
 				//don't block depress so keys won't stick in core if pressed before OSD.
 				send_keycode(key, press);
@@ -1720,7 +1749,7 @@ void user_io_kbd(uint16_t key, int press)
 			{
 				if (is_menu_core()) printf("PS2 code(make)%s for core: %d(0x%X)\n", (code & EXT) ? "(ext)" : "", code & 255, code & 255);
 
-				if (has_menu() && (((key == KEY_F12) && (!is_x86_core() || (get_key_mod() & (RGUI | LGUI)))) || key == KEY_MENU)) menu_key_set(KEY_F12);
+				if ((has_menu() || (get_key_mod() & (LALT | RALT | RGUI | LGUI)))  && (((key == KEY_F12) && (!is_x86_core() || (get_key_mod() & (RGUI | LGUI)))) || key == KEY_MENU)) menu_key_set(KEY_F12);
 				else if (osd_is_visible)
 				{
 					if (press == 1) menu_key_set(key);
@@ -1770,6 +1799,7 @@ void user_io_kbd(uint16_t key, int press)
 					}
 					else
 					{
+						if(key == KEY_MENU) key = KEY_F12;
 						send_keycode(key, press);
 					}
 				}