Updating ClickHandler (still broken)