Layout update
Main layout change
Merge pull request #1 from montanor/develop

Develop