lots of refactoring and search bar