diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index b1d026023..e2678d2db 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -9,7 +9,7 @@
         <legend class="sr-only" :data-focus-target="formattedGroupName" :id="formattedGroupName" tabindex="-1">
           {{(isMultiSelect && answers && answers.length > 1) ? 'Select one or more options below.' : 'Select an option below.' }}
         </legend>
-        <div :class="getComponentLoopWrapperClasses">
+        <div :class="getComponentLoopWrapperClasses" role="application">
           <div :class="getComponentWrapperClasses" v-for="answer in answers" :key="answer.Name ? answer.Name : answer">
             <component
               :is="buttonType"
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index c770d2b90..f94d69826 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -1,4 +1,5 @@
 <template>
+<div role="application">
 	<div class="row mt-2 mb-4">
 		<div class="col">
 			<textboxQuestion
@@ -67,6 +68,7 @@
 		alertClass="alert-warning"
 		v-bind:isDismissible="false"
 	/>
+</div>
 </template>
 
 <script>
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index a9cf0b0ea..5768c55de 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -19,6 +19,7 @@ const navigationScenarios = {
   SELECTED_HOME_ADDRESS: "SELECTED_HOME_ADDRESS",
   ANSWERED_QUESTIONS_WITH_SINGLE_PART: "ANSWERED_QUESTIONS_WITH_SINGLE_PART",
   ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS: "ANSWERED_QUESTIONS_WITH_MULTIPLE_PARTS",
+  SELECTED_PROVIDE_VIN_DIFFERENT_WAY: "SELECTED_PROVIDE_VIN_DIFFERENT_WAY"
 };
 
 export { navigationScenarios };
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index da76e73cc..127561bd2 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -114,13 +114,12 @@ const routingTable = [
       },
       {
         scenario: navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS,
-        //destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
-        destinationFmgPageValue: fmgPageValues.QUOTE,
+        destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
       },
       {
         scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
         destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
-      },
+      }
     ],
   },
   {
@@ -179,7 +178,7 @@ const routingTable = [
       {
         scenario: navigationScenarios.CLICKED_FORWARD,
         destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-      },
+      },   
       {
         scenario: navigationScenarios.SELECTED_VIN_WITH_PART_QUESTIONS,
         destinationFmgPageValue: fmgPageValues.PART_QUESTIONS
@@ -187,7 +186,11 @@ const routingTable = [
       {
         scenario: navigationScenarios.SELECTED_VIN_WITH_MULTIPLE_PARTS,
         destinationFmgPageValue: fmgPageValues.VEHICLE_PARTS
-      }
+      },
+      {
+        scenario: navigationScenarios.SELECTED_PROVIDE_VIN_DIFFERENT_WAY,
+        destinationFmgPageValue: fmgPageValues.ESTIMATE
+      }           
     ],
   },
   {
@@ -230,4 +233,4 @@ const routingTable = [
   },
 ];
 
-export { routingTable };
+export { routingTable };
\ No newline at end of file
diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
index 0c347de52..a15675d58 100644
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@@ -2,11 +2,11 @@
   <div
     class="list-group list-button rounded-3 d-flex flex-column w-100 mb-2"
     :class="[(errors.length > 0 || hasError) ? 'has-error' : '']"
-    @keyup.space="triggerButton()"
-    @keyup.up="handleKeyupArrow()"
-    @keyup.down="handleKeyupArrow()"
-    @keyup.left="handleKeyupArrow()"
-    @keyup.right="handleKeyupArrow()">
+    @keyup.space="triggerButton"
+    @keyup.up="handleKeyupArrow"
+    @keyup.down="handleKeyupArrow"
+    @keyup.left="handleKeyupArrow"
+    @keyup.right="handleKeyupArrow">
     <input
       :type="isMultiSelect ? 'checkbox' : 'radio'"
       :id="buttonID"
@@ -14,14 +14,14 @@
       :value="value"
       :aria-required="isRequired"
       v-model="checkValue"
-      @change="handleInputChange()"
+      @change="handleInputChange"
     >
     <label
       tabindex="-1"
       :for="buttonID"
       :aria-labelledby="buttonID"
       class="d-flex flex-column justify-content-center py-3 px-4"
-      @mouseup="triggerButton()"
+      @mouseup="triggerButton"
     >
       <span
         class="m-0"
@@ -106,10 +106,7 @@ export default {
       this.isLoaderDisplayed = true;
     },
     handleInputChange() {
-      if(this.selectingInitiatesLoad) {
-        this.triggerButton();
-      }
-      else {
+      if(!this.selectingInitiatesLoad) {
         this.handleCheckChange();
       }
     },
@@ -117,8 +114,6 @@ export default {
       if (this.isMultiSelect) {
         return; // Prevent arrow keys from doing anything if element is a checkbox
       }
-
-      this.handleInputChange();
     },
     triggerButton() {
       if(this.selectingInitiatesLoad) {