Added check for disabled state on checkbox and radio button