More tweaks to animations