added new fieldset with new radio and check buttons; removed old radio
cleaned up some code