Improve scannability of headings #556