Copy updates

- a number of copy updates
- some template refactors
- updated tests to reflect changes

fixes #323
Merge pull request #329 from ministryofjustice/fixes/gh-issue-323

Copy updates