CORE-1848 Adding line breaks between paragraphs and tweaking