Map view issues fixed