Layout works now.
Merge pull request #336 from muskovicsnet/master

Layout works now.