Add search form to results page
Fix search labels
Merge branch 'search_form_to_results'