diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageMagic.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageMagic.java
index 8753f0430..bda39aff3 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageMagic.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageMagic.java
@@ -67,7 +67,7 @@ public class GuiNpcManageMagic extends GuiNPCInterface2 implements ISubGuiListen
         int y = guiTop + 5;
 
         // Toggle button to switch between global and cycle views.
-        addButton(new GuiToggleButton(50, guiLeft + 368, guiTop + ySize - 10, viewByCycle));
+        addButton(new GuiToggleButton(50, guiLeft + 368, guiTop + ySize - 60, viewByCycle));
         ((GuiToggleButton) getButton(50)).setTextureOff(specialIcons).setTextureOffPos(16, 0);
         ((GuiToggleButton) getButton(50)).setIconTexture(specialIcons).setIconPos(16, 16, 16, 0);
 
@@ -103,20 +103,24 @@ public class GuiNpcManageMagic extends GuiNPCInterface2 implements ISubGuiListen
             addTextField(new GuiNpcTextField(66, this, fontRendererObj, dividerX + dividerWidth, y + 185 + 3, regionRight - (dividerX + dividerWidth), 20, magicSearch));
 
             // Left side cycle management buttons.
-            addButton(new GuiNpcButton(10, guiLeft + 3, guiTop + 8, 58, 20, "Cycles"));
+            addButton(new GuiNpcButton(10, guiLeft + 3, guiTop + 8, 58, 20, "menu.cycles"));
             getButton(10).setEnabled(false);
             addButton(new GuiNpcButton(4, guiLeft + 3, guiTop + 38, 58, 20, "gui.add"));
             addButton(new GuiNpcButton(5, guiLeft + 3, guiTop + 61, 58, 20, "gui.remove"));
             addButton(new GuiNpcButton(6, guiLeft + 3, guiTop + 94, 58, 20, "gui.edit"));
 
             // Right side magic management buttons.
-            addButton(new GuiNpcButton(33, guiLeft + 358, guiTop + 8, 58, 20, "Magics"));
+            addButton(new GuiNpcButton(33, guiLeft + 358, guiTop + 8, 58, 20, "menu.magics"));
             getButton(33).setEnabled(false);
+
             addButton(new GuiNpcButton(0, guiLeft + 358, guiTop + 38, 58, 20, "gui.add"));
             getButton(0).setEnabled(false);
             addButton(new GuiNpcButton(1, guiLeft + 358, guiTop + 61, 58, 20, "gui.remove"));
             getButton(1).setEnabled(false);
             addButton(new GuiNpcButton(2, guiLeft + 358, guiTop + 94, 58, 20, "gui.edit"));
+
+            addLabel(new GuiNpcLabel(200, "ID", guiLeft + 4, guiTop + 4 + 3 + 185));
+            addLabel(new GuiNpcLabel(201, "" + "", guiLeft + 4, guiTop + 4 + 3 + 195));
         } else {
             // --- Global Magic View: Single Scroll (all magics) ---
             if (rightScroll == null) {
@@ -128,7 +132,7 @@ public class GuiNpcManageMagic extends GuiNPCInterface2 implements ISubGuiListen
             this.addScroll(rightScroll);
             addTextField(new GuiNpcTextField(66, this, fontRendererObj, guiLeft + 10, y + 185 + 3, xSize - 75, 20, magicSearch));
 
-            addButton(new GuiNpcButton(33, guiLeft + 358, guiTop + 8, 58, 20, "Magics"));
+            addButton(new GuiNpcButton(33, guiLeft + 358, guiTop + 8, 58, 20, "menu.magics"));
             getButton(33).setEnabled(false);
 
             // Global magic management buttons.
@@ -153,6 +157,11 @@ public class GuiNpcManageMagic extends GuiNPCInterface2 implements ISubGuiListen
                     rightScroll.setList(applyMagicSearchFilter(currentMagicList));
             }
         }
+
+        addLabel(new GuiNpcLabel(100, "ID", guiLeft + 358, guiTop + 4 + 3 + 185));
+        addLabel(new GuiNpcLabel(101, "" + "", guiLeft + 358, guiTop + 4 + 3 + 195));
+
+        updateButtons();
     }
 
     @Override
@@ -187,6 +196,50 @@ public class GuiNpcManageMagic extends GuiNPCInterface2 implements ISubGuiListen
             }
         }
         super.mouseClicked(mouseX, mouseY, mouseButton);
+
+
+    }
+
+    public void updateButtons(){
+        // Magic Buttons
+        GuiButton button = getButton(2);
+        if(button != null){
+            button.enabled = selectedMagic != null;
+        }
+
+        if(viewByCycle){
+            button = getButton(1);
+            if(button != null){
+                button.enabled = selectedMagic != null;
+            }
+        }
+
+        button = getButton(5);
+        if(button != null){
+            button.enabled = selectedCycle != null;
+        }
+
+        button = getButton(6);
+        if(button != null){
+            button.enabled = selectedCycle != null;
+        }
+
+
+        if(getLabel(201) != null){
+            if(selectedCycle != null){
+                getLabel(201).label = selectedCycle.id + "";
+            } else {
+                getLabel(201).label = "";
+            }
+        }
+
+        if(getLabel(101) != null){
+            if(selectedMagic != null){
+                getLabel(101).label = selectedMagic.id + "";
+            } else {
+                getLabel(101).label = "";
+            }
+        }
     }
 
     @Override
@@ -307,6 +360,13 @@ public class GuiNpcManageMagic extends GuiNPCInterface2 implements ISubGuiListen
                     // Cycle view: start with an empty magic list.
                     currentMagicList.clear();
                 }
+
+                if(rightScroll != null)
+                    rightScroll.selected = -1;
+
+                if(leftScroll != null)
+                    leftScroll.selected = -1;
+
                 initGui();
                 return;
             // --- Cycle Management Buttons ---
@@ -358,6 +418,8 @@ public class GuiNpcManageMagic extends GuiNPCInterface2 implements ISubGuiListen
                 }
                 break;
         }
+
+        updateButtons();
     }
 
     @Override
@@ -461,5 +523,7 @@ public class GuiNpcManageMagic extends GuiNPCInterface2 implements ISubGuiListen
             if (rightScroll != null)
                 rightScroll.selected = -1;
         }
+
+        updateButtons();
     }
 }
diff --git a/src/main/resources/assets/customnpcs/lang/en_US.lang b/src/main/resources/assets/customnpcs/lang/en_US.lang
index 5c5208968..9b8d16b3a 100644
--- a/src/main/resources/assets/customnpcs/lang/en_US.lang
+++ b/src/main/resources/assets/customnpcs/lang/en_US.lang
@@ -550,6 +550,8 @@ menu.role=Role
 menu.animations=Animations
 menu.tags=Tags
 menu.general=General
+menu.magics=Magics
+menu.cycles=Cycles
 
 cloner.tagFilters=Tag Filters
 cloner.tagVisibility=Tag Visibility