diff --git a/mods/cnc/chrome/lobby.yaml b/mods/cnc/chrome/lobby.yaml
index 789a6def2d..9f56d6b309 100644
--- a/mods/cnc/chrome/lobby.yaml
+++ b/mods/cnc/chrome/lobby.yaml
@@ -7,14 +7,14 @@ Container@SERVER_LOBBY:
 	Children:
 		ColorPreviewManager@COLOR_MANAGER:
 		Label@SERVER_NAME:
-			Width: 800
+			Width: PARENT_RIGHT
 			Y: 0-25
 			Font: BigBold
 			Contrast: true
 			Align: Center
 		Background@bg:
-			Width: 800
-			Height: 540
+			Width: PARENT_RIGHT
+			Height: PARENT_BOTTOM - 35
 			Background: panel-black
 			Children:
 				Container@MAP_PREVIEW_ROOT:
@@ -122,13 +122,13 @@ Container@SERVER_LOBBY:
 					Width: PARENT_RIGHT - 30
 					Height: PARENT_BOTTOM - 330
 		Button@DISCONNECT_BUTTON:
-			Y: 539
+			Y: PARENT_BOTTOM - 36
 			Width: 140
 			Height: 35
 			Text: Leave Game
 		Button@START_GAME_BUTTON:
 			X: PARENT_RIGHT - WIDTH
-			Y: 539
+			Y: PARENT_BOTTOM - 36
 			Width: 140
 			Height: 35
 			Text: Start Game
diff --git a/mods/cnc/chrome/mapchooser.yaml b/mods/cnc/chrome/mapchooser.yaml
index 48ce55bc64..dba8ae35d4 100644
--- a/mods/cnc/chrome/mapchooser.yaml
+++ b/mods/cnc/chrome/mapchooser.yaml
@@ -59,7 +59,7 @@ Container@MAPCHOOSER_PANEL:
 					X: 15
 					Y: 45
 					Width: PARENT_RIGHT - 30
-					Height: 440
+					Height: PARENT_BOTTOM - 60
 					Children:
 						ScrollPanel@MAP_LIST:
 							Width: PARENT_RIGHT
@@ -69,7 +69,7 @@ Container@MAPCHOOSER_PANEL:
 					X: 15
 					Y: 45
 					Width: PARENT_RIGHT - 30
-					Height: 440
+					Height: PARENT_BOTTOM - 60
 					Children:
 						ScrollPanel@MAP_LIST:
 							Width: PARENT_RIGHT
@@ -79,7 +79,6 @@ Container@MAPCHOOSER_PANEL:
 					Width: 183
 					Height: 232
 					X: 2
-					Y: 0
 					Visible: false
 					Children:
 						MapPreview@PREVIEW: