Track containers to avoid flickering