diff --git a/src/main/java/com/hbm/inventory/container/ContainerStorageDrum.java b/src/main/java/com/hbm/inventory/container/ContainerStorageDrum.java
index 18d7e2d8d..4bf7c3e41 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerStorageDrum.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerStorageDrum.java
@@ -21,7 +21,7 @@ public class ContainerStorageDrum extends Container {
 			for(int i = 0; i < 6; i++) {
 
 				if(i + j > 1 && i + j < 9 && 5 - i + j > 1 && i + 5 - j > 1) {
-					this.addSlotToContainer(new Slot(drum, index, 35 + i * 18, 18 + j * 18));
+					this.addSlotToContainer(new Slot(drum, index, 35 + i * 18, 24 + j * 18));
 					index++;
 				}
 			}
@@ -29,12 +29,12 @@ public class ContainerStorageDrum extends Container {
 
 		for(int i = 0; i < 3; i++) {
 			for(int j = 0; j < 9; j++) {
-				this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 140 + i * 18));
+				this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 152 + i * 18));
 			}
 		}
 
 		for(int i = 0; i < 9; i++) {
-			this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 198));
+			this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 210));
 		}
 	}
 
diff --git a/src/main/java/com/hbm/inventory/container/ContainerWasteDrum.java b/src/main/java/com/hbm/inventory/container/ContainerWasteDrum.java
index 639f21d81..5eaca2b85 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerWasteDrum.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerWasteDrum.java
@@ -16,30 +16,30 @@ public class ContainerWasteDrum extends Container {
 	public ContainerWasteDrum(InventoryPlayer invPlayer, TileEntityWasteDrum tedf) {
 		drum = tedf;
 
-		this.addSlotToContainer(new Slot(tedf, 0, 71, 18));
-		this.addSlotToContainer(new Slot(tedf, 1, 89, 18));
-		this.addSlotToContainer(new Slot(tedf, 2, 53, 36));
-		this.addSlotToContainer(new Slot(tedf, 3, 71, 36));
-		this.addSlotToContainer(new Slot(tedf, 4, 89, 36));
-		this.addSlotToContainer(new Slot(tedf, 5, 107, 36));
-		this.addSlotToContainer(new Slot(tedf, 6, 53, 54));
-		this.addSlotToContainer(new Slot(tedf, 7, 71, 54));
-		this.addSlotToContainer(new Slot(tedf, 8, 89, 54));
-		this.addSlotToContainer(new Slot(tedf, 9, 107, 54));
-		this.addSlotToContainer(new Slot(tedf, 10, 71, 72));
-		this.addSlotToContainer(new Slot(tedf, 11, 89, 72));
+		this.addSlotToContainer(new Slot(tedf, 0, 71, 21));
+		this.addSlotToContainer(new Slot(tedf, 1, 89, 21));
+		this.addSlotToContainer(new Slot(tedf, 2, 53, 39));
+		this.addSlotToContainer(new Slot(tedf, 3, 71, 39));
+		this.addSlotToContainer(new Slot(tedf, 4, 89, 39));
+		this.addSlotToContainer(new Slot(tedf, 5, 107, 39));
+		this.addSlotToContainer(new Slot(tedf, 6, 53, 57));
+		this.addSlotToContainer(new Slot(tedf, 7, 71, 57));
+		this.addSlotToContainer(new Slot(tedf, 8, 89, 57));
+		this.addSlotToContainer(new Slot(tedf, 9, 107, 57));
+		this.addSlotToContainer(new Slot(tedf, 10, 71, 75));
+		this.addSlotToContainer(new Slot(tedf, 11, 89, 75));
 		
 		for(int i = 0; i < 3; i++)
 		{
 			for(int j = 0; j < 9; j++)
 			{
-				this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18 + 20));
+				this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18 + 23));
 			}
 		}
 		
 		for(int i = 0; i < 9; i++)
 		{
-			this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142 + 20));
+			this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142 + 23));
 		}
 	}
 	
diff --git a/src/main/java/com/hbm/inventory/gui/GUIStorageDrum.java b/src/main/java/com/hbm/inventory/gui/GUIStorageDrum.java
index f986aefab..d22fb9012 100644
--- a/src/main/java/com/hbm/inventory/gui/GUIStorageDrum.java
+++ b/src/main/java/com/hbm/inventory/gui/GUIStorageDrum.java
@@ -21,15 +21,15 @@ public class GUIStorageDrum extends GuiInfoContainer {
 		drum = tedf;
 		
 		this.xSize = 176;
-		this.ySize = 222;
+		this.ySize = 234;
 	}
 	
 	@Override
 	public void drawScreen(int mouseX, int mouseY, float f) {
 		super.drawScreen(mouseX, mouseY, f);
 
-		drum.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 16, guiTop + 17, 9, 108);
-		drum.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 151, guiTop + 17, 9, 108);
+		drum.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 16, guiTop + 23, 9, 108);
+		drum.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 151, guiTop + 23, 9, 108);
 	}
 	
 	@Override
@@ -46,8 +46,8 @@ public class GUIStorageDrum extends GuiInfoContainer {
 		drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
 
 		int liquid = drum.tanks[0].getFill() * 106 / drum.tanks[0].getMaxFill();
-		drawTexturedModalRect(guiLeft + 17, guiTop + 124 - liquid, 176, 106 - liquid, 7, liquid);
+		drawTexturedModalRect(guiLeft + 17, guiTop + 130 - liquid, 176, 106 - liquid, 7, liquid);
 		int gas = drum.tanks[1].getFill() * 106 / drum.tanks[1].getMaxFill();
-		drawTexturedModalRect(guiLeft + 152, guiTop + 124 - gas, 183, 106 - gas, 7, gas);
+		drawTexturedModalRect(guiLeft + 152, guiTop + 130 - gas, 183, 106 - gas, 7, gas);
 	}
 }
diff --git a/src/main/java/com/hbm/inventory/gui/GUIWasteDrum.java b/src/main/java/com/hbm/inventory/gui/GUIWasteDrum.java
index dc9ae9131..38089a3e2 100644
--- a/src/main/java/com/hbm/inventory/gui/GUIWasteDrum.java
+++ b/src/main/java/com/hbm/inventory/gui/GUIWasteDrum.java
@@ -21,7 +21,7 @@ public class GUIWasteDrum extends GuiInfoContainer {
 		diFurnace = tedf;
 		
 		this.xSize = 176;
-		this.ySize = 186;
+		this.ySize = 189;
 	}
 	
 	@Override
@@ -39,7 +39,7 @@ public class GUIWasteDrum extends GuiInfoContainer {
 		String name = this.diFurnace.hasCustomInventoryName() ? this.diFurnace.getInventoryName() : I18n.format(this.diFurnace.getInventoryName());
 		
 		this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752);
-		this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
+		this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 5, 4210752);
 	}
 
 	@Override