Added checkboxes and radio buttons