diff --git a/src/layouts/endorsements-page/endorsements-page.vue b/src/layouts/endorsements-page/endorsements-page.vue
index 510fda8b..de2ee33b 100644
--- a/src/layouts/endorsements-page/endorsements-page.vue
+++ b/src/layouts/endorsements-page/endorsements-page.vue
@@ -7,7 +7,9 @@
         <div class="page-container-grouped-styles">
             <div class="fade-on-route-transition position-relative">
                 <siteHeader cmsWidgetName="SiteHeaderWidget" />
-                <siteSubHeader cmsWidgetName="SiteSubHeaderWidget" class="mt-5" />
+                <siteSubHeader
+                    cmsWidgetName="SiteSubHeaderWidget"
+                    class="mt-5" />
                 <div class="container-fluid px-5 mt-0">
                 <buttonQuestion
                     v-model="schoolPropertyAnswer"
@@ -35,11 +37,11 @@
                 </buttonQuestion>
                 <siteFooter
                     ref="siteFooter"
+                    class="pt-5"
                     cmsWidgetName="SiteFooterWidget"
                     :isForwardActionDisabled="!meta.valid"
                     @ForwardClicked="forwardButtonAction"
-                    @backClicked="backButtonAction"
-                    class="pt-5" />
+                    @backClicked="backButtonAction" />
                 </div>
             </div>
         </div>
@@ -51,8 +53,6 @@ import siteHeader from '@/iss-components/site-header/site-header.vue';
 import siteSubHeader from '@/iss-components/site-sub-header/site-sub-header.vue';
 import siteFooter from '@/iss-components/site-footer/site-footer.vue';
 import buttonQuestion from '@/digital-components/button-question/button-question.vue';
-import questionsPageLayout from '@/iss-components/questions-page-layout/questions-page-layout.vue';
-import questionChain from '@/digital-components/question-chain/question-chain.vue';
 
 // Supporting files
 import { fetchCmsContentForPage } from '@/helpers/cms-content-helper';
@@ -69,8 +69,6 @@ export default {
         siteSubHeader,
         siteFooter,
         buttonQuestion,
-        questionsPageLayout,
-        questionChain,
         // eslint-disable-next-line vue/no-reserved-component-names
         Form
     },
@@ -98,7 +96,7 @@ export default {
             rules: {
                 selectionRequired: globalRules.OPTION_REQUIRED
             }
-        }
+        };
     },
     computed: {
         schoolPropertyQuestionText() {
@@ -112,7 +110,7 @@ export default {
         },
         parkingLotAnswersFromCms() {
             return this.getCmsContent('ParkingLotQuestion', 'Answers');
-        },
+        }
     },
     methods:
         {
@@ -122,9 +120,9 @@ export default {
             async forwardButtonAction() {
                 // manually creating the array for now, will revise once service returns questions
                 const questionAnswersArray = [];
-                
+
                 questionAnswersArray.push(
-                    {   
+                    {
                         questionNum: 1,
                         questionText: this.schoolPropertyQuestionText,
                         selectedAnswer: this.schoolPropertyAnswer
@@ -135,15 +133,17 @@ export default {
                         selectedAnswer: this.parkingLotAnswer
                     }
                 );
-    
+
                 // save answers to store as order.policy.endorsementQuestionAnswers
-                await this.mainStore.saveEndorsementQuestionAnswers(questionAnswersArray);
+                await useMainStore().saveEndorsementQuestionAnswers(questionAnswersArray);
 
                 return this.navigateForward();
             },
             navigateForward() {
-                this.$router.navigate(this.navigationScenarios.CLICKED_FORWARD,
-                    this.$route);
+                this.$router.navigate(
+                    this.navigationScenarios.CLICKED_FORWARD,
+                    this.$route
+                );
             }
         }
 };
@@ -174,5 +174,4 @@ export default {
     margin-top: 1rem;
 }
 
-
 </style>