AutoLayout bug fixes
Merge pull request #2 from carsonperrotti/better-auto-layout

AutoLayout bug fixes