diff --git a/src/main/java/world/bentobox/challenges/panel/admin/AdminGUI.java b/src/main/java/world/bentobox/challenges/panel/admin/AdminGUI.java
index 0140aea..644e0d0 100644
--- a/src/main/java/world/bentobox/challenges/panel/admin/AdminGUI.java
+++ b/src/main/java/world/bentobox/challenges/panel/admin/AdminGUI.java
@@ -206,7 +206,7 @@ public class AdminGUI extends CommonGUI
 								new EditChallengeGUI(this.addon,
 									this.world,
 									this.user,
-									this.addon.getChallengesManager().createChallenge(reply),
+									this.addon.getChallengesManager().createChallenge(newName),
 									this.topLabel,
 									this.permissionPrefix,
 									this).build();
@@ -242,7 +242,7 @@ public class AdminGUI extends CommonGUI
 								new EditLevelGUI(this.addon,
 									this.world,
 									this.user,
-									this.addon.getChallengesManager().createLevel(reply),
+									this.addon.getChallengesManager().createLevel(newName),
 									this.topLabel,
 									this.permissionPrefix,
 									this).build();
diff --git a/src/main/java/world/bentobox/challenges/panel/admin/EditChallengeGUI.java b/src/main/java/world/bentobox/challenges/panel/admin/EditChallengeGUI.java
index 7d896c7..f77951f 100644
--- a/src/main/java/world/bentobox/challenges/panel/admin/EditChallengeGUI.java
+++ b/src/main/java/world/bentobox/challenges/panel/admin/EditChallengeGUI.java
@@ -147,7 +147,7 @@ public class EditChallengeGUI extends CommonGUI
 		panelBuilder.item(28, this.createButton(Button.REMOVE_ENTITIES));
 
 		panelBuilder.item(21, this.createButton(Button.REQUIRED_BLOCKS));
-		panelBuilder.item(29, this.createButton(Button.REMOVE_BLOCKS));
+		panelBuilder.item(30, this.createButton(Button.REMOVE_BLOCKS));
 
 		panelBuilder.item(23, this.createButton(Button.SEARCH_RADIUS));
 		panelBuilder.item(25, this.createButton(Button.REQUIRED_PERMISSIONS));