search up and running
all button added - not working
Merge branch 'search'