diff --git a/out/boot.dol b/out/boot.dol
index d94439cc..3e2d3bd2 100644
Binary files a/out/boot.dol and b/out/boot.dol differ
diff --git a/source/menu/menu.cpp b/source/menu/menu.cpp
index 5a323e47..ecdfcd0d 100644
--- a/source/menu/menu.cpp
+++ b/source/menu/menu.cpp
@@ -405,6 +405,13 @@ bool CMenu::init(bool usb_mounted)
 	MusicPlayer.Init(m_cfg, m_musicDir, fmt("%s/music", m_themeDataDir.c_str()));
 	m_music_info = m_cfg.getBool("GENERAL", "display_music_info", false);
 
+	/* Source Menu on start reset tiers before buid menus */
+	if(m_cfg.getBool("GENERAL", "source_on_start", false))
+	{
+		m_cfg.remove(SOURCEFLOW_DOMAIN, "tiers");
+		m_cfg.remove(SOURCEFLOW_DOMAIN, "numbers");
+	}
+	
 	/* Init Button Manager and build the menus */
 	_buildMenus();
 
diff --git a/source/menu/menu_source.cpp b/source/menu/menu_source.cpp
index 0f1095c2..9f13c43d 100644
--- a/source/menu/menu_source.cpp
+++ b/source/menu/menu_source.cpp
@@ -132,6 +132,11 @@ void CMenu::_sourceFlow()
 			return;
 		}
 	}
+	else if(source == "back_tier")
+	{
+		_srcTierBack(false);
+		return;
+	}
 	else //(source == "wii")
 		m_current_view = COVERFLOW_WII;
 	m_sourceflow = false;
@@ -477,6 +482,12 @@ bool CMenu::_Source()
 						_updateSourceBtns();
 					}
 				}
+				else if(source == "back_tier")
+				{
+					exitSource = false;
+					_srcTierBack(false);
+					_updateSourceBtns();
+				}
 				else //if(source == "wii") or source is invalid or empty default to wii
 				{
 					m_current_view = COVERFLOW_WII;