Refactored names, added search bar