Added search bar
merged Monday