Make initial swiping less finicky
Merge branch 'work-on-swipe-behavior'