Styled search bar
Resolved conflict