Merge branch 'John'
New background/formatting stuff

New background/formatting stuff
Merge branch 'master' into John