add search form, fix up other pages