Working with the layout
Merge pull request #1 from rthbound/master

Working with the layout