Updated all click events to on events