Refactoring navbar
Minor