Getting withHome stuff to work with new state.

How we handled `withHome` was kind of a mish-mash of various approaches that had evolved over time. It wasn't all working well with the new state, leading to various jankiness in the app. For example, clicking on the "Home" icon didn't remove the `with-home` class on the container, which meant the `top` CSS attribute wasn't set correctly for search results.