move all map logic to the view
move all map logic to the view
add views