More work on navigation so top nav bar hightlights current selection correctly