Fixes to touch handling

Update the touch handling a bit so things behave a bit better when a callout is visible

Signed-off-by: Blake Skinner <bskinner@mit.edu>