fix eventhandler refactoring
add load event handler