Refactor nav bar