Fix CheckBox label handling