diff --git a/src/main/java/forge/gui/home/variant/VSubmenuArchenemy.java b/src/main/java/forge/gui/home/variant/VSubmenuArchenemy.java
index cac4d442df2..3af9df999d0 100644
--- a/src/main/java/forge/gui/home/variant/VSubmenuArchenemy.java
+++ b/src/main/java/forge/gui/home/variant/VSubmenuArchenemy.java
@@ -210,7 +210,7 @@ public enum VSubmenuArchenemy implements IVSubmenu<CSubmenuArchenemy> {
             fdc.populate();
         }
 
-        VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().add(tabPane, "gap 20px 20px 20px 20px, pushx, pushy, growx, growy");
+        VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().add(tabPane, "gap 20px 20px 20px 0px, pushx, pushy, growx, growy");
 
         VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().add(pnlStart, "gap 0 0 3.5%! 3.5%!, ax center");
 
diff --git a/src/main/java/forge/gui/home/variant/VSubmenuPlanechase.java b/src/main/java/forge/gui/home/variant/VSubmenuPlanechase.java
index 97699c6521b..d64af1bf868 100644
--- a/src/main/java/forge/gui/home/variant/VSubmenuPlanechase.java
+++ b/src/main/java/forge/gui/home/variant/VSubmenuPlanechase.java
@@ -211,7 +211,7 @@ public enum VSubmenuPlanechase implements IVSubmenu<CSubmenuPlanechase> {
             fdc.populate();
         }
 
-        VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().add(tabPane, "gap 20px 20px 20px 20px, pushx, pushy, growx, growy");
+        VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().add(tabPane, "gap 20px 20px 20px 0px, pushx, pushy, growx, growy");
 
         VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().add(pnlStart, "gap 0 0 3.5%! 3.5%!, ax center");
 
diff --git a/src/main/java/forge/gui/home/variant/VSubmenuVanguard.java b/src/main/java/forge/gui/home/variant/VSubmenuVanguard.java
index d4e6a7265dd..dfc2f01fb5f 100644
--- a/src/main/java/forge/gui/home/variant/VSubmenuVanguard.java
+++ b/src/main/java/forge/gui/home/variant/VSubmenuVanguard.java
@@ -66,7 +66,7 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
     private final JCheckBox cbRemoveSmall = new FCheckBox("Remove Small Creatures");
 
     private final List<CardPrinted> allAvatars = new ArrayList<CardPrinted>();
-    
+
     private final List<CardPrinted> allAiAvatars = new ArrayList<CardPrinted>();
     private final List<CardPrinted> nonRandomHumanAvatars = new ArrayList<CardPrinted>();
     private final List<CardPrinted> nonRandomAiAvatars = new ArrayList<CardPrinted>();
@@ -265,7 +265,7 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
             fdc.populate();
         }
 
-        VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().add(tabPane, "gap 20px 20px 20px 20px, pushx, pushy, growx, growy");
+        VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().add(tabPane, "gap 20px 20px 20px 0px, pushx, pushy, growx, growy");
 
         VHomeUI.SINGLETON_INSTANCE.getPnlDisplay().add(pnlStart, "gap 0 0 3.5%! 3.5%!, ax center");
 
@@ -346,10 +346,16 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
         return deckChoosers;
     }
 
+    /**
+     * @return the avatarLists
+     */
     public List<FList> getAvatarLists() {
         return avatarLists;
     }
 
+    /**
+     * @return the currentNumTabsShown
+     */
     public int getNumPlayers() {
         return currentNumTabsShown;
     }
@@ -358,10 +364,11 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
      * @return the allAvatars
      */
     public Iterable<CardPrinted> getAllAvatars() {
-        if ( allAvatars.isEmpty() ) {
-            for(CardPrinted c : CardDb.variants().getAllCards()) {
-                if( c.getRules().getType().isVanguard())
+        if (allAvatars.isEmpty()) {
+            for (CardPrinted c : CardDb.variants().getAllCards()) {
+                if (c.getRules().getType().isVanguard()) {
                     allAvatars.add(c);
+                }
             }
         }
         return allAvatars;