Refactor searchbar

This needs to go with corresponding core changes. Slightly changed classes on the search bar elements.

@sdougbrown