More cleanup plus linking directly from the scenario page to the state for that scenario.
Add state reset button to workbench.