Some updates for map page