diff --git a/shared/src/main/java/net/blay09/mods/waystones/block/entity/WaystoneBlockEntityBase.java b/shared/src/main/java/net/blay09/mods/waystones/block/entity/WaystoneBlockEntityBase.java
index c908ddb6..c6bf22e6 100644
--- a/shared/src/main/java/net/blay09/mods/waystones/block/entity/WaystoneBlockEntityBase.java
+++ b/shared/src/main/java/net/blay09/mods/waystones/block/entity/WaystoneBlockEntityBase.java
@@ -305,7 +305,7 @@ public void serverTick() {
 
             if (attunementTicks >= getMaxAttunementTicks()) {
                 attunementTicks = 0;
-                craft(recipe);
+                //craft(recipe);
             }
         } else {
             attunementTicks = 0;
diff --git a/shared/src/main/java/net/blay09/mods/waystones/client/gui/screen/WaystoneScreen.java b/shared/src/main/java/net/blay09/mods/waystones/client/gui/screen/WaystoneScreen.java
index ad1901fd..9b323d44 100644
--- a/shared/src/main/java/net/blay09/mods/waystones/client/gui/screen/WaystoneScreen.java
+++ b/shared/src/main/java/net/blay09/mods/waystones/client/gui/screen/WaystoneScreen.java
@@ -35,8 +35,8 @@ public class WaystoneScreen extends AbstractContainerScreen<WaystoneMenu> {
 
     public WaystoneScreen(WaystoneMenu container, Inventory playerInventory, Component title) {
         super(container, playerInventory, title);
-        imageHeight = 196;
-        inventoryLabelY = 93;
+        imageHeight = 222;
+        inventoryLabelY = imageHeight - 94;
     }
 
     @Override
@@ -116,28 +116,10 @@ protected void renderBg(GuiGraphics guiGraphics, float partialTicks, int mouseX,
         guiGraphics.setColor(1f, 1f, 1f, 1f);
         guiGraphics.blit(WAYSTONE_GUI_TEXTURES, leftPos, topPos, 0, 0, imageWidth, imageHeight);
 
-        guiGraphics.blit(WAYSTONE_GUI_TEXTURES,
-                leftPos + 107 - (int) (10 * menu.getAttunementProgress()),
-                topPos + 54,
-                176,
-                0,
-                (int) (10 * menu.getAttunementProgress()),
-                4);
-        guiGraphics.blit(WAYSTONE_GUI_TEXTURES, leftPos + 69, topPos + 54, 176, 0, (int) (10 * menu.getAttunementProgress()), 4);
-        guiGraphics.blit(WAYSTONE_GUI_TEXTURES,
-                leftPos + 72,
-                topPos + 68 - (int) (10 * menu.getAttunementProgress()),
-                176,
-                4,
-                4,
-                (int) (10 * menu.getAttunementProgress()));
-        guiGraphics.blit(WAYSTONE_GUI_TEXTURES,
-                leftPos + 100,
-                topPos + 68 - (int) (10 * menu.getAttunementProgress()),
-                176,
-                4,
-                4,
-                (int) (10 * menu.getAttunementProgress()));
+        guiGraphics.blit(WAYSTONE_GUI_TEXTURES, leftPos + 86, topPos + 65, 176, 4, 4, (int) (10 * menu.getAttunementProgress()));
+        guiGraphics.blit(WAYSTONE_GUI_TEXTURES, leftPos + 107 - (int) (10 * menu.getAttunementProgress()), topPos + 82, 176, 0, (int) (10 * menu.getAttunementProgress()), 4);
+        guiGraphics.blit(WAYSTONE_GUI_TEXTURES, leftPos + 86, topPos + 103 - (int) (10 * menu.getAttunementProgress()), 176, 4, 4, (int) (10 * menu.getAttunementProgress()));
+        guiGraphics.blit(WAYSTONE_GUI_TEXTURES, leftPos + 69, topPos + 82, 176, 0, (int) (10 * menu.getAttunementProgress()), 4);
     }
 
     @Override
diff --git a/shared/src/main/java/net/blay09/mods/waystones/menu/WarpPlateAttunementSlot.java b/shared/src/main/java/net/blay09/mods/waystones/menu/WarpPlateAttunementSlot.java
index 968e44ad..c5216791 100644
--- a/shared/src/main/java/net/blay09/mods/waystones/menu/WarpPlateAttunementSlot.java
+++ b/shared/src/main/java/net/blay09/mods/waystones/menu/WarpPlateAttunementSlot.java
@@ -1,22 +1,21 @@
 package net.blay09.mods.waystones.menu;
 
-import net.blay09.mods.waystones.block.entity.WarpPlateBlockEntity;
-import net.blay09.mods.waystones.tag.ModItemTags;
+import net.blay09.mods.waystones.block.entity.WaystoneBlockEntityBase;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
 
 public class WarpPlateAttunementSlot extends Slot {
-    private final WarpPlateBlockEntity warpPlate;
+    private final WaystoneBlockEntityBase blockEntity;
 
-    public WarpPlateAttunementSlot(WarpPlateBlockEntity container, int slot, int x, int y) {
-        super(container, slot, x, y);
-        warpPlate = container;
+    public WarpPlateAttunementSlot(WaystoneBlockEntityBase blockEntity, int slot, int x, int y) {
+        super(blockEntity, slot, x, y);
+        this.blockEntity = blockEntity;
     }
 
     @Override
     public boolean mayPickup(Player player) {
-        return warpPlate.isCompletedFirstAttunement() && super.mayPickup(player);
+        return blockEntity.isCompletedFirstAttunement() && super.mayPickup(player);
     }
 
     @Override
@@ -26,4 +25,5 @@ public int getMaxStackSize(ItemStack stack) {
         }
         return stack.getMaxStackSize();
     }
+
 }
diff --git a/shared/src/main/java/net/blay09/mods/waystones/menu/WaystoneMenu.java b/shared/src/main/java/net/blay09/mods/waystones/menu/WaystoneMenu.java
index 2db9910a..52bde122 100644
--- a/shared/src/main/java/net/blay09/mods/waystones/menu/WaystoneMenu.java
+++ b/shared/src/main/java/net/blay09/mods/waystones/menu/WaystoneMenu.java
@@ -36,20 +36,20 @@ public WaystoneMenu(int windowId, IWaystone waystone, WaystoneBlockEntityBase bl
 
         checkContainerDataCount(containerData, 1);
 
-        addSlot(new Slot(blockEntity, 0, 80, 48));
-        addSlot(new Slot(blockEntity, 1, 52, 48));
-        addSlot(new Slot(blockEntity, 2, 66, 69));
-        addSlot(new Slot(blockEntity, 3, 94, 69));
-        addSlot(new Slot(blockEntity, 4, 108, 48));
+        addSlot(new WarpPlateAttunementSlot(blockEntity, 0, 80, 76));
+        addSlot(new WarpPlateAttunementSlot(blockEntity, 1, 80, 48));
+        addSlot(new WarpPlateAttunementSlot(blockEntity, 2, 108, 76));
+        addSlot(new WarpPlateAttunementSlot(blockEntity, 3, 80, 104));
+        addSlot(new WarpPlateAttunementSlot(blockEntity, 4, 52, 76));
 
         for (int i = 0; i < 3; ++i) {
             for (int j = 0; j < 9; ++j) {
-                addSlot(new Slot(playerInventory, j + i * 9 + 9, 8 + j * 18, 104 + i * 18));
+                addSlot(new Slot(playerInventory, j + i * 9 + 9, 8 + j * 18, 140 + i * 18));
             }
         }
 
         for (int j = 0; j < 9; ++j) {
-            addSlot(new Slot(playerInventory, j, 8 + j * 18, 162));
+            addSlot(new Slot(playerInventory, j, 8 + j * 18, 198));
         }
 
         addDataSlots(containerData);
diff --git a/shared/src/main/resources/assets/waystones/textures/gui/menu/waystone.png b/shared/src/main/resources/assets/waystones/textures/gui/menu/waystone.png
index 97f10f8f..15612cbe 100644
Binary files a/shared/src/main/resources/assets/waystones/textures/gui/menu/waystone.png and b/shared/src/main/resources/assets/waystones/textures/gui/menu/waystone.png differ