Layouts updated.
Merge pull request #1008 from Bars107/master

Layouts updated.