Adding Collapsing/Expanding Logic to containers