Changed the way, checkboxes or textfields are handled