diff --git a/data/ui_scripts/frontend_menus/DataSources_ChangeMapCategories.lua b/data/ui_scripts/frontend_menus/DataSources_ChangeMapCategories.lua
index 9e25f646..468c6bfe 100644
--- a/data/ui_scripts/frontend_menus/DataSources_ChangeMapCategories.lua
+++ b/data/ui_scripts/frontend_menus/DataSources_ChangeMapCategories.lua
@@ -1,35 +1,35 @@
-local f0_local0 = function ( f1_arg0, f1_arg1 )
+local f0_local0 = function(f1_arg0, f1_arg1)
 	if not CoD.useMouse then
-		return 
+		return
 	else
-		LUI.OverrideFunction_CallOriginalFirst( f1_arg0, "setState", function ( element, controller )
-			if IsSelfInState( f1_arg0, "SelectingMap" ) then
-				f1_arg0.mapList:setMouseDisabled( false )
-				f1_arg0.mapCategoriesList:setMouseDisabled( true )
+		LUI.OverrideFunction_CallOriginalFirst(f1_arg0, "setState", function(element, controller)
+			if IsSelfInState(f1_arg0, "SelectingMap") then
+				f1_arg0.mapList:setMouseDisabled(false)
+				f1_arg0.mapCategoriesList:setMouseDisabled(true)
 				f1_arg0.m_categorySet = false
 			else
-				f1_arg0.mapList:setMouseDisabled( true )
-				f1_arg0.mapCategoriesList:setMouseDisabled( false )
+				f1_arg0.mapList:setMouseDisabled(true)
+				f1_arg0.mapCategoriesList:setMouseDisabled(false)
 			end
-		end )
-		f1_arg0.mapList:setMouseDisabled( true )
-		f1_arg0.mapList:registerEventHandler( "leftclick_outside", function ( element, event )
-			if IsSelfInState( f1_arg0, "SelectingMap" ) and f1_arg0.m_categorySet then
-				CoD.PCUtil.SimulateButtonPress( f1_arg1, Enum.LUIButton.LUI_KEY_XBB_PSCIRCLE )
+		end)
+		f1_arg0.mapList:setMouseDisabled(true)
+		f1_arg0.mapList:registerEventHandler("leftclick_outside", function(element, event)
+			if IsSelfInState(f1_arg0, "SelectingMap") and f1_arg0.m_categorySet then
+				CoD.PCUtil.SimulateButtonPress(f1_arg1, Enum.LUIButton.LUI_KEY_XBB_PSCIRCLE)
 			end
 			f1_arg0.m_categorySet = true
 			return true
-		end )
+		end)
 	end
 end
 
-local PostLoadFunc = function ( f4_arg0, f4_arg1 )
-	f0_local0( f4_arg0, f4_arg1 )
+local PostLoadFunc = function(f4_arg0, f4_arg1)
+	f0_local0(f4_arg0, f4_arg1)
 end
 
 local f0_local2 = 10000
 local f0_local3 = 10001
-local f0_local4 = function ( f5_arg0 )
+local f0_local4 = function(f5_arg0)
 	local f5_local0 = CoD.mapsTable[f5_arg0]
 	if CoD.CONTENT_DLC6_INDEX <= f5_local0.dlc_pack or f5_arg0 == "mp_redwood_ice" or f5_arg0 == "mp_veiled_heyday" then
 		return f0_local3
@@ -40,16 +40,16 @@ local f0_local4 = function ( f5_arg0 )
 	end
 end
 
-DataSources.ChangeMapCategories = DataSourceHelpers.ListSetup( "ChangeMapCategories", function ( f6_arg0 )
+DataSources.ChangeMapCategories = DataSourceHelpers.ListSetup("ChangeMapCategories", function(f6_arg0)
 	local f6_local0 = {}
-	local f6_local1 = CoD.GetMapValue( Engine.DvarString( nil, "ui_mapname" ), "dlc_pack", CoD.CONTENT_ORIGINAL_MAP_INDEX )
-	local f6_local2 = function ( f7_arg0, f7_arg1 )
+	local f6_local1 = CoD.GetMapValue(Engine.DvarString(nil, "ui_mapname"), "dlc_pack", CoD.CONTENT_ORIGINAL_MAP_INDEX)
+	local f6_local2 = function(f7_arg0, f7_arg1)
 		return {
 			models = {
-				text = Engine.Localize( "MPUI_MAP_CATEGORY_" .. f7_arg0 .. "_CAPS" ),
-				buttonText = Engine.Localize( "MPUI_MAP_CATEGORY_" .. f7_arg0 .. "_CAPS" ),
+				text = Engine.Localize("MPUI_MAP_CATEGORY_" .. f7_arg0 .. "_CAPS"),
+				buttonText = Engine.Localize("MPUI_MAP_CATEGORY_" .. f7_arg0 .. "_CAPS"),
 				image = "playlist_map",
-				description = Engine.Localize( "MPUI_MAP_CATEGORY_" .. f7_arg0 .. "_DESC" )
+				description = Engine.Localize("MPUI_MAP_CATEGORY_" .. f7_arg0 .. "_DESC")
 			},
 			properties = {
 				category = f7_arg1,
@@ -57,42 +57,40 @@ DataSources.ChangeMapCategories = DataSourceHelpers.ListSetup( "ChangeMapCategor
 			}
 		}
 	end
-	
+
 	CoD.mapsTable = Engine.GetGDTMapsTable()
-	local f6_local3 = function ( f8_arg0 )
-		for f8_local3, f8_local4 in pairs( CoD.mapsTable ) do
-			if f8_local4.session_mode == CoD.gameModeEnum and f0_local4( f8_local3 ) == f8_arg0 and (ShowPurchasableMap( f6_arg0, f8_local3 ) or Engine.IsMapValid( f8_local3 )) then
+	local f6_local3 = function(f8_arg0)
+		for f8_local3, f8_local4 in pairs(CoD.mapsTable) do
+			if f8_local4.session_mode == CoD.gameModeEnum and f0_local4(f8_local3) == f8_arg0 and (ShowPurchasableMap(f6_arg0, f8_local3) or Engine.IsMapValid(f8_local3)) then
 				return true
 			end
 		end
 		return false
 	end
-	
+
 	if CoD.isCampaign == true then
-		table.insert( f6_local0, f6_local2( "missions", CoD.CONTENT_ORIGINAL_MAP_INDEX ) )
-		table.insert( f6_local0, f6_local2( "dev", CoD.CONTENT_DEV_MAP_INDEX ) )
+		table.insert(f6_local0, f6_local2("missions", CoD.CONTENT_ORIGINAL_MAP_INDEX))
+		table.insert(f6_local0, f6_local2("dev", CoD.CONTENT_DEV_MAP_INDEX))
 	else
-		table.insert( f6_local0, f6_local2( "standard", CoD.CONTENT_ORIGINAL_MAP_INDEX ) )
-		if not Dvar.ui_execdemo:get() and f6_local3( f0_local2 ) then
-			table.insert( f6_local0, f6_local2( "dlc", f0_local2 ) )
+		table.insert(f6_local0, f6_local2("standard", CoD.CONTENT_ORIGINAL_MAP_INDEX))
+		if not Dvar.ui_execdemo:get() and f6_local3(f0_local2) then
+			table.insert(f6_local0, f6_local2("dlc", f0_local2))
 		end
-		if not Dvar.ui_execdemo:get() and f6_local3( f0_local3 ) then
-			table.insert( f6_local0, f6_local2( "dlc_bonus", f0_local3 ) )
+		if not Dvar.ui_execdemo:get() and f6_local3(f0_local3) then
+			table.insert(f6_local0, f6_local2("dlc_bonus", f0_local3))
 		end
 		if Mods_Enabled() then --and Engine.Mods_Lists_GetInfoEntries( LuaEnums.USERMAP_BASE_PATH, 0, Engine.Mods_Lists_GetInfoEntriesCount( LuaEnums.USERMAP_BASE_PATH ) ) ~= nil then
-			
-			local f9_local11 = Engine.Mods_Lists_GetInfoEntries( LuaEnums.USERMAP_BASE_PATH, 0, Engine.Mods_Lists_GetInfoEntriesCount( LuaEnums.USERMAP_BASE_PATH ) )
+			local f9_local11 = Engine.Mods_Lists_GetInfoEntries(LuaEnums.USERMAP_BASE_PATH, 0,
+			Engine.Mods_Lists_GetInfoEntriesCount(LuaEnums.USERMAP_BASE_PATH))
 			if f9_local11 then
 				for f9_local12 = 0, #f9_local11, 1 do
 					local f9_local17 = f9_local11[f9_local12]
-					if LUI.startswith( f9_local17.internalName, "mp_" ) then
-		
-						table.insert( f6_local0, f6_local2( "mods", CoD.CONTENT_MODS_INDEX ) )
+					if LUI.startswith(f9_local17.internalName, "mp_") then
+						table.insert(f6_local0, f6_local2("mods", CoD.CONTENT_MODS_INDEX))
 					end
 				end
 			end
 		end
 	end
 	return f6_local0
-end, true )
-
+end, true)
diff --git a/data/ui_scripts/frontend_menus/DataSources_GameSettingsFlyoutButtons.lua b/data/ui_scripts/frontend_menus/DataSources_GameSettingsFlyoutButtons.lua
index d4d4e60b..497efefb 100644
--- a/data/ui_scripts/frontend_menus/DataSources_GameSettingsFlyoutButtons.lua
+++ b/data/ui_scripts/frontend_menus/DataSources_GameSettingsFlyoutButtons.lua
@@ -1,24 +1,24 @@
-local f0_local0 = function ( f1_arg0, f1_arg1 )
+local f0_local0 = function(f1_arg0, f1_arg1)
 	if not CoD.useMouse then
-		return 
+		return
 	else
-		f1_arg0.Options:setHandleMouse( true )
-		f1_arg0.Options:registerEventHandler( "leftclick_outside", function ( element, event )
-			CoD.PCUtil.SimulateButtonPress( event.controller, Enum.LUIButton.LUI_KEY_XBB_PSCIRCLE )
+		f1_arg0.Options:setHandleMouse(true)
+		f1_arg0.Options:registerEventHandler("leftclick_outside", function(element, event)
+			CoD.PCUtil.SimulateButtonPress(event.controller, Enum.LUIButton.LUI_KEY_XBB_PSCIRCLE)
 			return true
-		end )
+		end)
 	end
 end
 
-local PostLoadFunc = function ( f3_arg0, f3_arg1 )
-	f0_local0( f3_arg0, f3_arg1 )
+local PostLoadFunc = function(f3_arg0, f3_arg1)
+	f0_local0(f3_arg0, f3_arg1)
 	f3_arg0.disableBlur = true
 	f3_arg0.disablePopupOpenCloseAnim = true
-	Engine.SetModelValue( Engine.CreateModel( Engine.GetGlobalModel(), "GameSettingsFlyoutOpen" ), true )
-	LUI.OverrideFunction_CallOriginalSecond( f3_arg0, "close", function ( element )
-		Engine.SetModelValue( Engine.CreateModel( Engine.GetGlobalModel(), "GameSettingsFlyoutOpen" ), false )
-	end )
-	f3_arg0:registerEventHandler( "occlusion_change", function ( element, event )
+	Engine.SetModelValue(Engine.CreateModel(Engine.GetGlobalModel(), "GameSettingsFlyoutOpen"), true)
+	LUI.OverrideFunction_CallOriginalSecond(f3_arg0, "close", function(element)
+		Engine.SetModelValue(Engine.CreateModel(Engine.GetGlobalModel(), "GameSettingsFlyoutOpen"), false)
+	end)
+	f3_arg0:registerEventHandler("occlusion_change", function(element, event)
 		local f5_local0 = element:getParent()
 		if f5_local0 then
 			local f5_local1 = f5_local0:getFirstChild()
@@ -30,30 +30,32 @@ local PostLoadFunc = function ( f3_arg0, f3_arg1 )
 			end
 			if f5_local1 then
 				if event.occluded == true then
-					f5_local1:setAlpha( 0 )
+					f5_local1:setAlpha(0)
 				end
-				f5_local1:setAlpha( 1 )
+				f5_local1:setAlpha(1)
 			end
 		end
-		element:OcclusionChange( event )
-	end )
-	f3_arg0:subscribeToModel( Engine.CreateModel( Engine.GetGlobalModel(), "lobbyRoot.lobbyNav", true ), function ( model )
+		element:OcclusionChange(event)
+	end)
+	f3_arg0:subscribeToModel(Engine.CreateModel(Engine.GetGlobalModel(), "lobbyRoot.lobbyNav", true), function(model)
 		local f6_local0 = f3_arg0.occludedBy
 		while f6_local0 do
 			if f6_local0.occludedBy ~= nil then
 				f6_local0 = f6_local0.occludedBy
 			end
 			while f6_local0 and f6_local0.menuName ~= "Lobby" do
-				f6_local0 = GoBack( f6_local0, f3_arg1 )
+				f6_local0 = GoBack(f6_local0, f3_arg1)
 			end
-			Engine.SendClientScriptNotify( f3_arg1, "menu_change" .. Engine.GetLocalClientNum( f3_arg1 ), "Main", "closeToMenu" )
-			return 
+			Engine.SendClientScriptNotify(f3_arg1, "menu_change" .. Engine.GetLocalClientNum(f3_arg1), "Main",
+			"closeToMenu")
+			return
 		end
-		GoBack( f3_arg0, f3_arg1 )
-	end, false )
+		GoBack(f3_arg0, f3_arg1)
+	end, false)
 end
 
-DataSources.GameSettingsFlyoutButtonsCustom = DataSourceHelpers.ListSetup( "GameSettingsFlyoutButtonsCustom", function ( f7_arg0 )
+DataSources.GameSettingsFlyoutButtonsCustom = DataSourceHelpers.ListSetup("GameSettingsFlyoutButtonsCustom",
+function(f7_arg0)
 	local f7_local0 = {
 		{
 			optionDisplay = "MPUI_CHANGE_MAP_CAPS",
@@ -61,9 +63,9 @@ DataSources.GameSettingsFlyoutButtonsCustom = DataSourceHelpers.ListSetup( "Game
 			action = OpenChangeMap
 		},
 		-- {
-			-- optionDisplay = "MPUI_CHANGE_GAME_MODE_CAPS",
-			-- customId = "btnChangeGameMode",
-			-- action = OpenChangeGameMode
+		-- optionDisplay = "MPUI_CHANGE_GAME_MODE_CAPS",
+		-- customId = "btnChangeGameMode",
+		-- action = OpenChangeGameMode
 		-- },
 		{
 			optionDisplay = "MENU_SETUP_BOTS_CAPS",
@@ -77,17 +79,17 @@ DataSources.GameSettingsFlyoutButtonsCustom = DataSourceHelpers.ListSetup( "Game
 		}
 	}
 	-- if CoD.isPC and IsServerBrowserEnabled() then
-		-- table.insert( f7_local0, {
-			-- optionDisplay = "PLATFORM_SERVER_SETTINGS_CAPS",
-			-- customID = "btnServerSettings",
-			-- action = OpenServerSettings
-		-- } )
+	-- table.insert( f7_local0, {
+	-- optionDisplay = "PLATFORM_SERVER_SETTINGS_CAPS",
+	-- customID = "btnServerSettings",
+	-- action = OpenServerSettings
+	-- } )
 	-- end
 	local f7_local1 = {}
-	for f7_local5, f7_local6 in ipairs( f7_local0 ) do
-		table.insert( f7_local1, {
+	for f7_local5, f7_local6 in ipairs(f7_local0) do
+		table.insert(f7_local1, {
 			models = {
-				displayText = Engine.Localize( f7_local6.optionDisplay ),
+				displayText = Engine.Localize(f7_local6.optionDisplay),
 				customId = f7_local6.customId,
 				disabled = f7_local6.disabled
 			},
@@ -97,155 +99,162 @@ DataSources.GameSettingsFlyoutButtonsCustom = DataSourceHelpers.ListSetup( "Game
 				action = f7_local6.action,
 				actionParam = f7_local6.actionParam
 			}
-		} )
+		})
 	end
 	return f7_local1
-end, nil, nil, nil )
+end, nil, nil, nil)
 
-LUI.createMenu.GameSettingsFlyoutMPCustom = function ( controller )
-	local self = CoD.Menu.NewForUIEditor( "GameSettingsFlyoutMPCustom" )
+LUI.createMenu.GameSettingsFlyoutMPCustom = function(controller)
+	local self = CoD.Menu.NewForUIEditor("GameSettingsFlyoutMPCustom")
 	if PreLoadFunc then
-		PreLoadFunc( self, controller )
+		PreLoadFunc(self, controller)
 	end
 	self.soundSet = "default"
-	self:setOwner( controller )
-	self:setLeftRight( true, true, 0, 0 )
-	self:setTopBottom( true, true, 0, 0 )
-	self:playSound( "menu_open", controller )
-	self.buttonModel = Engine.CreateModel( Engine.GetModelForController( controller ), "GameSettingsFlyoutMP.buttonPrompts" )
+	self:setOwner(controller)
+	self:setLeftRight(true, true, 0, 0)
+	self:setTopBottom(true, true, 0, 0)
+	self:playSound("menu_open", controller)
+	self.buttonModel = Engine.CreateModel(Engine.GetModelForController(controller), "GameSettingsFlyoutMP.buttonPrompts")
 	self.anyChildUsesUpdateState = true
-	
-	local Options = LUI.UIList.new( self, controller, -2, 0, nil, false, false, 0, 0, false, false )
+
+	local Options = LUI.UIList.new(self, controller, -2, 0, nil, false, false, 0, 0, false, false)
 	Options:makeFocusable()
-	Options:setLeftRight( true, false, 243.43, 523.43 )
-	Options:setTopBottom( true, false, 177.56, 329.56 )
-	Options:setYRot( 25 )
-	Options:setWidgetType( CoD.FE_List1ButtonLarge_PH )
-	Options:setVerticalCount( 3 )
-	Options:setSpacing( -2 )
-	Options:setDataSource( "GameSettingsFlyoutButtonsCustom" )
-	Options:registerEventHandler( "gain_focus", function ( element, event )
+	Options:setLeftRight(true, false, 243.43, 523.43)
+	Options:setTopBottom(true, false, 177.56, 329.56)
+	Options:setYRot(25)
+	Options:setWidgetType(CoD.FE_List1ButtonLarge_PH)
+	Options:setVerticalCount(3)
+	Options:setSpacing(-2)
+	Options:setDataSource("GameSettingsFlyoutButtonsCustom")
+	Options:registerEventHandler("gain_focus", function(element, event)
 		local f9_local0 = nil
 		if element.gainFocus then
-			f9_local0 = element:gainFocus( event )
+			f9_local0 = element:gainFocus(event)
 		elseif element.super.gainFocus then
-			f9_local0 = element.super:gainFocus( event )
+			f9_local0 = element.super:gainFocus(event)
 		end
-		CoD.Menu.UpdateButtonShownState( element, self, controller, Enum.LUIButton.LUI_KEY_XBA_PSCROSS )
+		CoD.Menu.UpdateButtonShownState(element, self, controller, Enum.LUIButton.LUI_KEY_XBA_PSCROSS)
 		return f9_local0
-	end )
-	Options:registerEventHandler( "lose_focus", function ( element, event )
+	end)
+	Options:registerEventHandler("lose_focus", function(element, event)
 		local f10_local0 = nil
 		if element.loseFocus then
-			f10_local0 = element:loseFocus( event )
+			f10_local0 = element:loseFocus(event)
 		elseif element.super.loseFocus then
-			f10_local0 = element.super:loseFocus( event )
+			f10_local0 = element.super:loseFocus(event)
 		end
 		return f10_local0
-	end )
-	self:AddButtonCallbackFunction( Options, controller, Enum.LUIButton.LUI_KEY_XBA_PSCROSS, "ENTER", function ( element, menu, controller, model )
-		ProcessListAction( self, element, controller )
+	end)
+	self:AddButtonCallbackFunction(Options, controller, Enum.LUIButton.LUI_KEY_XBA_PSCROSS, "ENTER",
+	function(element, menu, controller, model)
+		ProcessListAction(self, element, controller)
 		return true
-	end, function ( element, menu, controller )
-		CoD.Menu.SetButtonLabel( menu, Enum.LUIButton.LUI_KEY_XBA_PSCROSS, "MENU_SELECT" )
+	end, function(element, menu, controller)
+		CoD.Menu.SetButtonLabel(menu, Enum.LUIButton.LUI_KEY_XBA_PSCROSS, "MENU_SELECT")
 		return true
-	end, false )
-	self:addElement( Options )
+	end, false)
+	self:addElement(Options)
 	self.Options = Options
-	
-	self:mergeStateConditions( {
+
+	self:mergeStateConditions({
 		{
 			stateName = "Local",
-			condition = function ( menu, element, event )
+			condition = function(menu, element, event)
 				return IsLobbyNetworkModeLAN()
 			end
 		}
-	} )
-	self:subscribeToModel( Engine.GetModel( Engine.GetGlobalModel(), "lobbyRoot.lobbyNetworkMode" ), function ( model )
+	})
+	self:subscribeToModel(Engine.GetModel(Engine.GetGlobalModel(), "lobbyRoot.lobbyNetworkMode"), function(model)
 		local f14_local0 = self
 		local f14_local1 = {
 			controller = controller,
 			name = "model_validation",
-			modelValue = Engine.GetModelValue( model ),
+			modelValue = Engine.GetModelValue(model),
 			modelName = "lobbyRoot.lobbyNetworkMode"
 		}
-		CoD.Menu.UpdateButtonShownState( f14_local0, self, controller, Enum.LUIButton.LUI_KEY_XBY_PSTRIANGLE )
-	end )
-	self:subscribeToModel( Engine.GetModel( Engine.GetGlobalModel(), "lobbyRoot.lobbyNav" ), function ( model )
+		CoD.Menu.UpdateButtonShownState(f14_local0, self, controller, Enum.LUIButton.LUI_KEY_XBY_PSTRIANGLE)
+	end)
+	self:subscribeToModel(Engine.GetModel(Engine.GetGlobalModel(), "lobbyRoot.lobbyNav"), function(model)
 		local f15_local0 = self
 		local f15_local1 = {
 			controller = controller,
 			name = "model_validation",
-			modelValue = Engine.GetModelValue( model ),
+			modelValue = Engine.GetModelValue(model),
 			modelName = "lobbyRoot.lobbyNav"
 		}
-		CoD.Menu.UpdateButtonShownState( f15_local0, self, controller, Enum.LUIButton.LUI_KEY_XBY_PSTRIANGLE )
-	end )
-	self:AddButtonCallbackFunction( self, controller, Enum.LUIButton.LUI_KEY_XBB_PSCIRCLE, nil, function ( element, menu, controller, model )
-		GoBack( self, controller )
-		ClearMenuSavedState( menu )
+		CoD.Menu.UpdateButtonShownState(f15_local0, self, controller, Enum.LUIButton.LUI_KEY_XBY_PSTRIANGLE)
+	end)
+	self:AddButtonCallbackFunction(self, controller, Enum.LUIButton.LUI_KEY_XBB_PSCIRCLE, nil,
+	function(element, menu, controller, model)
+		GoBack(self, controller)
+		ClearMenuSavedState(menu)
 		return true
-	end, function ( element, menu, controller )
-		CoD.Menu.SetButtonLabel( menu, Enum.LUIButton.LUI_KEY_XBB_PSCIRCLE, "" )
+	end, function(element, menu, controller)
+		CoD.Menu.SetButtonLabel(menu, Enum.LUIButton.LUI_KEY_XBB_PSCIRCLE, "")
 		return false
-	end, false )
-	self:AddButtonCallbackFunction( self, controller, Enum.LUIButton.LUI_KEY_START, "M", function ( element, menu, controller, model )
-		GoBackAndOpenOverlayOnParent( self, "StartMenu_Main", controller )
+	end, false)
+	self:AddButtonCallbackFunction(self, controller, Enum.LUIButton.LUI_KEY_START, "M",
+	function(element, menu, controller, model)
+		GoBackAndOpenOverlayOnParent(self, "StartMenu_Main", controller)
 		return true
-	end, function ( element, menu, controller )
-		CoD.Menu.SetButtonLabel( menu, Enum.LUIButton.LUI_KEY_START, "MENU_MENU" )
+	end, function(element, menu, controller)
+		CoD.Menu.SetButtonLabel(menu, Enum.LUIButton.LUI_KEY_START, "MENU_MENU")
 		return true
-	end, false )
-	self:AddButtonCallbackFunction( self, controller, Enum.LUIButton.LUI_KEY_XBY_PSTRIANGLE, "S", function ( element, menu, controller, model )
-		if not IsLAN() and not IsPlayerAGuest( controller ) and IsPlayerAllowedToPlayOnline( controller ) then
-			GoBackAndOpenOverlayOnParent( self, "Social_Main", controller )
+	end, false)
+	self:AddButtonCallbackFunction(self, controller, Enum.LUIButton.LUI_KEY_XBY_PSTRIANGLE, "S",
+	function(element, menu, controller, model)
+		if not IsLAN() and not IsPlayerAGuest(controller) and IsPlayerAllowedToPlayOnline(controller) then
+			GoBackAndOpenOverlayOnParent(self, "Social_Main", controller)
 			return true
 		else
-			
+
 		end
-	end, function ( element, menu, controller )
-		if not IsLAN() and not IsPlayerAGuest( controller ) and IsPlayerAllowedToPlayOnline( controller ) then
-			CoD.Menu.SetButtonLabel( menu, Enum.LUIButton.LUI_KEY_XBY_PSTRIANGLE, "" )
+	end, function(element, menu, controller)
+		if not IsLAN() and not IsPlayerAGuest(controller) and IsPlayerAllowedToPlayOnline(controller) then
+			CoD.Menu.SetButtonLabel(menu, Enum.LUIButton.LUI_KEY_XBY_PSTRIANGLE, "")
 			return false
 		else
 			return false
 		end
-	end, false )
-	self:AddButtonCallbackFunction( self, controller, Enum.LUIButton.LUI_KEY_LB, nil, function ( element, menu, controller, model )
-		SendButtonPressToOccludedMenu( menu, controller, model, Enum.LUIButton.LUI_KEY_LB )
+	end, false)
+	self:AddButtonCallbackFunction(self, controller, Enum.LUIButton.LUI_KEY_LB, nil,
+	function(element, menu, controller, model)
+		SendButtonPressToOccludedMenu(menu, controller, model, Enum.LUIButton.LUI_KEY_LB)
 		return true
-	end, function ( element, menu, controller )
-		CoD.Menu.SetButtonLabel( menu, Enum.LUIButton.LUI_KEY_LB, "" )
+	end, function(element, menu, controller)
+		CoD.Menu.SetButtonLabel(menu, Enum.LUIButton.LUI_KEY_LB, "")
 		return false
-	end, false )
-	self:AddButtonCallbackFunction( self, controller, Enum.LUIButton.LUI_KEY_RB, nil, function ( element, menu, controller, model )
-		SendButtonPressToOccludedMenu( menu, controller, model, Enum.LUIButton.LUI_KEY_RB )
+	end, false)
+	self:AddButtonCallbackFunction(self, controller, Enum.LUIButton.LUI_KEY_RB, nil,
+	function(element, menu, controller, model)
+		SendButtonPressToOccludedMenu(menu, controller, model, Enum.LUIButton.LUI_KEY_RB)
 		return true
-	end, function ( element, menu, controller )
-		CoD.Menu.SetButtonLabel( menu, Enum.LUIButton.LUI_KEY_RB, "" )
+	end, function(element, menu, controller)
+		CoD.Menu.SetButtonLabel(menu, Enum.LUIButton.LUI_KEY_RB, "")
 		return false
-	end, false )
+	end, false)
 	Options.id = "Options"
-	self:processEvent( {
+	self:processEvent({
 		name = "menu_loaded",
 		controller = controller
-	} )
-	self:processEvent( {
+	})
+	self:processEvent({
 		name = "update_state",
 		menu = self
-	} )
+	})
 	if not self:restoreState() then
-		self.Options:processEvent( {
+		self.Options:processEvent({
 			name = "gain_focus",
 			controller = controller
-		} )
+		})
 	end
-	LUI.OverrideFunction_CallOriginalSecond( self, "close", function ( element )
+	LUI.OverrideFunction_CallOriginalSecond(self, "close", function(element)
 		element.Options:close()
-		Engine.UnsubscribeAndFreeModel( Engine.GetModel( Engine.GetModelForController( controller ), "GameSettingsFlyoutMP.buttonPrompts" ) )
-	end )
+		Engine.UnsubscribeAndFreeModel(Engine.GetModel(Engine.GetModelForController(controller),
+		"GameSettingsFlyoutMP.buttonPrompts"))
+	end)
 	if PostLoadFunc then
-		PostLoadFunc( self, controller )
+		PostLoadFunc(self, controller)
 	end
 	return self
 end
diff --git a/data/ui_scripts/frontend_menus/DataSources_StartMenuTabs.lua b/data/ui_scripts/frontend_menus/DataSources_StartMenuTabs.lua
index 2a07cb6a..77767260 100644
--- a/data/ui_scripts/frontend_menus/DataSources_StartMenuTabs.lua
+++ b/data/ui_scripts/frontend_menus/DataSources_StartMenuTabs.lua
@@ -1,31 +1,31 @@
-DataSources.StartMenuTabs = ListHelper_SetupDataSource( "StartMenuTabs", function ( f44_arg0 )
+DataSources.StartMenuTabs = ListHelper_SetupDataSource("StartMenuTabs", function(f44_arg0)
 	local f44_local0 = {}
-	table.insert( f44_local0, {
+	table.insert(f44_local0, {
 		models = {
 			tabIcon = CoD.buttonStrings.shoulderl
 		},
 		properties = {
 			m_mouseDisabled = true
 		}
-	} )
+	})
 	if Engine.IsDemoPlaying() then
 		local f44_local1 = "CoD.StartMenu_GameOptions"
 		if Engine.IsZombiesGame() then
 			f44_local1 = "CoD.StartMenu_GameOptions_ZM"
 		end
-		table.insert( f44_local0, {
+		table.insert(f44_local0, {
 			models = {
-				tabName = Engine.Localize( "MENU_THEATER_CAPS" ),
+				tabName = Engine.Localize("MENU_THEATER_CAPS"),
 				tabWidget = f44_local1,
 				tabIcon = ""
 			},
 			properties = {
 				tabId = "gameOptions"
 			}
-		} )
+		})
 	elseif Engine.IsInGame() then
 		if IsGameTypeDOA() and not InSafehouse() then
-			table.insert( f44_local0, {
+			table.insert(f44_local0, {
 				models = {
 					tabName = "DOA",
 					tabWidget = "CoD.StartMenu_GameOptions_DOA",
@@ -34,21 +34,21 @@ DataSources.StartMenuTabs = ListHelper_SetupDataSource( "StartMenuTabs", functio
 				properties = {
 					tabId = "gameOptions"
 				}
-			} )
+			})
 		elseif CoD.isCampaign then
-			table.insert( f44_local0, {
+			table.insert(f44_local0, {
 				models = {
-					tabName = SessionModeToUnlocalizedSessionModeCaps( Engine.CurrentSessionMode() ),
+					tabName = SessionModeToUnlocalizedSessionModeCaps(Engine.CurrentSessionMode()),
 					tabWidget = "CoD.StartMenu_GameOptions_CP",
 					tabIcon = ""
 				},
 				properties = {
 					tabId = "gameOptions"
 				}
-			} )
+			})
 			if not Engine.IsCampaignModeZombies() then
-				if CoD.isSafehouse and CoD.isOnlineGame() and not IsInTrainingSim( f44_arg0 ) and Dvar.ui_safehousebarracks:get() and not IsPlayerAGuest( f44_arg0 ) then
-					table.insert( f44_local0, {
+				if CoD.isSafehouse and CoD.isOnlineGame() and not IsInTrainingSim(f44_arg0) and Dvar.ui_safehousebarracks:get() and not IsPlayerAGuest(f44_arg0) then
+					table.insert(f44_local0, {
 						models = {
 							tabName = "CPUI_BARRACKS_CAPS",
 							tabWidget = "CoD.CombatRecordCP_Contents",
@@ -57,10 +57,10 @@ DataSources.StartMenuTabs = ListHelper_SetupDataSource( "StartMenuTabs", functio
 						properties = {
 							tabId = "combatRecord"
 						}
-					} )
+					})
 				end
-				if HighestMapReachedGreaterThan( f44_arg0, 1 ) or LUI.DEV ~= nil then
-					table.insert( f44_local0, {
+				if HighestMapReachedGreaterThan(f44_arg0, 1) or LUI.DEV ~= nil then
+					table.insert(f44_local0, {
 						models = {
 							tabName = "CPUI_TACTICAL_MODE_CAPS",
 							tabWidget = "CoD.StartMenu_TacticalMode",
@@ -69,10 +69,10 @@ DataSources.StartMenuTabs = ListHelper_SetupDataSource( "StartMenuTabs", functio
 						properties = {
 							tabId = "tacticalMode"
 						}
-					} )
+					})
 				end
-				if not CoD.isSafehouse and not IsPlayerAGuest( f44_arg0 ) then
-					table.insert( f44_local0, {
+				if not CoD.isSafehouse and not IsPlayerAGuest(f44_arg0) then
+					table.insert(f44_local0, {
 						models = {
 							tabName = "CPUI_ACCOLADES",
 							tabWidget = "CoD.MissionRecordVault_Challenges",
@@ -81,35 +81,35 @@ DataSources.StartMenuTabs = ListHelper_SetupDataSource( "StartMenuTabs", functio
 						properties = {
 							tabId = "accolades"
 						}
-					} )
+					})
 				end
 			end
 		elseif Engine.IsZombiesGame() then
-			table.insert( f44_local0, {
+			table.insert(f44_local0, {
 				models = {
-					tabName = SessionModeToUnlocalizedSessionModeCaps( Engine.CurrentSessionMode() ),
+					tabName = SessionModeToUnlocalizedSessionModeCaps(Engine.CurrentSessionMode()),
 					tabWidget = "CoD.StartMenu_GameOptions_ZM",
 					tabIcon = ""
 				},
 				properties = {
 					tabId = "gameOptions"
 				}
-			} )
+			})
 		else
-			table.insert( f44_local0, {
+			table.insert(f44_local0, {
 				models = {
-					tabName = SessionModeToUnlocalizedSessionModeCaps( Engine.CurrentSessionMode() ),
+					tabName = SessionModeToUnlocalizedSessionModeCaps(Engine.CurrentSessionMode()),
 					tabWidget = "CoD.StartMenu_GameOptions",
 					tabIcon = ""
 				},
 				properties = {
 					tabId = "gameOptions"
 				}
-			} )
+			})
 		end
 	else
-		if not IsPlayerAGuest( f44_arg0 ) then
-			table.insert( f44_local0, {
+		if not IsPlayerAGuest(f44_arg0) then
+			table.insert(f44_local0, {
 				models = {
 					tabName = "MENU_TAB_IDENTITY_CAPS",
 					tabWidget = "CoD.StartMenu_Identity",
@@ -119,10 +119,10 @@ DataSources.StartMenuTabs = ListHelper_SetupDataSource( "StartMenuTabs", functio
 					tabId = "identity",
 					disabled = Dvar.ui_execdemo_gamescom:get()
 				}
-			} )
+			})
 		end
-		if not IsLobbyNetworkModeLAN() and not Dvar.ui_execdemo:get() and not Engine.IsCampaignModeZombies() and not IsPlayerAGuest( f44_arg0 ) then
-			table.insert( f44_local0, {
+		if not IsLobbyNetworkModeLAN() and not Dvar.ui_execdemo:get() and not Engine.IsCampaignModeZombies() and not IsPlayerAGuest(f44_arg0) then
+			table.insert(f44_local0, {
 				models = {
 					tabName = "MENU_TAB_CHALLENGES_CAPS",
 					tabWidget = "CoD.StartMenu_Challenges",
@@ -131,12 +131,12 @@ DataSources.StartMenuTabs = ListHelper_SetupDataSource( "StartMenuTabs", functio
 				properties = {
 					tabId = "challenges"
 				}
-			} )
+			})
 			local f44_local1 = CoD.isPC
 			if f44_local1 then
 				f44_local1 = false --Mods_IsUsingMods()
 			end
-			table.insert( f44_local0, {
+			table.insert(f44_local0, {
 				models = {
 					tabName = "MENU_TAB_BARRACKS_CAPS",
 					tabWidget = "CoD.StartMenu_Barracks",
@@ -146,11 +146,11 @@ DataSources.StartMenuTabs = ListHelper_SetupDataSource( "StartMenuTabs", functio
 				properties = {
 					tabId = "barracks"
 				}
-			} )
+			})
 			if CommunityOptionsEnabled() then
 				local f44_local2 = CoD.perController[f44_arg0].openMediaTabAfterClosingGroups
 				CoD.perController[f44_arg0].openMediaTabAfterClosingGroups = false
-				table.insert( f44_local0, {
+				table.insert(f44_local0, {
 					models = {
 						tabName = "MENU_TAB_MEDIA_CAPS",
 						tabWidget = "CoD.StartMenu_Media",
@@ -160,7 +160,7 @@ DataSources.StartMenuTabs = ListHelper_SetupDataSource( "StartMenuTabs", functio
 						tabId = "media",
 						selectIndex = f44_local2
 					}
-				} )
+				})
 			end
 		end
 	end
@@ -183,7 +183,7 @@ DataSources.StartMenuTabs = ListHelper_SetupDataSource( "StartMenuTabs", functio
 		end
 		f44_local4.selectIndex = f44_local5
 		f44_local3.properties = f44_local4
-		f44_local1( f44_local2, f44_local3 )
+		f44_local1(f44_local2, f44_local3)
 	else
 		local f44_local1 = table.insert
 		local f44_local2 = f44_local0
@@ -203,15 +203,15 @@ DataSources.StartMenuTabs = ListHelper_SetupDataSource( "StartMenuTabs", functio
 		end
 		f44_local4.selectIndex = f44_local5
 		f44_local3.properties = f44_local4
-		f44_local1( f44_local2, f44_local3 )
+		f44_local1(f44_local2, f44_local3)
 	end
-	table.insert( f44_local0, {
+	table.insert(f44_local0, {
 		models = {
 			tabIcon = CoD.buttonStrings.shoulderr
 		},
 		properties = {
 			m_mouseDisabled = true
 		}
-	} )
+	})
 	return f44_local0
-end, true )
\ No newline at end of file
+end, true)
diff --git a/data/ui_scripts/frontend_menus/__init__.lua b/data/ui_scripts/frontend_menus/__init__.lua
index 3268ccbf..55aa2f90 100644
--- a/data/ui_scripts/frontend_menus/__init__.lua
+++ b/data/ui_scripts/frontend_menus/__init__.lua
@@ -2,8 +2,8 @@ if Engine.GetCurrentMap() ~= "core_frontend" then
   return
 end
 
-local EnableLobbyMapVote = true -- toggle map vote in public lobby
-local EnableLargeServerBrowserButton = true -- toggle large server browser button
+local enableLobbyMapVote = true             -- toggle map vote in public lobby
+local enableLargeServerBrowserButton = true -- toggle large server browser button
 
 local utils = require("utils")
 require("DataSources_StartMenuTabs")
@@ -52,43 +52,42 @@ CoD.LobbyButtons.SETTING_UP_BOTS = {
 
 CoD.LobbyButtons.GameSettingsFlyoutArenas = {
   stringRef = "MPUI_SETUP_GAME_CAPS",
-  action = function( self, element, controller, param, menu )
-    SetPerControllerTableProperty( controller, "disableGameSettingsOptions", true )
-    OpenPopup( menu, "GameSettingsFlyoutMP", controller )
+  action = function(self, element, controller, param, menu)
+    SetPerControllerTableProperty(controller, "disableGameSettingsOptions", true)
+    OpenPopup(menu, "GameSettingsFlyoutMP", controller)
   end,
   customId = "btnGameSettingsFlyoutMP"
 }
 
 CoD.LobbyButtons.GameSettingsFlyoutMP = {
   stringRef = "MPUI_SETUP_GAME_CAPS",
-  action = function( self, element, controller, param, menu )
-    SetPerControllerTableProperty( controller, "disableGameSettingsOptions", true )
-    OpenPopup( menu, "GameSettingsFlyoutMPCustom", controller )
+  action = function(self, element, controller, param, menu)
+    SetPerControllerTableProperty(controller, "disableGameSettingsOptions", true)
+    OpenPopup(menu, "GameSettingsFlyoutMPCustom", controller)
   end,
   customId = "btnGameSettingsFlyoutMPCustom"
 }
 
 CoD.LobbyButtons.SERVER_BROWSER = {
   stringRef = "MENU_SERVER_BROWSER_CAPS",
-  action = function( self, element, controller, param, menu )
-      SetPerControllerTableProperty( controller, "disableGameSettingsOptions", true )
-      OpenPopup( menu, "LobbyServerBrowserOnline", controller )
+  action = function(self, element, controller, param, menu)
+    SetPerControllerTableProperty(controller, "disableGameSettingsOptions", true)
+    OpenPopup(menu, "LobbyServerBrowserOnline", controller)
   end,
   customId = "btnDedicated"
 }
 
-local LobbyMapVoteIsEnabled = EnableLobbyMapVote
-local LobbyMapVote = function( LobbyMapVoteIsEnabled )
-  if LobbyMapVoteIsEnabled == true then
-    Engine.Exec( nil, "LobbyStopDemo" )
+local lobbyMapVoteIsEnabled = enableLobbyMapVote
+local lobbyMapVote = function(lobbyMapVoteIsEnabled)
+  if lobbyMapVoteIsEnabled == true then
+    Engine.Exec(nil, "LobbyStopDemo")
   end
 end
 
 local addCustomButtons = function(controller, menuId, buttonTable, isLeader)
-
   if menuId == LobbyData.UITargets.UI_MPLOBBYMAIN.id then
     utils.RemoveSpaces(buttonTable)
-    utils.AddSpacer(buttonTable, utils.GetButtonIndex(buttonTable, CoD.LobbyButtons.THEATER_MP)-1)
+    utils.AddSpacer(buttonTable, utils.GetButtonIndex(buttonTable, CoD.LobbyButtons.THEATER_MP) - 1)
   end
 
   if menuId == LobbyData.UITargets.UI_MPLOBBYONLINE.id or menuId == LobbyData.UITargets.UI_ZMLOBBYONLINE.id then
@@ -100,11 +99,10 @@ local addCustomButtons = function(controller, menuId, buttonTable, isLeader)
   end
 
   if menuId == LobbyData.UITargets.UI_MPLOBBYONLINE.id then
-    LobbyMapVoteIsEnabled = EnableLobbyMapVote
-    if EnableLargeServerBrowserButton then
+    lobbyMapVoteIsEnabled = enableLobbyMapVote
+    if enableLargeServerBrowserButton then
       utils.AddLargeButton(controller, buttonTable, CoD.LobbyButtons.SERVER_BROWSER, 1)
     end
-
   elseif menuId == LobbyData.UITargets.UI_MPLOBBYONLINEPUBLICGAME.id then
     utils.RemoveButton(buttonTable, CoD.LobbyButtons.MP_PUBLIC_LOBBY_LEADERBOARD)
 
@@ -112,9 +110,8 @@ local addCustomButtons = function(controller, menuId, buttonTable, isLeader)
     utils.AddSmallButton(controller, buttonTable, CoD.LobbyButtons.GameSettingsFlyoutMP, 2)
     utils.AddSpacer(buttonTable, utils.GetButtonIndex(buttonTable, CoD.LobbyButtons.GameSettingsFlyoutMP))
 
-    LobbyMapVote( LobbyMapVoteIsEnabled )
-    LobbyMapVoteIsEnabled = false
-
+    lobbyMapVote(lobbyMapVoteIsEnabled)
+    lobbyMapVoteIsEnabled = false
   elseif menuId == LobbyData.UITargets.UI_MPLOBBYONLINEARENAGAME.id then
     utils.AddLargeButton(controller, buttonTable, CoD.LobbyButtons.MP_START_GAME, 1)
     utils.AddSmallButton(controller, buttonTable, CoD.LobbyButtons.GameSettingsFlyoutArenas, 2)
@@ -125,11 +122,11 @@ local addCustomButtons = function(controller, menuId, buttonTable, isLeader)
   if menuId == LobbyData.UITargets.UI_ZMLOBBYONLINE.id then
     -- utils.RemoveButton(buttonTable,CoD.LobbyButtons.ZM_FIND_MATCH)
     utils.RemoveButton(buttonTable, CoD.LobbyButtons.THEATER_ZM)
-    utils.AddLargeButton(controller, buttonTable, CoD.LobbyButtons.THEATER_ZM, #buttonTable+1)
+    utils.AddLargeButton(controller, buttonTable, CoD.LobbyButtons.THEATER_ZM, #buttonTable + 1)
 
     utils.RemoveSpaces(buttonTable)
     utils.AddSpacer(buttonTable, utils.GetButtonIndex(buttonTable, CoD.LobbyButtons.SERVER_BROWSER))
-    utils.AddSpacer(buttonTable, utils.GetButtonIndex(buttonTable, CoD.LobbyButtons.ZM_BUBBLEGUM_BUFFS)-1)
+    utils.AddSpacer(buttonTable, utils.GetButtonIndex(buttonTable, CoD.LobbyButtons.ZM_BUBBLEGUM_BUFFS) - 1)
     utils.AddSpacer(buttonTable, utils.GetButtonIndex(buttonTable, CoD.LobbyButtons.STATS))
   end
 end
diff --git a/data/ui_scripts/frontend_menus/utils.lua b/data/ui_scripts/frontend_menus/utils.lua
index 78b18d65..7abe1926 100644
--- a/data/ui_scripts/frontend_menus/utils.lua
+++ b/data/ui_scripts/frontend_menus/utils.lua
@@ -18,9 +18,9 @@ end
 
 local RemoveButton = function(buttonTable, button)
   for id, v in pairs(buttonTable) do
-	if buttonTable[id].optionDisplay == button.stringRef then
-	   table.remove(buttonTable,id)
-	end
+    if buttonTable[id].optionDisplay == button.stringRef then
+      table.remove(buttonTable, id)
+    end
   end
 end
 
@@ -33,8 +33,8 @@ end
 local GetButtonIndex = function(buttonTable, button)
   for id, v in pairs(buttonTable) do
     if buttonTable[id].optionDisplay == button.stringRef then
-	  return id
-	end
+      return id
+    end
   end
 end