Improved layout of the map