[QAART-167] adding the functionality
code review fixes
Bogna review fixes - adding eventListeners etc