Swipe and pagination verbeterd