Navigation pane fixes

Some basic updates to the structure of the navigation pane code.