Revised click/touch event handling