diff --git a/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
index 23f688d9ab..f7688f7c81 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
@@ -128,13 +128,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			});
 
 			UpdateCurrentMap();
-			players = Ui.LoadWidget<ScrollPanelWidget>("LOBBY_PLAYER_BIN", lobby.Get("PLAYER_BIN_ROOT"), new WidgetArgs());
-			players.IsVisible = () => panel == PanelType.Players;
 
-			var playerBinHeaders = lobby.GetOrNull<ContainerWidget>("LABEL_CONTAINER");
-			if (playerBinHeaders != null)
-				playerBinHeaders.IsVisible = () => panel == PanelType.Players;
+			var playerBin = Ui.LoadWidget("LOBBY_PLAYER_BIN", lobby.Get("PLAYER_BIN_ROOT"), new WidgetArgs());
+			playerBin.IsVisible = () => panel == PanelType.Players;
 
+			players = playerBin.Get<ScrollPanelWidget>("LOBBY_PLAYERS");
 			editablePlayerTemplate = players.Get("TEMPLATE_EDITABLE_PLAYER");
 			nonEditablePlayerTemplate = players.Get("TEMPLATE_NONEDITABLE_PLAYER");
 			emptySlotTemplate = players.Get("TEMPLATE_EMPTY");
diff --git a/mods/cnc/chrome/lobby-players.yaml b/mods/cnc/chrome/lobby-players.yaml
index 0c4aa4b24a..f1f5812186 100644
--- a/mods/cnc/chrome/lobby-players.yaml
+++ b/mods/cnc/chrome/lobby-players.yaml
@@ -1,339 +1,387 @@
-ScrollPanel@LOBBY_PLAYER_BIN:
-	X: 15
-	Y: 30
-	Width: 556
-	Height: 219
-	TopBottomSpacing: 5
-	ItemSpacing: 5
+Container@LOBBY_PLAYER_BIN:
+	Width: PARENT_RIGHT
+	Height: PARENT_BOTTOM
 	Children:
-		Container@TEMPLATE_EDITABLE_PLAYER:
-			X: 5
-			Y: 0
-			Width: 530
-			Height: 25
-			Visible: false
+		Container@LABEL_CONTAINER:
+			X: 20
+			Y: 5
 			Children:
-				Image@ADMIN_INDICATOR:
-					ImageCollection: lobby-bits
-					ImageName: admin
-					X: 2
-					Visible: false
-				Background@LATENCY:
-					Background: button
-					X: 0
-					Y: 6
-					Width: 11
-					Height: 14
-					Visible: false
-					Children:
-						ColorBlock@LATENCY_COLOR:
-							X: 2
-							Y: 2
-							Width: PARENT_RIGHT-4
-							Height: PARENT_BOTTOM-4
-				ClientTooltipRegion@CLIENT_REGION:
-					TooltipContainer: TOOLTIP_CONTAINER
-					Template: CLIENT_TOOLTIP
-					Width: 11
+				Label@NAME:
+					Width: 200
 					Height: 25
-				TextField@NAME:
-					Text: Name
-					X: 15
-					Width: 190
-					Height: 25
-					MaxLength: 16
-					Visible: false
-				DropDownButton@SLOT_OPTIONS:
-					Text: Name
-					X: 15
-					Width: 190
-					Height: 25
-					Font: Regular
-					Visible: false
-				DropDownButton@COLOR:
+					Text: Player
+					Align: Center
+					Font: Bold
+				Label@COLOR:
 					Width: 70
 					Height: 25
 					X: 210
-					Font: Regular
-					IgnoreChildMouseOver: true
-					Children:
-						ColorBlock@COLORBLOCK:
-							X: 5
-							Y: 6
-							Width: PARENT_RIGHT-35
-							Height: PARENT_BOTTOM-12
-				DropDownButton@FACTION:
+					Text: Color
+					Align: Center
+					Font: Bold
+				Label@FACTION:
 					Width: 100
 					Height: 25
 					X: 285
-					Font: Regular
-					IgnoreChildMouseOver: true
-					TooltipContainer: TOOLTIP_CONTAINER
-					TooltipTemplate: FACTION_DESCRIPTION_TOOLTIP
-					PanelRoot: FACTION_DROPDOWN_PANEL_ROOT # ensure that tooltips for the options are on top of the dropdown panel
-					Children:
-						Image@FACTIONFLAG:
-							Width: 32
-							Height: 16
-							X: 4
-							Y: 4
-						Label@FACTIONNAME:
-							Text: Faction
-							Width: 60
-							Height: 25
-							X: 40
-							Y: 0
-				DropDownButton@TEAM:
-					Width: 50
-					Height: 25
-					X: 390
-					Font: Regular
-				DropDownButton@SPAWN:
-					X: 445
-					Width: 50
-					Height: 25
-					Font: Regular
-				Image@STATUS_IMAGE:
-					Visible: false
-					X: 495
-					Y: 4
-					Width: 20
-					Height: 20
-					ImageCollection: checkbox-bits
-					ImageName: checked
-				Checkbox@STATUS_CHECKBOX:
-					Visible: false
-					X: 501
-					Y: 2
-					Width: 20
-					Height: 20
-		Container@TEMPLATE_NONEDITABLE_PLAYER:
-			X: 5
-			Y: 0
-			Width: 530
-			Height: 25
-			Visible: false
-			Children:
-				Image@ADMIN_INDICATOR:
-					ImageCollection: lobby-bits
-					ImageName: admin
-					X: 2
-					Visible: false
-				Background@LATENCY:
-					Background: button
-					X: 0
-					Y: 6
-					Width: 11
-					Height: 14
-					Visible: false
-					Children:
-						ColorBlock@LATENCY_COLOR:
-							X: 2
-							Y: 2
-							Width: PARENT_RIGHT-4
-							Height: PARENT_BOTTOM-4
-				ClientTooltipRegion@CLIENT_REGION:
-					TooltipContainer: TOOLTIP_CONTAINER
-					Template: CLIENT_TOOLTIP
-					Width: 11
-					Height: 25
-				Label@NAME:
-					X: 20
-					Y: 0-1
-					Width: 180
-					Height: 25
-				Button@KICK:
-					Width: 25
-					Height: 25
-					X: 180
-					Children:
-						Image:
-							ImageCollection: lobby-bits
-							ImageName: kick
-							X: 7
-							Y: 7
-				ColorBlock@COLORBLOCK:
-					X: 215
-					Y: 6
-					Width: 35
-					Height: 13
-				Container@FACTION:
-					Width: 100
-					Height: 25
-					X: 285
-					Y: 0
-					Children:
-						Image@FACTIONFLAG:
-							Width: 30
-							Height: 15
-							X: 5
-							Y: 5
-						Label@FACTIONNAME:
-							Text: Faction
-							Width: 60
-							Height: 25
-							X: 40
-							Y: 0
+					Text: Faction
+					Align: Center
+					Font: Bold
 				Label@TEAM:
-					Align: Center
-					Width: 25
+					Width: 50
 					Height: 25
 					X: 390
-					Y: 0
+					Text: Team
+					Align: Center
+					Font: Bold
 				Label@SPAWN:
-					Align: Center
-					Width: 25
-					Height: 25
 					X: 445
-					Y: 0
-				Image@STATUS_IMAGE:
-					Visible: false
+					Width: 50
+					Height: 25
+					Text: Spawn
+					Align: Left
+					Font: Bold
+				Label@STATUS:
 					X: 501
-					Y: 4
 					Width: 20
-					Height: 20
-					ImageCollection: checkbox-bits
-					ImageName: checked
-		Container@TEMPLATE_EMPTY:
-			X: 5
-			Y: 0
-			Width: 530
-			Height: 25
-			Visible: false
+					Height: 25
+					Text: Ready
+					Align: Left
+					Font: Bold
+		ScrollPanel@LOBBY_PLAYERS:
+			X: 15
+			Y: 30
+			Width: 556
+			Height: 219
+			TopBottomSpacing: 5
+			ItemSpacing: 5
 			Children:
-				DropDownButton@SLOT_OPTIONS:
-					Text: Name
-					X: 15
-					Width: 190
-					Height: 25
-					Font: Regular
-					Visible: false
-				Label@NAME:
-					X: 20
-					Y: 0-1
-					Width: 195
-					Height: 25
-					Visible: false
-				Button@JOIN:
-					Text: Play in this slot
-					Font: Regular
-					Width: 312
-					Height: 25
-					X: 210
+				Container@TEMPLATE_EDITABLE_PLAYER:
+					X: 5
 					Y: 0
-		Container@TEMPLATE_EDITABLE_SPECTATOR:
-			X: 5
-			Y: 0
-			Width: 530
-			Height: 25
-			Visible: false
-			Children:
-				Image@ADMIN_INDICATOR:
-					ImageCollection: lobby-bits
-					ImageName: admin
-					X: 2
-					Visible: false
-				Background@LATENCY:
-					Background: button
-					X: 0
-					Y: 6
-					Width: 11
-					Height: 14
+					Width: 530
+					Height: 25
 					Visible: false
 					Children:
-						ColorBlock@LATENCY_COLOR:
+						Image@ADMIN_INDICATOR:
+							ImageCollection: lobby-bits
+							ImageName: admin
 							X: 2
+							Visible: false
+						Background@LATENCY:
+							Background: button
+							X: 0
+							Y: 6
+							Width: 11
+							Height: 14
+							Visible: false
+							Children:
+								ColorBlock@LATENCY_COLOR:
+									X: 2
+									Y: 2
+									Width: PARENT_RIGHT-4
+									Height: PARENT_BOTTOM-4
+						ClientTooltipRegion@CLIENT_REGION:
+							TooltipContainer: TOOLTIP_CONTAINER
+							Template: CLIENT_TOOLTIP
+							Width: 11
+							Height: 25
+						TextField@NAME:
+							Text: Name
+							X: 15
+							Width: 190
+							Height: 25
+							MaxLength: 16
+							Visible: false
+						DropDownButton@SLOT_OPTIONS:
+							Text: Name
+							X: 15
+							Width: 190
+							Height: 25
+							Font: Regular
+							Visible: false
+						DropDownButton@COLOR:
+							Width: 70
+							Height: 25
+							X: 210
+							Font: Regular
+							IgnoreChildMouseOver: true
+							Children:
+								ColorBlock@COLORBLOCK:
+									X: 5
+									Y: 6
+									Width: PARENT_RIGHT-35
+									Height: PARENT_BOTTOM-12
+						DropDownButton@FACTION:
+							Width: 100
+							Height: 25
+							X: 285
+							Font: Regular
+							IgnoreChildMouseOver: true
+							TooltipContainer: TOOLTIP_CONTAINER
+							TooltipTemplate: FACTION_DESCRIPTION_TOOLTIP
+							PanelRoot: FACTION_DROPDOWN_PANEL_ROOT # ensure that tooltips for the options are on top of the dropdown panel
+							Children:
+								Image@FACTIONFLAG:
+									Width: 32
+									Height: 16
+									X: 4
+									Y: 4
+								Label@FACTIONNAME:
+									Text: Faction
+									Width: 60
+									Height: 25
+									X: 40
+									Y: 0
+						DropDownButton@TEAM:
+							Width: 50
+							Height: 25
+							X: 390
+							Font: Regular
+						DropDownButton@SPAWN:
+							X: 445
+							Width: 50
+							Height: 25
+							Font: Regular
+						Image@STATUS_IMAGE:
+							Visible: false
+							X: 495
+							Y: 4
+							Width: 20
+							Height: 20
+							ImageCollection: checkbox-bits
+							ImageName: checked
+						Checkbox@STATUS_CHECKBOX:
+							Visible: false
+							X: 501
 							Y: 2
-							Width: PARENT_RIGHT-4
-							Height: PARENT_BOTTOM-4
-				ClientTooltipRegion@CLIENT_REGION:
-					TooltipContainer: TOOLTIP_CONTAINER
-					Template: CLIENT_TOOLTIP
-					Width: 11
-					Height: 25
-				TextField@NAME:
-					Text: Name
-					X: 15
-					Width: 190
-					Height: 25
-					MaxLength: 16
-				Label@SPECTATOR:
-					Text: Spectator
-					Width: 315
-					Height: 25
-					X: 210
+							Width: 20
+							Height: 20
+				Container@TEMPLATE_NONEDITABLE_PLAYER:
+					X: 5
 					Y: 0
-					Align: Center
-					Font: Bold
-		Container@TEMPLATE_NONEDITABLE_SPECTATOR:
-			X: 5
-			Y: 0
-			Width: 530
-			Height: 25
-			Visible: false
-			Children:
-				Image@ADMIN_INDICATOR:
-					ImageCollection: lobby-bits
-					ImageName: admin
-					X: 2
-					Visible: false
-				Background@LATENCY:
-					Background: button
-					X: 0
-					Y: 6
-					Width: 11
-					Height: 14
+					Width: 530
+					Height: 25
 					Visible: false
 					Children:
-						ColorBlock@LATENCY_COLOR:
+						Image@ADMIN_INDICATOR:
+							ImageCollection: lobby-bits
+							ImageName: admin
 							X: 2
+							Visible: false
+						Background@LATENCY:
+							Background: button
+							X: 0
+							Y: 6
+							Width: 11
+							Height: 14
+							Visible: false
+							Children:
+								ColorBlock@LATENCY_COLOR:
+									X: 2
+									Y: 2
+									Width: PARENT_RIGHT-4
+									Height: PARENT_BOTTOM-4
+						ClientTooltipRegion@CLIENT_REGION:
+							TooltipContainer: TOOLTIP_CONTAINER
+							Template: CLIENT_TOOLTIP
+							Width: 11
+							Height: 25
+						Label@NAME:
+							X: 20
+							Y: 0-1
+							Width: 180
+							Height: 25
+						Button@KICK:
+							Width: 25
+							Height: 25
+							X: 180
+							Children:
+								Image:
+									ImageCollection: lobby-bits
+									ImageName: kick
+									X: 7
+									Y: 7
+						ColorBlock@COLORBLOCK:
+							X: 215
+							Y: 6
+							Width: 35
+							Height: 13
+						Container@FACTION:
+							Width: 100
+							Height: 25
+							X: 285
+							Y: 0
+							Children:
+								Image@FACTIONFLAG:
+									Width: 30
+									Height: 15
+									X: 5
+									Y: 5
+								Label@FACTIONNAME:
+									Text: Faction
+									Width: 60
+									Height: 25
+									X: 40
+									Y: 0
+						Label@TEAM:
+							Align: Center
+							Width: 25
+							Height: 25
+							X: 390
+							Y: 0
+						Label@SPAWN:
+							Align: Center
+							Width: 25
+							Height: 25
+							X: 445
+							Y: 0
+						Image@STATUS_IMAGE:
+							Visible: false
+							X: 501
+							Y: 4
+							Width: 20
+							Height: 20
+							ImageCollection: checkbox-bits
+							ImageName: checked
+				Container@TEMPLATE_EMPTY:
+					X: 5
+					Y: 0
+					Width: 530
+					Height: 25
+					Visible: false
+					Children:
+						DropDownButton@SLOT_OPTIONS:
+							Text: Name
+							X: 15
+							Width: 190
+							Height: 25
+							Font: Regular
+							Visible: false
+						Label@NAME:
+							X: 20
+							Y: 0-1
+							Width: 195
+							Height: 25
+							Visible: false
+						Button@JOIN:
+							Text: Play in this slot
+							Font: Regular
+							Width: 312
+							Height: 25
+							X: 210
+							Y: 0
+				Container@TEMPLATE_EDITABLE_SPECTATOR:
+					X: 5
+					Y: 0
+					Width: 530
+					Height: 25
+					Visible: false
+					Children:
+						Image@ADMIN_INDICATOR:
+							ImageCollection: lobby-bits
+							ImageName: admin
+							X: 2
+							Visible: false
+						Background@LATENCY:
+							Background: button
+							X: 0
+							Y: 6
+							Width: 11
+							Height: 14
+							Visible: false
+							Children:
+								ColorBlock@LATENCY_COLOR:
+									X: 2
+									Y: 2
+									Width: PARENT_RIGHT-4
+									Height: PARENT_BOTTOM-4
+						ClientTooltipRegion@CLIENT_REGION:
+							TooltipContainer: TOOLTIP_CONTAINER
+							Template: CLIENT_TOOLTIP
+							Width: 11
+							Height: 25
+						TextField@NAME:
+							Text: Name
+							X: 15
+							Width: 190
+							Height: 25
+							MaxLength: 16
+						Label@SPECTATOR:
+							Text: Spectator
+							Width: 315
+							Height: 25
+							X: 210
+							Y: 0
+							Align: Center
+							Font: Bold
+				Container@TEMPLATE_NONEDITABLE_SPECTATOR:
+					X: 5
+					Y: 0
+					Width: 530
+					Height: 25
+					Visible: false
+					Children:
+						Image@ADMIN_INDICATOR:
+							ImageCollection: lobby-bits
+							ImageName: admin
+							X: 2
+							Visible: false
+						Background@LATENCY:
+							Background: button
+							X: 0
+							Y: 6
+							Width: 11
+							Height: 14
+							Visible: false
+							Children:
+								ColorBlock@LATENCY_COLOR:
+									X: 2
+									Y: 2
+									Width: PARENT_RIGHT-4
+									Height: PARENT_BOTTOM-4
+						ClientTooltipRegion@CLIENT_REGION:
+							TooltipContainer: TOOLTIP_CONTAINER
+							Template: CLIENT_TOOLTIP
+							Width: 11
+							Height: 25
+						Label@NAME:
+							X: 20
+							Y: 0-1
+							Width: 180
+							Height: 25
+						Button@KICK:
+							Text: X
+							Width: 25
+							Height: 23
+							X: 180
 							Y: 2
-							Width: PARENT_RIGHT-4
-							Height: PARENT_BOTTOM-4
-				ClientTooltipRegion@CLIENT_REGION:
-					TooltipContainer: TOOLTIP_CONTAINER
-					Template: CLIENT_TOOLTIP
-					Width: 11
-					Height: 25
-				Label@NAME:
-					X: 20
-					Y: 0-1
-					Width: 180
-					Height: 25
-				Button@KICK:
-					Text: X
-					Width: 25
-					Height: 23
-					X: 180
-					Y: 2
-					Font: Bold
-				Label@SPECTATOR:
-					Text: Spectator
-					Width: 315
-					Height: 25
-					X: 210
+							Font: Bold
+						Label@SPECTATOR:
+							Text: Spectator
+							Width: 315
+							Height: 25
+							X: 210
+							Y: 0
+							Align: Center
+							Font: Bold
+				Container@TEMPLATE_NEW_SPECTATOR:
+					X: 5
 					Y: 0
-					Align: Center
-					Font: Bold
-		Container@TEMPLATE_NEW_SPECTATOR:
-			X: 5
-			Y: 0
-			Width: 529
-			Height: 25
-			Visible: false
-			Children:
-				Checkbox@TOGGLE_SPECTATORS:
-					Font: Regular
-					Width: 190
-					Height: 20
-					X: 15
-					Y: 0
-					Text: Allow Spectators?
-				Button@SPECTATE:
-					Text: Spectate
-					Font: Regular
-					Width: 312
+					Width: 529
 					Height: 25
-					X: 210
-					Y: 0
-
+					Visible: false
+					Children:
+						Checkbox@TOGGLE_SPECTATORS:
+							Font: Regular
+							Width: 190
+							Height: 20
+							X: 15
+							Y: 0
+							Text: Allow Spectators?
+						Button@SPECTATE:
+							Text: Spectate
+							Font: Regular
+							Width: 312
+							Height: 25
+							X: 210
+							Y: 0
diff --git a/mods/cnc/chrome/lobby.yaml b/mods/cnc/chrome/lobby.yaml
index 4b6cf31c3e..cd9e1e165a 100644
--- a/mods/cnc/chrome/lobby.yaml
+++ b/mods/cnc/chrome/lobby.yaml
@@ -20,51 +20,6 @@ Container@SERVER_LOBBY:
 				Container@MAP_PREVIEW_ROOT:
 					Width: PARENT_RIGHT
 					Height: PARENT_BOTTOM
-				Container@LABEL_CONTAINER:
-					X: 20
-					Y: 5
-					Children:
-						Label@NAME:
-							Width: 200
-							Height: 25
-							Text: Player
-							Align: Center
-							Font: Bold
-						Label@COLOR:
-							Width: 70
-							Height: 25
-							X: 210
-							Text: Color
-							Align: Center
-							Font: Bold
-						Label@FACTION:
-							Width: 100
-							Height: 25
-							X: 285
-							Text: Faction
-							Align: Center
-							Font: Bold
-						Label@TEAM:
-							Width: 50
-							Height: 25
-							X: 390
-							Text: Team
-							Align: Center
-							Font: Bold
-						Label@SPAWN:
-							X: 445
-							Width: 50
-							Height: 25
-							Text: Spawn
-							Align: Left
-							Font: Bold
-						Label@STATUS:
-							X: 501
-							Width: 20
-							Height: 25
-							Text: Ready
-							Align: Left
-							Font: Bold
 				Container@PLAYER_BIN_ROOT:
 				DropDownButton@SLOTS_DROPDOWNBUTTON:
 					X: 15
diff --git a/mods/d2k/chrome/lobby-players.yaml b/mods/d2k/chrome/lobby-players.yaml
index cc429c05e9..2a5491586f 100644
--- a/mods/d2k/chrome/lobby-players.yaml
+++ b/mods/d2k/chrome/lobby-players.yaml
@@ -1,332 +1,382 @@
-ScrollPanel@LOBBY_PLAYER_BIN:
-	X: 20
-	Y: 67
-	TopBottomSpacing: 5
-	ItemSpacing: 5
-	Width: 593
-	Height: 235
+Container@LOBBY_PLAYER_BIN:
+	Width: PARENT_RIGHT
+	Height: PARENT_BOTTOM
 	Children:
-		Container@TEMPLATE_EDITABLE_PLAYER:
-			X: 5
-			Y: 0
-			Width: 475
-			Height: 25
-			Visible: false
+		Container@LABEL_CONTAINER:
+			X: 25
+			Y: 40
 			Children:
-				Image@ADMIN_INDICATOR:
-					ImageCollection: lobby-bits
-					ImageName: admin
-					X: 2
-					Visible: false
-				Container@LATENCY:
+				Label@LABEL_LOBBY_NAME:
 					X: 0
-					Y: 6
-					Width: 11
-					Height: 14
-					Visible: false
-					Children:
-						ColorBlock@LATENCY_COLOR:
-							X: 2
-							Y: 2
-							Width: PARENT_RIGHT-4
-							Height: PARENT_BOTTOM-4
-				ClientTooltipRegion@CLIENT_REGION:
-					TooltipContainer: TOOLTIP_CONTAINER
-					Template: CLIENT_TOOLTIP
-					Width: 11
+					Width: 180
 					Height: 25
-				TextField@NAME:
 					Text: Name
-					X: 15
-					Width: 165
-					Height: 25
-					MaxLength: 16
-				DropDownButton@SLOT_OPTIONS:
-					Text: Name
-					X: 15
-					Width: 165
-					Height: 25
-					Font: Regular
-					Visible: false
-				DropDownButton@COLOR:
+					Align: Center
+					Font: Bold
+				Label@LABEL_LOBBY_COLOR:
 					X: 190
 					Width: 80
 					Height: 25
-					IgnoreChildMouseOver: true
-					Children:
-						ColorBlock@COLORBLOCK:
-							X: 5
-							Y: 6
-							Width: PARENT_RIGHT-35
-							Height: PARENT_BOTTOM-12
-				DropDownButton@FACTION:
+					Text: Color
+					Align: Center
+					Font: Bold
+				Label@LABEL_LOBBY_FACTION:
 					X: 280
 					Width: 130
 					Height: 25
-					IgnoreChildMouseOver: true
-					TooltipContainer: TOOLTIP_CONTAINER
-					TooltipTemplate: FACTION_DESCRIPTION_TOOLTIP
-					PanelRoot: FACTION_DROPDOWN_PANEL_ROOT # ensure that tooltips for the options are on top of the dropdown panel
-					Children:
-						Image@FACTIONFLAG:
-							Width: 23
-							Height: 23
-							X: 4
-							Y: 2
-						Label@FACTIONNAME:
-							Text: Faction
-							Width: 70
-							Height: 25
-							X: 34
-							Y: 0
-				DropDownButton@TEAM:
+					Text: Faction
+					Align: Center
+					Font: Bold
+				Label@LABEL_LOBBY_TEAM:
 					X: 420
 					Width: 48
 					Height: 25
 					Text: Team
-				DropDownButton@SPAWN:
+					Align: Center
+					Font: Bold
+				Label@LABEL_LOBBY_SPAWN:
 					X: 478
 					Width: 48
 					Height: 25
 					Text: Spawn
-				Checkbox@STATUS_CHECKBOX:
+					Align: Center
+					Font: Bold
+				Label@LABEL_LOBBY_STATUS:
 					X: 535
-					Y: 2
 					Width: 20
-					Height: 20
-					Visible: false
-				Image@STATUS_IMAGE:
-					X: 537
-					Y: 4
-					Width: 20
-					Height: 20
-					ImageCollection: checkbox-bits
-					ImageName: checked
-					Visible: false
-		Container@TEMPLATE_NONEDITABLE_PLAYER:
-			X: 5
-			Y: 0
-			Width: 475
-			Height: 25
-			Visible: false
-			Children:
-				Image@ADMIN_INDICATOR:
-					ImageCollection: lobby-bits
-					ImageName: admin
-					X: 2
-					Visible: false
-				Container@LATENCY:
-					X: 0
-					Y: 6
-					Width: 11
-					Height: 14
-					Visible: false
-					Children:
-						ColorBlock@LATENCY_COLOR:
-							X: 2
-							Y: 2
-							Width: PARENT_RIGHT-4
-							Height: PARENT_BOTTOM-4
-				ClientTooltipRegion@CLIENT_REGION:
-					TooltipContainer: TOOLTIP_CONTAINER
-					Template: CLIENT_TOOLTIP
-					Width: 11
 					Height: 25
-				Label@NAME:
-					Text: Name
-					Width: 165
-					Height: 25
-					X: 20
-					Y: 0-1
-				Button@KICK:
-					Text: X
-					Width: 25
-					Height: 23
-					X: 155
-					Y: 2
+					Text: Ready
+					Align: Left
 					Font: Bold
-				ColorBlock@COLORBLOCK:
-					X: 195
-					Y: 6
-					Width: 45
-					Height: 13
-				Container@FACTION:
-					Width: 160
-					Height: 25
-					X: 280
+		ScrollPanel@LOBBY_PLAYERS:
+			X: 20
+			Y: 67
+			TopBottomSpacing: 5
+			ItemSpacing: 5
+			Width: 593
+			Height: 235
+			Children:
+				Container@TEMPLATE_EDITABLE_PLAYER:
+					X: 5
 					Y: 0
+					Width: 475
+					Height: 25
+					Visible: false
 					Children:
-						Image@FACTIONFLAG:
-							Width: 23
-							Height: 23
-							X: 4
-							Y: 2
-						Label@FACTIONNAME:
-							Text: Faction
-							Width: 60
+						Image@ADMIN_INDICATOR:
+							ImageCollection: lobby-bits
+							ImageName: admin
+							X: 2
+							Visible: false
+						Container@LATENCY:
+							X: 0
+							Y: 6
+							Width: 11
+							Height: 14
+							Visible: false
+							Children:
+								ColorBlock@LATENCY_COLOR:
+									X: 2
+									Y: 2
+									Width: PARENT_RIGHT-4
+									Height: PARENT_BOTTOM-4
+						ClientTooltipRegion@CLIENT_REGION:
+							TooltipContainer: TOOLTIP_CONTAINER
+							Template: CLIENT_TOOLTIP
+							Width: 11
 							Height: 25
-							X: 34
+						TextField@NAME:
+							Text: Name
+							X: 15
+							Width: 165
+							Height: 25
+							MaxLength: 16
+						DropDownButton@SLOT_OPTIONS:
+							Text: Name
+							X: 15
+							Width: 165
+							Height: 25
+							Font: Regular
+							Visible: false
+						DropDownButton@COLOR:
+							X: 190
+							Width: 80
+							Height: 25
+							IgnoreChildMouseOver: true
+							Children:
+								ColorBlock@COLORBLOCK:
+									X: 5
+									Y: 6
+									Width: PARENT_RIGHT-35
+									Height: PARENT_BOTTOM-12
+						DropDownButton@FACTION:
+							X: 280
+							Width: 130
+							Height: 25
+							IgnoreChildMouseOver: true
+							TooltipContainer: TOOLTIP_CONTAINER
+							TooltipTemplate: FACTION_DESCRIPTION_TOOLTIP
+							PanelRoot: FACTION_DROPDOWN_PANEL_ROOT # ensure that tooltips for the options are on top of the dropdown panel
+							Children:
+								Image@FACTIONFLAG:
+									Width: 23
+									Height: 23
+									X: 4
+									Y: 2
+								Label@FACTIONNAME:
+									Text: Faction
+									Width: 70
+									Height: 25
+									X: 34
+									Y: 0
+						DropDownButton@TEAM:
+							X: 420
+							Width: 48
+							Height: 25
+							Text: Team
+						DropDownButton@SPAWN:
+							X: 478
+							Width: 48
+							Height: 25
+							Text: Spawn
+						Checkbox@STATUS_CHECKBOX:
+							X: 535
+							Y: 2
+							Width: 20
+							Height: 20
+							Visible: false
+						Image@STATUS_IMAGE:
+							X: 537
+							Y: 4
+							Width: 20
+							Height: 20
+							ImageCollection: checkbox-bits
+							ImageName: checked
+							Visible: false
+				Container@TEMPLATE_NONEDITABLE_PLAYER:
+					X: 5
+					Y: 0
+					Width: 475
+					Height: 25
+					Visible: false
+					Children:
+						Image@ADMIN_INDICATOR:
+							ImageCollection: lobby-bits
+							ImageName: admin
+							X: 2
+							Visible: false
+						Container@LATENCY:
+							X: 0
+							Y: 6
+							Width: 11
+							Height: 14
+							Visible: false
+							Children:
+								ColorBlock@LATENCY_COLOR:
+									X: 2
+									Y: 2
+									Width: PARENT_RIGHT-4
+									Height: PARENT_BOTTOM-4
+						ClientTooltipRegion@CLIENT_REGION:
+							TooltipContainer: TOOLTIP_CONTAINER
+							Template: CLIENT_TOOLTIP
+							Width: 11
+							Height: 25
+						Label@NAME:
+							Text: Name
+							Width: 165
+							Height: 25
+							X: 20
+							Y: 0-1
+						Button@KICK:
+							Text: X
+							Width: 25
+							Height: 23
+							X: 155
+							Y: 2
+							Font: Bold
+						ColorBlock@COLORBLOCK:
+							X: 195
+							Y: 6
+							Width: 45
+							Height: 13
+						Container@FACTION:
+							Width: 160
+							Height: 25
+							X: 280
 							Y: 0
-				Label@TEAM:
-					Text: Team
-					Width: 23
-					Height: 25
-					Align: Center
-					X: 420
+							Children:
+								Image@FACTIONFLAG:
+									Width: 23
+									Height: 23
+									X: 4
+									Y: 2
+								Label@FACTIONNAME:
+									Text: Faction
+									Width: 60
+									Height: 25
+									X: 34
+									Y: 0
+						Label@TEAM:
+							Text: Team
+							Width: 23
+							Height: 25
+							Align: Center
+							X: 420
+							Y: 0
+						Label@SPAWN:
+							Align: Center
+							X: 478
+							Width: 23
+							Height: 25
+						Image@STATUS_IMAGE:
+							Visible: false
+							X: 537
+							Y: 4
+							Width: 20
+							Height: 20
+							ImageCollection: checkbox-bits
+							ImageName: checked
+				Container@TEMPLATE_EMPTY:
+					X: 5
 					Y: 0
-				Label@SPAWN:
-					Align: Center
-					X: 478
-					Width: 23
+					Width: 475
 					Height: 25
-				Image@STATUS_IMAGE:
-					Visible: false
-					X: 537
-					Y: 4
-					Width: 20
-					Height: 20
-					ImageCollection: checkbox-bits
-					ImageName: checked
-		Container@TEMPLATE_EMPTY:
-			X: 5
-			Y: 0
-			Width: 475
-			Height: 25
-			Visible: false
-			Children:
-				Label@NAME:
-					Text: Name
-					Width: 165
-					Height: 25
-					X: 20
-					Y: 0-1
-				DropDownButton@SLOT_OPTIONS:
-					Text: Name
-					Width: 165
-					Height: 25
-					X: 15
-					Y: 0
-					Visible: false
-				Button@JOIN:
-					Text: Play in this slot
-					Width: 336
-					Height: 25
-					X: 190
-					Y: 0
-		Container@TEMPLATE_EDITABLE_SPECTATOR:
-			X: 5
-			Y: 0
-			Width: 475
-			Height: 25
-			Visible: false
-			Children:
-				Image@ADMIN_INDICATOR:
-					ImageCollection: lobby-bits
-					ImageName: admin
-					X: 2
-					Visible: false
-				Container@LATENCY:
-					X: 0
-					Y: 6
-					Width: 11
-					Height: 14
 					Visible: false
 					Children:
-						ColorBlock@LATENCY_COLOR:
-							X: 2
-							Y: 2
-							Width: PARENT_RIGHT-4
-							Height: PARENT_BOTTOM-4
-				ClientTooltipRegion@CLIENT_REGION:
-					TooltipContainer: TOOLTIP_CONTAINER
-					Template: CLIENT_TOOLTIP
-					Width: 11
-					Height: 25
-				TextField@NAME:
-					Text: Name
-					X: 15
-					Width: 165
-					Height: 25
-					MaxLength: 16
-				Label@SPECTATOR:
-					Text: Spectator
-					Width: 336
-					Height: 25
-					X: 190
+						Label@NAME:
+							Text: Name
+							Width: 165
+							Height: 25
+							X: 20
+							Y: 0-1
+						DropDownButton@SLOT_OPTIONS:
+							Text: Name
+							Width: 165
+							Height: 25
+							X: 15
+							Y: 0
+							Visible: false
+						Button@JOIN:
+							Text: Play in this slot
+							Width: 336
+							Height: 25
+							X: 190
+							Y: 0
+				Container@TEMPLATE_EDITABLE_SPECTATOR:
+					X: 5
 					Y: 0
-					Align: Center
-					Font: Bold
-		Container@TEMPLATE_NONEDITABLE_SPECTATOR:
-			X: 5
-			Y: 0
-			Width: 475
-			Height: 25
-			Visible: false
-			Children:
-				Image@ADMIN_INDICATOR:
-					ImageCollection: lobby-bits
-					ImageName: admin
-					X: 2
-					Visible: false
-				Container@LATENCY:
-					X: 0
-					Y: 6
-					Width: 11
-					Height: 14
+					Width: 475
+					Height: 25
 					Visible: false
 					Children:
-						ColorBlock@LATENCY_COLOR:
+						Image@ADMIN_INDICATOR:
+							ImageCollection: lobby-bits
+							ImageName: admin
 							X: 2
+							Visible: false
+						Container@LATENCY:
+							X: 0
+							Y: 6
+							Width: 11
+							Height: 14
+							Visible: false
+							Children:
+								ColorBlock@LATENCY_COLOR:
+									X: 2
+									Y: 2
+									Width: PARENT_RIGHT-4
+									Height: PARENT_BOTTOM-4
+						ClientTooltipRegion@CLIENT_REGION:
+							TooltipContainer: TOOLTIP_CONTAINER
+							Template: CLIENT_TOOLTIP
+							Width: 11
+							Height: 25
+						TextField@NAME:
+							Text: Name
+							X: 15
+							Width: 165
+							Height: 25
+							MaxLength: 16
+						Label@SPECTATOR:
+							Text: Spectator
+							Width: 336
+							Height: 25
+							X: 190
+							Y: 0
+							Align: Center
+							Font: Bold
+				Container@TEMPLATE_NONEDITABLE_SPECTATOR:
+					X: 5
+					Y: 0
+					Width: 475
+					Height: 25
+					Visible: false
+					Children:
+						Image@ADMIN_INDICATOR:
+							ImageCollection: lobby-bits
+							ImageName: admin
+							X: 2
+							Visible: false
+						Container@LATENCY:
+							X: 0
+							Y: 6
+							Width: 11
+							Height: 14
+							Visible: false
+							Children:
+								ColorBlock@LATENCY_COLOR:
+									X: 2
+									Y: 2
+									Width: PARENT_RIGHT-4
+									Height: PARENT_BOTTOM-4
+						ClientTooltipRegion@CLIENT_REGION:
+							TooltipContainer: TOOLTIP_CONTAINER
+							Template: CLIENT_TOOLTIP
+							Width: 11
+							Height: 25
+						Label@NAME:
+							Text: Name
+							Width: 160
+							Height: 25
+							X: 20
+							Y: 0-1
+						Button@KICK:
+							Text: X
+							Width: 25
+							Height: 23
+							X: 155
 							Y: 2
-							Width: PARENT_RIGHT-4
-							Height: PARENT_BOTTOM-4
-				ClientTooltipRegion@CLIENT_REGION:
-					TooltipContainer: TOOLTIP_CONTAINER
-					Template: CLIENT_TOOLTIP
-					Width: 11
-					Height: 25
-				Label@NAME:
-					Text: Name
-					Width: 160
-					Height: 25
-					X: 20
-					Y: 0-1
-				Button@KICK:
-					Text: X
-					Width: 25
-					Height: 23
-					X: 155
-					Y: 2
-					Font: Bold
-				Label@SPECTATOR:
-					Text: Spectator
-					Width: 336
-					Height: 25
-					X: 190
+							Font: Bold
+						Label@SPECTATOR:
+							Text: Spectator
+							Width: 336
+							Height: 25
+							X: 190
+							Y: 0
+							Align: Center
+							Font: Bold
+				Container@TEMPLATE_NEW_SPECTATOR:
+					X: 5
 					Y: 0
-					Align: Center
-					Font: Bold
-		Container@TEMPLATE_NEW_SPECTATOR:
-			X: 5
-			Y: 0
-			Width: 475
-			Height: 25
-			Visible: false
-			Children:
-				Checkbox@TOGGLE_SPECTATORS:
-					Font: Regular
-					Width: 165
-					Height: 20
-					X: 15
-					Y: 0
-					Text: Allow Spectators?
-				Button@SPECTATE:
-					Text: Spectate
-					Font: Regular
-					Width: 336
+					Width: 475
 					Height: 25
-					X: 190
-					Y: 0
+					Visible: false
+					Children:
+						Checkbox@TOGGLE_SPECTATORS:
+							Font: Regular
+							Width: 165
+							Height: 20
+							X: 15
+							Y: 0
+							Text: Allow Spectators?
+						Button@SPECTATE:
+							Text: Spectate
+							Font: Regular
+							Width: 336
+							Height: 25
+							X: 190
+							Y: 0
 
 ScrollPanel@FACTION_DROPDOWN_TEMPLATE:
 	Width: DROPDOWN_WIDTH
diff --git a/mods/ra/chrome/lobby-players.yaml b/mods/ra/chrome/lobby-players.yaml
index 2ac7cb35ef..f78efe2368 100644
--- a/mods/ra/chrome/lobby-players.yaml
+++ b/mods/ra/chrome/lobby-players.yaml
@@ -1,332 +1,382 @@
-ScrollPanel@LOBBY_PLAYER_BIN:
-	X: 20
-	Y: 67
-	TopBottomSpacing: 5
-	ItemSpacing: 5
-	Width: 593
-	Height: 235
+Container@LOBBY_PLAYER_BIN:
+	Width: PARENT_RIGHT
+	Height: PARENT_BOTTOM
 	Children:
-		Container@TEMPLATE_EDITABLE_PLAYER:
-			X: 5
-			Y: 0
-			Width: 475
-			Height: 25
-			Visible: false
+		Container@LABEL_CONTAINER:
+			X: 25
+			Y: 40
 			Children:
-				Image@ADMIN_INDICATOR:
-					ImageCollection: lobby-bits
-					ImageName: admin
-					X: 2
-					Visible: false
-				Container@LATENCY:
+				Label@LABEL_LOBBY_NAME:
 					X: 0
-					Y: 6
-					Width: 11
-					Height: 14
-					Visible: false
-					Children:
-						ColorBlock@LATENCY_COLOR:
-							X: 2
-							Y: 2
-							Width: PARENT_RIGHT-4
-							Height: PARENT_BOTTOM-4
-				ClientTooltipRegion@CLIENT_REGION:
-					TooltipContainer: TOOLTIP_CONTAINER
-					Template: CLIENT_TOOLTIP
-					Width: 11
+					Width: 180
 					Height: 25
-				TextField@NAME:
 					Text: Name
-					X: 15
-					Width: 165
-					Height: 25
-					MaxLength: 16
-				DropDownButton@SLOT_OPTIONS:
-					Text: Name
-					X: 15
-					Width: 165
-					Height: 25
-					Font: Regular
-					Visible: false
-				DropDownButton@COLOR:
+					Align: Center
+					Font: Bold
+				Label@LABEL_LOBBY_COLOR:
 					X: 190
 					Width: 80
 					Height: 25
-					IgnoreChildMouseOver: true
-					Children:
-						ColorBlock@COLORBLOCK:
-							X: 5
-							Y: 6
-							Width: PARENT_RIGHT-35
-							Height: PARENT_BOTTOM-12
-				DropDownButton@FACTION:
+					Text: Color
+					Align: Center
+					Font: Bold
+				Label@LABEL_LOBBY_FACTION:
 					X: 280
 					Width: 130
 					Height: 25
-					IgnoreChildMouseOver: true
-					TooltipContainer: TOOLTIP_CONTAINER
-					TooltipTemplate: FACTION_DESCRIPTION_TOOLTIP
-					PanelRoot: FACTION_DROPDOWN_PANEL_ROOT # ensure that tooltips for the options are on top of the dropdown panel
-					Children:
-						Image@FACTIONFLAG:
-							Width: 30
-							Height: 15
-							X: 5
-							Y: 5
-						Label@FACTIONNAME:
-							Text: Faction
-							Width: 60
-							Height: 25
-							X: 40
-							Y: 0
-				DropDownButton@TEAM:
+					Text: Faction
+					Align: Center
+					Font: Bold
+				Label@LABEL_LOBBY_TEAM:
 					X: 420
 					Width: 48
 					Height: 25
 					Text: Team
-				DropDownButton@SPAWN:
+					Align: Center
+					Font: Bold
+				Label@LABEL_LOBBY_SPAWN:
 					X: 478
 					Width: 48
 					Height: 25
 					Text: Spawn
-				Checkbox@STATUS_CHECKBOX:
+					Align: Center
+					Font: Bold
+				Label@LABEL_LOBBY_STATUS:
 					X: 535
-					Y: 2
 					Width: 20
-					Height: 20
-					Visible: false
-				Image@STATUS_IMAGE:
-					X: 537
-					Y: 4
-					Width: 20
-					Height: 20
-					ImageCollection: checkbox-bits
-					ImageName: checked
-					Visible: false
-		Container@TEMPLATE_NONEDITABLE_PLAYER:
-			X: 5
-			Y: 0
-			Width: 475
-			Height: 25
-			Visible: false
-			Children:
-				Image@ADMIN_INDICATOR:
-					ImageCollection: lobby-bits
-					ImageName: admin
-					X: 2
-					Visible: false
-				Container@LATENCY:
-					X: 0
-					Y: 6
-					Width: 11
-					Height: 14
-					Visible: false
-					Children:
-						ColorBlock@LATENCY_COLOR:
-							X: 2
-							Y: 2
-							Width: PARENT_RIGHT-4
-							Height: PARENT_BOTTOM-4
-				ClientTooltipRegion@CLIENT_REGION:
-					TooltipContainer: TOOLTIP_CONTAINER
-					Template: CLIENT_TOOLTIP
-					Width: 11
 					Height: 25
-				Label@NAME:
-					Text: Name
-					Width: 165
-					Height: 25
-					X: 20
-					Y: 0-1
-				Button@KICK:
-					Text: X
-					Width: 25
-					Height: 23
-					X: 155
-					Y: 2
+					Text: Ready
+					Align: Left
 					Font: Bold
-				ColorBlock@COLORBLOCK:
-					X: 195
-					Y: 6
-					Width: 45
-					Height: 13
-				Container@FACTION:
-					Width: 160
-					Height: 25
-					X: 280
+		ScrollPanel@LOBBY_PLAYERS:
+			X: 20
+			Y: 67
+			TopBottomSpacing: 5
+			ItemSpacing: 5
+			Width: 593
+			Height: 235
+			Children:
+				Container@TEMPLATE_EDITABLE_PLAYER:
+					X: 5
 					Y: 0
+					Width: 475
+					Height: 25
+					Visible: false
 					Children:
-						Image@FACTIONFLAG:
-							Width: 30
-							Height: 15
-							X: 5
-							Y: 5
-						Label@FACTIONNAME:
-							Text: Faction
-							Width: 60
+						Image@ADMIN_INDICATOR:
+							ImageCollection: lobby-bits
+							ImageName: admin
+							X: 2
+							Visible: false
+						Container@LATENCY:
+							X: 0
+							Y: 6
+							Width: 11
+							Height: 14
+							Visible: false
+							Children:
+								ColorBlock@LATENCY_COLOR:
+									X: 2
+									Y: 2
+									Width: PARENT_RIGHT-4
+									Height: PARENT_BOTTOM-4
+						ClientTooltipRegion@CLIENT_REGION:
+							TooltipContainer: TOOLTIP_CONTAINER
+							Template: CLIENT_TOOLTIP
+							Width: 11
 							Height: 25
-							X: 40
+						TextField@NAME:
+							Text: Name
+							X: 15
+							Width: 165
+							Height: 25
+							MaxLength: 16
+						DropDownButton@SLOT_OPTIONS:
+							Text: Name
+							X: 15
+							Width: 165
+							Height: 25
+							Font: Regular
+							Visible: false
+						DropDownButton@COLOR:
+							X: 190
+							Width: 80
+							Height: 25
+							IgnoreChildMouseOver: true
+							Children:
+								ColorBlock@COLORBLOCK:
+									X: 5
+									Y: 6
+									Width: PARENT_RIGHT-35
+									Height: PARENT_BOTTOM-12
+						DropDownButton@FACTION:
+							X: 280
+							Width: 130
+							Height: 25
+							IgnoreChildMouseOver: true
+							TooltipContainer: TOOLTIP_CONTAINER
+							TooltipTemplate: FACTION_DESCRIPTION_TOOLTIP
+							PanelRoot: FACTION_DROPDOWN_PANEL_ROOT # ensure that tooltips for the options are on top of the dropdown panel
+							Children:
+								Image@FACTIONFLAG:
+									Width: 30
+									Height: 15
+									X: 5
+									Y: 5
+								Label@FACTIONNAME:
+									Text: Faction
+									Width: 60
+									Height: 25
+									X: 40
+									Y: 0
+						DropDownButton@TEAM:
+							X: 420
+							Width: 48
+							Height: 25
+							Text: Team
+						DropDownButton@SPAWN:
+							X: 478
+							Width: 48
+							Height: 25
+							Text: Spawn
+						Checkbox@STATUS_CHECKBOX:
+							X: 535
+							Y: 2
+							Width: 20
+							Height: 20
+							Visible: false
+						Image@STATUS_IMAGE:
+							X: 537
+							Y: 4
+							Width: 20
+							Height: 20
+							ImageCollection: checkbox-bits
+							ImageName: checked
+							Visible: false
+				Container@TEMPLATE_NONEDITABLE_PLAYER:
+					X: 5
+					Y: 0
+					Width: 475
+					Height: 25
+					Visible: false
+					Children:
+						Image@ADMIN_INDICATOR:
+							ImageCollection: lobby-bits
+							ImageName: admin
+							X: 2
+							Visible: false
+						Container@LATENCY:
+							X: 0
+							Y: 6
+							Width: 11
+							Height: 14
+							Visible: false
+							Children:
+								ColorBlock@LATENCY_COLOR:
+									X: 2
+									Y: 2
+									Width: PARENT_RIGHT-4
+									Height: PARENT_BOTTOM-4
+						ClientTooltipRegion@CLIENT_REGION:
+							TooltipContainer: TOOLTIP_CONTAINER
+							Template: CLIENT_TOOLTIP
+							Width: 11
+							Height: 25
+						Label@NAME:
+							Text: Name
+							Width: 165
+							Height: 25
+							X: 20
+							Y: 0-1
+						Button@KICK:
+							Text: X
+							Width: 25
+							Height: 23
+							X: 155
+							Y: 2
+							Font: Bold
+						ColorBlock@COLORBLOCK:
+							X: 195
+							Y: 6
+							Width: 45
+							Height: 13
+						Container@FACTION:
+							Width: 160
+							Height: 25
+							X: 280
 							Y: 0
-				Label@TEAM:
-					Text: Team
-					Width: 23
-					Height: 25
-					Align: Center
-					X: 420
+							Children:
+								Image@FACTIONFLAG:
+									Width: 30
+									Height: 15
+									X: 5
+									Y: 5
+								Label@FACTIONNAME:
+									Text: Faction
+									Width: 60
+									Height: 25
+									X: 40
+									Y: 0
+						Label@TEAM:
+							Text: Team
+							Width: 23
+							Height: 25
+							Align: Center
+							X: 420
+							Y: 0
+						Label@SPAWN:
+							Align: Center
+							X: 478
+							Width: 23
+							Height: 25
+						Image@STATUS_IMAGE:
+							Visible: false
+							X: 537
+							Y: 4
+							Width: 20
+							Height: 20
+							ImageCollection: checkbox-bits
+							ImageName: checked
+				Container@TEMPLATE_EMPTY:
+					X: 5
 					Y: 0
-				Label@SPAWN:
-					Align: Center
-					X: 478
-					Width: 23
+					Width: 475
 					Height: 25
-				Image@STATUS_IMAGE:
-					Visible: false
-					X: 537
-					Y: 4
-					Width: 20
-					Height: 20
-					ImageCollection: checkbox-bits
-					ImageName: checked
-		Container@TEMPLATE_EMPTY:
-			X: 5
-			Y: 0
-			Width: 475
-			Height: 25
-			Visible: false
-			Children:
-				Label@NAME:
-					Text: Name
-					Width: 165
-					Height: 25
-					X: 20
-					Y: 0-1
-				DropDownButton@SLOT_OPTIONS:
-					Text: Name
-					Width: 165
-					Height: 25
-					X: 15
-					Y: 0
-					Visible: false
-				Button@JOIN:
-					Text: Play in this slot
-					Width: 336
-					Height: 25
-					X: 190
-					Y: 0
-		Container@TEMPLATE_EDITABLE_SPECTATOR:
-			X: 5
-			Y: 0
-			Width: 475
-			Height: 25
-			Visible: false
-			Children:
-				Image@ADMIN_INDICATOR:
-					ImageCollection: lobby-bits
-					ImageName: admin
-					X: 2
-					Visible: false
-				Container@LATENCY:
-					X: 0
-					Y: 6
-					Width: 11
-					Height: 14
 					Visible: false
 					Children:
-						ColorBlock@LATENCY_COLOR:
-							X: 2
-							Y: 2
-							Width: PARENT_RIGHT-4
-							Height: PARENT_BOTTOM-4
-				ClientTooltipRegion@CLIENT_REGION:
-					TooltipContainer: TOOLTIP_CONTAINER
-					Template: CLIENT_TOOLTIP
-					Width: 11
-					Height: 25
-				TextField@NAME:
-					Text: Name
-					X: 15
-					Width: 165
-					Height: 25
-					MaxLength: 16
-				Label@SPECTATOR:
-					Text: Spectator
-					Width: 336
-					Height: 25
-					X: 190
+						Label@NAME:
+							Text: Name
+							Width: 165
+							Height: 25
+							X: 20
+							Y: 0-1
+						DropDownButton@SLOT_OPTIONS:
+							Text: Name
+							Width: 165
+							Height: 25
+							X: 15
+							Y: 0
+							Visible: false
+						Button@JOIN:
+							Text: Play in this slot
+							Width: 336
+							Height: 25
+							X: 190
+							Y: 0
+				Container@TEMPLATE_EDITABLE_SPECTATOR:
+					X: 5
 					Y: 0
-					Align: Center
-					Font: Bold
-		Container@TEMPLATE_NONEDITABLE_SPECTATOR:
-			X: 5
-			Y: 0
-			Width: 475
-			Height: 25
-			Visible: false
-			Children:
-				Image@ADMIN_INDICATOR:
-					ImageCollection: lobby-bits
-					ImageName: admin
-					X: 2
-					Visible: false
-				Container@LATENCY:
-					X: 0
-					Y: 6
-					Width: 11
-					Height: 14
+					Width: 475
+					Height: 25
 					Visible: false
 					Children:
-						ColorBlock@LATENCY_COLOR:
+						Image@ADMIN_INDICATOR:
+							ImageCollection: lobby-bits
+							ImageName: admin
 							X: 2
+							Visible: false
+						Container@LATENCY:
+							X: 0
+							Y: 6
+							Width: 11
+							Height: 14
+							Visible: false
+							Children:
+								ColorBlock@LATENCY_COLOR:
+									X: 2
+									Y: 2
+									Width: PARENT_RIGHT-4
+									Height: PARENT_BOTTOM-4
+						ClientTooltipRegion@CLIENT_REGION:
+							TooltipContainer: TOOLTIP_CONTAINER
+							Template: CLIENT_TOOLTIP
+							Width: 11
+							Height: 25
+						TextField@NAME:
+							Text: Name
+							X: 15
+							Width: 165
+							Height: 25
+							MaxLength: 16
+						Label@SPECTATOR:
+							Text: Spectator
+							Width: 336
+							Height: 25
+							X: 190
+							Y: 0
+							Align: Center
+							Font: Bold
+				Container@TEMPLATE_NONEDITABLE_SPECTATOR:
+					X: 5
+					Y: 0
+					Width: 475
+					Height: 25
+					Visible: false
+					Children:
+						Image@ADMIN_INDICATOR:
+							ImageCollection: lobby-bits
+							ImageName: admin
+							X: 2
+							Visible: false
+						Container@LATENCY:
+							X: 0
+							Y: 6
+							Width: 11
+							Height: 14
+							Visible: false
+							Children:
+								ColorBlock@LATENCY_COLOR:
+									X: 2
+									Y: 2
+									Width: PARENT_RIGHT-4
+									Height: PARENT_BOTTOM-4
+						ClientTooltipRegion@CLIENT_REGION:
+							TooltipContainer: TOOLTIP_CONTAINER
+							Template: CLIENT_TOOLTIP
+							Width: 11
+							Height: 25
+						Label@NAME:
+							Text: Name
+							Width: 160
+							Height: 25
+							X: 20
+							Y: 0-1
+						Button@KICK:
+							Text: X
+							Width: 25
+							Height: 23
+							X: 155
 							Y: 2
-							Width: PARENT_RIGHT-4
-							Height: PARENT_BOTTOM-4
-				ClientTooltipRegion@CLIENT_REGION:
-					TooltipContainer: TOOLTIP_CONTAINER
-					Template: CLIENT_TOOLTIP
-					Width: 11
-					Height: 25
-				Label@NAME:
-					Text: Name
-					Width: 160
-					Height: 25
-					X: 20
-					Y: 0-1
-				Button@KICK:
-					Text: X
-					Width: 25
-					Height: 23
-					X: 155
-					Y: 2
-					Font: Bold
-				Label@SPECTATOR:
-					Text: Spectator
-					Width: 336
-					Height: 25
-					X: 190
+							Font: Bold
+						Label@SPECTATOR:
+							Text: Spectator
+							Width: 336
+							Height: 25
+							X: 190
+							Y: 0
+							Align: Center
+							Font: Bold
+				Container@TEMPLATE_NEW_SPECTATOR:
+					X: 5
 					Y: 0
-					Align: Center
-					Font: Bold
-		Container@TEMPLATE_NEW_SPECTATOR:
-			X: 5
-			Y: 0
-			Width: 475
-			Height: 25
-			Visible: false
-			Children:
-				Checkbox@TOGGLE_SPECTATORS:
-					Font: Regular
-					Width: 165
-					Height: 20
-					X: 15
-					Y: 0
-					Text: Allow Spectators?
-				Button@SPECTATE:
-					Text: Spectate
-					Font: Regular
-					Width: 336
+					Width: 475
 					Height: 25
-					X: 190
-					Y: 0
+					Visible: false
+					Children:
+						Checkbox@TOGGLE_SPECTATORS:
+							Font: Regular
+							Width: 165
+							Height: 20
+							X: 15
+							Y: 0
+							Text: Allow Spectators?
+						Button@SPECTATE:
+							Text: Spectate
+							Font: Regular
+							Width: 336
+							Height: 25
+							X: 190
+							Y: 0
 
 ScrollPanel@FACTION_DROPDOWN_TEMPLATE:
 	Width: DROPDOWN_WIDTH
diff --git a/mods/ra/chrome/lobby.yaml b/mods/ra/chrome/lobby.yaml
index 62fbe85d35..62d927bfd8 100644
--- a/mods/ra/chrome/lobby.yaml
+++ b/mods/ra/chrome/lobby.yaml
@@ -16,52 +16,6 @@ Background@SERVER_LOBBY:
 		Container@MAP_PREVIEW_ROOT:
 			Width: PARENT_RIGHT
 			Height: PARENT_BOTTOM
-		Container@LABEL_CONTAINER:
-			X: 25
-			Y: 40
-			Children:
-				Label@LABEL_LOBBY_NAME:
-					X: 0
-					Width: 180
-					Height: 25
-					Text: Name
-					Align: Center
-					Font: Bold
-				Label@LABEL_LOBBY_COLOR:
-					X: 190
-					Width: 80
-					Height: 25
-					Text: Color
-					Align: Center
-					Font: Bold
-				Label@LABEL_LOBBY_FACTION:
-					X: 280
-					Width: 130
-					Height: 25
-					Text: Faction
-					Align: Center
-					Font: Bold
-				Label@LABEL_LOBBY_TEAM:
-					X: 420
-					Width: 48
-					Height: 25
-					Text: Team
-					Align: Center
-					Font: Bold
-				Label@LABEL_LOBBY_SPAWN:
-					X: 478
-					Width: 48
-					Height: 25
-					Text: Spawn
-					Align: Center
-					Font: Bold
-				Label@LABEL_LOBBY_STATUS:
-					X: 535
-					Width: 20
-					Height: 25
-					Text: Ready
-					Align: Left
-					Font: Bold
 		Container@PLAYER_BIN_ROOT:
 		DropDownButton@SLOTS_DROPDOWNBUTTON:
 			X: 20