Next button fixes