fixed navigation and replace edit form with step_form