Added map view
create map view
fixed merged conflict