Reordering works

auto play is also fixed, database made slightly deeper