WIP cleaning up map page