Made some improvements to animations