Added Corner rotation animation and refactoring