Resolved issues with radioGroup elements
Some cleanup