use event handler
add clickHandler
modify window close point
Merge branch 'bugfix/policy'