Layout updates
merge update
Merge pull request #3 from robotmayo/master

Mostly cosmetic changes