diff --git a/src/components/gameMaster/mapEditor/Map.vue b/src/components/gameMaster/mapEditor/Map.vue
index d55c0ba..4d0a2bf 100644
--- a/src/components/gameMaster/mapEditor/Map.vue
+++ b/src/components/gameMaster/mapEditor/Map.vue
@@ -113,10 +113,6 @@ function updateAndCommit(map?: MapT) {
   commit()
   commandStack.push(0)
   commandIndex.value = commandStack.length
-
-  console.log(history.value)
-  console.log(commandStack)
-  console.log(commandIndex.value)
 }
 
 function addCommand(command: EditorCommand) {
diff --git a/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue b/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
index 940e73c..eafafd8 100644
--- a/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
+++ b/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
@@ -25,6 +25,7 @@ import TilemapLayer = Phaser.Tilemaps.TilemapLayer
 
 const scene = useScene()
 const mapEditor = useMapEditorComposable()
+const map = computed(() => mapEditor.currentMap.value!)
 
 const emit = defineEmits<{(e: 'update', map: MapT): void, (e: 'updateAndCommit', map: MapT): void}>()
 
@@ -141,7 +142,6 @@ function rotatePlacedMapObject(id: string, map: MapT) {
 
   map.placedMapObjects.map((placed) => {
     if (placed.id === id) {
-      console.log(placed.id)
       placed.isRotated = !placed.isRotated
     }})
 
diff --git a/src/components/gameMaster/mapEditor/partials/Toolbar.vue b/src/components/gameMaster/mapEditor/partials/Toolbar.vue
index 42a5843..fe37851 100644
--- a/src/components/gameMaster/mapEditor/partials/Toolbar.vue
+++ b/src/components/gameMaster/mapEditor/partials/Toolbar.vue
@@ -108,7 +108,7 @@ import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
 
 const mapEditor = useMapEditorComposable()
 
-const emit = defineEmits(['save', 'clear', 'open-maps', 'open-settings'])
+const emit = defineEmits(['save', 'clear', 'open-maps', 'open-settings', 'open-teleport'])
 
 // States
 const toolbar = ref(null)
@@ -150,7 +150,7 @@ function handleClick(tool: string) {
   mapEditor.setTool(tool)
   selectPencilOpen.value = tool === 'pencil' ? !selectPencilOpen.value : false
   selectEraserOpen.value = tool === 'eraser' ? !selectEraserOpen.value : false
-
+  if (mapEditor.drawMode.value === 'teleport') emit("open-teleport")
 }
 
 function cycleToolMode(tool: 'pencil' | 'eraser') {
diff --git a/src/components/screens/MapEditor.vue b/src/components/screens/MapEditor.vue
index 5b0b671..2498a3c 100644
--- a/src/components/screens/MapEditor.vue
+++ b/src/components/screens/MapEditor.vue
@@ -5,7 +5,7 @@
         <div v-if="!isLoaded" class="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 text-white text-3xl font-ui">Loading...</div>
         <div v-else>
           <Map v-if="mapEditor.currentMap.value" :key="mapEditor.currentMap.value?.id" />
-          <Toolbar ref="toolbar" @save="save" @clear="clear" @open-maps="mapModal?.open" @open-settings="mapSettingsModal?.open" />
+          <Toolbar ref="toolbar" @save="save" @clear="clear" @open-maps="mapModal?.open" @open-settings="mapSettingsModal?.open" @open-teleport="teleportModal?.open"/>
           <MapList ref="mapModal" @open-create-map="mapSettingsModal?.open" />
           <TileList />
           <MapObjectList />
@@ -34,7 +34,6 @@ import { MapStorage } from '@/storage/storages'
 import { useGameStore } from '@/stores/gameStore'
 import { Game, Scene } from 'phavuer'
 import { ref, useTemplateRef } from 'vue'
-import teleportModal from '@/components/gameMaster/mapEditor/partials/TeleportModal.vue'
 
 const mapStorage = new MapStorage()
 const mapEditor = useMapEditorComposable()
@@ -42,7 +41,7 @@ const gameStore = useGameStore()
 
 const mapModal = useTemplateRef('mapModal')
 const mapSettingsModal = useTemplateRef('mapSettingsModal')
-const teleportSettings = useTemplateRef('teleportModal')
+const teleportModal = useTemplateRef('teleportModal')
 
 const isLoaded = ref(false)