Animations working better
Extra animations and error handling