Add map and fix android GPS tracking