Refactored. Next button always loads +1 page