Search form and template changes

- added search form to search page
- fixes to site search results
- cleaned up basic template code