Still need to properly fix the data save and completed steps when navigating with the progress bar