Correction for the navigation links
Refactor survey form values and add session clear helper function