Updated Map page to latest design and misc tweaks