New Animations, Refactored Button, Cleanup