Fixed map view
Merge remote-tracking branch 'origin/arcayne-branch'