diff --git a/src/ux-components/replace-options-question/replace-options-question.vue b/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue
similarity index 80%
rename from src/ux-components/replace-options-question/replace-options-question.vue
rename to src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue
index 699e9bddc..e90c85f7b 100644
--- a/src/ux-components/replace-options-question/replace-options-question.vue
+++ b/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue
@@ -3,6 +3,7 @@
         <buttonQestion
             v-if="isAvailable"
             :isMultiSelect="isMultiSelect"
+            v-model="modelValue"
          />
     </div>
 </template>
@@ -22,7 +23,8 @@ export default ({
     props: {
         isMultiSelect: Boolean,
         isAvailable: Boolean,
-        filterByVehicleCategory: Boolean
+        filterByVehicleCategory: Boolean,
+        modelValue: String,ewe3d
     },
     methods: {
         initializeComponent(cmsContent, replaceOptions){
@@ -31,6 +33,11 @@ export default ({
             this.replaceOptions = replaceOptions;
         }
     },
+    watch: {
+        modelValue(val) {
+        this.$emit("update:modelValue", val);
+        }
+    },
     components: {
         buttonQuestion,
     }
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 65e9a7bba..ebcb85d68 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -53,6 +53,7 @@ export default ({
         resultMap.cmsContent.FunnelSubHeaderWidget
       );
       // use resultMap.damageOptions for damage options
+      console.log(resultMap.damageOptions)
     });
     
   },
diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
index 912403025..5fa285c31 100644
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="list-group list-button d-flex flex-column w-100 mb-2">
-    <input :type="isMultiSelect ? 'checkbox' : 'radio'" :id="buttonID" :name="groupName" :value="buttonID" :aria-required="isRequired" @click="handleClick(value)" :data-focus-target="groupName">
+  <div class="list-group list-button d-flex flex-column w-100 mb-2" @mouseup="handleClick(value)" @keyup.space="handleClick(value)">
+    <input :type="isMultiSelect ? 'checkbox' : 'radio'" :id="buttonID" :name="groupName" :value="buttonID" :aria-required="isRequired" :data-focus-target="groupName">
     <label tabindex="-1" :for="buttonID" :aria-labelledby="buttonID" class="d-flex flex-column justify-content-center py-3 px-4">
       <span class="m-0" :class="textPosition">{{ buttonLabel }}</span>
       <span v-if="buttonLabelSubCopy" class="m-0 small" :class="textPosition">{{buttonLabelSubCopy}}</span>