957070 - move Webapp event listeners/handers to webapp/ class
957070 - add missing event handler and listener