added search functionality, improved style