Change clicks to use single event handler