Fix margin/padding problems for content/h1

This was Lance's commit. I think I accidentally messed it up. Sorry
about that. Won't happen again.