Scale of the map done
Positions scale correctly
Fixed merge conflicts