Remove unneeded variables and improve the sizes calculation
Add margins
Merge branch 'master' into gh-pages