Move to using Radio Buttons in Main Dialog