Improvment on the map editor