Show place holder when no search query is provided
Remove no longer needed button wrapping