Added search bar
merged search bar