Reworking scrolling
Reworking HTML files
Merge branch 'master' into gh-pages