Add redo / undo + shape movements