start refactoring of swipe view