diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiEffectGeneral.java b/src/main/java/noppes/npcs/client/gui/SubGuiEffectGeneral.java
index 6c33d9731..a5f8f0418 100644
--- a/src/main/java/noppes/npcs/client/gui/SubGuiEffectGeneral.java
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiEffectGeneral.java
@@ -39,7 +39,7 @@ public class SubGuiEffectGeneral extends SubGuiInterface implements ITextfieldLi
         super.initGui();
         GuiMenuTopButton close = new GuiMenuTopButton(-5, guiLeft + xSize - 22, guiTop - 10, "X");
 
-        GuiMenuTopButton general = new GuiMenuTopButton(-1, guiLeft + 4, guiTop - 10, "display.general");
+        GuiMenuTopButton general = new GuiMenuTopButton(-1, guiLeft + 4, guiTop - 10, "menu.general");
         GuiMenuTopButton scripts = new GuiMenuTopButton(-2, general.xPosition + general.getWidth(), guiTop - 10, "script.scripts");
 
         close.active = false;
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java
index 2b27317d4..b227cc829 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java
@@ -50,7 +50,7 @@ public class GuiNPCManageEffects extends GuiNPCInterface2 implements ICustomScro
         addButton(new GuiNpcButton(1, guiLeft + 368, guiTop + 32, 45, 20, "gui.remove"));
         getButton(1).enabled = effect != null && effect.id != -1;
 
-        addButton(new GuiNpcButton(2, guiLeft + 368, guiTop + 56, 45, 20, "gui.clone"));
+        addButton(new GuiNpcButton(2, guiLeft + 368, guiTop + 56, 45, 20, "gui.copy"));
         getButton(2).enabled = effect != null && effect.id != -1;
 
         addButton(new GuiNpcButton(3, guiLeft + 368, guiTop + 80, 45, 20, "gui.edit"));
@@ -173,7 +173,7 @@ public class GuiNPCManageEffects extends GuiNPCInterface2 implements ICustomScro
 
         // TODO: Fix ICONS
         // textureManager.bindTexture(new ResourceLocation(CustomNpcPlusDBC.ID + ":textures/gui/icons.png"));
-        func_152125_a(x, y, 0, 240, 16, 16, iconRenderSize, iconRenderSize, 256, 256);
+        // func_152125_a(x, y, 0, 240, 16, 16, iconRenderSize, iconRenderSize, 256, 256);
         GL11.glEnable(GL11.GL_DEPTH_TEST);
 
         x += iconRenderSize + 3;
diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java
index 65835fa6b..7ffbc3b34 100644
--- a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java
+++ b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java
@@ -142,8 +142,7 @@ public abstract class GuiNPCInterface extends GuiScreen {
                     tf.mouseClicked(i, j, k);
 
             for (GuiScrollWindow guiScrollableComponent : scrollWindows.values()) {
-                if (guiScrollableComponent.isMouseOver(i, j))
-                    guiScrollableComponent.mouseClicked(i, j, k);
+                guiScrollableComponent.mouseClicked(i, j, k);
             }
 
             if (k == 0) {
diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiScrollWindow.java b/src/main/java/noppes/npcs/client/gui/util/GuiScrollWindow.java
index 3b7e27b46..6c81a0b86 100644
--- a/src/main/java/noppes/npcs/client/gui/util/GuiScrollWindow.java
+++ b/src/main/java/noppes/npcs/client/gui/util/GuiScrollWindow.java
@@ -94,7 +94,6 @@ public class GuiScrollWindow extends GuiScreen implements ITextfieldListener, IC
     }
 
     public void mouseClicked(int i, int j, int k) {
-
         i = i - xPos;
         j = (int) (j - yPos + scrollY);
 
diff --git a/src/main/java/noppes/npcs/controllers/CustomEffectController.java b/src/main/java/noppes/npcs/controllers/CustomEffectController.java
index 17387ce51..c307d3173 100644
--- a/src/main/java/noppes/npcs/controllers/CustomEffectController.java
+++ b/src/main/java/noppes/npcs/controllers/CustomEffectController.java
@@ -304,13 +304,11 @@ public class CustomEffectController implements ICustomEffectHandler {
             customEffect.setID(getUnusedId());
             while (has(customEffect.getName()))
                 customEffect.setName(customEffect.getName() + "_");
-        } else {
-            CustomEffect existing = getCustomEffects().get(customEffect.getID());
-            if (existing != null && !existing.name.equalsIgnoreCase(customEffect.getName()))
-                while (has(customEffect.getName()))
-                    customEffect.setName(customEffect.getName() + "_");
         }
 
+        while (hasOther(customEffect.getName(), customEffect.getID()))
+            customEffect.setName(customEffect.getName() + "_");
+
         getCustomEffects().remove(customEffect.getID());
         getCustomEffects().put(customEffect.getID(), (CustomEffect) customEffect);
 
@@ -337,6 +335,14 @@ public class CustomEffectController implements ICustomEffectHandler {
         return getCustomEffects().get(customEffect.getID());
     }
 
+    private boolean hasOther(String name, int id) {
+        for (CustomEffect effect : getCustomEffects().values()) {
+            if (effect.getID() != id && effect.getName().equalsIgnoreCase(name))
+                return true;
+        }
+        return false;
+    }
+
     public void clearEffects(EntityPlayer player) {
         Map<EffectKey, PlayerEffect> effects = getPlayerEffects(player);
         if (effects != null) {
diff --git a/src/main/resources/assets/customnpcs/lang/en_US.lang b/src/main/resources/assets/customnpcs/lang/en_US.lang
index 818bf09ad..792e6dce7 100644
--- a/src/main/resources/assets/customnpcs/lang/en_US.lang
+++ b/src/main/resources/assets/customnpcs/lang/en_US.lang
@@ -513,6 +513,7 @@ menu.global=Global
 menu.role=Role
 menu.animations=Animations
 menu.tags=Tags
+menu.general=General
 
 cloner.tagFilters=Tag Filters
 cloner.tagVisibility=Tag Visibility