Bogna review fixes - adding eventListeners etc