Fix for axis not being drawn properly after reorder
Generalise ability to move objects over text tracks

When doing the re-alignment, we want to be able to move
the further annotations automatically