Fix the issues found by review both fed & state

[gilfishy]

During the filing process, I would like to be able to go to forms to make corrections and then return to step-by-step at the same place that I left it.