NDF - tidy up text styles
NDF - add h2 and p