Switch to using margins on headers so spacing can collapse.