Fix merge conflict
Tweak search styling