Issue #506 adding return back to track button & back to index buttonws in the wizard