added popup
Fixed loading of map issue