refactoring (navbar)