Fixed timer bug
Tweaked animations