Layout updates to fix display issues
Merge pull request #1 from lawn-chair/master

Layout updates to fix display issues