Replaced Radio button grouping, debugging