diff --git a/src/digital-components/text-block/text-block.vue b/src/digital-components/text-block/text-block.vue
index 2147f0a03..b58ec06c4 100644
--- a/src/digital-components/text-block/text-block.vue
+++ b/src/digital-components/text-block/text-block.vue
@@ -2,13 +2,12 @@
     <div class="text-block w-100" :class="[justifyText, typeStyle, fontWeight, marginTopClass]">
         <span v-for="copy in splitCopyOnCMSPlaceHolder(this.textBlockCopy)" :key="copy">
             <span v-if="doesCopyContainRouterLink(copy)">
-                <router-link
-                    :to="{
-                        query: { [pageQueryString]: `${getRouterLinkRouteFromCopy(copy)}` },
-                        name: 'root',
-                    }"
-                    >{{ getRouterLinkDisplayTextFromCopy(copy) }}</router-link
-                >
+                <textLink
+                    linkType="text"
+                    :text="getRouterLinkDisplayTextFromCopy(copy)"
+                    href="javascript:void(0)"
+                    useLoadingModal
+                    @click-event="navigateWithScenario(getRouterLinkRouteFromCopy(copy))" />
             </span>
             <span v-else-if="doesCopyContainTextLink(copy)">
                 <textLink
@@ -55,6 +54,10 @@ export default {
         getRouterLinkRouteFromCopy,
         getRouterLinkDisplayTextFromCopy,
         getExternalLink,
+        navigateWithScenario(scenarioName) {
+            console.log(scenarioName);
+            this.$router.navigateWithoutSaving(scenarioName, this.$route);
+        },
     },
     computed: {
         pageQueryString() {
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index 30f7d0341..14afea87b 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -26,6 +26,7 @@ const navigationScenarios = {
     SELECTED_LICENSE_PLATE: "SELECTED_LICENSE_PLATE",
     SELECTED_HOME_ADDRESS: "SELECTED_HOME_ADDRESS",
     CLICKED_FORWARD_WITH_NO_QUESTIONS: "CLICKED_FORWARD_WITH_NO_QUESTIONS",
+    CLICKED_VIN_RETRY: "estimate",
 
     // Part selection
     CLICKED_FORWARD_WITH_PART_QUESTIONS: "CLICKED_FORWARD_WITH_PART_QUESTIONS",
@@ -40,6 +41,9 @@ const navigationScenarios = {
     CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS: "CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS",
     CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS: "CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS",
 
+    // Schedule
+    CLICKED_CHANGE_LOCATION: "service-location",
+
     // Review
     CLICKED_VEHICLE_EDIT: "CLICKED_VEHICLE_EDIT",
     CLICKED_DAMAGE_EDIT: "CLICKED_DAMAGE_EDIT",
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 91fd47229..f150d0a61 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -76,6 +76,10 @@ const routingTable = function (store) {
                     scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
                     destinationFmgPageValue: fmgPageValues.QUOTE,
                 },
+                {
+                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
+                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                },
             ],
         },
         {
@@ -109,6 +113,10 @@ const routingTable = function (store) {
                     scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
                     destinationFmgPageValue: fmgPageValues.QUOTE,
                 },
+                {
+                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
+                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                },
             ],
         },
         {
@@ -146,6 +154,10 @@ const routingTable = function (store) {
                     scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
                     destinationFmgPageValue: fmgPageValues.QUOTE,
                 },
+                {
+                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
+                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                },
             ],
         },
         {
@@ -179,6 +191,10 @@ const routingTable = function (store) {
                     scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
                     destinationFmgPageValue: fmgPageValues.QUOTE,
                 },
+                {
+                    scenario: navigationScenarios.CLICKED_VIN_RETRY,
+                    destinationFmgPageValue: fmgPageValues.ESTIMATE,
+                },
             ],
         },
         {
@@ -399,6 +415,10 @@ const routingTable = function (store) {
                     scenario: navigationScenarios.CLICKED_FORWARD,
                     destinationFmgPageValue: fmgPageValues.CUSTOMER_DETAILS,
                 },
+                {
+                    scenario: navigationScenarios.CLICKED_CHANGE_LOCATION,
+                    destinationFmgPageValue: fmgPageValues.SERVICE_LOCATION,
+                },
             ],
         },
         {