Further work on the map creator tool