diff --git a/src/constants/error-messages.js b/src/constants/error-messages.js
index 62e79340..2fa565e2 100644
--- a/src/constants/error-messages.js
+++ b/src/constants/error-messages.js
@@ -10,7 +10,7 @@ const errorMessages = Object.freeze({
     PASSENGER_SIDE_OPTIONS_REQUIRED: 'Please select window',
     WINDSHIELD_DAMAGE_TYPE_REQUIRED: 'Please select windshield damage',
     WINDSHIELD_CHIP_COUNT_REQUIRED: 'Please select chip(s)',
-    WINDSHIELD_REPLACE_OPTIONS_REQUIRED: 'Please select windshield part',
+    WINDSHIELD_REPLACE_OPTIONS_REQUIRED: 'Select all windshield parts that need to be replaced',
     REPLACE_OPTIONS_REQUIRED: 'Please select rear window type',
     STREET_ADDRESS_REQUIRED: 'Street Address is required.',
     CITY_REQUIRED: 'City is required.',
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index a27e3655..47f7463d 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -46,7 +46,8 @@
                                 class="my-5"
                                 cmsWidgetName="HasReplacementConflict"
                                 alertClass="alert-danger"
-                                :isDismissible="false" />
+                                :isDismissible="false"
+                                :isCollapsible="true" />
                         </div>
                     </div>
                     <div class="justify-content-center">
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
index bee1bc28..dc529605 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -34,7 +34,8 @@
             class="mt-5"
             cmsWidgetName="SplitSingleConflict"
             alertClass="alert-danger"
-            :isDismissible="false" />
+            :isDismissible="false"
+            :isCollapsible="true" />
     </div>
 </template>