More map-related and popup related fixes and changes