diff --git a/src/App.vue b/src/App.vue
index 8717913..efc6e89 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -28,4 +28,4 @@ const currentScreen = computed(() => {
 
 // Disable right click
 addEventListener('contextmenu', (event) => event.preventDefault())
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/Effects.vue b/src/components/Effects.vue
index 44968b4..cb1d529 100644
--- a/src/components/Effects.vue
+++ b/src/components/Effects.vue
@@ -1,6 +1,5 @@
 <template>
-  <Scene name="effects" @preload="preloadScene" @create="createScene" @update="updateScene">
-  </Scene>
+  <Scene name="effects" @preload="preloadScene" @create="createScene" @update="updateScene"> </Scene>
 </template>
 
 <script setup lang="ts">
@@ -12,9 +11,6 @@ import { onBeforeMount, onBeforeUnmount, ref } from 'vue'
 const gameStore = useGameStore()
 const zoneEditorStore = useZoneEditorStore()
 
-
-
-
 // See if there's a dat
 
 const sceneRef = ref<Phaser.Scene | null>(null)
@@ -53,7 +49,7 @@ const createDayNightCycle = (scene: Phaser.Scene) => {
 const updateDayNightCycle = (time: number) => {
   if (!dayNightCycle.value) return
 
-  const darkness = Math.sin((time % dayNightDuration) / dayNightDuration * Math.PI) * maxDarkness
+  const darkness = Math.sin(((time % dayNightDuration) / dayNightDuration) * Math.PI) * maxDarkness
   dayNightCycle.value.clear()
   dayNightCycle.value.fillStyle(0x000000, darkness)
   dayNightCycle.value.fillRect(0, 0, window.innerWidth, window.innerHeight)
@@ -90,7 +86,7 @@ const createFogEffect = (scene: Phaser.Scene) => {
 const updateFogEffect = () => {
   if (fogSprite.value) {
     // Example: Oscillate fog opacity
-    const fogOpacity = (Math.sin(Date.now() / 5000) + 1) / 2 * 0.3
+    const fogOpacity = ((Math.sin(Date.now() / 5000) + 1) / 2) * 0.3
     fogSprite.value.setAlpha(fogOpacity)
   }
 }
@@ -111,4 +107,4 @@ defineExpose(controlEffects)
 onBeforeUnmount(() => {
   if (sceneRef.value) sceneRef.value.scene.remove('effects')
 })
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/gameMaster/zoneEditor/EventTiles.vue b/src/components/gameMaster/zoneEditor/EventTiles.vue
index f314c7c..6c45e35 100644
--- a/src/components/gameMaster/zoneEditor/EventTiles.vue
+++ b/src/components/gameMaster/zoneEditor/EventTiles.vue
@@ -1,18 +1,14 @@
-<template>
-
-</template>
+<template></template>
 
 <script setup lang="ts">
-
-
 import type { ZoneEventTile } from '@/types'
 import { tileToWorldX, tileToWorldY } from '@/composables/zoneComposable'
 
-function getEventTileImageProps(tile: ZoneEventTile) {
-  return {
-    x: tileToWorldX(zoneTilemap as any, tile.positionX, tile.positionY),
-    y: tileToWorldY(zoneTilemap as any, tile.positionX, tile.positionY),
-    texture: tile.type
-  }
-}
-</script>
\ No newline at end of file
+// function getEventTileImageProps(tile: ZoneEventTile) {
+//   return {
+//     x: tileToWorldX(zoneTilemap as any, tile.positionX, tile.positionY),
+//     y: tileToWorldY(zoneTilemap as any, tile.positionX, tile.positionY),
+//     texture: tile.type
+//   }
+// }
+</script>
diff --git a/src/components/gameMaster/zoneEditor/Objects.vue b/src/components/gameMaster/zoneEditor/Objects.vue
index 640a22e..33d9c1c 100644
--- a/src/components/gameMaster/zoneEditor/Objects.vue
+++ b/src/components/gameMaster/zoneEditor/Objects.vue
@@ -1,17 +1,20 @@
 <template>
-  <SelectedZoneObject v-if="zoneEditorStore.selectedZoneObject" />
+  <SelectedZoneObject v-if="selectedZoneObject" :zoneObject="selectedZoneObject" />
   <Image v-for="object in zoneEditorStore.zone?.zoneObjects" :key="object.id" v-bind="getObjectImageProps(object)" />
 </template>
 
 <script setup lang="ts">
-import { tileToWorldX, tileToWorldY } from '@/composables/zoneComposable'
-import { Image } from 'phavuer'
+import { uuidv4 } from '@/utilities'
+import { calculateIsometricDepth, getTile, tileToWorldX, tileToWorldY } from '@/composables/zoneComposable'
+import { Image, useScene } from 'phavuer'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import type { ZoneObject } from '@/types'
-import { ZoneEventTileType } from '@/types'
 import SelectedZoneObject from '@/components/gameMaster/zoneEditor/partials/SelectedZoneObject.vue'
+import { onBeforeMount, onBeforeUnmount, ref } from 'vue'
 
+const scene = useScene()
 const zoneEditorStore = useZoneEditorStore()
+const selectedZoneObject = ref<ZoneObject | null>(null)
 
 const props = defineProps<{
   tilemap: Phaser.Tilemaps.Tilemap
@@ -20,7 +23,8 @@ const props = defineProps<{
 function getObjectImageProps(object: ZoneObject) {
   return {
     // alpha: object.id === movingZoneObject.value?.id ? .5 : 1,
-    tint: zoneEditorStore.selectedZoneObject?.id === object.id ? 0x00ff00 : 0xffffff,
+    depth: calculateIsometricDepth(object.positionX, object.positionY, object.object.frameWidth, object.object.frameHeight),
+    tint: selectedZoneObject?.id === object.id ? 0x00ff00 : 0xffffff,
     x: tileToWorldX(props.tilemap as any, object.positionX, object.positionY),
     y: tileToWorldY(props.tilemap as any, object.positionX, object.positionY),
     texture: object.object.id,
@@ -28,4 +32,52 @@ function getObjectImageProps(object: ZoneObject) {
     originX: Number(object.object.originY)
   }
 }
+
+function addZoneObject(pointer: Phaser.Input.Pointer) {
+  if (!zoneEditorStore.zone) return
+
+  // Check if tool is pencil
+  if (zoneEditorStore.tool !== 'pencil') return
+
+  // Check if draw mode is object
+  if (zoneEditorStore.drawMode !== 'object') return
+
+  // Check if left mouse button is pressed
+  if (!pointer.isDown) return
+
+  // Check if there is a tile @TODO chekc if props.tilemap words
+  const tile = getTile(props.tilemap, pointer.worldX, pointer.worldY)
+  if (!tile) return
+
+  // Check if there is a selected object
+  if (!zoneEditorStore.selectedObject) return
+
+  // Check if object already exists on position
+  const existingObject = zoneEditorStore.zone?.zoneObjects.find((object) => object.positionX === tile.x && object.positionY === tile.y)
+  if (existingObject) return
+
+  const newObject = {
+    id: uuidv4(),
+    zoneId: zoneEditorStore.zone.id,
+    zone: zoneEditorStore.zone,
+    object: zoneEditorStore.selectedObject,
+    depth: 0,
+    isRotated: false,
+    positionX: tile.x,
+    positionY: tile.y
+  }
+
+  // Add new object to zoneObjects
+  zoneEditorStore.zone.zoneObjects = zoneEditorStore.zone.zoneObjects.concat(newObject as ZoneObject)
+}
+
+onBeforeMount(() => {
+  scene.input.on(Phaser.Input.Events.POINTER_DOWN, addZoneObject)
+  scene.input.on(Phaser.Input.Events.POINTER_MOVE, addZoneObject)
+})
+
+onBeforeUnmount(() => {
+  scene.input.off(Phaser.Input.Events.POINTER_DOWN, addZoneObject)
+  scene.input.off(Phaser.Input.Events.POINTER_MOVE, addZoneObject)
+})
 </script>
diff --git a/src/components/gameMaster/zoneEditor/Tiles.vue b/src/components/gameMaster/zoneEditor/Tiles.vue
index b629003..77e898d 100644
--- a/src/components/gameMaster/zoneEditor/Tiles.vue
+++ b/src/components/gameMaster/zoneEditor/Tiles.vue
@@ -13,9 +13,9 @@ import Controls from '@/components/utilities/Controls.vue'
 
 const emit = defineEmits(['tilemap:create'])
 
+const scene = useScene()
 const gameStore = useGameStore()
 const zoneEditorStore = useZoneEditorStore()
-const scene = useScene()
 
 const zoneTilemap = createTilemap()
 const tiles = createTileLayer()
@@ -55,11 +55,14 @@ function handleTileClick(pointer: Phaser.Input.Pointer) {
   // Check if tool is pencil
   if (zoneEditorStore.tool !== 'pencil') return
 
+  // Check if draw mode is tile
+  if (zoneEditorStore.drawMode !== 'tile') return
+
   // Check if left mouse button is pressed
   if (!pointer.isDown) return
 
   // Check if there is a tile
-  const tile = getTile(pointer.worldX, pointer.worldY, tiles)
+  const tile = getTile(tiles, pointer.worldX, pointer.worldY)
   if (!tile) return
 
   // Check if there is a selected tile
diff --git a/src/components/gameMaster/zoneEditor/partials/SelectedZoneObject.vue b/src/components/gameMaster/zoneEditor/partials/SelectedZoneObject.vue
index 5cb1fc7..37d1a55 100644
--- a/src/components/gameMaster/zoneEditor/partials/SelectedZoneObject.vue
+++ b/src/components/gameMaster/zoneEditor/partials/SelectedZoneObject.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex flex-col items-center py-5 px-3 fixed bottom-14 right-0" v-if="zoneEditorStore.selectedZoneObject">
+  <div class="flex flex-col items-center py-5 px-3 fixed bottom-14 right-0">
     <div class="self-end mt-2 flex gap-2">
       <div>
         <label class="mb-1.5 font-titles block text-sm text-gray-700 hidden" for="depth">Depth</label>
@@ -42,7 +42,7 @@ const handleRotate = () => {
 }
 
 const handleMove = () => {
-  emit('move', zoneEditorStore.selectedZoneObject?.id);
+  emit('move', zoneEditorStore.selectedZoneObject?.id)
 }
 
 const handleDelete = () => {
diff --git a/src/components/gameMaster/zoneEditor/partials/Toolbar.vue b/src/components/gameMaster/zoneEditor/partials/Toolbar.vue
index 6315166..bc8c0b0 100644
--- a/src/components/gameMaster/zoneEditor/partials/Toolbar.vue
+++ b/src/components/gameMaster/zoneEditor/partials/Toolbar.vue
@@ -88,7 +88,7 @@ import { onClickOutside } from '@vueuse/core'
 
 const zoneEditorStore = useZoneEditorStore()
 
-const emit = defineEmits(['move', 'eraser', 'pencil', 'paint', 'save', 'clear'])
+const emit = defineEmits(['save', 'clear'])
 
 // track when clicked outside of toolbar items
 const toolbar = ref(null)
@@ -124,16 +124,16 @@ function handleClick(tool: string) {
 }
 
 function cycleToolMode(tool: 'pencil' | 'eraser') {
-  const modes = ['tile', 'object', 'teleport', 'blocking tile'];
-  const currentMode = tool === 'pencil' ? zoneEditorStore.drawMode : zoneEditorStore.eraserMode;
-  const currentIndex = modes.indexOf(currentMode);
-  const nextIndex = (currentIndex + 1) % modes.length;
-  const nextMode = modes[nextIndex];
+  const modes = ['tile', 'object', 'teleport', 'blocking tile']
+  const currentMode = tool === 'pencil' ? zoneEditorStore.drawMode : zoneEditorStore.eraserMode
+  const currentIndex = modes.indexOf(currentMode)
+  const nextIndex = (currentIndex + 1) % modes.length
+  const nextMode = modes[nextIndex]
 
   if (tool === 'pencil') {
-    setDrawMode(nextMode);
+    setDrawMode(nextMode)
   } else {
-    setEraserMode(nextMode);
+    setEraserMode(nextMode)
   }
 }
 
@@ -151,11 +151,11 @@ function initKeyShortcuts(event: KeyboardEvent) {
   }
 
   if (keyActions.hasOwnProperty(event.key)) {
-    const tool = keyActions[event.key];
+    const tool = keyActions[event.key]
     if ((tool === 'pencil' || tool === 'eraser') && zoneEditorStore.tool === tool) {
-      cycleToolMode(tool);
+      cycleToolMode(tool)
     } else {
-      handleClick(tool);
+      handleClick(tool)
     }
   }
 }
diff --git a/src/components/gui/Chat.vue b/src/components/gui/Chat.vue
index 66d4dff..dbdd9e3 100644
--- a/src/components/gui/Chat.vue
+++ b/src/components/gui/Chat.vue
@@ -2,7 +2,7 @@
   <div class="w-full md:min-w-[350px] max-w-[750px] flex flex-col absolute left-1/2 -translate-x-1/2 bottom-5">
     <div ref="chatWindow" class="w-full overflow-auto h-32 mb-5 bg-gray rounded-md border-2 border-solid border-gray-500 text-gray-300" v-show="gameStore.uiSettings.isChatOpen">
       <div v-for="message in chats" class="flex-col py-2 items-center p-3">
-        <span class="text-ellipsis overflow-hidden whitespace-nowrap text-sm" :class="{'text-cyan-300': gameStore.character?.role == 'gm'}">{{ message.character.name }}</span>
+        <span class="text-ellipsis overflow-hidden whitespace-nowrap text-sm" :class="{ 'text-cyan-300': gameStore.character?.role == 'gm' }">{{ message.character.name }}</span>
         <p class="text-gray-50 m-0">{{ message.message }}</p>
       </div>
     </div>
diff --git a/src/components/gui/ExpBar.vue b/src/components/gui/ExpBar.vue
index b5b6215..75bdb13 100644
--- a/src/components/gui/ExpBar.vue
+++ b/src/components/gui/ExpBar.vue
@@ -1,9 +1,7 @@
-<template>
-
-</template>
+<template></template>
 
 <script setup lang="ts">
 import { useGameStore } from '@/stores/gameStore'
 
 const gameStore = useGameStore()
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/gui/Keybindings.vue b/src/components/gui/Keybindings.vue
index 8c42ca5..3c1e1be 100644
--- a/src/components/gui/Keybindings.vue
+++ b/src/components/gui/Keybindings.vue
@@ -1,48 +1,48 @@
 <template>
-    <div class="absolute left-[300px] top-4">
-        <button class="z-20 group-hover:cursor-pointer bg-[url('/assets/ui-border-4-corners-light.svg')] bg-no-repeat block w-[42px] h-[42px] relative p-0"></button>
-        <span class="z-10 text-pixel absolute top-1 left-2">F1</span>
-        <div class="absolute top-0 left-0 h-full w-full bg-[url('/assets/icons/f1-icon.png')] bg-no-repeat"></div>
-    </div>
-    <div class="absolute left-[346px] top-4">
-        <button class="z-20 group-hover:cursor-pointer bg-[url('/assets/ui-border-4-corners-light.svg')] bg-no-repeat block w-[42px] h-[42px] relative p-0"></button>
-        <span class="z-10 text-pixel absolute top-1 left-2">F2</span>
-        <div class="absolute top-0 left-0 h-full w-full bg-[url('/assets/icons/f2-icon.png')] bg-no-repeat"></div>
-    </div>
-    <div class="absolute left-[392px] top-4">
-        <button class="z-20 group-hover:cursor-pointer bg-[url('/assets/ui-border-4-corners-light.svg')] bg-no-repeat block w-[42px] h-[42px] relative p-0"></button>
-        <span class="z-10 text-pixel absolute top-1 left-2">F3</span>
-        <div class="absolute top-0 left-0 h-full w-full bg-[url('/assets/icons/f3-icon.png')] bg-no-repeat"></div>
-    </div>
-    <div class="absolute left-[438px] top-4">
-        <button class="z-20 group-hover:cursor-pointer bg-[url('/assets/ui-border-4-corners-light.svg')] bg-no-repeat block w-[42px] h-[42px] relative p-0"></button>
-        <span class="z-10 text-pixel absolute top-1 left-2">F4</span>
-        <div class="absolute top-0 left-0 h-full w-full bg-[url('/assets/icons/f4-icon.png')] bg-no-repeat"></div>
-    </div>
-    <div class="absolute left-[484px] top-4">
-        <button class="z-20 group-hover:cursor-pointer bg-[url('/assets/ui-border-4-corners-light.svg')] bg-no-repeat block w-[42px] h-[42px] relative p-0"></button>
-        <span class="z-10 text-pixel absolute top-1 left-2">F5</span>
-        <div class="absolute top-0 left-0 h-full w-full bg-[url('/assets/icons/f5-icon.png')] bg-no-repeat"></div>
-    </div>
-    <div class="absolute left-[530px] top-4">
-        <button class="z-20 group-hover:cursor-pointer bg-[url('/assets/ui-border-4-corners-light.svg')] bg-no-repeat block w-[42px] h-[42px] relative p-0"></button>
-        <span class="z-10 text-pixel absolute top-1 left-2">F6</span>
-        <div class="absolute top-0 left-0 h-full w-full bg-[url('/assets/icons/f6-icon.png')] bg-no-repeat"></div>
-    </div>
-    <div class="absolute left-[576px] top-4">
-        <button class="z-20 group-hover:cursor-pointer bg-[url('/assets/ui-border-4-corners-light.svg')] bg-no-repeat block w-[42px] h-[42px] relative p-0"></button>
-        <span class="z-10 text-pixel absolute top-1 left-2">F7</span>
-        <div class="absolute top-0 left-0 h-full w-full bg-[url('/assets/icons/f7-icon.png')] bg-no-repeat"></div>
-    </div>
-    <div class="absolute left-[622px] top-4">
-        <button class="z-20 group-hover:cursor-pointer bg-[url('/assets/ui-border-4-corners-light.svg')] bg-no-repeat block w-[42px] h-[42px] relative p-0"></button>
-        <span class="z-10 text-pixel absolute top-1 left-2">F8</span>
-        <div class="absolute top-0 left-0 h-full w-full bg-[url('/assets/icons/f8-icon.png')] bg-no-repeat"></div>
-    </div>
+  <div class="absolute left-[300px] top-4">
+    <button class="z-20 group-hover:cursor-pointer bg-[url('/assets/ui-border-4-corners-light.svg')] bg-no-repeat block w-[42px] h-[42px] relative p-0"></button>
+    <span class="z-10 text-pixel absolute top-1 left-2">F1</span>
+    <div class="absolute top-0 left-0 h-full w-full bg-[url('/assets/icons/f1-icon.png')] bg-no-repeat"></div>
+  </div>
+  <div class="absolute left-[346px] top-4">
+    <button class="z-20 group-hover:cursor-pointer bg-[url('/assets/ui-border-4-corners-light.svg')] bg-no-repeat block w-[42px] h-[42px] relative p-0"></button>
+    <span class="z-10 text-pixel absolute top-1 left-2">F2</span>
+    <div class="absolute top-0 left-0 h-full w-full bg-[url('/assets/icons/f2-icon.png')] bg-no-repeat"></div>
+  </div>
+  <div class="absolute left-[392px] top-4">
+    <button class="z-20 group-hover:cursor-pointer bg-[url('/assets/ui-border-4-corners-light.svg')] bg-no-repeat block w-[42px] h-[42px] relative p-0"></button>
+    <span class="z-10 text-pixel absolute top-1 left-2">F3</span>
+    <div class="absolute top-0 left-0 h-full w-full bg-[url('/assets/icons/f3-icon.png')] bg-no-repeat"></div>
+  </div>
+  <div class="absolute left-[438px] top-4">
+    <button class="z-20 group-hover:cursor-pointer bg-[url('/assets/ui-border-4-corners-light.svg')] bg-no-repeat block w-[42px] h-[42px] relative p-0"></button>
+    <span class="z-10 text-pixel absolute top-1 left-2">F4</span>
+    <div class="absolute top-0 left-0 h-full w-full bg-[url('/assets/icons/f4-icon.png')] bg-no-repeat"></div>
+  </div>
+  <div class="absolute left-[484px] top-4">
+    <button class="z-20 group-hover:cursor-pointer bg-[url('/assets/ui-border-4-corners-light.svg')] bg-no-repeat block w-[42px] h-[42px] relative p-0"></button>
+    <span class="z-10 text-pixel absolute top-1 left-2">F5</span>
+    <div class="absolute top-0 left-0 h-full w-full bg-[url('/assets/icons/f5-icon.png')] bg-no-repeat"></div>
+  </div>
+  <div class="absolute left-[530px] top-4">
+    <button class="z-20 group-hover:cursor-pointer bg-[url('/assets/ui-border-4-corners-light.svg')] bg-no-repeat block w-[42px] h-[42px] relative p-0"></button>
+    <span class="z-10 text-pixel absolute top-1 left-2">F6</span>
+    <div class="absolute top-0 left-0 h-full w-full bg-[url('/assets/icons/f6-icon.png')] bg-no-repeat"></div>
+  </div>
+  <div class="absolute left-[576px] top-4">
+    <button class="z-20 group-hover:cursor-pointer bg-[url('/assets/ui-border-4-corners-light.svg')] bg-no-repeat block w-[42px] h-[42px] relative p-0"></button>
+    <span class="z-10 text-pixel absolute top-1 left-2">F7</span>
+    <div class="absolute top-0 left-0 h-full w-full bg-[url('/assets/icons/f7-icon.png')] bg-no-repeat"></div>
+  </div>
+  <div class="absolute left-[622px] top-4">
+    <button class="z-20 group-hover:cursor-pointer bg-[url('/assets/ui-border-4-corners-light.svg')] bg-no-repeat block w-[42px] h-[42px] relative p-0"></button>
+    <span class="z-10 text-pixel absolute top-1 left-2">F8</span>
+    <div class="absolute top-0 left-0 h-full w-full bg-[url('/assets/icons/f8-icon.png')] bg-no-repeat"></div>
+  </div>
 </template>
 
 <script setup lang="ts">
 import { useGameStore } from '@/stores/gameStore'
 
 const gameStore = useGameStore()
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/gui/Menu.vue b/src/components/gui/Menu.vue
index a450751..8e8d2c4 100644
--- a/src/components/gui/Menu.vue
+++ b/src/components/gui/Menu.vue
@@ -53,5 +53,5 @@
 import { useGameStore } from '@/stores/gameStore'
 
 const gameStore = useGameStore()
-let characterLevel = gameStore.character?.level.toString().padStart(2, '0');
+let characterLevel = gameStore.character?.level.toString().padStart(2, '0')
 </script>
diff --git a/src/components/gui/Minimap.vue b/src/components/gui/Minimap.vue
index 045c446..a06c4cb 100644
--- a/src/components/gui/Minimap.vue
+++ b/src/components/gui/Minimap.vue
@@ -1,23 +1,23 @@
 <template>
-    <div class="absolute top-4 right-4">
-        <div class="w-40 h-40 rounded-full border border-solid border-gray-500 bg-[url('/assets/ui-texture.png')] bg-no-repeat">
-            <div class="w-40 h-40 rounded-full shadow-inner"></div>
-        </div>
-        <div class="absolute -bottom-3 left-1/2 -translate-x-1/2 flex gap-1">
-            <button class="w-6 h-6 relative p-0">
-                <img class="absolute w-3 h-3 left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2" src="/assets/icons/plus-icon.svg" />
-                <img class="w-full h-full" src="/assets/ui-border-4-corners.svg" />
-            </button>
-            <button class="w-6 h-6 relative p-0">
-                <img class="absolute w-3 h-3 left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2" src="/assets/icons/minus-icon.svg" />
-                <img class="w-full h-full" src="/assets/ui-border-4-corners.svg" />
-            </button>
-        </div>
+  <div class="absolute top-4 right-4">
+    <div class="w-40 h-40 rounded-full border border-solid border-gray-500 bg-[url('/assets/ui-texture.png')] bg-no-repeat">
+      <div class="w-40 h-40 rounded-full shadow-inner"></div>
     </div>
+    <div class="absolute -bottom-3 left-1/2 -translate-x-1/2 flex gap-1">
+      <button class="w-6 h-6 relative p-0">
+        <img class="absolute w-3 h-3 left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2" src="/assets/icons/plus-icon.svg" />
+        <img class="w-full h-full" src="/assets/ui-border-4-corners.svg" />
+      </button>
+      <button class="w-6 h-6 relative p-0">
+        <img class="absolute w-3 h-3 left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2" src="/assets/icons/minus-icon.svg" />
+        <img class="w-full h-full" src="/assets/ui-border-4-corners.svg" />
+      </button>
+    </div>
+  </div>
 </template>
 
 <script setup lang="ts">
 import { useGameStore } from '@/stores/gameStore'
 
 const gameStore = useGameStore()
-</script>
\ No newline at end of file
+</script>
diff --git a/src/composables/pointerHandlers/useGamePointerHandlers.ts b/src/composables/pointerHandlers/useGamePointerHandlers.ts
index cf4f987..9d66147 100644
--- a/src/composables/pointerHandlers/useGamePointerHandlers.ts
+++ b/src/composables/pointerHandlers/useGamePointerHandlers.ts
@@ -9,7 +9,7 @@ export function useGamePointerHandlers(scene: Phaser.Scene, layer: Phaser.Tilema
   const dragThreshold = 5 // pixels
 
   function updateWaypoint(worldX: number, worldY: number) {
-    const pointerTile = getTile(worldX, worldY, layer)
+    const pointerTile = getTile(layer, worldX, worldY)
     if (pointerTile) {
       const worldPoint = tileToWorldXY(layer, pointerTile.x, pointerTile.y)
       waypoint.value = {
@@ -46,7 +46,7 @@ export function useGamePointerHandlers(scene: Phaser.Scene, layer: Phaser.Tilema
     const distance = Phaser.Math.Distance.Between(pointerStartPosition.value.x, pointerStartPosition.value.y, pointer.x, pointer.y)
 
     if (distance <= dragThreshold) {
-      const pointerTile = getTile(pointer.worldX, pointer.worldY, layer)
+      const pointerTile = getTile(layer, pointer.worldX, pointer.worldY)
       if (pointerTile) {
         gameStore.connection?.emit('character:initMove', {
           positionX: pointerTile.x,
diff --git a/src/composables/pointerHandlers/useZoneEditorPointerHandlers.ts b/src/composables/pointerHandlers/useZoneEditorPointerHandlers.ts
index f7109e2..db1c0a3 100644
--- a/src/composables/pointerHandlers/useZoneEditorPointerHandlers.ts
+++ b/src/composables/pointerHandlers/useZoneEditorPointerHandlers.ts
@@ -11,7 +11,7 @@ export function useZoneEditorPointerHandlers(scene: Phaser.Scene, layer: Phaser.
 
   function updateWaypoint(pointer: Phaser.Input.Pointer) {
     const { x: px, y: py } = camera.getWorldPoint(pointer.x, pointer.y)
-    const pointerTile = getTile(px, py, layer)
+    const pointerTile = getTile(layer, px, py)
 
     if (pointerTile) {
       const worldPoint = tileToWorldXY(layer, pointerTile.x, pointerTile.y)
diff --git a/src/composables/zoneComposable.ts b/src/composables/zoneComposable.ts
index 15e8414..17566f8 100644
--- a/src/composables/zoneComposable.ts
+++ b/src/composables/zoneComposable.ts
@@ -5,8 +5,8 @@ import Tileset = Phaser.Tilemaps.Tileset
 import Tile = Phaser.Tilemaps.Tile
 import { useGameStore } from '@/stores/gameStore'
 
-export function getTile(x: number, y: number, layer: TilemapLayer): Tile | undefined {
-  const tile: Phaser.Tilemaps.Tile = layer.getTileAtWorldXY(x, y)
+export function getTile(layer: TilemapLayer | Tilemap, x: number, y: number): Tile | undefined {
+  const tile = layer.getTileAtWorldXY(x, y)
   if (!tile) return undefined
   return tile
 }
@@ -59,9 +59,7 @@ export const sortByIsometricDepth = <T extends { positionX: number; positionY: n
   })
 }
 
-export const clearAssets = (scene: Phaser.Scene) => {
-
-}
+export const clearAssets = (scene: Phaser.Scene) => {}
 
 export const loadAssets = (scene: Phaser.Scene): Promise<void> => {
   return new Promise((resolve) => {
diff --git a/src/screens/Characters.vue b/src/screens/Characters.vue
index f82c048..f048449 100644
--- a/src/screens/Characters.vue
+++ b/src/screens/Characters.vue
@@ -5,12 +5,7 @@
       <div class="filler"></div>
       <div class="flex gap-14 w-full max-h-[650px] overflow-x-auto" v-if="!isLoading">
         <!-- CHARACTER LIST -->
-        <div
-          v-for="character in characters"
-          :key="character.id"
-          class="group first:ml-auto last:mr-auto m-4 w-[170px] h-[275px] flex flex-col shrink-0 relative shadow-character"
-          :class="{ active: selected_character == character.id }"
-        >
+        <div v-for="character in characters" :key="character.id" class="group first:ml-auto last:mr-auto m-4 w-[170px] h-[275px] flex flex-col shrink-0 relative shadow-character" :class="{ active: selected_character == character.id }">
           <img src="/assets/ui-box-outer.svg" class="absolute w-full h-full" />
           <img src="/assets/ui-box-inner.svg" class="absolute left-2 bottom-2 w-[calc(100%_-_16px)] h-[calc(100%_-_40px)]" />
           <input class="opacity-0 h-full w-full absolute m-0 z-10" type="radio" :id="character.id" name="character" :value="character.id" v-model="selected_character" />
@@ -93,8 +88,9 @@
       <h3 class="m-0 font-medium text-white">Delete character?</h3>
     </template>
     <template #modalBody>
-      <p class="mt-0 mb-5 text-white text-lg">Do you want to permanently delete 
-        <span class="font-extrabold text-white">{{ deletingCharacter.name }}</span>?
+      <p class="mt-0 mb-5 text-white text-lg">
+        Do you want to permanently delete <span class="font-extrabold text-white">{{ deletingCharacter.name }}</span
+        >?
       </p>
     </template>
   </ConfirmationModal>
diff --git a/src/screens/Login.vue b/src/screens/Login.vue
index 40e0278..acbb4fd 100644
--- a/src/screens/Login.vue
+++ b/src/screens/Login.vue
@@ -16,12 +16,12 @@
                 <input class="input-field xs:min-w-[350px] min-w-64" id="username-login" v-model="username" type="text" name="username" placeholder="Username" required autofocus />
                 <div class="relative">
                   <input class="input-field xs:min-w-[350px] min-w-64" id="password-login" v-model="password" :type="showPassword ? 'text' : 'password'" name="password" placeholder="Password" required />
-                  <button type="button" @click.prevent="showPassword = !showPassword" :class="{'eye-open': showPassword}" class="bg-[url('/assets/icons/eye.svg')] p-0 absolute right-3 w-4 h-3 top-1/2 -translate-y-1/2 bg-no-repeat"></button>
+                  <button type="button" @click.prevent="showPassword = !showPassword" :class="{ 'eye-open': showPassword }" class="bg-[url('/assets/icons/eye.svg')] p-0 absolute right-3 w-4 h-3 top-1/2 -translate-y-1/2 bg-no-repeat"></button>
                 </div>
                 <span v-if="loginError" class="text-red-200 text-xs absolute top-full mt-1">{{ loginError }}</span>
               </div>
               <button class="inline-flex self-end p-0 text-cyan-300 text-base">Forgot password?</button>
-              <button class="btn-cyan px-0 xs:w-full" type="submit">Play now</button> 
+              <button class="btn-cyan px-0 xs:w-full" type="submit">Play now</button>
 
               <!-- Divider shape -->
               <div class="absolute w-40 h-0.5 -bottom-8 left-1/2 -translate-x-1/2 flex justify-between">
@@ -42,11 +42,11 @@
                 <input class="input-field xs:min-w-[350px] min-w-64" id="username-register" v-model="username" type="text" name="username" placeholder="Username" required autofocus />
                 <div class="relative">
                   <input class="input-field xs:min-w-[350px] min-w-64" id="password-register" v-model="password" :type="showPassword ? 'text' : 'password'" name="password" placeholder="Password" required />
-                  <button type="button" @click.prevent="showPassword = !showPassword" :class="{'eye-open': showPassword}" class="bg-[url('/assets/icons/eye.svg')] p-0 absolute right-3 w-4 h-3 top-1/2 -translate-y-1/2 bg-no-repeat"></button>
+                  <button type="button" @click.prevent="showPassword = !showPassword" :class="{ 'eye-open': showPassword }" class="bg-[url('/assets/icons/eye.svg')] p-0 absolute right-3 w-4 h-3 top-1/2 -translate-y-1/2 bg-no-repeat"></button>
                 </div>
                 <span v-if="loginError" class="text-red-200 text-xs absolute top-full mt-1">{{ loginError }}</span>
               </div>
-              <button class="btn-cyan xs:w-full" type="submit">Register now</button> 
+              <button class="btn-cyan xs:w-full" type="submit">Register now</button>
 
               <!-- Divider shape -->
               <div class="absolute w-40 h-0.5 -bottom-8 left-1/2 -translate-x-1/2 flex justify-between">
diff --git a/src/screens/ZoneEditor.vue b/src/screens/ZoneEditor.vue
index 9e8c6ff..c407878 100644
--- a/src/screens/ZoneEditor.vue
+++ b/src/screens/ZoneEditor.vue
@@ -5,7 +5,7 @@
 
     <Game :config="gameConfig" @create="createGame">
       <Scene name="main" @preload="preloadScene" @create="createScene">
-        <ZoneEditor v-if="isLoaded" :key="JSON.stringify(`${zoneEditorStore.zone?.id}_${zoneEditorStore.zone?.createdAt}_${zoneEditorStore.zone?.updatedAt}`)"  />
+        <ZoneEditor v-if="isLoaded" :key="JSON.stringify(`${zoneEditorStore.zone?.id}_${zoneEditorStore.zone?.createdAt}_${zoneEditorStore.zone?.updatedAt}`)" />
       </Scene>
     </Game>
   </div>
diff --git a/src/stores/zoneEditorStore.ts b/src/stores/zoneEditorStore.ts
index 8a10686..e3d3478 100644
--- a/src/stores/zoneEditorStore.ts
+++ b/src/stores/zoneEditorStore.ts
@@ -22,7 +22,6 @@ export const useZoneEditorStore = defineStore('zoneEditor', {
       objectList: [] as Object[],
       selectedTile: null as Tile | null,
       selectedObject: null as Object | null,
-      selectedZoneObject: null as ZoneObject | null,
       objectDepth: 0,
       isTileListModalShown: false,
       isObjectListModalShown: false,
@@ -95,9 +94,6 @@ export const useZoneEditorStore = defineStore('zoneEditor', {
     setSelectedObject(object: any) {
       this.selectedObject = object
     },
-    setSelectedZoneObject(zoneObject: ZoneObject | null) {
-      this.selectedZoneObject = zoneObject
-    },
     setObjectDepth(depth: number) {
       this.objectDepth = depth
     },
@@ -123,7 +119,6 @@ export const useZoneEditorStore = defineStore('zoneEditor', {
       this.drawMode = 'tile'
       this.selectedTile = null
       this.selectedObject = null
-      this.selectedZoneObject = null
       this.objectDepth = 0
       this.isSettingsModalShown = false
       this.isZoneListModalShown = false
diff --git a/src/types.ts b/src/types.ts
index e721151..0c73dcb 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -221,4 +221,4 @@ export type WorldSettings = {
   isRainEnabled: boolean
   isFogEnabled: boolean
   fogDensity: number
-}
\ No newline at end of file
+}