Merge pull request #9 from daveology/layout1

Merge for layout update.
Merge pull request #10 from daveology/master

Merge pull request #9 from daveology/layout1