diff --git a/source/menu/menu_config_game.cpp b/source/menu/menu_config_game.cpp
index 8341fb8b..75538aca 100644
--- a/source/menu/menu_config_game.cpp
+++ b/source/menu/menu_config_game.cpp
@@ -34,8 +34,8 @@ void CMenu::_hideGameSettings(bool instant)
 	m_btnMgr.hide(m_gameSettingsLblDMLVideo, instant);
 	m_btnMgr.hide(m_gameSettingsBtnDMLVideoP, instant);
 	m_btnMgr.hide(m_gameSettingsBtnDMLVideoM, instant);
-	m_btnMgr.hide(m_gameSettingsLblGClanguageVal, instant);
 	m_btnMgr.hide(m_gameSettingsLblGClanguage, instant);
+	m_btnMgr.hide(m_gameSettingsLblGClanguageVal, instant);
 	m_btnMgr.hide(m_gameSettingsBtnGClanguageP, instant);
 	m_btnMgr.hide(m_gameSettingsBtnGClanguageM, instant);
 	m_btnMgr.hide(m_gameSettingsLblAspectRatio, instant);
@@ -146,8 +146,8 @@ void CMenu::_showGameSettings(void)
 			m_btnMgr.show(m_gameSettingsBtnDMLVideoP);
 			m_btnMgr.show(m_gameSettingsBtnDMLVideoM);
 
-			m_btnMgr.show(m_gameSettingsLblGClanguageVal);
 			m_btnMgr.show(m_gameSettingsLblGClanguage);
+			m_btnMgr.show(m_gameSettingsLblGClanguageVal);
 			m_btnMgr.show(m_gameSettingsBtnGClanguageP);
 			m_btnMgr.show(m_gameSettingsBtnGClanguageM);
 		}
@@ -173,8 +173,8 @@ void CMenu::_showGameSettings(void)
 		m_btnMgr.hide(m_gameSettingsBtnCover);
 		if(m_cf.getHdr()->type == TYPE_GC_GAME)
 		{
-			m_btnMgr.hide(m_gameSettingsLblGClanguageVal);
 			m_btnMgr.hide(m_gameSettingsLblGClanguage);
+			m_btnMgr.hide(m_gameSettingsLblGClanguageVal);
 			m_btnMgr.hide(m_gameSettingsBtnGClanguageP);
 			m_btnMgr.hide(m_gameSettingsBtnGClanguageM);
 
@@ -771,8 +771,8 @@ void CMenu::_initGameSettingsMenu(CMenu::SThemeData &theme)
 	_setHideAnim(m_gameSettingsLblDMLVideo, "GAME_SETTINGS/DML_VIDEO_BTN", 200, 0, 1.f, 0.f);
 	_setHideAnim(m_gameSettingsBtnDMLVideoM, "GAME_SETTINGS/DML_VIDEO_MINUS", 200, 0, 1.f, 0.f);
 	_setHideAnim(m_gameSettingsBtnDMLVideoP, "GAME_SETTINGS/DML_VIDEO_PLUS", 200, 0, 1.f, 0.f);
-	_setHideAnim(m_gameSettingsLblGClanguageVal, "GAME_SETTINGS/GC_LANG", 200, 0, 1.f, 0.f);
-	_setHideAnim(m_gameSettingsLblGClanguage, "GAME_SETTINGS/GC_LANG_BTN", -200, 0, 1.f, 0.f);
+	_setHideAnim(m_gameSettingsLblGClanguage, "GAME_SETTINGS/GC_LANG", -200, 0, 1.f, 0.f);
+	_setHideAnim(m_gameSettingsLblGClanguageVal, "GAME_SETTINGS/GC_LANG_BTN", 200, 0, 1.f, 0.f);
 	_setHideAnim(m_gameSettingsBtnGClanguageM, "GAME_SETTINGS/GC_LANG_MINUS", 200, 0, 1.f, 0.f);
 	_setHideAnim(m_gameSettingsBtnGClanguageP, "GAME_SETTINGS/GC_LANG_PLUS", 200, 0, 1.f, 0.f);
 	_setHideAnim(m_gameSettingsLblGameLanguage, "GAME_SETTINGS/GAME_LANG", -200, 0, 1.f, 0.f);
diff --git a/source/menu/menu_startup.cpp b/source/menu/menu_startup.cpp
index ce83f501..3c1335e5 100644
--- a/source/menu/menu_startup.cpp
+++ b/source/menu/menu_startup.cpp
@@ -330,7 +330,7 @@ void CMenu::_initSourceMenu(CMenu::SThemeData &theme)
 
 void CMenu::_textSource(void)
 {
-	m_btnMgr.setText(m_sourceLblTitle, _t("", L"Select Source"));
-	m_btnMgr.setText(m_sourceBtnBack, _t("", L"Exit"));
+	m_btnMgr.setText(m_sourceLblTitle, _t("stup1", L"Select Source"));
+	m_btnMgr.setText(m_sourceBtnBack, _t("stup2", L"Exit"));
 	m_btnMgr.setText(m_sourceLblNotice, _t("NMMOff", L"** DISABLED **"));
 }
diff --git a/wii/wiiflow/Languages/english.ini b/wii/wiiflow/Languages/english.ini
index 5f75e59d..91b8f8b8 100644
--- a/wii/wiiflow/Languages/english.ini
+++ b/wii/wiiflow/Languages/english.ini
@@ -73,11 +73,11 @@ cfgg26=Disable IOS Reload block
 cfgg27=Aspect Ratio
 cfgg28=NMM
 cfgg29=No DVD Patch
+cfgg3=Language
 cfgg30=Extract Save from NAND
 cfgg31=Extract
 cfgg32=Flash Save to NAND
 cfgg33=Flash
-cfgg3=Language
 cfgg4=Patch country strings
 cfgg5=Ocarina
 cfgg7=Vipatch
@@ -175,8 +175,8 @@ dlmsg8=Full cover not found. Downloading from %s
 dlmsg9=%i/%i files downloaded. %i are front covers only.
 DMLdef=Default
 DMLdefG=Game
-DMLpal=PAL 576i
 DMLntsc=NTSC 480i
+DMLpal=PAL 576i
 DMLpal60=PAL 480i
 DMLprog=NTSC 480p
 DMLprogP=PAL 480p
@@ -224,10 +224,10 @@ NANDpart=Partial
 neogeo=Neo-Geo
 nes=Nintendo
 nintendo64=Nintendo64
+NMMdebug=Debug
 NMMDef=Default
 NMMOff=Disabled
 NMMon=Enabled
-NMMdebug=Debug
 NoDVDDef=Default
 NoDVDOff=Disabled
 NoDVDon=Enabled
@@ -245,6 +245,8 @@ SavePartG=Game save
 SaveReg=Regionswitch
 SaveRegG=Regionswitch
 snes=Super Nintendo
+stup1=Select Source
+stup2=Exit
 sys1=Update WiiFlow
 sys2=WiiFlow Version:
 sys3=Cancel
diff --git a/wii/wiiflow/Languages/french.ini b/wii/wiiflow/Languages/french.ini
index 7ea8515b..a9692ae8 100644
--- a/wii/wiiflow/Languages/french.ini
+++ b/wii/wiiflow/Languages/french.ini
@@ -11,7 +11,7 @@ alphabetically=Alphabétique
 appname=%s v%s
 aspect169=Forcer 16:9
 aspect43=Forcer 4:3
-aspectdef=Défaut
+aspectDef=Défaut
 bootmii=BootMii
 bycontrollers=Manettes
 byesrb=PEGI
@@ -227,7 +227,7 @@ nintendo64=Nintendo64
 NMMdebug=Debug
 NMMDef=Défaut
 NMMOff=Désactivé
-NMMOn=Activé
+NMMon=Activé
 NoDVDDef=Défaut
 NoDVDOff=Désactivé
 NoDVDon=Activé
@@ -245,6 +245,8 @@ SavePartG=Sauvegarde
 SaveReg=Changer région
 SaveRegG=Changer région
 snes=Super Nintendo
+stup1=Selectionner la source
+stup2=Quitter
 sys1=Mettre à jour WiiFlow
 sys2=Version de WiiFlow :
 sys3=Annuler