Search Bar and HTML edits
merging changes