fixed small ordering issue
fixed scroll again
Merge branch 'master' into gh-pages
updated git-pages