Added swipe views and popup