diff --git a/src/iss-components/cart-dropdown/cart-dropdown.spec.js b/src/iss-components/cart-dropdown/cart-dropdown.spec.js
index ed5a994b..43a354d2 100644
--- a/src/iss-components/cart-dropdown/cart-dropdown.spec.js
+++ b/src/iss-components/cart-dropdown/cart-dropdown.spec.js
@@ -57,7 +57,11 @@ beforeEach(() => {
 describe('cart-dropdown component', () => {
     test('initial data rendered as expected', () => {
         // Arrange
-        const { wrapper } = getMountedComponent({});
+        const { wrapper } = getMountedComponent({
+            order: {
+                availableVaps: []
+            }
+        });
 
         // Assert
         expect(wrapper.vm.$data).toMatchSnapshot();
@@ -74,6 +78,30 @@ describe('cart-dropdown component', () => {
             // Assert
             expect(head.exists()).toBeTruthy();
         });
+        test('cart dropdown head is visible', () => {
+            // Arrange
+            const reference = '#cart-dropdown-head';
+            const { wrapper } = getMountedComponent(cartDropdown, {}, { showDropdownHeader: true });
+
+            // Act
+            const head = wrapper.find(reference);
+
+            // Assert
+            expect(head.exists()).toBeTruthy();
+            expect(head.classes()).toContain('cart-toggle');
+        });
+        test('cart dropdown head is not visible', () => {
+            // Arrange
+            const reference = '#cart-dropdown-head';
+            const { wrapper } = getMountedComponent(cartDropdown, {}, { showDropdownHeader: false });
+
+            // Act
+            const head = wrapper.find(reference);
+
+            // Assert
+            expect(head.exists()).toBeTruthy();
+            expect(head.classes()).not.toContain('cart-toggle');
+        });
         test('cart table', () => {
             // Arrange
             const reference = '#cart-table';
diff --git a/src/iss-components/cart-dropdown/cart-dropdown.vue b/src/iss-components/cart-dropdown/cart-dropdown.vue
index e7d1c7d7..494753d9 100644
--- a/src/iss-components/cart-dropdown/cart-dropdown.vue
+++ b/src/iss-components/cart-dropdown/cart-dropdown.vue
@@ -161,7 +161,6 @@ import partTypeStrings from '@/constants/part-type-strings.js';
 import cartItemType from '@/constants/cart-item-type.js';
 import partNumberStrings from '@/constants/part-number-strings.js';
 import widgetFields from '@/constants/cms-widget-fields.js';
-import issPageValues from '@/router/router-constants/issPage-values';
 
 const VERIFYING_COVERAGE = 'Verifying coverage';
 
@@ -177,12 +176,12 @@ export default {
         readOnly: Boolean,
         recyclingModalCmsWidgetName: String,
         showDropdownHeader: Boolean,
-        defaultDropdownExpanded: Boolean
+        isInitiallyExpanded: Boolean
     },
     data() {
         return {
-            isExpanded: this.defaultDropdownExpanded,
-            availableVaps: useMainStore().pageData(issPageValues.PAYMENT_METHOD)?.vaps ?? [],
+            isExpanded: this.isInitiallyExpanded,
+            availableVaps: useMainStore().order.availableVaps,
             widget: {
                 amountDue: 'AmountDueTextWidget',
                 deductible: 'DeductibleWidget',
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index edd6689f..6bf7bb79 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -23,7 +23,7 @@
                     :showAsPaid="false"
                     :readOnly="false"
                     :showDropdownHeader="true"
-                    :defaultDropdownExpanded="false"
+                    :isInitiallyExpanded="false"
                     recyclingModalCmsWidgetName="RecycleModal"
                     servicePackageTitleWidgetName="ServicePackageTitle" />
                 <hr class="mt-0 mb-5" />
@@ -145,13 +145,12 @@ export default {
                 vm.setCmsContent(resultMap.cmsContent);
                 vm.updateFooterButtonText(vm.customCallToActionButtonCopy);
                 vm.$refs.reviewDropdown.initializeComponent(resultMap.reviewDropdownData);
-                vm.setAvailableVaps(pricedVaps ?? []);
+                vm.storeAvailableVaps(pricedVaps ?? []);
             });
         }
     },
     data() {
         return {
-            availableVaps: [],
             paymentMethodInternalModel: this.getPaymentMethodFromStore(),
             rules: {
                 optionRequired: globalRules.OPTION_REQUIRED
@@ -294,14 +293,8 @@ export default {
                 );
             }
         },
-        setAvailableVaps(vaps) {
-            this.availableVaps = vaps;
-            useMainStore().updatePageData({
-                page: issPageValues.PAYMENT_METHOD,
-                data: {
-                    vaps
-                }
-            });
+        storeAvailableVaps(vaps) {
+            useMainStore().order.availableVaps = vaps;
         }
     }
 };
diff --git a/src/layouts/payment-page/payment-page.vue b/src/layouts/payment-page/payment-page.vue
index 3a76b40f..ce8aec40 100644
--- a/src/layouts/payment-page/payment-page.vue
+++ b/src/layouts/payment-page/payment-page.vue
@@ -46,7 +46,7 @@
                             :showAsPaid="false"
                             :readOnly="true"
                             :showDropdownHeader="false"
-                            :defaultDropdownExpanded="true"
+                            :isInitiallyExpanded="true"
                             recyclingModalCmsWidgetName="RecycleModal"
                             servicePackageTitleWidgetName="ServicePackageTitle" />
                     </div>
diff --git a/src/store/index.js b/src/store/index.js
index 9e06815c..c419b8a8 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -206,7 +206,8 @@ export const getDefaultState = () => ({
         currentDeductible: null,
         carrierPhoneNumber: null,
         loadedFromDupeCheck: null,
-        loadedSessionClearedPreviousData: null
+        loadedSessionClearedPreviousData: null,
+        availableVaps: null
     },
     applicationUser: {
         experiments: [],