added search bar
merged