diff --git a/OpenRA.FileFormats/MiniYaml.cs b/OpenRA.FileFormats/MiniYaml.cs
index 89f0e5c3a7..8376fe8146 100755
--- a/OpenRA.FileFormats/MiniYaml.cs
+++ b/OpenRA.FileFormats/MiniYaml.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
  * This file is part of OpenRA.
@@ -59,16 +59,20 @@ namespace OpenRA.FileFormats
 
 				var colon = t.IndexOf(':');
 				var d = new Dictionary<string, MiniYaml>();
-
-				if (colon == -1)
-					levels[level].Add(t.Trim(), new MiniYaml(null, d));
-				else
+				try
 				{
-					var value = t.Substring(colon + 1).Trim();
-					if (value.Length == 0)
-						value = null;
-					levels[level].Add(t.Substring(0, colon).Trim(), new MiniYaml(value, d));
+					if (colon == -1)
+						levels[level].Add(t.Trim(), new MiniYaml(null, d));
+					else
+					{
+						var value = t.Substring(colon + 1).Trim();
+						if (value.Length == 0)
+							value = null;
+						levels[level].Add(t.Substring(0, colon).Trim(), new MiniYaml(value, d));
+					}
 				}
+				catch (ArgumentException) { throw new InvalidDataException("Duplicate Identifier:`{0}`".F(t)); }
+				
 				levels.Add(d);
 			}
 			return levels[0];
diff --git a/mods/cnc/menus.yaml b/mods/cnc/menus.yaml
index 6bf8e829c3..f852c8e5d4 100644
--- a/mods/cnc/menus.yaml
+++ b/mods/cnc/menus.yaml
@@ -2,8 +2,8 @@ Container:
 	Children:
 		Background@MAINMENU_BG:
 			Id:MAINMENU_BG
-			X:WINDOW_RIGHT/2 - 125
-			Y:WINDOW_BOTTOM/2 - 100
+			X:(WINDOW_RIGHT - WIDTH)/2
+			Y:(WINDOW_BOTTOM - HEIGHT)/2
 			Width:250
 			Height:200
 			Children:
@@ -41,8 +41,8 @@ Container:
 					Delegate:MainMenuButtonsDelegate
 		Background@CREATESERVER_BG:
 			Id:CREATESERVER_BG
-			X:WINDOW_RIGHT/2 - 225
-			Y:WINDOW_BOTTOM/2 - 72
+			X:(WINDOW_RIGHT - WIDTH)/2
+			Y:(WINDOW_BOTTOM - HEIGHT)/2
 			Width:450
 			Height:145
 			Visible:false
@@ -87,8 +87,8 @@ Container:
 					Delegate:CreateServerMenuDelegate
 		Background@JOINSERVER_BG:
 			Id:JOINSERVER_BG
-			X:WINDOW_RIGHT/2 - 225
-			Y:WINDOW_BOTTOM/2 - 200
+			X:(WINDOW_RIGHT - WIDTH)/2
+			Y:(WINDOW_BOTTOM - HEIGHT)/2
 			Width:450
 			Height:400
 			Visible:false
@@ -116,4 +116,52 @@ Container:
 					Width:160
 					Height:25
 					Text:Cancel
-					Delegate:ServerBrowserDelegate
\ No newline at end of file
+					Delegate:ServerBrowserDelegate
+		Background@CONNECTION_BG:
+			Id:CONNECTION_BG
+			X:(WINDOW_RIGHT - WIDTH)/2
+			Y:(WINDOW_BOTTOM - HEIGHT)/2
+			Width:450
+			Height:400
+			Visible:false
+			Children:
+				Label@CONNECTION_LABEL_TITLE:
+					Id:CONNECTION_LABEL_TITLE
+					X:0
+					Y:20
+					Width:450
+					Height:25
+					Text:Connecting
+					Align:Center
+				Container@CONNECTION_GROUP_CONNECTING:
+					Id:CONNECTION_GROUP_CONNECTING
+					Visible:false
+					Children:
+						Button@CONNECTION_BUTTON_ABORT:
+							Id:CONNECTION_BUTTON_ABORT
+							X:PARENT_RIGHT - 180
+							Y:PARENT_BOTTOM - 45
+							Width:160
+							Height:25
+							Text:Abort
+							Delegate:ServerBrowserDelegate
+				Container@CONNECTION_GROUP_FAILED:
+					Id:CONNECTION_GROUP_FAILED
+					Visible:false
+					Children:
+						Button@CONNECTION_BUTTON_RETRY:
+							Id:CONNECTION_BUTTON_RETRY
+							X:PARENT_RIGHT - 360
+							Y:PARENT_BOTTOM - 45
+							Width:160
+							Height:25
+							Text:Retry
+							Delegate:ServerBrowserDelegate
+						Button@CONNECTION_BUTTON_CANCEL:
+							Id:CONNECTION_BUTTON_CANCEL
+							X:PARENT_RIGHT - 180
+							Y:PARENT_BOTTOM - 45
+							Width:160
+							Height:25
+							Text:Cancel
+							Delegate:ServerBrowserDelegate
\ No newline at end of file
diff --git a/mods/ra/menus.yaml b/mods/ra/menus.yaml
index 6bf8e829c3..18e3d97d7a 100644
--- a/mods/ra/menus.yaml
+++ b/mods/ra/menus.yaml
@@ -2,8 +2,8 @@ Container:
 	Children:
 		Background@MAINMENU_BG:
 			Id:MAINMENU_BG
-			X:WINDOW_RIGHT/2 - 125
-			Y:WINDOW_BOTTOM/2 - 100
+			X:(WINDOW_RIGHT - WIDTH)/2
+			Y:(WINDOW_BOTTOM - HEIGHT)/2
 			Width:250
 			Height:200
 			Children:
@@ -41,8 +41,8 @@ Container:
 					Delegate:MainMenuButtonsDelegate
 		Background@CREATESERVER_BG:
 			Id:CREATESERVER_BG
-			X:WINDOW_RIGHT/2 - 225
-			Y:WINDOW_BOTTOM/2 - 72
+			X:(WINDOW_RIGHT - WIDTH)/2
+			Y:(WINDOW_BOTTOM - HEIGHT)/2
 			Width:450
 			Height:145
 			Visible:false
@@ -87,8 +87,8 @@ Container:
 					Delegate:CreateServerMenuDelegate
 		Background@JOINSERVER_BG:
 			Id:JOINSERVER_BG
-			X:WINDOW_RIGHT/2 - 225
-			Y:WINDOW_BOTTOM/2 - 200
+			X:(WINDOW_RIGHT - WIDTH)/2
+			Y:(WINDOW_BOTTOM - HEIGHT)/2
 			Width:450
 			Height:400
 			Visible:false
@@ -116,4 +116,52 @@ Container:
 					Width:160
 					Height:25
 					Text:Cancel
-					Delegate:ServerBrowserDelegate
\ No newline at end of file
+					Delegate:ServerBrowserDelegate
+		Background@CONNECTION_BG:
+			Id:CONNECTION_BG
+			X:(WINDOW_RIGHT - WIDTH)/2
+			Y:(WINDOW_BOTTOM - HEIGHT)/2
+			Width:450
+			Height:400
+			Visible:false
+			Children:
+				Label@CONNECTION_LABEL_TITLE:
+					Id:CONNECTION_LABEL_TITLE
+					X:0
+					Y:20
+					Width:450
+					Height:25
+					Text:Connecting
+					Align:Center
+				Container:
+				    Id:CONNECTION_GROUP_CONNECTING
+				    Visible:false
+				    Children:
+        				Button@CONNECTION_BUTTON_ABORT:
+        					Id:CONNECTION_BUTTON_ABORT
+        					X:PARENT_RIGHT - 180
+        					Y:PARENT_BOTTOM - 45
+        					Width:160
+        					Height:25
+        					Text:Abort
+        					Delegate:ServerBrowserDelegate
+				Container:
+				    Id:CONNECTION_GROUP_FAILED
+				    Visible:false
+				    Children:
+				        Button@CONNECTION_BUTTON_RETRY:
+        					Id:CONNECTION_BUTTON_RETRY
+        					X:PARENT_RIGHT - 360
+        					Y:PARENT_BOTTOM - 45
+        					Width:160
+        					Height:25
+        					Text:Retry
+        					Delegate:ServerBrowserDelegate
+        				Button@CONNECTION_BUTTON_CANCEL:
+        					Id:CONNECTION_BUTTON_CANCEL
+        					X:PARENT_RIGHT - 180
+        					Y:PARENT_BOTTOM - 45
+        					Width:160
+        					Height:25
+        					Text:Cancel
+        					Delegate:ServerBrowserDelegate
\ No newline at end of file