Added toggling animation settings

-Also some nice code cleanup