Started working on the search page

Also cleaned up some old stuff.