Control events handling reworked