Layout without tables

Do canvas layout without tables
Merge branch 'master' into gh-pages