Refactor navbar