Refactor navbar
Add ability to search