added checkboxes and radio buttons