Add the map grid to the view
Merge branch '57/map_view'