cont'd work on map control and nav container with toggle to switch between views