Fixing next and submit button validations

This should fix the issues outlined in the email from Ian, as well as the issue where the last page didn't need to be valid to submit the form.