Too much
Merge pull request #38 from smguy9/master

Layout fixes.