Added default classes for add and remove button
Updated collections and label / no label handling