Some slight changes to Animations and controls that make it more
responsive and adequate