diff --git a/mods/cnc/chrome/ingame-info-lobby-options.yaml b/mods/cnc/chrome/ingame-info-lobby-options.yaml
index a9e06cf885..89aba20568 100644
--- a/mods/cnc/chrome/ingame-info-lobby-options.yaml
+++ b/mods/cnc/chrome/ingame-info-lobby-options.yaml
@@ -7,41 +7,56 @@ Container@LOBBY_OPTIONS_PANEL:
 			X: 15
 			Y: 15
 			Width: 482
-			Height: 345
+			Height: 375
 			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 / 2 - 20
 									Height: 20
 									Font: Regular
 									Visible: False
 									TooltipContainer: TOOLTIP_CONTAINER
 								Checkbox@B:
-									X: 225
-									Width: 220
+									X: PARENT_RIGHT / 2 + 10
+									Width: PARENT_RIGHT / 2 - 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 / 2 - 20
+									Height: 20
 									Visible: False
 								DropDownButton@A:
-									X: 145
-									Width: 180
+									X: 10
+									Y: 25
+									Width: PARENT_RIGHT / 2 - 20
+									Height: 25
+									Font: Regular
+									Visible: False
+									TooltipContainer: TOOLTIP_CONTAINER
+								Label@B_DESC:
+									X: PARENT_RIGHT / 2 + 10
+									Width: PARENT_RIGHT / 2 - 20
+									Height: 20
+									Visible: False
+								DropDownButton@B:
+									X: PARENT_RIGHT / 2 + 10
+									Y: 25
+									Width: PARENT_RIGHT / 2 - 20
 									Height: 25
 									Font: Regular
 									Visible: False
diff --git a/mods/cnc/chrome/ingame-info.yaml b/mods/cnc/chrome/ingame-info.yaml
index 1c1782bb48..81e31c4df3 100644
--- a/mods/cnc/chrome/ingame-info.yaml
+++ b/mods/cnc/chrome/ingame-info.yaml
@@ -2,97 +2,86 @@ Container@GAME_INFO_PANEL:
 	X: (WINDOW_RIGHT - WIDTH) / 2
 	Y: (WINDOW_BOTTOM - HEIGHT) / 2
 	Width: 512
-	Height: 405
+	Height: 435
 	Logic: GameInfoLogic
 	Visible: False
 	Children:
 		Label@TITLE:
 			Width: PARENT_RIGHT
-			Y: 0 - 17
+			Y: 0 - 22
 			Text: Game Information
 			Align: Center
 			Font: BigBold
 			Contrast: true
 		Container@TAB_CONTAINER_2:
+			X: 0 - 140 + 1
 			Visible: False
 			Children:
 				Button@BUTTON1:
-					Y: 5
 					Width: 140
 					Height: 35
 				Button@BUTTON2:
-					X: 150
-					Y: 5
+					Y: 45
 					Width: 140
 					Height: 35
 		Container@TAB_CONTAINER_3:
+			X: 0 - 140 + 1
 			Visible: False
 			Children:
 				Button@BUTTON1:
-					Y: 5
 					Width: 140
 					Height: 35
 				Button@BUTTON2:
-					X: 150
-					Y: 5
+					Y: 45
 					Width: 140
 					Height: 35
 				Button@BUTTON3:
-					X: 300
-					Y: 5
+					Y: 90
 					Width: 140
 					Height: 35
 		Container@TAB_CONTAINER_4:
+			X: 0 - 140 + 1
 			Visible: False
 			Children:
 				Button@BUTTON1:
-					Y: 5
-					Width: 121
+					Width: 140
 					Height: 35
 				Button@BUTTON2:
-					X: 131
-					Y: 5
-					Width: 120
+					Y: 45
+					Width: 140
 					Height: 35
 				Button@BUTTON3:
-					X: 261
-					Y: 5
-					Width: 120
+					Y: 90
+					Width: 140
 					Height: 35
 				Button@BUTTON4:
-					X: 391
-					Y: 5
-					Width: 121
+					Y: 135
+					Width: 140
 					Height: 35
 		Container@TAB_CONTAINER_5:
+			X: 0 - 140 + 1
 			Visible: False
 			Children:
 				Button@BUTTON1:
-					Y: 5
-					Width: 99
+					Width: 140
 					Height: 35
 				Button@BUTTON2:
-					X: 104
-					Y: 5
-					Width: 98
+					Y: 45
+					Width: 140
 					Height: 35
 				Button@BUTTON3:
-					X: 207
-					Y: 5
-					Width: 98
+					Y: 90
+					Width: 140
 					Height: 35
 				Button@BUTTON4:
-					X: 310
-					Y: 5
-					Width: 98
+					Y: 135
+					Width: 140
 					Height: 35
 				Button@BUTTON5:
-					X: 413
-					Y: 5
-					Width: 99
+					Y: 180
+					Width: 140
 					Height: 35
 		Background@BACKGROUND:
-			Y: 39
 			Width: PARENT_RIGHT
 			Height: PARENT_BOTTOM
 			Background: panel-black
diff --git a/mods/cnc/chrome/ingame-infobriefing.yaml b/mods/cnc/chrome/ingame-infobriefing.yaml
index daf57c87ec..c55bd8890f 100644
--- a/mods/cnc/chrome/ingame-infobriefing.yaml
+++ b/mods/cnc/chrome/ingame-infobriefing.yaml
@@ -22,7 +22,7 @@ Container@MAP_PANEL:
 			X: 15
 			Y: 228
 			Width: 482
-			Height: 132
+			Height: 162
 			Children:
 				Label@MAP_DESCRIPTION:
 					X: 4
diff --git a/mods/cnc/chrome/ingame-infochat.yaml b/mods/cnc/chrome/ingame-infochat.yaml
index e13b6b14f0..a32467e740 100644
--- a/mods/cnc/chrome/ingame-infochat.yaml
+++ b/mods/cnc/chrome/ingame-infochat.yaml
@@ -1,7 +1,8 @@
 Container@CHAT_CONTAINER:
-	Y: 10
-	Width: PARENT_RIGHT
-	Height: PARENT_BOTTOM - 20
+	X: 15
+	Y: 15
+	Width: PARENT_RIGHT - 30
+	Height: PARENT_BOTTOM - 30
 	Logic: IngameChatLogic
 		Templates:
 			Chat: CHAT_LINE_TEMPLATE
@@ -9,8 +10,7 @@ Container@CHAT_CONTAINER:
 			Mission: CHAT_LINE_TEMPLATE
 	Children:
 		Container@CHAT_CHROME:
-			X: 15
-			Width: PARENT_RIGHT - 30
+			Width: PARENT_RIGHT
 			Height: PARENT_BOTTOM
 			Children:
 				Button@CHAT_MODE:
diff --git a/mods/cnc/chrome/ingame-infoobjectives.yaml b/mods/cnc/chrome/ingame-infoobjectives.yaml
index 403176e2b4..f7dd2f9a69 100644
--- a/mods/cnc/chrome/ingame-infoobjectives.yaml
+++ b/mods/cnc/chrome/ingame-infoobjectives.yaml
@@ -20,7 +20,7 @@ Container@MISSION_OBJECTIVES:
 			X: 15
 			Y: 50
 			Width: 482
-			Height: 310
+			Height: 340
 			TopBottomSpacing: 15
 			ItemSpacing: 15
 			Children:
diff --git a/mods/cnc/chrome/ingame-infostats.yaml b/mods/cnc/chrome/ingame-infostats.yaml
index 3eb33443ff..4a9a08e00a 100644
--- a/mods/cnc/chrome/ingame-infostats.yaml
+++ b/mods/cnc/chrome/ingame-infostats.yaml
@@ -59,7 +59,7 @@ Container@SKIRMISH_STATS:
 			X: 15
 			Y: 105
 			Width: 482
-			Height: 255
+			Height: 285
 			ItemSpacing: 5
 			Children:
 				ScrollItem@TEAM_TEMPLATE: