Added map view
Restructured css
Fixed merge conflicts