bug fix
refactor animations and controller