Added fade animation, and fixed expand duration.