In progress: refactoring top search bar