Fixed some animations (backout this submit if something goes wrong with animations)