Fix up margins around headers