(Bug 5073) Tweak alignment for nav search

* aligns the search form elements with one another
* aligns the search form to match the rest of the top bar