Added script-step (WIP) + fixed issue with forms on review-step sync