Fixing up the swipe events