Fixed animations to be more modular