Collapse-expand feature added