[simeon] refactored @wip scenarios, and refactored @close_form