Make the layout more stable.
Merge pull request #240 from bstell/master

Make the layout more stable.