Fix swiping, kind of
Further improvements to swiping

Don't allow scrolling while swiping, don't swipe if scrolled.