[refs #389] Updated the collapsible components