Animation fixes and formatting