Better handling of touch events