refactor navbar