removed search button and duplicate searches
Merge branch 'new_master' into search
Merge branch 'search' into new_master