Fixed panels for new casual/comp modes

3 files changed, 212 insertions, 2281 deletions

diff --git a/resource/ui/econ/lobbyleaderboard.res b/resource/ui/econ/lobbyleaderboard.res
index d40d6f1..f4d178c 100644
--- a/resource/ui/econ/lobbyleaderboard.res
+++ b/resource/ui/econ/lobbyleaderboard.res
@@ -16,6 +16,52 @@
 		"proportionaltoparent" "1"
 	}
 
+	"LocalLeaderboardButton"
+	{
+		"ControlName"	"Button"
+		"fieldName"		"LocalLeaderboardButton"
+		"xpos"			"p0.05"
+		"ypos"			"2"
+		"zpos"			"0"
+		"wide"			"p0.44"
+		"tall"			"15"
+		"visible"		"1"
+		"proportionaltoparent"	"1"
+
+		"actionsignallevel"		"1"
+		"command"		"local"
+		"labeltext"		"#TF_Competitive_Friends"
+		"font"			"HudFontSmallestBold"
+		"fgcolor_override"	"TanLight"
+		"textAlignment"	"center"
+
+		"sound_depressed"	"UI/buttonclick.wav"
+		"sound_released"	"UI/buttonclickrelease.wav"
+	}
+
+	"GlobalLeaderboardButton"
+	{
+		"ControlName"	"Button"
+		"fieldName"		"GlobalLeaderboardButton"
+		"xpos"			"rs1-p0.05"
+		"ypos"			"2"
+		"zpos"			"0"
+		"wide"			"p0.44"
+		"tall"			"15"
+		"visible"		"1"
+		"proportionaltoparent"	"1"
+
+		"actionsignallevel"		"1"
+		"command"		"global"
+		"labeltext"		"#TF_Competitive_Global"
+		"font"			"HudFontSmallestBold"
+		"fgcolor_override"	"TanLight"
+		"textAlignment"	"center"
+
+		"sound_depressed"	"UI/buttonclick.wav"
+		"sound_released"	"UI/buttonclickrelease.wav"
+	}	
+
 	"Line"
 	{
 		"ControlName"		"EditablePanel"
diff --git a/resource/ui/lobbycontainerframe.res b/resource/ui/lobbycontainerframe.res
index f3e7cc6..9e4e8ff 100644
--- a/resource/ui/lobbycontainerframe.res
+++ b/resource/ui/lobbycontainerframe.res
@@ -220,22 +220,6 @@
 		"border_armed"				"ButtonHover"
 	}	
 
-	"WaitingForLeaderLabel"
-	{
-		"ControlName"		"CExLabel"
-		"fieldName"		"WaitingForLeaderLabel"
-		"font"			"HudFontSmall"
-		"xpos"		"c+35"
-		"ypos"		"410"
-		"zpos"			"2"
-		"wide"		"300"
-		"tall"		"80"
-		"textAlignment"	"east"
-		"visible"	"1"
-		"enabled"	"1"
-		"labeltext"	"#TF_Matchmaking_LobbyLeaderMustStart"
-	}
-
 	"NotificationsPresentPanel"
 	{
 		"ControlName"	"CNotificationsPresentPanel"
@@ -249,45 +233,39 @@
 		"enabled"		"1"
 	}
 
-	"LearnMoreButton"
+	"MatchmakingBanPanel"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"LearnMoreButton"
-		"xpos"			"c-101"
-		"ypos"			"437"
+		"ControlName"	"EditablePanel"
+		"fieldName"		"MatchmakingBanPanel"
+		"xpos"			"c-113"
+		"ypos"			"428"
 		"zpos"			"2"
-		"wide"			"195"
-		"tall"			"25"
-		"autoResize"	"0"
-		//"pinCorner"		"3"
-		"visible"		"1"
+		"wide"			"220"
+		"tall"			"40"
+		"visible"		"0"
 		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"#TF_MvM_LearnMore"
-		"font"			"HudFontSmallBold"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"Command"		"learn_more"
+		"mouseinputenabled"	"0"
+		"bgcolor_override"	"Black"
 
-		"NavUp"			"PracticeButton"
-		"NavLeft"		"BackButton2"
-		"NavRight"		"NextButton"
-
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		
-		"paintbackground"	"1"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
-		"border_default"			"ButtonHover"
-		"border_armed"				"ButtonHover"
+		"MatchmakingBanDurationLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"MatchmakingBanDurationLabel"
+			"font"			"HudFontSmallest"
+			"fgcolor_override"	"RedSolid"
+			"labelText"		"#TF_Matchmaking_Ban_Duration_Remaining"
+			"textalignment"	"center"
+			"xpos"			"5"
+			"ypos"			"0"
+			"zpos"			"2"
+			"wide"			"200"
+			"tall"			"40"
+			"visible"		"1"
+			"enabled"		"1"
+			"autoResize"	"1"
+			"pinCorner"		"0"
+		}
 	}
-
 	"NextButton"
 	{
 		"ControlName"	"CExImageButton"
@@ -326,167 +304,6 @@
 		"border_armed"				"ButtonHover"
 	}
 
-	"PlayNowButton"
-	{
-		"ControlName"	"CExButton"
-		"fieldName"		"PlayNowButton"
-		"xpos"			"c-295"
-		"ypos"			"303"
-		"zpos"			"20"
-		"wide"			"180"
-		"tall"			"40"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"#TF_MvM_MannUp"
-		"font"			"HudFontMediumBold"
-		"textAlignment"	"center"
-		"textinsetx"	"50"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"Command"		"mannup"
-
-		"NavUp"			"Sheet"
-		"NavDown"		"BackButton2"
-		"NavLeft"		"Sheet"
-		"NavRight"		"PracticeButton"
-
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		
-		"paintbackground"	"1"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
-		"border_default"			"ButtonHover"
-		"border_armed"				"ButtonHover"
-	}
-
-	"MannUpDisabledLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"MannUpDisabledLabel"
-		"font"			"HudFontSmall"
-		"labelText"		"#TF_Matchmaking_MannUpDisabled"
-		"textAlignment"	"center"
-		"xpos"			"c-295"
-		"ypos"			"300"
-		"zpos"			"30"
-		"wide"			"180"
-		"tall"			"40"
-		"wrap"				   "1"
-		"centerwrap"		   "1"
-		"PaintBackgroundType"	"0"
-		"bgcolor_override"				"0 0 0 240"
-	}
-
-	"PracticeButton"
-	{
-		"ControlName"	"CExButton"
-		"fieldName"		"PracticeButton"
-		"xpos"			"c-95"
-		"ypos"			"303"
-		"zpos"			"20"
-		"wide"			"180"
-		"tall"			"40"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"#TF_MvM_BootCamp"
-		"font"			"HudFontMediumBold"
-		"textAlignment"	"center"
-		"textinsetx"	"50"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"Command"		"practice"
-
-		"NavUp"			"Sheet"
-		"NavDown"		"LearnMoreButton"
-		"NavLeft"		"PlayNowButton"
-		"NavRight"		"StartPartyButton"
-
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		
-		"paintbackground"	"1"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
-		"border_default"			"ButtonHover"
-		"border_armed"				"ButtonHover"
-			
-
-	}
-
-	"PlayWithFriendsExplanation"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"PlayWithFriendsExplanation"
-		"xpos"			"c+100"
-		"ypos"			"62"
-		"zpos"			"8"
-		"wide"			"200"
-		"tall"			"285"
-		"PaintBackgroundType"	"0"
-		"paintbackground"		"1"
-		"bgcolor_override"	"0 0 0 200"
-		"border"		"NoBorder"
-
-		"PlayWithFriendsExplanationTitle"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"PlayWithFriendsExplanationTitle"
-			"font"			"HudFontSmallBold"
-			"labelText"		"#TF_Matchmaking_PlayWithFriends"
-			"textAlignment"	"center"
-			"xpos"			"0"
-			"ypos"			"0"
-			"zpos"			"10"
-			"wide"			"200"
-			"tall"			"32"
-		}
-
-		"FriendsImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"FriendsImage"
-			"xpos"			"10"
-			"ypos"			"32"
-			"zpos"			"0"
-			"wide"			"180"
-			"tall"			"90"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"pve/mvm_friends_image"
-			"scaleImage"	"1"
-		}
-
-		"PlayWithFriendsExplanationLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"PlayWithFriendsExplanationLabel"
-			"font"			"HudFontSmall"
-			"labelText"		"#TF_MvM_PlayWithFriendsExplanation"
-			"textAlignment"	"north-west"
-			"xpos"			"10"
-			"ypos"			"130"
-			"zpos"			"10"
-			"wide"			"180"
-			"tall"			"150"
-			"wrap"			"1"
-		}
-	}
-
 	"StartPartyButton"
 	{
 		"ControlName"	"CExButton"
@@ -508,13 +325,6 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"start_party"
-		
-		if_competitive
-		{
-			"xpos"			"c+120"
-			"ypos"			"388"
-		}
-
 
 		"NavUp"			"Sheet"
 		"NavDown"		"NextButton"
@@ -534,481 +344,4 @@
 		"border_armed"				"ButtonHover"
 	}
 
-	"StartExplanation"
-	{
-		"ControlName"	"CExplanationPopup"
-		"fieldName"		"StartExplanation"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"10000"
-		"wide"			"250"
-		"tall"			"100"
-		"visible"		"0"
-		"PaintBackgroundType"	"2"
-		"paintbackground" "0"
-		"border"		"MainMenuHighlightBorder"
-		
-		"force_close"	"1"
-		"end_x"			"c-300"
-		"end_y"			"100"
-		"end_wide"		"300"
-		"end_tall"		"175"
-		"callout_inparents_x"	"c-270"
-		"callout_inparents_y"	"380"
-		"next_explanation"		"VoucherExplanation"
-		
-		"TitleLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"TitleLabel"
-			"font"			"HudFontSmallBold"
-			"labelText"		"#TF_MvM_TicketExplanation_Title"
-			"textAlignment"	"north"
-			"xpos"			"20"
-			"ypos"			"10"
-			"wide"			"260"
-			"tall"			"30"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
-		}
-		
-		"TextLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"TextLabel"
-			"font"			"HudFontSmall"
-			"labelText"		"#TF_MvM_TicketExplanation_Text"
-			"textAlignment"	"north-west"
-			"xpos"			"20"
-			"ypos"			"45"
-			"wide"			"260"
-			"tall"			"105"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
-		}
-		
-		"CloseButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"CloseButton"
-			"xpos"			"280"
-			"ypos"			"5"
-			"zpos"			"10"
-			"wide"			"14"
-			"tall"			"14"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			"Command"		"close"
-			
-			"paintbackground"	"0"
-			
-			"defaultFgColor_override" "46 43 42 255"
-			"armedFgColor_override" "200 80 60 255"
-			"depressedFgColor_override" "46 43 42 255"
-			
-			"image_drawcolor"	"117 107 94 255"
-			"image_armedcolor"	"200 80 60 255"
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"close_button"
-				"scaleImage"	"1"
-			}				
-		}			
-		"PositionLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"PositionLabel"
-			"font"			"HudFontSmallBold"
-			"labelText"		"%explanationnumber%"
-			"textAlignment"	"center"
-			"xpos"			"0"
-			"ypos"			"145"
-			"zpos"			"-1"
-			"wide"			"300"
-			"tall"			"30"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"fgcolor_override" "200 80 60 255"
-		}
-		"NButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"NButton"
-			"xpos"			"260"
-			"ypos"			"145"
-			"zpos"			"10"
-			"wide"			"30"
-			"tall"			"30"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"1"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			"Command"		"nextexplanation"
-			
-			"paintbackground"	"0"
-			
-			"defaultFgColor_override" "46 43 42 255"
-			"armedFgColor_override" "200 80 60 255"
-			"depressedFgColor_override" "46 43 42 255"
-			
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"255 255 255 255"
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"30"
-				"tall"			"30"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"blog_forward"
-				"scaleImage"	"1"
-			}				
-		}	
-	}
-
-	"VoucherExplanation"
-	{
-		"ControlName"	"CExplanationPopup"
-		"fieldName"		"VoucherExplanation"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"10000"
-		"wide"			"250"
-		"tall"			"100"
-		"visible"		"0"
-		"PaintBackgroundType"	"2"
-		"paintbackground" "0"
-		"border"		"MainMenuHighlightBorder"
-		
-		"force_close"	"1"
-		"end_x"			"c-300"
-		"end_y"			"100"
-		"end_wide"		"300"
-		"end_tall"		"175"
-		"callout_inparents_x"	"c-270"
-		"callout_inparents_y"	"340"
-		//"next_explanation"		"VoucherExplanation"
-		
-		"TitleLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"TitleLabel"
-			"font"			"HudFontSmallBold"
-			"labelText"		"#TF_MvM_VoucherExplanation_Title"
-			"textAlignment"	"north"
-			"xpos"			"20"
-			"ypos"			"10"
-			"wide"			"260"
-			"tall"			"30"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
-		}
-		
-		"TextLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"TextLabel"
-			"font"			"HudFontSmall"
-			"labelText"		"#TF_MvM_VoucherExplanation_Text"
-			"textAlignment"	"north-west"
-			"xpos"			"20"
-			"ypos"			"45"
-			"wide"			"260"
-			"tall"			"105"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
-		}
-		
-		"CloseButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"CloseButton"
-			"xpos"			"280"
-			"ypos"			"5"
-			"zpos"			"10"
-			"wide"			"14"
-			"tall"			"14"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			"Command"		"close"
-			
-			"paintbackground"	"0"
-			
-			"defaultFgColor_override" "46 43 42 255"
-			"armedFgColor_override" "200 80 60 255"
-			"depressedFgColor_override" "46 43 42 255"
-			
-			"image_drawcolor"	"117 107 94 255"
-			"image_armedcolor"	"200 80 60 255"
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"close_button"
-				"scaleImage"	"1"
-			}				
-		}
-		"PButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"PButton"
-			"xpos"			"10"
-			"ypos"			"145"
-			"zpos"			"10"
-			"wide"			"30"
-			"tall"			"30"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			"Command"		"prevexplanation"
-			
-			"paintbackground"	"0"
-			
-			"defaultFgColor_override" "46 43 42 255"
-			"armedFgColor_override" "200 80 60 255"
-			"depressedFgColor_override" "46 43 42 255"
-			
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"255 255 255 255"
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"30"
-				"tall"			"30"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"blog_back"
-				"scaleImage"	"1"
-			}				
-		}		
-		"PositionLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"PositionLabel"
-			"font"			"HudFontSmallBold"
-			"labelText"		"%explanationnumber%"
-			"textAlignment"	"center"
-			"xpos"			"0"
-			"ypos"			"145"
-			"zpos"			"-1"
-			"wide"			"300"
-			"tall"			"30"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"fgcolor_override" "200 80 60 255"
-		}	
-	}
-	
-		"MedalsHelp"
-	{
-		"ControlName"	"CExplanationPopup"
-		"fieldName"		"MedalsHelp"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"10000"
-		"wide"			"250"
-		"tall"			"100"
-		"visible"		"0"
-		"PaintBackgroundType"	"2"
-		"paintbackground" "0"
-		"border"		"MainMenuHighlightBorder"
-		
-		"force_close"	"1"
-		"end_x"			"c+10"
-		"end_y"			"60"
-		"end_wide"		"300"
-		"end_tall"		"175"
-		"callout_inparents_x"	"c-35"
-		"callout_inparents_y"	"230"
-		"next_explanation"		""
-		
-		"TitleLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"TitleLabel"
-			"font"			"HudFontSmallBold"
-			"labelText"		"#TF_Competitive_MedalsHelp_Title"
-			"textAlignment"	"north"
-			"xpos"			"20"
-			"ypos"			"10"
-			"wide"			"260"
-			"tall"			"30"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
-		}
-		
-		"TextLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"TextLabel"
-			"font"			"HudFontSmall"
-			"labelText"		"#TF_Competitive_MedalsHelp_Text"
-			"textAlignment"	"north-west"
-			"xpos"			"20"
-			"ypos"			"45"
-			"wide"			"260"
-			"tall"			"105"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
-		}
-		
-		"CloseButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"CloseButton"
-			"xpos"			"280"
-			"ypos"			"5"
-			"zpos"			"10"
-			"wide"			"14"
-			"tall"			"14"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			"Command"		"close"
-			
-			"paintbackground"	"0"
-			
-			"defaultFgColor_override" "46 43 42 255"
-			"armedFgColor_override" "200 80 60 255"
-			"depressedFgColor_override" "46 43 42 255"
-			
-			"image_drawcolor"	"117 107 94 255"
-			"image_armedcolor"	"200 80 60 255"
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"close_button"
-				"scaleImage"	"1"
-			}				
-		}			
-		"PositionLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"PositionLabel"
-			"font"			"HudFontSmallBold"
-			"labelText"		"%explanationnumber%"
-			"textAlignment"	"center"
-			"xpos"			"0"
-			"ypos"			"145"
-			"zpos"			"-1"
-			"wide"			"300"
-			"tall"			"30"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"fgcolor_override" "200 80 60 255"
-		}
-	}
 }
diff --git a/resource/ui/lobbypanel.res b/resource/ui/lobbypanel.res
index 3859de0..d963af4 100644
--- a/resource/ui/lobbypanel.res
+++ b/resource/ui/lobbypanel.res
@@ -5,7 +5,7 @@
 		"ControlName"	"Frame"
 		"fieldName"		"LobbyPanel"
 		"xpos"			"0"
-		"ypos"			"40"
+		"ypos"			"50"
 		"wide"			"f0"
 		"tall"			"480"
 		"autoResize"	"0"
@@ -15,1118 +15,175 @@
 		"tabPosition"	"0"
 		"settitlebarvisible"	"0"
 		"PaintBackgroundType"	"0"
-		"bgcolor_override"	"25 25 25 255"
+		"bgcolor_override"	"46 43 42 255"
+		"proportionaltoparent"	"1"
 
 		"NavToRelay"	"MvMTourOfDutyGroupBox"
 		"NavDown"		"MvMEconItemsGroupBox"
 	}
-	
-	"ModeBackgroundImage"
+
+	"TooltipPanel"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"ModeBackgroundImage"
+		"ControlName"	"EditablePanel"
+		"fieldName"		"TooltipPanel"
 		"xpos"			"0"
 		"ypos"			"0"
-		"zpos"			"-1"
-		"wide"			"f0"
-		"tall"			"p0.8"
+		"zpos"			"10000"
+		"wide"			"300"
+		"tall"			"0"
 		"visible"		"0"
-		"enabled"		"1"
-		"mouseinputenabled" "0"
-		"image"			"competitive/comp_background_tier001a"
-		"scaleImage"	"1"
-	}
-
-
-	"QuickplaySearchCriteriaGroupBox"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"QuickplaySearchCriteriaGroupBox"
-		"xpos"		"c-345"
-		"ypos"		"40"
-		"zpos"		"-1"
-		"wide"		"400"
-		"tall"		"300"
-
-		"NavToRelay"	"NextPageButton"
-
-		"SimplifiedOptionsContainer"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"SimplifiedOptionsContainer"
-			"xpos"		"0"
-			"ypos"		"00"
-			"zpos"		"-1"
-			"wide"		"400"
-			"tall"		"300"
-
-			"CurPageLabel"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"CurPageLabel"
-				"font"			"HudFontSmallBold"
-				"labelText"		"%page%"
-				"textAlignment"	"north-west"
-				"xpos"			"50"
-				"ypos"			"20"
-				"zpos"			"10"
-				"wide"			"100"
-				"tall"			"20"
-				"autoResize"	"1"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
-				"fgcolor_override"	"89 81 71 255"
-			}
-
-			"MoreInfoButton"
-			{
-				"ControlName"	"CExButton"
-				"fieldName"		"MoreInfoButton"
-				"xpos"			"335"
-				"ypos"			"20"
-				"zpos"			"20"
-				"wide"			"15"
-				"tall"			"15"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
-				"tabPosition"	"0"
-				"labelText"		"?"
-				"font"			"HudFontSmallBold"
-				"textAlignment"	"center"
-				"dulltext"		"0"
-				"brighttext"	"0"
-				"default"		"1"
-				"Command"		"more_info"
-				"button_activation_type"	"1"	// only on press
-
-				"NavDown"		"NextPageButton"
-
-				"sound_depressed"	"UI/buttonclick.wav"
-				"sound_released"	"UI/buttonclickrelease.wav"
-			}
-	
-			"ModeInfoContainer"
-			{
-				"ControlName"	"EditablePanel"
-				"fieldName"		"ModeInfoContainer"
-				"xpos"		"40"
-				"ypos"		"10"
-				"wide"		"320"
-				"tall"		"245"
-				"visible"	"1"
-				"enabled"	"1"
-				"border"				"MainMenuHighlightBorder"
-
-				"ModeImage"
-				{
-					"ControlName"	"ImagePanel"
-					"fieldName"		"ModeImage"
-					"xpos"			"45"
-					"ypos"			"10"
-					"zpos"			"0"
-					"wide"			"230"
-					"tall"			"230"
-					"visible"		"1"
-					"enabled"		"1"
-					"mouseinputenabled" "0"
-					"image"			"maps/menu_screen_ctf_2fort"
-					"scaleImage"	"1"
-				}
-	
-				"Label_GameType"
-				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"Label_GameType"
-					"font"			"HudFontMediumSmallBold"
-					"labelText"		"%gametype%"
-					"textAlignment"	"center"
-					"xpos"			"0"
-					"ypos"			"7"
-					"zpos"			"2"
-					"wide"			"320"
-					"tall"			"25"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"1"
-					"enabled"		"1"
-					"mouseinputenabled" "0"
-					"fgcolor_override"	"89 81 71 255"
-				}
-
-				"DescLabel"
-				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"DescLabel"
-					"font"			"HudFontSmallest"
-					"labelText"		"%description%"
-					"textAlignment"	"south"
-					"xpos"			"5"
-					"ypos"			"175"
-					"zpos"			"2"
-					"wide"			"310"
-					"tall"			"50"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"1"
-					"enabled"		"1"
-					"fgcolor_override"	"89 81 71 255"
-					"auto_wide_tocontents" "0"
-					"wrap"				   "1"
-					"centerwrap"		   "1"
-				}
-
-				"ComplexityLabel"
-				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"ComplexityLabel"
-					"font"			"HudFontSmallest"
-					"labelText"		"%complexity%"
-					"textAlignment"	"south"
-					"xpos"			"5"
-					"ypos"			"225"
-					"zpos"			"2"
-					"wide"			"310"
-					"tall"			"15"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"1"
-					"enabled"		"1"
-					"fgcolor_override"	"201 79 57 255"
-					"auto_wide_tocontents" "0"
-					"wrap"				   "1"
-					"centerwrap"		   "1"
-				}
-
-				"MoreInfoContainer"
-				{
-					"ControlName"	"EditablePanel"
-					"fieldName"		"MoreInfoContainer"
-					"xpos"		"20"
-					"ypos"		"30"
-					"zpos"		"3"
-					"wide"		"280"
-					"tall"		"205"
-					"autoResize"		"0"
-					"pinCorner"		"0"
-					"visible"		"0"
-					"enabled"		"1"
-					"tabPosition"		"0"
-					"PaintBackgroundType"	"0"
-					"paintbackground"		"1"
-					"border"				"BackpackItemBorder"
-		
-					"Background"
-					{
-						"ControlName"	"EditablePanel"
-						"fieldName"		"Background"
-						"xpos"		"0"
-						"ypos"		"0"
-						"wide"		"400"
-						"tall"		"400"
-						"autoResize"		"0"
-						"pinCorner"		"0"
-						"visible"		"0"
-						"enabled"		"1"
-						"tabPosition"		"0"
-						"bgcolor_override"	"40 37 37 255"
-					}
-		
-					"MoreInfoLabel"
-					{
-						"ControlName"		"CExLabel"
-						"fieldName"		"MoreInfoLabel"
-						"font"			"HudFontSmallest"
-						"labelText"		"%more_info%"
-						"textAlignment"	"center"
-						"xpos"			"10"
-						"ypos"			"15"
-						"zpos"			"1"
-						"wide"			"260"
-						"tall"			"160"
-						"autoResize"	"1"
-						"pinCorner"		"0"
-						"visible"		"1"
-						"enabled"		"1"
-						"wrap"			"1"
-						"centerwrap"	"1"
-					}
-				}	
-			}	
-
-			"PrevPageButton"
-			{
-				"ControlName"	"CExButton"
-				"fieldName"		"PrevPageButton"
-				"xpos"			"12"
-				"ypos"			"110"
-				"zpos"			"1"
-				"wide"			"20"
-				"tall"			"40"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
-				"tabPosition"	"0"
-				"labelText"		"<"
-				"font"			"HudFontSmallBold"
-				"textAlignment"	"center"
-				"dulltext"		"0"
-				"brighttext"	"0"
-				"Command"		"prevpage"
-				"button_activation_type"	"1"	// only on press
-
-				"NavUp"			"MoreInfoButton"
-				"NavRight"		"NextPageButton"
-
-				"sound_depressed"	"UI/buttonclick.wav"
-				"sound_released"	"UI/buttonclickrelease.wav"
-			}		
-				
-			"NextPageButton"
-			{
-				"ControlName"	"CExButton"
-				"fieldName"		"NextPageButton"
-				"xpos"			"367"
-				"ypos"			"110"
-				"zpos"			"10"
-				"wide"			"20"
-				"tall"			"40"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
-				"tabPosition"	"0"
-				"labelText"		">"
-				"font"			"HudFontSmallBold"
-				"textAlignment"	"center"
-				"dulltext"		"0"
-				"brighttext"	"0"
-				"Command"		"nextpage"
-				"button_activation_type"	"1"	// only on press
-
-				"NavUp"			"MoreInfoButton"
-				"NavLeft"		"PrevPageButton"
-
-				"sound_depressed"	"UI/buttonclick.wav"
-				"sound_released"	"UI/buttonclickrelease.wav"
-			}	
-		}
-	}
-
-	"MannVsMachineGroupBox"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"MannVsMachineGroupBox"
-		"xpos"		"c-305"
-		"ypos"		"10"
-		"zpos"		"-1"
-		"wide"		"400"
-		"tall"		"350"
-		"visible"	"1"
-		"enabled"	"1"
-		"border"	"MainMenuHighlightBorder"
-		
-		"MannVsMachineLabel"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"MannVsMachineLabel"
-			"xpos"			"15"
-			"ypos"			"5"
-			"zpos"			"1"
-			"wide"			"370"
-			"tall"			"25"
-			"labelText"		"#TF_MvM_HeaderMannVsMachine"
-			"font"			"HudFontMediumBold"
-			//"fgcolor_override"	"89 81 71 255"
-			"fgcolor_override"	"TanLight"
-			"textAlignment"	"west"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-		}
-		
-		"MannVsMachineExplanation"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"MannVsMachineExplanation"
-			"font"			"HudFontSmall"
-			"fgcolor_override"	"89 81 71 255"
-			"labelText"		"#TF_MvM_MannVsMachineExplaination"
-			"textAlignment"	"north-west"
-			"xpos"			"15"
-			"ypos"			"30"
-			"zpos"			"0"
-			"wide"			"400"
-			"tall"			"40"
-			"wrap" "1"
-		}
-
-		"ModeImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ModeImage"
-			"xpos"			"10"
-			"ypos"			"55"
-			"zpos"			"0"
-			"wide"			"380"
-			"tall"			"190"
-			"visible"		"1"
-			"enabled"		"1"
-			"mouseinputenabled" "0"
-			"image"			"illustrations/gamemode_mvm"
-			"scaleImage"	"1"
-		}
-	}
-
-	"MannUpGroupBox"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"MannUpGroupBox"
-		"xpos"		"c-305"
-		"ypos"		"245"
-		"zpos"		"-1"
-		"wide"		"200"
-		"tall"		"110"
-		"visible"	"1"
-		"enabled"	"1"
-
-		"PlayForBraggingRightsExplanation"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"PlayForBraggingRightsExplanation"
-			"font"			"HudFontSmall"
-			"fgcolor_override"	"89 81 71 255"
-			"labelText"		"#TF_MvM_BraggingRightsExplaination"
-			"textAlignment"	"north-west"
-			"xpos"			"15"
-			"ypos"			"50"
-			"zpos"			"0"
-			"wide"			"170"
-			"tall"			"60"
-			"wrap"			 "1"
-		}
-	}
-
-	"PracticeGroupBox"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"PracticeGroupBox"
-		"xpos"		"c-105"
-		"ypos"		"245"
-		"zpos"		"-1"
-		"wide"		"200"
-		"tall"		"110"
-		"visible"	"1"
-		"enabled"	"1"
-
-		"PlayOnCommunityServerExplanation"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"PlayOnCommunityServerExplanation"
-			"font"			"HudFontSmall"
-			"fgcolor_override"	"89 81 71 255"
-			"labelText"		"#TF_MvM_PracticeExplaination"
-			"textAlignment"	"north-west"
-			"xpos"			"15"
-			"ypos"			"50"
-			"zpos"			"0"
-			"wide"			"170"
-			"tall"			"60"
-			"wrap" "1"
-		}
-	}
-
-	"MvMTourOfDutyGroupBox"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"MvMTourOfDutyGroupBox"
-		"xpos"		"c-305"
-		"ypos"		"10"
-		"zpos"		"-1"
-		"wide"		"400"
-		"tall"		"225"
-
-		"NavToRelay"	"TourlistGroupBox"
-		"NavUp"			"MvMSelectChallengeGroupBox"
-		"NavLeft"		"MvMSelectChallengeGroupBox"
-		"NavRight"		"PartyActiveGroupBox"
-
-		"ChallengeLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"ChallengeLabel"
-			"font"			"HudFontMediumSmallBold"
-			"labelText"		"#TF_MvM_TourOfDuty"
-			"textAlignment"	"south-west"
-			"xpos"			"0"
-			"ypos"			"0"
-			"zpos"			"0"
-			"wide"			"400"
-			"tall"			"26"
-			"fgcolor_override"	"TanLight"
-		}
-
-		"DifficultyLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"DifficultyLabel"
-			"font"			"HudFontSmall"
-			"labelText"		"#TF_MvM_Difficulty"
-			"textAlignment"	"south-west"
-			"xpos"			"174"
-			"ypos"			"0"
-			"zpos"			"0"
-			"wide"			"100"
-			"tall"			"24"
-			"fgcolor_override"	"TanLight"
-		}
-
-		"CompleteLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"CompleteLabel"
-			"font"			"HudFontSmall"
-			"labelText"		"#TF_MvM_TourOfDutyProgress"
-			"textAlignment"	"south-west"
-			"xpos"			"264"
-			"ypos"			"0"
-			"zpos"			"0"
-			"wide"			"80"
-			"tall"			"24"
-			"fgcolor_override"	"TanLight"
-		}
-
-		"TourLevelLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"TourLevelLabel"
-			"font"			"HudFontSmall"
-			"labelText"		"#TF_MvM_TourNumber"
-			"textAlignment"	"south-west"
-			"xpos"			"330"
-			"ypos"			"0"
-			"zpos"			"0"
-			"wide"			"80"
-			"tall"			"26"
-			"fgcolor_override"	"TanLight"
-		}
-
-		"TourlistGroupBox"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"TourlistGroupBox"
-			"xpos"			"0"
-			"ypos"			"28"
-			"zpos"			"-1"
-			"wide"			"400"
-			"tall"			"197"
-			"PaintBackgroundType"	"2"
-			"paintbackground"		"1"
-			"bgcolor_override"	"0 0 0 200"
-			"border"		"NoBorder"
-
-			"NavToRelay"	"TourList"
-
-			"GreyOutPanel"
-			{
-				"ControlName"	"EditablePanel"
-				"fieldName"		"GreyOutPanel"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"200"
-				"wide"			"400"
-				"tall"			"225"
-				"visible"		"0"
-				"bgcolor_override"	"128 128 128 128"
-			}
-
-			"TourList"
-			{
-				"ControlName"	"SectionedListPanel"
-				"fieldName"		"TourList"
-				"font"			"HudFontSmall"
-				"xpos"			"0"
-				"ypos"			"5"
-				"zpos"			"0"
-				"wide"			"400"
-				"tall"			"197"
-				"linespacing"	"12"
-			}
-		}
-
-		"TourDifficultyWarning"
-		{
-			"ControlName"		"CExLabel"
-			"fieldName"		"TourDifficultyWarning"
-			"font"			"HudFontSmall"
-			"labelText"		"#TF_MVM_Tour_ExpertDifficulty_Warning"
-			"xpos"		"30"
-			"ypos"		"100"
-			"zpos"			"2"
-			"wide"		"340"
-			"tall"		"120"
-			"textAlignment"	"north-west"
-			"visible"	"1"
-			"enabled"	"1"
-			"wrap"		"1"
-			"fgcolor_override"	"TanLight"
-		}
-	}
-
-	"MannUpTourLootDescriptionBox"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"MannUpTourLootDescriptionBox"
-		"xpos"		"c-305"
-		"ypos"		"240"
-		"zpos"		"-1"
-		"wide"		"400"
-		"tall"		"120"
 		"PaintBackgroundType"	"2"
-		"paintbackground"		"1"
-		"bgcolor_override"	"0 0 0 200"
-		"border"		"NoBorder"
-
-		"TourLootImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"TourLootImage"
-			"xpos"			"280"
-			"ypos"			"6"
-			"zpos"			"0"
-			"wide"			"110"
-			"tall"			"110"
-			"visible"		"1"
-			"enabled"		"1"
-			"mouseinputenabled" "0"
-			"image"			"pve/mvm_loot_image"
-			"scaleImage"	"1"
-		}
-
-		"ToorLootTitle"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"ToorLootTitle"
-			"font"			"HudFontSmallBold"
-			"labelText"		"#TF_MvM_TourLootTitle"
-			"textAlignment"	"west"
-			"xpos"			"10"
-			"ypos"			"5"
-			"zpos"			"0"
-			"wide"			"200"
-			"tall"			"30"
-		}
-
-		"ToorLootDetailLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"ToorLootDetailLabel"
-			"font"			"HudFontSmall"
-			"labelText"		"%tour_loot_detail%"
-			"textAlignment"	"west"
-			"wrap"			"1"
-			"xpos"			"10"
-			"ypos"			"30"
-			"zpos"			"0"
-			"wide"			"280"
-			"tall"			"50"
-		}
-	}
-
-	"MvMEconItemsGroupBox"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"MvMEconItemsGroupBox"
-		"xpos"			"c-305"
-		"ypos"			"240"
-		"zpos"			"-1"
-		"wide"			"400"
-		"tall"			"120"
-		"bgcolor_override"	"0 0 0 200"
-		"border"		"NoBorder"
-
-		"NavToRelay"	"OpenHelpButton"
-		"NavUp"			"MvMTourOfDutyGroupBox"
-		"NavDown"		"MvMPracticeGroupBox"
-		"NavRight"		"PartyActiveGroupBox"
-
-		"InventoryTitleLabel"
+		"border"		"MainMenuBGBorder"
+		
+		"TipLabel"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"InventoryTitleLabel"
-			"font"			"HudFontSmallBold"
-			"labelText"		"#TF_MvM_InventoryTitle"
+			"fieldName"		"TipLabel"
+			"font"			"HudFontSmallestBold"
+			"labelText"		"%tiptext%"
 			"textAlignment"	"west"
-			"xpos"			"8"
-			"ypos"			"5"
-			"zpos"			"0"
-			"wide"			"200"
-			"tall"			"30"
-		}
-
-		"OpenHelpButton"
-		{
-			"ControlName"	"CExButton"
-			"fieldName"		"OpenHelpButton"
-			"xpos"			"175"
+			"xpos"			"20"
 			"ypos"			"10"
 			"zpos"			"2"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labelText"		"?"
-			"font"			"HudFontSmallBold"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"command" "open_help"
-			"button_activation_type"	"1"	// only on press
-
-			"NavDown"		"OpenStoreButton2"
-
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-		}
-
-		"MannUpTicketImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"MannUpTicketImage"
-			"xpos"			"6"
-			"ypos"			"61"
-			"zpos"			"0"
-			"wide"			"60"
-			"tall"			"60"
-			"visible"		"1"
-			"enabled"		"1"
-			"mouseinputenabled" "0"
-			"image"			"pve/mvm_ticket_inactive"
-			"scaleImage"	"1"
-		}
-
-		"MannUpTicketCountLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"MannUpTicketCountLabel"
-			"font"			"HudFontMediumBold"
-			"labelText"		"%ticket_count%"
-			"textAlignment"	"north-west"
-			"fgcolor_override"	"TanLight"
-			"xpos"			"70"
-			"ypos"			"79"
-			"zpos"			"1"
-			"wide"			"60"
-			"tall"			"30"
-			"mouseinputenabled" "0"
-		}
-
-		"OpenStoreButton"
-		{
-			"ControlName"	"CExButton"
-			"fieldName"		"OpenStoreButton"
-			"xpos"			"95"
-			"ypos"			"82"
-			"zpos"			"2"
 			"wide"			"100"
-			"tall"			"20"
+			"tall"			"10"
 			"autoResize"	"0"
-			"pinCorner"		"3"
+			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"tabPosition"	"0"
-			"labelText"		"#TF_MvM_BuyMore"
-			"font"			"HudFontSmallBold"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"command" "open_store_ticket"
-
-			"NavUp"			"OpenStoreButton2"
-			"NavDown"		"<<BackButton"
-
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			
-			"paintbackground"	"1"
-			"defaultBgColor_override"	"15 15 15 255"
-			"armedBgColor_override"		"25 25 25 255"
-			"depressedBgColor_override"	"25 25 25 255"
-			"defaultFgColor_override"	"TanLight"
-			"armedFgColor_override" 	"TanLight"
-			"depressedFgColor_override" "TanLight"
-			"border_default"			"ButtonHover"
-			"border_armed"				"ButtonHover"
-		}
-
-		"SquadSurplusImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SquadSurplusImage"
-			"xpos"			"6"
-			"ypos"			"24"
-			"zpos"			"0"
-			"wide"			"60"
-			"tall"			"60"
-			"visible"		"1"
-			"enabled"		"1"
-			"mouseinputenabled" "0"
-			"image"			"pve/mvm_voucher_inactive"
-			"scaleImage"	"1"
-		}
-
-		"SquadSurplusCountLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"SquadSurplusCountLabel"
-			"font"			"HudFontMediumBold"
-			"labelText"		"%voucher_count%"
-			"textAlignment"	"north-west"
 			"fgcolor_override"	"TanLight"
-			"xpos"			"70"
-			"ypos"			"43"
-			"zpos"			"1"
-			"wide"			"60"
-			"tall"			"30"
-			"mouseinputenabled" "0"
-		}
-
-		"OpenStoreButton2"
-		{
-			"ControlName"	"CExButton"
-			"fieldName"		"OpenStoreButton2"
-			"xpos"			"95"
-			"ypos"			"46"
-			"zpos"			"2"
-			"wide"			"100"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labelText"		"#TF_MvM_BuyMore"
-			"font"			"HudFontSmallBold"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"command" "open_store_voucher"
-
-			"NavUp"			"OpenHelpButton"
-			"NavDown"		"OpenStoreButton"
-
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			
-			"paintbackground"	"1"
-			"defaultBgColor_override"	"15 15 15 255"
-			"armedBgColor_override"		"25 25 25 255"
-			"depressedBgColor_override"	"25 25 25 255"
-			"defaultFgColor_override"	"TanLight"
-			"armedFgColor_override" 	"TanLight"
-			"depressedFgColor_override" "TanLight"
-			"border_default"			"ButtonHover"
-			"border_armed"				"ButtonHover"
-		}
-
-		"SquadSurplusCheckButton"
-		{
-			"ControlName"		"CheckButton"
-			"fieldName"		"SquadSurplusCheckButton"
-			"xpos"		"240"
-			"ypos"		"43"
-			"zpos"		"2"
-			"wide"		"25"
-			"tall"		"25"
-			"font"			"HudFontSmall"
-			"labelText"		""
-		}
-
-		"ActivateSquadSurplusLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"SquadSurplusCheckLabel"
-			"font"			"HudFontSmallestBold"
-			"labelText"		"#TF_MvM_ActivateSquadSurplus"
-			"textAlignment"	"north-west"
-			"wrap"			"1"
-			"xpos"			"268"
-			"ypos"			"46"
-			"zpos"			"0"
-			"wide"			"120"
-			"tall"			"60"
+			"auto_wide_tocontents"	"1"
 		}
 	}
 
-	"MvMPracticeGroupBox"
+	"NoGCGroupBox"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"MvMPracticeGroupBox"
-		"xpos"		"c-305"
-		"ypos"		"240"
-		"zpos"		"-1"
-		"wide"		"400"
-		"tall"		"120"
-		"PaintBackgroundType"	"2"
+		"fieldName"		"NoGCGroupBox"
+		"xpos"		"0"
+		"ypos"		"0"
+		"zpos"		"1000"
+		"wide"		"f0"
+		"tall"		"f0"
+		"PaintBackgroundType"	"0"
 		"paintbackground"		"1"
-		"bgcolor_override"	"0 0 0 200"
-		"border"		"NoBorder"
-
-		"NavToRelay"	"MannUpNowButton"
-		"NavUp"			"MvMEconItemsGroupBox"
-		"NavDown"		"<<BackButton"
-		"NavRight"		"PartyActiveGroupBox"
+		"bgcolor_override"	"0 0 0 250"
+		"proportionaltoparent"	"1"
 
-		"NoMannUpImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"NoMannUpImage"
-			"xpos"			"250"
-			"ypos"			"6"
-			"zpos"			"0"
-			"wide"			"110"
-			"tall"			"110"
-			"visible"		"1"
-			"enabled"		"1"
-			"mouseinputenabled" "0"
-			"image"			"pve/mvm_loot_image"
-			"scaleImage"	"1"
-		}
-
-		"NoMannUpTitleLabel"
+		"NoGCTitle"
 		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"NoMannUpTitleLabel"
-			"font"			"HudFontSmallBold"
-			"labelText"		"#TF_MvM_NoMannUpTitle"
-			"textAlignment"	"west"
-			"fgcolor_override"	"Base Color"
-			"xpos"			"10"
-			"ypos"			"5"
-			"zpos"			"0"
-			"wide"			"200"
-			"tall"			"30"
+			"ControlName"		"Label"
+			"fieldName"		"NoGCTitle"
+			"font"			"HudFontMediumBold"
+			"labelText"		"#TF_Matchmaking_PleaseWait"
+			"xpos"		"cs-0.5"
+			"ypos"		"120"
+			"zpos"			"2"
+			"wide"		"340"
+			"tall"		"40"
+			"textAlignment"	"center"
+			"visible"	"1"
+			"enabled"	"1"
+			"proportionaltoparent"	"1"
 		}
 
-		"NoMannUpDescriptionLabel"
+		"NoGCSubTitle"
 		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"NoMannUpDescriptionLabel"
+			"ControlName"		"Label"
+			"fieldName"		"NoGCSubTitle"
 			"font"			"HudFontSmall"
-			"labelText"		"#TF_MvM_NoMannUpDescription"
-			"textAlignment"	"west"
-			"wrap"			"1"
-			"xpos"			"10"
-			"ypos"			"30"
-			"zpos"			"0"
-			"wide"			"280"
-			"tall"			"50"
-		}
-
-		"MannUpNowButton"
-		{
-			"ControlName"	"CExButton"
-			"fieldName"		"MannUpNowButton"
-			"xpos"			"10"
-			"ypos"			"85"
+			"labelText"		"#TF_Matchmaking_RestoringConnection"
+			"xpos"		"cs-0.5"
+			"ypos"		"140"
 			"zpos"			"2"
-			"wide"			"120"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labelText"		"#TF_MvM_MannUpNow"
-			"font"			"HudFontSmallBold"
+			"wide"		"340"
+			"tall"		"40"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"command" "mann_up_now"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			
-			"paintbackground"	"1"
-			"defaultBgColor_override"	"15 15 15 255"
-			"armedBgColor_override"		"25 25 25 255"
-			"depressedBgColor_override"	"25 25 25 255"
-			"defaultFgColor_override"	"TanLight"
-			"armedFgColor_override" 	"TanLight"
-			"depressedFgColor_override" "TanLight"
-			"border_default"			"ButtonHover"
-			"border_armed"				"ButtonHover"
-		}
-	}
-
-	"MvMSelectChallengeGroupBox"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"MvMSelectChallengeGroupBox"
-		"xpos"		"c-305"
-		"ypos"		"10"
-		"zpos"		"-1"
-		"wide"		"400"
-		"tall"		"225"
-
-		"NavToRelay"	"ChallengeListGroupBox"
-		"NavRight"		"MvMTourOfDutyGroupBox"
-
-		"ChallengeLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"ChallengeLabel"
-			"font"			"HudFontMediumSmallBold"
-			"labelText"		"%tour_name%"
-			"textAlignment"	"south-west"
-			"xpos"			"0"
-			"ypos"			"0"
-			"zpos"			"0"
-			"wide"			"400"
-			"tall"			"26"
-			"fgcolor_override"	"TanLight"
-		}
-
-		"CompleteLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"CompleteLabel"
-			"font"			"HudFontSmallBold"
-			"labelText"		"%complete_heading%"
-			"textAlignment"	"south-west"
-			"xpos"			"264"
-			"ypos"			"0"
-			"zpos"			"0"
-			"wide"			"100"
-			"tall"			"24"
-			"fgcolor_override"	"TanLight"
+			"visible"	"1"
+			"enabled"	"1"
+			"proportionaltoparent"	"1"
 		}
 
-		"TourLevelImage"
+		"SpinnerImage"
 		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"TourLevelImage"
-			"xpos"			"342"
-			"ypos"			"-10"
+			"ControlName"	"ScalableImagePanel"
+			"fieldName"		"SpinnerImage"
+			"xpos"			"cs-0.5"
+			"ypos"			"160"
 			"zpos"			"0"
-			"wide"			"60"
-			"tall"			"60"
+			"wide"			"o1"
+			"tall"			"80"
 			"visible"		"1"
 			"enabled"		"1"
-			"mouseinputenabled" "0"
-			"image"			"../hud/mvm_tours"
-			"scaleImage"	"1"
-		}
-
-		"TourLevelLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"TourLevelLabel"
-			"font"			"HudFontMediumSmallBold"
-			"labelText"		"%tour_level%"
-			"textAlignment"	"south"
-			"xpos"			"357"
-			"ypos"			"0"
-			"zpos"			"0"
-			"wide"			"30"
-			"tall"			"26"
-			"fgcolor_override"	"0 0 0 255"
-		}
-
-		"ChallengeListGroupBox"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"ChallengeListGroupBox"
-			"xpos"			"0"
-			"ypos"			"28"
-			"zpos"			"-1"
-			"wide"			"400"
-			"tall"			"197"
-			"PaintBackgroundType"	"2"
-			"paintbackground"		"1"
-			"bgcolor_override"	"0 0 0 200"
-			"border"		"NoBorder"
-
-			"NavToRelay"	"ChallengeList"
-
-			"GreyOutPanel"
-			{
-				"ControlName"	"EditablePanel"
-				"fieldName"		"GreyOutPanel"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"200"
-				"wide"			"400"
-				"tall"			"225"
-				"visible"		"0"
-				"bgcolor_override"	"128 128 128 128"
-			}
-
-			"ChallengeList"
-			{
-				"ControlName"	"SectionedListPanel"
-				"fieldName"		"ChallengeList"
-				"font"			"HudFontSmall"
-				"xpos"			"70"
-				"ypos"			"5"
-				"zpos"			"0"
-				"wide"			"330"
-				"tall"			"192"
-				"linespacing"	"12"
-			}
+			"image"			"animated/tf2_logo_hourglass"
+		
+			"proportionaltoparent"	"1"
 		}
 	}
 
-	"NoGCGroupBox"
+	"MatchInProgressGroupBox"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"NoGCGroupBox"
-		"xpos"		"c-305"
-		"ypos"		"10"
-		"zpos"		"-1"
-		"wide"		"400"
-		"tall"		"330"
+		"fieldName"		"MatchInProgressGroupBox"
+		"xpos"		"0"
+		"ypos"		"0"
+		"zpos"		"1000"
+		"wide"		"f0"
+		"tall"		"f0"
 		"PaintBackgroundType"	"0"
 		"paintbackground"		"1"
-		"bgcolor_override"	"0 0 0 200"
-		"border"		"NoBorder"
+		"bgcolor_override"	"0 0 0 250"
+		"proportionaltoparent"	"1"
 
-		"NoGCTitle"
+		"MatchInProgressTitle"
 		{
-			"ControlName"		"CExLabel"
-			"fieldName"		"NoGCTitle"
+			"ControlName"		"Label"
+			"fieldName"		"MatchInProgressTitle"
 			"font"			"HudFontMediumBold"
-			"labelText"		"#TF_Matchmaking_PleaseWait"
-			"xpos"		"30"
-			"ypos"		"20"
+			"labelText"		"#TF_Matchmaking_MatchInProgress"
+			"xpos"		"cs-0.5"
+			"ypos"		"120"
 			"zpos"			"2"
 			"wide"		"340"
 			"tall"		"40"
-			"textAlignment"	"north-west"
+			"textAlignment"	"center"
 			"visible"	"1"
 			"enabled"	"1"
+			"proportionaltoparent"	"1"
 		}
 
-		"NoGCSubTitle"
+		"MatchInProgressSubTitle"
 		{
-			"ControlName"		"CExLabel"
-			"fieldName"		"NoGCSubTitle"
+			"ControlName"		"Label"
+			"fieldName"		"MatchInProgressSubTitle"
 			"font"			"HudFontSmall"
-			"labelText"		"#TF_Matchmaking_RestoringConnection"
-			"xpos"		"30"
-			"ypos"		"70"
+			"labelText"		"#TF_Matchmaking_MatchInProgress_RestoringConnection"
+			"xpos"		"cs-0.5"
+			"ypos"		"140"
 			"zpos"			"2"
 			"wide"		"340"
 			"tall"		"40"
-			"textAlignment"	"north-west"
+			"textAlignment"	"center"
 			"visible"	"1"
 			"enabled"	"1"
+			"proportionaltoparent"	"1"
 		}
 
+		"SpinnerImage"
+		{
+			"ControlName"	"ScalableImagePanel"
+			"fieldName"		"SpinnerImage"
+			"xpos"			"cs-0.5"
+			"ypos"			"160"
+			"zpos"			"0"
+			"wide"			"o1"
+			"tall"			"80"
+			"visible"		"1"
+			"enabled"		"1"
+			"image"			"animated/tf2_logo_hourglass"
+		
+			"proportionaltoparent"	"1"
+		}
 	}
 
 	"SearchActiveGroupBox"
@@ -1141,11 +198,11 @@
 		"PaintBackgroundType"	"0"
 		"paintbackground"		"1"
 		"bgcolor_override"	"0 0 0 200"
-		"border"		"NoBorder"
+		"border"		"QuickplayBorder"
 
 		"SearchActiveTitle"
 		{
-			"ControlName"		"CExLabel"
+			"ControlName"		"Label"
 			"fieldName"		"SearchActiveTitle"
 			"font"			"HudFontMediumBold"
 			"labelText"		"#TF_Matchmaking_Searching"
@@ -1161,7 +218,7 @@
 
 		"NearbyColumnHead"
 		{
-			"ControlName"		"CExLabel"
+			"ControlName"		"Label"
 			"fieldName"		"NearbyColumnHead"
 			"font"			"HudFontSmall"
 			"labelText"		"#TF_Matchmaking_Nearby"
@@ -1177,7 +234,7 @@
 
 		"WorldwideColumnHead"
 		{
-			"ControlName"		"CExLabel"
+			"ControlName"		"Label"
 			"fieldName"		"WorldwideColumnHead"
 			"font"			"HudFontSmall"
 			"labelText"		"#TF_Matchmaking_Worldwide"
@@ -1193,7 +250,7 @@
 
 		"PlayersInGameLabel"
 		{
-			"ControlName"		"CExLabel"
+			"ControlName"		"Label"
 			"fieldName"		"PlayersInGameLabel"
 			"font"			"HudFontSmallBold"
 			"labelText"		"#TF_Matchmaking_ActivePlayers"
@@ -1209,7 +266,7 @@
 
 		"PlayersInGameTotalLabel"
 		{
-			"ControlName"		"CExLabel"
+			"ControlName"		"Label"
 			"fieldName"		"PlayersInGameTotalLabel"
 			"font"			"HudFontSmall"
 			"labelText"		"#TF_Matchmaking_Total"
@@ -1225,7 +282,7 @@
 
 			"PlayersInGameTotalNearbyValue"
 			{
-				"ControlName"		"CExLabel"
+				"ControlName"		"Label"
 				"fieldName"		"PlayersInGameTotalNearbyValue"
 				"font"			"HudFontSmall"
 				"xpos"		"190"
@@ -1241,7 +298,7 @@
 
 			"PlayersInGameTotalWorldwideValue"
 			{
-				"ControlName"		"CExLabel"
+				"ControlName"		"Label"
 				"fieldName"		"PlayersInGameTotalWorldwideValue"
 				"font"			"HudFontSmall"
 				"xpos"		"280"
@@ -1257,7 +314,7 @@
 
 		"PlayersInGameMatchingLabel"
 		{
-			"ControlName"		"CExLabel"
+			"ControlName"		"Label"
 			"fieldName"		"PlayersInGameMatchingLabel"
 			"font"			"HudFontSmall"
 			"labelText"		"#TF_Matchmaking_Compatible"
@@ -1273,7 +330,7 @@
 
 			"PlayersInGameMatchingNearbyValue"
 			{
-				"ControlName"		"CExLabel"
+				"ControlName"		"Label"
 				"fieldName"		"PlayersInGameMatchingNearbyValue"
 				"font"			"HudFontSmall"
 				"xpos"		"190"
@@ -1289,7 +346,7 @@
 
 			"PlayersInGameMatchingWorldwideValue"
 			{
-				"ControlName"		"CExLabel"
+				"ControlName"		"Label"
 				"fieldName"		"PlayersInGameMatchingWorldwideValue"
 				"font"			"HudFontSmall"
 				"xpos"		"280"
@@ -1305,7 +362,7 @@
 
 		"PlayersSearchingLabel"
 		{
-			"ControlName"		"CExLabel"
+			"ControlName"		"Label"
 			"fieldName"		"PlayersSearchingLabel"
 			"font"			"HudFontSmallBold"
 			"labelText"		"#TF_Matchmaking_SearchingPlayers"
@@ -1321,7 +378,7 @@
 
 		"PlayersSearchingTotalLabel"
 		{
-			"ControlName"		"CExLabel"
+			"ControlName"		"Label"
 			"fieldName"		"PlayersSearchingTotalLabel"
 			"font"			"HudFontSmall"
 			"labelText"		"#TF_Matchmaking_Total"
@@ -1337,7 +394,7 @@
 
 			"PlayersSearchingTotalNearbyValue"
 			{
-				"ControlName"		"CExLabel"
+				"ControlName"		"Label"
 				"fieldName"		"PlayersSearchingTotalNearbyValue"
 				"font"			"HudFontSmall"
 				"xpos"		"190"
@@ -1353,7 +410,7 @@
 
 			"PlayersSearchingTotalWorldwideValue"
 			{
-				"ControlName"		"CExLabel"
+				"ControlName"		"Label"
 				"fieldName"		"PlayersSearchingTotalWorldwideValue"
 				"font"			"HudFontSmall"
 				"xpos"		"280"
@@ -1369,7 +426,7 @@
 
 		"PlayersSearchingMatchingLabel"
 		{
-			"ControlName"		"CExLabel"
+			"ControlName"		"Label"
 			"fieldName"		"PlayersSearchingMatchingLabel"
 			"font"			"HudFontSmall"
 			"labelText"		"#TF_Matchmaking_Compatible"
@@ -1385,7 +442,7 @@
 
 			"PlayersSearchingMatchingNearbyValue"
 			{
-				"ControlName"		"CExLabel"
+				"ControlName"		"Label"
 				"fieldName"		"PlayersSearchingMatchingNearbyValue"
 				"font"			"HudFontSmall"
 				"xpos"		"190"
@@ -1401,7 +458,7 @@
 
 			"PlayersSearchingMatchingWorldwideValue"
 			{
-				"ControlName"		"CExLabel"
+				"ControlName"		"Label"
 				"fieldName"		"PlayersSearchingMatchingWorldwideValue"
 				"font"			"HudFontSmall"
 				"xpos"		"280"
@@ -1417,7 +474,7 @@
 
 		"EmptyGameserversLabel"
 		{
-			"ControlName"		"CExLabel"
+			"ControlName"		"Label"
 			"fieldName"		"EmptyGameserversLabel"
 			"font"			"HudFontSmallBold"
 			"labelText"		"#TF_Matchmaking_EmptyGameservers"
@@ -1433,7 +490,7 @@
 
 			"EmptyGameserversMatchingNearbyValue"
 			{
-				"ControlName"		"CExLabel"
+				"ControlName"		"Label"
 				"fieldName"		"EmptyGameserversMatchingNearbyValue"
 				"font"			"HudFontSmall"
 				"xpos"		"190"
@@ -1449,7 +506,7 @@
 
 			"EmptyGameserversMatchingWorldwideValue"
 			{
-				"ControlName"		"CExLabel"
+				"ControlName"		"Label"
 				"fieldName"		"EmptyGameserversMatchingWorldwideValue"
 				"font"			"HudFontSmall"
 				"xpos"		"280"
@@ -1492,7 +549,7 @@
 			}
 			"PartyHasLowPriorityLabel"
 			{
-				"ControlName"		"CExLabel"
+				"ControlName"		"Label"
 				"fieldName"		"PartyHasLowPriorityLabel"
 				"font"			"HudFontSmall"
 				"labelText"		"#TF_Matchmaking_PartyPenalty"
@@ -1509,7 +566,7 @@
 			}
 			"PartyLowPriorityPenaltyTimer"
 			{
-				"ControlName"		"CExLabel"
+				"ControlName"		"Label"
 				"fieldName"		"PartyLowPriorityPenaltyTimer"
 				"font"			"HudFontSmall"
 				"labelText"		"%penaltytimer%"
@@ -1532,9 +589,9 @@
 		"fieldName"		"PartyActiveGroupBox"
 		"xpos"			"c+100"
 		"ypos"		"10"
-		"zpos"		"10"
+		"zpos"		"1"
 		"wide"		"200"
-		"tall"		"330"
+		"tall"		"310"
 		"visible"	"0"
 
 		"NavToRelay"	"PartyGroupBox"
@@ -1554,13 +611,13 @@
 			"PaintBackgroundType"	"0"
 			"paintbackground"		"1"
 			"bgcolor_override"	"0 0 0 200"
-			"border"		"NoBorder"
+			"border"		"QuickplayBorder"
 
 			"NavToRelay"	"InviteButton"
 
 			"PartyLabel"
 			{
-				"ControlName"	"CExLabel"
+				"ControlName"	"Label"
 				"fieldName"		"PartyLabel"
 				"font"			"HudFontMediumBold"
 				"labelText"		"#TF_Matchmaking_Party"
@@ -1578,7 +635,7 @@
 				"fieldName"		"InviteButton"
 				"xpos"			"95"
 				"ypos"			"5"
-				"zpos"			"100"
+				"zpos"			"2"
 				"wide"			"100"
 				"tall"			"20"
 				"autoResize"	"0"
@@ -1619,10 +676,10 @@
 				"ControlName"	"SectionedListPanel"
 				"fieldName"		"PartyPlayerList"
 				"xpos"			"5"
-				"ypos"			"30"
+				"ypos"			"35"
 				"zpos"			"0"
 				"wide"			"190"
-				"tall"			"125"
+				"tall"			"120"
 				"linespacing"	"18"
 			}
 		}
@@ -1638,7 +695,7 @@
 			"wide"			"200"
 			"tall"			"110"
 			"bgcolor_override"	"0 0 0 200"
-			"border"		"NoBorder"
+			"border"		"QuickplayBorder"
 		}
 
 		"ChatTextEntry"
@@ -1652,7 +709,7 @@
 			"wide"			"200"
 			"tall"			"20"
 			"bgcolor_override"	"0 0 0 200"
-			"border"		"NoBorder"
+			"border"		"QuickplayBorder"
 		}
 	}
 
@@ -1671,7 +728,7 @@
 
 	"JoinLateValueLabel"
 	{
-		"ControlName"		"CExLabel"
+		"ControlName"		"Label"
 		"fieldName"		"JoinLateValueLabel"
 		"font"			"HudFontSmall"
 		"textAlignment"	"west"
@@ -1681,509 +738,4 @@
 		"wide"		"200"
 		"tall"		"20"
 	}
-
-	"CompetitiveModeGroupBox"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"CompetitiveModeGroupBox"
-		"xpos"		"0"
-		"ypos"		"10"
-		"zpos"		"-1"
-		"wide"		"f0"
-		"tall"		"470"
-		"visible"	"0"
-		"enabled"	"1"
-		//"border"	"MainMenuHighlightBorder"
-
-		"LadderLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"LadderLabel"
-			"xpos"			"105"
-			"ypos"			"0"
-			"zpos"			"0"
-			"wide"			"50"
-			"tall"			"20"
-			"visible"		"1"
-			"enabled"		"1"
-			"font"			"HudFontSmallestBold"
-			//"fgcolor_override"	"89 81 71 255"
-			"textAlignment"	"west"
-			"labelText"		"#TF_Competitive_Ladder"
-		}
-
-		// Dropdown
-		"CompetitiveModeComboBox"
-		{
-			"ControlName"		"ComboBox"
-			"fieldName"			"CompetitiveModeComboBox"
-			"Font"				"HudFontSmallestBold"
-			"xpos"				"155"
-			"ypos"				"1"
-			"zpos"				"0"
-			"wide"				"85"
-			"tall"				"15"
-			"autoResize"		"0"
-			"pinCorner"			"0"
-			"visible"			"1"
-			"enabled"			"1"
-			"textHidden"		"0"
-			"editable"			"0"
-			"maxchars"			"-1"
-			"NumericInputOnly"	"0"
-			"unicode"			"0"
-			"default"			"0"
-		
-			"fgcolor_override"	"White"
-			"bgcolor_override"	"0 0 0 0"
-			"disabledFgColor_override" "White"
-			"disabledBgColor_override" "0 0 0 0"
-			"selectionColor_override" "White"
-			"selectionTextColor_override" "White"
-			"defaultSelectionBG2Color_override" "0 0 0 0"
-		}
-		
-		"LadderInfoPanel"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"LadderInfoPanel"
-			"xpos"			"c-318"
-			"ypos"			"30"
-			"zpos"			"-1"
-			"wide"			"313"
-			"tall"			"285"
-			"PaintBackgroundType"	"0"
-			"paintbackground"		"1"
-			"bgcolor_override"	"10 10 10 200"
-			"border"			"QuickplayBorder"
-
-			"StatsLabel"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"StatsLabel"
-				"xpos"			"135"
-				"ypos"			"10"
-				"zpos"			"-1"
-				"wide"			"150"
-				"tall"			"20"
-				"visible"		"0"
-				"enabled"		"0"
-				"font"			"HudFontSmallBold"
-				"fgcolor_override"	"89 81 71 255"
-				"textAlignment"	"west"
-				"labelText"		"#TF_Competitive_Stats"
-			}
-			
-			// Rank title and icon
-			"RankBG"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"RankBG"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"-1"
-				"wide"			"200"
-				"tall"			"200"
-				"visible"		"1"
-				"enabled"		"1"
-				"mouseinputenabled" "0"
-				"image"			"competitive/comp_badge_ui_spotlight"
-				"scaleImage"	"1"
-			}
-
-			"RankLabel"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"RankLabel"
-				"xpos"			"107"
-				"ypos"			"35"
-				"zpos"			"0"
-				"wide"			"100"
-				"tall"			"20"
-				"visible"		"0"
-				"enabled"		"1"
-				"font"			"HudFontSmallBold"
-				//"fgcolor_override"	"89 81 71 255"
-				"textAlignment"	"west"
-				"labelText"		"#TF_Competitive_RankUpper"
-			}
-
-		"RankIcon"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"RankIcon"
-			"xpos"			"37"
-			"ypos"			"46"
-			"zpos"			"0"
-			"wide"			"55"
-			"tall"			"55"
-			"visible"		"1"
-			"enabled"		"1"
-			"mouseinputenabled" "0"
-			"image"			"pve/mvm_loot_image"
-			"scaleImage"	"1"
-		}
-
-			"RankNumber"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"RankNumber"
-				"xpos"			"100"
-				"ypos"			"30"
-				"zpos"			"0"
-				"wide"			"30"
-				"tall"			"20"
-				"visible"		"1"
-				"enabled"		"1"
-				"font"			"HudFontSmallBold"
-				//"fgcolor_override"	"250 114 45 255"
-				"textAlignment"	"west"
-				"labelText"		"%ranknumber%"
-			}
-
-			"RankTitle"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"RankTitle"
-				"xpos"			"115"
-				"ypos"			"30"
-				"zpos"			"0"
-				"wide"			"150"
-				"tall"			"20"
-				"visible"		"1"
-				"enabled"		"1"
-				"font"			"HudFontSmallBold"
-				//"fgcolor_override"	"250 114 45 255"
-				"textAlignment"	"west"
-				"labelText"		"%ranktitle%"
-			}
-
-			// Progress meter
-			"RankLevelLabel"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"RankLevelLabel"
-				"xpos"			"20"
-				"ypos"			"75"
-				"zpos"			"0"
-				"wide"			"100"
-				"tall"			"20"
-				"visible"		"0"
-				"enabled"		"1"
-				"font"			"HudFontSmallestBold"
-				//"fgcolor_override"	"89 81 71 255"
-				"textAlignment"	"west"
-				"labelText"		"#TF_Competitive_Next"
-			}
-
-			"RankLevel"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"RankLevel"
-				"xpos"			"55"
-				"ypos"			"75"
-				"zpos"			"0"
-				"wide"			"20"
-				"tall"			"20"
-				"visible"		"0"
-				"enabled"		"1"
-				"font"			"HudFontSmallBold"
-				"fgcolor_override"	"250 114 45 255"
-				"textAlignment"	"west"
-				"labelText"		"%ranklevel%"
-			}
-
-			"NextRankLevel"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"NextRankLevel"
-				"xpos"			"285"
-				"ypos"			"75"
-				"zpos"			"0"
-				"wide"			"100"
-				"tall"			"20"
-				"visible"		"0"
-				"enabled"		"1"
-				"font"			"HudFontSmallBold"
-				"fgcolor_override"	"250 114 45 255"
-				"textAlignment"	"west"
-				"labelText"		"%nextranklevel%"
-			}
-
-			"RankProgressMeter"
-			{	
-				"ControlName"	"ContinuousProgressBar"
-				"fieldName"		"RankProgressMeter"
-				"font"			"HudFontSmallestBold"
-				"xpos"			"100"
-				"ypos"			"50"
-				"zpos"			"2"
-				"wide"			"185"
-				"tall"			"10"				
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
-				"textAlignment"	"center"
-				"dulltext"		"0"
-				"brighttext"	"0"
-				"fgcolor_override"	"132 229 37 255"
-			}
-
-			"RankProgressMeterBG"
-			{
-				"ControlName"	"EditablePanel"
-				"fieldName"		"RankProgressMeterBG"
-				"xpos"			"99"
-				"ypos"			"49"
-				"zpos"			"-1"
-				"wide"			"187"
-				"tall"			"12"
-				"PaintBackgroundType"	"0"
-				"paintbackground"		"1"
-				"bgcolor_override"	"75 75 75 200"
-				//"border"			"QuickplayBorder"
-			}
-
-			"StatsButton"
-			{
-				"ControlName"	"CExButton"
-				"fieldName"		"StatsButton"
-				"xpos"			"50"
-				"ypos"			"110"
-				"zpos"			"1"
-				"wide"			"105"
-				"tall"			"16"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
-				"tabPosition"	"0"
-				"labelText"		"#TF_Competitive_Stats_Season"
-				"font"			"HudFontSmallBold"
-				"textAlignment"	"center"
-				"dulltext"		"0"
-				"brighttext"	"0"
-				"Command"		"stats_season"
-				"button_activation_type"	"1"	// only on press
-				"sound_depressed"	"UI/buttonclick.wav"
-				"sound_released"	"UI/buttonclickrelease.wav"
-			}
-
-			"MatchStatsButton"
-			{
-				"ControlName"	"CExButton"
-				"fieldName"		"MatchStatsButton"
-				"xpos"			"160"
-				"ypos"			"110"
-				"zpos"			"1"
-				"wide"			"105"
-				"tall"			"16"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
-				"tabPosition"	"0"
-				"labelText"		"#TF_Competitive_Stats_Match"
-				"font"			"HudFontSmallBold"
-				"textAlignment"	"center"
-				"dulltext"		"0"
-				"brighttext"	"0"
-				"bgcolor_override"	"89 81 71 255"
-				"Command"		"stats_match"
-				"button_activation_type"	"1"	// only on press
-				"sound_depressed"	"UI/buttonclick.wav"
-				"sound_released"	"UI/buttonclickrelease.wav"
-			}
-
-			"StatLine"
-			{
-				"ControlName"		"EditablePanel"
-				"fieldName"			"StatLine"
-				"xpos"				"15"
-				"ypos"				"125"
-				"zpos"				"10"
-				"wide"				"p0.9"
-				"tall"				"2"
-				"visible"			"0"
-				"proportionaltoparent" "1"
-				"bgcolor_override"	"89 81 71 255"
-			}
-
-			"StatList"
-			{
-				"ControlName"	"SectionedListPanel"
-				"fieldName"		"StatList"
-				"xpos"			"10"
-				"ypos"			"125"
-				"zpos"			"2"
-				"wide"			"330"
-				"tall"			"150"
-				"visible"		"1"
-				"linespacing"	"16"
-				"linegap"		"2"
-				"bgcolor_override"	"0 0 0 0"
-			}
-
-			"GoldMedalIcon"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"GoldMedalIcon"
-				"xpos"			"231"
-				"ypos"			"139"
-				"zpos"			"0"
-				"wide"			"18"
-				"tall"			"18"
-				"visible"		"1"
-				"enabled"		"1"
-				"mouseinputenabled" "0"
-				"image"			"competitive/competitive_coin_gold"
-				"scaleImage"	"1"
-			}
-
-			"SilverMedalIcon"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SilverMedalIcon"
-				"xpos"			"251"
-				"ypos"			"139"
-				"zpos"			"0"
-				"wide"			"18"
-				"tall"			"18"
-				"visible"		"1"
-				"enabled"		"1"
-				"mouseinputenabled" "0"
-				"image"			"competitive/competitive_coin_silver"
-				"scaleImage"	"1"
-			}
-
-			"BronzeMedalIcon"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"BronzeMedalIcon"
-				"xpos"			"270"
-				"ypos"			"139"
-				"zpos"			"0"
-				"wide"			"18"
-				"tall"			"18"
-				"visible"		"1"
-				"enabled"		"1"
-				"mouseinputenabled" "0"
-				"image"			"competitive/competitive_coin_bronze"
-				"scaleImage"	"1"
-			}
-
-			"MedalsHelpButton"
-			{
-				"ControlName"	"CExButton"
-				"fieldName"		"MedalsHelpButton"
-				"xpos"			"292"
-				"ypos"			"144"
-				"zpos"			"3"
-				"wide"			"12"
-				"tall"			"12"
-				"autoResize"	"0"
-				"pinCorner"		"3"
-				"visible"		"1"
-				"enabled"		"1"
-				"tabPosition"	"0"
-				"labelText"		"?"
-				"font"			"HudFontSmallBold"
-				"textAlignment"	"center"
-				"dulltext"		"0"
-				"brighttext"	"0"
-				"command"		"medals_help"
-				"button_activation_type"	"1"	// only on press
-				"sound_depressed"	"UI/buttonclick.wav"
-				"sound_released"	"UI/buttonclickrelease.wav"
-			}
-		}
-
-		"LeaderboardPanel"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"LeaderboardPanel"
-			"xpos"			"c5"
-			"ypos"			"30"
-			"zpos"			"-1"
-			"wide"			"313"
-			"tall"			"285"
-			"PaintBackgroundType"	"0"
-			"paintbackground"		"1"
-			"bgcolor_override"	"10 10 10 200"
-			"border"			"QuickplayBorder"
-			"mouseinputenabled" "1"
-
-			"Leaderboard"
-
-			{
-				"ControlName"	"CLadderLobbyLeaderboard"
-				"fieldName"		"Leaderboard"
-				"xpos"			"0"
-				"ypos"			"5"
-				"zpos"			"0"
-				"wide"			"313"
-				"tall"			"275"
-				"visible"		"1"
-				"enabled"		"1"
-				"mouseinputenabled" "1"
-				"scaleImage"	"1"
-				"entry_step"	"22"
-			}
-
-			"FriendsLeaderboardButton"
-			{
-				"ControlName"	"CExButton"
-				"fieldName"		"FriendsLeaderboardButton"
-				"xpos"			"50"
-				"ypos"			"8"
-				"zpos"			"100"
-				"wide"			"105"
-				"tall"			"16"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
-				"tabPosition"	"0"
-				"labelText"		"#TF_Competitive_Friends"
-				"font"			"HudFontSmallBold"
-				"textAlignment"	"center"
-				"dulltext"		"0"
-				"brighttext"	"0"
-				"Command"		"friends_leaderboard"
-				"button_activation_type"	"1"	// only on press
-				"sound_depressed"	"UI/buttonclick.wav"
-				"sound_released"	"UI/buttonclickrelease.wav"
-			}
-
-			"GlobalLeaderboardButton"
-
-			{
-				"ControlName"	"CExButton"
-				"fieldName"		"GlobalLeaderboardButton"
-
-				"xpos"			"160"
-				"ypos"			"8"
-				"zpos"			"100"
-
-				"wide"			"105"
-				"tall"			"16"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
-				"tabPosition"	"0"
-				"labelText"		"#TF_Competitive_Global"
-				"font"			"HudFontSmallBold"
-				"textAlignment"	"center"
-				"dulltext"		"0"
-				"brighttext"	"0"
-				"bgcolor_override"	"89 81 71 255"
-				"Command"		"global_leaderboard"
-				"button_activation_type"	"1"	// only on press
-				"sound_depressed"	"UI/buttonclick.wav"
-				"sound_released"	"UI/buttonclickrelease.wav"
-			}
-		}
-	}
 }