Layout fixes
Merge pull request #1283 from stude1/master

Layout fixes