Swipe navigation improvement