Make some more appropriate name choices
Added the search form to the page