diff --git a/src/main/java/com/hbm/inventory/container/ContainerCrystallizer.java b/src/main/java/com/hbm/inventory/container/ContainerCrystallizer.java
index 35ca3c64b..07a2d03cb 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerCrystallizer.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerCrystallizer.java
@@ -17,13 +17,18 @@ public class ContainerCrystallizer extends Container {
 	public ContainerCrystallizer(InventoryPlayer invPlayer, TileEntityMachineCrystallizer tedf) {
 		diFurnace = tedf;
 
-		this.addSlotToContainer(new Slot(tedf, 0, 80, 35));
-		this.addSlotToContainer(new Slot(tedf, 1, 8, 53));
-		this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 140, 35));
-		this.addSlotToContainer(new Slot(tedf, 3, 26, 17));
-		this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 26, 53));
-		this.addSlotToContainer(new SlotUpgrade(tedf, 5, 98, 17));
-		this.addSlotToContainer(new SlotUpgrade(tedf, 6, 116, 17));
+		//Input
+		this.addSlotToContainer(new Slot(tedf, 0, 62, 45));
+		//Battery
+		this.addSlotToContainer(new Slot(tedf, 1, 152, 72));
+		//Output
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 113, 45));
+		//Fluid slots
+		this.addSlotToContainer(new Slot(tedf, 3, 17, 18));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 17, 54));
+		//Upgrades
+		this.addSlotToContainer(new SlotUpgrade(tedf, 5, 80, 18));
+		this.addSlotToContainer(new SlotUpgrade(tedf, 6, 98, 18));
 
 		for(int i = 0; i < 3; i++) {
 			for(int j = 0; j < 9; j++) {
diff --git a/src/main/java/com/hbm/inventory/gui/GUICrystallizer.java b/src/main/java/com/hbm/inventory/gui/GUICrystallizer.java
index e9b03cea8..020eb1bef 100644
--- a/src/main/java/com/hbm/inventory/gui/GUICrystallizer.java
+++ b/src/main/java/com/hbm/inventory/gui/GUICrystallizer.java
@@ -14,7 +14,7 @@ import net.minecraft.util.ResourceLocation;
 
 public class GUICrystallizer extends GuiInfoContainer {
 
-	public static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/processing/gui_crystallizer.png");
+	public static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/processing/gui_crystallizer_alt.png");
 	private TileEntityMachineCrystallizer acidomatic;
 	
 	public GUICrystallizer(InventoryPlayer invPlayer, TileEntityMachineCrystallizer acidomatic) {
@@ -22,22 +22,22 @@ public class GUICrystallizer extends GuiInfoContainer {
 		this.acidomatic = acidomatic;
 
 		this.xSize = 176;
-		this.ySize = 168;
+		this.ySize = 204;
 	}
 	
 	@Override
 	public void drawScreen(int mouseX, int mouseY, float f) {
 		super.drawScreen(mouseX, mouseY, f);
 		
-		this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 51 - 34, 16, 34, acidomatic.power, acidomatic.maxPower);
-		acidomatic.tank.renderTankInfo(this, mouseX, mouseY, guiLeft + 44, guiTop + 17, 16, 52);
+		this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 152, guiTop + 18, 16, 34, acidomatic.power, acidomatic.maxPower);
+		acidomatic.tank.renderTankInfo(this, mouseX, mouseY, guiLeft + 35, guiTop + 18, 16, 52);
 
 		String[] upgradeText = new String[4];
 		upgradeText[0] = I18nUtil.resolveKey("desc.gui.upgrade");
 		upgradeText[1] = I18nUtil.resolveKey("desc.gui.upgrade.speed");
 		upgradeText[2] = I18nUtil.resolveKey("desc.gui.upgrade.effectiveness");
 		upgradeText[3] = I18nUtil.resolveKey("desc.gui.upgrade.overdrive");
-		this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 87, guiTop + 21, 8, 8, guiLeft + 200, guiTop + 45, upgradeText);
+		this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 117, guiTop + 22, 8, 8, guiLeft + 200, guiTop + 45, upgradeText);
 	}
 	
 	@Override
@@ -54,14 +54,14 @@ public class GUICrystallizer extends GuiInfoContainer {
 		Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
 		drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
 
-		int i = (int)acidomatic.getPowerScaled(34);
-		drawTexturedModalRect(guiLeft + 8, guiTop + 51 - i, 176, 34 - i, 16, i);
+		int i = (int)acidomatic.getPowerScaled(52);
+		drawTexturedModalRect(guiLeft + 152, guiTop + 70 - i, 176, 64 - i, 16, i);
 		
-		int j = acidomatic.getProgressScaled(23);
-		drawTexturedModalRect(guiLeft + 104, guiTop + 34, 192, 0, j, 16);
+		int j = acidomatic.getProgressScaled(28);
+		drawTexturedModalRect(guiLeft + 80, guiTop + 47, 176, 0, j, 12);
 		
-		this.drawInfoPanel(guiLeft + 87, guiTop + 21, 8, 8, 8);
+		this.drawInfoPanel(guiLeft + 117, guiTop + 22, 8, 8, 8);
 
-		acidomatic.tank.renderTank(guiLeft + 44, guiTop + 69, this.zLevel, 16, 52);
+		acidomatic.tank.renderTank(guiLeft + 35, guiTop + 70, this.zLevel, 16, 52);
 	}
 }
diff --git a/src/main/java/com/hbm/module/ModulePatternMatcher.java b/src/main/java/com/hbm/module/ModulePatternMatcher.java
index 5a5d4e514..097bc6859 100644
--- a/src/main/java/com/hbm/module/ModulePatternMatcher.java
+++ b/src/main/java/com/hbm/module/ModulePatternMatcher.java
@@ -119,6 +119,10 @@ public class ModulePatternMatcher {
 		
 		String mode = modes[index];
 		
+		if(mode == null) {
+			modes[index] = mode = MODE_EXACT;
+		}
+		
 		switch(mode) {
 		case MODE_EXACT: return input.isItemEqual(filter) && ItemStack.areItemStackTagsEqual(input, filter);
 		case MODE_WILDCARD: return input.getItem() == filter.getItem() && ItemStack.areItemStackTagsEqual(input, filter);
diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_crystallizer_alt.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_crystallizer_alt.png
index ae0884951..fb90b4c8b 100644
Binary files a/src/main/resources/assets/hbm/textures/gui/processing/gui_crystallizer_alt.png and b/src/main/resources/assets/hbm/textures/gui/processing/gui_crystallizer_alt.png differ