diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/MatterDecomposerMenu.java b/src/main/java/ru/dbotthepony/mc/otm/menu/MatterDecomposerMenu.java
index cdc3a717f..be8835d2d 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/menu/MatterDecomposerMenu.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/menu/MatterDecomposerMenu.java
@@ -49,7 +49,6 @@ public class MatterDecomposerMenu extends PoweredMatteryMenu {
 			progress = new ProgressGaugeWidget(this, () -> (float) tile.getWorkProgress(), tile::cantProcessJob);
 		}
 
-		addBatterySlot(14);
 		addInventorySlots();
 	}
 
diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/MatterReplicatorMenu.java b/src/main/java/ru/dbotthepony/mc/otm/menu/MatterReplicatorMenu.java
index 48c8fbaa5..98935cbb6 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/menu/MatterReplicatorMenu.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/menu/MatterReplicatorMenu.java
@@ -35,7 +35,6 @@ public class MatterReplicatorMenu extends PoweredMatteryMenu {
 			progress = new ProgressGaugeWidget(this);
 		}
 
-		addBatterySlot(14);
 		addInventorySlots();
 	}
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/AndroidStationMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/AndroidStationMenu.kt
index 89929a2ff..66ee0c58f 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/AndroidStationMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/AndroidStationMenu.kt
@@ -38,7 +38,6 @@ class AndroidStationMenu @JvmOverloads constructor(
 
 	init {
 		addSlot(androidBattery)
-		addBatterySlot()
 		addInventorySlots()
 	}
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveRackMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveRackMenu.kt
index a47c0b146..942c7c7ae 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveRackMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveRackMenu.kt
@@ -21,7 +21,6 @@ class DriveRackMenu @JvmOverloads constructor(
 			addSlot(slot)
 		}
 
-		addBatterySlot()
 		addInventorySlots()
 	}
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveViewerMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveViewerMenu.kt
index e67e16f72..bdd795bb0 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveViewerMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveViewerMenu.kt
@@ -56,7 +56,6 @@ class DriveViewerMenu @JvmOverloads constructor(
 		}
 
 		addSlot(driveSlot)
-		addBatterySlot()
 		addInventorySlots()
 	}
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/ItemMonitorMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/ItemMonitorMenu.kt
index 813a5a5f3..2da42ded7 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/ItemMonitorMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/ItemMonitorMenu.kt
@@ -37,7 +37,6 @@ class ItemMonitorMenu @JvmOverloads constructor(
 			local = null
 		}
 
-		addBatterySlot()
 		addInventorySlots()
 	}
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.kt
index 3f6731c22..c6e1785ec 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.kt
@@ -55,7 +55,6 @@ class MatterBottlerMenu @JvmOverloads constructor(
 		}
 
 		addDataSlots(workFlow)
-		addBatterySlot()
 		addInventorySlots()
 	}
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterScannerMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterScannerMenu.kt
index 0d13c1f10..4ca0a1445 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterScannerMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterScannerMenu.kt
@@ -43,7 +43,6 @@ class MatterScannerMenu @JvmOverloads constructor(
 			patterns = LevelGaugeWidget(this)
 		}
 
-		addBatterySlot()
 		addInventorySlots()
 	}
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt
index 35b6b11f9..b013712c2 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt
@@ -51,8 +51,7 @@ abstract class MatteryMenu protected @JvmOverloads constructor(
 	@JvmField
 	protected var inventorySlotIndexEnd = 0
 
-	@JvmOverloads
-	protected fun addInventorySlots(offset: Int = 97) {
+	protected fun addInventorySlots() {
 		var first = true
 
 		for (i in 0..2) {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/PoweredMatteryMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/PoweredMatteryMenu.kt
index c77ab7fb9..ee324b346 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/PoweredMatteryMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/PoweredMatteryMenu.kt
@@ -13,25 +13,16 @@ abstract class PoweredMatteryMenu protected constructor(
 	inventory: Inventory,
 	tile: BlockEntityMatteryPowered? = null
 ) : MatteryMenu(menuType, containerID, inventory, tile) {
-	@JvmField
-	val powerWidget: LevelGaugeWidget
-
-	@JvmField
-	var batterySlot: BatterySlot? = null
+	@JvmField val powerWidget: LevelGaugeWidget
+	@JvmField val batterySlot: BatterySlot
 
 	init {
 		if (tile == null || tile.getCapability(MatteryCapability.ENERGY).resolve().isEmpty) {
 			powerWidget = LevelGaugeWidget(this)
+			batterySlot = BatterySlot(SimpleContainer(1), 0)
 		} else {
 			powerWidget = LevelGaugeWidget(this, tile.getCapability(MatteryCapability.ENERGY).resolve().get())
+			batterySlot = BatterySlot(tile.battery_container, 0)
 		}
 	}
-
-	@JvmOverloads
-	protected fun addBatterySlot(x: Int = 10, y: Int = 66) {
-		val container = if (tile is BlockEntityMatteryPowered) tile.battery_container else SimpleContainer(1)
-		val batterySlot = BatterySlot(container, 0, x, y)
-		addSlot(batterySlot)
-		this.batterySlot = batterySlot
-	}
 }