Undo previous form when callbacks steps exist between it and the current step.

Added two functions for navigating by 'form' steps rather than steps.