oops i broke scoreboards

3 files changed, 172 insertions, 172 deletions

diff --git a/resource/ui/MvMScoreboard.res b/resource/ui/MvMScoreboard.res
index d4a6505..b6980c1 100644
--- a/resource/ui/MvMScoreboard.res
+++ b/resource/ui/MvMScoreboard.res
@@ -4,24 +4,25 @@
 	{
 		"ControlName"		"CWaveStatusPanel"
 		"fieldName"			"WaveStatusPanel"
-		"xpos"				"c-130"
+		"xpos"				"100"
 		"ypos"				"8"
 		"zpos"				"0"
-		"wide"				"400"
+		"wide"				"600"
 		"tall"				"67"
 		"visible"			"1"
 		"enabled"			"1"
 		
 		"verbose"			"1"
 	}
-		"ScoreboardBackground"
+	
+	"ScoreboardBackground"
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"		"ScoreboardBackground"
-		"xpos"			"c-102"
-		"ypos"			"78"
+		"xpos"			"98"
+		"ypos"			"71"
 		"zpos"			"-1"
-		"wide"			"445"
+		"wide"			"455"
 		"tall"			"288"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -35,7 +36,7 @@
 		"font"			"Cerbetica24"
 		"labelText"		"%popfile%"
 		"textAlignment"	"center"
-		"xpos"			"188"
+		"xpos"			"78"
 		"ypos"			"c150"
 		"wide"			"290"
 		"tall"			"20"
@@ -46,7 +47,7 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"DifficultyContainer"
-		"xpos"			"450"
+		"xpos"			"355"
 		"ypos"			"c150"
 		"wide"			"150"
 		"tall"			"50"
@@ -107,7 +108,7 @@
 	{
 		"ControlName"	"SectionedListPanel"
 		"fieldName"		"MvMPlayerList"
-		"xpos"			"c-100"
+		"xpos"			"110"
 		"ypos"			"79"
 		"wide"			"420"
 		"tall"			"150"
@@ -125,8 +126,8 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"CreditStatsContainer"
-		"xpos"			"c-90"
-		"ypos"			"230"
+		"xpos"			"118"
+		"ypos"			"220"
 		"wide"			"400"
 		"tall"			"205"
 		"visible"		"1"
@@ -214,7 +215,7 @@
 			"visible"		"1"
 		}
 		
-		"RespecStatusLabel"
+				"RespecStatusLabel"
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"RespecStatusLabel"
@@ -228,4 +229,4 @@
 			"fgcolor"		"tanlight"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/resource/ui/ScoreBoard-9s.res b/resource/ui/ScoreBoard-9s.res
index 470fffd..f2ab6f9 100644
--- a/resource/ui/ScoreBoard-9s.res
+++ b/resource/ui/ScoreBoard-9s.res
@@ -4,9 +4,9 @@
 	{
 		"ControlName"		"CTFClientScoreBoardDialog"
 		"fieldName"			"scoreinfo"
-		"xpos"				"c-300"
+		"xpos"				"c-200"
 		"ypos"				"0"
-		"wide"				"f0"
+		"wide"				"740"
 		"tall"				"480"
 		"autoResize"		"0"
 		"pinCorner"			"0"
@@ -20,18 +20,18 @@
 		"nemesis_width"		"15"	
 		"class_width"		"15"	
 		"score_width"		"24"
-		"ping_width"		"24"	
+		"ping_width"		"24"
 	}
 	"BlueScoreBG"
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"		"BlueScoreBG"
-		"xpos"			"c-230"
-		"xpos_minmode"  "c65"
+		"xpos"			"c-100"
+		"xpos_minmode"  "c135"
 		"ypos"			"96"
-		"ypos_minmode"  "54"
-		"wide"			"270"
-		"wide_minmode"	"240"
+		"ypos_minmode"  "96"
+		"wide"			"230"
+		"wide_minmode"	"230"
 		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -49,12 +49,12 @@
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"		"RedScoreBG"
-		"xpos"			"c40"
-		"xpos_minmode" 	"c65"
+		"xpos"			"c130"
+		"xpos_minmode" 	"c135"
 		"ypos"			"96"
 		"ypos_minmode"  "240"
-		"wide"			"270"
-		"wide_minmode"  "240"
+		"wide"			"230"
+		"wide_minmode"  "230"
 		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -90,12 +90,12 @@
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"		"ScoreboardBackground"
-		"xpos"			"c-230"
+		"xpos"			"c-100"
 		"xpos_minmode"  "9999"
-		"ypos"			"121"
+		"ypos"			"120"
 		"ypos_minmode"  "9999"
 		"zpos"			"-1"
-		"wide"			"540"
+		"wide"			"460"
 		"tall"			"244"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -104,7 +104,9 @@
 		
 		if_mvm
 		{
-			"visible"	"0"
+		
+			"visible"		"0"
+		
 		}
 	}
 	"Red6sBackground"
@@ -112,12 +114,12 @@
 		"ControlName"		"ImagePanel"
 		"fieldName"		"ScoreboardBackground"
 		"xpos"			"9999"
-		"xpos_minmode"	"c65"
+		"xpos_minmode"	"c135"
 		"ypos"			"9999"
 		"ypos_minmode"	"265"
 		"zpos"			"-1"
-		"wide_minmode"	"240"
-		"tall"			"142"
+		"wide_minmode"	"230"
+		"tall"			"102"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -125,8 +127,9 @@
 		
 		if_mvm
 		{
+		
 			"visible"		"0"
-
+		
 		}
 	}
 	"Blue6sBackground"
@@ -134,12 +137,12 @@
 		"ControlName"		"ImagePanel"
 		"fieldName"		"ScoreboardBackground"
 		"xpos"			"9999"
-		"xpos_minmode"	"c65"
+		"xpos_minmode"	"c135"
 		"ypos"			"9999"
-		"ypos_minmode"	"79"
+		"ypos_minmode"	"120"
 		"zpos"			"-1"
-		"wide"			"240"
-		"tall"			"142"
+		"wide"			"230"
+		"tall"			"102"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -147,24 +150,25 @@
 		
 		if_mvm
 		{
+		
 			"visible"		"0"
-
+		
 		}
 	}			
 	"BlueTeamLabel"
 	{
-		"ControlName"		"CExLabel"
+		"ControlName"	"CExLabel"
 		"fieldName"		"BlueTeamLabel"
 		"font"			"Cerbetica32"
 		"labelText"		"%blueteamname%"
-		"textAlignment"		"west"
-		"xpos"			"c-228"
-		"xpos_minmode"	"c67"
+		"textAlignment"	"west"
+		"xpos"			"c-98"
+		"xpos_minmode"	"c138"
 		"ypos"			"92"
-		"ypos_minmode"	"50"
+		"ypos_minmode"	"92"
 		"wide"			"140"
 		"tall"			"34"
-		"autoResize"		"0"
+		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -181,10 +185,10 @@
 		"font"			"Cerbetica56"
 		"labelText"		"%blueteamscore%"
 		"textAlignment"		"east"
-		"xpos"			"c-71"
-		"xpos_minmode"	"c197"
-		"ypos"			"68"
-		"ypos_minmode"	"26"
+		"xpos"			"c22"
+		"xpos_minmode"	"c258"
+		"ypos"			"c-172"
+		"ypos_minmode"	"68"
 		"zpos"			"4"
 		"wide"			"100"
 		"tall"			"55"
@@ -206,10 +210,10 @@
 		"fgcolor"		"Black"
 		"labelText"		"%blueteamscore%"
 		"textAlignment"		"east"
-		"xpos"			"c-69"
-		"xpos_minmode"	"c199"
-		"ypos"			"70" 
-		"ypos_minmode"	"28"
+		"xpos"			"c24"
+		"xpos_minmode"	"c260"
+		"ypos"			"c-170" 
+		"ypos_minmode"	"70"
 		"zpos"			"4"
 		"wide"			"100"
 		"tall"			"55"
@@ -230,10 +234,10 @@
 		"font"			"Cerbetica14"
 		"labelText"		"%blueteamplayercount%"
 		"textAlignment"		"west"
-		"xpos"			"c-65"
-		"xpos_minmode"	"c212"
+		"xpos"			"c35"
+		"xpos_minmode"	"c280"
 		"ypos"			"99"
-		"ypos_minmode"	"57"
+		"ypos_minmode"	"99"
 		"wide"			"100"
 		"tall"			"29"
 		"autoResize"		"0"
@@ -254,8 +258,8 @@
 		"labelText"		"%redteamname%"
 		"textAlignment"		"east"
 		"textAlignment_minmode"	"west"
-		"xpos"			"c168"
-		"xpos_minmode"	"c67"
+		"xpos"			"c218"
+		"xpos_minmode"	"c138"
 		"ypos"			"92"
 		"ypos_minmode"	"236"
 		"wide"			"140"
@@ -278,9 +282,9 @@
 		"labelText"		"%redteamscore%"
 		"textAlignment"		"west"
 		"textAlignment_minmode"		"east"
-		"xpos"			"c51"
-		"xpos_minmode"	"c197"
-		"ypos"			"68"
+		"xpos"			"c138"
+		"xpos_minmode"	"c258"
+		"ypos"			"c-172"
 		"ypos_minmode"	"211"
 		"zpos"			"4"
 		"wide"			"100"
@@ -306,13 +310,15 @@
 		"labelText"		"%redteamscore%"
 		"textAlignment"		"west"
 		"textAlignment_minmode"	"east"
-		"xpos"			"c53"
-		"xpos_minmode"	"c199"
-		"ypos"			"70"
+		"xpos"			"c140"
+		"xpos_minmode"	"c260"
+		"ypos"			"c-170"
 		"ypos_minmode"	"213"
 		"zpos"			"4"
 		"wide"			"100"
 		"tall"			"55"
+		"tall_hidef"	"75"
+		"tall_lodef"	"75"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -331,8 +337,8 @@
 		"labelText"		"%redteamplayercount%"
 		"textAlignment"		"east"
 		"textAlignment_minmode" "west"
-		"xpos"			"c12"
-		"xpos_minmode"	"c212"
+		"xpos"			"c97"
+		"xpos_minmode"	"c280"
 		"ypos"			"99"
 		"ypos_minmode"	"243"
 		"wide"			"130"
@@ -354,7 +360,7 @@
 		"font"			"Cerbetica12"
 		"labelText"		"%server%"
 		"textAlignment"		"west"
-		"xpos"			"c-360"
+		"xpos"			"c-225"
 		"ypos"			"68"
 		"zpos"			"999"
 		"wide"			"600"
@@ -362,6 +368,7 @@
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"	[$WIN32]
+		"visible"		"0"	[$X360]
 		"enabled"		"1"
 		
 		if_mvm
@@ -376,7 +383,7 @@
 		"font"			"Cerbetica12"
 		"labelText"		"%servertimeleft%"
 		"textAlignment"		"west"
-		"xpos"			"c-360"
+		"xpos"			"c-225"
 		"ypos"			"80"
 		"zpos"			"999"
 		"wide"			"600"
@@ -396,15 +403,15 @@
 	{
 		"ControlName"	"SectionedListPanel"
 		"fieldName"		"BluePlayerList"
-		"xpos"			"c-225"
-		"xpos_minmode"	"c68"
+		"xpos"			"c-97"
+		"xpos_minmode"	"c138"
 		"ypos"			"125"
-		"ypos_minmode"	"80"
+		"ypos_minmode"	"122"
 		"zpos"			"20"
-		"wide"			"260"
-		"wide_minmode"	"235"
+		"wide"			"225"
+		"wide_minmode"	"225"
 		"tall"			"240"
-		"tall_minmode"	"141"
+		"tall_minmode"	"100"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -422,15 +429,15 @@
 	{
 		"ControlName"	"SectionedListPanel"
 		"fieldName"		"RedPlayerList"
-		"xpos"			"c45"
-		"xpos_minmode"  "c68"
+		"xpos"			"c132"
+		"xpos_minmode"  "c138"
 		"ypos"			"125"
-		"ypos_minmode"  "265"
+		"ypos_minmode"  "267"
 		"zpos"			"20"
-		"wide"			"260"
-		"wide_minmode"  "235"
+		"wide"			"225"
+		"wide_minmode"  "225"
 		"tall"			"240"
-		"tall_minmode"	"141"
+		"tall_minmode"	"100"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -477,10 +484,10 @@
 		"font"			"Cerbetica12"
 		"labelText"		"%spectators%"
 		"textAlignment"		"west"
-		"xpos"			"c-230"
-		"xpos_minmode"	"c65"
+		"xpos"			"c-100"
+		"xpos_minmode"	"c135"
 		"ypos"			"360"
-		"ypos_minmode"	"402"
+		"ypos_minmode"			"362"
 		"zpos"			"4"
 		"wide"			"540"
 		"wide_minmode"	"240"
@@ -492,7 +499,7 @@
 		
 		if_mvm
 		{
-			"ypos"		"444"
+			"ypos"		"c-100"
 		}
 	}	
 	"SpectatorsInQueue"
@@ -502,8 +509,8 @@
 		"font"			"Cerbetica12"
 		"labelText"		"%waitingtoplay%"
 		"textAlignment"		"west"
-		"xpos"			"c-230"
-		"xpos_minmode"	"c65"
+		"xpos"			"c-100"
+		"xpos_minmode"	"c145"
 		"ypos"			"372"	
 		"zpos"			"4"
 		"wide"			"424"
@@ -522,7 +529,7 @@
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"		"StatsBackground"
-		"xpos"			"c-360"
+		"xpos"			"c-225"
 		"ypos"			"96"	
 		"zpos"			"2"
 		"wide"			"116"
@@ -614,7 +621,7 @@
 		"font"			"Cerbetica20"
 		"labelText"		"%playerscore%"
 		"textAlignment"		"center"
-		"xpos"			"c-368"
+		"xpos"			"c-236"
 		"ypos"			"310"
 		"zpos"			"3"
 		"wide"			"140"
@@ -845,7 +852,7 @@
 	{
 		"ControlName"		"EditablePanel"
 		"fieldName"		"LocalPlayerStatsPanel"
-		"xpos"			"c-388"
+		"xpos"			"c-254"
 		"ypos"			"96"
 		"zpos"			"3"
 		"wide"			"166"
@@ -1374,7 +1381,6 @@
 		}
 	}
 
-
 	"ButtonLegendBG"		[$X360]
 	{
 		"ControlName"	"ImagePanel"
@@ -1539,8 +1545,8 @@
 	{
 		"ControlName"		"CTFHudMannVsMachineScoreboard"
 		"fieldName"			"MvMScoreboard"
-		"xpos"				"100"
-		"ypos"				"5"
+		"xpos"				"0"
+		"ypos"				"0"
 		"zpos"				"10"
 		"wide"				"f0"
 		"tall"				"480"
diff --git a/resource/ui/ScoreBoard.res b/resource/ui/ScoreBoard.res
index 8cbb14b..c20f6e1 100644
--- a/resource/ui/ScoreBoard.res
+++ b/resource/ui/ScoreBoard.res
@@ -4,9 +4,9 @@
 	{
 		"ControlName"		"CTFClientScoreBoardDialog"
 		"fieldName"			"scoreinfo"
-		"xpos"				"c-200"
+		"xpos"				"c-300"
 		"ypos"				"0"
-		"wide"				"740"
+		"wide"				"f0"
 		"tall"				"480"
 		"autoResize"		"0"
 		"pinCorner"			"0"
@@ -14,24 +14,24 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"avatar_width"		"54"	
-		"name_width"		"54"
-		"name_width_minmode""53"
+		"name_width"		"80"
+		"name_width_minmode""60"
 		"status_width"		"15"	
 		"nemesis_width"		"15"	
 		"class_width"		"15"	
 		"score_width"		"24"
-		"ping_width"		"24"
+		"ping_width"		"24"	
 	}
 	"BlueScoreBG"
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"		"BlueScoreBG"
-		"xpos"			"c-100"
-		"xpos_minmode"  "c135"
+		"xpos"			"c-230"
+		"xpos_minmode"  "c65"
 		"ypos"			"96"
 		"ypos_minmode"  "96"
-		"wide"			"230"
-		"wide_minmode"	"230"
+		"wide"			"270"
+		"wide_minmode"	"240"
 		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -49,12 +49,12 @@
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"		"RedScoreBG"
-		"xpos"			"c130"
-		"xpos_minmode" 	"c135"
+		"xpos"			"c40"
+		"xpos_minmode" 	"c65"
 		"ypos"			"96"
 		"ypos_minmode"  "240"
-		"wide"			"230"
-		"wide_minmode"  "230"
+		"wide"			"270"
+		"wide_minmode"  "240"
 		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -90,12 +90,12 @@
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"		"ScoreboardBackground"
-		"xpos"			"c-100"
+		"xpos"			"c-230"
 		"xpos_minmode"  "9999"
-		"ypos"			"120"
+		"ypos"			"121"
 		"ypos_minmode"  "9999"
 		"zpos"			"-1"
-		"wide"			"460"
+		"wide"			"540"
 		"tall"			"244"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -104,9 +104,7 @@
 		
 		if_mvm
 		{
-		
-			"visible"		"0"
-		
+			"visible"	"0"
 		}
 	}
 	"Red6sBackground"
@@ -114,12 +112,12 @@
 		"ControlName"		"ImagePanel"
 		"fieldName"		"ScoreboardBackground"
 		"xpos"			"9999"
-		"xpos_minmode"	"c135"
+		"xpos_minmode"	"c65"
 		"ypos"			"9999"
 		"ypos_minmode"	"265"
 		"zpos"			"-1"
-		"wide_minmode"	"230"
-		"tall"			"102"
+		"wide_minmode"	"240"
+		"tall"			"100"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -127,9 +125,8 @@
 		
 		if_mvm
 		{
-		
 			"visible"		"0"
-		
+
 		}
 	}
 	"Blue6sBackground"
@@ -137,12 +134,12 @@
 		"ControlName"		"ImagePanel"
 		"fieldName"		"ScoreboardBackground"
 		"xpos"			"9999"
-		"xpos_minmode"	"c135"
+		"xpos_minmode"	"c65"
 		"ypos"			"9999"
-		"ypos_minmode"	"120"
+		"ypos_minmode"	"121"
 		"zpos"			"-1"
-		"wide"			"230"
-		"tall"			"102"
+		"wide"			"240"
+		"tall"			"100"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -150,25 +147,24 @@
 		
 		if_mvm
 		{
-		
 			"visible"		"0"
-		
+
 		}
 	}			
 	"BlueTeamLabel"
 	{
-		"ControlName"	"CExLabel"
+		"ControlName"		"CExLabel"
 		"fieldName"		"BlueTeamLabel"
 		"font"			"Cerbetica32"
 		"labelText"		"%blueteamname%"
-		"textAlignment"	"west"
-		"xpos"			"c-98"
-		"xpos_minmode"	"c138"
+		"textAlignment"		"west"
+		"xpos"			"c-228"
+		"xpos_minmode"	"c67"
 		"ypos"			"92"
 		"ypos_minmode"	"92"
 		"wide"			"140"
 		"tall"			"34"
-		"autoResize"	"0"
+		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -185,9 +181,9 @@
 		"font"			"Cerbetica56"
 		"labelText"		"%blueteamscore%"
 		"textAlignment"		"east"
-		"xpos"			"c22"
-		"xpos_minmode"	"c258"
-		"ypos"			"c-172"
+		"xpos"			"c-71"
+		"xpos_minmode"	"c197"
+		"ypos"			"68"
 		"ypos_minmode"	"68"
 		"zpos"			"4"
 		"wide"			"100"
@@ -210,9 +206,9 @@
 		"fgcolor"		"Black"
 		"labelText"		"%blueteamscore%"
 		"textAlignment"		"east"
-		"xpos"			"c24"
-		"xpos_minmode"	"c260"
-		"ypos"			"c-170" 
+		"xpos"			"c-69"
+		"xpos_minmode"	"c199"
+		"ypos"			"70" 
 		"ypos_minmode"	"70"
 		"zpos"			"4"
 		"wide"			"100"
@@ -234,8 +230,8 @@
 		"font"			"Cerbetica14"
 		"labelText"		"%blueteamplayercount%"
 		"textAlignment"		"west"
-		"xpos"			"c35"
-		"xpos_minmode"	"c280"
+		"xpos"			"c-65"
+		"xpos_minmode"	"c212"
 		"ypos"			"99"
 		"ypos_minmode"	"99"
 		"wide"			"100"
@@ -258,8 +254,8 @@
 		"labelText"		"%redteamname%"
 		"textAlignment"		"east"
 		"textAlignment_minmode"	"west"
-		"xpos"			"c218"
-		"xpos_minmode"	"c138"
+		"xpos"			"c168"
+		"xpos_minmode"	"c67"
 		"ypos"			"92"
 		"ypos_minmode"	"236"
 		"wide"			"140"
@@ -282,9 +278,9 @@
 		"labelText"		"%redteamscore%"
 		"textAlignment"		"west"
 		"textAlignment_minmode"		"east"
-		"xpos"			"c138"
-		"xpos_minmode"	"c258"
-		"ypos"			"c-172"
+		"xpos"			"c51"
+		"xpos_minmode"	"c197"
+		"ypos"			"68"
 		"ypos_minmode"	"211"
 		"zpos"			"4"
 		"wide"			"100"
@@ -310,15 +306,13 @@
 		"labelText"		"%redteamscore%"
 		"textAlignment"		"west"
 		"textAlignment_minmode"	"east"
-		"xpos"			"c140"
-		"xpos_minmode"	"c260"
-		"ypos"			"c-170"
+		"xpos"			"c53"
+		"xpos_minmode"	"c199"
+		"ypos"			"70"
 		"ypos_minmode"	"213"
 		"zpos"			"4"
 		"wide"			"100"
 		"tall"			"55"
-		"tall_hidef"	"75"
-		"tall_lodef"	"75"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -337,8 +331,8 @@
 		"labelText"		"%redteamplayercount%"
 		"textAlignment"		"east"
 		"textAlignment_minmode" "west"
-		"xpos"			"c97"
-		"xpos_minmode"	"c280"
+		"xpos"			"c12"
+		"xpos_minmode"	"c212"
 		"ypos"			"99"
 		"ypos_minmode"	"243"
 		"wide"			"130"
@@ -360,7 +354,7 @@
 		"font"			"Cerbetica12"
 		"labelText"		"%server%"
 		"textAlignment"		"west"
-		"xpos"			"c-225"
+		"xpos"			"c-360"
 		"ypos"			"68"
 		"zpos"			"999"
 		"wide"			"600"
@@ -368,7 +362,6 @@
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"	[$WIN32]
-		"visible"		"0"	[$X360]
 		"enabled"		"1"
 		
 		if_mvm
@@ -383,7 +376,7 @@
 		"font"			"Cerbetica12"
 		"labelText"		"%servertimeleft%"
 		"textAlignment"		"west"
-		"xpos"			"c-225"
+		"xpos"			"c-360"
 		"ypos"			"80"
 		"zpos"			"999"
 		"wide"			"600"
@@ -403,15 +396,15 @@
 	{
 		"ControlName"	"SectionedListPanel"
 		"fieldName"		"BluePlayerList"
-		"xpos"			"c-97"
-		"xpos_minmode"	"c138"
+		"xpos"			"c-225"
+		"xpos_minmode"	"c68"
 		"ypos"			"125"
-		"ypos_minmode"	"122"
+		"ypos_minmode"	"123"
 		"zpos"			"20"
-		"wide"			"225"
-		"wide_minmode"	"225"
+		"wide"			"260"
+		"wide_minmode"	"235"
 		"tall"			"240"
-		"tall_minmode"	"100"
+		"tall_minmode"	"96"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -429,15 +422,15 @@
 	{
 		"ControlName"	"SectionedListPanel"
 		"fieldName"		"RedPlayerList"
-		"xpos"			"c132"
-		"xpos_minmode"  "c138"
+		"xpos"			"c45"
+		"xpos_minmode"  "c68"
 		"ypos"			"125"
-		"ypos_minmode"  "267"
+		"ypos_minmode"  "266"
 		"zpos"			"20"
-		"wide"			"225"
-		"wide_minmode"  "225"
+		"wide"			"260"
+		"wide_minmode"  "235"
 		"tall"			"240"
-		"tall_minmode"	"100"
+		"tall_minmode"	"96"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -484,10 +477,9 @@
 		"font"			"Cerbetica12"
 		"labelText"		"%spectators%"
 		"textAlignment"		"west"
-		"xpos"			"c-100"
-		"xpos_minmode"	"c135"
+		"xpos"			"c-230"
+		"xpos_minmode"	"c65"
 		"ypos"			"360"
-		"ypos_minmode"			"362"
 		"zpos"			"4"
 		"wide"			"540"
 		"wide_minmode"	"240"
@@ -499,7 +491,7 @@
 		
 		if_mvm
 		{
-			"ypos"		"c-100"
+			"ypos"		"444"
 		}
 	}	
 	"SpectatorsInQueue"
@@ -509,8 +501,8 @@
 		"font"			"Cerbetica12"
 		"labelText"		"%waitingtoplay%"
 		"textAlignment"		"west"
-		"xpos"			"c-100"
-		"xpos_minmode"	"c145"
+		"xpos"			"c-230"
+		"xpos_minmode"	"c65"
 		"ypos"			"372"	
 		"zpos"			"4"
 		"wide"			"424"
@@ -529,7 +521,7 @@
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"		"StatsBackground"
-		"xpos"			"c-225"
+		"xpos"			"c-360"
 		"ypos"			"96"	
 		"zpos"			"2"
 		"wide"			"116"
@@ -621,7 +613,7 @@
 		"font"			"Cerbetica20"
 		"labelText"		"%playerscore%"
 		"textAlignment"		"center"
-		"xpos"			"c-236"
+		"xpos"			"c-368"
 		"ypos"			"310"
 		"zpos"			"3"
 		"wide"			"140"
@@ -852,7 +844,7 @@
 	{
 		"ControlName"		"EditablePanel"
 		"fieldName"		"LocalPlayerStatsPanel"
-		"xpos"			"c-254"
+		"xpos"			"c-388"
 		"ypos"			"96"
 		"zpos"			"3"
 		"wide"			"166"
@@ -1381,6 +1373,7 @@
 		}
 	}
 
+
 	"ButtonLegendBG"		[$X360]
 	{
 		"ControlName"	"ImagePanel"
@@ -1545,8 +1538,8 @@
 	{
 		"ControlName"		"CTFHudMannVsMachineScoreboard"
 		"fieldName"			"MvMScoreboard"
-		"xpos"				"0"
-		"ypos"				"0"
+		"xpos"				"100"
+		"ypos"				"5"
 		"zpos"				"10"
 		"wide"				"f0"
 		"tall"				"480"