Merge pull request #9 from daveology/layout1

Merge for layout update.