Change event listener

Use click event instaed of change

Change-Id: I96ccac0ae41f5d5a813c1e1294c247bd160ad05a