collapsables now in boxes

fsw: applybutton now at the end