Added checkboxes and radiobuttons (to be tested)