Improve validation to truly only validate fields in current step
Rename nextButton to forwardButton, etc