Better handling of Touch listeners