fixed some auto-layout issues
Merge pull request #1 from johnnyclem/master

fixed some auto-layout issues