Fixed Swipe issues