Checkbox and Radio fixes, product files fixes