added radio buttons and checkboxes