Refactoring animations, final changes