(Bug 5041) Include comments search in S2 search module

Style fixes as per review comments.
Text box, comment search checkbox and Search button  on separate lines