Added onControlButtonClick event