Map view bugs fixed