Swipe and notification bug fix