21 files changed, 779 insertions, 1295 deletions

diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index eb94918e..5777cff2 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -8627,13 +8627,13 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 	case COMMAND_ACTIVATE_SAVE_MENU:
 	{
 		CStats::SafeHouseVisits++;
-		FrontEndMenuManager.m_bSaveMenuActive = true;
+		FrontEndMenuManager.m_bActivateSaveMenu = true;
 		FindPlayerPed()->SetMoveSpeed(0.0f, 0.0f, 0.0f);
 		FindPlayerPed()->SetTurnSpeed(0.0f, 0.0f, 0.0f);
 		return 0;
 	}
 	case COMMAND_HAS_SAVE_GAME_FINISHED:
-		UpdateCompareFlag(!FrontEndMenuManager.m_bMenuActive && !FrontEndMenuManager.m_bSaveMenuActive);
+		UpdateCompareFlag(!FrontEndMenuManager.m_bMenuActive && !FrontEndMenuManager.m_bActivateSaveMenu);
 		return 0;
 	case COMMAND_NO_SPECIAL_CAMERA_FOR_THIS_GARAGE:
 		CollectParameters(&m_nIp, 1);
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp
index afa153f9..871b6dba 100644
--- a/src/core/Cam.cpp
+++ b/src/core/Cam.cpp
@@ -3630,7 +3630,7 @@ CCam::Process_Fixed(const CVector &CameraTarget, float, float, float)
 	if(TheCamera.m_bUseSpecialFovTrain)
 		FOV = TheCamera.m_fFovForTrain;
 
-	if(CMenuManager::m_ControlMethod == 0 && Using3rdPersonMouseCam()){
+	if(FrontEndMenuManager.m_ControlMethod == 0 && Using3rdPersonMouseCam()){
 		CPed *player = FindPlayerPed();
 		if(player && player->CanStrafeOrMouseControl()){
 			float Heading = Front.Heading();
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index fa5e44bb..486c2c9e 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -3037,33 +3037,25 @@ CCamera::SetNearClipScript(float clip)
 void
 CCamera::ProcessFade(void)
 {
-	float fade = (CTimer::GetTimeInMilliseconds() - m_uiFadeTimeStarted)/1000.0f;
-	// Why even set CDraw::FadeValue if m_fFLOATingFade sets it anyway?
 	if(m_bFading){
 		if(m_iFadingDirection == FADE_IN){
 			if(m_fTimeToFadeOut != 0.0f){
-				m_fFLOATingFade = 255.0f - 255.0f*fade/m_fTimeToFadeOut;
-				if(m_fFLOATingFade <= 0.0f){
-					m_bFading = false;
-					CDraw::FadeValue = 0;
-					m_fFLOATingFade = 0.0f;
-				}
+				m_fFLOATingFade -= CTimer::GetTimeStepInSeconds() * 255.0f / m_fTimeToFadeOut;
 			}else{
+				m_fFLOATingFade = 0.0f;
+			}
+			if (m_fFLOATingFade <= 0.0f) {
 				m_bFading = false;
-				CDraw::FadeValue = 0;
 				m_fFLOATingFade = 0.0f;
 			}
 		}else if(m_iFadingDirection == FADE_OUT){
 			if(m_fTimeToFadeOut != 0.0f){
-				m_fFLOATingFade = 255.0f*fade/m_fTimeToFadeOut;
-				if(m_fFLOATingFade >= 255.0f){
-					m_bFading = false;
-					CDraw::FadeValue = 255;
-					m_fFLOATingFade = 255.0f;
-				}
+				m_fFLOATingFade += CTimer::GetTimeStepInSeconds() * 255.0f / m_fTimeToFadeOut;
 			}else{
+				m_fFLOATingFade = 255.0f;
+			}
+			if (m_fFLOATingFade >= 255.0f) {
 				m_bFading = false;
-				CDraw::FadeValue = 255;
 				m_fFLOATingFade = 255.0f;
 			}
 		}
diff --git a/src/core/ControllerConfig.cpp b/src/core/ControllerConfig.cpp
index 6a5080e5..453889a5 100644
--- a/src/core/ControllerConfig.cpp
+++ b/src/core/ControllerConfig.cpp
@@ -769,7 +769,7 @@ void CControllerConfigManager::AffectControllerStateOn_ButtonDown_ThirdPersonOnl
 	if (button == GetControllerKeyAssociatedWithAction(PED_SPRINT, type))
 		state.Cross = 255;
 	
-	if (CMenuManager::m_ControlMethod == CONTROL_CLASSIC)
+	if (FrontEndMenuManager.m_ControlMethod == CONTROL_CLASSIC)
 	{
 		if (button == GetControllerKeyAssociatedWithAction(PED_CYCLE_TARGET_LEFT, type))
 			state.LeftShoulder2 = 255;
@@ -835,7 +835,7 @@ void CControllerConfigManager::AffectControllerStateOn_ButtonDown_FirstAndThirdP
 			state.RightStickX = 128;
 	}
 
-	if (CMenuManager::m_ControlMethod == CONTROL_CLASSIC)
+	if (FrontEndMenuManager.m_ControlMethod == CONTROL_CLASSIC)
 	{
 		if (button == GetControllerKeyAssociatedWithAction(PED_1RST_PERSON_LOOK_UP, type))
 		{
@@ -1617,7 +1617,7 @@ void CControllerConfigManager::DeleteMatching3rdPersonControls(e_ControllerActio
 		if (key == GetControllerKeyAssociatedWithAction(PED_SPRINT, type))
 			ClearSettingsAssociatedWithAction(PED_SPRINT, type);
 
-		if (CMenuManager::m_ControlMethod == CONTROL_CLASSIC)
+		if (FrontEndMenuManager.m_ControlMethod == CONTROL_CLASSIC)
 		{
 			if (key == GetControllerKeyAssociatedWithAction(PED_CYCLE_TARGET_LEFT, type))
 				ClearSettingsAssociatedWithAction(PED_CYCLE_TARGET_LEFT, type);
@@ -1640,7 +1640,7 @@ void CControllerConfigManager::DeleteMatching1rst3rdPersonControls(e_ControllerA
 		if (key == GetControllerKeyAssociatedWithAction(GO_BACK, type))
 			ClearSettingsAssociatedWithAction(GO_BACK, type);
 
-		if (CMenuManager::m_ControlMethod == CONTROL_CLASSIC)
+		if (FrontEndMenuManager.m_ControlMethod == CONTROL_CLASSIC)
 		{
 			if (key == GetControllerKeyAssociatedWithAction(PED_1RST_PERSON_LOOK_LEFT, type))
 				ClearSettingsAssociatedWithAction(PED_1RST_PERSON_LOOK_LEFT, type);
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index dd840bdc..8149a201 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -78,14 +78,6 @@ CRGBA SLIDEROFF_COLOR(27, 89, 130, 255);
 #define GetBackJustDown GetSquareJustDown
 #endif
 
-#ifdef MENU_MAP
-bool CMenuManager::bMenuMapActive = false;
-bool CMenuManager::bMapMouseShownOnce = false;
-bool CMenuManager::bMapLoaded = false;
-float CMenuManager::fMapSize;
-float CMenuManager::fMapCenterY;
-float CMenuManager::fMapCenterX;
-#endif
 
 #ifdef PS2_LIKE_MENU
 BottomBarOption bbNames[8];
@@ -98,35 +90,8 @@ int curBottomBarOption = -1;
 int hoveredBottomBarOption = -1;
 #endif
 
-int32 CMenuManager::OS_Language = LANG_ENGLISH;
-int8 CMenuManager::m_PrefsUseVibration;
-int8 CMenuManager::m_DisplayControllerOnFoot;
-int8 CMenuManager::m_PrefsVsync = 1;
-int8 CMenuManager::m_PrefsVsyncDisp = 1;
-int8 CMenuManager::m_PrefsFrameLimiter = 1;
-int8 CMenuManager::m_PrefsShowSubtitles = 1;
-int8 CMenuManager::m_PrefsSpeakers;
-int32 CMenuManager::m_ControlMethod;
-int8 CMenuManager::m_PrefsDMA = 1;
-int32 CMenuManager::m_PrefsLanguage;
 uint8 CMenuManager::m_PrefsStereoMono; // unused except restore settings
 
-bool CMenuManager::m_PrefsAllowNastyGame = true;
-bool CMenuManager::m_bStartUpFrontEndRequested;
-bool CMenuManager::m_bShutDownFrontEndRequested;
-
-int8 CMenuManager::m_PrefsUseWideScreen;
-int8 CMenuManager::m_PrefsRadioStation;
-int32 CMenuManager::m_PrefsBrightness = 256;
-float CMenuManager::m_PrefsLOD = CRenderer::ms_lodDistScale;
-int8 CMenuManager::m_bFrontEnd_ReloadObrTxtGxt;
-int32 CMenuManager::m_PrefsMusicVolume = 102;
-int32 CMenuManager::m_PrefsSfxVolume = 102;
-
-char CMenuManager::m_PrefsSkinFile[256] = DEFAULT_SKIN_NAME;
-
-int32 CMenuManager::m_KeyPressedCode = -1;
-
 // Originally that was PS2 option color, they forget it here and used in PrintBriefs once(but didn't use the output anyway)
 #ifdef PS2_LIKE_MENU
 const CRGBA TEXT_COLOR = CRGBA(150, 110, 30, 255);
@@ -137,56 +102,25 @@ const CRGBA TEXT_COLOR = CRGBA(235, 170, 50, 255); // PC briefs text color
 float MENU_TEXT_SIZE_X = SMALLTEXT_X_SCALE;
 float MENU_TEXT_SIZE_Y = SMALLTEXT_Y_SCALE;
 
-bool holdingScrollBar; // *(bool*)0x628D59; // not original name
-int32 CMenuManager::m_SelectedMap;
-int32 CMenuManager::m_SelectedGameType;
-
-// Used in a hidden menu
-uint8 CMenuManager::m_PrefsPlayerRed = 255;
-uint8 CMenuManager::m_PrefsPlayerGreen = 128;
-uint8 CMenuManager::m_PrefsPlayerBlue; // why??
+bool holdingScrollBar; // *(bool*)0x7039B9; // not original name
 
 CMenuManager FrontEndMenuManager;
+MenuTrapezoid menuBg(CGeneral::GetRandomNumber() % 40 + 65, CGeneral::GetRandomNumber() % 40 + 21,
+	CGeneral::GetRandomNumber() % 40 + 568, CGeneral::GetRandomNumber() % 40 + 44,
+	CGeneral::GetRandomNumber() % 40 + 36, CGeneral::GetRandomNumber() % 40 + 352,
+	CGeneral::GetRandomNumber() % 40 + 593, CGeneral::GetRandomNumber() % 40 + 312);
 
-uint32 TimeToStopPadShaking;
-char *pEditString;
-int32 *pControlEdit;
-bool DisplayComboButtonErrMsg;
-int32 MouseButtonJustClicked;
-int32 JoyButtonJustClicked;
-//int32 *pControlTemp = 0;
+MenuTrapezoid menuOptionHighlight(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
+
+// TODO(Miami): TEMPORARY
+bool bMapLoaded = false;
+bool bMapMouseShownOnce = false;
 
 #ifndef MASTER
 bool CMenuManager::m_PrefsMarketing = false;
 bool CMenuManager::m_PrefsDisableTutorials = false;
 #endif // !MASTER
 
-/*
-// 0x5F3344
-const char* MenuFilenames[][2] = {
-	{"connection24", ""},
-	{"findgame24", ""},
-	{"hostgame24", ""},
-	{"mainmenu24", ""},
-	{"Playersetup24", ""},
-	{"singleplayer24", ""},
-	{"multiplayer24", ""},
-	{"dmalogo128", "dmalogo128m"},
-	{"gtaLogo128", "gtaLogo128"},
-	{"rockstarLogo128", "rockstarlogo128m"},
-	{"gamespy256", "gamespy256a"},
-	{"mouse", "mousetimera"},
-	{"mousetimer", "mousetimera"},
-	{"mp3logo", "mp3logoA"},
-	{"downOFF", "buttonA"},
-	{"downON", "buttonA"},
-	{"upOff", "buttonA"},
-	{"upON", "buttonA"},
-	{"gta3logo256", "gta3logo256m"},
-	{ nil, nil }
-};
-*/
-
 // 0x68C144
 const char* FrontendFilenames[][2] = {
 	{"background", ""},
@@ -252,7 +186,7 @@ ScaleAndCenterX(float x)
 			m_nCurrOption = pendingOption; \
 			reverseAlpha = false; \
 			if (updateDelay) \
-				m_nScreenChangeDelayTimer = CTimer::GetTimeInMillisecondsPauseMode(); \
+				m_LastScreenSwitch = CTimer::GetTimeInMillisecondsPauseMode(); \
 		} \
 		if (withReverseAlpha) { \
 			pendingOption = option; \
@@ -263,7 +197,7 @@ ScaleAndCenterX(float x)
 			m_nCurrScreen = screen; \
 			m_nCurrOption = option; \
 			if (updateDelay) \
-				m_nScreenChangeDelayTimer = CTimer::GetTimeInMillisecondsPauseMode(); \
+				m_LastScreenSwitch = CTimer::GetTimeInMillisecondsPauseMode(); \
 		} \
 		m_nMenuFadeAlpha = 255; \
 	} while(0)
@@ -274,7 +208,7 @@ ScaleAndCenterX(float x)
 		m_nCurrScreen = screen; \
 		m_nCurrOption = option; \
 		if(updateDelay) \
-			m_nScreenChangeDelayTimer = CTimer::GetTimeInMillisecondsPauseMode(); \
+			m_LastScreenSwitch = CTimer::GetTimeInMillisecondsPauseMode(); \
 		if(clearAlpha) \
 			m_nMenuFadeAlpha = 0; \
 	} while(0)
@@ -409,6 +343,125 @@ CMenuManager::ThingsToDoBeforeLeavingPage()
 
 // ------ Functions not in the game/inlined ends
 
+CMenuManager::CMenuManager()
+{
+	m_StatsScrollSpeed = 150.0f;
+	m_StatsScrollDirection = 1;
+	m_PrefsSfxVolume = 49;
+	m_PrefsMusicVolume = 49;
+	m_PrefsRadioStation = 0;
+	field_2C = 1;
+	m_PrefsBrightness = 256;
+	m_PrefsLOD = 1.2f;
+	m_KeyPressedCode = -1;
+	m_bFrontEnd_ReloadObrTxtGxt = false;
+	m_PrefsMP3BoostVolume = 0;
+	m_PrefsShowSubtitles = 0;
+	m_PrefsShowLegends = 1;
+	m_PrefsUseWideScreen = 0;
+	m_PrefsVsync = 0;
+	m_PrefsVsyncDisp = 1;
+	m_PrefsFrameLimiter = 1;
+	m_PrefsLanguage = 0;
+	field_54 = 0;
+	m_PrefsAllowNastyGame = 1;
+	m_PrefsSpeakers = 0;
+	field_8 = 0;
+	m_PrefsUseVibration = 0;
+	m_PrefsShowHud = 1;
+	m_PrefsRadarMode = 0;
+	field_10 = 0;
+	m_bShutDownFrontEndRequested = false;
+	m_bStartUpFrontEndRequested = false;
+	pEditString = nil;
+	pControlEdit = nil;
+	DisplayComboButtonErrMsg = false;
+	m_PrefsDMA = 1;
+	OS_Language = LANG_ENGLISH;
+	m_ControlMethod = CONTROL_STANDARD;
+	CCamera::m_bUseMouse3rdPerson = true;
+	m_3DProviderOnLastSaveLoad = 0;
+	m_nFirstVisibleRowOnList = 0;
+	m_nScrollbarTopMargin = 0.0f;
+	m_nSelectedListRow = 0;
+	m_nSkinsTotal = 0;
+	m_nPrefsAudio3DProviderIndex = -99;
+	m_bGameNotLoaded = true;
+	m_nMousePosX = m_nMouseTempPosX;
+	m_nMousePosY = m_nMouseTempPosY;
+	m_nMouseOldPosX = m_nMousePosX;
+	m_nMouseOldPosY = m_nMousePosY;
+	m_bShowMouse = true;
+	m_nHoverOption = HOVEROPTION_NOT_HOVERING;
+
+	// TODO(Miami)
+	// DMAudio.SetMP3BoostVolume(m_PrefsMP3BoostVolume);
+	m_bMenuActive = false;
+	m_bActivateSaveMenu = false;
+	m_bWantToLoad = false;
+	m_nMenuFadeAlpha = 0;
+	m_OnlySaveMenu = false;
+	m_fMapSize = 162.0f;
+	m_fMapCenterX = 320.0f;
+	m_fMapCenterY = 225.0f;
+	DMAudio.SetMusicMasterVolume(m_PrefsMusicVolume);
+	DMAudio.SetEffectsMasterVolume(m_PrefsSfxVolume);
+}
+
+void
+CMenuManager::SetFrontEndRenderStates(void)
+{
+	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
+	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSCLAMP);
+	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
+	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
+	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
+	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
+	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
+}
+
+bool DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha);
+void DoRWStuffEndOfFrame(void);
+
+void
+CMenuManager::Initialise(void)
+{
+	DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+	DoRWStuffEndOfFrame();
+	m_AllowNavigation = false;
+	m_menuTransitionProgress = -50;
+	m_nMenuFadeAlpha = 0;
+	m_nCurrOption = 0;
+	bOptionHighlightTransitionBlend = 0;
+	CentreMousePointer();
+	m_bShowMouse = true;
+	m_fMapSize = 162.0f;
+	m_fMapCenterX = 320.0f;
+	m_fMapCenterY = 225.0f;
+	CPad::StopPadsShaking();
+	if (!m_OnlySaveMenu)
+		m_nCurrScreen = MENUPAGE_NONE;
+	DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
+	DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_STARTING, 0);
+	DMAudio.Service();
+	DMAudio.SetMusicMasterVolume(m_PrefsMusicVolume);
+	DMAudio.SetEffectsMasterVolume(m_PrefsSfxVolume);
+	m_PrefsRadioStation = DMAudio.GetRadioInCar();
+
+	// TODO(Miami)
+	// DMAudio.SetMP3BoostVolume(m_PrefsMP3BoostVolume);
+	if (DMAudio.IsMP3RadioChannelAvailable()) {
+		if (m_PrefsRadioStation < HEAD_RADIO || m_PrefsRadioStation > USERTRACK)
+			m_PrefsRadioStation = CGeneral::GetRandomNumber() % 10;
+	} else if (m_PrefsRadioStation < HEAD_RADIO || m_PrefsRadioStation > CHATTERBOX)
+		m_PrefsRadioStation = CGeneral::GetRandomNumber() % 9;
+
+	CFileMgr::SetDir("");
+	//CFileMgr::SetDir("");
+	PcSaveHelper.PopulateSlotInfo();
+	CTimer::StartUserPause();
+}
+
 void
 CMenuManager::BuildStatLine(Const char *text, void *stat, bool itsFloat, void *stat2)
 {
@@ -682,16 +735,15 @@ CMenuManager::DoSettingsBeforeStartingAGame()
 
 	DMAudio.Service();
 	m_bWantToRestart = true;
-
-	ShutdownJustMenu();
-	UnloadTextures();
+	m_bShutDownFrontEndRequested = true;
 	DMAudio.SetEffectsFadeVol(0);
 	DMAudio.SetMusicFadeVol(0);
+	SwitchMenuOnAndOff();
 	DMAudio.ResetTimers(CTimer::GetTimeInMilliseconds());
 }
 
 void
-CMenuManager::Draw()
+CMenuManager::DrawStandardMenus()
 {
 	CFont::SetBackgroundOff();
 	CFont::SetPropOn();
@@ -699,19 +751,6 @@ CMenuManager::Draw()
 	CFont::SetJustifyOn();
 	CFont::SetBackGroundOnlyTextOn();
 
-	// no V1.1 text in vc obv
-#if 0 //def GTA3_1_1_PATCH
-	CFont::SetColor(CRGBA(255, 150, 225, FadeIn(255)));
-	CFont::SetRightJustifyOn();
-	CFont::SetFontStyle(FONT_HEADING);
-	CFont::SetScale(MENU_X(0.7f), MENU_Y(0.5f));
-	CFont::SetWrapx(SCREEN_WIDTH);
-	CFont::SetRightJustifyWrap(0.0f);
-	strcpy(gString, "V1.1");
-	AsciiToUnicode(gString, gUString);
-	CFont::PrintString(SCREEN_WIDTH / 10, SCREEN_HEIGHT / 45, gUString);
-#endif
-
 	CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(MENU_X_MARGIN));
 	CFont::SetRightJustifyWrap(SCREEN_SCALE_X(MENUACTION_WIDTH));
 
@@ -733,9 +772,6 @@ CMenuManager::Draw()
 	float nextYToUse = 40.0f;
 
 	// Page name
-#ifdef PS2_SAVE_DIALOG
-	if(!m_bRenderGameInMenu)
-#endif
 	if (aScreens[m_nCurrScreen].m_ScreenName[0] != '\0') {
 
 		PREPARE_MENU_HEADER
@@ -864,15 +900,6 @@ CMenuManager::Draw()
 			CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = BIGTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = BIGTEXT_Y_SCALE));
 			CFont::SetCentreOn();
 			break;
-#ifdef PS2_SAVE_DIALOG
-		case MENUPAGE_SAVE:
-			columnWidth = 180;
-			headerHeight = 60;
-			lineHeight = 24;
-			CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
-			CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = BIGTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = BIGTEXT_Y_SCALE));
-			break;
-#endif
 		default:
 			columnWidth = 320;
 			headerHeight = 40;
@@ -948,73 +975,8 @@ CMenuManager::Draw()
 			}
 
 			switch (aScreens[m_nCurrScreen].m_aEntries[i].m_Action) {
-			case MENUACTION_CHANGEMENU: {
-				switch (aScreens[m_nCurrScreen].m_aEntries[i].m_TargetMenu) {
-					case MENUPAGE_MULTIPLAYER_MAP:
-						switch (m_SelectedMap) {
-							case 0:
-								rightText = TheText.Get("FEM_MA0");
-								break;
-							case 1:
-								rightText = TheText.Get("FEM_MA1");
-								break;
-							case 2:
-								rightText = TheText.Get("FEM_MA2");
-								break;
-							case 3:
-								rightText = TheText.Get("FEM_MA3");
-								break;
-							case 4:
-								rightText = TheText.Get("FEM_MA4");
-								break;
-							case 5:
-								rightText = TheText.Get("FEM_MA5");
-								break;
-							case 6:
-								rightText = TheText.Get("FEM_MA6");
-								break;
-							case 7:
-								rightText = TheText.Get("FEM_MA7");
-								break;
-							default:
-								break;
-						}
-						break;
-					case MENUPAGE_MULTIPLAYER_MODE:
-						switch (m_SelectedGameType) {
-							case 0:
-								rightText = TheText.Get("FEN_TY0");
-								break;
-							case 1:
-								rightText = TheText.Get("FEN_TY1");
-								break;
-							case 2:
-								rightText = TheText.Get("FEN_TY2");
-								break;
-							case 3:
-								rightText = TheText.Get("FEN_TY3");
-								break;
-							case 4:
-								rightText = TheText.Get("FEN_TY4");
-								break;
-							case 5:
-								rightText = TheText.Get("FEN_TY5");
-								break;
-							case 6:
-								rightText = TheText.Get("FEN_TY6");
-								break;
-							case 7:
-								rightText = TheText.Get("FEN_TY7");
-								break;
-							default:
-								break;
-						}
-						break;
-					default:
-						break;
-				}
+			case MENUACTION_CHANGEMENU:
 				break;
-			}
 			case MENUACTION_CTRLVIBRATION:
 				if (m_PrefsUseVibration)
 					rightText = TheText.Get("FEM_ON");
@@ -1037,12 +999,6 @@ CMenuManager::Draw()
 					break;
 				}
 				break;
-			case MENUACTION_CTRLDISPLAY:
-				if (m_DisplayControllerOnFoot)
-					rightText = TheText.Get("FEC_ONF");
-				else
-					rightText = TheText.Get("FEC_INC");
-				break;
 			case MENUACTION_FRAMESYNC:
 				rightText = TheText.Get(m_PrefsVsyncDisp ? "FEM_ON" : "FEM_OFF");
 				break;
@@ -1224,9 +1180,6 @@ CMenuManager::Draw()
 			}
 
 			// Green bar behind selected option
-#ifdef PS2_SAVE_DIALOG
-			if (!m_bRenderGameInMenu)
-#endif
 			if (i == m_nCurrOption && itemsAreSelectable) {
 				// We keep stretching, because we also stretch background image and we want that bar to be aligned with borders of background
 				CSprite2d::DrawRect(CRect(StretchX(10.0f), MENU_Y(bitAboveNextItemY),
@@ -1354,14 +1307,6 @@ CMenuManager::Draw()
 		DisplayHelperText();
 		break;
 	}
-
-	if (m_nCurrScreen == MENUPAGE_CONTROLLER_SETTINGS)
-		PrintController();
-	else if (m_nCurrScreen == MENUPAGE_SKIN_SELECT_OLD) {
-		CSprite2d::DrawRect(CRect(MENU_X_LEFT_ALIGNED(180), MENU_Y(98), MENU_X_LEFT_ALIGNED(230), MENU_Y(123)), CRGBA(255, 255, 255, FadeIn(255)));
-		CSprite2d::DrawRect(CRect(MENU_X_LEFT_ALIGNED(181), MENU_Y(99), MENU_X_LEFT_ALIGNED(229), MENU_Y(122)), CRGBA(m_PrefsPlayerRed, m_PrefsPlayerGreen, m_PrefsPlayerBlue, FadeIn(255)));
-	}
-
 }
 
 int
@@ -2009,6 +1954,10 @@ void
 CMenuManager::DrawFrontEnd()
 {
 	CFont::SetAlphaFade(255.0f);
+	CSprite2d::InitPerFrame();
+	CFont::InitPerFrame();
+	SetFrontEndRenderStates();
+	m_NoEmptyBinding = true;
 
 #ifdef PS2_LIKE_MENU
 	if (m_nCurrScreen == MENUPAGE_NONE) {
@@ -2052,63 +2001,18 @@ CMenuManager::DrawFrontEnd()
 	if (m_nCurrOption == 0 && aScreens[m_nCurrScreen].m_aEntries[0].m_Action == MENUACTION_LABEL)
 		m_nCurrOption = 1;
 
-#ifdef PS2_SAVE_DIALOG
-	if(m_bRenderGameInMenu)
-		DrawFrontEndSaveZone();
-	else
-#endif
-		DrawFrontEndNormal();
-
-	PrintErrorMessage();
-}
-
-#ifdef PS2_SAVE_DIALOG
-void
-CMenuManager::DrawFrontEndSaveZone()
-{
-	CSprite2d::InitPerFrame();
-	CFont::InitPerFrame();
-	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERNEAREST);
-
-	// Not original dimensions, have been changed to fit PC screen & PC menu layout.
-	CSprite2d::DrawRect(CRect(MENU_X_LEFT_ALIGNED(30.0f), MENU_Y(50.0f), MENU_X_RIGHT_ALIGNED(30.0f), SCREEN_SCALE_FROM_BOTTOM(50.0f)), CRGBA(0, 0, 0, 175));
+	if (m_menuTransitionProgress == 255 && m_nMenuFadeAlpha == 255)
+		bMenuChangeOngoing = false;
 
-	m_nMenuFadeAlpha = 255;
-	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSCLAMP);
-	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
-	Draw();
-
-	CFont::DrawFonts();
+	DrawBackground();
 
-	// Draw mouse
-	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
-	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSCLAMP);
-	if (m_bShowMouse) {
-		RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
-		RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
-		RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
-
-		CRect mouse(0.0f, 0.0f, MENU_X(75.0f), MENU_Y(75.0f));
-		CRect shad(MENU_X(10.0f), MENU_Y(3.0f), MENU_X(85.0f), MENU_Y(78.0f));
-
-		mouse.Translate(m_nMousePosX, m_nMousePosY);
-		shad.Translate(m_nMousePosX, m_nMousePosY);
-		if(field_518 == 4){
-			m_aFrontEndSprites[MENUSPRITE_MOUSE].Draw(shad, CRGBA(100, 100, 100, 50));
-			RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
-			m_aFrontEndSprites[MENUSPRITE_MOUSE].Draw(mouse, CRGBA(255, 255, 255, 255));
-		}else{
-			m_aFrontEndSprites[MENUSPRITE_MOUSE].Draw(shad, CRGBA(100, 100, 100, 50));
-			RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
-			m_aFrontEndSprites[MENUSPRITE_MOUSE].Draw(mouse, CRGBA(255, 255, 255, 255));
-		}
-	}
+	// TODO(Miami): Delete dis
+	PrintErrorMessage();
 }
-#endif
 
 #ifdef PS2_LIKE_MENU
 void
-CMenuManager::DrawFrontEndNormal()
+CMenuManager::DrawBackground()
 {
 	CSprite2d::InitPerFrame();
 	CFont::InitPerFrame();
@@ -2225,7 +2129,7 @@ CMenuManager::DrawFrontEndNormal()
 			DrawControllerSetupScreen();
 			break;
 		default:
-			Draw();
+			DrawStandardMenus();
 			break;
 	}
 
@@ -2300,53 +2204,17 @@ CMenuManager::DrawFrontEndNormal()
 }
 #else
 void
-CMenuManager::DrawFrontEndNormal()
+CMenuManager::DrawBackground()
 {
-	CSprite2d::InitPerFrame();
-	CFont::InitPerFrame();
-	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
+	if (!m_bSpritesLoaded)
+		return;
 
-	LoadSplash(nil);
-	
-	eMenuSprites previousSprite = MENUSPRITE_BACKGROUND;
+	SetFrontEndRenderStates();
 
-	if (m_nMenuFadeAlpha < 255) {
-		if (m_nPrevScreen == m_nCurrScreen)
-			CSprite2d::DrawRect(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(0, 0, 0, 255 - m_nMenuFadeAlpha));
-		else
-			m_aFrontEndSprites[previousSprite].Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(255, 255, 255, 255 - m_nMenuFadeAlpha));
+	if (m_menuTransitionProgress < 255) {
+		CSprite2d::DrawRect(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(0, 0, 0, 255));
 	}
 
-	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
-	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
-
-	eMenuSprites currentSprite = MENUSPRITE_BACKGROUND; // actually uninitialized
-
-	switch (m_nCurrScreen) {
-		case MENUPAGE_STATS:
-		case MENUPAGE_START_MENU:
-		case MENUPAGE_PAUSE_MENU:
-		case MENUPAGE_NEW_GAME:
-		case MENUPAGE_CHOOSE_LOAD_SLOT:
-		case MENUPAGE_CHOOSE_DELETE_SLOT:
-		case MENUPAGE_NEW_GAME_RELOAD:
-		case MENUPAGE_LOAD_SLOT_CONFIRM:
-		case MENUPAGE_DELETE_SLOT_CONFIRM:
-		case MENUPAGE_EXIT:
-		case MENUPAGE_MULTIPLAYER_MAIN:
-		case MENUPAGE_MULTIPLAYER_MAP:
-		case MENUPAGE_MULTIPLAYER_FIND_GAME:
-		case MENUPAGE_SKIN_SELECT:
-		case MENUPAGE_KEYBOARD_CONTROLS:
-		case MENUPAGE_MOUSE_CONTROLS:
-		case MENUPAGE_MULTIPLAYER_CONNECTION:
-		case MENUPAGE_MULTIPLAYER_MODE:
-		case MENUPAGE_MULTIPLAYER_CREATE:
-		case MENUPAGE_SKIN_SELECT_OLD:
-		case MENUPAGE_OPTIONS:
-			currentSprite = MENUSPRITE_BACKGROUND;
-			break;
-	}
 
 	if (m_nMenuFadeAlpha < 255) {
 
@@ -2358,6 +2226,7 @@ CMenuManager::DrawFrontEndNormal()
 		// +20 per every 33 ms (1000.f/30.f - original frame limiter fps)
 		fadeAlpha += (frameTime) * 20.f / 33.f;
 		m_nMenuFadeAlpha = fadeAlpha;
+		m_menuTransitionProgress = clamp(fadeAlpha, 0, 255);
 #else
 		static uint32 LastFade = 0;
 
@@ -2366,44 +2235,15 @@ CMenuManager::DrawFrontEndNormal()
 			LastFade = CTimer::GetTimeInMillisecondsPauseMode();
 		}
 #endif
-		
-		if (m_nMenuFadeAlpha > 255){
-			m_aFrontEndSprites[currentSprite].Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(255, 255, 255, 255));
-		} else {
-			RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
-			m_aFrontEndSprites[currentSprite].Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(255, 255, 255, m_nMenuFadeAlpha));
-		}
 	} else {
-		m_aFrontEndSprites[currentSprite].Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(255, 255, 255, 255));
-		// TODO: what is this? waiting mouse?
-		if(field_518 == 4){
-			if(m_nHoverOption == HOVEROPTION_3 || m_nHoverOption == HOVEROPTION_4 ||
-				m_nHoverOption == HOVEROPTION_5 || m_nHoverOption == HOVEROPTION_6 || m_nHoverOption == HOVEROPTION_7)
-
-				field_518 = 2;
-			else
-				field_518 = 1;
-		}
+		m_nMenuFadeAlpha = 255;
+		m_menuTransitionProgress = 255;
 	}
 
-	m_aFrontEndSprites[currentSprite].Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(255, 255, 255, 255));
+	m_aFrontEndSprites[MENUSPRITE_BACKGROUND].Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(255, 255, 255, Min(255, m_nMenuFadeAlpha)));
 
-	// GTA LOGO
-	RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
-	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
-	/*
-	if (m_nCurrScreen == MENUPAGE_START_MENU || m_nCurrScreen == MENUPAGE_PAUSE_MENU) {
-		if (CGame::frenchGame || CGame::germanGame || !CGame::nastyGame)
-			m_aFrontEndSprites[MENUSPRITE_VCLOGO].Draw(CRect(MENU_X_LEFT_ALIGNED(205.0f), MENU_Y(70.0f), MENU_X_LEFT_ALIGNED(435.0f), MENU_Y(180.0f)), CRGBA(255, 255, 255, FadeIn(255)));
-		else
-			m_aFrontEndSprites[MENUSPRITE_VCLOGO].Draw(CRect(MENU_X_LEFT_ALIGNED(225.0f), MENU_Y(40.0f), MENU_X_LEFT_ALIGNED(415.0f), MENU_Y(210.0f)), CRGBA(255, 255, 255, FadeIn(255)));
-	}
-	*/
-	m_aFrontEndSprites[MENUSPRITE_VCLOGO].Draw(CRect(SCREEN_SCALE_X(27.0f), MENU_Y(8.0f), SCREEN_SCALE_X(157.0f), MENU_Y(138.0f)), CRGBA(255, 255, 255, FadeIn(255)));
+	SetFrontEndRenderStates();
 
-	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERNEAREST);
-	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSCLAMP);
-	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
 	switch (m_nCurrScreen) {
 		case MENUPAGE_SKIN_SELECT:
 			DrawPlayerSetupScreen();
@@ -2412,34 +2252,28 @@ CMenuManager::DrawFrontEndNormal()
 			DrawControllerSetupScreen();
 			break;
 		default:
-			Draw();
+			DrawStandardMenus();
 			break;
 	}
 
 	CFont::DrawFonts();
 
-	// Draw mouse
-	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
-	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSCLAMP);
-	if (m_bShowMouse) {
-		RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
-		RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
-		RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
+	SetFrontEndRenderStates();
+
+	if (m_menuTransitionProgress == 255) {
+		m_aFrontEndSprites[MENUSPRITE_VCLOGO].Draw(CRect(MENU_X(27.0f), MENU_Y(8.0f), MENU_X(157.0f), MENU_Y(138.0f)), CRGBA(255, 255, 255, 255));
+	} else {
+		m_aFrontEndSprites[MENUSPRITE_VCLOGO].Draw(CRect(MENU_X(27.0f), MENU_Y(8.0f), MENU_X(157.0f), MENU_Y(138.0f)), CRGBA(255, 255, 255, Min(m_nMenuFadeAlpha, 255)));
+	}
 
+	if (m_bShowMouse) {
 		CRect mouse(0.0f, 0.0f, MENU_X(40.0f), MENU_Y(40.0f));
 		CRect shad(MENU_X(10.0f), MENU_Y(3.0f), MENU_X(55.0f), MENU_Y(43.0f));
 
 		mouse.Translate(m_nMousePosX, m_nMousePosY);
 		shad.Translate(m_nMousePosX, m_nMousePosY);
-		if(field_518 == 4){
-			m_aFrontEndSprites[MENUSPRITE_MOUSE].Draw(shad, CRGBA(100, 100, 100, 50));
-			RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
-			m_aFrontEndSprites[MENUSPRITE_MOUSE].Draw(mouse, CRGBA(255, 255, 255, 255));
-		}else{
-			m_aFrontEndSprites[MENUSPRITE_MOUSE].Draw(shad, CRGBA(100, 100, 100, 50));
-			RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
-			m_aFrontEndSprites[MENUSPRITE_MOUSE].Draw(mouse, CRGBA(255, 255, 255, 255));
-		}
+		m_aFrontEndSprites[MENUSPRITE_MOUSE].Draw(shad, CRGBA(100, 100, 100, 50));
+		m_aFrontEndSprites[MENUSPRITE_MOUSE].Draw(mouse, CRGBA(255, 255, 255, 255));
 	}
 }
 #endif
@@ -2971,21 +2805,9 @@ CMenuManager::LoadAllTextures()
 	if (m_bSpritesLoaded)
 		return;
 
-	CentreMousePointer();
-	DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
-	DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_STARTING, 0);
-	m_nCurrOption = 0;
-	m_PrefsRadioStation = DMAudio.GetRadioInCar();
-
-	if (DMAudio.IsMP3RadioChannelAvailable()) {
-		if (m_PrefsRadioStation > USERTRACK)
-			m_PrefsRadioStation = CGeneral::GetRandomNumber() % 10;
-	} else if (m_PrefsRadioStation > CHATTERBOX)
-		m_PrefsRadioStation = CGeneral::GetRandomNumber() % 9;
-	
-	CFileMgr::SetDir("");
-	//CFileMgr::SetDir("");
+	field_F0 = SCREEN_STRETCH_X(178.0f); // TODO(Miami)
 	CTimer::Stop();
+
 	CStreaming::MakeSpaceFor(350 * CDSTREAM_SECTOR_SIZE); // twice of it in mobile
 	CStreaming::ImGonnaUseStreamingMemory();
 	CGame::TidyUpMemory(false, true);
@@ -3008,38 +2830,29 @@ CMenuManager::LoadAllTextures()
 	CTxdStore::PopCurrentTxd();
 	CStreaming::IHaveUsedStreamingMemory();
 
+	if (!m_OnlySaveMenu) {
+		CStreaming::MakeSpaceFor(692 * CDSTREAM_SECTOR_SIZE); // twice of it in mobile
+		CStreaming::ImGonnaUseStreamingMemory();
+		CTxdStore::PushCurrentTxd();
 
-	// if ( !*(_BYTE *)(v1 + 124) )
-
-	CStreaming::MakeSpaceFor(350 * CDSTREAM_SECTOR_SIZE); // twice of it in mobile
-	CStreaming::ImGonnaUseStreamingMemory();
-	CTxdStore::PushCurrentTxd();
-
-	int frontendTxdSlot2 = CTxdStore::FindTxdSlot("frontend2");
+		int frontendTxdSlot2 = CTxdStore::FindTxdSlot("frontend2");
 
-	if (frontendTxdSlot2 == -1)
-		frontendTxdSlot2 = CTxdStore::AddTxdSlot("frontend2");
+		if (frontendTxdSlot2 == -1)
+			frontendTxdSlot2 = CTxdStore::AddTxdSlot("frontend2");
 
-	printf("LOAD frontend2\n");
-	CTxdStore::LoadTxd(frontendTxdSlot2, "MODELS/FRONTEN2.TXD");
-	CTxdStore::AddRef(frontendTxdSlot2);
-	CTxdStore::SetCurrentTxd(frontendTxdSlot2);
-
-	for (int i = 3; i < NUM_MENU_SPRITES; i++) {
-		m_aFrontEndSprites[i].SetTexture(FrontendFilenames[i][0], FrontendFilenames[i][1]);
-		m_aFrontEndSprites[i].SetAddressing(rwTEXTUREADDRESSBORDER);
-	}
-
-	CTxdStore::PopCurrentTxd();
-	CStreaming::IHaveUsedStreamingMemory();
+		printf("LOAD frontend2\n");
+		CTxdStore::LoadTxd(frontendTxdSlot2, "MODELS/FRONTEN2.TXD");
+		CTxdStore::AddRef(frontendTxdSlot2);
+		CTxdStore::SetCurrentTxd(frontendTxdSlot2);
 
+		for (int i = 3; i < NUM_MENU_SPRITES; i++) {
+			m_aFrontEndSprites[i].SetTexture(FrontendFilenames[i][0], FrontendFilenames[i][1]);
+			m_aFrontEndSprites[i].SetAddressing(rwTEXTUREADDRESSBORDER);
+		}
 
-#if 0 //MENU_MAP
-	for (int i = 0; i < ARRAY_SIZE(MapFilenames); i++) {
-		m_aMapSprites[i].SetTexture(MapFilenames[i][0], MapFilenames[i][1]);
-		m_aMapSprites[i].SetAddressing(rwTEXTUREADDRESSBORDER);
+		CTxdStore::PopCurrentTxd();
+		CStreaming::IHaveUsedStreamingMemory();
 	}
-#endif
 
 	m_bSpritesLoaded = true;
 	CTimer::Update();
@@ -3211,9 +3024,6 @@ CMenuManager::SaveSettings()
 	CFileMgr::SetDir("");
 }
 
-bool DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha);
-void DoRWStuffEndOfFrame(void);
-
 void
 CMenuManager::MessageScreen(const char *text)
 {
@@ -3247,22 +3057,6 @@ CMenuManager::MessageScreen(const char *text)
 }
 
 void
-CMenuManager::PickNewPlayerColour()
-{
-	m_PrefsPlayerRed = 0;
-	m_PrefsPlayerGreen = 0;
-	m_PrefsPlayerBlue = 0;
-	while (true) {
-		int sum = m_PrefsPlayerRed + m_PrefsPlayerGreen + m_PrefsPlayerBlue;
-		if (sum >= 100 && sum <= 650)
-			break;
-		m_PrefsPlayerRed = CGeneral::GetRandomNumber();
-		m_PrefsPlayerGreen = CGeneral::GetRandomNumber();
-		m_PrefsPlayerBlue = CGeneral::GetRandomNumber();
-	}
-}
-
-void
 CMenuManager::PrintBriefs()
 {
 	CFont::SetColor(CRGBA(235, 170, 50, FadeIn(255)));
@@ -3350,7 +3144,7 @@ CMenuManager::PrintStats()
 	// Scroll stats with mouse
 #ifdef SCROLLABLE_STATS_PAGE
 	static float scrollY = 0;
-	static uint32 lastChange = m_nScreenChangeDelayTimer;
+	static uint32 lastChange = m_LastScreenSwitch;
 	if (CPad::GetPad(0)->GetLeftMouse()) {
 		scrollY += (m_nMouseOldPosY - m_nMousePosY);
 		lastChange = CTimer::GetTimeInMillisecondsPauseMode();
@@ -3360,7 +3154,7 @@ CMenuManager::PrintStats()
 	}
 #else
 	// MENU_Y(30.0f) per second
-	float scrollY = MENU_Y(STATS_SLIDE_Y_PER_SECOND) * (CTimer::GetTimeInMillisecondsPauseMode() - m_nScreenChangeDelayTimer) / 1000.0f;
+	float scrollY = MENU_Y(STATS_SLIDE_Y_PER_SECOND) * (CTimer::GetTimeInMillisecondsPauseMode() - m_LastScreenSwitch) / 1000.0f;
 #endif
 
 	for (int row = 0; row < rowNum; ++row) {
@@ -3423,7 +3217,7 @@ CMenuManager::PrintStats()
 	// ::Draw already does that.
 	/*
 	PREPARE_MENU_HEADER
-	CFont::PrintString(MENU_X_RIGHT_ALIGNED(MENUHEADER_POS_X), SCREEN_SCALE_FROM_BOTTOM(MENUHEADER_POS_Y), TheText.Get(aScreens[m_nCurrScreen].m_ScreenName));
+	CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(MENUHEADER_POS_X), SCREEN_SCALE_FROM_BOTTOM(MENUHEADER_POS_Y), TheText.Get(aScreens[m_nCurrScreen].m_ScreenName));
 	*/
 	CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X), MENU_Y(MENU_TEXT_SIZE_Y));
 }
@@ -3431,159 +3225,86 @@ CMenuManager::PrintStats()
 void
 CMenuManager::Process(void)
 {
-	m_bMenuStateChanged = false;
-
-	if (!m_bSaveMenuActive && TheCamera.GetScreenFadeStatus() != FADE_0)
+	if (TheCamera.GetScreenFadeStatus() != FADE_0)
 		return;
 
-	m_bWantToRestart = false;
 	InitialiseChangedLanguageSettings();
 
-	// Just a hack by R* to not make game continuously resume/pause. But we it seems we can live with it.
-	if (CPad::GetPad(0)->GetEscapeJustDown())
-		RequestFrontEndStartUp();
-
-	SwitchMenuOnAndOff();
-
-	// Be able to re-open menu correctly.
 	if (m_bMenuActive) {
+		ProcessButtonPresses();
+		ProcessFileActions();
+		DMAudio.Service();
 
-		// Load frontend textures.
-		LoadAllTextures();
+		// TODO(Miami): What are the functions in here?
+	}
 
-		// Set save/delete game pages.
-		if (m_nCurrScreen == MENUPAGE_DELETING) {
-			bool SlotPopulated = false;
+	SwitchMenuOnAndOff();
+}
 
-			if (PcSaveHelper.DeleteSlot(m_nCurrSaveSlot)) {
-				PcSaveHelper.PopulateSlotInfo();
-				SlotPopulated = true;
+void
+CMenuManager::ProcessButtonPresses(void)
+{
+	// TODO(Miami)
+	// if (m_nCurrScreen == MENUPAGE_OUTRO)
+	//	return;
+
+	if (m_bWaitingForNewKeyBind) {
+		if (m_bStartWaitingForKeyBind)
+			m_bStartWaitingForKeyBind = false;
+		else {
+			pControlEdit = CPad::EditCodesForControls(pControlEdit, 1);
+			JoyButtonJustClicked = false;
+			MouseButtonJustClicked = false;
+
+			if (CPad::GetPad(0)->GetLeftMouseJustDown())
+				MouseButtonJustClicked = 1;
+			else if (CPad::GetPad(0)->GetRightMouseJustUp())
+				MouseButtonJustClicked = 3;
+			else if (CPad::GetPad(0)->GetMiddleMouseJustUp())
+				MouseButtonJustClicked = 2;
+			else if (CPad::GetPad(0)->GetMouseWheelUpJustUp())
+				MouseButtonJustClicked = 4;
+			else if (CPad::GetPad(0)->GetMouseWheelDownJustUp())
+				MouseButtonJustClicked = 5;
+			// TODO two more buttons
+
+			JoyButtonJustClicked = ControlsManager.GetJoyButtonJustDown();
+
+			int32 TypeOfControl = KEYBOARD;
+			if (JoyButtonJustClicked)
+				TypeOfControl = JOYSTICK;
+			if (MouseButtonJustClicked)
+				TypeOfControl = MOUSE;
+			if (*pControlEdit != rsNULL)
+				TypeOfControl = KEYBOARD;
+
+			if (!m_bKeyIsOK) {
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_FAIL, 0);
+				pControlEdit = nil;
+				m_bWaitingForNewKeyBind = false;
+				m_KeyPressedCode = -1;
+				m_bStartWaitingForKeyBind = false;
 			}
+			else if (!m_bKeyChangeNotProcessed) {
+				if (*pControlEdit != rsNULL || MouseButtonJustClicked || JoyButtonJustClicked)
+					CheckCodesForControls(TypeOfControl);
 
-			if (SlotPopulated) 
-				ChangeScreen(MENUPAGE_DELETE_SUCCESS, 0, true, false);
-			else
-				SaveLoadFileError_SetUpErrorScreen();
-		}
-		if (m_nCurrScreen == MENUPAGE_SAVING_IN_PROGRESS) {
-			int8 SaveSlot = PcSaveHelper.SaveSlot(m_nCurrSaveSlot);
-			PcSaveHelper.PopulateSlotInfo();
-			if (SaveSlot)
-				ChangeScreen(MENUPAGE_SAVE_SUCCESSFUL, 0, true, false);
-			else
-				SaveLoadFileError_SetUpErrorScreen();
-		}
-		if (m_nCurrScreen == MENUPAGE_LOADING_IN_PROGRESS) {
-			if (CheckSlotDataValid(m_nCurrSaveSlot)) {
-				TheCamera.m_bUseMouse3rdPerson = m_ControlMethod == CONTROL_STANDARD;
-				if (m_PrefsVsyncDisp != m_PrefsVsync)
-					m_PrefsVsync = m_PrefsVsyncDisp;
-				DMAudio.Service();
-				m_bWantToRestart = true;
-				RequestFrontEndShutDown();
-				m_bWantToLoad = true;
-				b_FoundRecentSavedGameWantToLoad = true;
-				DMAudio.SetEffectsFadeVol(0);
-				DMAudio.SetMusicFadeVol(0);
-				DMAudio.ResetTimers(CTimer::GetTimeInMilliseconds());
-			} else
-				SaveLoadFileError_SetUpErrorScreen();
-		}
-
-		ProcessButtonPresses();
-
-		// Set binding keys.
-		if (pEditString && CPad::EditString(pEditString, 0) == nil) {
-			if (*pEditString == 0)
-				strcpy(pEditString, "NoName");
-			pEditString = nil;
-			SaveSettings();
-		}
-
-		if (m_bWaitingForNewKeyBind) {
-			if (m_bStartWaitingForKeyBind)
-				m_bStartWaitingForKeyBind = false;
+				field_159 = true;
+			}
 			else {
-				pControlEdit = CPad::EditCodesForControls(pControlEdit, 1);
-				JoyButtonJustClicked = false;
-				MouseButtonJustClicked = false;
-
-				if (CPad::GetPad(0)->GetLeftMouseJustDown())
-					MouseButtonJustClicked = 1;
-				else if (CPad::GetPad(0)->GetRightMouseJustUp())
-					MouseButtonJustClicked = 3;
-				else if (CPad::GetPad(0)->GetMiddleMouseJustUp())
-					MouseButtonJustClicked = 2;
-				else if (CPad::GetPad(0)->GetMouseWheelUpJustUp())
-					MouseButtonJustClicked = 4;
-				else if (CPad::GetPad(0)->GetMouseWheelDownJustUp())
-					MouseButtonJustClicked = 5;
-				// TODO two more buttons
-
-				JoyButtonJustClicked = ControlsManager.GetJoyButtonJustDown();
-
-				int32 TypeOfControl = KEYBOARD;
-				if (JoyButtonJustClicked)
-					TypeOfControl = JOYSTICK;
-				if (MouseButtonJustClicked)
-					TypeOfControl = MOUSE;
-				if (*pControlEdit != rsNULL)
-					TypeOfControl = KEYBOARD;
-
-				if (!m_bKeyIsOK) {
-					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_FAIL, 0);
-					pControlEdit = nil;
-					m_bWaitingForNewKeyBind = false;
-					m_KeyPressedCode = -1;
-					m_bStartWaitingForKeyBind = false;
-				} else if (!m_bKeyChangeNotProcessed) {
-					if (*pControlEdit != rsNULL || MouseButtonJustClicked || JoyButtonJustClicked)
-						CheckCodesForControls(TypeOfControl);
-
-					field_535 = true;
-				} else {
-					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SUCCESS, 0);
-					for (int i = 0; i < 4; i++)
-						ControlsManager.ClearSettingsAssociatedWithAction((e_ControllerAction)m_CurrCntrlAction, (eControllerType)i);
-					m_bKeyIsOK = false;
-					m_bKeyChangeNotProcessed = false;
-					pControlEdit = nil;
-					m_bWaitingForNewKeyBind = false;
-					m_KeyPressedCode = -1;
-					m_bStartWaitingForKeyBind = false;
-				}
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SUCCESS, 0);
+				for (int i = 0; i < 4; i++)
+					ControlsManager.ClearSettingsAssociatedWithAction((e_ControllerAction)m_CurrCntrlAction, (eControllerType)i);
+				m_bKeyIsOK = false;
+				m_bKeyChangeNotProcessed = false;
+				pControlEdit = nil;
+				m_bWaitingForNewKeyBind = false;
+				m_KeyPressedCode = -1;
+				m_bStartWaitingForKeyBind = false;
 			}
 		}
-
-		if ((m_nCurrScreen == MENUPAGE_NO_MEMORY_CARD || m_nCurrScreen == MENUPAGE_PS2_LOAD_FAILED) && CTimer::GetTimeInMillisecondsPauseMode() > field_558) {
-			m_nCurrScreen = m_nPrevScreen;
-			m_nCurrOption = 0;
-		}
-
-		// Reset pad shaking.
-		if (TimeToStopPadShaking && TimeToStopPadShaking < CTimer::GetTimeInMillisecondsPauseMode()) {
-			CPad::StopPadsShaking();
-			TimeToStopPadShaking = 0;
-		}
-
-	} else {
-		UnloadTextures();
-		m_bRenderGameInMenu = false;
-		// byte_5F33E4 = 1;	// unused
-		ChangeScreen(MENUPAGE_NONE, 0, false, false);
-		pEditString = nil;
-		m_bWaitingForNewKeyBind = false;
 	}
 
-	if (!m_bWantToRestart) {
-		if (m_bGameNotLoaded)
-			DMAudio.Service();
-	}
-}
-
-void
-CMenuManager::ProcessButtonPresses(void)
-{
 	if (pEditString || pControlEdit)
 		return;
 
@@ -3627,7 +3348,7 @@ CMenuManager::ProcessButtonPresses(void)
 			optionSelected = true;
 		}
 #endif
-		if (CPad::GetPad(0)->GetBackspaceJustDown() && m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS && !field_535) {
+		if (CPad::GetPad(0)->GetBackspaceJustDown() && m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS && !field_159) {
 			if (m_nCurrExLayer == HOVEROPTION_LIST) {
 				m_nHoverOption = HOVEROPTION_NOT_HOVERING;
 				m_bWaitingForNewKeyBind = true;
@@ -3636,7 +3357,7 @@ CMenuManager::ProcessButtonPresses(void)
 				pControlEdit = &m_KeyPressedCode;
 			}
 		} else {
-			field_535 = false;
+			field_159 = false;
 		}
 
 		static uint32 lastTimeClickedScrollButton = 0;
@@ -4452,30 +4173,6 @@ CMenuManager::ProcessButtonPresses(void)
 				case MENUACTION_RESUME_FROM_SAVEZONE:
 					RequestFrontEndShutDown();
 					break;
-				case MENUACTION_MPMAP_LIBERTY:
-				case MENUACTION_MPMAP_REDLIGHT:
-				case MENUACTION_MPMAP_CHINATOWN:
-				case MENUACTION_MPMAP_TOWER:
-				case MENUACTION_MPMAP_SEWER:
-				case MENUACTION_MPMAP_INDUSTPARK:
-				case MENUACTION_MPMAP_DOCKS:
-				case MENUACTION_MPMAP_STAUNTON:
-					m_SelectedMap = option - MENUACTION_MPMAP_LIBERTY;
-					SaveSettings();
-					ChangeScreen(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu, 0, true, true);
-					break;
-				case MENUACTION_MPMAP_DEATHMATCH1:
-				case MENUACTION_MPMAP_DEATHMATCH2:
-				case MENUACTION_MPMAP_TEAMDEATH1:
-				case MENUACTION_MPMAP_TEAMDEATH2:
-				case MENUACTION_MPMAP_STASH:
-				case MENUACTION_MPMAP_CAPTURE:
-				case MENUACTION_MPMAP_RATRACE:
-				case MENUACTION_MPMAP_DOMINATION:
-					m_SelectedGameType = option - MENUACTION_MPMAP_DEATHMATCH1;
-					SaveSettings();
-					ChangeScreen(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu, 0, true, true);
-					break;
 				case MENUACTION_REDEFCTRL:
 					ChangeScreen(MENUPAGE_KEYBOARD_CONTROLS, 0, true, true);
 					m_nSelectedListRow = 0;
@@ -4509,7 +4206,13 @@ CMenuManager::ProcessButtonPresses(void)
 					if (m_nDisplayVideoMode != m_nPrefsVideoMode) {
 						m_nPrefsVideoMode = m_nDisplayVideoMode;
 						_psSelectScreenVM(m_nPrefsVideoMode);
-						SetHelperText(0);
+						SetHelperText(0); // TODO(Miami): Remove that
+						DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
+						DMAudio.Service();
+						CentreMousePointer();
+						m_bShowMouse = true;
+						// m_nCurrOption = 5; // Why?
+						bOptionHighlightTransitionBlend = 0;
 						SaveSettings();
 					}
 					break;
@@ -4651,7 +4354,7 @@ CMenuManager::ProcessButtonPresses(void)
 #else
 		if (m_nCurrScreen == MENUPAGE_PAUSE_MENU) {
 #endif
-			if (!m_bGameNotLoaded && !m_bMenuStateChanged) {
+			if (!m_bGameNotLoaded) {
 				if (m_PrefsVsyncDisp != m_PrefsVsync) {
 					m_PrefsVsync = m_PrefsVsyncDisp;
 				}
@@ -4858,11 +4561,6 @@ CMenuManager::ProcessOnOffMenuOptions()
 	switch (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action) {
 	case MENUACTION_CTRLVIBRATION:
 		m_PrefsUseVibration = !m_PrefsUseVibration;
-
-		if (m_PrefsUseVibration) {
-			CPad::GetPad(0)->StartShake(350, 150);
-			TimeToStopPadShaking = CTimer::GetTimeInMillisecondsPauseMode() + 500;
-		}
 		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SUCCESS, 0);
 		break;
 	case MENUACTION_CTRLCONFIG:
@@ -4871,10 +4569,6 @@ CMenuManager::ProcessOnOffMenuOptions()
 			CPad::GetPad(0)->Mode = 0;
 		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SUCCESS, 0);
 		break;
-	case MENUACTION_CTRLDISPLAY:
-		m_DisplayControllerOnFoot = !m_DisplayControllerOnFoot;
-		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SUCCESS, 0);
-		break;
 	case MENUACTION_FRAMESYNC:
 		m_PrefsVsyncDisp = !m_PrefsVsyncDisp;
 		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SUCCESS, 0);
@@ -4926,11 +4620,6 @@ CMenuManager::ProcessOnOffMenuOptions()
 		gbShowCollisionPolys = !gbShowCollisionPolys;
 		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SUCCESS, 0);
 		break;
-	case MENUACTION_MP_PLAYERCOLOR:
-		PickNewPlayerColour();
-		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SUCCESS, 0);
-		SaveSettings();
-		break;
 	case MENUACTION_SHOWHEADBOB:
 		TheCamera.m_bHeadBob = !TheCamera.m_bHeadBob;
 		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SUCCESS, 0);
@@ -4959,7 +4648,6 @@ void
 CMenuManager::RequestFrontEndShutDown()
 {
 	m_bShutDownFrontEndRequested = true;
-	DMAudio.ChangeMusicMode(MUSICMODE_GAME);
 }
 
 void
@@ -5008,13 +4696,6 @@ CMenuManager::SetHelperText(int text)
 	m_nHelperTextAlpha = 300;
 }
 
-void
-CMenuManager::ShutdownJustMenu()
-{
-	m_bMenuActive = false;
-	CTimer::EndUserPause();
-}
-
 float
 CMenuManager::StretchX(float x)
 {
@@ -5035,80 +4716,130 @@ float CMenuManager::StretchY(float y)
 }
 
 void
+CMenuManager::ProcessFileActions()
+{
+	if (m_nCurrScreen == MENUPAGE_DELETING) {
+		bool SlotPopulated = false;
+
+		if (PcSaveHelper.DeleteSlot(m_nCurrSaveSlot)) {
+			PcSaveHelper.PopulateSlotInfo();
+			SlotPopulated = true;
+		}
+
+		if (SlotPopulated)
+			ChangeScreen(MENUPAGE_DELETE_SUCCESS, 0, true, false);
+		else
+			SaveLoadFileError_SetUpErrorScreen();
+	}
+	if (m_nCurrScreen == MENUPAGE_SAVING_IN_PROGRESS) {
+		int8 SaveSlot = PcSaveHelper.SaveSlot(m_nCurrSaveSlot);
+		PcSaveHelper.PopulateSlotInfo();
+		if (SaveSlot)
+			ChangeScreen(MENUPAGE_SAVE_SUCCESSFUL, 0, true, false);
+		else
+			SaveLoadFileError_SetUpErrorScreen();
+	}
+	if (m_nCurrScreen == MENUPAGE_LOADING_IN_PROGRESS) {
+		if (CheckSlotDataValid(m_nCurrSaveSlot)) {
+			DoSettingsBeforeStartingAGame();
+			m_bWantToLoad = true;
+		}
+		else
+			SaveLoadFileError_SetUpErrorScreen();
+	}
+}
+
+void
 CMenuManager::SwitchMenuOnAndOff()
 {
-	bool menuWasActive = GetIsMenuActive();
+	if (!TheCamera.m_WideScreenOn) {
+
+		// Reminder: You need REGISTER_START_BUTTON defined to make it work.
+		if ((CPad::GetPad(0)->GetStartJustDown() || CPad::GetPad(0)->GetEscapeJustDown())
+			&& (!m_bMenuActive || m_nCurrScreen == MENUPAGE_PAUSE_MENU || m_nCurrScreen == MENUPAGE_CHOOSE_SAVE_SLOT/* || m_nCurrScreen == 20 */) // TODO(Miami): What is screen 20?
+			|| m_bShutDownFrontEndRequested || m_bStartUpFrontEndRequested) {
+
+			if (m_nCurrScreen != MENUPAGE_LOADING_IN_PROGRESS) {
+				DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+				DoRWStuffEndOfFrame();
+				DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+				DoRWStuffEndOfFrame();
+			}
 
-	// Reminder: You need REGISTER_START_BUTTON defined to make it work.
-	if (CPad::GetPad(0)->GetStartJustDown() 
-#ifdef FIX_BUGS
-		&& !m_bGameNotLoaded
-#endif
-		|| m_bShutDownFrontEndRequested || m_bStartUpFrontEndRequested) {
+			if (m_bShutDownFrontEndRequested)
+				m_bMenuActive = false;
+			else if (m_bStartUpFrontEndRequested)
+				m_bMenuActive = true;
+			else
+				m_bMenuActive = !m_bMenuActive;
 
-		m_bMenuActive = !m_bMenuActive;
+			if (m_bMenuActive) {
+				Initialise();
+				LoadAllTextures();
 
-		if (m_bShutDownFrontEndRequested)
-			m_bMenuActive = false;
-		if (m_bStartUpFrontEndRequested)
-			m_bMenuActive = true;
+				// TODO(Miami): DxInput??
+			} else {
+				if (CMBlur::BlurOn)
+					CMBlur::MotionBlurOpen(Scene.camera);
+				else
+					CMBlur::MotionBlurClose();
+				DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+				DoRWStuffEndOfFrame();
+				DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+				DoRWStuffEndOfFrame();
+
+				// TODO(Miami): DxInput??
 
-		if (m_bMenuActive) {
-			CTimer::StartUserPause();
-		} else {
 #ifdef PS2_LIKE_MENU
-			bottomBarActive = false;
-#endif
-#ifdef FIX_BUGS
-			ThingsToDoBeforeLeavingPage();
+				bottomBarActive = false;
 #endif
-			ShutdownJustMenu();
-			SaveSettings();
-			m_bStartUpFrontEndRequested = false;
-			pControlEdit = nil;
-			m_bShutDownFrontEndRequested = false;
-			DisplayComboButtonErrMsg = false;
+
+				m_StatsScrollSpeed = 150.0f;
+				SaveSettings();
+				pControlEdit = nil;
+				pEditString = nil;
+				DisplayComboButtonErrMsg = false;
+				m_bShutDownFrontEndRequested = false;
+				m_bStartUpFrontEndRequested = false;
+				m_bWaitingForNewKeyBind = false;
 
 #ifdef REGISTER_START_BUTTON
-			int16 start1 = CPad::GetPad(0)->PCTempJoyState.Start, start2 = CPad::GetPad(0)->PCTempKeyState.Start,
-				start3 = CPad::GetPad(0)->OldState.Start, start4 = CPad::GetPad(0)->NewState.Start;
+				int16 start1 = CPad::GetPad(0)->PCTempJoyState.Start, start2 = CPad::GetPad(0)->PCTempKeyState.Start,
+					start3 = CPad::GetPad(0)->OldState.Start, start4 = CPad::GetPad(0)->NewState.Start;
 #endif
-			CPad::GetPad(0)->Clear(false);
-			CPad::GetPad(1)->Clear(false);
+				CPad::GetPad(0)->Clear(false);
+				CPad::GetPad(1)->Clear(false);
 #ifdef REGISTER_START_BUTTON
-			CPad::GetPad(0)->PCTempJoyState.Start = start1;
-			CPad::GetPad(0)->PCTempKeyState.Start = start2;
-			CPad::GetPad(0)->OldState.Start = start3;
-			CPad::GetPad(0)->NewState.Start = start4;
+				CPad::GetPad(0)->PCTempJoyState.Start = start1;
+				CPad::GetPad(0)->PCTempKeyState.Start = start2;
+				CPad::GetPad(0)->OldState.Start = start3;
+				CPad::GetPad(0)->NewState.Start = start4;
 #endif
-			m_nCurrScreen = MENUPAGE_NONE;
+				UnloadTextures();
+				CTimer::EndUserPause();
+				CTimer::Update();
+				m_OnlySaveMenu = false;
+			}
 		}
 	}
 
 	// Just entered the save/safe zone
-	if (m_bSaveMenuActive && !m_bQuitGameNoCD) {
-		m_bSaveMenuActive = false;
+	if (m_bActivateSaveMenu) {
+		DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+		DoRWStuffEndOfFrame();
+		DoRWStuffStartOfFrame(0, 0, 0, 0, 0, 0, 255);
+		DoRWStuffEndOfFrame();
+		m_bActivateSaveMenu = false;
 		m_bMenuActive = true;
-		CTimer::StartUserPause();
-#ifdef PS2_SAVE_DIALOG
-		m_nCurrScreen = MENUPAGE_SAVE;
-		m_bRenderGameInMenu = true;
-#else
+		m_OnlySaveMenu = true;
+
+		// TODO(Miami): DxInput??
+
+		Initialise();
+		LoadAllTextures();
 		m_nCurrScreen = MENUPAGE_CHOOSE_SAVE_SLOT;
-#endif
-		PcSaveHelper.PopulateSlotInfo();
 		m_nCurrOption = 0;
 	}
-/*	// PS2 leftover
-	if (m_nCurrScreen != MENUPAGE_SOUND_SETTINGS && gMusicPlaying)
-	{
-		DMAudio.StopFrontEndTrack();
-		OutputDebugString("FRONTEND AUDIO TRACK STOPPED");
-		gMusicPlaying = 0;
-	}
-*/
-	if (m_bMenuActive != menuWasActive)
-		m_bMenuStateChanged = true;
 
 	m_bStartUpFrontEndRequested = false;
 	m_bShutDownFrontEndRequested = false;
@@ -5117,25 +4848,31 @@ CMenuManager::SwitchMenuOnAndOff()
 void
 CMenuManager::UnloadTextures()
 {
-	if (!m_bSpritesLoaded)
-		return;
+	if (m_nCurrScreen == MENUPAGE_SOUND_SETTINGS)
+		DMAudio.StopFrontEndTrack();
 
-	printf("REMOVE frontend\n");
-	for (int i = 0; i < ARRAY_SIZE(FrontendFilenames); ++i)
-		m_aFrontEndSprites[i].Delete();
+	DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_STARTING, 0);
+	DMAudio.ChangeMusicMode(MUSICMODE_GAME);
+	if (m_bSpritesLoaded) {
+		printf("REMOVE frontend\n");
+		int frontend = CTxdStore::FindTxdSlot("frontend1");
+		for (int i = 0; i < 3; ++i)
+			m_aFrontEndSprites[i].Delete();
 
-	int frontend = CTxdStore::FindTxdSlot("frontend1");
-	CTxdStore::RemoveTxd(frontend);
+		CTxdStore::RemoveTxd(frontend);
 
-	int frontend2 = CTxdStore::FindTxdSlot("frontend2");
-	CTxdStore::RemoveTxd(frontend2);
+		if (!m_OnlySaveMenu) {
+			int frontend2 = CTxdStore::FindTxdSlot("frontend2");
+			for (int i = 3; i < NUM_MENU_SPRITES; ++i)
+				m_aFrontEndSprites[i].Delete();
 
-#ifdef false //MENU_MAP
-	for (int i = 0; i < ARRAY_SIZE(MapFilenames); ++i)
-		m_aMapSprites[i].Delete();
-#endif
+			CTxdStore::RemoveTxd(frontend2);
+		}
 
-	m_bSpritesLoaded = false;
+		m_bSpritesLoaded = false;
+	}
+	m_OnlySaveMenu = false;
+	// TODO(Miami): Place name thing
 }
 
 void
@@ -5166,278 +4903,53 @@ CMenuManager::WaitForUserCD()
 	}
 }
 
-void
-CMenuManager::PrintController(void)
-{
-	// FIX: Originally this function doesn't have StretchX/Y, everything had constant pixel size (due to screen was abandoned early?)
-	//		Also texts and their alignment were very bad, so I tried to make them readable (commented out the original code, and marked the ones I added with X)
-
-	// sorry!
-
-	/*
-	m_aFrontEndSprites[FE_CONTROLLERSH].Draw(MENU_X_LEFT_ALIGNED(160.0f), MENU_Y(160.0f), MENU_X(240.0f), MENU_Y(180.0f), CRGBA(0, 0, 0, 255));
-	m_aFrontEndSprites[FE_CONTROLLER].Draw(MENU_X_LEFT_ALIGNED(160.0f), MENU_Y(160.0f), MENU_X(235.2f), MENU_Y(175.2f), CRGBA(255, 255, 255, 255));
-	if (m_DisplayControllerOnFoot) {
-		if (CTimer::GetTimeInMillisecondsPauseMode() & 0x400)
-			m_aFrontEndSprites[FE_ARROWS1].Draw(MENU_X_LEFT_ALIGNED(160.0f), MENU_Y(160.0f), MENU_X(235.2f), MENU_Y(175.2f), CRGBA(255, 255, 255, 255));
-		else
-			m_aFrontEndSprites[FE_ARROWS3].Draw(MENU_X_LEFT_ALIGNED(160.0f), MENU_Y(160.0f), MENU_X(235.2f), MENU_Y(175.2f), CRGBA(255, 255, 255, 255));
-	} else {
-		if (CTimer::GetTimeInMillisecondsPauseMode() & 0x400)
-			m_aFrontEndSprites[FE_ARROWS2].Draw(MENU_X_LEFT_ALIGNED(160.0f), MENU_Y(160.0f), MENU_X(235.2f), MENU_Y(175.2f), CRGBA(255, 255, 255, 255));
-		else
-			m_aFrontEndSprites[FE_ARROWS4].Draw(MENU_X_LEFT_ALIGNED(160.0f), MENU_Y(160.0f), MENU_X(235.2f), MENU_Y(175.2f), CRGBA(255, 255, 255, 255));
-	}
-	*/
-
-	CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));  // X
-
-	// CFont::SetScale(0.4f, 0.4f);
-	CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE), MENU_Y(SMALLESTTEXT_Y_SCALE)); // X
-
-	// CFont::SetColor(CRGBA(128, 128, 128, FadeIn(255)));
-	CFont::SetDropColor(CRGBA(0, 0, 0, FadeIn(255))); // X
-	CFont::SetDropShadowPosition(1); // X
-	CFont::SetColor(CRGBA(255, 255, 255, FadeIn(255))); // X
-
-	if (m_DisplayControllerOnFoot) {
-		switch (CPad::GetPad(0)->Mode) {
-			case 0:
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(210.0f), MENU_Y(146.0f), TheText.Get("FEC_CWL"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(185.0f), TheText.Get("FEC_LOF"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(225.0f), TheText.Get("FEC_MOV"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(257.0f), TheText.Get("FEC_MOV"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(263.0f), MENU_Y(301.0f), TheText.Get("FEC_CAM"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(290.0f), MENU_Y(288.0f), TheText.Get("FEC_PAU"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(344.0f), MENU_Y(146.0f), TheText.Get("FEC_CWR"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(185.0f), TheText.Get("FEC_TAR"));
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(304.0f), MENU_Y(178.0f), TheText.Get("FEC_JUM"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(212.0f), TheText.Get("FEC_ENV"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(225.0f), TheText.Get("FEC_ATT"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(238.0f), TheText.Get("FEC_RUN"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(254.0f), TheText.Get("FEC_FPC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(269.0f), TheText.Get("FEC_LB3"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(282.0f), TheText.Get("FEC_R3"));
-				break;
-			case 1:
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(210.0f), MENU_Y(146.0f), TheText.Get("FEC_CWL"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(185.0f), TheText.Get("FEC_LOF"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(225.0f), TheText.Get("FEC_CAM"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(257.0f), TheText.Get("FEC_MOV"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(263.0f), MENU_Y(301.0f), TheText.Get("FEC_NA"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(290.0f), MENU_Y(288.0f), TheText.Get("FEC_PAU"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(344.0f), MENU_Y(146.0f), TheText.Get("FEC_CWR"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(185.0f), TheText.Get("FEC_TAR"));
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(304.0f), MENU_Y(178.0f), TheText.Get("FEC_JUM"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(212.0f), TheText.Get("FEC_ENV"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(225.0f), TheText.Get("FEC_ATT"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(238.0f), TheText.Get("FEC_RUN"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(254.0f), TheText.Get("FEC_FPC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(269.0f), TheText.Get("FEC_LB3"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(282.0f), TheText.Get("FEC_R3"));
-				break;
-			case 2:
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(210.0f), MENU_Y(146.0f), TheText.Get("FEC_CWL"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(185.0f), TheText.Get("FEC_ENV"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(225.0f), TheText.Get("FEC_MOV"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(257.0f), TheText.Get("FEC_MOV"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(263.0f), MENU_Y(301.0f), TheText.Get("FEC_CAM"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(290.0f), MENU_Y(288.0f), TheText.Get("FEC_PAU"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(344.0f), MENU_Y(146.0f), TheText.Get("FEC_CWR"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(185.0f), TheText.Get("FEC_TAR"));
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(304.0f), MENU_Y(178.0f), TheText.Get("FEC_JUM"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(212.0f), TheText.Get("FEC_LOF"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(225.0f), TheText.Get("FEC_RUN"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(238.0f), TheText.Get("FEC_ATT"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(254.0f), TheText.Get("FEC_FPC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(269.0f), TheText.Get("FEC_LB3"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(282.0f), TheText.Get("FEC_R3"));
-				break;
-			case 3:
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(210.0f), MENU_Y(146.0f), TheText.Get("FEC_CWL"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(185.0f), TheText.Get("FEC_TAR"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(225.0f), TheText.Get("FEC_NA"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(257.0f), TheText.Get("FEC_MOV"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(263.0f), MENU_Y(301.0f), TheText.Get("FEC_CAM"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(290.0f), MENU_Y(288.0f), TheText.Get("FEC_PAU"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(344.0f), MENU_Y(146.0f), TheText.Get("FEC_CWR"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(185.0f), TheText.Get("FEC_TAR"));
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(304.0f), MENU_Y(178.0f), TheText.Get("FEC_JUM"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(212.0f), TheText.Get("FEC_LOF"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(225.0f), TheText.Get("FEC_RUN"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(238.0f), TheText.Get("FEC_ATT"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(254.0f), TheText.Get("FEC_FPC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(269.0f), TheText.Get("FEC_LB3"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(282.0f), TheText.Get("FEC_R3"));
-				break;
-			default:
-				return;
-		}
-	} else {
-		switch (CPad::GetPad(0)->Mode) {
-			case 0:
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(210.0f), MENU_Y(146.0f), TheText.Get("FEC_LL"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(185.0f), TheText.Get("FEC_RSC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(225.0f), TheText.Get("FEC_VES"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(257.0f), TheText.Get("FEC_VES"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(263.0f), MENU_Y(301.0f), TheText.Get("FEC_HO3"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(290.0f), MENU_Y(288.0f), TheText.Get("FEC_CAM"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(344.0f), MENU_Y(146.0f), TheText.Get("FEC_PAU"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(185.0f), TheText.Get("FEC_LB"));
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(304.0f), MENU_Y(178.0f), TheText.Get("FEC_LR"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(212.0f), TheText.Get("FEC_HAB"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(225.0f), TheText.Get("FEC_BRA"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(238.0f), TheText.Get("FEC_EXV"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(254.0f), TheText.Get("FEC_CAW"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(269.0f), TheText.Get("FEC_ACC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(282.0f), TheText.Get("FEC_TUC"));
-				// FIX: Coordinates of this line is undefined in PC...
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(304.0f), TheText.Get("FEC_SM3"));
-				break;
-			case 1:
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(210.0f), MENU_Y(146.0f), TheText.Get("FEC_LL"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(185.0f), TheText.Get("FEC_HOR"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(225.0f), TheText.Get("FEC_CAM"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(257.0f), TheText.Get("FEC_VES"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(263.0f), MENU_Y(301.0f), TheText.Get("FEC_NA"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(290.0f), MENU_Y(288.0f), TheText.Get("FEC_RSC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(344.0f), MENU_Y(146.0f), TheText.Get("FEC_PAU"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(185.0f), TheText.Get("FEC_LB"));
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(304.0f), MENU_Y(178.0f), TheText.Get("FEC_LR"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(212.0f), TheText.Get("FEC_HAB"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(225.0f), TheText.Get("FEC_BRA"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(238.0f), TheText.Get("FEC_EXV"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(254.0f), TheText.Get("FEC_CAW"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(269.0f), TheText.Get("FEC_ACC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(282.0f), TheText.Get("FEC_TUC"));
-				// FIX: Coordinates of this line is undefined in PC...
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(304.0f), TheText.Get("FEC_SM3"));
-				break;
-			case 2:
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(210.0f), MENU_Y(146.0f), TheText.Get("FEC_LL"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(185.0f), TheText.Get("FEC_EXV"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(225.0f), TheText.Get("FEC_VES"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(257.0f), TheText.Get("FEC_VES"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(263.0f), MENU_Y(301.0f), TheText.Get("FEC_RS3"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(290.0f), MENU_Y(288.0f), TheText.Get("FEC_CAM"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(344.0f), MENU_Y(146.0f), TheText.Get("FEC_PAU"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(185.0f), TheText.Get("FEC_LB"));
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(304.0f), MENU_Y(178.0f), TheText.Get("FEC_LR"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(212.0f), TheText.Get("FEC_HOR"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(225.0f), TheText.Get("FEC_BRA"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(238.0f), TheText.Get("FEC_HAB"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(254.0f), TheText.Get("FEC_CAW"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(269.0f), TheText.Get("FEC_ACC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(282.0f), TheText.Get("FEC_TUC"));
-				// FIX: Coordinates of this line is undefined in PC...
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(304.0f), TheText.Get("FEC_SM3"));
-				break;
-			case 3:
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(210.0f), MENU_Y(146.0f), TheText.Get("FEC_LL"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(185.0f), TheText.Get("FEC_HAB"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(225.0f), TheText.Get("FEC_TUC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(156.0f), MENU_Y(257.0f), TheText.Get("FEC_VES"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(263.0f), MENU_Y(301.0f), TheText.Get("FEC_HO3"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(290.0f), MENU_Y(288.0f), TheText.Get("FEC_CAM"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(344.0f), MENU_Y(146.0f), TheText.Get("FEC_PAU"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(185.0f), TheText.Get("FEC_LB"));
-				CFont::SetRightJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(304.0f), MENU_Y(178.0f), TheText.Get("FEC_LR"));
-				CFont::SetJustifyOn(); // X
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(212.0f), TheText.Get("FEC_CAW"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(225.0f), TheText.Get("FEC_SMT"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(238.0f), TheText.Get("FEC_EXV"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(254.0f), TheText.Get("FEC_RSC"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(269.0f), TheText.Get("FEC_NA"));
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(282.0f), TheText.Get("FEC_ACC"));
-				// FIX: Coordinates of this line is undefined in PC...
-				CFont::PrintString(MENU_X_LEFT_ALIGNED(398.0f), MENU_Y(304.0f), TheText.Get("FEC_BRA"));
-				break;
-			default:
-				return;
-		}
-	}
-
-	CFont::SetDropShadowPosition(0); // X
-}
-
 #ifdef MENU_MAP
 
 #define ZOOM(x, y, in) \
 	do { \
-		if(fMapSize > SCREEN_HEIGHT * 3.0f && in) \
+		if(m_fMapSize > SCREEN_HEIGHT * 3.0f && in) \
 			break; \
 		float z2 = in? 1.1f : 1.f/1.1f; \
-		fMapCenterX += (x - fMapCenterX) * (1.0f - z2); \
-		fMapCenterY += (y - fMapCenterY) * (1.0f - z2); \
+		m_fMapCenterX += (x - m_fMapCenterX) * (1.0f - z2); \
+		m_fMapCenterY += (y - m_fMapCenterY) * (1.0f - z2); \
 		\
-		if (fMapSize < SCREEN_HEIGHT / 2 && !in) \
+		if (m_fMapSize < SCREEN_HEIGHT / 2 && !in) \
 			break; \
 		\
-		fMapSize *= z2; \
+		m_fMapSize *= z2; \
 	} while(0) \
 
 void
 CMenuManager::PrintMap(void)
 {
 	CFont::SetJustifyOn();
-	bMenuMapActive = true;
+	m_bMenuMapActive = true;
 	CRadar::InitFrontEndMap();
 
 	// Just entered to map
 	if (!bMapLoaded) {
-		fMapSize = SCREEN_HEIGHT * 2.0f;
-		fMapCenterX = 0.0f;
-		fMapCenterY = 0.0f;
+		m_fMapSize = SCREEN_HEIGHT * 2.0f;
+		m_fMapCenterX = 0.0f;
+		m_fMapCenterY = 0.0f;
 		CVector2D radarSpacePlayer;
 		CVector2D screenSpacePlayer;
 		CRadar::TransformRealWorldPointToRadarSpace(radarSpacePlayer, CVector2D(FindPlayerCoors()));
 		CRadar::TransformRadarPointToScreenSpace(screenSpacePlayer, radarSpacePlayer);
 
-		fMapCenterX = (-screenSpacePlayer.x) + SCREEN_WIDTH / 2;
-		fMapCenterY = (-screenSpacePlayer.y) + SCREEN_HEIGHT / 2;
+		m_fMapCenterX = (-screenSpacePlayer.x) + SCREEN_WIDTH / 2;
+		m_fMapCenterY = (-screenSpacePlayer.y) + SCREEN_HEIGHT / 2;
 		bMapMouseShownOnce = false;
 		bMapLoaded = true;
 
 		// Let's wait for a frame to not toggle the waypoint
 		if (CPad::GetPad(0)->NewState.Cross) {
-			bMenuMapActive = false;
+			m_bMenuMapActive = false;
 			return;
 		}
 	}
 
-	// Because fMapSize is half of the map length, and map consists of 3x3 tiles.
-	float halfTile = fMapSize / 3.0f;
+	// Because m_fMapSize is half of the map length, and map consists of 3x3 tiles.
+	float halfTile = m_fMapSize / 3.0f;
 
 	// Darken background a bit
 	CSprite2d::DrawRect(CRect(0, 0,
@@ -5446,49 +4958,49 @@ CMenuManager::PrintMap(void)
 
 	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
 
-	if (SCREEN_WIDTH >= fMapCenterX - fMapSize || SCREEN_HEIGHT >= fMapCenterY - fMapSize) {
-		m_aFrontEndSprites[MENUSPRITE_MAPTOP01].Draw(CRect(fMapCenterX - fMapSize, fMapCenterY - fMapSize,
-			fMapCenterX - halfTile, fMapCenterY - halfTile), CRGBA(255, 255, 255, FadeIn(255)));
+	if (SCREEN_WIDTH >= m_fMapCenterX - m_fMapSize || SCREEN_HEIGHT >= m_fMapCenterY - m_fMapSize) {
+		m_aFrontEndSprites[MENUSPRITE_MAPTOP01].Draw(CRect(m_fMapCenterX - m_fMapSize, m_fMapCenterY - m_fMapSize,
+			m_fMapCenterX - halfTile, m_fMapCenterY - halfTile), CRGBA(255, 255, 255, FadeIn(255)));
 	}
 
-	if (SCREEN_WIDTH >= fMapCenterX - halfTile || SCREEN_HEIGHT >= fMapCenterY - fMapSize) {
-		m_aFrontEndSprites[MENUSPRITE_MAPTOP02].Draw(CRect(fMapCenterX - halfTile, fMapCenterY - fMapSize,
-			fMapCenterX + halfTile, fMapCenterY - halfTile), CRGBA(255, 255, 255, FadeIn(255)));
+	if (SCREEN_WIDTH >= m_fMapCenterX - halfTile || SCREEN_HEIGHT >= m_fMapCenterY - m_fMapSize) {
+		m_aFrontEndSprites[MENUSPRITE_MAPTOP02].Draw(CRect(m_fMapCenterX - halfTile, m_fMapCenterY - m_fMapSize,
+			m_fMapCenterX + halfTile, m_fMapCenterY - halfTile), CRGBA(255, 255, 255, FadeIn(255)));
 	}
 
-	if (SCREEN_WIDTH >= fMapCenterX + halfTile || SCREEN_HEIGHT >= fMapCenterY - fMapSize) {
-		m_aFrontEndSprites[MENUSPRITE_MAPTOP03].Draw(CRect(fMapCenterX + halfTile, fMapCenterY - fMapSize,
-			fMapCenterX + fMapSize, fMapCenterY - halfTile), CRGBA(255, 255, 255, FadeIn(255)));
+	if (SCREEN_WIDTH >= m_fMapCenterX + halfTile || SCREEN_HEIGHT >= m_fMapCenterY - m_fMapSize) {
+		m_aFrontEndSprites[MENUSPRITE_MAPTOP03].Draw(CRect(m_fMapCenterX + halfTile, m_fMapCenterY - m_fMapSize,
+			m_fMapCenterX + m_fMapSize, m_fMapCenterY - halfTile), CRGBA(255, 255, 255, FadeIn(255)));
 	}
 
-	if (SCREEN_WIDTH >= fMapCenterX - fMapSize || SCREEN_HEIGHT >= fMapCenterY - halfTile) {
-		m_aFrontEndSprites[MENUSPRITE_MAPMID01].Draw(CRect(fMapCenterX - fMapSize, fMapCenterY - halfTile,
-			fMapCenterX - halfTile, fMapCenterY + halfTile), CRGBA(255, 255, 255, FadeIn(255)));
+	if (SCREEN_WIDTH >= m_fMapCenterX - m_fMapSize || SCREEN_HEIGHT >= m_fMapCenterY - halfTile) {
+		m_aFrontEndSprites[MENUSPRITE_MAPMID01].Draw(CRect(m_fMapCenterX - m_fMapSize, m_fMapCenterY - halfTile,
+			m_fMapCenterX - halfTile, m_fMapCenterY + halfTile), CRGBA(255, 255, 255, FadeIn(255)));
 	}
 
-	if (SCREEN_WIDTH >= fMapCenterX - halfTile || SCREEN_HEIGHT >= fMapCenterY - halfTile) {
-		m_aFrontEndSprites[MENUSPRITE_MAPMID02].Draw(CRect(fMapCenterX - halfTile, fMapCenterY - halfTile,
-			fMapCenterX + halfTile, fMapCenterY + halfTile), CRGBA(255, 255, 255, FadeIn(255)));
+	if (SCREEN_WIDTH >= m_fMapCenterX - halfTile || SCREEN_HEIGHT >= m_fMapCenterY - halfTile) {
+		m_aFrontEndSprites[MENUSPRITE_MAPMID02].Draw(CRect(m_fMapCenterX - halfTile, m_fMapCenterY - halfTile,
+			m_fMapCenterX + halfTile, m_fMapCenterY + halfTile), CRGBA(255, 255, 255, FadeIn(255)));
 	}
 
-	if (SCREEN_WIDTH >= fMapCenterX + halfTile || SCREEN_HEIGHT >= fMapCenterY - halfTile) {
-		m_aFrontEndSprites[MENUSPRITE_MAPMID03].Draw(CRect(fMapCenterX + halfTile, fMapCenterY - halfTile,
-			fMapCenterX + fMapSize, fMapCenterY + halfTile), CRGBA(255, 255, 255, FadeIn(255)));
+	if (SCREEN_WIDTH >= m_fMapCenterX + halfTile || SCREEN_HEIGHT >= m_fMapCenterY - halfTile) {
+		m_aFrontEndSprites[MENUSPRITE_MAPMID03].Draw(CRect(m_fMapCenterX + halfTile, m_fMapCenterY - halfTile,
+			m_fMapCenterX + m_fMapSize, m_fMapCenterY + halfTile), CRGBA(255, 255, 255, FadeIn(255)));
 	}
 
-	if (SCREEN_WIDTH >= fMapCenterX - fMapSize || SCREEN_HEIGHT >= fMapCenterY + halfTile) {
-		m_aFrontEndSprites[MENUSPRITE_MAPBOT01].Draw(CRect(fMapCenterX - fMapSize, fMapCenterY + halfTile,
-			fMapCenterX - halfTile, fMapCenterY + fMapSize), CRGBA(255, 255, 255, FadeIn(255)));
+	if (SCREEN_WIDTH >= m_fMapCenterX - m_fMapSize || SCREEN_HEIGHT >= m_fMapCenterY + halfTile) {
+		m_aFrontEndSprites[MENUSPRITE_MAPBOT01].Draw(CRect(m_fMapCenterX - m_fMapSize, m_fMapCenterY + halfTile,
+			m_fMapCenterX - halfTile, m_fMapCenterY + m_fMapSize), CRGBA(255, 255, 255, FadeIn(255)));
 	}
 
-	if (SCREEN_WIDTH >= fMapCenterX - halfTile || SCREEN_HEIGHT >= fMapCenterY + halfTile) {
-		m_aFrontEndSprites[MENUSPRITE_MAPBOT02].Draw(CRect(fMapCenterX - halfTile, fMapCenterY + halfTile,
-			fMapCenterX + halfTile, fMapCenterY + fMapSize), CRGBA(255, 255, 255, FadeIn(255)));
+	if (SCREEN_WIDTH >= m_fMapCenterX - halfTile || SCREEN_HEIGHT >= m_fMapCenterY + halfTile) {
+		m_aFrontEndSprites[MENUSPRITE_MAPBOT02].Draw(CRect(m_fMapCenterX - halfTile, m_fMapCenterY + halfTile,
+			m_fMapCenterX + halfTile, m_fMapCenterY + m_fMapSize), CRGBA(255, 255, 255, FadeIn(255)));
 	}
 
-	if (SCREEN_WIDTH >= fMapCenterX + halfTile || SCREEN_HEIGHT >= fMapCenterY + halfTile) {
-		m_aFrontEndSprites[MENUSPRITE_MAPBOT03].Draw(CRect(fMapCenterX + halfTile, fMapCenterY + halfTile,
-			fMapCenterX + fMapSize, fMapCenterY + fMapSize), CRGBA(255, 255, 255, FadeIn(255)));
+	if (SCREEN_WIDTH >= m_fMapCenterX + halfTile || SCREEN_HEIGHT >= m_fMapCenterY + halfTile) {
+		m_aFrontEndSprites[MENUSPRITE_MAPBOT03].Draw(CRect(m_fMapCenterX + halfTile, m_fMapCenterY + halfTile,
+			m_fMapCenterX + m_fMapSize, m_fMapCenterY + m_fMapSize), CRGBA(255, 255, 255, FadeIn(255)));
 	}
 
 	CRadar::DrawBlips();
@@ -5512,35 +5024,35 @@ CMenuManager::PrintMap(void)
 		CRGBA(0, 0, 0, 150));
 
 	if (CPad::GetPad(0)->GetRightMouseJustDown() || CPad::GetPad(0)->GetCrossJustDown()) {
-		if (mapPoint.y > fMapCenterY - fMapSize && mapPoint.y < fMapCenterY + fMapSize &&
-			mapPoint.x > fMapCenterX - fMapSize && mapPoint.x < fMapCenterX + fMapSize) {
+		if (mapPoint.y > m_fMapCenterY - m_fMapSize && mapPoint.y < m_fMapCenterY + m_fMapSize &&
+			mapPoint.x > m_fMapCenterX - m_fMapSize && mapPoint.x < m_fMapCenterX + m_fMapSize) {
 
 			// Don't ask me the meanings, I don't know. Found them by trying
-			float diffX = fMapCenterX - fMapSize, diffY = fMapCenterY - fMapSize;
-			float x = ((mapPoint.x - diffX) / (fMapSize * 2)) * (WORLD_SIZE_X / MENU_MAP_WIDTH_SCALE) - (WORLD_SIZE_X / 2 + MENU_MAP_LEFT_OFFSET * MENU_MAP_LENGTH_UNIT);
-			float y = (WORLD_SIZE_Y / 2 - MENU_MAP_TOP_OFFSET * MENU_MAP_LENGTH_UNIT) - ((mapPoint.y - diffY) / (fMapSize * 2)) * (WORLD_SIZE_Y / MENU_MAP_HEIGHT_SCALE);
+			float diffX = m_fMapCenterX - m_fMapSize, diffY = m_fMapCenterY - m_fMapSize;
+			float x = ((mapPoint.x - diffX) / (m_fMapSize * 2)) * (WORLD_SIZE_X / MENU_MAP_WIDTH_SCALE) - (WORLD_SIZE_X / 2 + MENU_MAP_LEFT_OFFSET * MENU_MAP_LENGTH_UNIT);
+			float y = (WORLD_SIZE_Y / 2 - MENU_MAP_TOP_OFFSET * MENU_MAP_LENGTH_UNIT) - ((mapPoint.y - diffY) / (m_fMapSize * 2)) * (WORLD_SIZE_Y / MENU_MAP_HEIGHT_SCALE);
 			CRadar::ToggleTargetMarker(x, y);
 			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SUCCESS, 0);
 		}
 	}
 
 	if (CPad::GetPad(0)->GetLeftMouse()) {
-		fMapCenterX += m_nMousePosX - m_nMouseOldPosX;
-		fMapCenterY += m_nMousePosY - m_nMouseOldPosY;
+		m_fMapCenterX += m_nMousePosX - m_nMouseOldPosX;
+		m_fMapCenterY += m_nMousePosY - m_nMouseOldPosY;
 	} else if (CPad::GetPad(0)->GetLeft() || CPad::GetPad(0)->GetDPadLeft()) {
-		fMapCenterX += 15.0f;
+		m_fMapCenterX += 15.0f;
 	} else if (CPad::GetPad(0)->GetRight() || CPad::GetPad(0)->GetDPadRight()) {
-		fMapCenterX -= 15.0f;
+		m_fMapCenterX -= 15.0f;
 	} else if (CPad::GetPad(0)->GetLeftStickX()) {
-		fMapCenterX -= CPad::GetPad(0)->GetLeftStickX() / 128.0f * 20.0f;
+		m_fMapCenterX -= CPad::GetPad(0)->GetLeftStickX() / 128.0f * 20.0f;
 	}
 
 	if (CPad::GetPad(0)->GetUp() || CPad::GetPad(0)->GetDPadUp()) {
-		fMapCenterY += 15.0f;
+		m_fMapCenterY += 15.0f;
 	} else if (CPad::GetPad(0)->GetDown() || CPad::GetPad(0)->GetDPadDown()) {
-		fMapCenterY -= 15.0f;
+		m_fMapCenterY -= 15.0f;
 	} else if (CPad::GetPad(0)->GetLeftStickY()) {
-		fMapCenterY -= CPad::GetPad(0)->GetLeftStickY() / 128.0f * 20.0f;
+		m_fMapCenterY -= CPad::GetPad(0)->GetLeftStickY() / 128.0f * 20.0f;
 	}
 
 	if (CPad::GetPad(0)->GetMouseWheelDown() || CPad::GetPad(0)->GetPageDown() || CPad::GetPad(0)->GetRightShoulder2()) {
@@ -5555,19 +5067,19 @@ CMenuManager::PrintMap(void)
 			ZOOM(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2, true);
 	}
 	
-	if (fMapCenterX - fMapSize > SCREEN_WIDTH / 2)
-		fMapCenterX = fMapSize + SCREEN_WIDTH / 2;
+	if (m_fMapCenterX - m_fMapSize > SCREEN_WIDTH / 2)
+		m_fMapCenterX = m_fMapSize + SCREEN_WIDTH / 2;
 
-	if (fMapCenterX + fMapSize < SCREEN_WIDTH / 2)
-		fMapCenterX = SCREEN_WIDTH / 2 - fMapSize;
+	if (m_fMapCenterX + m_fMapSize < SCREEN_WIDTH / 2)
+		m_fMapCenterX = SCREEN_WIDTH / 2 - m_fMapSize;
 
-	if (fMapCenterY + fMapSize < SCREEN_HEIGHT - MENU_Y(60.0f))
-		fMapCenterY = SCREEN_HEIGHT - MENU_Y(60.0f) - fMapSize;
+	if (m_fMapCenterY + m_fMapSize < SCREEN_HEIGHT - MENU_Y(60.0f))
+		m_fMapCenterY = SCREEN_HEIGHT - MENU_Y(60.0f) - m_fMapSize;
 	
-	if (fMapCenterY - fMapSize > SCREEN_HEIGHT / 2)
-		fMapCenterY = SCREEN_HEIGHT / 2 + fMapSize;
+	if (m_fMapCenterY - m_fMapSize > SCREEN_HEIGHT / 2)
+		m_fMapCenterY = SCREEN_HEIGHT / 2 + m_fMapSize;
 
-	bMenuMapActive = false;
+	m_bMenuMapActive = false;
 
 	// CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(5.0f)); // From VC
 	// CFont::SetRightJustifyWrap(10.0f);
diff --git a/src/core/Frontend.h b/src/core/Frontend.h
index 114ea6ba..a867e4c8 100644
--- a/src/core/Frontend.h
+++ b/src/core/Frontend.h
@@ -95,42 +95,6 @@ enum eLanguages
 #endif
 };
 
-/*
-enum eFrontendSprites
-{
-	FE2_MAINPANEL_UL,
-	FE2_MAINPANEL_UR,
-	FE2_MAINPANEL_DL,
-	FE2_MAINPANEL_DR,
-	FE2_MAINPANEL_DR2,
-	FE2_TABACTIVE,
-	FE_ICONBRIEF,
-	FE_ICONSTATS,
-	FE_ICONCONTROLS,
-	FE_ICONSAVE,
-	FE_ICONAUDIO,
-	FE_ICONDISPLAY,
-	FE_ICONLANGUAGE,
-	FE_CONTROLLER,
-	FE_CONTROLLERSH,
-	FE_ARROWS1,
-	FE_ARROWS2,
-	FE_ARROWS3,
-	FE_ARROWS4,
-	FE_RADIO1,
-	FE_RADIO2,
-	FE_RADIO3,
-	FE_RADIO4,
-	FE_RADIO5,
-	FE_RADIO6,
-	FE_RADIO7,
-	FE_RADIO8,
-	FE_RADIO9,
-
-	NUM_FE_SPRITES
-};
-*/
-
 enum eMenuSprites
 {
 	MENUSPRITE_BACKGROUND,
@@ -177,22 +141,6 @@ enum eSaveSlot
 	SAVESLOT_LABEL = 36
 };
 
-#ifdef MENU_MAP
-enum MapSprites
-{
-	MAPMID1,
-	MAPMID2,
-	MAPMID3,
-	MAPBOT1,
-	MAPBOT2,
-	MAPBOT3,
-	MAPTOP1,
-	MAPTOP2,
-	MAPTOP3,
-	NUM_MAP_SPRITES
-};
-#endif
-
 enum eMenuScreen
 {
 	MENUPAGE_DISABLED = -1,
@@ -480,70 +428,162 @@ struct CMenuScreen
 	} m_aEntries[NUM_MENUROWS];
 };
 
+struct MenuTrapezoid
+{
+	float topRight_x;
+	float topRight_y;
+	float topLeft_x;
+	float topLeft_y;
+	float bottomLeft_x;
+	float bottomLeft_y;
+	float bottomRight_x;
+	float bottomRight_y;
+	float old_topRight_x;
+	float old_topRight_y;
+	float old_topLeft_x;
+	float old_topLeft_y;
+	float old_bottomLeft_x;
+	float old_bottomLeft_y;
+	float old_bottomRight_x;
+	float old_bottomRight_y;
+	float mult_topRight_x;
+	float mult_topRight_y;
+	float mult_topLeft_x;
+	float mult_topLeft_y;
+	float mult_bottomLeft_x;
+	float mult_bottomLeft_y;
+	float mult_bottomRight_x;
+	float mult_bottomRight_y;
+
+	MenuTrapezoid(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4) {
+		topRight_x = x1;
+		topRight_y = y1;
+		topLeft_x = x2;
+		topLeft_y = y2;
+		bottomLeft_x = x3;
+		bottomLeft_y = y3;
+		bottomRight_x = x4;
+		bottomRight_y = y4;
+	};
+};
+
 class CMenuManager
 {
 public:
-	int32 m_nPrefsVideoMode;
-	int32 m_nDisplayVideoMode;
+	int8 m_StatsScrollDirection;
+	float m_StatsScrollSpeed;
+	uint8 field_8;
+	bool m_PrefsUseVibration;
+	bool m_PrefsShowHud;
+	int32 m_PrefsRadarMode;
+	uint8 field_10;
+	bool m_bShutDownFrontEndRequested;
+	bool m_bStartUpFrontEndRequested;
+	int32 m_KeyPressedCode;
+	int32 m_PrefsBrightness;
+	float m_PrefsLOD;
+	int8 m_PrefsShowSubtitles;
+	int8 m_PrefsShowLegends;
+	int8 m_PrefsUseWideScreen;
+	int8 m_PrefsVsync; // TODO(Miami): Are we sure?
+	int8 m_PrefsVsyncDisp;
+	int8 m_PrefsFrameLimiter;
 	int8 m_nPrefsAudio3DProviderIndex;
-	bool m_bKeyChangeNotProcessed;
-	char m_aSkinName[256];
-	int32 m_nHelperTextMsgId;
-	bool m_bLanguageLoaded;
+	int8 m_PrefsSpeakers;
+	int8 m_PrefsDMA;
+	uint8 m_PrefsSfxVolume;
+	uint8 m_PrefsMusicVolume;
+	uint8 m_PrefsRadioStation;
+	uint8 field_2C;
+	int32 m_nCurrOption;
+	bool m_bQuitGameNoCD;
+	bool m_bMenuMapActive;
+	bool m_AllowNavigation;
+	uint8 field_37;
 	bool m_bMenuActive;
-	bool m_bMenuStateChanged;
-	bool m_bWaitingForNewKeyBind;
 	bool m_bWantToRestart;
 	bool m_bFirstTime;
-	bool m_bGameNotLoaded;
-	int32 m_nMousePosX;
-	int32 m_nMousePosY;
+	bool m_bActivateSaveMenu;
+	bool m_bWantToLoad;
+	float m_fMapSize;
+	float m_fMapCenterX;
+	float m_fMapCenterY;
+	uint32 OS_Language;
+	int32 m_PrefsLanguage;
+	int32 field_54;
+	int8 m_bLanguageLoaded;
+	uint8 m_PrefsAllowNastyGame;
+	uint8 m_PrefsMP3BoostVolume;
+	uint8 m_ControlMethod;
+	int32 m_nPrefsVideoMode;
+	int32 m_nDisplayVideoMode;
 	int32 m_nMouseTempPosX;
 	int32 m_nMouseTempPosY;
-	bool m_bShowMouse;
-	tSkinInfo m_pSkinListHead;
-	tSkinInfo *m_pSelectedSkin;
-	int32 m_nFirstVisibleRowOnList;
-	float m_nScrollbarTopMargin;
-	int32 m_nTotalListRow;
-	int32 m_nSkinsTotal;
- char _unk0[4];
-	int32 m_nSelectedListRow;
-	bool m_bSkinsEnumerated;
-	bool m_bQuitGameNoCD;
- bool m_bRenderGameInMenu;
-	bool m_bSaveMenuActive;
-	bool m_bWantToLoad;
- char field_455;
-	bool m_bStartWaitingForKeyBind;
-	bool m_bSpritesLoaded;
-	//CSprite2d m_aFrontEndSprites[NUM_FE_SPRITES];
-	//CSprite2d m_aMenuSprites[NUM_MENU_SPRITES];
+	bool m_bGameNotLoaded;
+	int8 m_3DProviderOnLastSaveLoad;
+	bool m_bFrontEnd_ReloadObrTxtGxt;
+	int32 *pEditString;
+	uint8 field_74[4];
+	int32 *pControlEdit;
+	bool m_OnlySaveMenu;
+	int32 m_menuTransitionProgress;
 	CSprite2d m_aFrontEndSprites[NUM_MENU_SPRITES];
- int32 field_518;
-	int32 m_nMenuFadeAlpha;
+	bool m_bSpritesLoaded;
+	int32 field_F0;
+	int32 m_LastRadioScrollDir;
+	int32 m_nCurrScreen;
+	int32 m_nPrevScreen;
+	int32 m_nCurrSaveSlot;
+	int32 m_LastScreenSwitch;
+	uint32 m_nMenuFadeAlpha;
+	int32 bOptionHighlightTransitionBlend;
+	bool bMenuChangeOngoing;
+	int32 MouseButtonJustClicked;
+	int32 JoyButtonJustClicked;
+	bool DisplayComboButtonErrMsg;
+	bool m_NoEmptyBinding;
+	bool m_ShowEmptyBindingError;
+	int32 m_nHelperTextAlpha;
 	bool m_bPressedPgUpOnList;
 	bool m_bPressedPgDnOnList;
 	bool m_bPressedUpOnList;
 	bool m_bPressedDownOnList;
 	bool m_bPressedScrollButton;
-	int32 m_CurrCntrlAction;
- char _unk1[4];
- int32 m_nSelectedContSetupColumn;
-	 bool m_bKeyIsOK;
- bool field_535;
-	int8 m_nCurrExLayer;
-	int32 m_nHelperTextAlpha;
+	uint8 field_129;
+	uint8 field_12A;
+	uint8 field_12B;
+	int32 m_nMousePosX;
+	int32 m_nMousePosY;
 	int32 m_nMouseOldPosX;
 	int32 m_nMouseOldPosY;
 	int32 m_nHoverOption;
-	int32 m_nCurrScreen;
-	int32 m_nCurrOption;
+	bool m_bShowMouse;
 	int32 m_nPrevOption;
-	int32 m_nPrevScreen;
- uint32 field_558;
-	int32 m_nCurrSaveSlot;
-	int32 m_nScreenChangeDelayTimer;
+	bool m_bStartWaitingForKeyBind;
+	bool m_bWaitingForNewKeyBind;
+	bool m_bKeyChangeNotProcessed;
+	int32 m_CurrCntrlAction;
+	uint8 field_150;
+	uint8 field_151;
+	uint8 field_152;
+	uint8 field_153;
+	int32 m_nSelectedContSetupColumn;
+	bool m_bKeyIsOK;
+	bool field_159;
+	uint8 m_nCurrExLayer;
+	char m_PrefsSkinFile[256];
+	char m_aSkinName[256];
+	uint8 field_35B;
+	int32 m_nHelperTextMsgId;
+	tSkinInfo m_pSkinListHead;
+	tSkinInfo *m_pSelectedSkin;
+	int32 m_nFirstVisibleRowOnList;
+	float m_nScrollbarTopMargin;
+	int32 m_nTotalListRow;
+	int32 m_nSkinsTotal;
+	uint8 field_67C[4];
+	int32 m_nSelectedListRow;
+	bool m_bSkinsEnumerated;
 
 #ifdef IMPROVED_VIDEOMODE
 	int32 m_nPrefsWidth;
@@ -554,107 +594,63 @@ public:
 	int32 m_nSelectedScreenMode;
 #endif
 
-public:
 	bool GetIsMenuActive() {return !!m_bMenuActive;}
 
-public:
-	static int32 OS_Language;
-	static int8 m_PrefsUseVibration;
-	static int8 m_DisplayControllerOnFoot;
-	static int8 m_PrefsUseWideScreen;
-	static int8 m_PrefsRadioStation;
-	static int8 m_PrefsVsync;
-	static int8 m_PrefsVsyncDisp;
-	static int8 m_PrefsFrameLimiter;
-	static int8 m_PrefsShowSubtitles;
-	static int8 m_PrefsSpeakers;
-	static int32 m_ControlMethod;
-	static int8 m_PrefsDMA;
-	static int32 m_PrefsLanguage;
-	static int32 m_PrefsBrightness;
-	static float m_PrefsLOD;
-	static int8 m_bFrontEnd_ReloadObrTxtGxt;
-	static int32 m_PrefsMusicVolume;
-	static int32 m_PrefsSfxVolume;
-	static char m_PrefsSkinFile[256];
-	static int32 m_KeyPressedCode;
-
-	static bool m_bStartUpFrontEndRequested;
-	static bool m_bShutDownFrontEndRequested;
-	static bool m_PrefsAllowNastyGame;
-	
 	static uint8 m_PrefsStereoMono;
-	static int32 m_SelectedMap;
-	static int32 m_SelectedGameType;
-	static uint8 m_PrefsPlayerRed;
-	static uint8 m_PrefsPlayerGreen;
-	static uint8 m_PrefsPlayerBlue;
 
 #ifndef MASTER
 	static bool m_PrefsMarketing;
 	static bool m_PrefsDisableTutorials;
 #endif // !MASTER
 
-#ifdef MENU_MAP
-	static bool bMenuMapActive;
-	static bool bMapMouseShownOnce;
-	static bool bMapLoaded;
-	static float fMapSize;
-	static float fMapCenterY;
-	static float fMapCenterX;
-	static CSprite2d m_aMapSprites[NUM_MAP_SPRITES];
+	CMenuManager(void);
+	~CMenuManager(void) { UnloadTextures(); }
+	
+	void Initialise();
 	void PrintMap();
-#endif
-
-public:
+	void SetFrontEndRenderStates();
 	static void BuildStatLine(Const char *text, void *stat, bool itsFloat, void *stat2);
 	static void CentreMousePointer();
 	void CheckCodesForControls(int);
 	bool CheckHover(int x1, int x2, int y1, int y2);
 	void CheckSliderMovement(int);
-	int CostructStatLine(int);
 	void DisplayHelperText();
 	int DisplaySlider(float, float, float, float, float, float);
 	void DoSettingsBeforeStartingAGame();
-	void Draw();
+	void DrawStandardMenus();
 	void DrawControllerBound(int32, int32, int32, int8);
 	void DrawControllerScreenExtraText(int, int, int);
 	void DrawControllerSetupScreen();
 	void DrawFrontEnd();
-	void DrawFrontEndNormal();
-#ifdef PS2_SAVE_DIALOG
-	void DrawFrontEndSaveZone();
-#endif
+	void DrawBackground();
 	void DrawPlayerSetupScreen();
 	int FadeIn(int alpha);
 	void FilterOutColorMarkersFromString(wchar*, CRGBA &);
 	int GetStartOptionsCntrlConfigScreens();
-	static void InitialiseChangedLanguageSettings();
+	void InitialiseChangedLanguageSettings();
 	void LoadAllTextures();
 	void LoadSettings();
 	void MessageScreen(const char *);
 	// TODO(MIAMI): implement the second argument
 	void MessageScreen(const char *str, bool) { MessageScreen(str); }
-	void PickNewPlayerColour();
 	void PrintBriefs();
 	static void PrintErrorMessage();
 	void PrintStats();
 	void Process();
 	void ProcessButtonPresses();
+	void ProcessFileActions();
 	void ProcessOnOffMenuOptions();
-	static void RequestFrontEndShutDown();
-	static void RequestFrontEndStartUp();
+	void RequestFrontEndShutDown();
+	void RequestFrontEndStartUp();
 	void ResetHelperText();
 	void SaveLoadFileError_SetUpErrorScreen();
 	void SaveSettings();
 	void SetHelperText(int text);
-	void ShutdownJustMenu();
 	float StretchX(float);
 	float StretchY(float);
 	void SwitchMenuOnAndOff();
 	void UnloadTextures();
 	void WaitForUserCD();
-	void PrintController();
 	int GetNumOptionsCntrlConfigScreens();
 	int ConstructStatLine(int);
 
@@ -669,7 +665,7 @@ public:
 };
 
 #ifndef IMPROVED_VIDEOMODE
-VALIDATE_SIZE(CMenuManager, 0x564);
+VALIDATE_SIZE(CMenuManager, 0x688);
 #endif
 
 extern CMenuManager FrontEndMenuManager;
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 3f4a3217..385b3892 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -221,20 +221,20 @@ bool CGame::InitialiseOnceAfterRW(void)
 
 	if ( FrontEndMenuManager.m_nPrefsAudio3DProviderIndex == -99 || FrontEndMenuManager.m_nPrefsAudio3DProviderIndex == -2 )
 	{
-		CMenuManager::m_PrefsSpeakers = 0;
+		FrontEndMenuManager.m_PrefsSpeakers = 0;
 		int8 provider = DMAudio.AutoDetect3DProviders();
 		if ( provider != -1 )
 			FrontEndMenuManager.m_nPrefsAudio3DProviderIndex = provider;
 	}
 
 	DMAudio.SetCurrent3DProvider(FrontEndMenuManager.m_nPrefsAudio3DProviderIndex);
-	DMAudio.SetSpeakerConfig(CMenuManager::m_PrefsSpeakers);
-	DMAudio.SetDynamicAcousticModelingStatus(CMenuManager::m_PrefsDMA);
-	DMAudio.SetMusicMasterVolume(CMenuManager::m_PrefsMusicVolume);
-	DMAudio.SetEffectsMasterVolume(CMenuManager::m_PrefsSfxVolume);
+	DMAudio.SetSpeakerConfig(FrontEndMenuManager.m_PrefsSpeakers);
+	DMAudio.SetDynamicAcousticModelingStatus(FrontEndMenuManager.m_PrefsDMA);
+	DMAudio.SetMusicMasterVolume(FrontEndMenuManager.m_PrefsMusicVolume);
+	DMAudio.SetEffectsMasterVolume(FrontEndMenuManager.m_PrefsSfxVolume);
 	DMAudio.SetEffectsFadeVol(127);
 	DMAudio.SetMusicFadeVol(127);
-	CWorld::Players[0].SetPlayerSkin(CMenuManager::m_PrefsSkinFile);
+	CWorld::Players[0].SetPlayerSkin(FrontEndMenuManager.m_PrefsSkinFile);
 
 	return true;
 }
diff --git a/src/core/MenuScreens.h b/src/core/MenuScreens.h
index 6c2ebdb8..e9e37a9b 100644
--- a/src/core/MenuScreens.h
+++ b/src/core/MenuScreens.h
@@ -206,20 +206,12 @@ const CMenuScreen aScreens[] = {
 		MENUACTION_MEMCARDSAVECONFIRM, "JAILB_U", SAVESLOT_NONE, MENUPAGE_NONE,
 	},
 
-	// Unused in PC but anyway
 	// MENUPAGE_SAVE = 24
-#ifdef PS2_SAVE_DIALOG
-	{ "FET_SG", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
-		MENUACTION_CHANGEMENU,			"FESZ_SA",	SAVESLOT_NONE, MENUPAGE_CHOOSE_SAVE_SLOT,
-		MENUACTION_RESUME_FROM_SAVEZONE,	"FESZ_CA",	SAVESLOT_NONE, MENUPAGE_NONE,
-	},
-#else
 	{ "FET_SG", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
 		MENUACTION_LABEL,				"FES_SCG",	SAVESLOT_NONE, MENUPAGE_NONE,
 		MENUACTION_POPULATESLOTS_CHANGEMENU,			"GMSAVE",	SAVESLOT_NONE, MENUPAGE_CHOOSE_SAVE_SLOT,
 		MENUACTION_RESUME_FROM_SAVEZONE,	"FESZ_CA",	SAVESLOT_NONE, MENUPAGE_NONE,
 	},
-#endif
 
 	// MENUPAGE_NO_MEMORY_CARD_2 = 25
 	{ "FES_NOC", 1, MENUPAGE_DISABLED, MENUPAGE_DISABLED, 0, 0,
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index ae7fcdb4..c3fb69d6 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -701,7 +701,7 @@ CControllerState CPad::ReconcileTwoControllersInput(CControllerState const &Stat
 
 void CPad::StartShake(int16 nDur, uint8 nFreq)
 {
-	if ( !CMenuManager::m_PrefsUseVibration )
+	if ( !FrontEndMenuManager.m_PrefsUseVibration )
 		return;
 	
 	if ( CCutsceneMgr::IsRunning() || CGame::playingIntro )
@@ -723,7 +723,7 @@ void CPad::StartShake(int16 nDur, uint8 nFreq)
 
 void CPad::StartShake_Distance(int16 nDur, uint8 nFreq, float fX, float fY, float fZ)
 {
-	if ( !CMenuManager::m_PrefsUseVibration )
+	if ( !FrontEndMenuManager.m_PrefsUseVibration )
 		return;
 	
 	if ( CCutsceneMgr::IsRunning() || CGame::playingIntro )
@@ -750,7 +750,7 @@ void CPad::StartShake_Distance(int16 nDur, uint8 nFreq, float fX, float fY, floa
 
 void CPad::StartShake_Train(float fX, float fY)
 {
-	if ( !CMenuManager::m_PrefsUseVibration )
+	if ( !FrontEndMenuManager.m_PrefsUseVibration )
 		return;
 	
 	if ( CCutsceneMgr::IsRunning() || CGame::playingIntro )
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
index 1267896a..95ae62a0 100644
--- a/src/core/Radar.cpp
+++ b/src/core/Radar.cpp
@@ -264,7 +264,7 @@ int LineRadarBoxCollision(CVector2D &out, const CVector2D &p1, const CVector2D &
 uint8 CRadar::CalculateBlipAlpha(float dist)
 {
 #ifdef MENU_MAP
-	if (CMenuManager::bMenuMapActive)
+	if (FrontEndMenuManager.m_bMenuMapActive)
 		return 255;
 #endif
 	if (dist <= 1.0f)
@@ -487,7 +487,7 @@ void CRadar::DrawBlips()
 		TransformRadarPointToScreenSpace(out, in);
 
 #ifdef MENU_MAP
-		if (!CMenuManager::bMenuMapActive) {
+		if (!FrontEndMenuManager.m_bMenuMapActive) {
 #endif
 			float angle;
 			if (TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOPDOWN)
@@ -555,7 +555,7 @@ void CRadar::DrawBlips()
 								TransformRealWorldPointToRadarSpace(in, blipEntity->GetPosition());
 								float dist = LimitRadarPoint(in);
 								TransformRadarPointToScreenSpace(out, in);
-								if (!ms_RadarTrace[blipId].m_bShortRange || dist <= 1.0f || CMenuManager::bMenuMapActive) {
+								if (!ms_RadarTrace[blipId].m_bShortRange || dist <= 1.0f || FrontEndMenuManager.m_bMenuMapActive) {
 									if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_NONE) {
 										DrawRadarSprite(ms_RadarTrace[blipId].m_eRadarSprite, out.x, out.y, CalculateBlipAlpha(dist));
 									}
@@ -597,7 +597,7 @@ void CRadar::DrawBlips()
 							TransformRealWorldPointToRadarSpace(in, ms_RadarTrace[blipId].m_vec2DPos);
 							float dist = LimitRadarPoint(in);
 							TransformRadarPointToScreenSpace(out, in);
-							if (!ms_RadarTrace[blipId].m_bShortRange || dist <= 1.0f || CMenuManager::bMenuMapActive) {
+							if (!ms_RadarTrace[blipId].m_bShortRange || dist <= 1.0f || FrontEndMenuManager.m_bMenuMapActive) {
 								if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_NONE) {
 									DrawRadarSprite(ms_RadarTrace[blipId].m_eRadarSprite, out.x, out.y, CalculateBlipAlpha(dist));
 								}
@@ -666,7 +666,7 @@ void CRadar::DrawBlips()
 								TransformRealWorldPointToRadarSpace(in, blipEntity->GetPosition());
 								float dist = LimitRadarPoint(in);
 								TransformRadarPointToScreenSpace(out, in);
-								if (!ms_RadarTrace[blipId].m_bShortRange || dist <= 1.0f || CMenuManager::bMenuMapActive) {
+								if (!ms_RadarTrace[blipId].m_bShortRange || dist <= 1.0f || FrontEndMenuManager.m_bMenuMapActive) {
 									if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_NONE)
 										DrawRadarSprite(ms_RadarTrace[blipId].m_eRadarSprite, out.x, out.y, CalculateBlipAlpha(dist));
 									else
@@ -717,7 +717,7 @@ void CRadar::DrawBlips()
 							TransformRealWorldPointToRadarSpace(in, ms_RadarTrace[blipId].m_vec2DPos);
 							float dist = LimitRadarPoint(in);
 							TransformRadarPointToScreenSpace(out, in);
-							if (!ms_RadarTrace[blipId].m_bShortRange || dist <= 1.0f || CMenuManager::bMenuMapActive) {
+							if (!ms_RadarTrace[blipId].m_bShortRange || dist <= 1.0f || FrontEndMenuManager.m_bMenuMapActive) {
 								if (ms_RadarTrace[blipId].m_eRadarSprite != RADAR_SPRITE_NONE)
 									DrawRadarSprite(ms_RadarTrace[blipId].m_eRadarSprite, out.x, out.y, CalculateBlipAlpha(dist));
 								else
@@ -744,7 +744,7 @@ void CRadar::DrawBlips()
 			}
 		}
 #ifdef MENU_MAP
-		if (CMenuManager::bMenuMapActive) {
+		if (FrontEndMenuManager.m_bMenuMapActive) {
 			CVector2D in, out;
 			TransformRealWorldPointToRadarSpace(in, FindPlayerCentreOfWorld_NoSniperShift());
 			TransformRadarPointToScreenSpace(out, in);
@@ -899,7 +899,7 @@ void CRadar::DrawRadarSprite(uint16 sprite, float x, float y, uint8 alpha)
 {
 	RadarSprites[sprite]->Draw(CRect(x - SCREEN_SCALE_X(8.0f), y - SCREEN_SCALE_Y(8.0f), x + SCREEN_SCALE_X(8.0f), y + SCREEN_SCALE_Y(8.0f)), CRGBA(255, 255, 255, alpha));
 #ifdef MENU_MAP
-	if (CMenuManager::bMenuMapActive) {
+	if (FrontEndMenuManager.m_bMenuMapActive) {
 		bool alreadyThere = false;
 		for (int i = 0; i < NUM_MAP_LEGENDS; i++) {
 			if (MapLegendList[i] == sprite)
@@ -1047,7 +1047,7 @@ float CRadar::LimitRadarPoint(CVector2D &point)
 
 	dist = point.Magnitude();
 #ifdef MENU_MAP
-	if (CMenuManager::bMenuMapActive)
+	if (FrontEndMenuManager.m_bMenuMapActive)
 		return dist;
 #endif
 	if (dist > 1.0f) {
@@ -1278,7 +1278,7 @@ void CRadar::ShowRadarTraceWithHeight(float x, float y, uint32 size, uint8 red,
 	}
 #ifdef MENU_MAP
 	// VC uses -1 for coords and -2 for entities but meh, I don't want to edit DrawBlips
-	if (CMenuManager::bMenuMapActive) {
+	if (FrontEndMenuManager.m_bMenuMapActive) {
 		bool alreadyThere = false;
 		for (int i = 0; i < NUM_MAP_LEGENDS; i++) {
 			if (MapLegendList[i] == -1)
@@ -1403,9 +1403,9 @@ void CRadar::TransformRadarPointToRealWorldSpace(CVector2D &out, const CVector2D
 void CRadar::TransformRadarPointToScreenSpace(CVector2D &out, const CVector2D &in)
 {
 #ifdef MENU_MAP
-	if (CMenuManager::bMenuMapActive) {
-		out.x = (CMenuManager::fMapCenterX - CMenuManager::fMapSize) + (MENU_MAP_LENGTH / 2 + MENU_MAP_LEFT_OFFSET + in.x) * CMenuManager::fMapSize * MENU_MAP_WIDTH_SCALE * 2.0f / MENU_MAP_LENGTH;
-		out.y = (CMenuManager::fMapCenterY - CMenuManager::fMapSize) + (MENU_MAP_LENGTH / 2 - MENU_MAP_TOP_OFFSET - in.y) * CMenuManager::fMapSize * MENU_MAP_HEIGHT_SCALE * 2.0f / MENU_MAP_LENGTH;
+	if (FrontEndMenuManager.m_bMenuMapActive) {
+		out.x = (FrontEndMenuManager.m_fMapCenterX - FrontEndMenuManager.m_fMapSize) + (MENU_MAP_LENGTH / 2 + MENU_MAP_LEFT_OFFSET + in.x) * FrontEndMenuManager.m_fMapSize * MENU_MAP_WIDTH_SCALE * 2.0f / MENU_MAP_LENGTH;
+		out.y = (FrontEndMenuManager.m_fMapCenterY - FrontEndMenuManager.m_fMapSize) + (MENU_MAP_LENGTH / 2 - MENU_MAP_TOP_OFFSET - in.y) * FrontEndMenuManager.m_fMapSize * MENU_MAP_HEIGHT_SCALE * 2.0f / MENU_MAP_LENGTH;
 	} else
 #endif
 	{
@@ -1463,7 +1463,7 @@ CRadar::CalculateCachedSinCos()
 {
 	if (TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOPDOWN || TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_TOP_DOWN_PED
 #ifdef MENU_MAP
-		|| CMenuManager::bMenuMapActive
+		|| FrontEndMenuManager.m_bMenuMapActive
 #endif
 		) {
 		cachedSin = 0.0f;
diff --git a/src/core/config.h b/src/core/config.h
index 105454fa..c7ce5016 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -222,7 +222,6 @@ enum Config {
 // Hud, frontend and radar
 #define ASPECT_RATIO_SCALE	// Not just makes everything scale with aspect ratio, also adds support for all aspect ratios
 #define TRIANGULAR_BLIPS	// height indicating triangular radar blips, as in VC
-#define PS2_SAVE_DIALOG		// PS2 style save dialog with transparent black box
 // #define PS2_LIKE_MENU	// An effort to recreate PS2 menu, cycling through tabs, different bg etc.
 #define MENU_MAP			// VC-like menu map. Make sure you have new menu.txd
 #define SCROLLABLE_STATS_PAGE	// only draggable by mouse atm
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 9b40b81d..ecae127a 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -199,13 +199,13 @@ DoFade(void)
 		}
 	}
 
-	if(CDraw::FadeValue != 0 || CMenuManager::m_PrefsBrightness < 256){
+	if(CDraw::FadeValue != 0 || FrontEndMenuManager.m_PrefsBrightness < 256){
 		CSprite2d *splash = LoadSplash(nil);
 
 		CRGBA fadeColor;
 		CRect rect;
 		int fadeValue = CDraw::FadeValue;
-		float brightness = Min(CMenuManager::m_PrefsBrightness, 256);
+		float brightness = Min(FrontEndMenuManager.m_PrefsBrightness, 256);
 		if(brightness <= 50)
 			brightness = 50;
 		if(FrontEndMenuManager.m_bMenuActive)
@@ -944,35 +944,6 @@ Idle(void *arg)
 	CSprite2d::InitPerFrame();
 	CFont::InitPerFrame();
 
-	// We're basically merging FrontendIdle and Idle (just like TheGame on PS2)
-#ifdef PS2_SAVE_DIALOG
-	// Only exists on PC FrontendIdle, probably some PS2 bug fix
-	if (FrontEndMenuManager.m_bMenuActive)
-		CSprite2d::SetRecipNearClip();
-	
-	if (FrontEndMenuManager.m_bGameNotLoaded) {
-		CPad::UpdatePads();
-		FrontEndMenuManager.Process();
-	} else {
-		CPointLights::InitPerFrame();
-#ifdef TIMEBARS
-		tbStartTimer(0, "CGame::Process");
-#endif
-		CGame::Process();
-#ifdef TIMEBARS
-		tbEndTimer("CGame::Process");
-		tbStartTimer(0, "DMAudio.Service");
-#endif
-		DMAudio.Service();
-
-#ifdef TIMEBARS
-		tbEndTimer("DMAudio.Service");
-#endif
-	}
-
-	if (RsGlobal.quit)
-		return;
-#else
 	CPointLights::InitPerFrame();
 #ifdef TIMEBARS
 	tbStartTimer(0, "CGame::Process");
@@ -988,7 +959,6 @@ Idle(void *arg)
 #ifdef TIMEBARS
 	tbEndTimer("DMAudio.Service");
 #endif
-#endif
 
 	if(CGame::bDemoMode && CTimer::GetTimeInMilliseconds() > (3*60 + 30)*1000 && !CCutsceneMgr::IsCutsceneProcessing()){
 		FrontEndMenuManager.m_bWantToRestart = true;
@@ -1004,17 +974,16 @@ Idle(void *arg)
 	if(arg == nil)
 		return;
 
-	if((!FrontEndMenuManager.m_bMenuActive || FrontEndMenuManager.m_bRenderGameInMenu) &&
+	// m_bRenderGameInMenu is there in III PS2 but I don't know about VC PS2.
+	if((!FrontEndMenuManager.m_bMenuActive/* || FrontEndMenuManager.m_bRenderGameInMenu*/) &&
 	   TheCamera.GetScreenFadeStatus() != FADE_2)
 	{
 #ifdef GTA_PC
-		if (!FrontEndMenuManager.m_bRenderGameInMenu) {
 			// This is from SA, but it's nice for windowed mode
 			RwV2d pos;
 			pos.x = SCREEN_WIDTH / 2.0f;
 			pos.y = SCREEN_HEIGHT / 2.0f;
 			RsMouseSetPos(&pos);
-		}
 #endif
 #ifdef TIMEBARS
 		tbStartTimer(0, "CnstrRenderList");
@@ -1082,10 +1051,6 @@ Idle(void *arg)
 			return;
 	}
 
-#ifdef PS2_SAVE_DIALOG
-	if (FrontEndMenuManager.m_bMenuActive)
-		DefinedState();
-#endif
 #ifdef TIMEBARS
 	tbStartTimer(0, "RenderMenus");
 #endif
@@ -1217,11 +1182,7 @@ AppEventHandler(RsEvent event, void *param)
 
 		case rsFRONTENDIDLE:
 		{
-#ifdef PS2_SAVE_DIALOG
-			Idle((void*)1);
-#else
 			FrontendIdle();
-#endif
 
 			return rsEVENTPROCESSED;
 		}
@@ -1307,9 +1268,9 @@ void TheGame(void)
 		strcpy(TheMemoryCard.LoadFileName, TheMemoryCard.field37);
 		TheMemoryCard.b_FoundRecentSavedGameWantToLoad = true;
 
-		if (CMenuManager::m_PrefsLanguage != TheMemoryCard.GetLanguageToLoad())
+		if (FrontEndMenuManager.m_PrefsLanguage != TheMemoryCard.GetLanguageToLoad())
 		{
-			CMenuManager::m_PrefsLanguage = TheMemoryCard.GetLanguageToLoad();
+			FrontEndMenuManager.m_PrefsLanguage = TheMemoryCard.GetLanguageToLoad();
 			TheText.Unload();
 			TheText.Load();
 		}
@@ -1383,7 +1344,8 @@ void TheGame(void)
 			gMainHeap.PushMemId(_TODOCONST(15));
 #endif
 
-			if (!FrontEndMenuManager.m_bMenuActive || FrontEndMenuManager.m_bRenderGameInMenu == true && TheCamera.GetScreenFadeStatus() != FADE_2 )
+			// m_bRenderGameInMenu is there in III PS2 but I don't know about VC PS2.
+			if (!FrontEndMenuManager.m_bMenuActive || /*FrontEndMenuManager.m_bRenderGameInMenu == true && */TheCamera.GetScreenFadeStatus() != FADE_2 )
 			{
 #ifdef GTA_PS2
 				gMainHeap.PushMemId(_TODOCONST(11));
@@ -1590,30 +1552,30 @@ void SystemInit()
 	CGame::frenchGame = false;
 	CGame::germanGame = false;
 	CGame::nastyGame = true;
-	CMenuManager::m_PrefsAllowNastyGame = true;
+	FrontEndMenuManager.m_PrefsAllowNastyGame = true;
 	
 #ifdef GTA_PS2
 	int32 lang = sceScfGetLanguage();
 	if ( lang  == SCE_ITALIAN_LANGUAGE )
-		CMenuManager::m_PrefsLanguage = LANGUAGE_ITALIAN;
+		FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_ITALIAN;
 	else if ( lang  == SCE_SPANISH_LANGUAGE )
-		CMenuManager::m_PrefsLanguage = LANGUAGE_SPANISH;
+		FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_SPANISH;
 	else if ( lang  == SCE_GERMAN_LANGUAGE )
 	{
 		CGame::germanGame = true;
 		CGame::nastyGame = false;
-		CMenuManager::m_PrefsAllowNastyGame = false;
-		CMenuManager::m_PrefsLanguage = LANGUAGE_GERMAN;
+		FrontEndMenuManager.m_PrefsAllowNastyGame = false;
+		FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_GERMAN;
 	}
 	else if ( lang  == SCE_FRENCH_LANGUAGE )
 	{
 		CGame::frenchGame = true;
 		CGame::nastyGame = false;
-		CMenuManager::m_PrefsAllowNastyGame = false;
-		CMenuManager::m_PrefsLanguage = LANGUAGE_FRENCH;
+		FrontEndMenuManager.m_PrefsAllowNastyGame = false;
+		FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_FRENCH;
 	}
 	else
-		CMenuManager::m_PrefsLanguage = LANGUAGE_AMERICAN;
+		FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_AMERICAN;
 	
 	FrontEndMenuManager.InitialiseMenuContentsAfterLoadingGame();
 #else
diff --git a/src/render/Credits.cpp b/src/render/Credits.cpp
index dc0b0252..60e69583 100644
--- a/src/render/Credits.cpp
+++ b/src/render/Credits.cpp
@@ -128,12 +128,12 @@ CCredits::Render(void)
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED040"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.4f, 0.82f, TheText.Get("CRED041"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.5, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED042"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED043"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.5, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED044"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
@@ -176,7 +176,7 @@ CCredits::Render(void)
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED061"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.5, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED062"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
@@ -191,7 +191,7 @@ CCredits::Render(void)
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED068"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED069"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.5, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED070"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
@@ -220,7 +220,7 @@ CCredits::Render(void)
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED262"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED085"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.5, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED086"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
@@ -265,76 +265,76 @@ CCredits::Render(void)
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED108"), lineoffset, scrolloffset);
 	PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED109"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED110"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED111"), lineoffset, scrolloffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED112"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED113"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED114"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED115"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED116"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED117"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED118"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED119"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED120"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED121"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED122"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED123"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED124"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED125"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED126"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED127"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED128"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED129"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED130"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED131"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED132"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED133"), lineoffset, scrolloffset);
-	if(CMenuManager::m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED134"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
diff --git a/src/render/Fluff.cpp b/src/render/Fluff.cpp
index 59ac1652..1056d6ff 100644
--- a/src/render/Fluff.cpp
+++ b/src/render/Fluff.cpp
@@ -382,7 +382,7 @@ void CScrollBar::Update()
 					m_pMessage = FindTimeMessage();
 					break;
 				case 6:
-					if (CMenuManager::m_PrefsLanguage == LANGUAGE_FRENCH || CMenuManager::m_PrefsLanguage == LANGUAGE_GERMAN)
+					if (FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_FRENCH || FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_GERMAN)
 						m_pMessage = FindTimeMessage();
 					else
 						m_pMessage = "WWW.GRANDTHEFTAUTO3.COM    ";
@@ -602,7 +602,7 @@ void CScrollBar::Update()
 					m_pMessage = "FREE FLUFFY DICE WITH ALL PURCHASES. . .";
 					break;
 				case 9:
-					if (CMenuManager::m_PrefsLanguage == LANGUAGE_FRENCH || CMenuManager::m_PrefsLanguage == LANGUAGE_GERMAN)
+					if (FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_FRENCH || FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_GERMAN)
 						m_pMessage = "QUICK, TAKE A LOOK AT OUR CURRENT STOCK )CAUSE THESE AUTOS ARE MOVIN) FAST . . .  ";
 					else
 						m_pMessage = "HTTP:((ROCKSTARGAMES.COM(GRANDTHEFTAUTO3(CAPITALAUTOS    ";
diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp
index 7289d70c..96149573 100644
--- a/src/render/Hud.cpp
+++ b/src/render/Hud.cpp
@@ -102,6 +102,7 @@ uint32 CHud::m_WeaponState;
 uint32 CHud::m_WeaponTimer;
 
 uint32 CHud::m_LastDisplayScore;
+uint32 CHud::m_LastWanted;
 
 CSprite2d CHud::Sprites[NUM_HUD_SPRITES];
 
@@ -483,33 +484,46 @@ void CHud::Draw()
 		/*
 			DrawWantedLevel
 		*/
-		CFont::SetBackgroundOff();
-		CFont::SetScale(SCREEN_SCALE_X(HUD_TEXT_SCALE_X), SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y));
-		CFont::SetJustifyOff();
-		CFont::SetCentreOff();
-		CFont::SetRightJustifyOn();
-		CFont::SetPropOn();
-		CFont::SetFontStyle(FONT_HEADING);
-		CFont::SetDropShadowPosition(2); // TODO(Miami): Remove that, VC keeps that open above
+		if (m_LastWanted == playerPed->m_pWanted->m_nWantedLevel)
+			alpha = CHud::DrawFadeState(HUD_WANTED_FADING, 0);
+		else {
+			alpha = CHud::DrawFadeState(HUD_WANTED_FADING, 1);
+			m_LastWanted = playerPed->m_pWanted->m_nWantedLevel;
+		}
 
-		AsciiToUnicode("]", sPrintIcon);
+		if (m_WantedState != FADED_OUT) {
+			CFont::SetBackgroundOff();
+			CFont::SetScale(SCREEN_SCALE_X(HUD_TEXT_SCALE_X), SCREEN_SCALE_Y(HUD_TEXT_SCALE_Y));
+			CFont::SetJustifyOff();
+			CFont::SetCentreOff();
+			CFont::SetRightJustifyOn();
+			CFont::SetPropOn();
+			CFont::SetFontStyle(FONT_HEADING);
+			CFont::SetDropShadowPosition(2); // TODO(Miami): Remove that, VC keeps that open above
+			CFont::SetDropColor(CRGBA(0,0,0,alpha)); // TODO(Miami): Remove that, VC keeps that open above
 
-		for (int i = 0; i < 6; i++) {
-			if (playerPed->m_pWanted->m_nWantedLevel > i
-				&& (CTimer::GetTimeInMilliseconds() > playerPed->m_pWanted->m_nLastWantedLevelChange
-					+ 2000 || CTimer::GetFrameCounter() & 4)) {
+			AsciiToUnicode("]", sPrintIcon);
 
-				CFont::SetColor(WANTED_COLOR);
-				CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(110.0f + 23.0f * i), SCREEN_SCALE_Y(87.0f), sPrintIcon);
+			for (int i = 0; i < 6; i++) {
+				if (playerPed->m_pWanted->m_nWantedLevel > i
+					&& (CTimer::GetTimeInMilliseconds() > playerPed->m_pWanted->m_nLastWantedLevelChange
+						+ 2000 || CTimer::GetFrameCounter() & 4)) {
 
-			// TODO(Miami): There is one more condition in here
-			}else if (playerPed->m_pWanted->m_nWantedLevel <= i) {
-				CFont::SetColor(NOTWANTED_COLOR);
-				CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(110.0f + 23.0f * i), SCREEN_SCALE_Y(87.0f), sPrintIcon);
+					WANTED_COLOR.a = alpha;
+					CFont::SetColor(WANTED_COLOR);
+					CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(110.0f + 23.0f * i), SCREEN_SCALE_Y(87.0f), sPrintIcon);
+
+					// TODO(Miami): There is one more condition in here
+				}
+				else if (playerPed->m_pWanted->m_nWantedLevel <= i) {
+					NOTWANTED_COLOR.a = alpha;
+					CFont::SetColor(NOTWANTED_COLOR);
+					CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(110.0f + 23.0f * i), SCREEN_SCALE_Y(87.0f), sPrintIcon);
+				}
 			}
-		}
 
-		CFont::SetDropShadowPosition(0); // TODO(Miami): Remove that, VC keeps that open
+			CFont::SetDropShadowPosition(0); // TODO(Miami): Remove that, VC keeps that open
+		}
 
 		/*
 			DrawZoneName
@@ -1503,20 +1517,28 @@ void CHud::Initialise()
 	PagerSoundPlayed = 0;
 	PagerXOffset = 150.0f;
 
-	m_WantedFadeTimer = 0;
+#ifdef HUD_AUTO_FADE
+	m_EnergyLostState = START_FADE_OUT;
+	m_WantedState = START_FADE_OUT;
+	m_DisplayScoreState = START_FADE_OUT;
+	m_WeaponState = START_FADE_OUT;
+#else
+	m_EnergyLostState = FADE_DISABLED;
 	m_WantedState = FADE_DISABLED;
+	m_DisplayScoreState = FADE_DISABLED;
+	m_WeaponState = FADE_DISABLED;
+#endif
+	m_WantedFadeTimer = 0;
 	m_WantedTimer = 0;
 	m_EnergyLostFadeTimer = 0;
-	m_EnergyLostState = FADE_DISABLED;
 	m_EnergyLostTimer = 0;
 	m_DisplayScoreFadeTimer = 0;
-	m_DisplayScoreState = FADE_DISABLED;
 	m_DisplayScoreTimer = 0;
 	m_WeaponFadeTimer = 0;
-	m_WeaponState = FADE_DISABLED;
 	m_WeaponTimer = 0;
 
 	m_LastDisplayScore = CWorld::Players[CWorld::PlayerInFocus].m_nVisibleMoney;
+	m_LastWanted = 0;
 
 	CTxdStore::PopCurrentTxd();
 }
@@ -1542,20 +1564,28 @@ void CHud::ReInitialise() {
 	PagerSoundPlayed = 0;
 	PagerXOffset = 150.0f;
 
-	m_WantedFadeTimer = 0;
+#ifdef HUD_AUTO_FADE
+	m_EnergyLostState = START_FADE_OUT;
+	m_WantedState = START_FADE_OUT;
+	m_DisplayScoreState = START_FADE_OUT;
+	m_WeaponState = START_FADE_OUT;
+#else
+	m_EnergyLostState = FADE_DISABLED;
 	m_WantedState = FADE_DISABLED;
+	m_DisplayScoreState = FADE_DISABLED;
+	m_WeaponState = FADE_DISABLED;
+#endif
+	m_WantedFadeTimer = 0;
 	m_WantedTimer = 0;
 	m_EnergyLostFadeTimer = 0;
-	m_EnergyLostState = FADE_DISABLED;
 	m_EnergyLostTimer = 0;
 	m_DisplayScoreFadeTimer = 0;
-	m_DisplayScoreState = FADE_DISABLED;
 	m_DisplayScoreTimer = 0;
 	m_WeaponFadeTimer = 0;
-	m_WeaponState = FADE_DISABLED;
 	m_WeaponTimer = 0;
 
 	m_LastDisplayScore = CWorld::Players[CWorld::PlayerInFocus].m_nVisibleMoney;
+	m_LastWanted = 0;
 }
 
 wchar LastBigMessage[6][128];
diff --git a/src/render/Hud.h b/src/render/Hud.h
index bae19ee4..4c02827b 100644
--- a/src/render/Hud.h
+++ b/src/render/Hud.h
@@ -119,6 +119,7 @@ public:
 	static uint32 m_WeaponTimer;
 
 	static uint32 m_LastDisplayScore;
+	static uint32 m_LastWanted;
 
 public:
 	static void Draw();
diff --git a/src/rw/Lights.cpp b/src/rw/Lights.cpp
index 8f7f92b6..cd45b81f 100644
--- a/src/rw/Lights.cpp
+++ b/src/rw/Lights.cpp
@@ -86,9 +86,9 @@ SetLightsWithTimeOfDayColour(RpWorld *)
 		RwFrameTransform(RpLightGetFrame(pDirect), &mat, rwCOMBINEREPLACE);
 	}
 
-	if(CMenuManager::m_PrefsBrightness > 256){
-		float f1 = 2.0f * (CMenuManager::m_PrefsBrightness/256.0f - 1.0f) * 0.6f + 1.0f;
-		float f2 = 3.0f * (CMenuManager::m_PrefsBrightness/256.0f - 1.0f) * 0.6f + 1.0f;
+	if(FrontEndMenuManager.m_PrefsBrightness > 256){
+		float f1 = 2.0f * (FrontEndMenuManager.m_PrefsBrightness/256.0f - 1.0f) * 0.6f + 1.0f;
+		float f2 = 3.0f * (FrontEndMenuManager.m_PrefsBrightness/256.0f - 1.0f) * 0.6f + 1.0f;
 
 		AmbientLightColourForFrame.red = Min(1.0f, AmbientLightColourForFrame.red * f2);
 		AmbientLightColourForFrame.green = Min(1.0f, AmbientLightColourForFrame.green * f2);
diff --git a/src/save/GenericGameStorage.cpp b/src/save/GenericGameStorage.cpp
index 1afa8165..4eff4fb7 100644
--- a/src/save/GenericGameStorage.cpp
+++ b/src/save/GenericGameStorage.cpp
@@ -341,8 +341,8 @@ GenericLoad()
 	LoadSaveDataBlock();
 	ReadDataFromBlock("Loading PedType Stuff \n", CPedType::Load);
 
-	DMAudio.SetMusicMasterVolume(CMenuManager::m_PrefsMusicVolume);
-	DMAudio.SetEffectsMasterVolume(CMenuManager::m_PrefsSfxVolume);
+	DMAudio.SetMusicMasterVolume(FrontEndMenuManager.m_PrefsMusicVolume);
+	DMAudio.SetEffectsMasterVolume(FrontEndMenuManager.m_PrefsSfxVolume);
 	if (!CloseFile(file)) {
 		PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_CLOSE;
 		return false;
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index c60c5cd9..2c46374d 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -176,7 +176,7 @@ psCameraBeginUpdate(RwCamera *camera)
 void
 psCameraShowRaster(RwCamera *camera)
 {
-	if (CMenuManager::m_PrefsVsync)
+	if (FrontEndMenuManager.m_PrefsVsync)
 		RwCameraShowRaster(camera, PSGLOBAL(window), rwRASTERFLIPWAITVSYNC);
 	else
 		RwCameraShowRaster(camera, PSGLOBAL(window), rwRASTERFLIPDONTWAIT);
@@ -944,7 +944,7 @@ void InitialiseLanguage()
 		|| primLayout	  == LANG_GERMAN )
 	{
 		CGame::nastyGame = false;
-		CMenuManager::m_PrefsAllowNastyGame = false;
+		FrontEndMenuManager.m_PrefsAllowNastyGame = false;
 		CGame::germanGame = true;
 	}
 	
@@ -953,7 +953,7 @@ void InitialiseLanguage()
 		|| primLayout	  == LANG_FRENCH )
 	{
 		CGame::nastyGame = false;
-		CMenuManager::m_PrefsAllowNastyGame = false;
+		FrontEndMenuManager.m_PrefsAllowNastyGame = false;
 		CGame::frenchGame = true;
 	}
 	
@@ -964,7 +964,7 @@ void InitialiseLanguage()
 
 #ifdef NASTY_GAME
 	CGame::nastyGame = true;
-	CMenuManager::m_PrefsAllowNastyGame = true;
+	FrontEndMenuManager.m_PrefsAllowNastyGame = true;
 	CGame::noProstitutes = false;
 #endif
 	
@@ -999,33 +999,33 @@ void InitialiseLanguage()
 		}
 	}
 	
-	CMenuManager::OS_Language = primUserLCID;
+	FrontEndMenuManager.OS_Language = primUserLCID;
 
 	switch ( lang )
 	{
 		case LANG_GERMAN:
 		{
-			CMenuManager::m_PrefsLanguage = LANGUAGE_GERMAN;
+			FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_GERMAN;
 			break;
 		}
 		case LANG_SPANISH:
 		{
-			CMenuManager::m_PrefsLanguage = LANGUAGE_SPANISH;
+			FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_SPANISH;
 			break;
 		}
 		case LANG_FRENCH:
 		{
-			CMenuManager::m_PrefsLanguage = LANGUAGE_FRENCH;
+			FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_FRENCH;
 			break;
 		}
 		case LANG_ITALIAN:
 		{
-			CMenuManager::m_PrefsLanguage = LANGUAGE_ITALIAN;
+			FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_ITALIAN;
 			break;
 		}
 		default:
 		{
-			CMenuManager::m_PrefsLanguage = LANGUAGE_AMERICAN;
+			FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_AMERICAN;
 			break;
 		}
 	}
@@ -1486,7 +1486,7 @@ main(int argc, char *argv[])
 						
 						FrontEndMenuManager.m_bGameNotLoaded = true;
 						
-						CMenuManager::m_bStartUpFrontEndRequested = true;
+						FrontEndMenuManager.m_bStartUpFrontEndRequested = true;
 						
 						if ( defaultFullscreenRes )
 						{
@@ -1535,7 +1535,7 @@ main(int argc, char *argv[])
 						float ms = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond();
 						if ( RwInitialised )
 						{
-							if (!CMenuManager::m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
+							if (!FrontEndMenuManager.m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
 								RsEventHandler(rsIDLE, (void *)TRUE);
 						}
 						break;
@@ -1546,7 +1546,7 @@ main(int argc, char *argv[])
 						float ms = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond();
 						if (RwInitialised)
 						{
-							if (!CMenuManager::m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
+							if (!FrontEndMenuManager.m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
 								RsEventHandler(rsANIMVIEWER, (void*)TRUE);
 						}
 						break;
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index f41b9ef8..7fc77d45 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -221,7 +221,7 @@ psCameraBeginUpdate(RwCamera *camera)
 void
 psCameraShowRaster(RwCamera *camera)
 {
-	if (CMenuManager::m_PrefsVsync)
+	if (FrontEndMenuManager.m_PrefsVsync)
 		RwCameraShowRaster(camera, PSGLOBAL(window), rwRASTERFLIPWAITVSYNC);
 	else
 		RwCameraShowRaster(camera, PSGLOBAL(window), rwRASTERFLIPDONTWAIT);
@@ -1654,7 +1654,7 @@ void InitialiseLanguage()
 		|| primLayout	  == LANG_GERMAN )
 	{
 		CGame::nastyGame = false;
-		CMenuManager::m_PrefsAllowNastyGame = false;
+		FrontEndMenuManager.m_PrefsAllowNastyGame = false;
 		CGame::germanGame = true;
 	}
 	
@@ -1663,7 +1663,7 @@ void InitialiseLanguage()
 		|| primLayout	  == LANG_FRENCH )
 	{
 		CGame::nastyGame = false;
-		CMenuManager::m_PrefsAllowNastyGame = false;
+		FrontEndMenuManager.m_PrefsAllowNastyGame = false;
 		CGame::frenchGame = true;
 	}
 	
@@ -1674,7 +1674,7 @@ void InitialiseLanguage()
 
 #ifdef NASTY_GAME
 	CGame::nastyGame = true;
-	CMenuManager::m_PrefsAllowNastyGame = true;
+	FrontEndMenuManager.m_PrefsAllowNastyGame = true;
 	CGame::noProstitutes = false;
 #endif
 	
@@ -1709,33 +1709,33 @@ void InitialiseLanguage()
 		}
 	}
 	
-	CMenuManager::OS_Language = primUserLCID;
+	FrontEndMenuManager.OS_Language = primUserLCID;
 
 	switch ( lang )
 	{
 		case LANG_GERMAN:
 		{
-			CMenuManager::m_PrefsLanguage = LANGUAGE_GERMAN;
+			FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_GERMAN;
 			break;
 		}
 		case LANG_SPANISH:
 		{
-			CMenuManager::m_PrefsLanguage = LANGUAGE_SPANISH;
+			FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_SPANISH;
 			break;
 		}
 		case LANG_FRENCH:
 		{
-			CMenuManager::m_PrefsLanguage = LANGUAGE_FRENCH;
+			FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_FRENCH;
 			break;
 		}
 		case LANG_ITALIAN:
 		{
-			CMenuManager::m_PrefsLanguage = LANGUAGE_ITALIAN;
+			FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_ITALIAN;
 			break;
 		}
 		default:
 		{
-			CMenuManager::m_PrefsLanguage = LANGUAGE_AMERICAN;
+			FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_AMERICAN;
 			break;
 		}
 	}
@@ -2128,7 +2128,7 @@ WinMain(HINSTANCE instance,
 						
 						CoUninitialize();
 						
-						if ( CMenuManager::OS_Language == LANG_FRENCH || CMenuManager::OS_Language == LANG_GERMAN )
+						if ( FrontEndMenuManager.OS_Language == LANG_FRENCH || FrontEndMenuManager.OS_Language == LANG_GERMAN )
 							PlayMovieInWindow(cmdShow, "movies\\GTAtitlesGER.mpg");
 						else
 							PlayMovieInWindow(cmdShow, "movies\\GTAtitles.mpg");
@@ -2179,7 +2179,7 @@ WinMain(HINSTANCE instance,
 						
 						FrontEndMenuManager.m_bGameNotLoaded = true;
 						
-						CMenuManager::m_bStartUpFrontEndRequested = true;
+						FrontEndMenuManager.m_bStartUpFrontEndRequested = true;
 						
 						if ( defaultFullscreenRes )
 						{
@@ -2230,7 +2230,7 @@ WinMain(HINSTANCE instance,
 						float ms = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond();
 						if ( RwInitialised )
 						{
-							if (!CMenuManager::m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
+							if (!FrontEndMenuManager.m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
 								RsEventHandler(rsIDLE, (void *)TRUE);
 						}
 						break;
@@ -2241,7 +2241,7 @@ WinMain(HINSTANCE instance,
 						float ms = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond();
 						if (RwInitialised)
 						{
-							if (!CMenuManager::m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
+							if (!FrontEndMenuManager.m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
 								RsEventHandler(rsANIMVIEWER, (void*)TRUE);
 						}
 						break;
diff --git a/src/text/Text.cpp b/src/text/Text.cpp
index 74f53f80..e092627e 100644
--- a/src/text/Text.cpp
+++ b/src/text/Text.cpp
@@ -39,7 +39,7 @@ CText::Load(void)
 	Unload();
 
 	CFileMgr::SetDir("TEXT");
-	switch(CMenuManager::m_PrefsLanguage){
+	switch(FrontEndMenuManager.m_PrefsLanguage){
 	case LANGUAGE_AMERICAN:
 		sprintf(filename, "AMERICAN.GXT");
 		break;
@@ -241,7 +241,7 @@ CText::LoadMissionText(char *MissionTableName)
 	}
 
 	CFileMgr::SetDir("TEXT");
-	switch (CMenuManager::m_PrefsLanguage) {
+	switch (FrontEndMenuManager.m_PrefsLanguage) {
 	case LANGUAGE_AMERICAN:
 		sprintf(filename, "AMERICAN.GXT");
 		break;