Agreement ready, 2 new component added for custom radio/checkbox groups