Preparation of layout
Merge pull request #1 from miamarti/master

Preparation of layout