diff --git a/Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java b/Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java
index 885d6daca9..ea774ec703 100644
--- a/Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java
+++ b/Mage.Client/src/main/java/mage/client/util/GUISizeHelper.java
@@ -13,8 +13,6 @@ import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 import mage.client.MageFrame;
 import mage.client.dialog.PreferencesDialog;
-import mage.sets.avacynrestored.GuiseOfFire;
-import org.apache.log4j.Logger;
 import org.mage.card.arcane.CardRenderer;
 
 /**
@@ -145,12 +143,10 @@ public class GUISizeHelper {
         otherZonesCardDimension = new Dimension(CARD_IMAGE_WIDTH * otherZonesCardSize / 42, CARD_IMAGE_HEIGHT * otherZonesCardSize / 42);
         if (PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_RENDERING_FALLBACK, "false").equals("false")) {
             otherZonesCardVerticalOffset = CardRenderer.getCardTopHeight(otherZonesCardDimension.width);
+        } else if (otherZonesCardSize > 29) {
+            otherZonesCardVerticalOffset = otherZonesCardDimension.height / 8;
         } else {
-            if (otherZonesCardSize > 29) {
-                otherZonesCardVerticalOffset = otherZonesCardDimension.height / 8;
-            } else {
-                otherZonesCardVerticalOffset = otherZonesCardDimension.height / 10;
-            }
+            otherZonesCardVerticalOffset = otherZonesCardDimension.height / 10;
         }
 
         int battlefieldCardMinSize = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GUI_CARD_BATTLEFIELD_MIN_SIZE, 10);
diff --git a/Mage.Sets/src/mage/sets/worldwake/QuestForTheGoblinLord.java b/Mage.Sets/src/mage/sets/worldwake/QuestForTheGoblinLord.java
index b0d83912ea..a19993749d 100644
--- a/Mage.Sets/src/mage/sets/worldwake/QuestForTheGoblinLord.java
+++ b/Mage.Sets/src/mage/sets/worldwake/QuestForTheGoblinLord.java
@@ -28,12 +28,6 @@
 package mage.sets.worldwake;
 
 import java.util.UUID;
-
-import mage.constants.CardType;
-import mage.constants.Rarity;
-import mage.constants.Duration;
-import mage.constants.TargetController;
-import mage.constants.Zone;
 import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.condition.common.SourceHasCounterCondition;
@@ -41,6 +35,11 @@ import mage.abilities.decorator.ConditionalContinuousEffect;
 import mage.abilities.effects.common.continuous.BoostAllEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.TargetController;
+import mage.constants.Zone;
 import mage.counters.CounterType;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterControlledCreaturePermanent;
@@ -54,7 +53,7 @@ import mage.filter.predicate.permanent.ControllerPredicate;
  */
 public class QuestForTheGoblinLord extends CardImpl {
 
-    private static final String rule = "As long as Quest for the Goblin Lord has five or more quest counters on it, creatures you control get +2/+0.";
+    private static final String rule = "As long as {this} has five or more quest counters on it, creatures you control get +2/+0";
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
     private static final FilterPermanent goblinFilter = new FilterControlledCreaturePermanent();
 
@@ -67,7 +66,6 @@ public class QuestForTheGoblinLord extends CardImpl {
         super(ownerId, 86, "Quest for the Goblin Lord", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{R}");
         this.expansionSetCode = "WWK";
 
-
         // Whenever a Goblin enters the battlefield under your control, you may put a quest counter on Quest for the Goblin Lord.
         this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.QUEST.createInstance()), goblinFilter, true));