Cherry pick commit from original branch for adding layout paragraphs to basic...

Cherry pick commit from original branch for adding layout paragraphs to basic page and remove body field whilst there