Fixed Next/Prev to work properly.