Don't let test view interfere with normal body styles.
Merged in geometry work from #51.
Fixed typo: massword -> password.
Merge branch 'master' into production