Update layout.html
Merge branch 'master' into canvas