updated search options and home page
merged zach and blaines work