VE-1321: Bunch of improvements to Map dialog