Some 'CMS' formatting updates, and some minor editing ;)