Working on Map editor