Checkbox event handling

Checkbox event handling changes.