diff --git a/src/components/zone/Characters.vue b/src/components/zone/Characters.vue
index 1620585..d6288a0 100644
--- a/src/components/zone/Characters.vue
+++ b/src/components/zone/Characters.vue
@@ -1,20 +1,13 @@
 <template>
-  <Character v-for="item in zoneStore.characters" :key="item.id" :layer="tilemap" :character="item" />
+  <Character v-for="item in zoneStore.characters" :key="item.id" :layer="tilemap" :character="item" :depth="1" />
 </template>
 
 <script setup lang="ts">
 import Character from '@/components/sprites/Character.vue'
 import { useZoneStore } from '@/stores/zone'
-import { useGameStore } from '@/stores/game'
-import { useAssetStore } from '@/stores/assets'
-import { useZoneEditorStore } from '@/stores/zoneEditor'
-import { useScene } from 'phavuer'
 
-const gameStore = useGameStore()
 const zoneStore = useZoneStore()
 
-const scene = useScene()
-
 const props = defineProps<{
   tilemap: Phaser.Tilemaps.Tilemap
 }>()
diff --git a/src/components/zone/Tiles.vue b/src/components/zone/Tiles.vue
index 6c123ec..b64b885 100644
--- a/src/components/zone/Tiles.vue
+++ b/src/components/zone/Tiles.vue
@@ -1,6 +1,6 @@
 <template>
   <TilemapLayer :tilemap="zoneTilemap" :tileset="tileArray" :layerIndex="0" :cull-padding="10" />
-  <Controls :layer="tiles" />
+  <Controls :layer="tiles" :depth="0" />
 </template>
 
 <script setup lang="ts">
diff --git a/src/components/zone/Zone.vue b/src/components/zone/Zone.vue
index b3acd74..4cecccc 100644
--- a/src/components/zone/Zone.vue
+++ b/src/components/zone/Zone.vue
@@ -30,6 +30,7 @@ gameStore.connection?.emit('zone:characterJoin', { zoneId: gameStore.character?.
 
 // Event listeners
 gameStore.connection?.on('zone:teleport', (data: zoneLoadData) => {
+  if (zoneStore.zone?.id === data.zone.id) return
   tileMap.value = null;
   zoneStore.setZone(data.zone)
   zoneStore.setCharacters(data.characters)