ManageMapPage refactoring