added a search bar and clean up