Refactor tour step view/edit into nested states