Update layout to exclude body

Also fix width on some samples
Merge pull request #43 from ianbarber/master

Update layout to exclude body