Search styling
Fixed merge conflict