diff --git a/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
index 23f688d9ab..c7e4930079 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("TOP_PANELS_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");
@@ -275,7 +273,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				};
 			}
 
-			var optionsBin = Ui.LoadWidget("LOBBY_OPTIONS_BIN", lobby, new WidgetArgs());
+			var optionsBin = Ui.LoadWidget("LOBBY_OPTIONS_BIN", lobby.Get("TOP_PANELS_ROOT"), new WidgetArgs());
 			optionsBin.IsVisible = () => panel == PanelType.Options;
 
 			var optionsButton = lobby.Get<ButtonWidget>("OPTIONS_BUTTON");
@@ -305,7 +303,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				};
 			}
 
-			var forceStartBin = Ui.LoadWidget("FORCE_START_DIALOG", lobby, new WidgetArgs());
+			var forceStartBin = Ui.LoadWidget("FORCE_START_DIALOG", lobby.Get("TOP_PANELS_ROOT"), new WidgetArgs());
 			forceStartBin.IsVisible = () => panel == PanelType.ForceStart;
 			forceStartBin.Get("KICK_WARNING").IsVisible = () => orderManager.LobbyInfo.Clients.Any(c => c.IsInvalid);
 			forceStartBin.Get<ButtonWidget>("OK_BUTTON").OnClick = startGame;
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs b/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs
index d39933f368..4d796f5fa3 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs
@@ -330,7 +330,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			{
 				before();
 
-				Game.LoadWidget(null, "KICK_CLIENT_DIALOG", lobby, new WidgetArgs
+				Game.LoadWidget(null, "KICK_CLIENT_DIALOG", lobby.Get("TOP_PANELS_ROOT"), new WidgetArgs
 				{
 					{ "clientName", c.Name },
 					{ "okPressed", okPressed },
@@ -364,7 +364,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				var spectatorCount = orderManager.LobbyInfo.Clients.Count(c => c.IsObserver);
 				if (spectatorCount > 0)
 				{
-					Game.LoadWidget(null, "KICK_SPECTATORS_DIALOG", lobby, new WidgetArgs
+					Game.LoadWidget(null, "KICK_SPECTATORS_DIALOG", lobby.Get("TOP_PANELS_ROOT"), new WidgetArgs
 					{
 						{ "clientCount", "{0}".F(spectatorCount) },
 						{ "okPressed", okPressed },
diff --git a/mods/cnc/chrome/lobby-dialogs.yaml b/mods/cnc/chrome/lobby-dialogs.yaml
deleted file mode 100644
index 183b8494bc..0000000000
--- a/mods/cnc/chrome/lobby-dialogs.yaml
+++ /dev/null
@@ -1,281 +0,0 @@
-Background@KICK_CLIENT_DIALOG:
-	X: 15
-	Y: 30
-	Width: 501
-	Height: 219
-	Logic: KickClientLogic
-	Background: scrollpanel-bg
-	Children:
-		Label@TITLE:
-			X: 0
-			Y: 40
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Bold
-			Align: Center
-		Label@TEXTA:
-			X: 0
-			Y: 67
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Regular
-			Align: Center
-			Text: You may also apply a temporary ban, preventing
-		Label@TEXTB:
-			X: 0
-			Y: 85
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Regular
-			Align: Center
-			Text: them from joining for the remainder of this game.
-		Checkbox@PREVENT_REJOINING_CHECKBOX:
-			X: (PARENT_RIGHT - WIDTH)/2
-			Y: 120
-			Width: 150
-			Height: 20
-			Font: Regular
-			Text: Temporarily Ban
-		Button@OK_BUTTON:
-			X: (PARENT_RIGHT - WIDTH)/2 + 75
-			Y: 155
-			Width: 120
-			Height: 25
-			Text: Kick
-			Font: Bold
-		Button@CANCEL_BUTTON:
-			X: (PARENT_RIGHT - WIDTH)/2 - 75
-			Y: 155
-			Width: 120
-			Height: 25
-			Text: Cancel
-			Font: Bold
-
-Background@KICK_SPECTATORS_DIALOG:
-	X: 15
-	Y: 30
-	Width: 501
-	Height: 219
-	Logic: KickSpectatorsLogic
-	Background: scrollpanel-bg
-	Children:
-		Label@TITLE:
-			X: 0
-			Y: 40
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Bold
-			Align: Center
-			Text: Kick Spectators
-		Label@TEXT:
-			X: 0
-			Y: 85
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Regular
-			Align: Center
-		Button@OK_BUTTON:
-			X: (PARENT_RIGHT - WIDTH)/2 + 75
-			Y: 155
-			Width: 120
-			Height: 25
-			Text: Ok
-			Font: Bold
-		Button@CANCEL_BUTTON:
-			X: (PARENT_RIGHT - WIDTH)/2 - 75
-			Y: 155
-			Width: 120
-			Height: 25
-			Text: Cancel
-			Font: Bold
-
-Background@LOBBY_OPTIONS_BIN:
-	X: 15
-	Y: 30
-	Width: 556
-	Height: 219
-	Background: scrollpanel-bg
-	Children:
-		Label@TITLE:
-			X: 0
-			Y: 0 - 25
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Bold
-			Align: Center
-			Text: Map Options
-		Container:
-			X: 30
-			Y: 30
-			Width: PARENT_RIGHT-60
-			Height: PARENT_BOTTOM-75
-			Children:
-				Checkbox@EXPLORED_MAP_CHECKBOX:
-					Width: 230
-					Height: 20
-					Font: Regular
-					Text: Explored Map
-				Checkbox@FOG_CHECKBOX:
-					Y: 35
-					Width: 230
-					Height: 20
-					Font: Regular
-					Text: Fog of War
-				Checkbox@CRATES_CHECKBOX:
-					X: 140
-					Width: 230
-					Height: 20
-					Font: Regular
-					Text: Crates
-				Checkbox@ALLYBUILDRADIUS_CHECKBOX:
-					X: 140
-					Y: 35
-					Width: 230
-					Height: 20
-					Font: Regular
-					Text: Build off Allies' ConYards
-				Checkbox@SHORTGAME_CHECKBOX:
-					X: 365
-					Width: 230
-					Height: 20
-					Font: Regular
-					Text: Short Game
-				Checkbox@ALLOWCHEATS_CHECKBOX:
-					X: 365
-					Y: 35
-					Width: 230
-					Height: 20
-					Font: Regular
-					Text: Debug Menu
-				Label@STARTINGCASH_DESC:
-					X: 10
-					Y: 72
-					Width: 70
-					Height: 25
-					Font: Regular
-					Text: Starting Cash:
-					Align: Right
-				DropDownButton@STARTINGCASH_DROPDOWNBUTTON:
-					X: 85
-					Y: 72
-					Width: 120
-					Height: 25
-					Font: Regular
-					Text: $5000
-				Label@STARTINGUNITS_DESC:
-					X: PARENT_RIGHT - WIDTH - 135
-					Y: 72
-					Width: 120
-					Height: 25
-					Text: Starting Units:
-					Align: Right
-				DropDownButton@STARTINGUNITS_DROPDOWNBUTTON:
-					X: PARENT_RIGHT - WIDTH + 10
-					Y: 72
-					Width: 140
-					Height: 25
-					Font: Regular
-				DropDownButton@TECHLEVEL_DROPDOWNBUTTON:
-					X: 85
-					Y: 112
-					Width: 120
-					Height: 25
-					Font: Regular
-					Text: 10
-				Label@TECHLEVEL_DESC:
-					Y: 112
-					Width: 80
-					Height: 25
-					Text: Tech Level:
-					Align: Right
-				Label@GAMESPEED_DESC:
-					X: PARENT_RIGHT - WIDTH - 135
-					Y: 112
-					Width: 120
-					Height: 25
-					Text: Game Speed:
-					Align: Right
-				DropDownButton@GAMESPEED_DROPDOWNBUTTON:
-					X: PARENT_RIGHT - WIDTH + 10
-					Y: 112
-					Width: 140
-					Height: 25
-					Font: Regular
-				Label@DIFFICULTY_DESC:
-					X: PARENT_RIGHT - WIDTH - 135
-					Y: 152
-					Width: 120
-					Height: 25
-					Text: Mission Difficulty:
-					Align: Right
-				DropDownButton@DIFFICULTY_DROPDOWNBUTTON:
-					X: PARENT_RIGHT - WIDTH + 10
-					Y: 152
-					Width: 140
-					Height: 25
-					Font: Regular
-Background@FORCE_START_DIALOG:
-	X: 15
-	Y: 30
-	Width: 556
-	Height: 219
-	Background: scrollpanel-bg
-	Children:
-		Label@TITLE:
-			X: 0
-			Y: 40
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Bold
-			Align: Center
-			Text: Start Game?
-		Label@TEXTA:
-			X: 0
-			Y: 67
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Regular
-			Align: Center
-			Text: One or more players are not yet ready.
-		Label@TEXTB:
-			X: 0
-			Y: 85
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Regular
-			Align: Center
-			Text: Are you sure that you want to force start the game?
-		Container@KICK_WARNING:
-			Width: PARENT_RIGHT
-			Children:
-				Label@KICK_WARNING_A:
-					X: 0
-					Y: 106
-					Width: PARENT_RIGHT
-					Height: 25
-					Font: Bold
-					Align: Center
-					Text: One or more clients are missing the selected
-				Label@KICK_WARNING_B:
-					X: 0
-					Y: 123
-					Width: PARENT_RIGHT
-					Height: 25
-					Font: Bold
-					Align: Center
-					Text: map, and will be kicked from the server.
-		Button@OK_BUTTON:
-			X: (PARENT_RIGHT - WIDTH)/2 + 75
-			Y: 155
-			Width: 120
-			Height: 25
-			Text: Start
-			Font: Bold
-		Button@CANCEL_BUTTON:
-			X: (PARENT_RIGHT - WIDTH)/2 - 75
-			Y: 155
-			Width: 120
-			Height: 25
-			Text: Cancel
-			Font: Bold
-
diff --git a/mods/cnc/chrome/lobby-kickdialogs.yaml b/mods/cnc/chrome/lobby-kickdialogs.yaml
new file mode 100644
index 0000000000..0eea66c383
--- /dev/null
+++ b/mods/cnc/chrome/lobby-kickdialogs.yaml
@@ -0,0 +1,139 @@
+Background@KICK_CLIENT_DIALOG:
+	Width: PARENT_RIGHT
+	Height: PARENT_BOTTOM
+	Logic: KickClientLogic
+	Background: scrollpanel-bg
+	Children:
+		Label@TITLE:
+			Y: 40
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Bold
+			Align: Center
+		Label@TEXTA:
+			Y: 67
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Regular
+			Align: Center
+			Text: You may also apply a temporary ban, preventing
+		Label@TEXTB:
+			Y: 85
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Regular
+			Align: Center
+			Text: them from joining for the remainder of this game.
+		Checkbox@PREVENT_REJOINING_CHECKBOX:
+			X: (PARENT_RIGHT - WIDTH)/2
+			Y: 120
+			Width: 150
+			Height: 20
+			Font: Regular
+			Text: Temporarily Ban
+		Button@OK_BUTTON:
+			X: (PARENT_RIGHT - WIDTH)/2 + 75
+			Y: 155
+			Width: 120
+			Height: 25
+			Text: Kick
+			Font: Bold
+		Button@CANCEL_BUTTON:
+			X: (PARENT_RIGHT - WIDTH)/2 - 75
+			Y: 155
+			Width: 120
+			Height: 25
+			Text: Cancel
+			Font: Bold
+Background@KICK_SPECTATORS_DIALOG:
+	Width: PARENT_RIGHT
+	Height: PARENT_BOTTOM
+	Logic: KickSpectatorsLogic
+	Background: scrollpanel-bg
+	Children:
+		Label@TITLE:
+			Y: 40
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Bold
+			Align: Center
+			Text: Kick Spectators
+		Label@TEXT:
+			Y: 85
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Regular
+			Align: Center
+		Button@OK_BUTTON:
+			X: (PARENT_RIGHT - WIDTH)/2 + 75
+			Y: 155
+			Width: 120
+			Height: 25
+			Text: Ok
+			Font: Bold
+		Button@CANCEL_BUTTON:
+			X: (PARENT_RIGHT - WIDTH)/2 - 75
+			Y: 155
+			Width: 120
+			Height: 25
+			Text: Cancel
+			Font: Bold
+Background@FORCE_START_DIALOG:
+	Width: PARENT_RIGHT
+	Height: PARENT_BOTTOM
+	Background: scrollpanel-bg
+	Children:
+		Label@TITLE:
+			Y: 40
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Bold
+			Align: Center
+			Text: Start Game?
+		Label@TEXTA:
+			Y: 67
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Regular
+			Align: Center
+			Text: One or more players are not yet ready.
+		Label@TEXTB:
+			Y: 85
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Regular
+			Align: Center
+			Text: Are you sure that you want to force start the game?
+		Container@KICK_WARNING:
+			Width: PARENT_RIGHT
+			Children:
+				Label@KICK_WARNING_A:
+					X: 0
+					Y: 106
+					Width: PARENT_RIGHT
+					Height: 25
+					Font: Bold
+					Align: Center
+					Text: One or more clients are missing the selected
+				Label@KICK_WARNING_B:
+					X: 0
+					Y: 123
+					Width: PARENT_RIGHT
+					Height: 25
+					Font: Bold
+					Align: Center
+					Text: map, and will be kicked from the server.
+		Button@OK_BUTTON:
+			X: (PARENT_RIGHT - WIDTH)/2 + 75
+			Y: 155
+			Width: 120
+			Height: 25
+			Text: Start
+			Font: Bold
+		Button@CANCEL_BUTTON:
+			X: (PARENT_RIGHT - WIDTH)/2 - 75
+			Y: 155
+			Width: 120
+			Height: 25
+			Text: Cancel
+			Font: Bold
diff --git a/mods/cnc/chrome/lobby-mappreview.yaml b/mods/cnc/chrome/lobby-mappreview.yaml
index a6de873ac6..4014fafccd 100644
--- a/mods/cnc/chrome/lobby-mappreview.yaml
+++ b/mods/cnc/chrome/lobby-mappreview.yaml
@@ -1,9 +1,7 @@
 Container@LOBBY_MAP_PREVIEW:
 	Logic: LobbyMapPreviewLogic
-	X: PARENT_RIGHT-15-WIDTH
-	Y: 30
-	Width: 194
-	Height: 250
+	Width: PARENT_RIGHT
+	Height: PARENT_BOTTOM
 	Children:
 		Container@MAP_AVAILABLE:
 			Width: PARENT_RIGHT
diff --git a/mods/cnc/chrome/lobby-options.yaml b/mods/cnc/chrome/lobby-options.yaml
new file mode 100644
index 0000000000..07316ef02a
--- /dev/null
+++ b/mods/cnc/chrome/lobby-options.yaml
@@ -0,0 +1,122 @@
+Background@LOBBY_OPTIONS_BIN:
+	Width: PARENT_RIGHT
+	Height: PARENT_BOTTOM
+	Background: scrollpanel-bg
+	Children:
+		Label@TITLE:
+			Y: 0 - 25
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Bold
+			Align: Center
+			Text: Map Options
+		Container:
+			X: 30
+			Y: 30
+			Width: PARENT_RIGHT-60
+			Height: PARENT_BOTTOM-75
+			Children:
+				Checkbox@EXPLORED_MAP_CHECKBOX:
+					Width: 230
+					Height: 20
+					Font: Regular
+					Text: Explored Map
+				Checkbox@FOG_CHECKBOX:
+					Y: 35
+					Width: 230
+					Height: 20
+					Font: Regular
+					Text: Fog of War
+				Checkbox@CRATES_CHECKBOX:
+					X: 140
+					Width: 230
+					Height: 20
+					Font: Regular
+					Text: Crates
+				Checkbox@ALLYBUILDRADIUS_CHECKBOX:
+					X: 140
+					Y: 35
+					Width: 230
+					Height: 20
+					Font: Regular
+					Text: Build off Allies' ConYards
+				Checkbox@SHORTGAME_CHECKBOX:
+					X: 365
+					Width: 230
+					Height: 20
+					Font: Regular
+					Text: Short Game
+				Checkbox@ALLOWCHEATS_CHECKBOX:
+					X: 365
+					Y: 35
+					Width: 230
+					Height: 20
+					Font: Regular
+					Text: Debug Menu
+				Label@STARTINGCASH_DESC:
+					X: 10
+					Y: 72
+					Width: 70
+					Height: 25
+					Font: Regular
+					Text: Starting Cash:
+					Align: Right
+				DropDownButton@STARTINGCASH_DROPDOWNBUTTON:
+					X: 85
+					Y: 72
+					Width: 120
+					Height: 25
+					Font: Regular
+					Text: $5000
+				Label@STARTINGUNITS_DESC:
+					X: PARENT_RIGHT - WIDTH - 135
+					Y: 72
+					Width: 120
+					Height: 25
+					Text: Starting Units:
+					Align: Right
+				DropDownButton@STARTINGUNITS_DROPDOWNBUTTON:
+					X: PARENT_RIGHT - WIDTH + 10
+					Y: 72
+					Width: 140
+					Height: 25
+					Font: Regular
+				DropDownButton@TECHLEVEL_DROPDOWNBUTTON:
+					X: 85
+					Y: 112
+					Width: 120
+					Height: 25
+					Font: Regular
+					Text: 10
+				Label@TECHLEVEL_DESC:
+					Y: 112
+					Width: 80
+					Height: 25
+					Text: Tech Level:
+					Align: Right
+				Label@GAMESPEED_DESC:
+					X: PARENT_RIGHT - WIDTH - 135
+					Y: 112
+					Width: 120
+					Height: 25
+					Text: Game Speed:
+					Align: Right
+				DropDownButton@GAMESPEED_DROPDOWNBUTTON:
+					X: PARENT_RIGHT - WIDTH + 10
+					Y: 112
+					Width: 140
+					Height: 25
+					Font: Regular
+				Label@DIFFICULTY_DESC:
+					X: PARENT_RIGHT - WIDTH - 135
+					Y: 152
+					Width: 120
+					Height: 25
+					Text: Mission Difficulty:
+					Align: Right
+				DropDownButton@DIFFICULTY_DROPDOWNBUTTON:
+					X: PARENT_RIGHT - WIDTH + 10
+					Y: 152
+					Width: 140
+					Height: 25
+					Font: Regular
diff --git a/mods/cnc/chrome/lobby-playerbin.yaml b/mods/cnc/chrome/lobby-playerbin.yaml
deleted file mode 100644
index 0c4aa4b24a..0000000000
--- a/mods/cnc/chrome/lobby-playerbin.yaml
+++ /dev/null
@@ -1,339 +0,0 @@
-ScrollPanel@LOBBY_PLAYER_BIN:
-	X: 15
-	Y: 30
-	Width: 556
-	Height: 219
-	TopBottomSpacing: 5
-	ItemSpacing: 5
-	Children:
-		Container@TEMPLATE_EDITABLE_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
-				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: 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
-				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
-					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
-			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
-					Height: 25
-					X: 210
-					Y: 0
-
diff --git a/mods/cnc/chrome/lobby-players.yaml b/mods/cnc/chrome/lobby-players.yaml
new file mode 100644
index 0000000000..dc05ea8e6b
--- /dev/null
+++ b/mods/cnc/chrome/lobby-players.yaml
@@ -0,0 +1,387 @@
+Container@LOBBY_PLAYER_BIN:
+	Width: PARENT_RIGHT
+	Height: PARENT_BOTTOM
+	Children:
+		Container@LABEL_CONTAINER:
+			X: 5
+			Y: 0-25
+			Width: PARENT_RIGHT
+			Height: PARENT_BOTTOM
+			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
+		ScrollPanel@LOBBY_PLAYERS:
+			Width: PARENT_RIGHT
+			Height: PARENT_BOTTOM
+			TopBottomSpacing: 5
+			ItemSpacing: 5
+			Children:
+				Container@TEMPLATE_EDITABLE_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
+						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: 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
+						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
+							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
+					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
+							Height: 25
+							X: 210
+							Y: 0
diff --git a/mods/cnc/chrome/lobby.yaml b/mods/cnc/chrome/lobby.yaml
index 4b6cf31c3e..b5a6088293 100644
--- a/mods/cnc/chrome/lobby.yaml
+++ b/mods/cnc/chrome/lobby.yaml
@@ -18,54 +18,15 @@ Container@SERVER_LOBBY:
 			Background: panel-black
 			Children:
 				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:
+					X: PARENT_RIGHT-15-WIDTH
+					Y: 30
+					Width: 194
+					Height: 250
+				Container@TOP_PANELS_ROOT:
+					X: 15
+					Y: 30
+					Width: 556
+					Height: 219
 				DropDownButton@SLOTS_DROPDOWNBUTTON:
 					X: 15
 					Y: 254
diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml
index 8bbcfa44b0..147a4fc4f0 100644
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -96,8 +96,9 @@ ChromeLayout:
 	./mods/cnc/chrome/directconnect.yaml
 	./mods/cnc/chrome/lobby.yaml
 	./mods/cnc/chrome/lobby-mappreview.yaml
-	./mods/cnc/chrome/lobby-playerbin.yaml
-	./mods/cnc/chrome/lobby-dialogs.yaml
+	./mods/cnc/chrome/lobby-players.yaml
+	./mods/cnc/chrome/lobby-options.yaml
+	./mods/cnc/chrome/lobby-kickdialogs.yaml
 	./mods/cnc/chrome/connection.yaml
 	./mods/cnc/chrome/color-picker.yaml
 	./mods/cnc/chrome/mapchooser.yaml
diff --git a/mods/d2k/chrome/lobby-dialogs.yaml b/mods/d2k/chrome/lobby-dialogs.yaml
deleted file mode 100644
index 614777b41a..0000000000
--- a/mods/d2k/chrome/lobby-dialogs.yaml
+++ /dev/null
@@ -1,284 +0,0 @@
-Background@KICK_CLIENT_DIALOG:
-	X: 20
-	Y: 67
-	Width: 535
-	Height: 235
-	Logic: KickClientLogic
-	Background: dialog3
-	Children:
-		Label@TITLE:
-			X: 0
-			Y: 40
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Bold
-			Align: Center
-		Label@TEXTA:
-			X: 0
-			Y: 67
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Regular
-			Align: Center
-			Text: You may also apply a temporary ban, preventing
-		Label@TEXTB:
-			X: 0
-			Y: 85
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Regular
-			Align: Center
-			Text: them from joining for the remainder of this game.
-		Checkbox@PREVENT_REJOINING_CHECKBOX:
-			X: (PARENT_RIGHT - WIDTH)/2
-			Y: 120
-			Width: 150
-			Height: 20
-			Text: Temporarily Ban
-		Button@OK_BUTTON:
-			X: (PARENT_RIGHT - WIDTH)/2 + 75
-			Y: 155
-			Width: 120
-			Height: 25
-			Text: Kick
-			Font: Bold
-		Button@CANCEL_BUTTON:
-			X: (PARENT_RIGHT - WIDTH)/2 - 75
-			Y: 155
-			Width: 120
-			Height: 25
-			Text: Cancel
-			Font: Bold
-
-Background@KICK_SPECTATORS_DIALOG:
-	X: 20
-	Y: 67
-	Width: 535
-	Height: 235
-	Logic: KickSpectatorsLogic
-	Background: dialog3
-	Children:
-		Label@TITLE:
-			X: 0
-			Y: 40
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Bold
-			Align: Center
-			Text: Kick Spectators
-		Label@TEXT:
-			X: 0
-			Y: 85
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Regular
-			Align: Center
-		Button@OK_BUTTON:
-			X: (PARENT_RIGHT - WIDTH)/2 + 75
-			Y: 155
-			Width: 120
-			Height: 25
-			Text: Ok
-			Font: Bold
-		Button@CANCEL_BUTTON:
-			X: (PARENT_RIGHT - WIDTH)/2 - 75
-			Y: 155
-			Width: 120
-			Height: 25
-			Text: Cancel
-			Font: Bold
-
-Background@LOBBY_OPTIONS_BIN:
-	X: 20
-	Y: 67
-	Width: 593
-	Height: 235
-	Background: dialog3
-	Children:
-		Label@TITLE:
-			X: 0
-			Y: 0 - 27
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Bold
-			Align: Center
-			Text: Map Options
-		Container:
-			X: 30
-			Y: 30
-			Width: PARENT_RIGHT-60
-			Height: PARENT_BOTTOM-75
-			Children:
-				Checkbox@EXPLORED_MAP_CHECKBOX:
-					Width: 140
-					Height: 20
-					Text: Explored Map
-				Checkbox@FOG_CHECKBOX:
-					Y: 35
-					Width: 140
-					Height: 20
-					Text: Fog of War
-				Checkbox@SHORTGAME_CHECKBOX:
-					X: 150
-					Width: 140
-					Height: 20
-					Text: Short Game
-				Checkbox@CRATES_CHECKBOX:
-					X: 150
-					Y: 35
-					Width: 140
-					Height: 20
-					Text: Crates
-				Checkbox@ALLYBUILDRADIUS_CHECKBOX:
-					X: 290
-					Width: 140
-					Height: 20
-					Text: Build off Allies' ConYards
-				Checkbox@FRAGILEALLIANCES_CHECKBOX:
-					X: 290
-					Y: 35
-					Width: 140
-					Height: 20
-					Text: Diplomacy Changes
-				Checkbox@CREEPS_CHECKBOX:
-					Y: 70
-					Width: 140
-					Height: 20
-					Text: Worms
-				Checkbox@ALLOWCHEATS_CHECKBOX:
-					X: 150
-					Y: 70
-					Width: 140
-					Height: 20
-					Text: Debug Menu
-				Label@DIFFICULTY_DESC:
-					X: PARENT_RIGHT - WIDTH - 145
-					Y: 70
-					Width: 120
-					Height: 25
-					Text: Mission Difficulty:
-					Align: Right
-				DropDownButton@DIFFICULTY_DROPDOWNBUTTON:
-					X: PARENT_RIGHT - WIDTH
-					Y: 70
-					Width: 140
-					Height: 25
-					Font: Regular
-				Label@STARTINGCASH_DESC:
-					Y: 110
-					Width: 80
-					Height: 25
-					Text: Starting Cash:
-					Align: Right
-				DropDownButton@STARTINGCASH_DROPDOWNBUTTON:
-					X: 85
-					Y: 110
-					Width: 130
-					Height: 25
-					Font: Regular
-					Text: $5000
-				Label@STARTINGUNITS_DESC:
-					X: PARENT_RIGHT - WIDTH - 145
-					Y: 110
-					Width: 120
-					Height: 25
-					Text: Starting Units:
-					Align: Right
-				DropDownButton@STARTINGUNITS_DROPDOWNBUTTON:
-					X: PARENT_RIGHT - WIDTH
-					Y: 110
-					Width: 140
-					Height: 25
-					Font: Regular
-				DropDownButton@TECHLEVEL_DROPDOWNBUTTON:
-					X: 85
-					Y: 150
-					Width: 130
-					Height: 25
-					Font: Regular
-					Text: 10
-				Label@TECHLEVEL_DESC:
-					Y: 150
-					Width: 80
-					Height: 25
-					Text: Tech Level:
-					Align: Right
-				Label@GAMESPEED_DESC:
-					X: PARENT_RIGHT - WIDTH - 145
-					Y: 150
-					Width: 120
-					Height: 25
-					Text: Game Speed:
-					Align: Right
-				DropDownButton@GAMESPEED_DROPDOWNBUTTON:
-					X: PARENT_RIGHT - WIDTH
-					Y: 150
-					Width: 140
-					Height: 25
-					Font: Regular
-
-Background@FORCE_START_DIALOG:
-	X: 20
-	Y: 67
-	Width: 593
-	Height: 235
-	Background: dialog3
-	Children:
-		Label@TITLE:
-			X: 0
-			Y: 40
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Bold
-			Align: Center
-			Text: Start Game?
-		Label@TEXTA:
-			X: 0
-			Y: 67
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Regular
-			Align: Center
-			Text: One or more players are not yet ready.
-		Label@TEXTB:
-			X: 0
-			Y: 85
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Regular
-			Align: Center
-			Text: Are you sure that you want to force start the game?
-		Container@KICK_WARNING:
-			Width: PARENT_RIGHT
-			Children:
-				Label@KICK_WARNING_A:
-					X: 0
-					Y: 106
-					Width: PARENT_RIGHT
-					Height: 25
-					Font: Bold
-					Align: Center
-					Text: One or more clients are missing the selected
-				Label@KICK_WARNING_B:
-					X: 0
-					Y: 123
-					Width: PARENT_RIGHT
-					Height: 25
-					Font: Bold
-					Align: Center
-					Text: map, and will be kicked from the server.
-		Button@OK_BUTTON:
-			X: (PARENT_RIGHT - WIDTH)/2 + 75
-			Y: 155
-			Width: 120
-			Height: 25
-			Text: Start
-			Font: Bold
-		Button@CANCEL_BUTTON:
-			X: (PARENT_RIGHT - WIDTH)/2 - 75
-			Y: 155
-			Width: 120
-			Height: 25
-			Text: Cancel
-			Font: Bold
-
diff --git a/mods/d2k/chrome/lobby-options.yaml b/mods/d2k/chrome/lobby-options.yaml
new file mode 100644
index 0000000000..46b4b76476
--- /dev/null
+++ b/mods/d2k/chrome/lobby-options.yaml
@@ -0,0 +1,126 @@
+Background@LOBBY_OPTIONS_BIN:
+	Width: PARENT_RIGHT
+	Height: PARENT_BOTTOM
+	Background: dialog3
+	Children:
+		Label@TITLE:
+			X: 0
+			Y: 0 - 27
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Bold
+			Align: Center
+			Text: Map Options
+		Container:
+			X: 30
+			Y: 30
+			Width: PARENT_RIGHT-60
+			Height: PARENT_BOTTOM-75
+			Children:
+				Checkbox@EXPLORED_MAP_CHECKBOX:
+					Width: 140
+					Height: 20
+					Text: Explored Map
+				Checkbox@FOG_CHECKBOX:
+					Y: 35
+					Width: 140
+					Height: 20
+					Text: Fog of War
+				Checkbox@SHORTGAME_CHECKBOX:
+					X: 150
+					Width: 140
+					Height: 20
+					Text: Short Game
+				Checkbox@CRATES_CHECKBOX:
+					X: 150
+					Y: 35
+					Width: 140
+					Height: 20
+					Text: Crates
+				Checkbox@ALLYBUILDRADIUS_CHECKBOX:
+					X: 290
+					Width: 140
+					Height: 20
+					Text: Build off Allies' ConYards
+				Checkbox@FRAGILEALLIANCES_CHECKBOX:
+					X: 290
+					Y: 35
+					Width: 140
+					Height: 20
+					Text: Diplomacy Changes
+				Checkbox@CREEPS_CHECKBOX:
+					Y: 70
+					Width: 140
+					Height: 20
+					Text: Worms
+				Checkbox@ALLOWCHEATS_CHECKBOX:
+					X: 150
+					Y: 70
+					Width: 140
+					Height: 20
+					Text: Debug Menu
+				Label@DIFFICULTY_DESC:
+					X: PARENT_RIGHT - WIDTH - 145
+					Y: 70
+					Width: 120
+					Height: 25
+					Text: Mission Difficulty:
+					Align: Right
+				DropDownButton@DIFFICULTY_DROPDOWNBUTTON:
+					X: PARENT_RIGHT - WIDTH
+					Y: 70
+					Width: 140
+					Height: 25
+					Font: Regular
+				Label@STARTINGCASH_DESC:
+					Y: 110
+					Width: 80
+					Height: 25
+					Text: Starting Cash:
+					Align: Right
+				DropDownButton@STARTINGCASH_DROPDOWNBUTTON:
+					X: 85
+					Y: 110
+					Width: 130
+					Height: 25
+					Font: Regular
+					Text: $5000
+				Label@STARTINGUNITS_DESC:
+					X: PARENT_RIGHT - WIDTH - 145
+					Y: 110
+					Width: 120
+					Height: 25
+					Text: Starting Units:
+					Align: Right
+				DropDownButton@STARTINGUNITS_DROPDOWNBUTTON:
+					X: PARENT_RIGHT - WIDTH
+					Y: 110
+					Width: 140
+					Height: 25
+					Font: Regular
+				DropDownButton@TECHLEVEL_DROPDOWNBUTTON:
+					X: 85
+					Y: 150
+					Width: 130
+					Height: 25
+					Font: Regular
+					Text: 10
+				Label@TECHLEVEL_DESC:
+					Y: 150
+					Width: 80
+					Height: 25
+					Text: Tech Level:
+					Align: Right
+				Label@GAMESPEED_DESC:
+					X: PARENT_RIGHT - WIDTH - 145
+					Y: 150
+					Width: 120
+					Height: 25
+					Text: Game Speed:
+					Align: Right
+				DropDownButton@GAMESPEED_DROPDOWNBUTTON:
+					X: PARENT_RIGHT - WIDTH
+					Y: 150
+					Width: 140
+					Height: 25
+					Font: Regular
diff --git a/mods/d2k/chrome/lobby-playerbin.yaml b/mods/d2k/chrome/lobby-playerbin.yaml
deleted file mode 100644
index cc429c05e9..0000000000
--- a/mods/d2k/chrome/lobby-playerbin.yaml
+++ /dev/null
@@ -1,365 +0,0 @@
-ScrollPanel@LOBBY_PLAYER_BIN:
-	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@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
-				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
-					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
-			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
-					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
-					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
-			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
-					Height: 25
-					X: 190
-					Y: 0
-
-ScrollPanel@FACTION_DROPDOWN_TEMPLATE:
-	Width: DROPDOWN_WIDTH
-	Children:
-		ScrollItem@HEADER:
-			BaseName: scrollheader
-			Width: PARENT_RIGHT-27
-			Height: 13
-			X: 2
-			Y: 0
-			Visible: false
-			Children:
-				Label@LABEL:
-					Font: TinyBold
-					Width: PARENT_RIGHT
-					Height: 10
-					Align: Center
-		ScrollItem@TEMPLATE:
-			Width: PARENT_RIGHT-27
-			Height: 25
-			X: 2
-			Y: 0
-			Visible: false
-			TooltipContainer: TOOLTIP_CONTAINER
-			TooltipTemplate: FACTION_DESCRIPTION_TOOLTIP
-			Children:
-				Image@FLAG:
-					X: 2
-					Y: 2
-					Width: 30
-					Height: 15
-				Label@LABEL:
-					X: 30
-					Width: 70
-					Height: 25
-
diff --git a/mods/d2k/chrome/lobby-players.yaml b/mods/d2k/chrome/lobby-players.yaml
new file mode 100644
index 0000000000..bd0b74b2b2
--- /dev/null
+++ b/mods/d2k/chrome/lobby-players.yaml
@@ -0,0 +1,415 @@
+Container@LOBBY_PLAYER_BIN:
+	Width: PARENT_RIGHT
+	Height: PARENT_BOTTOM
+	Children:
+		Container@LABEL_CONTAINER:
+			X: 5
+			Y: 0-27
+			Width: PARENT_RIGHT
+			Height: PARENT_BOTTOM
+			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
+		ScrollPanel@LOBBY_PLAYERS:
+			Width: PARENT_RIGHT
+			Height: PARENT_BOTTOM
+			TopBottomSpacing: 5
+			ItemSpacing: 5
+			Children:
+				Container@TEMPLATE_EDITABLE_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
+						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
+							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
+					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
+							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
+							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
+					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
+							Height: 25
+							X: 190
+							Y: 0
+
+ScrollPanel@FACTION_DROPDOWN_TEMPLATE:
+	Width: DROPDOWN_WIDTH
+	Children:
+		ScrollItem@HEADER:
+			BaseName: scrollheader
+			Width: PARENT_RIGHT-27
+			Height: 13
+			X: 2
+			Y: 0
+			Visible: false
+			Children:
+				Label@LABEL:
+					Font: TinyBold
+					Width: PARENT_RIGHT
+					Height: 10
+					Align: Center
+		ScrollItem@TEMPLATE:
+			Width: PARENT_RIGHT-27
+			Height: 25
+			X: 2
+			Y: 0
+			Visible: false
+			TooltipContainer: TOOLTIP_CONTAINER
+			TooltipTemplate: FACTION_DESCRIPTION_TOOLTIP
+			Children:
+				Image@FLAG:
+					X: 2
+					Y: 2
+					Width: 30
+					Height: 15
+				Label@LABEL:
+					X: 30
+					Width: 70
+					Height: 25
+
diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml
index 3688479571..345fec1a1d 100644
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -86,8 +86,9 @@ ChromeLayout:
 	./mods/ra/chrome/credits.yaml
 	./mods/ra/chrome/lobby.yaml
 	./mods/ra/chrome/lobby-mappreview.yaml
-	./mods/d2k/chrome/lobby-playerbin.yaml
-	./mods/d2k/chrome/lobby-dialogs.yaml
+	./mods/d2k/chrome/lobby-players.yaml
+	./mods/d2k/chrome/lobby-options.yaml
+	./mods/ra/chrome/lobby-kickdialogs.yaml
 	./mods/d2k/chrome/color-picker.yaml
 	./mods/ra/chrome/map-chooser.yaml
 	./mods/ra/chrome/create-server.yaml
diff --git a/mods/ra/chrome/lobby-dialogs.yaml b/mods/ra/chrome/lobby-dialogs.yaml
deleted file mode 100644
index efa06a8a20..0000000000
--- a/mods/ra/chrome/lobby-dialogs.yaml
+++ /dev/null
@@ -1,278 +0,0 @@
-Background@KICK_CLIENT_DIALOG:
-	X: 20
-	Y: 67
-	Width: 535
-	Height: 235
-	Logic: KickClientLogic
-	Background: dialog3
-	Children:
-		Label@TITLE:
-			X: 0
-			Y: 40
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Bold
-			Align: Center
-		Label@TEXTA:
-			X: 0
-			Y: 67
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Regular
-			Align: Center
-			Text: You may also apply a temporary ban, preventing
-		Label@TEXTB:
-			X: 0
-			Y: 85
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Regular
-			Align: Center
-			Text: them from joining for the remainder of this game.
-		Checkbox@PREVENT_REJOINING_CHECKBOX:
-			X: (PARENT_RIGHT - WIDTH)/2
-			Y: 120
-			Width: 150
-			Height: 20
-			Text: Temporarily Ban
-		Button@OK_BUTTON:
-			X: (PARENT_RIGHT - WIDTH)/2 + 75
-			Y: 155
-			Width: 120
-			Height: 25
-			Text: Kick
-			Font: Bold
-		Button@CANCEL_BUTTON:
-			X: (PARENT_RIGHT - WIDTH)/2 - 75
-			Y: 155
-			Width: 120
-			Height: 25
-			Text: Cancel
-			Font: Bold
-
-Background@KICK_SPECTATORS_DIALOG:
-	X: 20
-	Y: 67
-	Width: 535
-	Height: 235
-	Logic: KickSpectatorsLogic
-	Background: dialog3
-	Children:
-		Label@TITLE:
-			X: 0
-			Y: 40
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Bold
-			Align: Center
-			Text: Kick Spectators
-		Label@TEXT:
-			X: 0
-			Y: 85
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Regular
-			Align: Center
-		Button@OK_BUTTON:
-			X: (PARENT_RIGHT - WIDTH)/2 + 75
-			Y: 155
-			Width: 120
-			Height: 25
-			Text: Ok
-			Font: Bold
-		Button@CANCEL_BUTTON:
-			X: (PARENT_RIGHT - WIDTH)/2 - 75
-			Y: 155
-			Width: 120
-			Height: 25
-			Text: Cancel
-			Font: Bold
-
-Background@LOBBY_OPTIONS_BIN:
-	X: 20
-	Y: 67
-	Width: 593
-	Height: 235
-	Background: dialog3
-	Children:
-		Label@TITLE:
-			X: 0
-			Y: 0 - 27
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Bold
-			Align: Center
-			Text: Map Options
-		Container:
-			X: 30
-			Y: 30
-			Width: PARENT_RIGHT-60
-			Height: PARENT_BOTTOM-75
-			Children:
-				Checkbox@EXPLORED_MAP_CHECKBOX:
-					Width: 140
-					Height: 20
-					Text: Explored Map
-				Checkbox@FOG_CHECKBOX:
-					Y: 35
-					Width: 140
-					Height: 20
-					Text: Fog of War
-				Checkbox@SHORTGAME_CHECKBOX:
-					X: 150
-					Width: 140
-					Height: 20
-					Text: Short Game
-				Checkbox@CRATES_CHECKBOX:
-					X: 150
-					Y: 35
-					Width: 140
-					Height: 20
-					Text: Crates
-				Checkbox@ALLYBUILDRADIUS_CHECKBOX:
-					X: 290
-					Width: 140
-					Height: 20
-					Text: Build off Allies' ConYards
-				Checkbox@FRAGILEALLIANCES_CHECKBOX:
-					X: 290
-					Y: 35
-					Width: 140
-					Height: 20
-					Text: Diplomacy Changes
-				Checkbox@ALLOWCHEATS_CHECKBOX:
-					Y: 70
-					Width: 140
-					Height: 20
-					Text: Debug Menu
-				Label@DIFFICULTY_DESC:
-					X: PARENT_RIGHT - WIDTH - 145
-					Y: 70
-					Width: 120
-					Height: 25
-					Text: Mission Difficulty:
-					Align: Right
-				DropDownButton@DIFFICULTY_DROPDOWNBUTTON:
-					X: PARENT_RIGHT - WIDTH
-					Y: 70
-					Width: 140
-					Height: 25
-					Font: Regular
-				Label@STARTINGCASH_DESC:
-					Y: 110
-					Width: 80
-					Height: 25
-					Text: Starting Cash:
-					Align: Right
-				DropDownButton@STARTINGCASH_DROPDOWNBUTTON:
-					X: 85
-					Y: 110
-					Width: 130
-					Height: 25
-					Font: Regular
-					Text: $5000
-				Label@STARTINGUNITS_DESC:
-					X: PARENT_RIGHT - WIDTH - 145
-					Y: 110
-					Width: 120
-					Height: 25
-					Text: Starting Units:
-					Align: Right
-				DropDownButton@STARTINGUNITS_DROPDOWNBUTTON:
-					X: PARENT_RIGHT - WIDTH
-					Y: 110
-					Width: 140
-					Height: 25
-					Font: Regular
-				DropDownButton@TECHLEVEL_DROPDOWNBUTTON:
-					X: 85
-					Y: 150
-					Width: 130
-					Height: 25
-					Font: Regular
-					Text: 10
-				Label@TECHLEVEL_DESC:
-					Y: 150
-					Width: 80
-					Height: 25
-					Text: Tech Level:
-					Align: Right
-				Label@GAMESPEED_DESC:
-					X: PARENT_RIGHT - WIDTH - 145
-					Y: 150
-					Width: 120
-					Height: 25
-					Text: Game Speed:
-					Align: Right
-				DropDownButton@GAMESPEED_DROPDOWNBUTTON:
-					X: PARENT_RIGHT - WIDTH
-					Y: 150
-					Width: 140
-					Height: 25
-					Font: Regular
-
-Background@FORCE_START_DIALOG:
-	X: 20
-	Y: 67
-	Width: 593
-	Height: 235
-	Background: dialog3
-	Children:
-		Label@TITLE:
-			X: 0
-			Y: 40
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Bold
-			Align: Center
-			Text: Start Game?
-		Label@TEXTA:
-			X: 0
-			Y: 67
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Regular
-			Align: Center
-			Text: One or more players are not yet ready.
-		Label@TEXTB:
-			X: 0
-			Y: 85
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Regular
-			Align: Center
-			Text: Are you sure that you want to force start the game?
-		Container@KICK_WARNING:
-			Width: PARENT_RIGHT
-			Children:
-				Label@KICK_WARNING_A:
-					X: 0
-					Y: 106
-					Width: PARENT_RIGHT
-					Height: 25
-					Font: Bold
-					Align: Center
-					Text: One or more clients are missing the selected
-				Label@KICK_WARNING_B:
-					X: 0
-					Y: 123
-					Width: PARENT_RIGHT
-					Height: 25
-					Font: Bold
-					Align: Center
-					Text: map, and will be kicked from the server.
-		Button@OK_BUTTON:
-			X: (PARENT_RIGHT - WIDTH)/2 + 75
-			Y: 155
-			Width: 120
-			Height: 25
-			Text: Start
-			Font: Bold
-		Button@CANCEL_BUTTON:
-			X: (PARENT_RIGHT - WIDTH)/2 - 75
-			Y: 155
-			Width: 120
-			Height: 25
-			Text: Cancel
-			Font: Bold
-
diff --git a/mods/ra/chrome/lobby-kickdialogs.yaml b/mods/ra/chrome/lobby-kickdialogs.yaml
new file mode 100644
index 0000000000..78c91c8078
--- /dev/null
+++ b/mods/ra/chrome/lobby-kickdialogs.yaml
@@ -0,0 +1,138 @@
+Background@KICK_CLIENT_DIALOG:
+	Width: PARENT_RIGHT
+	Height: PARENT_BOTTOM
+	Logic: KickClientLogic
+	Background: dialog3
+	Children:
+		Label@TITLE:
+			Y: 40
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Bold
+			Align: Center
+		Label@TEXTA:
+			Y: 67
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Regular
+			Align: Center
+			Text: You may also apply a temporary ban, preventing
+		Label@TEXTB:
+			Y: 85
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Regular
+			Align: Center
+			Text: them from joining for the remainder of this game.
+		Checkbox@PREVENT_REJOINING_CHECKBOX:
+			X: (PARENT_RIGHT - WIDTH)/2
+			Y: 120
+			Width: 150
+			Height: 20
+			Text: Temporarily Ban
+		Button@OK_BUTTON:
+			X: (PARENT_RIGHT - WIDTH)/2 + 75
+			Y: 155
+			Width: 120
+			Height: 25
+			Text: Kick
+			Font: Bold
+		Button@CANCEL_BUTTON:
+			X: (PARENT_RIGHT - WIDTH)/2 - 75
+			Y: 155
+			Width: 120
+			Height: 25
+			Text: Cancel
+			Font: Bold
+
+Background@KICK_SPECTATORS_DIALOG:
+	Width: PARENT_RIGHT
+	Height: PARENT_BOTTOM
+	Logic: KickSpectatorsLogic
+	Background: dialog3
+	Children:
+		Label@TITLE:
+			Y: 40
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Bold
+			Align: Center
+			Text: Kick Spectators
+		Label@TEXT:
+			Y: 85
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Regular
+			Align: Center
+		Button@OK_BUTTON:
+			X: (PARENT_RIGHT - WIDTH)/2 + 75
+			Y: 155
+			Width: 120
+			Height: 25
+			Text: Ok
+			Font: Bold
+		Button@CANCEL_BUTTON:
+			X: (PARENT_RIGHT - WIDTH)/2 - 75
+			Y: 155
+			Width: 120
+			Height: 25
+			Text: Cancel
+			Font: Bold
+
+Background@FORCE_START_DIALOG:
+	Width: PARENT_RIGHT
+	Height: PARENT_BOTTOM
+	Background: dialog3
+	Children:
+		Label@TITLE:
+			Y: 40
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Bold
+			Align: Center
+			Text: Start Game?
+		Label@TEXTA:
+			Y: 67
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Regular
+			Align: Center
+			Text: One or more players are not yet ready.
+		Label@TEXTB:
+			Y: 85
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Regular
+			Align: Center
+			Text: Are you sure that you want to force start the game?
+		Container@KICK_WARNING:
+			Width: PARENT_RIGHT
+			Children:
+				Label@KICK_WARNING_A:
+					Y: 106
+					Width: PARENT_RIGHT
+					Height: 25
+					Font: Bold
+					Align: Center
+					Text: One or more clients are missing the selected
+				Label@KICK_WARNING_B:
+					Y: 123
+					Width: PARENT_RIGHT
+					Height: 25
+					Font: Bold
+					Align: Center
+					Text: map, and will be kicked from the server.
+		Button@OK_BUTTON:
+			X: (PARENT_RIGHT - WIDTH)/2 + 75
+			Y: 155
+			Width: 120
+			Height: 25
+			Text: Start
+			Font: Bold
+		Button@CANCEL_BUTTON:
+			X: (PARENT_RIGHT - WIDTH)/2 - 75
+			Y: 155
+			Width: 120
+			Height: 25
+			Text: Cancel
+			Font: Bold
diff --git a/mods/ra/chrome/lobby-mappreview.yaml b/mods/ra/chrome/lobby-mappreview.yaml
index 7990a72bef..3b500c55b8 100644
--- a/mods/ra/chrome/lobby-mappreview.yaml
+++ b/mods/ra/chrome/lobby-mappreview.yaml
@@ -1,9 +1,7 @@
 Container@LOBBY_MAP_PREVIEW:
 	Logic: LobbyMapPreviewLogic
-	X: PARENT_RIGHT-20-WIDTH
-	Y: 67
-	Width: 214
-	Height: 250
+	Width: PARENT_RIGHT
+	Height: PARENT_BOTTOM
 	Children:
 		Container@MAP_AVAILABLE:
 			Width: PARENT_RIGHT
diff --git a/mods/ra/chrome/lobby-options.yaml b/mods/ra/chrome/lobby-options.yaml
new file mode 100644
index 0000000000..f19e0fecdf
--- /dev/null
+++ b/mods/ra/chrome/lobby-options.yaml
@@ -0,0 +1,120 @@
+Background@LOBBY_OPTIONS_BIN:
+	Width: PARENT_RIGHT
+	Height: PARENT_BOTTOM
+	Background: dialog3
+	Children:
+		Label@TITLE:
+			X: 0
+			Y: 0 - 27
+			Width: PARENT_RIGHT
+			Height: 25
+			Font: Bold
+			Align: Center
+			Text: Map Options
+		Container:
+			X: 30
+			Y: 30
+			Width: PARENT_RIGHT-60
+			Height: PARENT_BOTTOM-75
+			Children:
+				Checkbox@EXPLORED_MAP_CHECKBOX:
+					Width: 140
+					Height: 20
+					Text: Explored Map
+				Checkbox@FOG_CHECKBOX:
+					Y: 35
+					Width: 140
+					Height: 20
+					Text: Fog of War
+				Checkbox@SHORTGAME_CHECKBOX:
+					X: 150
+					Width: 140
+					Height: 20
+					Text: Short Game
+				Checkbox@CRATES_CHECKBOX:
+					X: 150
+					Y: 35
+					Width: 140
+					Height: 20
+					Text: Crates
+				Checkbox@ALLYBUILDRADIUS_CHECKBOX:
+					X: 290
+					Width: 140
+					Height: 20
+					Text: Build off Allies' ConYards
+				Checkbox@FRAGILEALLIANCES_CHECKBOX:
+					X: 290
+					Y: 35
+					Width: 140
+					Height: 20
+					Text: Diplomacy Changes
+				Checkbox@ALLOWCHEATS_CHECKBOX:
+					Y: 70
+					Width: 140
+					Height: 20
+					Text: Debug Menu
+				Label@DIFFICULTY_DESC:
+					X: PARENT_RIGHT - WIDTH - 145
+					Y: 70
+					Width: 120
+					Height: 25
+					Text: Mission Difficulty:
+					Align: Right
+				DropDownButton@DIFFICULTY_DROPDOWNBUTTON:
+					X: PARENT_RIGHT - WIDTH
+					Y: 70
+					Width: 140
+					Height: 25
+					Font: Regular
+				Label@STARTINGCASH_DESC:
+					Y: 110
+					Width: 80
+					Height: 25
+					Text: Starting Cash:
+					Align: Right
+				DropDownButton@STARTINGCASH_DROPDOWNBUTTON:
+					X: 85
+					Y: 110
+					Width: 130
+					Height: 25
+					Font: Regular
+					Text: $5000
+				Label@STARTINGUNITS_DESC:
+					X: PARENT_RIGHT - WIDTH - 145
+					Y: 110
+					Width: 120
+					Height: 25
+					Text: Starting Units:
+					Align: Right
+				DropDownButton@STARTINGUNITS_DROPDOWNBUTTON:
+					X: PARENT_RIGHT - WIDTH
+					Y: 110
+					Width: 140
+					Height: 25
+					Font: Regular
+				DropDownButton@TECHLEVEL_DROPDOWNBUTTON:
+					X: 85
+					Y: 150
+					Width: 130
+					Height: 25
+					Font: Regular
+					Text: 10
+				Label@TECHLEVEL_DESC:
+					Y: 150
+					Width: 80
+					Height: 25
+					Text: Tech Level:
+					Align: Right
+				Label@GAMESPEED_DESC:
+					X: PARENT_RIGHT - WIDTH - 145
+					Y: 150
+					Width: 120
+					Height: 25
+					Text: Game Speed:
+					Align: Right
+				DropDownButton@GAMESPEED_DROPDOWNBUTTON:
+					X: PARENT_RIGHT - WIDTH
+					Y: 150
+					Width: 140
+					Height: 25
+					Font: Regular
diff --git a/mods/ra/chrome/lobby-playerbin.yaml b/mods/ra/chrome/lobby-playerbin.yaml
deleted file mode 100644
index 2ac7cb35ef..0000000000
--- a/mods/ra/chrome/lobby-playerbin.yaml
+++ /dev/null
@@ -1,364 +0,0 @@
-ScrollPanel@LOBBY_PLAYER_BIN:
-	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@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
-				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
-					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
-			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
-					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
-					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
-			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
-					Height: 25
-					X: 190
-					Y: 0
-
-ScrollPanel@FACTION_DROPDOWN_TEMPLATE:
-	Width: DROPDOWN_WIDTH
-	Children:
-		ScrollItem@HEADER:
-			BaseName: scrollheader
-			Width: PARENT_RIGHT-27
-			Height: 13
-			X: 2
-			Y: 0
-			Visible: false
-			Children:
-				Label@LABEL:
-					Font: TinyBold
-					Width: PARENT_RIGHT
-					Height: 10
-					Align: Center
-		ScrollItem@TEMPLATE:
-			Width: PARENT_RIGHT-27
-			Height: 25
-			X: 2
-			Y: 0
-			Visible: false
-			TooltipContainer: TOOLTIP_CONTAINER
-			TooltipTemplate: FACTION_DESCRIPTION_TOOLTIP
-			Children:
-				Image@FLAG:
-					X: 5
-					Y: 5
-					Width: 30
-					Height: 15
-				Label@LABEL:
-					X: 40
-					Width: 60
-					Height: 25
\ No newline at end of file
diff --git a/mods/ra/chrome/lobby-players.yaml b/mods/ra/chrome/lobby-players.yaml
new file mode 100644
index 0000000000..004a7661af
--- /dev/null
+++ b/mods/ra/chrome/lobby-players.yaml
@@ -0,0 +1,414 @@
+Container@LOBBY_PLAYER_BIN:
+	Width: PARENT_RIGHT
+	Height: PARENT_BOTTOM
+	Children:
+		Container@LABEL_CONTAINER:
+			X: 5
+			Y: 0-27
+			Width: PARENT_RIGHT
+			Height: PARENT_BOTTOM
+			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
+		ScrollPanel@LOBBY_PLAYERS:
+			Width: PARENT_RIGHT
+			Height: PARENT_BOTTOM
+			TopBottomSpacing: 5
+			ItemSpacing: 5
+			Children:
+				Container@TEMPLATE_EDITABLE_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
+						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
+							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
+					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
+							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
+							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
+					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
+							Height: 25
+							X: 190
+							Y: 0
+
+ScrollPanel@FACTION_DROPDOWN_TEMPLATE:
+	Width: DROPDOWN_WIDTH
+	Children:
+		ScrollItem@HEADER:
+			BaseName: scrollheader
+			Width: PARENT_RIGHT-27
+			Height: 13
+			X: 2
+			Y: 0
+			Visible: false
+			Children:
+				Label@LABEL:
+					Font: TinyBold
+					Width: PARENT_RIGHT
+					Height: 10
+					Align: Center
+		ScrollItem@TEMPLATE:
+			Width: PARENT_RIGHT-27
+			Height: 25
+			X: 2
+			Y: 0
+			Visible: false
+			TooltipContainer: TOOLTIP_CONTAINER
+			TooltipTemplate: FACTION_DESCRIPTION_TOOLTIP
+			Children:
+				Image@FLAG:
+					X: 5
+					Y: 5
+					Width: 30
+					Height: 15
+				Label@LABEL:
+					X: 40
+					Width: 60
+					Height: 25
\ No newline at end of file
diff --git a/mods/ra/chrome/lobby.yaml b/mods/ra/chrome/lobby.yaml
index 62fbe85d35..61ab1932b6 100644
--- a/mods/ra/chrome/lobby.yaml
+++ b/mods/ra/chrome/lobby.yaml
@@ -14,55 +14,15 @@ Background@SERVER_LOBBY:
 			Height: 20
 			Font: Bold
 		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:
+			X: PARENT_RIGHT-20-WIDTH
+			Y: 67
+			Width: 214
+			Height: 250
+		Container@TOP_PANELS_ROOT:
+			X: 20
+			Y: 67
+			Width: 593
+			Height: 235
 		DropDownButton@SLOTS_DROPDOWNBUTTON:
 			X: 20
 			Y: PARENT_BOTTOM - 291
diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml
index cb03bf1675..56996c546f 100644
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -97,8 +97,9 @@ ChromeLayout:
 	./mods/ra/chrome/credits.yaml
 	./mods/ra/chrome/lobby.yaml
 	./mods/ra/chrome/lobby-mappreview.yaml
-	./mods/ra/chrome/lobby-playerbin.yaml
-	./mods/ra/chrome/lobby-dialogs.yaml
+	./mods/ra/chrome/lobby-players.yaml
+	./mods/ra/chrome/lobby-options.yaml
+	./mods/ra/chrome/lobby-kickdialogs.yaml
 	./mods/ra/chrome/color-picker.yaml
 	./mods/ra/chrome/map-chooser.yaml
 	./mods/ra/chrome/create-server.yaml
diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml
index a082b8b627..9f9b6b58dc 100644
--- a/mods/ts/mod.yaml
+++ b/mods/ts/mod.yaml
@@ -151,8 +151,9 @@ ChromeLayout:
 	./mods/ra/chrome/credits.yaml
 	./mods/ra/chrome/lobby.yaml
 	./mods/ra/chrome/lobby-mappreview.yaml
-	./mods/ra/chrome/lobby-playerbin.yaml
-	./mods/ra/chrome/lobby-dialogs.yaml
+	./mods/ra/chrome/lobby-players.yaml
+	./mods/ra/chrome/lobby-options.yaml
+	./mods/ra/chrome/lobby-kickdialogs.yaml
 	./mods/ts/chrome/color-picker.yaml
 	./mods/ra/chrome/map-chooser.yaml
 	./mods/ra/chrome/create-server.yaml