Checkbox and radio buttons fix