Fixed Level Editor stuff and merged