restructure: update swipe behavior