Fixed Bugs in the Timeline