Tweaks to map section