views/animation refactor/fixes