Various tidying up.
Fix some more errors.
Fix numerous HTML validation errors.
Further HTML validation fixes.
Fix remaining validation errors.
Merge branch 'master' into MNF