diff --git a/src/components/gameMaster/zoneEditor/ZoneEditor.vue b/src/components/gameMaster/zoneEditor/ZoneEditor.vue
index a208542..0b1bbce 100644
--- a/src/components/gameMaster/zoneEditor/ZoneEditor.vue
+++ b/src/components/gameMaster/zoneEditor/ZoneEditor.vue
@@ -7,6 +7,7 @@
     <Objects />
     <ZoneSettings />
     <TeleportModal v-if="shouldShowTeleportModal" />
+<!--    Disabled for now since it bottlenecks performance -->
 <!--    <TilemapLayerC :tilemap="zoneTilemap as Tilemap" :tileset="tileArray as any" :layerIndex="0" :cull-padding="3" />-->
     <Controls :layer="tiles as TilemapLayer" />
 
@@ -68,15 +69,19 @@ function createTilemap() {
     tileWidth: config.tile_size.x,
     tileHeight: config.tile_size.y,
     orientation: Phaser.Tilemaps.Orientation.ISOMETRIC,
-    format: Phaser.Tilemaps.Formats.ARRAY_2D
+    format: Phaser.Tilemaps.Formats.ARRAY_2D,
   })
-  return new Phaser.Tilemaps.Tilemap(scene, zoneData)
+  const tilemap = new Phaser.Tilemaps.Tilemap(scene, zoneData)
+  return tilemap
 }
 
 function createTileLayer() {
   const tilesetImages = assetStore.assets.filter((asset) => asset.group === 'tiles').map((asset, index) => zoneTilemap.value.addTilesetImage(asset.key, asset.key, config.tile_size.x, config.tile_size.y, 0, 0, index + 1))
   tilesetImages.push(zoneTilemap.value.addTilesetImage('blank_tile', 'blank_tile', config.tile_size.x, config.tile_size.y, 0, 0, 0))
-  return zoneTilemap.value.createBlankLayer('tiles', tilesetImages as any, 0, config.tile_size.y)
+  const layer = zoneTilemap.value.createBlankLayer('tiles', tilesetImages as any, 0, config.tile_size.y) as Phaser.Tilemaps.TilemapLayer
+  //set layerindex
+  layer.setDepth(0)
+  return layer
 }
 
 function createTileArray() {
diff --git a/src/components/zone/Tiles.vue b/src/components/zone/Tiles.vue
index 22df5e8..1d2995e 100644
--- a/src/components/zone/Tiles.vue
+++ b/src/components/zone/Tiles.vue
@@ -1,4 +1,5 @@
 <template>
+<!--  Disabled for now since it bottlenecks performance -->
 <!--  <TilemapLayer :tilemap="zoneTilemap" :tileset="tileArray" :layerIndex="0" :cull-padding="0" />-->
   <Controls :layer="tiles" :depth="0" />
 </template>
@@ -44,12 +45,14 @@ function createTileLayer() {
 
   const tilesetImages = Array.from(uniqueTiles).map((tile, index) => {
     return zoneTilemap.value.addTilesetImage(tile, tile, config.tile_size.x, config.tile_size.y, 0, 0, index + 1)
-  })
+  }) as any
 
   // Add blank tile
   tilesetImages.push(zoneTilemap.value.addTilesetImage('blank_tile', 'blank_tile', config.tile_size.x, config.tile_size.y, 0, 0, 0))
-
-  return zoneTilemap.value.createBlankLayer('tiles', tilesetImages, 0, config.tile_size.y) as Phaser.Tilemaps.TilemapLayer
+  const layer = zoneTilemap.value.createBlankLayer('tiles', tilesetImages, 0, config.tile_size.y) as Phaser.Tilemaps.TilemapLayer
+  layer.setDepth(0)
+  layer.setCullPadding(0)
+  return layer
 }
 
 function createTileArray() {