Improve the MapActivity