Ok, so I changed the template to make the search look a little better (by putting the button on the same line as the input field), but I also noticed that I didn't actually fix the CSS problem totally.
The page looks right in Safari if the window is wide enough, but if you make the window narrow, it messes things up. I suppose I'm going to have to play with it some more.