Converted new map page to use singleton