FixToggle Issues

Fixed the toggling issues for radio buttons