Fixed swipe thresholds

Fixed swipe thresholds and some UI bugs