diff --git a/out/bins/ext_booter.bin b/out/bins/ext_booter.bin
index 1d9d3b0f..f928efa8 100644
Binary files a/out/bins/ext_booter.bin and b/out/bins/ext_booter.bin differ
diff --git a/out/boot.dol b/out/boot.dol
index 89f7e3fe..b83769bf 100644
Binary files a/out/boot.dol and b/out/boot.dol differ
diff --git a/source/defines.h b/source/defines.h
index a2838f65..b195fc50 100644
--- a/source/defines.h
+++ b/source/defines.h
@@ -1,6 +1,6 @@
 
 #define APP_NAME				"WiiFlow WFL"
-#define APP_VERSION				"5.4.7 beta 7"
+#define APP_VERSION				"5.4.7 beta 8"
 
 #define APP_DATA_DIR			"wiiflow"
 #define APPS_DIR				"apps/wiiflow"
diff --git a/source/devicemounter/DeviceHandler.cpp b/source/devicemounter/DeviceHandler.cpp
index 297f68d6..bebe067b 100644
--- a/source/devicemounter/DeviceHandler.cpp
+++ b/source/devicemounter/DeviceHandler.cpp
@@ -61,7 +61,7 @@ void DeviceHandler::MountAll()
 void DeviceHandler::UnMountAll()
 {
 	/* Kill possible USB thread */
-	KillUSBKeepAliveThread();
+	//KillUSBKeepAliveThread();
 
 	for(u32 i = SD; i < MAXDEVICES; i++)
 		UnMount(i);
diff --git a/source/loader/sys.c b/source/loader/sys.c
index 7cf47e21..0df2b19f 100644
--- a/source/loader/sys.c
+++ b/source/loader/sys.c
@@ -160,18 +160,9 @@ bool AHBPROT_Patched(void)
 }
 
 /* WiiU Check by crediar, thanks */
-bool WiiUChecked = false;
-bool WiiUMode = false;
 bool IsOnWiiU(void)
 {
-	if(WiiUChecked)
-		return WiiUMode;
-
-	if((*HW_PROCESSOR >> 16) == 0xCAFE)
-		WiiUMode = true;
-
-	WiiUChecked = true;
-	return WiiUMode;
+	return ((*HW_PROCESSOR >> 16 ) == 0xCAFE);
 }
 
 void Sys_SetNeekPath(const char *Path)
diff --git a/source/menu/menu_config7.cpp b/source/menu/menu_config7.cpp
index 11dc0435..7c8813fc 100644
--- a/source/menu/menu_config7.cpp
+++ b/source/menu/menu_config7.cpp
@@ -50,10 +50,10 @@ void CMenu::_showConfig7(int curPage)
 
 	m_btnMgr.show(m_config7Lbl1);
 	m_btnMgr.show(m_config7Btn1);
+	m_btnMgr.show(m_config7Lbl2);
+	m_btnMgr.show(m_config7Btn2);
 	if(curPage != 14)
 	{
-		m_btnMgr.show(m_config7Lbl2);
-		m_btnMgr.show(m_config7Btn2);
 		m_btnMgr.show(m_config7Lbl3);
 		m_btnMgr.show(m_config7Btn3);
 		m_btnMgr.show(m_config7Lbl4);
@@ -149,6 +149,8 @@ void CMenu::_showConfig7(int curPage)
 	{
 		m_btnMgr.setText(m_config7Lbl1, _t("cfg729", L"Use system proxy settings"));
 		m_btnMgr.setText(m_config7Btn1, m_cfg.getBool("PROXY", "proxy_use_system") ? _t("on", L"On") : _t("off", L"Off"));
+		m_btnMgr.setText(m_config7Lbl2, _t("cfg730", L"Always show main icons"));
+		m_btnMgr.setText(m_config7Btn2, !m_cfg.getBool("GENERAL", "auto_hide_icons", true) ?  _t("yes", L"Yes") : _t("no", L"No"));
 	}
 }
 
@@ -365,6 +367,13 @@ int CMenu::_config7(int curPage)
 					mainMenu.proxyUseSystem = val;
 					m_btnMgr.setText(m_config7Btn1, val ? _t("on", L"On") : _t("off", L"Off"));
 				}
+				else if(m_btnMgr.selected(m_config7Btn2))
+				{
+					bool val = !m_cfg.getBool("GENERAL", "auto_hide_icons");
+					m_cfg.setBool("GENERAL", "auto_hide_icons", val);
+					m_btnMgr.setText(m_config7Btn2, !val ?  _t("yes", L"Yes") : _t("no", L"No"));
+					Auto_hide_icons = val;
+				}
 			}
 		}
 	}
diff --git a/source/menu/menu_main.cpp b/source/menu/menu_main.cpp
index 2c64200e..95465c74 100644
--- a/source/menu/menu_main.cpp
+++ b/source/menu/menu_main.cpp
@@ -138,7 +138,7 @@ void CMenu::_showCF(bool refreshList)
 
 		/* if game list is empty display message letting user know */
 		wstringEx Msg;
-		wstringEx Pth;
+		string Pth;
 		if(m_gameList.empty())
 		{
 			cacheCovers = false;
@@ -152,20 +152,20 @@ void CMenu::_showCF(bool refreshList)
 				switch(m_current_view)
 				{
 					case COVERFLOW_WII:
-						Msg = _t("main2", L"No games found in ");
-						Pth = wstringEx(fmt(wii_games_dir, DeviceName[currentPartition]));
+						Msg = _t("main2", L"No games found in");
+						Pth = sfmt(wii_games_dir, DeviceName[currentPartition]);
 						break;
 					case COVERFLOW_GAMECUBE:
-						Msg = _t("main2", L"No games found in ");
-						Pth = wstringEx(fmt(gc_games_dir, DeviceName[currentPartition]));
+						Msg = _t("main2", L"No games found in");
+						Pth = sfmt(gc_games_dir, DeviceName[currentPartition]);
 						break;
 					case COVERFLOW_CHANNEL:
-						Msg = _t("main3", L"No titles found in ");
-						Pth = wstringEx(fmt("%s:/%s/%s", DeviceName[currentPartition],  emu_nands_dir, m_cfg.getString(CHANNEL_DOMAIN, "current_emunand").c_str()));
+						Msg = _t("main3", L"No titles found in");
+						Pth = sfmt("%s:/%s/%s", DeviceName[currentPartition],  emu_nands_dir, m_cfg.getString(CHANNEL_DOMAIN, "current_emunand").c_str());
 						break;
 					case COVERFLOW_HOMEBREW:
-						Msg = _t("main4", L"No apps found in ");
-						Pth = wstringEx(fmt(HOMEBREW_DIR, DeviceName[currentPartition]));
+						Msg = _t("main4", L"No apps found in");
+						Pth = sfmt(HOMEBREW_DIR, DeviceName[currentPartition]);
 						break;
 					case COVERFLOW_PLUGIN:
 						Pth = "";
@@ -175,18 +175,18 @@ void CMenu::_showCF(bool refreshList)
 							Msg = _t("main5", L"No roms/items found.");
 						else
 						{
-							Msg = _t("main2", L"No games found in ");
+							Msg = _t("main2", L"No games found in");
 							u8 i = 0;
 							while(m_plugin.PluginExist(i) && !m_plugin.GetEnabledStatus(i)){ ++i; }
 							int romsPartition = m_plugin.GetRomPartition(i);
 							if(romsPartition < 0)
 								romsPartition = m_cfg.getInt(PLUGIN_DOMAIN, "partition", 0);
-							Pth = wstringEx(fmt("%s:/%s", DeviceName[romsPartition], m_plugin.GetRomDir(i)));
+							Pth = sfmt("%s:/%s", DeviceName[romsPartition], m_plugin.GetRomDir(i));
 						}
 						break;
 				}
 			}
-			Msg.append(Pth);
+			Msg.append(wstringEx(' ' + Pth));
 			m_btnMgr.setText(m_mainLblMessage, Msg);
 			m_btnMgr.show(m_mainLblMessage);
 			return;
diff --git a/source/menu/menu_sm_editor.cpp b/source/menu/menu_sm_editor.cpp
index 05148ddf..c14df52f 100644
--- a/source/menu/menu_sm_editor.cpp
+++ b/source/menu/menu_sm_editor.cpp
@@ -274,7 +274,7 @@ void CMenu::_checkboxesMenu(u8 md)
 								{
 									found = true;// and don't add it
 								}
-								else
+								else if(m_plugin.GetPluginPosition(strtoul(magicNums[i].c_str(), NULL, 16)) < 255)// make sure plugin exist
 								{
 									if(pluginsCount == 0)
 										newMagics = magicNums[j];
diff --git a/source/plugin/plugin.cpp b/source/plugin/plugin.cpp
index 96ccb749..74d484cc 100644
--- a/source/plugin/plugin.cpp
+++ b/source/plugin/plugin.cpp
@@ -69,7 +69,7 @@ void Plugin::init(const string& m_pluginsDir)
 			if(iniFile->find("scummvm.ini") != string::npos)
 				continue;
 			m_plugin_cfg.load(iniFile->c_str());
-			if(m_plugin_cfg.loaded())
+			if(m_plugin_cfg.loaded() && Plugins.size() < 256)// max plugins count = 255
 			{
 				m_plugin.AddPlugin(m_plugin_cfg, *iniFile);
 			}
@@ -119,7 +119,7 @@ u8 Plugin::GetPluginPosition(u32 magic)
 	for(u8 pos = 0; pos < Plugins.size(); pos++)
 	{
 		if(magic == Plugins[pos].magic)
-			return (s16)pos;
+			return pos;
 	}
 	return 255;
 }
diff --git a/wii/wiiflow/Languages/english.ini b/wii/wiiflow/Languages/english.ini
index ebd94114..f84f1f5b 100644
--- a/wii/wiiflow/Languages/english.ini
+++ b/wii/wiiflow/Languages/english.ini
@@ -70,6 +70,8 @@ cfg725=Shutdown to idle standby
 cfg726=Covers Box Mode
 cfg727=Use Plugin Database Titles
 cfg728=Upsample music to 48khz
+cfg729=Use system proxy settings
+cfg730=Always show main icons
 cfga2=Install game
 cfga3=Install
 cfga6=Language