diff --git a/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuArchenemy.java b/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuArchenemy.java
index 90be5d03bdd..3f91b238f0b 100644
--- a/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuArchenemy.java
+++ b/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuArchenemy.java
@@ -128,15 +128,19 @@ public enum VSubmenuArchenemy implements IVSubmenu<CSubmenuArchenemy> {
 
             deckChoosers.add(tempChooser);
             
-            ButtonGroup tempBtnGroup = new ButtonGroup();
+            ButtonGroup tempBtnGroup = new ButtonGroup();            
             FRadioButton tmpAI = new FRadioButton();
             tmpAI.setText("AI");
             tmpAI.setSelected(i != 0);
             FRadioButton tmpHuman = new FRadioButton();
             tmpHuman.setText("Human");
             tmpHuman.setSelected(i == 0);
-            tempPanel.add(tmpAI);
-            tempPanel.add(tmpHuman,"wrap");
+            
+            FPanel typeBtnPanel = new FPanel();
+            typeBtnPanel.add(tmpAI);
+            typeBtnPanel.add(tmpHuman,"wrap");
+            tempPanel.add(typeBtnPanel);
+            
             tempBtnGroup.add(tmpAI);
             tempBtnGroup.add(tmpHuman);
             playerIsAIRadios.add(tmpAI);
@@ -153,11 +157,8 @@ public enum VSubmenuArchenemy implements IVSubmenu<CSubmenuArchenemy> {
             }
 
             playerPanels.add(tempPanel);
-            if (i == 0) {
-                tabPane.add("Human", tempPanel);
-            } else {
-                tabPane.add("Opponent " + i, tempPanel);
-            }
+            
+            tabPane.add("Player " + (i+1), tempPanel);
         }
 
         final String strCheckboxConstraints = "h 30px!, gap 0 20px 0 0";
@@ -184,7 +185,7 @@ public enum VSubmenuArchenemy implements IVSubmenu<CSubmenuArchenemy> {
         }
         else {
             for (int i = currentNumTabsShown; i <= toShow; i++) {
-                tabPane.add("Opponent " + i, playerPanels.get(i));
+                tabPane.add("Player " + i, playerPanels.get(i));
             }
             currentNumTabsShown = tabPane.getComponentCount() - 1;
         }
diff --git a/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuCommander.java b/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuCommander.java
index 2fca80cf62a..760c3666686 100644
--- a/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuCommander.java
+++ b/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuCommander.java
@@ -126,7 +126,7 @@ public enum VSubmenuCommander implements IVSubmenu<CSubmenuCommander> {
         //Player panels (Human + 7 AIs)
         for (int i = 0; i < 8; i++) {
             tempPanel = new FPanel();
-            tempPanel.setLayout(new MigLayout("insets 0, gap 0 , wrap 2, flowy, ax center"));
+            tempPanel.setLayout(new MigLayout("insets 0, gap 0 , wrap 2, flowx, ax center"));
 
             tempList = new FList<Object>();
 
@@ -136,30 +136,34 @@ public enum VSubmenuCommander implements IVSubmenu<CSubmenuCommander> {
 
             deckLists.add(tempList);
             
-            ButtonGroup tempBtnGroup = new ButtonGroup();
+            ButtonGroup tempBtnGroup = new ButtonGroup();            
             FRadioButton tmpAI = new FRadioButton();
             tmpAI.setText("AI");
             tmpAI.setSelected(i != 0);
             FRadioButton tmpHuman = new FRadioButton();
             tmpHuman.setText("Human");
             tmpHuman.setSelected(i == 0);
-            tempPanel.add(tmpAI);
-            tempPanel.add(tmpHuman,"wrap");
+            
+            FPanel typeBtnPanel = new FPanel();
+            typeBtnPanel.add(tmpAI);
+            typeBtnPanel.add(tmpHuman,"wrap");
+            
+            
             tempBtnGroup.add(tmpAI);
             tempBtnGroup.add(tmpHuman);
             playerIsAIRadios.add(tmpAI);
+            playerIsAIRadios.add(tmpAI);
             
             tempPanel.add(new FLabel.Builder().text("Select Deck:").build(), "gap 0px 0px 10px 10px, flowy");
 
+            tempPanel.add(typeBtnPanel);
+            
             JScrollPane scrDecks = new FScrollPane(tempList, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
             tempPanel.add(scrDecks, "w 55%!, h 90%, gap 0px 10px 0px 10px, growy, pushy, wrap");
 
             playerPanels.add(tempPanel);
-            if (i == 0) {
-                tabPane.add("Human", tempPanel);
-            } else {
-                tabPane.add("Opponent " + i, tempPanel);
-            }
+
+            tabPane.add("Player " + (i+1), tempPanel);
         }
 
         pnlStart.setOpaque(false);
@@ -179,7 +183,7 @@ public enum VSubmenuCommander implements IVSubmenu<CSubmenuCommander> {
         }
         else {
             for (int i = currentNumTabsShown; i <= toShow; i++) {
-                tabPane.add("Opponent " + i, playerPanels.get(i));
+                tabPane.add("Player " + i, playerPanels.get(i));
             }
             currentNumTabsShown = tabPane.getComponentCount() - 1;
         }
diff --git a/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuPlanechase.java b/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuPlanechase.java
index 8b353fd4381..6020ee98d3f 100644
--- a/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuPlanechase.java
+++ b/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuPlanechase.java
@@ -98,7 +98,6 @@ public enum VSubmenuPlanechase implements IVSubmenu<CSubmenuPlanechase> {
         FPanel tempPanel;
         FDeckChooser tempChooser;
         FList<Object> tempPlanarDeckList;
-        ButtonGroup tempBtnGroup;
 
         //Settings panel
         FPanel settingsPanel = new FPanel();
@@ -131,15 +130,19 @@ public enum VSubmenuPlanechase implements IVSubmenu<CSubmenuPlanechase> {
 
             deckChoosers.add(tempChooser);
             
-            tempBtnGroup = new ButtonGroup();
+            ButtonGroup tempBtnGroup = new ButtonGroup();            
             FRadioButton tmpAI = new FRadioButton();
             tmpAI.setText("AI");
             tmpAI.setSelected(i != 0);
             FRadioButton tmpHuman = new FRadioButton();
             tmpHuman.setText("Human");
             tmpHuman.setSelected(i == 0);
-            tempPanel.add(tmpAI);
-            tempPanel.add(tmpHuman,"wrap");
+            
+            FPanel typeBtnPanel = new FPanel();
+            typeBtnPanel.add(tmpAI);
+            typeBtnPanel.add(tmpHuman,"wrap");
+            tempPanel.add(typeBtnPanel);
+            
             tempBtnGroup.add(tmpAI);
             tempBtnGroup.add(tmpHuman);
             playerIsAIRadios.add(tmpAI);
@@ -157,11 +160,8 @@ public enum VSubmenuPlanechase implements IVSubmenu<CSubmenuPlanechase> {
             planarDeckLists.add(tempPlanarDeckList);
 
             playerPanels.add(tempPanel);
-            if (i == 0) {
-                tabPane.add("Human", tempPanel);
-            } else {
-                tabPane.add("Opponent " + i, tempPanel);
-            }
+            
+            tabPane.add("Player " + (i+1), tempPanel);
         }
 
         final String strCheckboxConstraints = "h 30px!, gap 0 20px 0 0";
@@ -185,7 +185,7 @@ public enum VSubmenuPlanechase implements IVSubmenu<CSubmenuPlanechase> {
         }
         else {
             for (int i = currentNumTabsShown; i <= toShow; i++) {
-                tabPane.add("Opponent " + i, playerPanels.get(i));
+                tabPane.add("Player " + i, playerPanels.get(i));
             }
             currentNumTabsShown = tabPane.getComponentCount() - 1;
         }
diff --git a/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuVanguard.java b/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuVanguard.java
index ff52c8b1a9d..2676b97f4b3 100644
--- a/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuVanguard.java
+++ b/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuVanguard.java
@@ -146,7 +146,6 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
         FDeckChooser tempChooser;
         FList<Object> tempList;
         CardDetailPanel tempDetail;
-        ButtonGroup tempBtnGroup;
 
         //Settings panel
         FPanel settingsPanel = new FPanel();
@@ -186,15 +185,19 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
             deckChoosers.add(tempChooser);
             avatarLists.add(tempList);
             
-            tempBtnGroup = new ButtonGroup();
+            ButtonGroup tempBtnGroup = new ButtonGroup();            
             FRadioButton tmpAI = new FRadioButton();
             tmpAI.setText("AI");
             tmpAI.setSelected(i != 0);
             FRadioButton tmpHuman = new FRadioButton();
             tmpHuman.setText("Human");
             tmpHuman.setSelected(i == 0);
-            tempPanel.add(tmpAI);
-            tempPanel.add(tmpHuman,"wrap");
+            
+            FPanel typeBtnPanel = new FPanel();
+            typeBtnPanel.add(tmpAI);
+            typeBtnPanel.add(tmpHuman,"wrap");
+            tempPanel.add(typeBtnPanel);
+            
             tempBtnGroup.add(tmpAI);
             tempBtnGroup.add(tmpHuman);
             playerIsAIRadios.add(tmpAI);
@@ -212,11 +215,8 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
             tempPanel.add(tempDetail, "span 1 2, gap 0px 10px 10px 10px, growy, pushy, growx, pushx");
 
             playerPanels.add(tempPanel);
-            if (i == 0) {
-                tabPane.add("Human", tempPanel);
-            } else {
-                tabPane.add("Opponent " + i, tempPanel);
-            }
+            
+            tabPane.add("Player " + (i+1), tempPanel);
         }
 
         final String strCheckboxConstraints = "h 30px!, gap 0 20px 0 0";
@@ -240,7 +240,7 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
         }
         else {
             for (int i = currentNumTabsShown; i <= toShow; i++) {
-                tabPane.add("Opponent " + i, playerPanels.get(i));
+                tabPane.add("Player " + i, playerPanels.get(i));
             }
             currentNumTabsShown = tabPane.getComponentCount() - 1;
         }