Changed expand/collapse feature