Make headings less cramped
Merge branch 'base' into build

* base:
  Make headings less cramped