Modify layout
Merge pull request #26 from canzalon/develop

Modify layout