For now, I've given the navlinks a padding-right that's more or less the width of the search bar. If the search bar isn't there, it will look kinda funky with that blank space.

I think I can come up with a solution to this with S2. I'll go give it a try.

Thanks for your help!