Added more animations and controls