Replace AddRemoveWidget by SelectionWidget which are radio buttons