Fixed the search box button alignment issue

Hi,
  I have added the search button and clear button onto the same button group as it was creating alignment issues in many of the templates.

Regards
Sudhakar