diff --git a/src/main/java/forge/ImageCache.java b/src/main/java/forge/ImageCache.java
index 6ae2be90739..35a5cd5f4ff 100644
--- a/src/main/java/forge/ImageCache.java
+++ b/src/main/java/forge/ImageCache.java
@@ -86,11 +86,13 @@ public class ImageCache {
         if (null != cached) {
             return cached;
         }
+        
+        boolean mayEnlarge = Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_SCALE_LARGER);
 
         BufferedImage original = getImage(key);
         double scale = Math.min((double) width / original.getWidth(), (double) height / original.getHeight());
         // here would be the place to limit the scaling option in menu ?
-        if ((scale > 1) && !Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_SCALE_LARGER)) {
+        if ((scale > 1) && !mayEnlarge) {
             scale = 1;
         }
 
@@ -103,8 +105,8 @@ public class ImageCache {
             ResampleOp resampler = new ResampleOp(destWidth, destHeight);
             
             result = resampler.filter(original, null);
+            CACHE.put(resizedKey, result);
         }
-        CACHE.put(resizedKey, result);
         return result;
     }
 
diff --git a/src/main/java/forge/deck/DeckgenUtil.java b/src/main/java/forge/deck/DeckgenUtil.java
index c60045c8d9b..acf3cb7c842 100644
--- a/src/main/java/forge/deck/DeckgenUtil.java
+++ b/src/main/java/forge/deck/DeckgenUtil.java
@@ -116,7 +116,7 @@ public class DeckgenUtil {
      * @param selection {java.lang.String}
      * @return {@link forge.deck.Deck}
      */
-    public static Deck buildCustomDeck(final String[] selection) {
+    public static Deck getConstructedDeck(final String[] selection) {
         return Singletons.getModel().getDecks().getConstructed().get(selection[0]);
     }
 
diff --git a/src/main/java/forge/gui/deckeditor/views/VAllDecks.java b/src/main/java/forge/gui/deckeditor/views/VAllDecks.java
index 34d5f85695d..a1d1a237c31 100644
--- a/src/main/java/forge/gui/deckeditor/views/VAllDecks.java
+++ b/src/main/java/forge/gui/deckeditor/views/VAllDecks.java
@@ -93,7 +93,7 @@ public enum VAllDecks implements IVDoc<CAllDecks> {
 
         parentCell.getBody().add(btnImport, "w 120px!, h 30px!, gap 0 0 5px 5px");
 
-        //parentCell.getBody().add(scroller, "w 96%!, h 96%!, gap 2% 0 2% 0");
+        parentCell.getBody().add(scroller, "w 96%!, growy, pushy, gap 2% 0 2% 0");
     }
 
     //========== Retrieval methods
diff --git a/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletBuild.java b/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletBuild.java
index 1152f004289..b36746192f1 100644
--- a/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletBuild.java
+++ b/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletBuild.java
@@ -245,7 +245,7 @@ public enum CSubmenuGauntletBuild implements ICDoc {
             deckToAdd = DeckgenUtil.buildThemeDeck(selection);
         }
         else {
-            deckToAdd = DeckgenUtil.buildCustomDeck(selection);
+            deckToAdd = DeckgenUtil.getConstructedDeck(selection);
         }
 
         workingDecks.add(deckToAdd);
diff --git a/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletContests.java b/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletContests.java
index 0dd857c7e5f..4644c449a7a 100644
--- a/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletContests.java
+++ b/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletContests.java
@@ -230,7 +230,7 @@ public enum CSubmenuGauntletContests implements ICDoc {
                 userDeck = DeckgenUtil.buildThemeDeck(selection);
             }
             else {
-                userDeck = DeckgenUtil.buildCustomDeck(selection);
+                userDeck = DeckgenUtil.getConstructedDeck(selection);
             }
             gd.setUserDeck(userDeck);
         }
diff --git a/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletQuick.java b/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletQuick.java
index 11cb33673bc..1c321ad0d6b 100644
--- a/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletQuick.java
+++ b/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletQuick.java
@@ -240,7 +240,7 @@ public enum CSubmenuGauntletQuick implements ICDoc {
             userDeck = DeckgenUtil.buildThemeDeck(selection);
         }
         else {
-            userDeck = DeckgenUtil.buildCustomDeck(selection);
+            userDeck = DeckgenUtil.getConstructedDeck(selection);
         }
 
         // Generate gauntlet decks
diff --git a/src/main/java/forge/gui/toolbox/FDeckChooser.java b/src/main/java/forge/gui/toolbox/FDeckChooser.java
index 65a6451ac48..22011d43be5 100644
--- a/src/main/java/forge/gui/toolbox/FDeckChooser.java
+++ b/src/main/java/forge/gui/toolbox/FDeckChooser.java
@@ -271,7 +271,7 @@ public class FDeckChooser extends JPanel {
         }
         // Custom deck
         else if (lst0.getName().equals(ESubmenuConstructedTypes.CUSTOM.toString())) {
-            deck = DeckgenUtil.buildCustomDeck(selection);
+            deck = DeckgenUtil.getConstructedDeck(selection);
         }
         // Failure, for some reason
         else {