Refactored layouts
Merge pull request #235 from sylvaindeloux/refactor_layouts

Refactored layouts