diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/block/ModelSwitcherGui.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/block/ModelSwitcherGui.java
index d95735874..97e47321d 100644
--- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/block/ModelSwitcherGui.java
+++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/block/ModelSwitcherGui.java
@@ -148,7 +148,7 @@ public void resize(Minecraft pMinecraft, int pWidth, int pHeight) {
         if (this.description != null) {
             value = this.description.getValue();
         }
-        super.resize(pMinecraft, width, height);
+        super.resize(pMinecraft, pWidth, pHeight);
         if (this.description != null) {
             this.description.setValue(value);
         }
@@ -170,7 +170,7 @@ public void render(PoseStack pPoseStack, int pMouseX, int pMouseY, float pPartia
         }
         drawCenteredString(pPoseStack, font, String.format("%d/%d", page + 1, (infoList.size() - 1) / maxRow + 1), leftPos + 193, topPos + 12, 0xffffff);
         if (this.description != null) {
-            InventoryScreen.renderEntityInInventory(leftPos + 30, topPos + 60, 25, leftPos - 150, topPos - 50, maid);
+            InventoryScreen.renderEntityInInventory(leftPos + 30, topPos + 60, 25, -25, -20, maid);
             this.description.render(pPoseStack, pMouseX, pMouseY, pPartialTick);
         }
         super.render(pPoseStack, pMouseX, pMouseY, pPartialTick);
diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/block/ModelSwitcherModelGui.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/block/ModelSwitcherModelGui.java
index ef0028ff9..e6ad7e34a 100644
--- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/block/ModelSwitcherModelGui.java
+++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/block/ModelSwitcherModelGui.java
@@ -53,20 +53,12 @@ protected void drawRightEntity(PoseStack pPoseStack, int posX, int posY, MaidMod
             int textureSize = 24;
             RenderSystem.setShader(GameRenderer::getPositionTexShader);
             RenderSystem.setShaderTexture(0, cacheIconId);
-            RenderSystem.disableDepthTest();
             blit(pPoseStack, posX - textureSize / 2, posY - textureSize, textureSize, textureSize, 0, 0, textureSize, textureSize, textureSize, textureSize);
         } else {
             drawEntity(pPoseStack, posX, posY, modelItem);
         }
     }
 
-    private float[] getRgbFromHash(int hashCode) {
-        float r = (float) (hashCode >> 16 & 255) / 255.0F;
-        float g = (float) (hashCode >> 8 & 255) / 255.0F;
-        float b = (float) (hashCode & 255) / 255.0F;
-        return new float[]{r, g, b};
-    }
-
     @Override
     protected void openDetailsGui(EntityMaid maid, MaidModelInfo modelInfo) {
         if (minecraft != null && modelInfo.getEasterEgg() == null) {
diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/entity/model/ChairModelGui.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/entity/model/ChairModelGui.java
index d1a06771b..42d536660 100644
--- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/entity/model/ChairModelGui.java
+++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/entity/model/ChairModelGui.java
@@ -44,7 +44,6 @@ protected void drawRightEntity(PoseStack pPoseStack, int posX, int posY, ChairMo
             int textureSize = 24;
             RenderSystem.setShader(GameRenderer::getPositionTexShader);
             RenderSystem.setShaderTexture(0, cacheIconId);
-            RenderSystem.disableDepthTest();
             blit(pPoseStack, posX - textureSize / 2, posY - textureSize, textureSize, textureSize, 0, 0, textureSize, textureSize, textureSize, textureSize);
         } else {
             drawEntity(pPoseStack, posX, posY, modelItem);
diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/entity/model/MaidModelGui.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/entity/model/MaidModelGui.java
index a91664968..3c5c1c554 100644
--- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/entity/model/MaidModelGui.java
+++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/gui/entity/model/MaidModelGui.java
@@ -51,7 +51,6 @@ protected void drawRightEntity(PoseStack pPoseStack, int posX, int posY, MaidMod
             int textureSize = 24;
             RenderSystem.setShader(GameRenderer::getPositionTexShader);
             RenderSystem.setShaderTexture(0, cacheIconId);
-            RenderSystem.disableDepthTest();
             blit(pPoseStack, posX - textureSize / 2, posY - textureSize, textureSize, textureSize, 0, 0, textureSize, textureSize, textureSize, textureSize);
         } else {
             drawEntity(pPoseStack, posX, posY, modelItem);
@@ -124,7 +123,7 @@ protected void setRowIndex(int rowIndex) {
         ROW_INDEX = rowIndex;
     }
 
-    private void drawEntity(PoseStack pPoseStack,  int posX, int posY, MaidModelInfo modelItem) {
+    private void drawEntity(PoseStack pPoseStack, int posX, int posY, MaidModelInfo modelItem) {
         Level world = getMinecraft().level;
         if (world == null) {
             return;
diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/renderer/texture/CacheIconTexture.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/renderer/texture/CacheIconTexture.java
index 60e197a06..4a05e1054 100644
--- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/renderer/texture/CacheIconTexture.java
+++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/renderer/texture/CacheIconTexture.java
@@ -26,6 +26,9 @@ public void load(ResourceManager manager) {
     }
 
     private void doLoad() {
+        if (imageIn == null) {
+            return;
+        }
         int width = imageIn.getWidth();
         int height = imageIn.getHeight();
         TextureUtil.prepareImage(this.getId(), 0, width, height);
diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/item/MaidGroup.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/item/MaidGroup.java
index a18c6232d..8345c8b40 100644
--- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/item/MaidGroup.java
+++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/item/MaidGroup.java
@@ -11,7 +11,7 @@
 import static com.github.tartaricacid.touhoulittlemaid.init.InitItems.*;
 
 public class MaidGroup extends CreativeModeTab {
-    public static CreativeModeTab MAIN_TAB = new MaidGroup("main", HAKUREI_GOHEI);
+    public static CreativeModeTab MAIN_TAB = new MaidGroup("main", HAKUREI_GOHEI).setEnchantmentCategories(InitEnchantments.GOHEI);
     public static CreativeModeTab GARAGE_KIT_TAB = new MaidGroup("garage_kit", GARAGE_KIT);
     public static CreativeModeTab CHAIR_TAB = new MaidGroup("chair", CHAIR);
 
@@ -23,7 +23,6 @@ public MaidGroup(String label, RegistryObject<Item> iconItem) {
         super(String.format("touhou_little_maid.%s", label));
         this.displayName = Component.translatable(String.format("item_group.%s.%s", TouhouLittleMaid.MOD_ID, label));
         this.iconItem = iconItem;
-        this.setEnchantmentCategories(InitEnchantments.GOHEI);
     }
 
     @Override