Search feature implemented

Combined the search into one box.