added map view to main view
merged