Animation Actions + some refactoring