small navbar refactorings