Added collapsible feature