Added rotation & row highlighting