Fixed layout issues
More layout fixes
Merge pull request #3 from jlieb10/layout

Layout