Animation smoothing and style override fix