Updated main menu pages

- Added a home server button.
- Added a HUD Options panel.
- Updated the source schema.
- Updated the backpack, trade, stats, workshop

15 files changed, 889 insertions, 284 deletions

diff --git a/resource/clientscheme.res b/resource/clientscheme.res
index c46f168..7b7216c 100644
--- a/resource/clientscheme.res
+++ b/resource/clientscheme.res
@@ -1,7 +1,7 @@
+#base "scheme/clientscheme_settings.res"
 #base "scheme/clientscheme_borders.res"
 #base "scheme/clientscheme_colors.res"
 #base "scheme/clientscheme_fonts.res"
 #base "scheme/clientscheme_icons.res"
-#base "scheme/clientscheme_settings.res"
-#base "scheme/clientscheme_xhairs_outline.res"
-#base "scheme/clientscheme_xhairs.res"
\ No newline at end of file
+#base "scheme/clientscheme_xhairs.res"
+#base "scheme/clientscheme_xhairs_outline.res"
\ No newline at end of file
diff --git a/resource/fonts/TF2Icons.ttf b/resource/fonts/TF2Icons.ttf
index 2dc30c9..41952b7 100644
--- a/resource/fonts/TF2Icons.ttf
+++ b/resource/fonts/TF2Icons.ttf
diff --git a/resource/gamemenu.res b/resource/gamemenu.res
index 5b910d6..d29bf28 100644
--- a/resource/gamemenu.res
+++ b/resource/gamemenu.res
@@ -66,14 +66,14 @@
 	}
 	"MOTD_ShowButtonPanel"
 	{
-		"label"			"o"
+		"label"			"w"
 		"command"		"motd_show"
-		"tooltip"		"#TF_MOTD_Title"
+		"tooltip"		"#TF_OptionCategory_HUD"
 	}
-	"RefreshHUDButton"
+	"HomeServerButton"
 	{
-		"label"			"."
-		"command"		"engine hud_reloadscheme"
-		"tooltip"		"Refresh HUD"
+		"label"			"p"
+		"command"		"engine connect 138.197.133.71; password flawhud"
+		"tooltip"		"Home Server"
 	}
 }
\ No newline at end of file
diff --git a/resource/sourcescheme.res b/resource/sourcescheme.res
index 5b6866b..5c308ad 100644
--- a/resource/sourcescheme.res
+++ b/resource/sourcescheme.res
@@ -16,6 +16,7 @@ Scheme
 		"Black"						"17 17 17 255"
 		"Blank"						"0 0 0 0"
 		"HudBlack"					"0 0 0 200"
+		"Cyan"						"72 255 255 255"
 
 		// BASE COLORS
 		//---------------------------------------------
@@ -58,7 +59,7 @@ Scheme
 		Border.Bright					"Blank"
 		Border.Dark						"Blank"
 		Border.Selection				"Blank"
-		Border.DarkSolid				"32 32 32 255"
+		Border.DarkSolid				"Cyan"
 
 		Button.TextColor				"White"
 		Button.BgColor					"Black"
@@ -96,7 +97,7 @@ Scheme
 		FrameGrip.Color2				"White"
 		FrameTitleButton.FgColor		"White"
 		FrameTitleBar.Font				"UiBold"
-		FrameTitleBar.TextColor			"White"
+		FrameTitleBar.TextColor			"Cyan"
 		FrameTitleBar.DisabledTextColor	"DullWhite"
 
 		Label.TextDullColor				"DullWhite"
diff --git a/resource/tools.res b/resource/tools.res
new file mode 100644
index 0000000..39535a9
--- /dev/null
+++ b/resource/tools.res
@@ -0,0 +1,522 @@
+"Resource/UI/MainMenuOverride.res"
+{
+	"MOTD_Panel"
+	{
+		"ControlName"		"EditablePanel"
+		"fieldName"			"MOTD_Panel"
+		"xpos"				"r345"
+		"ypos"				"85"
+		"zpos"				"100"
+		"wide"				"300"
+		"tall"				"190"
+		"visible"			"0"
+		"paintbackground"	"1"
+		"paintborder"		"0"
+		"bgcolor_override"	"DarkGrey"
+		"PaintBackgroundType"	"0"
+
+		"MOTD_HeaderContainer"
+		{
+			"ControlName"		"EditablePanel"
+			"fieldName"			"MOTD_HeaderContainer"
+			"xpos"				"0"
+			"ypos"				"0"
+			"wide"				"300"
+			"tall"				"22"
+			"visible"			"1"
+			"bgcolor_override"	"DarkerGrey"
+
+			"HeaderLabel"
+			{
+				"ControlName"			"Label"
+				"fieldName"				"HeaderLabel"
+				"font"					"Cerbetica18"
+				"textAlignment"			"center"
+				"xpos"					"0"
+				"ypos"					"0"
+				"wide"					"300"
+				"tall"					"24"
+				"autoResize"			"0"
+				"pinCorner"				"0"
+				"visible"				"1"
+				"enabled"				"1"
+				"paintbackground" 		"0"
+				"fgcolor_override"		"ColorCyan"
+				"labelText"				"#TF_OptionCategory_HUD"
+				"allcaps"				"1"
+			}
+		}
+
+		"MOTD_CloseButton"
+		{
+			"ControlName"		"CExImageButton"
+			"fieldName"			"MOTD_CloseButton"
+			"xpos"				"282"
+			"ypos"				"4"
+			"zpos"				"10"
+			"wide"				"14"
+			"tall"				"14"
+			"autoResize"		"0"
+			"pinCorner"			"0"
+			"visible"			"1"
+			"enabled"			"1"
+			"tabPosition"		"0"
+			"labeltext"			"("
+			"font"				"CustomIcons"
+			"textAlignment"		"center"
+			"dulltext"			"0"
+			"brighttext"		"0"
+			"default"			"0"
+			"actionsignallevel"	"2"
+			"Command"			"motd_hide"
+			"paintbackground"	"0"
+
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+
+			"defaultFgColor_override" 	"TanLight"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "TanLight"
+		}
+
+		"MOTD_HeaderIcon"
+		{
+			"ControlName"			"ImagePanel"
+			"fieldName"				"MOTD_HeaderIcon"
+			"xpos"					"9999"
+		}
+
+		"MOTD_Label"
+		{
+			"ControlName"			"CExLabel"
+			"fieldName"				"MOTD_Label"
+			"xpos"					"9999"
+		}
+
+		"MOTD_TitleImageBg"
+		{
+			"ControlName"			"ImagePanel"
+			"fieldName"				"MOTD_TitleImageBg"
+			"xpos"					"9999"
+		}
+
+		"MOTD_TitleImageContainer"
+		{
+			"ControlName"			"EditablePanel"
+			"fieldName"				"MOTD_TitleImageContainer"
+			"xpos"					"9999"
+		}
+
+		"MOTD_TextScroller"
+		{
+			"ControlName"			"ScrollableEditablePanel"
+			"fieldName"				"MOTD_TextScroller"
+			"xpos"					"9999"
+		}
+
+		"MOTD_URLButton"
+		{
+			"ControlName"			"CExButton"
+			"fieldName"				"MOTD_URLButton"
+			"xpos"					"9999"
+		}
+
+		"MOTD_PrevButton"
+		{
+			"ControlName"			"CExImageButton"
+			"fieldName"				"MOTD_PrevButton"
+			"xpos"					"9999"
+		}
+
+		"MOTD_NextButton"
+		{
+			"ControlName"			"CExImageButton"
+			"fieldName"				"MOTD_NextButton"
+			"xpos"					"9999"
+		}
+		
+		"ReloadScheme"
+		{
+			"ControlName"			"CExImageButton"
+			"fieldname"				"ReloadScheme"
+			"xpos"					"-20"
+			"ypos"					"-35"
+			"zpos"					"16"
+			"wide"					"130"
+			"tall"					"26"
+			"visible"				"1"
+			"enabled"				"1"
+			"labeltext"				"RELOAD HUD"
+			"command"				"engine vgui_cache_res_files 0;hud_reloadscheme"
+			"actionsignallevel"		"2"
+			"font"					"Cerbetica12"
+			"textAlignment"			"center"
+			"sound_depressed"		"UI/buttonclick.wav"
+			"sound_released"		"UI/buttonclickrelease.wav"
+			
+			"pin_to_sibling"		"MOTD_HeaderContainer"
+			"pin_corner_to_sibling" "PIN_TOPLEFT"
+			"pin_to_sibling_corner" "PIN_TOPLEFT"
+		}
+		
+		"ChatToggle"
+		{
+			"ControlName"			"CExImageButton"
+			"fieldname"				"ChatToggle"
+			"xpos"					"5"
+			"ypos"					"0"
+			"zpos"					"16"
+			"wide"					"130"
+			"tall"					"26"
+			"visible"				"1"
+			"enabled"				"1"
+			"labeltext"				"CHAT ON/OFF"
+			"command"				"engine toggle hud_saytext_time 10 0"
+			"actionsignallevel"		"2"
+			"font"					"Cerbetica12"
+			"textAlignment"			"center"
+			"sound_depressed"		"UI/buttonclick.wav"
+			"sound_released"		"UI/buttonclickrelease.wav"
+			
+			"pin_to_sibling"		"ReloadScheme"
+			"pin_corner_to_sibling" "PIN_TOPLEFT"
+			"pin_to_sibling_corner" "PIN_TOPRIGHT"
+		}
+		
+		"ClosedCaptionsON"
+		{
+			"ControlName"			"CExImageButton"
+			"fieldname"				"ClosedCaptionsON"
+			"xpos"					"0"
+			"ypos"					"-30"
+			"zpos"					"16"
+			"wide"					"130"
+			"tall"					"26"
+			"visible"				"1"
+			"enabled"				"1"
+			"labeltext"				"CAPTIONS ON"
+			"command"				"engine closecaption 1;cc_subtitles 0;cc_lang english;cc_predisplay_time 0;cc_emit #subtitles0"
+			"actionsignallevel"		"2"
+			"font"					"Cerbetica12"
+			"textAlignment"			"center"
+			"sound_depressed"		"UI/buttonclick.wav"
+			"sound_released"		"UI/buttonclickrelease.wav"
+			
+			"pin_to_sibling"		"ReloadScheme"
+		}
+		
+		"ClosedCaptionsOFF"
+		{
+			"ControlName"			"CExImageButton"
+			"fieldname"				"ClosedCaptionsOFF"
+			"xpos"					"5"
+			"ypos"					"0"
+			"zpos"					"16"
+			"wide"					"130"
+			"tall"					"26"
+			"visible"				"1"
+			"enabled"				"1"
+			"labeltext"				"CAPTIONS OFF"
+			"command"				"engine closecaption 0"
+			"actionsignallevel"		"2"
+			"font"					"Cerbetica12"
+			"textAlignment"			"center"
+			"sound_depressed"		"UI/buttonclick.wav"
+			"sound_released"		"UI/buttonclickrelease.wav"
+			
+			"pin_to_sibling"		"ClosedCaptionsON"
+			"pin_corner_to_sibling" "PIN_TOPLEFT"
+			"pin_to_sibling_corner" "PIN_TOPRIGHT"
+		}
+		
+		"SoundFix"
+		{
+			"ControlName"			"CExImageButton"
+			"fieldname"				"SoundFix"
+			"xpos"					"0"
+			"ypos"					"-30"
+			"zpos"					"16"
+			"wide"					"130"
+			"tall"					"26"
+			"visible"				"1"
+			"enabled"				"1"
+			"labeltext"				"FIX SOUND ISSUES"
+			"command"				"engine snd_restart"
+			"actionsignallevel"		"2"
+			"font"					"Cerbetica12"
+			"textAlignment"			"center"
+			"sound_depressed"		"UI/buttonclick.wav"
+			"sound_released"		"UI/buttonclickrelease.wav"
+			"pin_to_sibling"		"ClosedCaptionsON"
+		}
+		
+		"InviliblePlayersFix"
+		{
+			"ControlName"			"CExImageButton"
+			"fieldname"				"InviliblePlayersFix"
+			"xpos"					"5"
+			"ypos"					"0"
+			"zpos"					"16"
+			"wide"					"130"
+			"tall"					"26"
+			"visible"				"1"
+			"enabled"				"1"
+			"labeltext"				"FIX VISUAL ISSUES"
+			"command"				"engine record fix;stop"
+			"actionsignallevel"		"2"
+			"font"					"Cerbetica12"
+			"textAlignment"			"center"
+			"sound_depressed"		"UI/buttonclick.wav"
+			"sound_released"		"UI/buttonclickrelease.wav"
+			
+			"pin_to_sibling"		"SoundFix"
+			"pin_corner_to_sibling" "PIN_TOPLEFT"
+			"pin_to_sibling_corner" "PIN_TOPRIGHT"
+		}
+		
+		"NetgraphToggle"
+		{
+			"ControlName"			"CExImageButton"
+			"fieldname"				"NetgraphToggle"
+			"xpos"					"0"
+			"ypos"					"-30"
+			"zpos"					"16"
+			"wide"					"130"
+			"tall"					"26"
+			"visible"				"1"
+			"enabled"				"1"
+			"labeltext"				"NET GRAPH ON/OFF"
+			"command"				"engine toggle net_graph"
+			"actionsignallevel"		"2"
+			"font"					"Cerbetica12"
+			"textAlignment"			"center"
+			"sound_depressed"		"UI/buttonclick.wav"
+			"sound_released"		"UI/buttonclickrelease.wav"
+			"pin_to_sibling"		"SoundFix"
+		}
+		
+		"MatchStatusToggle"
+		{
+			"ControlName"			"CExImageButton"
+			"fieldname"				"MatchStatusToggle"
+			"xpos"					"5"
+			"ypos"					"0"
+			"zpos"					"16"
+			"wide"					"130"
+			"tall"					"26"
+			"visible"				"1"
+			"enabled"				"1"
+			"labeltext"				"MATCH HUD ON/OFF"
+			"command"				"engine toggle tf_use_match_hud"
+			"actionsignallevel"		"2"
+			"font"					"Cerbetica12"
+			"textAlignment"			"center"
+			"sound_depressed"		"UI/buttonclick.wav"
+			"sound_released"		"UI/buttonclickrelease.wav"
+			"pin_to_sibling"		"NetgraphToggle"
+			"pin_corner_to_sibling" "PIN_TOPLEFT"
+			"pin_to_sibling_corner" "PIN_TOPRIGHT"
+		}
+		
+		"DamageLabel"
+		{
+			"ControlName"			"CExLabel"
+			"fieldName"				"DamageLabel"
+			"xpos"					"0"
+			"ypos"					"5"
+			"wide"					"130"
+			"tall"					"12"
+			"autoResize"			"0"
+			"pinCorner"				"0"
+			"visible"				"1"
+			"enabled"				"1"
+			"labelText"				"Damage Color:"
+			"font"					"Cerbetica12"
+			"textAlignment"			"center"
+			"fgcolor_override"		"TanLight"
+			"pin_to_sibling"		"NetgraphToggle"
+			"pin_corner_to_sibling" "PIN_TOPLEFT"
+			"pin_to_sibling_corner" "PIN_BOTTOMLEFT"
+		}
+		
+		"DamageWhite"
+		{
+			"ControlName"			"CExImageButton"
+			"fieldname"				"DamageWhite"
+			"xpos"					"-17"
+			"ypos"					"0"
+			"zpos"					"16"
+			"wide"					"15"
+			"tall"					"15"
+			"visible"				"1"
+			"enabled"				"1"
+			"labelText"				"#"
+			"command"				"engine hud_combattext 1;hud_combattext_red 255;hud_combattext_green 255;hud_combattext_blue 255"
+			"actionsignallevel"		"2"
+			"font"					"CustomIcons"
+			"textAlignment"			"center"
+			"paintbackground"		"0"
+			
+			"sound_depressed"		"UI/buttonclick.wav"
+			"sound_released"		"UI/buttonclickrelease.wav"
+			
+			"pin_to_sibling"		"DamageLabel"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_BOTTOMLEFT"
+			
+			"defaultFgColor_override"	"255 255 255 255"
+			"armedFgColor_override"		"128 128 128 255"
+			"depressedFgColor_override"	"255 255 255 255"
+		}
+		
+		"DamageYellow"
+		{
+			"ControlName"			"CExImageButton"
+			"fieldname"				"DamageYellow"
+			"xpos"					"1"
+			"ypos"					"0"
+			"zpos"					"16"
+			"wide"					"15"
+			"tall"					"15"
+			"visible"				"1"
+			"enabled"				"1"
+			"labelText"				"#"
+			"command"				"engine hud_combattext 1;hud_combattext_red 255;hud_combattext_green 255;hud_combattext_blue 0"
+			"actionsignallevel"		"2"
+			"font"					"CustomIcons"
+			"textAlignment"			"center"
+			"paintbackground"		"0"
+			
+			"sound_depressed"		"UI/buttonclick.wav"
+			"sound_released"		"UI/buttonclickrelease.wav"
+			
+			"pin_to_sibling"		"DamageWhite"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPRIGHT"
+			
+			"defaultFgColor_override" 	"255 255 0 255"
+			"armedFgColor_override" 	"128 128 0 255"
+			"depressedFgColor_override" "255 255 0 255"
+		}
+		
+		"DamageRed"
+		{
+			"ControlName"			"CExImageButton"
+			"fieldname"				"DamageRed"
+			"xpos"					"1"
+			"ypos"					"0"
+			"zpos"					"16"
+			"wide"					"15"
+			"tall"					"15"
+			"visible"				"1"
+			"enabled"				"1"
+			"labelText"				"#"
+			"command"				"engine hud_combattext 1;hud_combattext_red 255;hud_combattext_green 0;hud_combattext_blue 0"
+			"actionsignallevel"		"2"
+			"font"					"CustomIcons"
+			"textAlignment"			"center"
+			"paintbackground"		"0"
+			
+			"sound_depressed"		"UI/buttonclick.wav"
+			"sound_released"		"UI/buttonclickrelease.wav"
+			
+			"pin_to_sibling"		"DamageYellow"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPRIGHT"
+			
+			"defaultFgColor_override" 	"255 0 0 255"
+			"armedFgColor_override" 	"128 0 0 255"
+			"depressedFgColor_override" "255 0 0 255"
+		}
+		
+		"DamageGreen"
+		{
+			"ControlName"			"CExImageButton"
+			"fieldname"				"DamageGreen"
+			"xpos"					"1"
+			"ypos"					"0"
+			"zpos"					"16"
+			"wide"					"15"
+			"tall"					"15"
+			"visible"				"1"
+			"enabled"				"1"
+			"labelText"				"#"
+			"command"				"engine hud_combattext 1;hud_combattext_red 0;hud_combattext_green 255;hud_combattext_blue 0"
+			"actionsignallevel"		"2"
+			"font"					"CustomIcons"
+			"textAlignment"			"center"
+			"paintbackground"		"0"
+			
+			"sound_depressed"		"UI/buttonclick.wav"
+			"sound_released"		"UI/buttonclickrelease.wav"
+			
+			"pin_to_sibling"		"DamageRed"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPRIGHT"
+			
+			"defaultFgColor_override" 	"0 255 0 255"
+			"armedFgColor_override" 	"0 128 0 255"
+			"depressedFgColor_override" "0 255 0 255"
+		}
+		
+		"DamageCyan"
+		{
+			"ControlName"			"CExImageButton"
+			"fieldname"				"DamageCyan"
+			"xpos"					"1"
+			"ypos"					"0"
+			"zpos"					"16"
+			"wide"					"15"
+			"tall"					"15"
+			"visible"				"1"
+			"enabled"				"1"
+			"labelText"				"#"
+			"command"				"engine hud_combattext 1;hud_combattext_red 0;hud_combattext_green 255;hud_combattext_blue 255"
+			"actionsignallevel"		"2"
+			"font"					"CustomIcons"
+			"textAlignment"			"center"
+			"paintbackground"		"0"
+			
+			"sound_depressed"		"UI/buttonclick.wav"
+			"sound_released"		"UI/buttonclickrelease.wav"
+			
+			"pin_to_sibling"		"DamageGreen"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPRIGHT"
+			
+			"defaultFgColor_override" 	"0 255 255 255"
+			"armedFgColor_override" 	"0 128 128 255"
+			"depressedFgColor_override" "0 255 255 255"
+		}
+
+		"DamagePink"
+		{
+			"ControlName"			"CExImageButton"
+			"fieldname"				"DamagePink"
+			"xpos"					"1"
+			"ypos"					"0"
+			"zpos"					"16"
+			"wide"					"15"
+			"tall"					"15"
+			"visible"				"1"
+			"enabled"				"1"
+			"labelText"				"#"
+			"command"				"engine hud_combattext 1;hud_combattext_red 255;hud_combattext_green 0;hud_combattext_blue 255"
+			"actionsignallevel"		"2"
+			"font"					"CustomIcons"
+			"textAlignment"			"center"
+			"paintbackground"		"0"
+			
+			"sound_depressed"		"UI/buttonclick.wav"
+			"sound_released"		"UI/buttonclickrelease.wav"
+			
+			"pin_to_sibling"		"DamageCyan"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPRIGHT"
+			
+			"defaultFgColor_override" 	"255 0 255 255"
+			"armedFgColor_override" 	"128 0 128 255"
+			"depressedFgColor_override" "255 0 255 255"
+		}
+	}
+}
diff --git a/resource/ui/econ/backpackpanel.res b/resource/ui/econ/backpackpanel.res
index fdaedfc..5b7b0f7 100644
--- a/resource/ui/econ/backpackpanel.res
+++ b/resource/ui/econ/backpackpanel.res
@@ -182,7 +182,7 @@
 		"xpos"				"c-270"
 		"ypos"				"10"
 		"zpos"				"1"
-		"wide"				"200"
+		"wide"				"350"
 		"tall"				"25"
 		"autoResize"		"0"
 		"pinCorner"			"0"
@@ -245,8 +245,8 @@
 		"labelText"			"#ShowBaseItemsCheckBox"
 		"font"				"HudFontSmallestBold"
 		"textAlignment"		"east"
-		"xpos"				"c-60"
-		"ypos"				"15"
+		"xpos"				"c-170"
+		"ypos"				"34"
 		"zpos"				"1"
 		"wide"				"120"
 		"tall"				"20"
@@ -268,9 +268,9 @@
 		"labelText"			"#Store_NameFilterLabel"
 		"textAlignment"		"west"
 		"xpos"				"c117"
-		"ypos"				"0"
+		"ypos"				"17"
 		"zpos"				"1"
-		"wide"				"90"
+		"wide"				"40"
 		"tall"				"15"
 		"autoResize"		"1"
 		"pinCorner"			"0"
@@ -283,10 +283,10 @@
 	{
 		"ControlName"		"TextEntry"
 		"fieldName"			"NameFilterTextEntry"
-		"xpos"				"c117"
-		"ypos"				"15"
-		"wide"				"168"
-		"tall"				"19"
+		"xpos"				"c155"
+		"ypos"				"17"
+		"wide"				"130"
+		"tall"				"15"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
@@ -295,8 +295,8 @@
 		"textHidden"		"0"
 		"editable"			"1"
 		"unicode"			"1"
-		"fgcolor_override"	"TanLight"
-		"bgcolor_override"	"DarkerGrey"
+		"fgcolor_override"	"DarkerGrey"
+		"bgcolor_override"	"TanLight"
 		"paintbackgroundtype" "2"
 		"font"				"HudFontSmallest"
 	}
@@ -400,7 +400,7 @@
 		"ControlName"	"CExButton"
 		"fieldName"		"PrevPageButton"
 		"xpos"			"c-288"
-		"ypos"			"40"
+		"ypos"			"37"
 		"zpos"			"1"
 		"wide"			"25"
 		"tall"			"15"
@@ -427,10 +427,10 @@
 		"labelText"		"%backpackpage%"
 		"textAlignment"	"center"
 		"xpos"			"c-260"
-		"ypos"			"40"
+		"ypos"			"37"
 		"zpos"			"1"
 		"wide"			"53"
-		"tall"			"13"
+		"tall"			"15"
 		"autoResize"	"1"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -443,7 +443,7 @@
 		"ControlName"	"CExButton"
 		"fieldName"		"NextPageButton"
 		"xpos"			"c-204"
-		"ypos"			"40"
+		"ypos"			"37"
 		"zpos"			"1"
 		"wide"			"25"
 		"tall"			"15"
@@ -515,7 +515,7 @@
 		"ControlName"	"CExButton"
 		"fieldName"		"CancelApplyToolButton"
 		"xpos"			"c117"
-		"ypos"			"37"
+		"ypos"			"38"
 		"zpos"			"1"
 		"wide"			"168"
 		"tall"			"15"
diff --git a/resource/ui/econ/tradingstartdialog.res b/resource/ui/econ/tradingstartdialog.res
index ed81ff3..9dd70ee 100644
--- a/resource/ui/econ/tradingstartdialog.res
+++ b/resource/ui/econ/tradingstartdialog.res
@@ -6,7 +6,7 @@
 		"visible"				"1"
 		"enabled"				"1"
 		"xpos"					"c-200"
-		"ypos"					"80"
+		"ypos"					"75"
 		"wide"					"400"
 		"tall"					"300"
 		"bgcolor_override"		"DarkerGrey"
@@ -66,7 +66,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"TitleLabel"
-		"font"			"HudFontMedium"
+		"font"			"HudFontMediumBig"
 		"labelText"		"#TF_TradeStartDialog_Title"
 		"textAlignment"	"north"
 		"xpos"			"0"
@@ -78,6 +78,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
+		"allcaps"		"1"
 		"fgcolor_override" "TanLight"
 	}
 
@@ -121,14 +122,14 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"QueryLabel"
-			"font"			"HudFontSmallest"
+			"font"			"HudFontMediumSmall"
 			"labelText"		"#TF_TradeStartDialog_Select"
 			"textAlignment"	"north"
 			"xpos"			"0"
 			"ypos"			"10"
 			"zpos"			"-1"
 			"wide"			"400"
-			"tall"			"15"
+			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -226,13 +227,13 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"QueryLabel"
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontMediumSmall"
 			"labelText"		"#TF_TradeStartDialog_Friends"
 			"textAlignment"	"north"
 			"xpos"			"0"
 			"ypos"			"10"
 			"wide"			"400"
-			"tall"			"15"
+			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -278,11 +279,11 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"QueryLabel"
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontMediumSmall"
 			"labelText"		"#TF_TradeStartDialog_Server"
 			"textAlignment"	"north"
 			"xpos"			"0"
-			"ypos"			"10"
+			"ypos"			"20"
 			"zpos"			"-1"
 			"wide"			"400"
 			"tall"			"15"
@@ -331,14 +332,14 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"QueryLabel"
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontMediumSmall"
 			"labelText"		"#TF_TradeStartDialog_Profile"
 			"textAlignment"	"north"
 			"xpos"			"0"
 			"ypos"			"10"
 			"zpos"			"-1"
 			"wide"			"400"
-			"tall"			"15"
+			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -481,6 +482,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"1"
+		"allcaps"		"1"
 		"Command"		"cancel"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
diff --git a/resource/ui/mainmenuoverride.res b/resource/ui/mainmenuoverride.res
index 331e9c5..05b56ba 100644
--- a/resource/ui/mainmenuoverride.res
+++ b/resource/ui/mainmenuoverride.res
@@ -1,6 +1,7 @@
 "#base" "../../resource/preload.res"
 "#base" "../../#customizations/_enabled/mainmenuoverride-classic.res"
 "#base" "../../#customizations/_stock/mainmenuoverride.res"
+#base "../../resource/tools.res"
 
 "Resource/UI/MainMenuOverride.res"
 {
@@ -86,6 +87,7 @@
 		"tall"			"20"
 		"visible"		"1"
 		"enabled"		"1"
+		
 		"pin_to_sibling"	"QuestLogButton"
 		"pin_corner_to_sibling"	"PIN_BOTTOMLEFT"
 		"pin_to_sibling_corner"	"PIN_BOTTOMLEFT"
@@ -112,15 +114,16 @@
 			"paintborder"		"0"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
+			
 			"defaultFgColor_override"	"235 226 202 255"
 			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
-	"RefreshHUDButton"
+	"HomeServerButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"RefreshHUDButton"
+		"fieldName"		"HomeServerButton"
 		"xpos"			"0"
 		"ypos"			"20"
 		"zpos"			"1"
@@ -153,6 +156,7 @@
 			"paintborder"		"0"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
+			
 			"defaultFgColor_override"	"235 226 202 255"
 			"armedFgColor_override"		"72 255 255 255"
 		}
diff --git a/resource/ui/publishfiledialog.res b/resource/ui/publishfiledialog.res
index 4da9536..e614a48 100644
--- a/resource/ui/publishfiledialog.res
+++ b/resource/ui/publishfiledialog.res
@@ -83,6 +83,7 @@
 		"dulltext"			"0"
 		"brighttext"		"0"
 		"wrap"				"0"
+		"allcaps"			"1"
 		"font"				"HudFontMedium"
 	}
 
@@ -219,7 +220,7 @@
 		"NumericInputOnly"	"0"
 		"unicode"			"1"
 		"fgcolor_override"	"ColorBlack"
-		"bgcolor_override"	"235 226 202 255"
+		"bgcolor_override"	"TanLight"
 		"paintbackgroundtype"	"2"
 		"font"					"HudFontSmall"
 	}
@@ -263,7 +264,7 @@
 		"NumericInputOnly"	"0"
 		"unicode"			"1"
 		"fgcolor_override"	"ColorBlack"
-		"bgcolor_override"	"235 226 202 255"
+		"bgcolor_override"	"TanLight"
 		"paintbackgroundtype"	"2"
 		"font"					"HudFontSmall"
 	}
@@ -313,7 +314,7 @@
 
 	"ButtonSourceCosmetics"
 	{
-		"ControlName"		"CExImageButton"
+		"ControlName"		"Button"
 		"fieldName"			"ButtonSourceCosmetics"
 		"xpos"				"15"
 		"ypos"				"250"
@@ -359,7 +360,7 @@
 
 	"ButtonSourceMaps"
 	{
-		"ControlName"		"CExImageButton"
+		"ControlName"		"Button"
 		"fieldName"			"ButtonSourceMaps"
 		"xpos"				"15"
 		"ypos"				"310"
@@ -439,7 +440,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"ClassCheckBox1"
 			"labelText"		"#TF_Class_Name_Scout"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"0"
 			"ypos"			"25"
@@ -459,7 +460,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"ClassCheckBox2"
 			"labelText"		"#TF_Class_Name_Sniper"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"0"
 			"ypos"			"45"
@@ -479,7 +480,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"ClassCheckBox3"
 			"labelText"		"#TF_Class_Name_Soldier"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"0"
 			"ypos"			"65"
@@ -499,7 +500,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"ClassCheckBox4"
 			"labelText"		"#TF_Class_Name_Demoman"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"0"
 			"ypos"			"85"
@@ -519,7 +520,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"ClassCheckBox5"
 			"labelText"		"#TF_Class_Name_Medic"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"0"
 			"ypos"			"105"
@@ -539,7 +540,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"ClassCheckBox6"
 			"labelText"		"#TF_Class_Name_HWGuy"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"0"
 			"ypos"			"125"
@@ -559,7 +560,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"ClassCheckBox7"
 			"labelText"		"#TF_Class_Name_Pyro"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"0"
 			"ypos"			"145"
@@ -579,7 +580,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"ClassCheckBox8"
 			"labelText"		"#TF_Class_Name_Spy"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"0"
 			"ypos"			"165"
@@ -599,7 +600,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"ClassCheckBox9"
 			"labelText"		"#TF_Class_Name_Engineer"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			""
 			"ypos"			"185"
@@ -620,9 +621,9 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"TagCheckbox_Headgear"
 			"labelText"		"#TF_SteamWorkshop_Tag_Headgear"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
-			"xpos"			"85"
+			"xpos"			"75"
 			"ypos"			"25"
 			"zpos"			"1"
 			"wide"			"75"
@@ -640,9 +641,9 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"TagCheckbox_Weapon"
 			"labelText"		"#TF_SteamWorkshop_Tag_Weapon"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
-			"xpos"			"85"
+			"xpos"			"75"
 			"ypos"			"45"
 			"zpos"			"1"
 			"wide"			"75"
@@ -660,9 +661,9 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"TagCheckbox_Misc"
 			"labelText"		"#TF_SteamWorkshop_Tag_Misc"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
-			"xpos"			"85"
+			"xpos"			"75"
 			"ypos"			"65"
 			"zpos"			"1"
 			"wide"			"75"
@@ -680,12 +681,12 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"TagCheckbox_SoundDevice"
 			"labelText"		"#TF_SteamWorkshop_Tag_SoundDevice"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
-			"xpos"			"85"
+			"xpos"			"75"
 			"ypos"			"85"
 			"zpos"			"1"
-			"wide"			"75"
+			"wide"			"f0"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -700,9 +701,9 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"TagCheckbox_Halloween"
 			"labelText"		"#TF_SteamWorkshop_Tag_Halloween"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
-			"xpos"			"85"
+			"xpos"			"75"
 			"ypos"			"105"
 			"zpos"			"1"
 			"wide"			"75"
@@ -720,9 +721,9 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"TagCheckbox_Smissmas"
 			"labelText"		"#TF_SteamWorkshop_Tag_Smissmas"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
-			"xpos"			"85"
+			"xpos"			"75"
 			"ypos"			"125"
 			"zpos"			"1"
 			"wide"			"75"
@@ -740,9 +741,9 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"TagCheckbox_Taunt"
 			"labelText"		"#TF_SteamWorkshop_Tag_Taunt"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
-			"xpos"			"85"
+			"xpos"			"75"
 			"ypos"			"145"
 			"zpos"			"1"
 			"wide"			"75"
@@ -760,12 +761,12 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"TagCheckbox_UnusualEffect"
 			"labelText"		"#TF_SteamWorkshop_Tag_UnusualEffect"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
-			"xpos"			"85"
+			"xpos"			"75"
 			"ypos"			"165"
 			"zpos"			"1"
-			"wide"			"75"
+			"wide"			"f0"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -780,9 +781,9 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"TagCheckbox_WarPaint"
 			"labelText"		"#TF_SteamWorkshop_Tag_WarPaint"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
-			"xpos"			"85"
+			"xpos"			"75"
 			"ypos"			"185"
 			"zpos"			"1"
 			"wide"			"75"
@@ -800,9 +801,9 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"TagCheckbox_Jungle"
 			"labelText"		"#TF_SteamWorkshop_Tag_Jungle"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
-			"xpos"			"85"
+			"xpos"			"75"
 			"ypos"			"205"
 			"zpos"			"1"
 			"wide"			"75"
@@ -821,7 +822,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"MapsCheckBox_CTF"
 			"labelText"		"#TF_SteamWorkshop_Tag_CTF"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"0"
 			"ypos"			"25"
@@ -841,7 +842,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"MapsCheckBox_CP"
 			"labelText"		"#TF_SteamWorkshop_Tag_CP"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"0"
 			"ypos"			"45"
@@ -861,7 +862,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"MapsCheckBox_Escort"
 			"labelText"		"#TF_SteamWorkshop_Tag_Escort"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"0"
 			"ypos"			"65"
@@ -881,7 +882,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"MapsCheckBox_EscortRace"
 			"labelText"		"#TF_SteamWorkshop_Tag_EscortRace"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"0"
 			"ypos"			"85"
@@ -901,7 +902,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"MapsCheckBox_RobotDestruction"
 			"labelText"		"#TF_SteamWorkshop_Tag_RobotDestruction"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"0"
 			"ypos"			"105"
@@ -921,7 +922,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"MapsCheckBox_Koth"
 			"labelText"		"#TF_SteamWorkshop_Tag_Koth"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"0"
 			"ypos"			"125"
@@ -941,7 +942,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"MapsCheckBox_AttackDefense"
 			"labelText"		"#TF_SteamWorkshop_Tag_AttackDefense"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"0"
 			"ypos"			"145"
@@ -961,7 +962,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"MapsCheckBox_SD"
 			"labelText"		"#TF_SteamWorkshop_Tag_SD"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"0"
 			"ypos"			"165"
@@ -981,7 +982,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"MapsCheckBox_MVM"
 			"labelText"		"#TF_SteamWorkshop_Tag_MVM"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"0"
 			"ypos"			"185"
@@ -1001,7 +1002,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"MapsCheckBox_Arena"
 			"labelText"		"#TF_SteamWorkshop_Tag_Arena"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"85"
 			"ypos"			"25"
@@ -1021,7 +1022,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"MapsCheckBox_Powerup"
 			"labelText"		"#TF_SteamWorkshop_Tag_Powerup"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"85"
 			"ypos"			"45"
@@ -1041,7 +1042,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"MapsCheckBox_Medieval"
 			"labelText"		"#TF_SteamWorkshop_Tag_Medieval"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"85"
 			"ypos"			"65"
@@ -1061,7 +1062,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"MapsCheckBox_PassTime"
 			"labelText"		"#TF_SteamWorkshop_Tag_PassTime"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"85"
 			"ypos"			"85"
@@ -1081,7 +1082,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"MapsCheckBox_Specialty"
 			"labelText"		"#TF_SteamWorkshop_Tag_Specialty"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"85"
 			"ypos"			"105"
@@ -1101,7 +1102,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"MapsCheckBox_Halloween"
 			"labelText"		"#TF_SteamWorkshop_Tag_Halloween"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"85"
 			"ypos"			"125"
@@ -1121,7 +1122,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"MapsCheckbox_Smissmas"
 			"labelText"		"#TF_SteamWorkshop_Tag_Smissmas"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"85"
 			"ypos"			"145"
@@ -1141,7 +1142,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"MapsCheckbox_Night"
 			"labelText"		"#TF_SteamWorkshop_Tag_Night"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"85"
 			"ypos"			"165"
@@ -1161,7 +1162,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"MapsCheckbox_Jungle"
 			"labelText"		"#TF_SteamWorkshop_Tag_Jungle"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"ItemFontAttribLarge"
 			"textAlignment"	"west"
 			"xpos"			"85"
 			"ypos"			"185"
@@ -1207,7 +1208,7 @@
 		"fieldName"			"ButtonPublish"
 		"xpos"				"120"
 		"ypos"				"365"
-		"wide"				"150"
+		"wide"				"100"
 		"tall"				"25"
 		"autoResize"		"0"
 		"pinCorner"			"0"
diff --git a/resource/ui/replaybrowser/basepage.res b/resource/ui/replaybrowser/basepage.res
index 4f7b93d..070278e 100644
--- a/resource/ui/replaybrowser/basepage.res
+++ b/resource/ui/replaybrowser/basepage.res
@@ -2,58 +2,58 @@
 {
 	"BasePage"
 	{
-		"ControlName"		"Frame"
-		"fieldName"			"BasePage"
-		"xpos"				"0"
-		"ypos"				"40"
-		"wide"				"f0"
-		"tall"				"480"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"0"
-		"enabled"			"1"
-		"tabPosition"		"0"
+		"ControlName"			"Frame"
+		"fieldName"				"BasePage"
+		"xpos"					"0"
+		"ypos"					"40"
+		"wide"					"f0"
+		"tall"					"480"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"0"
+		"enabled"				"1"
+		"tabPosition"			"0"
 		"settitlebarvisible"	"0"
 		"PaintBackgroundType"	"0"
 		"bgcolor_override"		"DarkGrey"
 	}
-
+	
 	"SearchTextEntry"
 	{
-		"ControlName"		"TextEntry"
-		"fieldName"			"SearchTextEntry"
-		"maxchars"			"255"
-		"textHidden"		"0"
-		"textAlignment"		"west"
-		"unicode"			"1"
-		"wrap"				"0"
-		"xpos"				"c+80"
-		"ypos"				"5"
-		"tall"				"15"
-		"wide"				"160"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"fgcolor_override"	"White"
-		"bgcolor_override"	"DarkerGrey"
-		"Font"				"Cerbetica14"
+		"ControlName"			"TextEntry"
+		"fieldName"				"SearchTextEntry"
+		"maxchars"				"255"
+		"textHidden"			"0"
+		"textAlignment"			"west"
+		"unicode"				"1"
+		"wrap"					"0"
+		"xpos"					"c+80"
+		"ypos"					"5"
+		"tall"					"15"
+		"wide"					"160"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"fgcolor_override"		"White"
+		"bgcolor_override"		"DarkerGrey"
+		"Font"					"Cerbetica14"
 	}
-
+	
 	"ReplayList"
 	{
-		"ControlName"		"PanelListPanel"
-		"fieldName"			"ReplayList"
-		"xpos"				"c-300"
-		"ypos"				"20"
-		"wide"				"605"
-		"tall"				"350"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"paintbackground"	"1"
-		"bgcolor_override"	"Transparent"
-		"autohide_scrollbar" "1"
+		"ControlName"			"PanelListPanel"
+		"fieldName"				"ReplayList"
+		"xpos"					"c-300"
+		"ypos"					"20"
+		"wide"					"605"
+		"tall"					"350"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"paintbackground"		"1"
+		"bgcolor_override"		"Transparent"
+		"autohide_scrollbar"	"1"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/replaybrowser/mainpanel.res b/resource/ui/replaybrowser/mainpanel.res
index e1ddd86..e17c00c 100644
--- a/resource/ui/replaybrowser/mainpanel.res
+++ b/resource/ui/replaybrowser/mainpanel.res
@@ -100,8 +100,8 @@
 		"tall"			"2"
 		"visible"		"1"
 		"enabled"		"1"
+		"bgcolor_override"	"ColorCyan"
 		"PaintBackgroundType"	"2"
-		"bgcolor_override"		"ColorCyan"
 	}
 
 	"Sheet"
diff --git a/resource/ui/statsummary.res b/resource/ui/statsummary.res
index c90c589..a747bd8 100644
--- a/resource/ui/statsummary.res
+++ b/resource/ui/statsummary.res
@@ -70,7 +70,7 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"LoadingLabel"
 		"font"			"HudFontBiggerBold"
-		"labelText"		"Loading..."
+		"labelText"		"#LoadingMap"
 		"textAlignment"	"west"
 		"xpos"			"5"
 		"ypos"			"414"
diff --git a/resource/ui/statsummary_embedded.res b/resource/ui/statsummary_embedded.res
index 351b6c7..a6a5f12 100644
--- a/resource/ui/statsummary_embedded.res
+++ b/resource/ui/statsummary_embedded.res
@@ -196,14 +196,14 @@
 			"ControlName"	"EditablePanel"
 			"fieldName"		"AveragesBG"
 			"xpos"			"c-295"
-			"ypos"			"165"
+			"ypos"			"180"
 			"wide"			"600"
-			"tall"			"300"
+			"tall"			"280"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"bgcolor_override"	"TransparentBlack"
+			"bgcolor_override"	"DarkerGrey"
 			"PaintBackgroundType"	"2"
 		}
 		"AveragesLabel"
@@ -243,8 +243,8 @@
 		{
 			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG1B"
-			"xpos"			"c+30"
-			"ypos"			"230"
+			"xpos"			"5"
+			"ypos"			"0"
 			"zpos"			"2"
 			"wide"			"70"
 			"tall"			"16"
@@ -255,6 +255,10 @@
 			"tabPosition"	"0"
 			"fillcolor"		"0 0 0 80"
 			"PaintBackgroundType"	"0"
+
+			"pin_to_sibling"		"ClassBarBG1A"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPRIGHT"
 		}
 		"ClassBar1A"
 		{
@@ -263,7 +267,7 @@
 			"xpos"			"c-282"
 			"ypos"			"232"
 			"zpos"			"3"
-			"wide"			"151"
+			"wide"			"150"
 			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -280,7 +284,7 @@
 			"xpos"			"c-127"
 			"ypos"			"232"
 			"zpos"			"3"
-			"wide"			"151"
+			"wide"			"150"
 			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -298,10 +302,10 @@
 			"labelText"		"%classbarlabel1A%"
 			"textAlignment"	"west"
 			"xpos"			"c-282"
-			"ypos"			"228"
+			"ypos"			"232"
 			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
+			"wide"			"150"
+			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -315,10 +319,10 @@
 			"labelText"		"%classbarlabel1B%"
 			"textAlignment"	"west"
 			"xpos"			"c-127"
-			"ypos"			"228"
+			"ypos"			"232"
 			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
+			"wide"			"150"
+			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -330,16 +334,20 @@
 			"fieldName"		"ClassLabel1"
 			"font"			"Cerbetica12"
 			"labelText"		"%class1%"
-			"textAlignment"	"west"
-			"xpos"			"c+34"
-			"ypos"			"228"
+			"textAlignment"	"center"
+			"xpos"			"0"
+			"ypos"			"0"
 			"zpos"			"5"
-			"wide"			"300"
-			"tall"			"20"
+			"wide"			"70"
+			"tall"			"16"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
+
+			"pin_to_sibling"		"ClassBarBG1B"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPLEFT"
 		}
 		"ClassBarBG2A"
 		{
@@ -362,8 +370,8 @@
 		{
 			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG2B"
-			"xpos"			"c+30"
-			"ypos"			"248"
+			"xpos"			"5"
+			"ypos"			"0"
 			"zpos"			"2"
 			"wide"			"70"
 			"tall"			"16"
@@ -374,6 +382,10 @@
 			"tabPosition"	"0"
 			"fillcolor"		"0 0 0 80"
 			"PaintBackgroundType"	"0"
+
+			"pin_to_sibling"		"ClassBarBG2A"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPRIGHT"
 		}
 		"ClassBar2A"
 		{
@@ -382,7 +394,7 @@
 			"xpos"			"c-282"
 			"ypos"			"250"
 			"zpos"			"3"
-			"wide"			"151"
+			"wide"			"150"
 			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -399,7 +411,7 @@
 			"xpos"			"c-127"
 			"ypos"			"250"
 			"zpos"			"3"
-			"wide"			"151"
+			"wide"			"150"
 			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -417,10 +429,10 @@
 			"labelText"		"%classbarlabel2A%"
 			"textAlignment"	"west"
 			"xpos"			"c-282"
-			"ypos"			"246"
+			"ypos"			"250"
 			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
+			"wide"			"150"
+			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -434,10 +446,10 @@
 			"labelText"		"%classbarlabel2B%"
 			"textAlignment"	"west"
 			"xpos"			"c-127"
-			"ypos"			"246"
+			"ypos"			"250"
 			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
+			"wide"			"150"
+			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -449,16 +461,20 @@
 			"fieldName"		"ClassLabel2"
 			"font"			"Cerbetica12"
 			"labelText"		"%class2%"
-			"textAlignment"	"west"
-			"xpos"			"c+34"
-			"ypos"			"246"
+			"textAlignment"	"center"
+			"xpos"			"0"
+			"ypos"			"0"
 			"zpos"			"5"
-			"wide"			"300"
-			"tall"			"20"
+			"wide"			"70"
+			"tall"			"16"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
+
+			"pin_to_sibling"		"ClassBarBG2B"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPLEFT"
 		}
 		"ClassBarBG3A"
 		{
@@ -481,8 +497,8 @@
 		{
 			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG3B"
-			"xpos"			"c+30"
-			"ypos"			"266"
+			"xpos"			"5"
+			"ypos"			"0"
 			"zpos"			"2"
 			"wide"			"70"
 			"tall"			"16"
@@ -493,6 +509,10 @@
 			"tabPosition"	"0"
 			"fillcolor"		"0 0 0 80"
 			"PaintBackgroundType"	"0"
+
+			"pin_to_sibling"		"ClassBarBG3A"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPRIGHT"
 		}
 		"ClassBar3A"
 		{
@@ -501,7 +521,7 @@
 			"xpos"			"c-282"
 			"ypos"			"268"
 			"zpos"			"3"
-			"wide"			"151"
+			"wide"			"150"
 			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -518,7 +538,7 @@
 			"xpos"			"c-127"
 			"ypos"			"268"
 			"zpos"			"3"
-			"wide"			"151"
+			"wide"			"150"
 			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -536,10 +556,10 @@
 			"labelText"		"%classbarlabel3A%"
 			"textAlignment"	"west"
 			"xpos"			"c-282"
-			"ypos"			"264"
+			"ypos"			"268"
 			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
+			"wide"			"150"
+			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -553,10 +573,10 @@
 			"labelText"		"%classbarlabel3B%"
 			"textAlignment"	"west"
 			"xpos"			"c-127"
-			"ypos"			"264"
+			"ypos"			"268"
 			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
+			"wide"			"150"
+			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -568,16 +588,20 @@
 			"fieldName"		"ClassLabel3"
 			"font"			"Cerbetica12"
 			"labelText"		"%class3%"
-			"textAlignment"	"west"
-			"xpos"			"c+34"
-			"ypos"			"264"
+			"textAlignment"	"center"
+			"xpos"			"0"
+			"ypos"			"0"
 			"zpos"			"5"
-			"wide"			"300"
-			"tall"			"20"
+			"wide"			"70"
+			"tall"			"16"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
+
+			"pin_to_sibling"		"ClassBarBG3B"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPLEFT"
 		}
 		"ClassBarBG4A"
 		{
@@ -600,8 +624,8 @@
 		{
 			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG4B"
-			"xpos"			"c+30"
-			"ypos"			"284"
+			"xpos"			"5"
+			"ypos"			"0"
 			"zpos"			"2"
 			"wide"			"70"
 			"tall"			"16"
@@ -612,6 +636,10 @@
 			"tabPosition"	"0"
 			"fillcolor"		"0 0 0 80"
 			"PaintBackgroundType"	"0"
+
+			"pin_to_sibling"		"ClassBarBG4A"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPRIGHT"
 		}
 		"ClassBar4A"
 		{
@@ -620,7 +648,7 @@
 			"xpos"			"c-282"
 			"ypos"			"286"
 			"zpos"			"3"
-			"wide"			"151"
+			"wide"			"150"
 			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -637,7 +665,7 @@
 			"xpos"			"c-127"
 			"ypos"			"286"
 			"zpos"			"3"
-			"wide"			"151"
+			"wide"			"150"
 			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -655,10 +683,10 @@
 			"labelText"		"%classbarlabel4A%"
 			"textAlignment"	"west"
 			"xpos"			"c-282"
-			"ypos"			"282"
+			"ypos"			"286"
 			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
+			"wide"			"150"
+			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -672,10 +700,10 @@
 			"labelText"		"%classbarlabel4B%"
 			"textAlignment"	"west"
 			"xpos"			"c-127"
-			"ypos"			"282"
+			"ypos"			"286"
 			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
+			"wide"			"150"
+			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -687,16 +715,20 @@
 			"fieldName"		"ClassLabel4"
 			"font"			"Cerbetica12"
 			"labelText"		"%class4%"
-			"textAlignment"	"west"
-			"xpos"			"c+34"
-			"ypos"			"282"
+			"textAlignment"	"center"
+			"xpos"			"0"
+			"ypos"			"0"
 			"zpos"			"5"
-			"wide"			"300"
-			"tall"			"20"
+			"wide"			"70"
+			"tall"			"16"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
+
+			"pin_to_sibling"		"ClassBarBG4B"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPLEFT"
 		}
 		"ClassBarBG5A"
 		{
@@ -719,8 +751,8 @@
 		{
 			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG5B"
-			"xpos"			"c+30"
-			"ypos"			"302"
+			"xpos"			"5"
+			"ypos"			"0"
 			"zpos"			"2"
 			"wide"			"70"
 			"tall"			"16"
@@ -731,6 +763,10 @@
 			"tabPosition"	"0"
 			"fillcolor"		"0 0 0 80"
 			"PaintBackgroundType"	"0"
+
+			"pin_to_sibling"		"ClassBarBG5A"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPRIGHT"
 		}
 		"ClassBar5A"
 		{
@@ -739,7 +775,7 @@
 			"xpos"			"c-282"
 			"ypos"			"304"
 			"zpos"			"3"
-			"wide"			"151"
+			"wide"			"150"
 			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -756,7 +792,7 @@
 			"xpos"			"c-127"
 			"ypos"			"304"
 			"zpos"			"3"
-			"wide"			"151"
+			"wide"			"150"
 			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -774,10 +810,10 @@
 			"labelText"		"%classbarlabel5A%"
 			"textAlignment"	"west"
 			"xpos"			"c-282"
-			"ypos"			"300"
+			"ypos"			"304"
 			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
+			"wide"			"150"
+			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -791,10 +827,10 @@
 			"labelText"		"%classbarlabel5B%"
 			"textAlignment"	"west"
 			"xpos"			"c-127"
-			"ypos"			"300"
+			"ypos"			"304"
 			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
+			"wide"			"150"
+			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -806,16 +842,20 @@
 			"fieldName"		"ClassLabel5"
 			"font"			"Cerbetica12"
 			"labelText"		"%class5%"
-			"textAlignment"	"west"
-			"xpos"			"c+34"
-			"ypos"			"300"
+			"textAlignment"	"center"
+			"xpos"			"0"
+			"ypos"			"0"
 			"zpos"			"5"
-			"wide"			"282"
-			"tall"			"20"
+			"wide"			"70"
+			"tall"			"16"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
+
+			"pin_to_sibling"		"ClassBarBG5B"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPLEFT"
 		}
 		"ClassBarBG6A"
 		{
@@ -838,8 +878,8 @@
 		{
 			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG6B"
-			"xpos"			"c+30"
-			"ypos"			"320"
+			"xpos"			"5"
+			"ypos"			"0"
 			"zpos"			"2"
 			"wide"			"70"
 			"tall"			"16"
@@ -850,6 +890,10 @@
 			"tabPosition"	"0"
 			"fillcolor"		"0 0 0 80"
 			"PaintBackgroundType"	"0"
+
+			"pin_to_sibling"		"ClassBarBG6A"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPRIGHT"
 		}
 		"ClassBar6A"
 		{
@@ -858,7 +902,7 @@
 			"xpos"			"c-282"
 			"ypos"			"322"
 			"zpos"			"3"
-			"wide"			"151"
+			"wide"			"150"
 			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -875,7 +919,7 @@
 			"xpos"			"c-127"
 			"ypos"			"322"
 			"zpos"			"3"
-			"wide"			"151"
+			"wide"			"150"
 			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -893,10 +937,10 @@
 			"labelText"		"%classbarlabel6A%"
 			"textAlignment"	"west"
 			"xpos"			"c-282"
-			"ypos"			"318"
+			"ypos"			"322"
 			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
+			"wide"			"150"
+			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -910,10 +954,10 @@
 			"labelText"		"%classbarlabel6B%"
 			"textAlignment"	"west"
 			"xpos"			"c-127"
-			"ypos"			"318"
+			"ypos"			"322"
 			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
+			"wide"			"150"
+			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -925,16 +969,20 @@
 			"fieldName"		"ClassLabel6"
 			"font"			"Cerbetica12"
 			"labelText"		"%class6%"
-			"textAlignment"	"west"
-			"xpos"			"c+34"
-			"ypos"			"318"
+			"textAlignment"	"center"
+			"xpos"			"0"
+			"ypos"			"0"
 			"zpos"			"5"
-			"wide"			"300"
-			"tall"			"20"
+			"wide"			"70"
+			"tall"			"16"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
+
+			"pin_to_sibling"		"ClassBarBG6B"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPLEFT"
 		}
 		"ClassBarBG7A"
 		{
@@ -957,8 +1005,8 @@
 		{
 			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG7B"
-			"xpos"			"c+30"
-			"ypos"			"338"
+			"xpos"			"5"
+			"ypos"			"0"
 			"zpos"			"2"
 			"wide"			"70"
 			"tall"			"16"
@@ -969,6 +1017,10 @@
 			"tabPosition"	"0"
 			"fillcolor"		"0 0 0 80"
 			"PaintBackgroundType"	"0"
+
+			"pin_to_sibling"		"ClassBarBG7A"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPRIGHT"
 		}
 		"ClassBar7A"
 		{
@@ -977,7 +1029,7 @@
 			"xpos"			"c-282"
 			"ypos"			"340"
 			"zpos"			"3"
-			"wide"			"151"
+			"wide"			"150"
 			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -994,7 +1046,7 @@
 			"xpos"			"c-127"
 			"ypos"			"340"
 			"zpos"			"3"
-			"wide"			"151"
+			"wide"			"150"
 			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -1012,10 +1064,10 @@
 			"labelText"		"%classbarlabel7A%"
 			"textAlignment"	"west"
 			"xpos"			"c-282"
-			"ypos"			"336"
+			"ypos"			"340"
 			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
+			"wide"			"150"
+			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -1029,10 +1081,10 @@
 			"labelText"		"%classbarlabel7B%"
 			"textAlignment"	"west"
 			"xpos"			"c-127"
-			"ypos"			"336"
+			"ypos"			"340"
 			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
+			"wide"			"150"
+			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -1044,16 +1096,20 @@
 			"fieldName"		"ClassLabel7"
 			"font"			"Cerbetica12"
 			"labelText"		"%class7%"
-			"textAlignment"	"west"
-			"xpos"			"c+34"
-			"ypos"			"336"
+			"textAlignment"	"center"
+			"xpos"			"0"
+			"ypos"			"0"
 			"zpos"			"5"
-			"wide"			"300"
-			"tall"			"20"
+			"wide"			"70"
+			"tall"			"16"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
+
+			"pin_to_sibling"		"ClassBarBG7B"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPLEFT"
 		}
 		"ClassBarBG8A"
 		{
@@ -1076,8 +1132,8 @@
 		{
 			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG8B"
-			"xpos"			"c+30"
-			"ypos"			"356"
+			"xpos"			"5"
+			"ypos"			"0"
 			"zpos"			"2"
 			"wide"			"70"
 			"tall"			"16"
@@ -1088,6 +1144,10 @@
 			"tabPosition"	"0"
 			"fillcolor"		"0 0 0 80"
 			"PaintBackgroundType"	"0"
+
+			"pin_to_sibling"		"ClassBarBG8A"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPRIGHT"
 		}
 		"ClassBar8A"
 		{
@@ -1096,7 +1156,7 @@
 			"xpos"			"c-282"
 			"ypos"			"358"
 			"zpos"			"3"
-			"wide"			"151"
+			"wide"			"150"
 			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -1113,7 +1173,7 @@
 			"xpos"			"c-127"
 			"ypos"			"358"
 			"zpos"			"3"
-			"wide"			"151"
+			"wide"			"150"
 			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -1131,10 +1191,10 @@
 			"labelText"		"%classbarlabel8A%"
 			"textAlignment"	"west"
 			"xpos"			"c-282"
-			"ypos"			"354"
+			"ypos"			"358"
 			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
+			"wide"			"150"
+			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -1148,10 +1208,10 @@
 			"labelText"		"%classbarlabel8B%"
 			"textAlignment"	"west"
 			"xpos"			"c-127"
-			"ypos"			"354"
+			"ypos"			"358"
 			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
+			"wide"			"150"
+			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -1163,16 +1223,20 @@
 			"fieldName"		"ClassLabel8"
 			"font"			"Cerbetica12"
 			"labelText"		"%class8%"
-			"textAlignment"	"west"
-			"xpos"			"c+34"
-			"ypos"			"354"
+			"textAlignment"	"center"
+			"xpos"			"0"
+			"ypos"			"0"
 			"zpos"			"5"
-			"wide"			"300"
-			"tall"			"20"
+			"wide"			"70"
+			"tall"			"16"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
+
+			"pin_to_sibling"		"ClassBarBG8B"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPLEFT"
 		}
 		"ClassBarBG9A"
 		{
@@ -1195,8 +1259,8 @@
 		{
 			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG9B"
-			"xpos"			"c+30"
-			"ypos"			"374"
+			"xpos"			"5"
+			"ypos"			"0"
 			"zpos"			"2"
 			"wide"			"70"
 			"tall"			"16"
@@ -1207,6 +1271,10 @@
 			"tabPosition"	"0"
 			"fillcolor"		"0 0 0 80"
 			"PaintBackgroundType"	"0"
+
+			"pin_to_sibling"		"ClassBarBG9A"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPRIGHT"
 		}
 		"ClassBar9A"
 		{
@@ -1215,7 +1283,7 @@
 			"xpos"			"c-282"
 			"ypos"			"376"
 			"zpos"			"3"
-			"wide"			"151"
+			"wide"			"150"
 			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -1232,7 +1300,7 @@
 			"xpos"			"c-127"
 			"ypos"			"376"
 			"zpos"			"3"
-			"wide"			"151"
+			"wide"			"150"
 			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -1250,10 +1318,10 @@
 			"labelText"		"%classbarlabel9A%"
 			"textAlignment"	"west"
 			"xpos"			"c-282"
-			"ypos"			"372"
+			"ypos"			"376"
 			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
+			"wide"			"150"
+			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -1267,10 +1335,10 @@
 			"labelText"		"%classbarlabel9B%"
 			"textAlignment"	"west"
 			"xpos"			"c-127"
-			"ypos"			"372"
+			"ypos"			"376"
 			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
+			"wide"			"150"
+			"tall"			"12"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -1282,30 +1350,34 @@
 			"fieldName"		"ClassLabel9"
 			"font"			"Cerbetica12"
 			"labelText"		"%class9%"
-			"textAlignment"	"west"
-			"xpos"			"c+34"
-			"ypos"			"372"
+			"textAlignment"	"center"
+			"xpos"			"0"
+			"ypos"			"0"
 			"zpos"			"5"
-			"wide"			"300"
-			"tall"			"20"
+			"wide"			"70"
+			"tall"			"16"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
+
+			"pin_to_sibling"		"ClassBarBG9B"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPLEFT"
 		}
 		"RecordsBG"
 		{
 			"ControlName"	"EditablePanel"
 			"fieldName"		"RecordsBG"
 			"xpos"			"9999"
-			"ypos"			"9999"
+			"ypos"			"0"
 			"wide"			"200"
 			"tall"			"260"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"bgcolor_override"	"15 15 15 255"
+			"bgcolor_override"	"DarkerGrey"
 		}
 		"RecordsLabel1"
 		{
@@ -1331,13 +1403,13 @@
 			"ypos"			"230"
 			"zpos"			"2"
 			"wide"			"167"
-			"tall"			"160"
+			"tall"			"0"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"fillcolor"		"0 0 0 80"
+			"fillcolor"		"DarkerGrey"
 			"PaintBackgroundType"	"0"
 		}
 		"RecordsLabel"
@@ -1873,7 +1945,7 @@
 	{
 		"ControlName"	"CTFImagePanel"
 		"fieldName"		"TipImage"
-		"xpos"			"c-285"
+		"xpos"			"c-283"
 		"ypos"			"270"
 		"zpos"			"12"
 		"wide"			"35"
diff --git a/resource/ui/steamworkshopdialog.res b/resource/ui/steamworkshopdialog.res
index bc6ff93..c5d97af 100644
--- a/resource/ui/steamworkshopdialog.res
+++ b/resource/ui/steamworkshopdialog.res
@@ -275,7 +275,7 @@
 			{
 				"ControlName"	"CExLabel"
 				"fieldName"		"CurPageLabel"
-				"font"			"HudFontSmall"
+				"font"			"HudFontMediumSmall"
 				"labelText"		"%page%"
 				"textAlignment"	"center"
 				"xpos"			"441"
@@ -608,7 +608,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labelText"		"#TF_Close"
+			"labelText"		"#Cancel"
 			"font"			"HudFontSmall"
 			"textAlignment"	"center"
 			"textinsetx"	"50"
diff --git a/resource/ui/tfadvancedoptionsdialog.res b/resource/ui/tfadvancedoptionsdialog.res
index def1f7c..4abe61e 100644
--- a/resource/ui/tfadvancedoptionsdialog.res
+++ b/resource/ui/tfadvancedoptionsdialog.res
@@ -43,6 +43,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"fgcolor_override"	"TanLight"
+		"allcaps"			"1"
 	}
 
 	"CancelButton"
@@ -65,6 +66,7 @@
 		"dulltext"			"0"
 		"brighttext"		"0"
 		"default"			"1"
+		"allcaps"			"1"
 		"Command"			"Close"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
@@ -90,6 +92,7 @@
 		"dulltext"			"0"
 		"brighttext"		"0"
 		"default"			"1"
+		"allcaps"			"1"
 		"Command"			"Ok"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"