Don't remove margin above `h2`

I’ll fix extra padding in panels in due course.
First work on improved prefs page layout