LAyout fix proposal
Merge pull request #1 from lnwdr/master

A few suggestions …