Refactor nav-bar