GR: added radio buttons and checkboxes to form