fixed going to map view.
Merge remote-tracking branch 'origin/master'