Improve touch map to stop animation