Merge branch 'temp'
Reordering works

auto play is also fixed, database made slightly deeper
Merge branch 'temp' into gh-pages