Changed UI and added right swipe feature