More changes for AddRaceWizard

Trying to figure out how to control the flow of the wizard, especially jumping over pages