Moved map view to top level; improved view event handling