moved remove button into collapsibles, make strings clearer