Edited click event listener.
More robust.
Merge remote-tracking branch 'origin/CookieMonster' into R6_Kickass