Swipe click and out of range fixed