Move topbar out of the way of scrollbars

In the process getting rid of some extraneous `<p>` tags.

Fixes #566