Improved Sample click events