Tile reorganization and fixed the editor, but still some performance
issues