More refinements to swipe behavior