diff --git a/source/menu/menu_main.cpp b/source/menu/menu_main.cpp
index 7dca6984..cd1ad77c 100644
--- a/source/menu/menu_main.cpp
+++ b/source/menu/menu_main.cpp
@@ -112,8 +112,6 @@ void CMenu::_showMain(void)
 				m_btnMgr.show(m_mainBtnUsb);
 			break;
 		case COVERFLOW_MAX:
-			m_btnMgr.show(m_mainBtnUsb);
-			break;
 		case COVERFLOW_HOMEBREW:
 			m_btnMgr.show(m_mainBtnUsb);
 			break;
@@ -780,6 +778,7 @@ int CMenu::main(void)
 						m_btnMgr.show(m_mainBtnUsb);
 					break;
 				case COVERFLOW_HOMEBREW:
+				case COVERFLOW_MAX:
 					m_btnMgr.show(m_mainBtnUsb);
 					break;
 				default:
diff --git a/source/menu/menu_source.cpp b/source/menu/menu_source.cpp
index a86be117..3d34f35e 100644
--- a/source/menu/menu_source.cpp
+++ b/source/menu/menu_source.cpp
@@ -128,7 +128,8 @@ void CMenu::_updateSourceBtns(void)
 			domain = PLUGIN_DOMAIN;
 			if(m_cfg.getBool(domain, "source", false))
 			{
-				if(m_cfg.getBool("PLUGIN", m_source.getString(fmt("BUTTON_%i", i + j), "magic"), false))
+				vector<string> magicNums = m_source.getStrings(fmt("BUTTON_%i", i + j), "magic", ',');
+				if(m_cfg.getBool("PLUGIN", magicNums.at(0), false))
 					ImgName = m_source.getString(fmt("BUTTON_%i", i + j),"image_s", "").c_str();
 				else
 					ImgName = m_source.getString(fmt("BUTTON_%i", i + j),"image", "").c_str();
@@ -366,7 +367,7 @@ bool CMenu::_Source()
 							break;
 						}
 					}
-					if (source == "allplugins")
+					/*if (source == "allplugins")
 					{
 						if (!show_emu) _showSourceNotice();
 						else
@@ -380,7 +381,7 @@ bool CMenu::_Source()
 							}
 							break;
 						}
-					}
+					}*/
 					if (source == "plugin")
 					{
 						if(!show_emu)