Updated the the layouts
Merge branch 'develop' into gh-pages