Cleanup
Fix bug with animation when cell not at (0,0)