Better tap/click handling