Dynamic fixes
fix ordering
Merge branch 'gh-pages'