diff --git a/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyOptionsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyOptionsLogic.cs
index 10d3e5f6d7..394ee1f688 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyOptionsLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyOptionsLogic.cs
@@ -161,7 +161,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				var label = row.GetOrNull<LabelWidget>(dropdown.Id + "_DESC");
 				if (label != null)
 				{
-					label.GetText = () => option.Name;
+					label.GetText = () => option.Name + ":";
 					label.IsVisible = () => true;
 				}
 			}
diff --git a/mods/cnc/chrome/lobby-options.yaml b/mods/cnc/chrome/lobby-options.yaml
index 1c4a459ce0..2a711fe946 100644
--- a/mods/cnc/chrome/lobby-options.yaml
+++ b/mods/cnc/chrome/lobby-options.yaml
@@ -15,58 +15,73 @@ Container@LOBBY_OPTIONS_BIN:
 			Height: PARENT_BOTTOM
 			Children:
 				Container@LOBBY_OPTIONS:
-					X: 18
-					Y: 9
-					Width: PARENT_RIGHT - 24 - 18
+					Y: 10
+					Width: PARENT_RIGHT - 24
 					Children:
 						Container@CHECKBOX_ROW_TEMPLATE:
-							Height: 34
+							Width: PARENT_RIGHT
+							Height: 30
 							Children:
 								Checkbox@A:
-									Width: 220
+									X: 10
+									Width: PARENT_RIGHT / 3 - 20
 									Height: 20
 									Font: Regular
 									Visible: False
 									TooltipContainer: TOOLTIP_CONTAINER
 								Checkbox@B:
-									X: 225
-									Width: 220
+									X: PARENT_RIGHT / 3 + 10
+									Width: PARENT_RIGHT / 3 - 20
 									Height: 20
 									Font: Regular
 									Visible: False
 									TooltipContainer: TOOLTIP_CONTAINER
 								Checkbox@C:
-									X: 450
-									Width: 190
+									X: (PARENT_RIGHT / 3) * 2 + 10
+									Width: PARENT_RIGHT / 3 - 20
 									Height: 20
 									Font: Regular
 									Visible: False
 									TooltipContainer: TOOLTIP_CONTAINER
 						Container@DROPDOWN_ROW_TEMPLATE:
-							Height: 34
+							Height: 60
 							Width: PARENT_RIGHT
 							Children:
 								Label@A_DESC:
-									Width: 140
-									Height: 25
-									Align: Right
+									X: 10
+									Width: PARENT_RIGHT / 3 - 20
+									Height: 20
 									Visible: False
 								DropDownButton@A:
-									X: 145
-									Width: 180
+									X: 10
+									Width: PARENT_RIGHT / 3 - 20
+									Y: 25
 									Height: 25
 									Font: Regular
 									Visible: False
 									TooltipContainer: TOOLTIP_CONTAINER
 								Label@B_DESC:
-									X: PARENT_RIGHT - WIDTH - 203
-									Width: 140
-									Height: 25
-									Align: Right
+									X: PARENT_RIGHT / 3 + 10
+									Width: PARENT_RIGHT / 3 - 20
+									Height: 20
 									Visible: False
 								DropDownButton@B:
-									X: PARENT_RIGHT - WIDTH - 18
-									Width: 180
+									X: PARENT_RIGHT / 3 + 10
+									Width: PARENT_RIGHT / 3 - 20
+									Y: 25
+									Height: 25
+									Font: Regular
+									Visible: False
+									TooltipContainer: TOOLTIP_CONTAINER
+								Label@C_DESC:
+									X: (PARENT_RIGHT / 3) * 2 + 10
+									Width: PARENT_RIGHT / 3 - 20
+									Height: 20
+									Visible: False
+								DropDownButton@C:
+									X: (PARENT_RIGHT / 3) * 2 + 10
+									Width: PARENT_RIGHT / 3 - 20
+									Y: 25
 									Height: 25
 									Font: Regular
 									Visible: False
diff --git a/mods/common/chrome/lobby-options.yaml b/mods/common/chrome/lobby-options.yaml
index c6deac7d90..cbc9b4f592 100644
--- a/mods/common/chrome/lobby-options.yaml
+++ b/mods/common/chrome/lobby-options.yaml
@@ -15,55 +15,68 @@ Container@LOBBY_OPTIONS_BIN:
 			Height: PARENT_BOTTOM
 			Children:
 				Container@LOBBY_OPTIONS:
-					X: 10
-					Y: 9
-					Width: PARENT_RIGHT - 10 - 24
+					Y: 10
+					Width: PARENT_RIGHT - 24
 					Children:
 						Container@CHECKBOX_ROW_TEMPLATE:
+							Width: PARENT_RIGHT
 							Height: 30
 							Children:
 								Checkbox@A:
-									Width: 220
+									X: 10
+									Width: PARENT_RIGHT / 3 - 20
 									Height: 20
 									Visible: False
 									TooltipContainer: TOOLTIP_CONTAINER
 								Checkbox@B:
-									X: 225
-									Width: 220
+									X: PARENT_RIGHT / 3 + 10
+									Width: PARENT_RIGHT / 3 - 20
 									Height: 20
 									Visible: False
 									TooltipContainer: TOOLTIP_CONTAINER
 								Checkbox@C:
-									X: 450
-									Width: 190
+									X: (PARENT_RIGHT / 3) * 2 + 10
+									Width: PARENT_RIGHT / 3 - 20
 									Height: 20
 									Visible: False
 									TooltipContainer: TOOLTIP_CONTAINER
 						Container@DROPDOWN_ROW_TEMPLATE:
-							Height: 30
+							Height: 60
 							Width: PARENT_RIGHT
 							Children:
 								Label@A_DESC:
-									Width: 140
-									Height: 25
-									Align: Right
+									X: 10
+									Width: PARENT_RIGHT / 3 - 20
+									Height: 20
 									Visible: False
 								DropDownButton@A:
-									X: 145
-									Width: 180
+									X: 10
+									Width: PARENT_RIGHT / 3 - 20
+									Y: 25
 									Height: 25
 									Visible: False
 									TooltipContainer: TOOLTIP_CONTAINER
 								Label@B_DESC:
-									X: PARENT_RIGHT - WIDTH - 203
-									Width: 140
-									Height: 25
-									Align: Right
+									X: PARENT_RIGHT / 3 + 10
+									Width: PARENT_RIGHT / 3 - 20
+									Height: 20
 									Visible: False
 								DropDownButton@B:
-									X: PARENT_RIGHT - WIDTH - 18
-									Width: 180
+									X: PARENT_RIGHT / 3 + 10
+									Width: PARENT_RIGHT / 3 - 20
+									Y: 25
+									Height: 25
+									Visible: False
+									TooltipContainer: TOOLTIP_CONTAINER
+								Label@C_DESC:
+									X: (PARENT_RIGHT / 3) * 2 + 10
+									Width: PARENT_RIGHT / 3 - 20
+									Height: 20
+									Visible: False
+								DropDownButton@C:
+									X: (PARENT_RIGHT / 3) * 2 + 10
+									Width: PARENT_RIGHT / 3 - 20
+									Y: 25
 									Height: 25
-									Font: Regular
 									Visible: False
 									TooltipContainer: TOOLTIP_CONTAINER