More animation fixes. Left the scaling to attempt

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>