diff --git a/code/editor.lua b/code/editor.lua
index 27e8cb8..3d52db1 100644
--- a/code/editor.lua
+++ b/code/editor.lua
@@ -140,10 +140,12 @@ function drawEditor()
 	drawGridDisplay()
 	drawGameworldForeground()
 	endGameworldDraw()
-	doEditorEdit()
-	drawSpawns()
 
 	drawEditorRooms()
+	drawSpawns()
+
+	doEditorEdit()
+
 	drawSelectingPaletteTile()
 
 	if editor.palette_mode then
@@ -172,8 +174,14 @@ function doEditorEdit()
 		 expand_v = vertical
 	end
 	love.graphics.setColor(100, 100, 100, 0.8)
-	love.graphics.print("> " .. horizontal .. ", " .. vertical .. "; " .. math.floor(mouse_x / game.scale + Camera.pos.x) .. ", " .. math.floor(mouse_y / game.scale + Camera.pos.y))
-	love.graphics.print("> " .. level_width .. "(" .. expand_h .. "), " .. level_height .. "(".. expand_v .. ")", 0, 10)
+		drawTextBox(
+		 	"Coords: [" ..
+			horizontal .. "," .. vertical .. "] (tile)\t[" ..
+			math.floor(mouse_x / game.scale + Camera.pos.x) .. "," .. math.floor(mouse_y / game.scale + Camera.pos.y).."] (pixel)\n" ..
+			 "Level size: [" ..	level_width .. ", " .. level_height .. "] +(" .. expand_h .. "," .. expand_v .. ")",
+			0,
+			0
+		)
 
 	if editor.room_mode then
 		local rx = horizontal * tile_properties.width
diff --git a/code/keybind.lua b/code/keybind.lua
index 2e14cf9..f8abdeb 100644
--- a/code/keybind.lua
+++ b/code/keybind.lua
@@ -128,7 +128,7 @@ function Keybind:default()
 	Keybind.editor.entity_select = { keys = {1}}
 	Keybind.editor.entity_move = { keys = {2}}
 	Keybind.editor.entity_modify_archetype = { keys = {"t"}}
-	Keybind.editor.entity_modify_data = { keys = {"d"}}
+	Keybind.editor.entity_modify_data = { keys = {"g"}}
 	-- Generic
 	Keybind.generic.lclick = { keys = {1}}
 	Keybind.generic.rclick = { keys = {2}}
diff --git a/code/spawn.lua b/code/spawn.lua
index da1989f..caa4921 100644
--- a/code/spawn.lua
+++ b/code/spawn.lua
@@ -170,12 +170,15 @@ function drawSpawns()
 		)
 
 		if spawn.selected then
-			local text = spawn.archetype.type.."\n["..spawn.args[1]..","..spawn.args[2].."]\n"
-			for i=3, #spawn.args do
-				if i > 3 then text = text .. ", " end
-				text = text .. tostring(spawn.args[i])
+			local text = spawn.archetype.type.."\n---\nPosition\n["..spawn.args[1]..","..spawn.args[2].."]"
+			if #spawn.args > 2 then
+				text = text .. "\n---\nData:\n"
+				for i=3, #spawn.args do
+					if i > 3 then text = text .. ", " end
+					text = text .. tostring(spawn.args[i])
+				end
 			end
-			love.graphics.print(
+			drawTextBox(
 				text,
 				spawn.args[1] - Camera.pos.x + 20,
 				spawn.args[2] - Camera.pos.y