Tweak margins for headings and paragraphs
Merge branch 'develop'