demo page 2 layouts
Merge branch 'issue-14' into develop