Changed layout for map view to be more user-friendly
Merge remote-tracking branch 'origin/master'