Optimize code

- Always animate unless same row