Added custom icons; Added search bar