Refactor nav search bar