Bar nav refactoring