diff --git a/src/components/gameMaster/zoneEditor/ZoneEditor.vue b/src/components/gameMaster/zoneEditor/ZoneEditor.vue
index 29aadc9..b9aa8ca 100644
--- a/src/components/gameMaster/zoneEditor/ZoneEditor.vue
+++ b/src/components/gameMaster/zoneEditor/ZoneEditor.vue
@@ -3,13 +3,14 @@
   <ZoneList v-if="zoneEditorStore.isZoneListModalShown" />
 
   <template v-if="zoneEditorStore.zone">
+    <Controls :layer="tiles as TilemapLayer" />
+
     <Tiles />
     <Objects />
+
     <ZoneSettings />
     <TeleportModal v-if="shouldShowTeleportModal" />
 
-    <Controls :layer="tiles as TilemapLayer" />
-
     <Container :depth="2">
       <Image v-for="object in zoneObjects" :depth="calculateIsometricDepth(object.positionX, object.positionY, 0)" :key="object.id" v-bind="getObjectImageProps(object)" @pointerup="() => setSelectedZoneObject(object)" />
     </Container>
@@ -46,6 +47,12 @@ import TeleportModal from '@/components/gameMaster/zoneEditor/partials/TeleportM
 import Tilemap = Phaser.Tilemaps.Tilemap
 import TilemapLayer = Phaser.Tilemaps.TilemapLayer
 
+
+/**
+ * @TODO:
+ * Clean all the code in this file
+ */
+
 const scene = useScene()
 const gameStore = useGameStore()
 const zoneEditorStore = useZoneEditorStore()