NavogatorBar refactoring