Mainly Layout and disabling authenticate.
Merge pull request #441 from colinbull/master

Mainly Layout and disabling authenticate.