Smoother animation. Fix volume bug