Added map to the view
Merge branch 'map'