Refactored and ajusted animation time;
Added animations;