swipe navi refactoring