Fixed animations and validation