diff --git a/.github/workflows/web-issue-triage.yml b/.github/workflows/web-issue-triage.yml
deleted file mode 100644
index 995346ee6..000000000
--- a/.github/workflows/web-issue-triage.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-on:
-  issues:
-    types: [opened]
-jobs:
-  createCard:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Add New Issues to Backlog Board
-        uses: peter-evans/create-or-update-project-card@866533e2ae61f13c35fd1d374049713fab43c729 # current tag: v2
-        with:
-          project-name: Backlog Board
-          column-name: New Issues (Need to be Triaged)
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index 607348cc7..6754b69d6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -19,6 +19,7 @@ import PrimaryNavigation from './components/PrimaryNavigation.vue';
 import NotificationBannerModule from './components/NotificationBannerModule.vue';
 import FoooterModule from './components/FooterModule.vue';
 import NotFound from './views/NotFound.vue';
+import { usePartnerStore } from '@/stores/partners';
 
 export default {
   components: {
@@ -31,6 +32,9 @@ export default {
     return {
       NavigationItems
     }
+  },
+  beforeMount() {
+    usePartnerStore().populatePartnerShortLongNameMap();
   }
 }
 </script>
diff --git a/src/components/AdpVulnerabilityEnrichment.vue b/src/components/AdpVulnerabilityEnrichment.vue
index e2946727e..ea4f9623b 100644
--- a/src/components/AdpVulnerabilityEnrichment.vue
+++ b/src/components/AdpVulnerabilityEnrichment.vue
@@ -6,21 +6,21 @@
         <button class="button message-header-button"
           :style="{'background-color': '#162e51 !important', 'color': 'white !important'}"
           @click="togglePanel"
-          :aria-expanded="useCveRecordLookupStore.accordianState[organizationId] ? 'true' : 'false'"
+          :aria-expanded="usecveRecordStore.accordionState[organizationId] ? 'true' : 'false'"
           :aria-controls="`${organizationId}-panel`"
         >
           <span class="icon is-small">
             <p :id="`expandCollapseAltText-${organizationId}`" class="is-hidden">
-              {{useCveRecordLookupStore.accordianState[organizationId] ? 'expand' : 'collapse'}}
+              {{usecveRecordStore.accordionState[organizationId] ? 'expand' : 'collapse'}}
             </p>
-            <font-awesome-icon :icon="useCveRecordLookupStore.accordianState[organizationId] ? 'minus' : 'plus'"
+            <font-awesome-icon :icon="usecveRecordStore.accordionState[organizationId] ? 'minus' : 'plus'"
               aria-hidden="false" focusable="true" :aria-labelledby="`expandCollapseAltText-${organizationId}`"
             />
           </span>
         </button>
       </div>
       <!-- Panel content is conditionally determined by role -->
-      <div :id="`${organizationId}-panel`" v-if="useCveRecordLookupStore.accordianState[organizationId]"
+      <div :id="`${organizationId}-panel`" v-if="usecveRecordStore.accordionState[organizationId]"
         class="pl-3 pr-3 pt-2 pb-5 cve-container-accordion-panel"
       >
         <div>
@@ -207,7 +207,7 @@
 </template>
   
 <script>
-import { useCveRecordLookupStore } from '@/stores/cveRecordLookup.ts';
+import { usecveRecordStore } from '@/stores/cveRecord.ts';
 import ProductStatus from '@/components/ProductStatus.vue';
 import CveRecordReferences from './CveRecordReferences.vue';
 
@@ -253,12 +253,12 @@ export default {
       adpShortName: this.containerObject.providerMetadata.shortName,
       dateUpdated: '',
       cveServicesBaseUrl: import.meta.env.VITE_CVE_SERVICES_BASE_URL,
-      useCveRecordLookupStore: useCveRecordLookupStore(),
+      usecveRecordStore: usecveRecordStore(),
     }
   },
   methods: {
     togglePanel(){
-      useCveRecordLookupStore().accordianState[this.organizationId] = !useCveRecordLookupStore().accordianState[this.organizationId];
+      usecveRecordStore().accordionState[this.organizationId] = !usecveRecordStore().accordionState[this.organizationId];
     },
     hasEnrichmentData(){
       if (this.cwes.length > 0 || this.cvsss.length > 0 || this.kevs.length > 0 || this.ssvcs.length > 0) {
@@ -403,8 +403,8 @@ export default {
       }
     },
     getCveProgramReferences(){
-      if (this.containerObject.providerMetadata.shortName.toLowerCase() !== useCveRecordLookupStore().cveProgramShortName) return;
-      this.cveProgramReferences = useCveRecordLookupStore().getReferences(this.containerObject.references);
+      if (this.containerObject.providerMetadata.shortName.toLowerCase() !== usecveRecordStore().cveProgramShortName) return;
+      this.cveProgramReferences = usecveRecordStore().getReferences(this.containerObject.references);
     },
     getUpdatedDate() {
       this.dateUpdated = this.getDate(this.containerObject.providerMetadata.dateUpdated);
diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue
deleted file mode 100644
index 38d821ef8..000000000
--- a/src/components/HelloWorld.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<script setup lang="ts">
-defineProps<{
-  msg: string
-}>()
-</script>
-
-<template>
-  <div class="greetings">
-    <h1 class="green">{{ msg }}</h1>
-    <h3>
-      You’ve successfully created a project with
-      <a href="https://vitejs.dev/" target="_blank" rel="noopener">Vite</a> +
-      <a href="https://vuejs.org/" target="_blank" rel="noopener">Vue 3</a>. What's next?
-    </h3>
-  </div>
-</template>
-
-<style scoped>
-h1 {
-  font-weight: 500;
-  font-size: 2.6rem;
-  position: relative;
-  top: -10px;
-}
-
-h3 {
-  font-size: 1.2rem;
-}
-
-.greetings h1,
-.greetings h3 {
-  text-align: center;
-}
-
-@media (min-width: 1024px) {
-  .greetings h1,
-  .greetings h3 {
-    text-align: left;
-  }
-}
-</style>
diff --git a/src/components/NotificationBannerModule.vue b/src/components/NotificationBannerModule.vue
index 90e6d7c9b..0011be55f 100644
--- a/src/components/NotificationBannerModule.vue
+++ b/src/components/NotificationBannerModule.vue
@@ -66,7 +66,7 @@
             <div>
               <p id="expandCollapseButton" class="is-hidden">Expand or collapse notification button</p>
               <button id="alertIcon" class="button is-text pl-3 pb-0 pt-0" style="height: 1.5rem" aria-labelledby="expandCollapseButton"
-                @click="toggleAccordianItem()" :aria-expanded="isCollapsed ? false : true">
+                @click="toggleAccordionItem()" :aria-expanded="isCollapsed ? false : true">
                 <span class="icon is-small" style="padding-top: 6px;">
                   <p :id="isCollapsed ? 'caret-up' : 'caret-down'" class="is-hidden">close notification button</p>
                   <font-awesome-icon style="font-size: 25px" :icon="isCollapsed ? 'caret-up' : 'caret-down'"
@@ -95,7 +95,7 @@ export default {
     this.setIsCollapsedState();
   },
   methods: {
-    toggleAccordianItem() {
+    toggleAccordionItem() {
       this.isCollapsed = !this.isCollapsed;
       useGlobalNotificationStore().setLocalNotificationStates();
     },
diff --git a/src/components/PrimaryNavigation.vue b/src/components/PrimaryNavigation.vue
index 5ccb74d0b..5c46660cb 100644
--- a/src/components/PrimaryNavigation.vue
+++ b/src/components/PrimaryNavigation.vue
@@ -122,12 +122,12 @@
         <div class="navbar-start" style="flex-grow: 1 !important; align-items: center !important; justify-content: center !important;
           flex-direction: column !important">
           <div class="navbar-item cve-secondary-navbar-item">
-            <cveRecordLookup/>
+            <cveRecordSearch/>
           </div>
           <div class="navbar-item cve-secondary-navbar-item cve-keyword-search">
             <span class="icon-text mr-2" style="font-size: 14px">
               <router-link to="/ResourcesSupport/FAQs#pc_cve_list_basicssearch_cve" class="cve-dark-blue-text">
-                Find CVE Records by keyword on cve.mitre.org.
+                The legacy CVE List search is available on cve.mitre.org.
               </router-link>
             </span>
           </div>
@@ -150,10 +150,10 @@
 </template>
 
 <script>
-import cveRecordLookup from './cveRecordLookupModule.vue';
+import cveRecordSearch from '@/components/cveRecordSearchModule.vue';
 
 export default {
-  components: { cveRecordLookup },
+  components: { cveRecordSearch },
   props: {
     cvenavs: {
       type: Object,
@@ -184,8 +184,6 @@ export default {
       } else {
         this.selectedTouchScreenMenu.push(menuOption);
       }
-
-      console.log('this.selectedTouchScreenMenu ', this.selectedTouchScreenMenu)
     },
     toggleTouchScreenBurgerMenu() {
       this.isOpen = !this.isOpen;
diff --git a/src/components/ProductStatus.vue b/src/components/ProductStatus.vue
index e72e6fc6a..5115156f7 100644
--- a/src/components/ProductStatus.vue
+++ b/src/components/ProductStatus.vue
@@ -3,7 +3,7 @@
     <h4 class="title is-size-5 mb-0">Product Status</h4>
     <router-link to="/CVERecord/UserGuide/#cve-product-status" class="cve-learn-more-link">Learn more</router-link>
     <div class="mt-4">
-      <div v-if="useCveRecordLookupStore.emptyProductStatus[role]">
+      <div v-if="usecveRecordStore.emptyProductStatus[role]">
         <p class="is-italic cve-help-text">Information not provided</p>
       </div>
       <div v-else>
@@ -87,7 +87,7 @@
 </template>
   
 <script>
-import { useCveRecordLookupStore } from '@/stores/cveRecordLookup.ts';
+import { usecveRecordStore } from '@/stores/cveRecord.ts';
 
 export default {
   props: {
@@ -102,7 +102,7 @@ export default {
   },
   data() {
     return {
-      useCveRecordLookupStore: useCveRecordLookupStore()
+      usecveRecordStore: usecveRecordStore()
       
     }
   },
@@ -125,9 +125,9 @@ export default {
         }
 
         if (isVendorNa && isProductNa && isVersionNa && isDefaultStausNa) {
-          useCveRecordLookupStore().emptyProductStatus[this.role] = true;
+          usecveRecordStore().emptyProductStatus[this.role] = true;
         } else {
-          useCveRecordLookupStore().emptyProductStatus[this.role] = false;
+          usecveRecordStore().emptyProductStatus[this.role] = false;
         }
       }
     },
diff --git a/src/components/ServiceUnavailable.vue b/src/components/ServiceUnavailable.vue
new file mode 100644
index 000000000..758e19075
--- /dev/null
+++ b/src/components/ServiceUnavailable.vue
@@ -0,0 +1,47 @@
+<template>
+  <div class="cve-service-unavailable-container has-text-centered">
+    <h1 class="title is-4">Service is currently unavailable.</h1>
+    <p class="has-text-centered">Please
+      <span class="icon-text">
+        <a href="https://cveform.mitre.org/" target="_blank">report the issue
+          <span class="icon is-size-7 cve-icon-xxs">
+            <p id="extenalLink1" class="is-hidden">external site</p>
+            <font-awesome-icon icon="external-link-alt" aria-labelledby="extenalLink1" aria-hidden="false" focusable="false"/>
+          </span>
+        </a>
+      </span>
+      and try again later.<br/>Or, use
+      <a :href="legacyCveWebsiteLink" target="_blank">Search CVE List on cve.mitre.org
+        <span class="icon is-size-7 cve-icon-xxs">
+          <p id="extenalLink1" class="is-hidden">external site</p>
+          <font-awesome-icon icon="external-link-alt" aria-labelledby="extenalLink1" aria-hidden="false" focusable="false"/>
+        </span>
+      </a>
+      to search CVE Records. Sorry for the inconvenience.
+    </p>
+  </div>
+</template>
+
+<script>
+import { getCurrentInstance } from 'vue';
+
+export default {
+  setup() {
+    const  legacyCveWebsiteLink = getCurrentInstance().appContext.config.globalProperties.GenericGlobalsStore.legacyCveWebsiteLink;
+
+    return {
+      legacyCveWebsiteLink
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+  @import '../assets/style/globals.scss'; 
+</style>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped lang="scss">
+
+
+</style>
diff --git a/src/components/StickyOnPageSidebar.vue b/src/components/StickyOnPageSidebar.vue
index b4bd16a88..8b8d3f4da 100644
--- a/src/components/StickyOnPageSidebar.vue
+++ b/src/components/StickyOnPageSidebar.vue
@@ -5,7 +5,7 @@
       <li v-for="(submenuObj, submenuLabel) in nav.submenu" :key="submenuObj.key">
         <span class="is-flex" style="justify-content: space-between; width: inherit">
           <router-link
-            :to="`${submenuObj.path}?id=${useCveRecordLookupStore.cveId}#${submenuObj.anchorId}`"
+            :to="`${submenuObj.path}?id=${usecveRecordStore.cveId}#${submenuObj.anchorId}`"
             :class="isExactPath(`/${submenuObj.path}#${submenuObj.anchorId}`) ? '' : 'cve-not-active-link'"
           >
             {{ submenuLabel }} here
@@ -28,7 +28,7 @@
 
 <script>
 import { useLinkStore } from '@/stores/link';
-import { useCveRecordLookupStore } from '@/stores/cveRecordLookup.ts';
+import { usecveRecordStore } from '@/stores/cveRecord.ts';
 
 
 export default {
@@ -46,7 +46,7 @@ export default {
   data() {
     return {
       selectedSubmenu: [this.$route.path],
-      useCveRecordLookupStore: useCveRecordLookupStore(),
+      usecveRecordStore: usecveRecordStore(),
     };
   },
   methods: {
diff --git a/src/components/TableOfContentsSidebar.vue b/src/components/TableOfContentsSidebar.vue
index 2c2dd10fa..c1dc281f8 100644
--- a/src/components/TableOfContentsSidebar.vue
+++ b/src/components/TableOfContentsSidebar.vue
@@ -114,31 +114,31 @@ export default {
     return {
       isActive: true,
       isOpen: -1,
-      accordian: {},
-      accordianList: [],
+      accordion: {},
+      accordionList: [],
       selectedSubmenu: [],
     };
   },
   created() {
-    this.setAccordian(false, '', 'subSectionId', 'subSections', ['pageSections', 'appendices']);
+    this.setAccordion(false, '', 'subSectionId', 'subSections', ['pageSections', 'appendices']);
   },
   methods: {
     isExactPath(onPageLink) {
       return useLinkStore().isExactPath(`${this.$route.path}${onPageLink}`, this.$route.fullPath);
     },
-    setAccordian(isHidden, parentId, childId, subSectionPropertyName, topLevelProperties) {
+    setAccordion(isHidden, parentId, childId, subSectionPropertyName, topLevelProperties) {
       Object.keys(this.nav).forEach((topLevelSection) => {
         if (topLevelProperties.includes(topLevelSection)) {
           this.nav[topLevelSection].forEach((item) => {
             item[subSectionPropertyName].forEach((subSection) => {
-              this.accordian[(parentId === '') ? subSection[childId] : `${item[parentId]}${subSection[childId]}`] = isHidden;
+              this.accordion[(parentId === '') ? subSection[childId] : `${item[parentId]}${subSection[childId]}`] = isHidden;
             });
           });
         }
       });
     },
-    toggleAccordianItem(id) {
-      this.accordian[id] = !this.accordian[id];
+    toggleAccordionItem(id) {
+      this.accordion[id] = !this.accordion[id];
     },
     toggleSubmenuItem(id) {
       if (this.selectedSubmenu.includes(id)) {
diff --git a/src/components/TheWelcome.vue b/src/components/TheWelcome.vue
deleted file mode 100644
index 49d8f7354..000000000
--- a/src/components/TheWelcome.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-<script setup lang="ts">
-import WelcomeItem from './WelcomeItem.vue'
-import DocumentationIcon from './icons/IconDocumentation.vue'
-import ToolingIcon from './icons/IconTooling.vue'
-import EcosystemIcon from './icons/IconEcosystem.vue'
-import CommunityIcon from './icons/IconCommunity.vue'
-import SupportIcon from './icons/IconSupport.vue'
-</script>
-
-<template>
-  <WelcomeItem>
-    <template #icon>
-      <DocumentationIcon />
-    </template>
-    <template #heading>Documentation</template>
-
-    Vue’s
-    <a href="https://vuejs.org/" target="_blank" rel="noopener">official documentation</a>
-    provides you with all information you need to get started.
-  </WelcomeItem>
-
-  <WelcomeItem>
-    <template #icon>
-      <ToolingIcon />
-    </template>
-    <template #heading>Tooling</template>
-
-    This project is served and bundled with
-    <a href="https://vitejs.dev/guide/features.html" target="_blank" rel="noopener">Vite</a>. The
-    recommended IDE setup is
-    <a href="https://code.visualstudio.com/" target="_blank" rel="noopener">VSCode</a> +
-    <a href="https://github.com/johnsoncodehk/volar" target="_blank" rel="noopener">Volar</a>. If
-    you need to test your components and web pages, check out
-    <a href="https://www.cypress.io/" target="_blank" rel="noopener">Cypress</a> and
-    <a href="https://on.cypress.io/component" target="_blank" rel="noopener"
-      >Cypress Component Testing</a
-    >.
-
-    <br />
-
-    More instructions are available in <code>README.md</code>.
-  </WelcomeItem>
-
-  <WelcomeItem>
-    <template #icon>
-      <EcosystemIcon />
-    </template>
-    <template #heading>Ecosystem</template>
-
-    Get official tools and libraries for your project:
-    <a href="https://pinia.vuejs.org/" target="_blank" rel="noopener">Pinia</a>,
-    <a href="https://router.vuejs.org/" target="_blank" rel="noopener">Vue Router</a>,
-    <a href="https://test-utils.vuejs.org/" target="_blank" rel="noopener">Vue Test Utils</a>, and
-    <a href="https://github.com/vuejs/devtools" target="_blank" rel="noopener">Vue Dev Tools</a>. If
-    you need more resources, we suggest paying
-    <a href="https://github.com/vuejs/awesome-vue" target="_blank" rel="noopener">Awesome Vue</a>
-    a visit.
-  </WelcomeItem>
-
-  <WelcomeItem>
-    <template #icon>
-      <CommunityIcon />
-    </template>
-    <template #heading>Community</template>
-
-    Got stuck? Ask your question on
-    <a href="https://chat.vuejs.org" target="_blank" rel="noopener">Vue Land</a>, our official
-    Discord server, or
-    <a href="https://stackoverflow.com/questions/tagged/vue.js" target="_blank" rel="noopener"
-      >StackOverflow</a
-    >. You should also subscribe to
-    <a href="https://news.vuejs.org" target="_blank" rel="noopener">our mailing list</a> and follow
-    the official
-    <a href="https://twitter.com/vuejs" target="_blank" rel="noopener">@vuejs</a>
-    twitter account for latest news in the Vue world.
-  </WelcomeItem>
-
-  <WelcomeItem>
-    <template #icon>
-      <SupportIcon />
-    </template>
-    <template #heading>Support Vue</template>
-
-    As an independent project, Vue relies on community backing for its sustainability. You can help
-    us by
-    <a href="https://vuejs.org/sponsor/" target="_blank" rel="noopener">becoming a sponsor</a>.
-  </WelcomeItem>
-</template>
diff --git a/src/components/WelcomeItem.vue b/src/components/WelcomeItem.vue
deleted file mode 100644
index 6d7086aea..000000000
--- a/src/components/WelcomeItem.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <div class="item">
-    <i>
-      <slot name="icon"></slot>
-    </i>
-    <div class="details">
-      <h3>
-        <slot name="heading"></slot>
-      </h3>
-      <slot></slot>
-    </div>
-  </div>
-</template>
-
-<style scoped>
-.item {
-  margin-top: 2rem;
-  display: flex;
-  position: relative;
-}
-
-.details {
-  flex: 1;
-  margin-left: 1rem;
-}
-
-i {
-  display: flex;
-  place-items: center;
-  place-content: center;
-  width: 32px;
-  height: 32px;
-
-  color: var(--color-text);
-}
-
-h3 {
-  font-size: 1.2rem;
-  font-weight: 500;
-  margin-bottom: 0.4rem;
-  color: var(--color-heading);
-}
-
-@media (min-width: 1024px) {
-  .item {
-    margin-top: 0;
-    padding: 0.4rem 0 1rem calc(var(--section-gap) / 2);
-  }
-
-  i {
-    top: calc(50% - 25px);
-    left: -26px;
-    position: absolute;
-    border: 1px solid var(--color-border);
-    background: var(--color-background);
-    border-radius: 8px;
-    width: 50px;
-    height: 50px;
-  }
-
-  .item:before {
-    content: ' ';
-    border-left: 1px solid var(--color-border);
-    position: absolute;
-    left: 0;
-    bottom: calc(50% + 25px);
-    height: calc(50% - 25px);
-  }
-
-  .item:after {
-    content: ' ';
-    border-left: 1px solid var(--color-border);
-    position: absolute;
-    left: 0;
-    top: calc(50% + 25px);
-    height: calc(50% - 25px);
-  }
-
-  .item:first-of-type:before {
-    display: none;
-  }
-
-  .item:last-of-type:after {
-    display: none;
-  }
-}
-</style>
diff --git a/src/components/cveRecordLookupModule.vue b/src/components/cveRecordLookupModule.vue
deleted file mode 100644
index 38cec86ff..000000000
--- a/src/components/cveRecordLookupModule.vue
+++ /dev/null
@@ -1,283 +0,0 @@
-<template>
-  <div class="field mt-1" style="">
-    <div class="field has-addons mb-1">
-      <div class="control is-expanded">
-        <input v-model="cveId" @keyup.enter="onKeyUpEnter" @keyup="validateCveId" @blur="removeHelpText" type="text" class="input cve-id-input"
-          placeholder="Enter CVE ID (CVE-YYYY-NNNN)"/>
-      </div>
-      <div class="control">
-        <button class="button cve-button cve-button-accent-warm" :class="{'is-loading': isSearching, 'disabled': disabled}"
-          :aria-disabled="disabled" @click="startLookup">
-          Find {{ websiteEnv === 'test' ? 'a Test CVE Record/ID' : ''}}
-        </button>
-      </div>
-    </div>
-    <div class="notification is-warning is-light" role="alert" v-if="errorMessage.length > 0">
-      <div class="is-flex" style="justify-content: flex-start;">
-        <p id="alertIcon" class="is-hidden">alert</p>
-        <font-awesome-icon style="flex: 0 0 40px; margin-top:3px" size="lg"  icon="exclamation-triangle" role="alert"
-          aria-labelledby="alertIcon" aria-hidden="false" />
-          <p class="cve-help-text">
-          <ul v-for="errorMsg in errorMessage" :key="errorMsg.key" class="pl-4" style="list-style: square">
-            <li class="cve-help-text" v-html="errorMsg"></li>
-          </ul>
-        <router-link to="/About/Process#request"> Learn more</router-link>
-        </p>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>import axios from 'axios';
-import { useCveRecordLookupStore } from '@/stores/cveRecordLookup';
-
-export default {
-  data() {
-    return {
-      cveId: useCveRecordLookupStore().cveId,
-      showHelpText: false,
-      errorMessage: [],
-      disabled: true,
-      getIdStatusCode: undefined,
-    };
-  },
-  computed: {
-    isSearching() {
-      return useCveRecordLookupStore().isSearching;
-    },
-    websiteEnv() {
-      return import.meta.env.VITE_WEBSITE_ENVIRONMENT;
-    }
-  },
-  created() {
-    const fullPathArr = this.$route.fullPath.split('id=');
-    if (fullPathArr.length === 2) {
-      const cveId = fullPathArr[1];
-      this.cveId = this.cveIdToUpperCase(cveId);
-      this.validateCveId();
-      if (!this.disabled) {
-        this.startLookup();
-      } else {
-        useCveRecordLookupStore().showHelpText = true;
-      }
-    } else {
-      useCveRecordLookupStore().showHelpText = true;
-    }
-  },
-  watch: {
-    $route(to) {
-      if (Object.prototype.hasOwnProperty.call(to.query, 'id')) {
-        this.cveId = this.cveIdToUpperCase(to.query.id);
-        this.validateCveId();
-        if (!this.disabled) {
-          this.startLookup();
-        } else {
-          this.resetStates();
-          useCveRecordLookupStore().showHelpText = true;
-        }
-      }
-    },
-    cveId() {
-      this.cveId = this.cveId.trim().toUpperCase();
-    },
-  },
-  methods: {
-    removeHelpText() {
-      if (this.cveId.length === 0) {
-        this.errorMessage = [];
-      }
-    },
-    cveIdToUpperCase(cveId) {
-      return cveId.toUpperCase();
-    },
-    validateCveId() {
-      this.errorMessage = [];
-
-      const [cve, year, digits] = this.cveId.split('-');
-      const firstElContainsCve = new RegExp(/^(cve)/, 'i').test(cve);
-      const idStartsWithCve = new RegExp(/^(cve-)/, 'i').test(this.cveId);
-      const isElFilledIn = cve && year && digits;
-
-      if (!firstElContainsCve) {
-        this.errorMessage.push('Required CVE ID format: <b>CVE-YYYY-NNNN</b>');
-        this.errorMessage.push('<b>YYYY</b> must be a year starting from 1999');
-        this.errorMessage.push('<b>NNNN</b> must be 4 digits or greater');
-      } else if (!idStartsWithCve && !new RegExp(/^(cve-)\d{4}(-)/, 'i').test(this.cveId)) {
-        if (!idStartsWithCve) this.errorMessage.push('CVE ID must start with <b>CVE-</b>');
-      }
-
-      if (year && year.length > 0 && (parseInt(year, 10) < 1999 || !new RegExp(/^\d{4}$/, 'i').test(year))) {
-        this.errorMessage.push('CVE-<b>YYYY</b>-NNNN must be a year starting from 1999');
-      } else if (year && year.length > 0 && (!new RegExp(/^(cve-)\d{4}(-)/, 'i').test(this.cveId) && isElFilledIn === undefined)) {
-        this.errorMessage.push('Hyphen (-) must follow the year <b>(YYYY)</b>');
-        this.errorMessage.push('Required CVE ID format: <b>CVE-YYYY-NNNN</b>');
-      }
-
-      if (digits && digits.length > 0 && !new RegExp(/^\d{4,}$/).test(digits)) {
-        this.errorMessage.push('CVE-YYYY-<b>NNNN</b> must be 4 digits or greater');
-      }
-
-      if (this.errorMessage.length === 0 && new RegExp(/^(cve)-\d{4}-\d{4,}$/, 'i').test(this.cveId)) {
-        this.disabled = false;
-      } else {
-        this.disabled = true;
-      }
-    },
-    resetStates() {
-      useCveRecordLookupStore().$reset();
-    },
-    startLookup() {
-      if (this.cveId !== useCveRecordLookupStore().cveId) {
-        this.resetStates();
-        useCveRecordLookupStore().cveId = this.cveId;
-        const newPath = `/CVERecord?id=${useCveRecordLookupStore().cveId}`;
-        this.$router.push(newPath);
-        this.lookupId()
-      }
-    },
-    async lookupId() {
-      useCveRecordLookupStore().isSearching = true;
-      this.disabled = true;
-
-      try {
-        this.getRecordData();
-      } catch (error) {
-        const regex = /4\d{2}/g; // 4xx error, e.g.: 400, 404, etc
-        const errorToStr = error.toString() || '';
-        if (!errorToStr.match(regex)) {
-          useCveRecordLookupStore().isPublished = false;
-          useCveRecordLookupStore().isReserved = false;
-          useCveRecordLookupStore().isRejected = false;
-          this.handleServerError();
-        }
-      } finally {
-        if (!useCveRecordLookupStore().serverError && !useCveRecordLookupStore().isPublished && !useCveRecordLookupStore().isReserved && !useCveRecordLookupStore().isRejected) {
-          this.getIdData();
-        }
-      }
-    },
-    async getIdData() {
-      useCveRecordLookupStore().serverError = false;
-      useCveRecordLookupStore().isArecord = undefined;
-
-      const getIdUrl = `/api/cve-id/${useCveRecordLookupStore().cveId}`;
-      try {
-        axios.defaults.baseURL = `https://${import.meta.env.VITE_CVE_SERVICES_BASE_URL}`;
-        const idData = await axios.get(getIdUrl);
-        this.getIdStatusCode = 200;
-        if (idData.status === 200 && idData?.data?.error === undefined) {
-          useCveRecordLookupStore().idData = idData.data;
-          if (useCveRecordLookupStore().idData.state === 'RESERVED') {
-            useCveRecordLookupStore().isReserved = true;
-            useCveRecordLookupStore().isArecord = false;
-          } else if (useCveRecordLookupStore().idData.state === 'REJECTED') {
-            useCveRecordLookupStore().isRejected = true;
-            useCveRecordLookupStore().isArecord = false;
-          }
-
-          this.handleIsIdOrRecordFound(true);
-        }
-      } catch (error) {
-        if (!useCveRecordLookupStore().isPublished) useCveRecordLookupStore().isPublished = false;
-        if (!useCveRecordLookupStore().isReserved) useCveRecordLookupStore().isReserved = false;
-        if (!useCveRecordLookupStore().isRejected) useCveRecordLookupStore().isRejected = false;
-
-        const regex = /4\d{2}/g; // 4xx error, e.g.: 400, 404, etc
-        if (error.toString().match(regex) === null) {
-          this.handleServerError();
-        } else {
-          const errorToStr = error.toString();
-          this.getIdStatusCode = errorToStr.match(regex) ? regex.exec(errorToStr)[0] : 500;
-          if (errorToStr.match(regex)) {
-            useCveRecordLookupStore().isArecord = false;
-            this.handleIsIdOrRecordFound(false);
-          } else {
-            this.handleServerError();
-          }
-        }
-      }
-    },
-    async getRecordData() {
-      const getRecordUrl = `https://${import.meta.env.VITE_CVE_SERVICES_BASE_URL}/api/cve/${useCveRecordLookupStore().cveId}`;
-      const recordData = await axios.get(getRecordUrl);
-
-      if (!this.isJson(recordData.data)) {
-        useCveRecordLookupStore().isPublished = false;
-        useCveRecordLookupStore().isReserved = false;
-        useCveRecordLookupStore().isRejected = false;
-        this.handleServerError();
-      } else if (recordData?.data?.error) {
-        useCveRecordLookupStore().isPublished = false;
-        useCveRecordLookupStore().isReserved = false;
-        useCveRecordLookupStore().isRejected = false;
-
-        if (recordData.data.error === 'CVE_RECORD_DNE') {
-          useCveRecordLookupStore().isIdOrRecordFound = false;
-          useCveRecordLookupStore().isArecord = true;
-        } else {
-          this.handleServerError();
-        }
-      } else {
-        useCveRecordLookupStore().isArecord = true;
-        useCveRecordLookupStore().recordData = recordData.data;
-        if (useCveRecordLookupStore().recordData.cveMetadata.state === 'PUBLISHED') {
-          useCveRecordLookupStore().isPublished = true;
-        } else if (useCveRecordLookupStore().recordData.cveMetadata.state === 'RESERVED') {
-          useCveRecordLookupStore().isReserved = true;
-        } else if (useCveRecordLookupStore().recordData.cveMetadata.state === 'REJECTED') {
-          useCveRecordLookupStore().isRejected = true;
-        }
-        this.handleIsIdOrRecordFound(true);
-      }
-    },
-    handleServerError() {
-      useCveRecordLookupStore().serverError = true;
-      this.setLoadingState(false);
-      useCveRecordLookupStore().isArecord = undefined;
-    },
-    handleIsIdOrRecordFound(newState) {
-      useCveRecordLookupStore().serverError = false;
-      useCveRecordLookupStore().isIdOrRecordFound = newState;
-      this.setLoadingState(false);
-    },
-    setLoadingState(newState) {
-      useCveRecordLookupStore().showHelpText = newState;
-      useCveRecordLookupStore().isSearching = newState;
-      this.disabled = false;
-    },
-    onKeyUpEnter() {
-      this.validateCveId();
-
-      if (!this.disabled) this.startLookup();
-    },
-    isJson(value) {
-      if (typeof value === 'object') {
-        return true;
-      }
-      return false;
-    },
-  },
-}
-
-</script>
-
-<style scoped lang="scss">
-.disabled {
-  opacity: 0.7 !important;
-  background-color: #3d4551;
-  color: white;
-  border-color: #dbdbdb;
-  box-shadow: none;
-}
-
-.notification {
-  margin: 0 0 2px 0 !important;
-  padding: 2px 10px 2px 10px  !important;
-}
-
-@media screen and (min-width: $desktop) {
-  .cve-id-input {
-    width: 400px;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/components/cveRecordSearchModule.vue b/src/components/cveRecordSearchModule.vue
new file mode 100644
index 000000000..11805fabf
--- /dev/null
+++ b/src/components/cveRecordSearchModule.vue
@@ -0,0 +1,122 @@
+<template>
+  <div class="field mt-1">
+    <div class="field has-addons mb-1">
+      <div class="control is-expanded">
+        <input v-model.trim="queryString" @keyup.enter="onKeyUpEnter" @keyup="validateQueryString" type="text" class="input cve-id-input"
+          placeholder="Enter keywords (e.g.: CVE ID, sql injection, etc.)"/>
+      </div>
+      <div class="control">
+        <button @click="validate"
+          class="button cve-button cve-button-accent-warm"
+          :class="{'is-loading': cveListSearchStore.isSearching, 'disabled': cveListSearchStore.isSeachButtonDisabled}"
+          :aria-disabled="cveListSearchStore.isSeachButtonDisabled">
+          Search {{ websiteEnv === 'test' ? 'CVE List in Test' : ''}}
+        </button>
+      </div>
+    </div>
+    <div class="notification is-warning is-light" role="alert" v-if="errorMessage.length > 0">
+      <div class="is-flex is-align-content-flex-start">
+        <p id="alertIcon" class="is-hidden">alert</p>
+        <font-awesome-icon style="flex: 0 0 40px; margin-top:3px" size="lg"  icon="exclamation-triangle" role="alert"
+          aria-labelledby="alertIcon" aria-hidden="false" />
+          <p class="cve-help-text">
+            {{errorMessage}}
+            <router-link to="/About/Process#request"> Learn more</router-link>
+          </p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { useCveListSearchStore } from '@/stores/cveListSearch';
+import { computed, ref, watch } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+let cveListSearchStore = useCveListSearchStore();
+const route = useRoute();
+const router = useRouter();
+
+let queryString = ref('');
+let errorMessage = ref('');
+
+watch(
+  () => route.query,
+  () => {
+    if (route.query?.query){
+      queryString.value = route.query.query.trim();
+      validate();
+    } else {
+      queryString.value = cveListSearchStore.query = '';
+      errorMessage.value = '';
+    }
+  }
+)
+
+
+function startSearch() {
+  if (queryString.value !== cveListSearchStore.query) {
+    cveListSearchStore.$reset();
+    cveListSearchStore.query = queryString.value;
+      router.push({
+        name: 'SearchResults',
+        query: {query: cveListSearchStore.query}
+      });
+      cveListSearchStore.search();
+  }
+}
+
+function validateQueryString() {
+  const alphaNumericDashPattern = new RegExp(/^[a-zA-Z0-9 ]+$/, 'i').test(queryString.value);
+  const cveIdPattern = new RegExp(/^CVE-\d{4}-\d{4,7}$/, 'i').test(queryString.value);
+
+  if (queryString.value.length > 0 && !alphaNumericDashPattern && !cveIdPattern) {
+    cveListSearchStore.isSeachButtonDisabled = true;
+    errorMessage.value = 'Only letters, numbers, and CVE IDs (CVE-YYYY-NNNN) are allowed.';
+    cveListSearchStore.showHelpText = true;
+  } else if (queryString.value.length === 0) {
+    cveListSearchStore.isSeachButtonDisabled = true;
+    errorMessage.value = '';
+    cveListSearchStore.showHelpText = false;
+  } else {
+    cveListSearchStore.isSeachButtonDisabled = false;
+    errorMessage.value = '';
+    cveListSearchStore.showHelpText = false;
+  }
+}
+
+function onKeyUpEnter() {
+  validate()
+}
+
+function validate() {
+  validateQueryString();
+  if (!cveListSearchStore.isSeachButtonDisabled) {
+    startSearch();
+  }
+}
+
+const websiteEnv = computed(() => {
+  return import.meta.env.VITE_WEBSITE_ENVIRONMENT;
+});
+</script>
+
+<style scoped lang="scss">
+.disabled {
+  opacity: 0.7 !important;
+  background-color: #3d4551;
+  color: white;
+  border-color: #dbdbdb;
+  box-shadow: none;
+}
+
+.notification {
+  margin: 0 0 2px 0 !important;
+  padding: 2px 10px 2px 10px  !important;
+}
+
+@media screen and (min-width: $desktop) {
+  .cve-id-input {
+    width: 470px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/icons/IconCommunity.vue b/src/components/icons/IconCommunity.vue
deleted file mode 100644
index 2dc8b0552..000000000
--- a/src/components/icons/IconCommunity.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor">
-    <path
-      d="M15 4a1 1 0 1 0 0 2V4zm0 11v-1a1 1 0 0 0-1 1h1zm0 4l-.707.707A1 1 0 0 0 16 19h-1zm-4-4l.707-.707A1 1 0 0 0 11 14v1zm-4.707-1.293a1 1 0 0 0-1.414 1.414l1.414-1.414zm-.707.707l-.707-.707.707.707zM9 11v-1a1 1 0 0 0-.707.293L9 11zm-4 0h1a1 1 0 0 0-1-1v1zm0 4H4a1 1 0 0 0 1.707.707L5 15zm10-9h2V4h-2v2zm2 0a1 1 0 0 1 1 1h2a3 3 0 0 0-3-3v2zm1 1v6h2V7h-2zm0 6a1 1 0 0 1-1 1v2a3 3 0 0 0 3-3h-2zm-1 1h-2v2h2v-2zm-3 1v4h2v-4h-2zm1.707 3.293l-4-4-1.414 1.414 4 4 1.414-1.414zM11 14H7v2h4v-2zm-4 0c-.276 0-.525-.111-.707-.293l-1.414 1.414C5.42 15.663 6.172 16 7 16v-2zm-.707 1.121l3.414-3.414-1.414-1.414-3.414 3.414 1.414 1.414zM9 12h4v-2H9v2zm4 0a3 3 0 0 0 3-3h-2a1 1 0 0 1-1 1v2zm3-3V3h-2v6h2zm0-6a3 3 0 0 0-3-3v2a1 1 0 0 1 1 1h2zm-3-3H3v2h10V0zM3 0a3 3 0 0 0-3 3h2a1 1 0 0 1 1-1V0zM0 3v6h2V3H0zm0 6a3 3 0 0 0 3 3v-2a1 1 0 0 1-1-1H0zm3 3h2v-2H3v2zm1-1v4h2v-4H4zm1.707 4.707l.586-.586-1.414-1.414-.586.586 1.414 1.414z"
-    />
-  </svg>
-</template>
diff --git a/src/components/icons/IconDocumentation.vue b/src/components/icons/IconDocumentation.vue
deleted file mode 100644
index 6d4791cfb..000000000
--- a/src/components/icons/IconDocumentation.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  <svg xmlns="http://www.w3.org/2000/svg" width="20" height="17" fill="currentColor">
-    <path
-      d="M11 2.253a1 1 0 1 0-2 0h2zm-2 13a1 1 0 1 0 2 0H9zm.447-12.167a1 1 0 1 0 1.107-1.666L9.447 3.086zM1 2.253L.447 1.42A1 1 0 0 0 0 2.253h1zm0 13H0a1 1 0 0 0 1.553.833L1 15.253zm8.447.833a1 1 0 1 0 1.107-1.666l-1.107 1.666zm0-14.666a1 1 0 1 0 1.107 1.666L9.447 1.42zM19 2.253h1a1 1 0 0 0-.447-.833L19 2.253zm0 13l-.553.833A1 1 0 0 0 20 15.253h-1zm-9.553-.833a1 1 0 1 0 1.107 1.666L9.447 14.42zM9 2.253v13h2v-13H9zm1.553-.833C9.203.523 7.42 0 5.5 0v2c1.572 0 2.961.431 3.947 1.086l1.107-1.666zM5.5 0C3.58 0 1.797.523.447 1.42l1.107 1.666C2.539 2.431 3.928 2 5.5 2V0zM0 2.253v13h2v-13H0zm1.553 13.833C2.539 15.431 3.928 15 5.5 15v-2c-1.92 0-3.703.523-5.053 1.42l1.107 1.666zM5.5 15c1.572 0 2.961.431 3.947 1.086l1.107-1.666C9.203 13.523 7.42 13 5.5 13v2zm5.053-11.914C11.539 2.431 12.928 2 14.5 2V0c-1.92 0-3.703.523-5.053 1.42l1.107 1.666zM14.5 2c1.573 0 2.961.431 3.947 1.086l1.107-1.666C18.203.523 16.421 0 14.5 0v2zm3.5.253v13h2v-13h-2zm1.553 12.167C18.203 13.523 16.421 13 14.5 13v2c1.573 0 2.961.431 3.947 1.086l1.107-1.666zM14.5 13c-1.92 0-3.703.523-5.053 1.42l1.107 1.666C11.539 15.431 12.928 15 14.5 15v-2z"
-    />
-  </svg>
-</template>
diff --git a/src/components/icons/IconEcosystem.vue b/src/components/icons/IconEcosystem.vue
deleted file mode 100644
index c3a4f078c..000000000
--- a/src/components/icons/IconEcosystem.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  <svg xmlns="http://www.w3.org/2000/svg" width="18" height="20" fill="currentColor">
-    <path
-      d="M11.447 8.894a1 1 0 1 0-.894-1.789l.894 1.789zm-2.894-.789a1 1 0 1 0 .894 1.789l-.894-1.789zm0 1.789a1 1 0 1 0 .894-1.789l-.894 1.789zM7.447 7.106a1 1 0 1 0-.894 1.789l.894-1.789zM10 9a1 1 0 1 0-2 0h2zm-2 2.5a1 1 0 1 0 2 0H8zm9.447-5.606a1 1 0 1 0-.894-1.789l.894 1.789zm-2.894-.789a1 1 0 1 0 .894 1.789l-.894-1.789zm2 .789a1 1 0 1 0 .894-1.789l-.894 1.789zm-1.106-2.789a1 1 0 1 0-.894 1.789l.894-1.789zM18 5a1 1 0 1 0-2 0h2zm-2 2.5a1 1 0 1 0 2 0h-2zm-5.447-4.606a1 1 0 1 0 .894-1.789l-.894 1.789zM9 1l.447-.894a1 1 0 0 0-.894 0L9 1zm-2.447.106a1 1 0 1 0 .894 1.789l-.894-1.789zm-6 3a1 1 0 1 0 .894 1.789L.553 4.106zm2.894.789a1 1 0 1 0-.894-1.789l.894 1.789zm-2-.789a1 1 0 1 0-.894 1.789l.894-1.789zm1.106 2.789a1 1 0 1 0 .894-1.789l-.894 1.789zM2 5a1 1 0 1 0-2 0h2zM0 7.5a1 1 0 1 0 2 0H0zm8.553 12.394a1 1 0 1 0 .894-1.789l-.894 1.789zm-1.106-2.789a1 1 0 1 0-.894 1.789l.894-1.789zm1.106 1a1 1 0 1 0 .894 1.789l-.894-1.789zm2.894.789a1 1 0 1 0-.894-1.789l.894 1.789zM8 19a1 1 0 1 0 2 0H8zm2-2.5a1 1 0 1 0-2 0h2zm-7.447.394a1 1 0 1 0 .894-1.789l-.894 1.789zM1 15H0a1 1 0 0 0 .553.894L1 15zm1-2.5a1 1 0 1 0-2 0h2zm12.553 2.606a1 1 0 1 0 .894 1.789l-.894-1.789zM17 15l.447.894A1 1 0 0 0 18 15h-1zm1-2.5a1 1 0 1 0-2 0h2zm-7.447-5.394l-2 1 .894 1.789 2-1-.894-1.789zm-1.106 1l-2-1-.894 1.789 2 1 .894-1.789zM8 9v2.5h2V9H8zm8.553-4.894l-2 1 .894 1.789 2-1-.894-1.789zm.894 0l-2-1-.894 1.789 2 1 .894-1.789zM16 5v2.5h2V5h-2zm-4.553-3.894l-2-1-.894 1.789 2 1 .894-1.789zm-2.894-1l-2 1 .894 1.789 2-1L8.553.106zM1.447 5.894l2-1-.894-1.789-2 1 .894 1.789zm-.894 0l2 1 .894-1.789-2-1-.894 1.789zM0 5v2.5h2V5H0zm9.447 13.106l-2-1-.894 1.789 2 1 .894-1.789zm0 1.789l2-1-.894-1.789-2 1 .894 1.789zM10 19v-2.5H8V19h2zm-6.553-3.894l-2-1-.894 1.789 2 1 .894-1.789zM2 15v-2.5H0V15h2zm13.447 1.894l2-1-.894-1.789-2 1 .894 1.789zM18 15v-2.5h-2V15h2z"
-    />
-  </svg>
-</template>
diff --git a/src/components/icons/IconSupport.vue b/src/components/icons/IconSupport.vue
deleted file mode 100644
index 7452834d3..000000000
--- a/src/components/icons/IconSupport.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor">
-    <path
-      d="M10 3.22l-.61-.6a5.5 5.5 0 0 0-7.666.105 5.5 5.5 0 0 0-.114 7.665L10 18.78l8.39-8.4a5.5 5.5 0 0 0-.114-7.665 5.5 5.5 0 0 0-7.666-.105l-.61.61z"
-    />
-  </svg>
-</template>
diff --git a/src/components/icons/IconTooling.vue b/src/components/icons/IconTooling.vue
deleted file mode 100644
index 660598d7c..000000000
--- a/src/components/icons/IconTooling.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- This icon is from <https://github.com/Templarian/MaterialDesign>, distributed under Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0) license-->
-<template>
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    aria-hidden="true"
-    role="img"
-    class="iconify iconify--mdi"
-    width="24"
-    height="24"
-    preserveAspectRatio="xMidYMid meet"
-    viewBox="0 0 24 24"
-  >
-    <path
-      d="M20 18v-4h-3v1h-2v-1H9v1H7v-1H4v4h16M6.33 8l-1.74 4H7v-1h2v1h6v-1h2v1h2.41l-1.74-4H6.33M9 5v1h6V5H9m12.84 7.61c.1.22.16.48.16.8V18c0 .53-.21 1-.6 1.41c-.4.4-.85.59-1.4.59H4c-.55 0-1-.19-1.4-.59C2.21 19 2 18.53 2 18v-4.59c0-.32.06-.58.16-.8L4.5 7.22C4.84 6.41 5.45 6 6.33 6H7V5c0-.55.18-1 .57-1.41C7.96 3.2 8.44 3 9 3h6c.56 0 1.04.2 1.43.59c.39.41.57.86.57 1.41v1h.67c.88 0 1.49.41 1.83 1.22l2.34 5.39z"
-      fill="currentColor"
-    ></path>
-  </svg>
-</template>
diff --git a/src/main.ts b/src/main.ts
index 4e156da03..108b1aa97 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -8,6 +8,7 @@ import App from './App.vue';
 import router from './router/index.js';
 import ExternalLinkMessage from './components/ExternalLinkMessage.vue';
 import { usePartnerStore } from '@/stores/partners';
+import { useGenericGlobalsStore } from '@/stores/genericGlobals.ts';
 
 
 // Import and add icons to library
@@ -16,32 +17,38 @@ import {
   faXTwitter, faGithub, faLinkedin, faYoutube, faMedium, faLeanpub, faReadme, faMastodon,
 } from '@fortawesome/free-brands-svg-icons';
 import {
-  faAngleLeft, faAngleRight, faArrowRight, faBlog, faBook, faCaretDown, faCaretUp, faInfoCircle, faCheckCircle, faExclamationCircle, faFileCode,
-  faTriangleExclamation, faUpRightFromSquare, faLink, faMinus, faPassport, faPlus, faPodcast, faIdCard, faSearch, faHandshake, faUsersCog,
-  faLaptopCode, faPoll, faTimes, faToolbox, faSitemap, faUser, faUserShield, faBullhorn, faWindowMaximize
+  faAngleDoubleLeft, faAngleDoubleRight, faAngleLeft, faAngleRight, faArrowRight, faBlog, faBook, faCaretDown, faCaretUp, faInfoCircle, faCheckCircle,
+  faExclamationCircle, faFileCode, faTriangleExclamation, faUpRightFromSquare, faLink, faMinus, faPassport, faPlus, faPodcast, faIdCard, faSearch,
+  faHandshake, faUsersCog, faLaptopCode, faPoll, faTimes, faToolbox, faSitemap, faUser, faUserShield, faBullhorn, faWindowMaximize,
 } from '@fortawesome/free-solid-svg-icons';
 import { faArrowAltCircleRight, faClipboard, faNewspaper } from '@fortawesome/free-regular-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 
-library.add(faAngleLeft, faAngleRight, faArrowRight, faBlog, faBook, faCaretDown, faCaretUp, faInfoCircle, faCheckCircle, faExclamationCircle, faFileCode,
-  faTriangleExclamation, faUpRightFromSquare, faLink, faMinus, faPassport, faPlus, faPodcast, faIdCard, faSearch, faHandshake, faUsersCog, faLaptopCode,
-  faTimes, faToolbox, faSitemap, faUser, faUserShield, faXTwitter, faGithub, faLinkedin, faYoutube, faMedium, faLeanpub, faArrowAltCircleRight,
-  faClipboard, faNewspaper, faBullhorn, faWindowMaximize, faReadme, faPoll, faMastodon);
+library.add(
+  faAngleDoubleLeft, faAngleDoubleRight, faAngleLeft, faAngleRight, faArrowRight, faBlog, faBook, faCaretDown, faCaretUp, faInfoCircle, faCheckCircle,
+  faExclamationCircle, faFileCode, faTriangleExclamation, faUpRightFromSquare, faLink, faMinus, faPassport, faPlus, faPodcast, faIdCard, faSearch,
+  faHandshake, faUsersCog, faLaptopCode, faPoll, faTimes, faToolbox, faSitemap, faUser, faUserShield, faBullhorn,  faWindowMaximize, faXTwitter, 
+  faGithub, faLinkedin, faYoutube, faMedium, faLeanpub, faArrowAltCircleRight, faClipboard, faNewspaper, faReadme,  faMastodon);
 
 
 const app = createApp(App);
-app.use(createPinia());
+const pinia = createPinia();
+pinia.use(({ store }) => {
+  store.router = router;
+});
+app.use(pinia);
+
 usePartnerStore().populatePartnerCounts();
 
 app.use(VueGtag, {
   config: { id: import.meta.env.VITE_GOOGLE_ANALYTICS_PROPERTY_ID },
   appName: 'CVE Website',
 }, router);
-
 app.use(LoadScript);
-
 app.use(router);
 
+app.config.globalProperties.GenericGlobalsStore = useGenericGlobalsStore();
+
 app.component('font-awesome-icon', FontAwesomeIcon);
 app.component('ExternalLinkMessage', ExternalLinkMessage);
 app.mount('#app');
diff --git a/src/router/index.js b/src/router/index.js
index c65e375d2..1004fb950 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -27,6 +27,7 @@ import PrivacyPolicy from '@/views/Legal/PrivacyPolicy.vue';
 import TermsOfUse from '@/views/Legal/TermsOfUse.vue';
 import CookieNotice from '@/views/Legal/CookieNotice.vue';
 import CVERecord from '@/views/CVERecord/CVERecord.vue';
+import SearchResults from '@/views/CVERecord/SearchResults.vue';
 import CveRecordUserGuide from '@/views/CVERecord/CveRecordUserGuide.vue';
 import AllNews from '@/views/Media/News/AllNews.vue';
 import News from '@/views/Media/News/News.vue';
@@ -368,6 +369,14 @@ const router = createRouter({
         title: 'CVE Record | CVE',
       },
     },
+    {
+      path: '/CVERecord/SearchResults',
+      name: 'SearchResults',
+      component: SearchResults,
+      meta: {
+        title: 'CVE Search Results | CVE',
+      },
+    },
     {
       path: '/CVERecord/UserGuide',
       name: 'CveRecorUserGuided',
diff --git a/src/stores/cveListSearch.js b/src/stores/cveListSearch.js
new file mode 100644
index 000000000..f7e69b819
--- /dev/null
+++ b/src/stores/cveListSearch.js
@@ -0,0 +1,388 @@
+import { defineStore } from 'pinia';
+import axios from 'axios';
+
+export const useCveListSearchStore = defineStore('cveListSearch ', {
+  state: () => { 
+    return {
+      cveId: '',
+      from: 0,
+      isArecord: undefined,
+      isSeachButtonDisabled: true,
+      isIdOrRecordFound: true,
+      isPublished: false,
+      isReserved: false,
+      isRejected: false,
+      isSearching: false,
+      isLookingUpRecord: false,
+      isQueryingSearchService: false,
+      isLookUpRecordServerError: false,
+      isSearchServerError: false,
+      query: '',
+      recordData: {},
+      searchResults: [],
+      serverError: false,
+      showHelpText: false,
+      size: 25,
+      totalExecutingRequests: -1,
+      totalSearchResultCount: 0,
+      pagination: {
+        startWindow: 1,
+        endWindow: undefined,
+        firstPage: 1,
+        currentPage: 1,
+        currentPageWindow: [],
+        totalPages: undefined,
+        maxPageWindow: 5,
+        numberPerPage: 25,
+        sortBy: {
+          field: 'cveId',
+          direction: 'desc',
+          label: 'CVE ID (new to old)',
+          selected: true
+        },
+        sortByOptions: [
+          {
+            field: 'cveId',
+            direction: 'desc',
+            label: 'CVE ID (new to old)',
+            selected: true
+          },
+          {
+            field: 'cveId',
+            direction: 'asc',
+            label: 'CVE ID (old to new)',
+            selected: false
+          },
+          {
+            field: 'relevancy',
+            direction: 'desc',
+            label: 'Relevancy (most to least)',
+            selected: false
+          },
+          {
+            field: 'relevancy',
+            direction: 'asc',
+            label: 'Relevancy (least to most)',
+            selected: false
+          }
+        ],
+        numberPerPageOptions: [25, 50, 100, 200],
+        fromCount: undefined,
+        toCount: undefined
+      },
+    }
+  },
+  actions: {
+    decrement(field) {
+      this[field] -= 1;
+    },
+    isCveIdPattern() {
+      return new RegExp(/^CVE-\d{4}-\d{4,7}$/, 'i').test(this.query);
+    },
+    async search() {
+      this.isSearching = true;
+      try{
+
+        // * 2nd, query search service
+        this.totalExecutingRequests = 1;
+        await this.getSearchResults();
+
+        // * Check if keyword is CVE ID
+        if (this.isCveIdPattern()) {
+          this.totalExecutingRequests = 2;
+          
+          // 1st, lookup ID to get Record data, and continue to get CVE Records that mention that ID
+          this.cveId = this.query.toUpperCase();
+          await this.getRecordData();
+        }
+
+      } catch (error) {
+         throw new Error('search() >> error with getRecordData() and or getSearchResults()');
+      } finally {
+        this.isSearching = false;
+        this.setUpInitialPagination();
+      }
+    },
+    async getRecordData() {
+      this.isLookingUpRecord = true;
+      const getRecordUrl = `/api/cve/${this.cveId}`;
+
+      try {
+        axios.defaults.baseURL = `https://${import.meta.env.VITE_CVE_SERVICES_BASE_URL}`;
+        const response = await axios.get(getRecordUrl);
+        const cveRecordData = response?.data || {};
+        this.isArecord = true;
+        this.isIdOrRecordFound = false;
+
+        // format description
+        let descriptions = [];
+        cveRecordData.containers?.cna?.descriptions.forEach((description) => {
+          if (this.isEnglishLanguage(description.lang)) descriptions.push(this.processShowMoreShowLessDescription(description.value));
+        });
+        let recordDataSummary = {
+          cveId: cveRecordData?.cveMetadata?.cveId || 'No ID provided',
+          cna: cveRecordData?.cveMetadata?.assignerShortName || 'No CNA provided',
+          descriptions: descriptions,
+          relevancyScore: 'not appliciable'
+        }
+        this.recordData = recordDataSummary;
+
+        if (cveRecordData?.cveMetadata.state === 'PUBLISHED') {
+          this.isPublished = true;
+        } else if (cveRecordData?.cveMetadata.state === 'REJECTED') {
+          this.isRejected = true;
+        }
+
+      } catch (e) {
+        this.isLookUpRecordServerError = true;
+
+        this.isPublished = false;
+        this.isReserved = false;
+        this.isRejected = false;
+        this.isIdOrRecordFound = false;
+        this.isArecord = false;
+        throw new Error('getRecordData >> throwing wrroe')
+      } finally {
+        this.isLookingUpRecord = false;
+        this.decrement('totalExecutingRequests');
+      }
+    },
+    async getSearchResults() {
+      this.isQueryingSearchService = true;
+
+      const instance = axios.create({
+        baseURL: import.meta.env.VITE_API_BASE_URL,
+      });
+
+      try {
+        let payLoad = this.createSearchPayload();
+        const response = await instance.post(
+          import.meta.env.VITE_LIST_SEARCH_PATH,
+          payLoad
+        );
+
+
+        if (response.status === 200) {
+          this.totalSearchResultCount = response.data.resultsTotal;
+          this.processSearchResults(response.data.data);
+        }
+
+      } catch (e) {
+        this.isSearchServerError = true;
+        throw new Error(`getSearchResults >> : ${e}`)
+      } finally {
+        this.isQueryingSearchService = false;
+        this.decrement('totalExecutingRequests');
+      }
+    },
+    processSearchResults(results){
+      const parsedResults = [];
+
+      if (results.length >> 0) {
+        results.forEach((result) => {
+
+          parsedResults.push({
+            cveId: result._id,
+            cna: result?._source?.cveMetadata?.assignerShortName || 'No CNA provided',
+            descriptions: this.processDescriptionsField(result),
+            relevancyScore: result?._score
+          });
+        });
+      }
+
+      this.searchResults = parsedResults;
+    },
+    processDescriptionsField(result){
+      let descriptions = [];
+      if (result?._source?.cveMetadata?.state === "PUBLISHED") {
+        result?._source?.containers?.cna?.descriptions.forEach((description) => {
+          if (this.isEnglishLanguage(description.lang)) descriptions.push(this.processShowMoreShowLessDescription(description.value));
+        });
+      } else if (result?._source?.cveMetadata?.state === "REJECTED") {
+        result?._source?.containers?.cna?.rejectedReasons.forEach((rejectedReason) => {
+          if (this.isEnglishLanguage(rejectedReason.lang)) descriptions.push(this.processShowMoreShowLessDescription(rejectedReason.value));
+        });
+      } else {
+        descriptions.push('No description provided');
+      }
+
+      return descriptions;
+    },
+    processShowMoreShowLessDescription(description){
+      let words = this.splitDescriptionsIntoWords(description);
+      let processedDescription = {
+        firstChunk: words.splice(0, 30).join(' '),
+        secondChunk: words.join(' '),
+        showMore: false,
+      };
+
+      return processedDescription;
+      // if 1st or 2nd arr empty then don't display
+    },
+    splitDescriptionsIntoWords(str) {
+      const value = str.trim()
+      if(!value) return 0;
+      return value.split(/\s+/);
+    },
+    setUpInitialPagination() {
+      if (Object.keys(this.pagination.currentPageWindow).length === 0 && this.totalSearchResultCount > 0) {
+        // sets up these values for the first search request and the rest is handled in SearchResults component
+        this.pagination.totalPages = Math.ceil(this.totalSearchResultCount / this.pagination.numberPerPage);
+        if (this.pagination.totalPages < this.pagination.maxPageWindow) {
+          this.pagination.endWindow = this.pagination.maxPageWindow = this.pagination.totalPages;
+        } else {
+          this.pagination.endWindow = this.pagination.maxPageWindow;
+        }
+
+        this.pagination.currentPageWindow = this.calcRange(this.pagination.startWindow, this.pagination.endWindow);
+        this.calcToAndFromCounts();
+      }
+    },
+    async paginate() {
+      try {
+        this.calcToAndFromCounts();
+      
+        // search service starts at 0 while this app starts at 1
+        this.from = (parseInt(this.pagination.currentPage) * parseInt(this.pagination.numberPerPage)) - parseInt(this.pagination.numberPerPage);
+        if (parseInt(this.from) + parseInt(this.pagination.numberPerPage) > parseInt(this.totalSearchResultCount)) {
+          this.size = parseInt(this.totalSearchResultCount) - parseInt(this.from);
+        } else {
+          this.size = parseInt(this.pagination.numberPerPage);
+        }
+
+        await this.search();
+      } finally {
+        this.router.push({
+          name: 'SearchResults',
+          query: {query: this.query},
+          replace: true
+        });
+      }
+    },
+    calcRange(start, stop) {
+      const startInt = parseInt(start);
+      const stopInt = parseInt(stop);
+      const step = 1;
+
+      let newArr = Array.from({ length: (stopInt - startInt) / step + 1 }, (_, i) => startInt + i * step);
+      return newArr
+    },
+    calcToAndFromCounts(){
+      this.pagination.fromCount = (parseInt(this.pagination.currentPage) * parseInt(this.pagination.numberPerPage) - parseInt(this.pagination.numberPerPage)) + 1;
+      if (this.totalSearchResultCount >= (this.pagination.numberPerPage * this.pagination.currentPage)){
+        this.pagination.toCount = parseInt(this.pagination.currentPage) * parseInt(this.pagination.numberPerPage);
+      } else if (this.pagination.fromCount === this.totalSearchResultCount) {
+        this.pagination.toCount = undefined;
+      } else {
+        this.pagination.toCount = this.totalSearchResultCount;
+      }
+    },
+    createSearchPayload() {
+      let payLoad = {
+        "query": this.query,
+        "from": parseInt(this.from),
+        "size": parseInt(this.size),
+        "sort": {
+          "property": this.pagination.sortBy.field,
+          "order": this.pagination.sortBy.direction
+        }
+      }
+
+      return payLoad;
+    },
+    getResults() {
+      this.pagination.currentPage = 1;
+      this.paginate();
+
+      this.pagination.totalPages = Math.ceil(this.totalSearchResultCount / this.pagination.numberPerPage);
+      if (this.pagination.totalPages < this.pagination.maxPageWindow) {
+        this.pagination.endWindow = this.pagination.totalPages;
+      } else {
+        this.pagination.endWindow = this.pagination.maxPageWindow;
+      }
+
+      this.pagination.startWindow = 1;
+      this.pagination.currentPageWindow = this.calcRange(this.pagination.startWindow, this.pagination.endWindow);
+      this.calcToAndFromCounts();
+    },
+    sortResults() {
+      this.getResults();
+    },
+    handleNumberPerPageChange() {
+      this.getResults();
+    },
+    handlePageChange(pageNum) {
+      this.pagination.currentPage = pageNum;
+      this.paginate();
+    },
+    handlePreviousWindowChange() {
+      const maxPageWindow = parseInt(this.pagination.maxPageWindow);
+      const isPartialWindow = (parseInt(this.pagination.endWindow) % maxPageWindow) > 0;
+      this.pagination.currentPage = parseInt(this.pagination.currentPage) - maxPageWindow;
+      this.pagination.startWindow = parseInt(this.pagination.startWindow) - maxPageWindow;
+      this.pagination.endWindow = isPartialWindow ? (this.pagination.startWindow + (maxPageWindow - 1)) : this.pagination.endWindow - maxPageWindow;
+      this.pagination.currentPageWindow = this.calcRange(this.pagination.startWindow, this.pagination.endWindow);
+      this.paginate();
+    },
+    handleNextWindowChange() {
+      const maxPageWindow = parseInt(this.pagination.maxPageWindow);
+      const totalPages = parseInt(this.pagination.totalPages);
+      const endWindow = parseInt(this.pagination.endWindow);
+      const isPartialWindow = (totalPages - (endWindow + maxPageWindow)) < 0;
+      const currentPageExceedsMaxPage = (this.pagination.currentPage + maxPageWindow) > totalPages;
+      const partialWindowSize =  totalPages % maxPageWindow;
+
+      this.pagination.currentPage = isPartialWindow && currentPageExceedsMaxPage ? totalPages : this.pagination.currentPage + maxPageWindow;
+      this.pagination.startWindow = parseInt(this.pagination.startWindow) + maxPageWindow;
+      this.pagination.endWindow = isPartialWindow ? endWindow + partialWindowSize : endWindow + maxPageWindow;
+      this.pagination.currentPageWindow = this.calcRange(this.pagination.startWindow, this.pagination.endWindow);
+      this.paginate();
+    },
+    handlePreviousPageChange() {
+      this.pagination.currentPage = parseInt(this.pagination.currentPage) - 1;
+
+      if (this.pagination.currentPage >= 1) {
+        if (this.pagination.currentPage % this.pagination.maxPageWindow === 0) {
+          this.pagination.endWindow = parseInt(this.pagination.currentPage);
+          this.pagination.startWindow = parseInt(this.pagination.endWindow) - (parseInt(this.pagination.maxPageWindow) - 1);
+        }
+
+        this.pagination.currentPageWindow = this.calcRange(this.pagination.startWindow, this.pagination.endWindow);
+        this.paginate();
+      } 
+    },
+    handleNextPageChange() {
+      this.pagination.currentPage = parseInt(this.pagination.currentPage) + 1;
+      if ((this.pagination.currentPage > this.pagination.endWindow) && (this.pagination.currentPage <= this.pagination.totalPages)) {
+        this.pagination.startWindow = this.pagination.currentPage;
+
+        if (this.pagination.startWindow === this.pagination.totalPages) {
+          this.pagination.endWindow = this.pagination.startWindow;
+        } else if ((this.pagination.endWindow + this.pagination.maxPageWindow) < this.pagination.totalPages) {
+          this.pagination.endWindow = parseInt(this.pagination.endWindow) + this.pagination.maxPageWindow;
+        } else if ((this.pagination.endWindow + this.pagination.maxPageWindow) > this.pagination.totalPages) {
+          this.pagination.endWindow = parseInt(this.pagination.endWindow) + (this.pagination.totalPages - this.pagination.startWindow);
+        }
+
+        this.pagination.currentPageWindow = this.calcRange(this.pagination.startWindow, this.pagination.endWindow);
+      }
+
+      this.paginate();
+    },
+    handleShowMoreChange(resultIndex, descriptionIndex) {
+      if (typeof resultIndex === 'number') {
+        let description =  this.searchResults[resultIndex].descriptions[descriptionIndex];
+        description.showMore = !description.showMore;
+      } else {
+        let description =  this.recordData.descriptions[descriptionIndex];
+        description.showMore = !description.showMore;
+      }
+    },
+    isEnglishLanguage(lang) {
+      const regex = /^(en)/;
+      const isEnglishLanguage = regex.test(lang);
+
+      return isEnglishLanguage;
+    },
+  }
+});
\ No newline at end of file
diff --git a/src/stores/cveRecordLookup.ts b/src/stores/cveRecord.ts
similarity index 94%
rename from src/stores/cveRecordLookup.ts
rename to src/stores/cveRecord.ts
index e638d1a54..810e6d964 100644
--- a/src/stores/cveRecordLookup.ts
+++ b/src/stores/cveRecord.ts
@@ -2,7 +2,7 @@ import { defineStore } from 'pinia';
 import _ from 'lodash';
 
 
-export const useCveRecordLookupStore = defineStore('cveRecordLookup', {
+export const usecveRecordStore = defineStore('cveRecord', {
   state: () => { 
     return {
       cveId: '',
@@ -19,7 +19,7 @@ export const useCveRecordLookupStore = defineStore('cveRecordLookup', {
       showJsonRecord: false,
       hasAdpInfo: false,
       emptyProductStatus: {},
-      accordianState: {
+      accordionState: {
         collapseAll: true,
       },
       onPageMenuItems: {
diff --git a/src/stores/genericGlobals.ts b/src/stores/genericGlobals.ts
new file mode 100644
index 000000000..e2f4ea92d
--- /dev/null
+++ b/src/stores/genericGlobals.ts
@@ -0,0 +1,9 @@
+import { defineStore } from 'pinia';
+
+export const useGenericGlobalsStore = defineStore('genericGlobals', {
+  state: () => { 
+    return {
+      legacyCveWebsiteLink: 'https://cve.mitre.org/cve/search_cve_list.html'
+    }
+  }
+});
\ No newline at end of file
diff --git a/src/stores/partners.js b/src/stores/partners.js
index 63f722a7e..e41a41ee6 100644
--- a/src/stores/partners.js
+++ b/src/stores/partners.js
@@ -1,10 +1,12 @@
 import { defineStore } from 'pinia';
 import PartnerData from '@/assets/data/CNAsList.json';
+import axios from 'axios';
 
 export const usePartnerStore = defineStore('partner', {
   state: () => { 
     return {
       partnerCounts: {},
+      partnerShortLongNameMap: {}
     }
   },
   actions: {
@@ -57,6 +59,18 @@ export const usePartnerStore = defineStore('partner', {
       delete partnerCounts.countries['n/a'];
     
       this.partnerCounts = partnerCounts;
+    },
+    async populatePartnerShortLongNameMap () {
+
+      try {
+        const url = `${import.meta.env.VITE_API_BASE_URL}cve-partner-name-map.json`;
+        const response = await axios.get(url, { timeout: 30000 });
+
+        this.partnerShortLongNameMap = response?.data || {};
+        
+      } catch (error) {
+        throw new Error(`Error fetching ${import.meta.env.VITE_API_BASE_URL}cve-partner-name-map.json`);
+      }
     }
   }
 });
\ No newline at end of file
diff --git a/src/views/About/Process.vue b/src/views/About/Process.vue
index 29c4f62d2..6f67c7d84 100644
--- a/src/views/About/Process.vue
+++ b/src/views/About/Process.vue
@@ -48,23 +48,23 @@
                 <div class="timeline-content">
                   <h3 class="title">Request</h3>
                   <p>CVE Program participant requests a CVE Identifier (CVE ID).</p>
-                  <section class="cve-accordian">
+                  <section class="cve-accordion">
                     <div class="message">
                       <div class="message-header">
                         <h4 class="title">CVE ID</h4>
-                        <button class="button" @click="toggleAccordianItem('cve-id')"
-                          :aria-expanded="!accordian['cve-id'] ? 'true' : 'false'"
+                        <button class="button" @click="toggleAccordionItem('cve-id')"
+                          :aria-expanded="!accordion['cve-id'] ? 'true' : 'false'"
                           aria-controls="cve-id">
                           <span class="icon is-small">
                             <p id="cve-id-alttext" class="is-hidden">
-                              {{accordian['cve-id'] ? 'collapse' : 'expand'}}
+                              {{accordion['cve-id'] ? 'collapse' : 'expand'}}
                             </p>
-                            <font-awesome-icon :icon="accordian['cve-id'] ? 'plus' : 'minus'"
+                            <font-awesome-icon :icon="accordion['cve-id'] ? 'plus' : 'minus'"
                             aria-hidden="false" focusable="true" aria-labelledby="cve-id-alttext"/>
                           </span>
                         </button>
                       </div>
-                      <div class="message-body" :class="{'is-hidden': accordian['cve-id']}" id="cve-id">
+                      <div class="message-body" :class="{'is-hidden': accordion['cve-id']}" id="cve-id">
                         <div class="block">
                           <p>
                             A CVE ID is a unique, alphanumeric identifier assigned by the CVE Program. Each identifier references a specific
@@ -124,23 +124,23 @@
                     CNA.
                   </p>
                   <p>The CVE Record is now available for download and viewing by the public.</p>
-                  <section class="cve-accordian">
+                  <section class="cve-accordion">
                     <div class="message">
                       <div class="message-header">
                         <h4 class="title">CVE Records</h4>
-                        <button class="button" @click="toggleAccordianItem('cve-record')"
-                          :aria-expanded="!accordian['cve-record'] ? 'true' : 'false'"
+                        <button class="button" @click="toggleAccordionItem('cve-record')"
+                          :aria-expanded="!accordion['cve-record'] ? 'true' : 'false'"
                           aria-controls="cve-record">
                           <span class="icon is-small">
                             <p id="cve-record-alttext" class="is-hidden">
-                              {{accordian['cve-record'] ? 'collapse' : 'expand'}}
+                              {{accordion['cve-record'] ? 'collapse' : 'expand'}}
                             </p>
-                            <font-awesome-icon :icon="accordian['cve-record'] ? 'plus' : 'minus'"
+                            <font-awesome-icon :icon="accordion['cve-record'] ? 'plus' : 'minus'"
                               aria-hidden="false" focusable="true" aria-labelledby="cve-record-alttext"/>
                           </span>
                         </button>
                       </div>
-                      <div class="message-body" :class="{'is-hidden': accordian['cve-record']}" id="cve-record">
+                      <div class="message-body" :class="{'is-hidden': accordion['cve-record']}" id="cve-record">
                         <div class="block">
                           <p>
                             A CVE Record is the descriptive data about a vulnerability associated with a CVE ID, provided by a CVE Numbering
@@ -222,12 +222,12 @@ export default {
   },
   data() {
     return {
-      accordian: { 'cve-id': true, 'cve-record': true },
+      accordion: { 'cve-id': true, 'cve-record': true },
     };
   },
   methods: {
-    toggleAccordianItem(id) {
-      this.accordian[id] = !this.accordian[id];
+    toggleAccordionItem(id) {
+      this.accordion[id] = !this.accordion[id];
     },
   },
 };
diff --git a/src/views/CVERecord/CVERecord.vue b/src/views/CVERecord/CVERecord.vue
index 62ed07e47..c5a3e0dac 100644
--- a/src/views/CVERecord/CVERecord.vue
+++ b/src/views/CVERecord/CVERecord.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="cve-secondary-page-main-container">
-    <div v-if="useCveRecordLookupStore.isSearching">
+    <div v-if="usecveRecordStore.isSearching">
       <div class="columns">
         <div class="column is-2 is-hidden-touch"></div>
         <div class="column is-full-mobile is-full-tablet is-7-desktop">
@@ -20,10 +20,10 @@
       </div>
     </div>
     <div v-else>
-      <div v-if="useCveRecordLookupStore.isIdOrRecordFound">
-        <PublishedRecord v-if="useCveRecordLookupStore.isPublished"/>
-        <RejectedRecordOrId v-if="useCveRecordLookupStore.isRejected"/>
-        <ReservedId v-if="useCveRecordLookupStore.isReserved"/>
+      <div v-if="usecveRecordStore.isIdOrRecordFound">
+        <PublishedRecord v-if="usecveRecordStore.isPublished"/>
+        <RejectedRecordOrId v-if="usecveRecordStore.isRejected"/>
+        <ReservedId v-if="usecveRecordStore.isReserved"/>
       </div>
       <div v-else class="columns">
         <div class="column is-2 is-hidden-touch"></div>
@@ -31,34 +31,16 @@
           <main id="cve-main-page-content">
             <div class="content">
               <div>
-                <p v-if="useCveRecordLookupStore.showHelpText" class="has-text-centered">
+                <p v-if="usecveRecordStore.showHelpText" class="has-text-centered">
                   Please use the search box above to find a CVE record by ID.
                 </p>
-                <div v-else-if="useCveRecordLookupStore.serverError" class="has-text-centered">
-                  <h1 class="title is-4">Service is currently unavailable.</h1>
-                  <p style="text-align: center;">Please
-                    <span class="icon-text">
-                      <a href="https://cveform.mitre.org/" target="_blank">report the issue
-                        <span class="icon is-size-7 cve-icon-xxs">
-                          <p id="extenalLink1" class="is-hidden">external site</p>
-                          <font-awesome-icon icon="external-link-alt" aria-labelledby="extenalLink1" aria-hidden="false" focusable="false"/>
-                        </span>
-                      </a>
-                    </span>
-                    and try again later.<br/>Or, use
-                    <a href="https://cve.mitre.org/cve/search_cve_list.html" target="_blank">Search CVE List on cve.mitre.org
-                      <span class="icon is-size-7 cve-icon-xxs">
-                        <p id="extenalLink1" class="is-hidden">external site</p>
-                        <font-awesome-icon icon="external-link-alt" aria-labelledby="extenalLink1" aria-hidden="false" focusable="false"/>
-                      </span>
-                    </a>
-                    to search CVE Records. Sorry for the inconvenience.
-                  </p>
+                <div v-else-if="usecveRecordStore.serverError">
+                  <ServiceUnavailable></ServiceUnavailable>
                 </div>
-                <div v-else-if="!useCveRecordLookupStore.isIdOrRecordFound" class="has-text-centered">
-                  <h1 class="title is-3 is-4 mb-2">{{useCveRecordLookupStore.cveId}} not found.</h1>
+                <div v-else-if="!usecveRecordStore.isIdOrRecordFound" class="has-text-centered">
+                  <h1 class="title is-3 is-4 mb-2">{{usecveRecordStore.cveId}} not found.</h1>
                   <span class="icon-text">
-                    <a href="https://cve.mitre.org/cve/search_cve_list.html" target="_blank">
+                    <a :href="legacyCveWebsiteLink" target="_blank">
                     Find CVE Record by Keyword
                     <span class="icon cve-icon-xxs" style="margin-left: 0px;">
                       <p id="CVERecordsKeywordSearch" class="is-hidden">external site</p>
@@ -77,10 +59,13 @@
   </div>
 </template>
 
-<script>import PublishedRecord from './PublishedRecord.vue';
+<script>
+import PublishedRecord from './PublishedRecord.vue';
 import RejectedRecordOrId from './RejectedRecordOrId.vue';
 import ReservedId from './ReservedId.vue';
-import { useCveRecordLookupStore } from '@/stores/cveRecordLookup.ts';
+import { usecveRecordStore } from '@/stores/cveRecord.ts';
+import ServiceUnavailable from '@/components/ServiceUnavailable.vue';
+import axios from 'axios';
 
 export default {
   name: 'CVERecord',
@@ -88,12 +73,235 @@ export default {
     PublishedRecord,
     RejectedRecordOrId,
     ReservedId,
+    ServiceUnavailable
   },
   data() {
     return {
-      useCveRecordLookupStore: useCveRecordLookupStore()
+      usecveRecordStore: usecveRecordStore(),
+      cveId: usecveRecordStore().cveId,
+      showHelpText: false,
+      errorMessage: [],
+      disabled: true,
+      getIdStatusCode: undefined,
+      legacyCveWebsiteLink: this.GenericGlobalsStore.legacyCveWebsiteLink
     };
   },
+  computed: {
+    isSearching() {
+      return usecveRecordStore().isSearching;
+    },
+    websiteEnv() {
+      return import.meta.env.VITE_WEBSITE_ENVIRONMENT;
+    }
+  },
+  created() {
+    const fullPathArr = this.$route.fullPath.split('id=');
+    if (fullPathArr.length === 2) {
+      const cveId = fullPathArr[1];
+      this.cveId = this.cveIdToUpperCase(cveId);
+      this.validateCveId();
+      if (!this.disabled) {
+        this.startLookup();
+      } else {
+        usecveRecordStore().showHelpText = true;
+      }
+    } else {
+      usecveRecordStore().showHelpText = true;
+    }
+  },
+  watch: {
+    $route(to) {
+      if (Object.prototype.hasOwnProperty.call(to.query, 'id')) {
+        this.cveId = this.cveIdToUpperCase(to.query.id);
+        this.validateCveId();
+        if (!this.disabled) {
+          this.startLookup();
+        } else {
+          this.resetStates();
+          usecveRecordStore().showHelpText = true;
+        }
+      }
+    },
+    cveId() {
+      this.cveId = this.cveId.trim().toUpperCase();
+    },
+  },
+  methods: {
+    removeHelpText() {
+      if (this.cveId.length === 0) {
+        this.errorMessage = [];
+      }
+    },
+    cveIdToUpperCase(cveId) {
+      return cveId.toUpperCase();
+    },
+    validateCveId() {
+      this.errorMessage = [];
+
+      const [cve, year, digits] = this.cveId.split('-');
+      const firstElContainsCve = new RegExp(/^(cve)/, 'i').test(cve);
+      const idStartsWithCve = new RegExp(/^(cve-)/, 'i').test(this.cveId);
+      const isElFilledIn = cve && year && digits;
+
+      if (!firstElContainsCve) {
+        this.errorMessage.push('Required CVE ID format: <b>CVE-YYYY-NNNN</b>');
+        this.errorMessage.push('<b>YYYY</b> must be a year starting from 1999');
+        this.errorMessage.push('<b>NNNN</b> must be 4 digits or greater');
+      } else if (!idStartsWithCve && !new RegExp(/^(cve-)\d{4}(-)/, 'i').test(this.cveId)) {
+        if (!idStartsWithCve) this.errorMessage.push('CVE ID must start with <b>CVE-</b>');
+      }
+
+      if (year && year.length > 0 && (parseInt(year, 10) < 1999 || !new RegExp(/^\d{4}$/, 'i').test(year))) {
+        this.errorMessage.push('CVE-<b>YYYY</b>-NNNN must be a year starting from 1999');
+      } else if (year && year.length > 0 && (!new RegExp(/^(cve-)\d{4}(-)/, 'i').test(this.cveId) && isElFilledIn === undefined)) {
+        this.errorMessage.push('Hyphen (-) must follow the year <b>(YYYY)</b>');
+        this.errorMessage.push('Required CVE ID format: <b>CVE-YYYY-NNNN</b>');
+      }
+
+      if (digits && digits.length > 0 && !new RegExp(/^\d{4,}$/).test(digits)) {
+        this.errorMessage.push('CVE-YYYY-<b>NNNN</b> must be 4 digits or greater');
+      }
+
+      if (this.errorMessage.length === 0 && new RegExp(/^(cve)-\d{4}-\d{4,}$/, 'i').test(this.cveId)) {
+        this.disabled = false;
+      } else {
+        this.disabled = true;
+      }
+    },
+    resetStates() {
+      usecveRecordStore().$reset();
+    },
+    startLookup() {
+      if (this.cveId !== usecveRecordStore().cveId) {
+        this.resetStates();
+        usecveRecordStore().cveId = this.cveId;
+        const newPath = `/CVERecord?id=${usecveRecordStore().cveId}`;
+        this.$router.push(newPath);
+        this.lookupId()
+      }
+    },
+    async lookupId() {
+      usecveRecordStore().isSearching = true;
+      this.disabled = true;
+
+      try {
+        this.getRecordData();
+      } catch (error) {
+        const regex = /4\d{2}/g; // 4xx error, e.g.: 400, 404, etc
+        const errorToStr = error.toString() || '';
+        if (!errorToStr.match(regex)) {
+          usecveRecordStore().isPublished = false;
+          usecveRecordStore().isReserved = false;
+          usecveRecordStore().isRejected = false;
+          this.handleServerError();
+        }
+      } finally {
+        if (!usecveRecordStore().serverError && !usecveRecordStore().isPublished && !usecveRecordStore().isReserved && !usecveRecordStore().isRejected) {
+          this.getIdData();
+        }
+      }
+    },
+    async getIdData() {
+      usecveRecordStore().serverError = false;
+      usecveRecordStore().isArecord = undefined;
+
+      const getIdUrl = `/api/cve-id/${usecveRecordStore().cveId}`;
+      try {
+        axios.defaults.baseURL = `https://${import.meta.env.VITE_CVE_SERVICES_BASE_URL}`;
+        const idData = await axios.get(getIdUrl);
+        this.getIdStatusCode = 200;
+        if (idData.status === 200 && idData?.data?.error === undefined) {
+          usecveRecordStore().idData = idData.data;
+          if (usecveRecordStore().idData.state === 'RESERVED') {
+            usecveRecordStore().isReserved = true;
+            usecveRecordStore().isArecord = false;
+          } else if (usecveRecordStore().idData.state === 'REJECTED') {
+            usecveRecordStore().isRejected = true;
+            usecveRecordStore().isArecord = false;
+          }
+
+          this.handleIsIdOrRecordFound(true);
+        }
+      } catch (error) {
+        if (!usecveRecordStore().isPublished) usecveRecordStore().isPublished = false;
+        if (!usecveRecordStore().isReserved) usecveRecordStore().isReserved = false;
+        if (!usecveRecordStore().isRejected) usecveRecordStore().isRejected = false;
+
+        const regex = /4\d{2}/g; // 4xx error, e.g.: 400, 404, etc
+        if (error.toString().match(regex) === null) {
+          this.handleServerError();
+        } else {
+          const errorToStr = error.toString();
+          this.getIdStatusCode = errorToStr.match(regex) ? regex.exec(errorToStr)[0] : 500;
+          if (errorToStr.match(regex)) {
+            usecveRecordStore().isArecord = false;
+            this.handleIsIdOrRecordFound(false);
+          } else {
+            this.handleServerError();
+          }
+        }
+      }
+    },
+    async getRecordData() {
+      const getRecordUrl = `https://${import.meta.env.VITE_CVE_SERVICES_BASE_URL}/api/cve/${usecveRecordStore().cveId}`;
+      const recordData = await axios.get(getRecordUrl);
+
+      if (!(typeof (recordData.data) === 'object')) {
+        usecveRecordStore().isPublished = false;
+        usecveRecordStore().isReserved = false;
+        usecveRecordStore().isRejected = false;
+        this.handleServerError();
+      } else if (recordData?.data?.error) {
+        usecveRecordStore().isPublished = false;
+        usecveRecordStore().isReserved = false;
+        usecveRecordStore().isRejected = false;
+
+        if (recordData.data.error === 'CVE_RECORD_DNE') {
+          usecveRecordStore().isIdOrRecordFound = false;
+          usecveRecordStore().isArecord = true;
+        } else {
+          this.handleServerError();
+        }
+      } else {
+        usecveRecordStore().isArecord = true;
+        usecveRecordStore().recordData = recordData.data;
+        if (usecveRecordStore().recordData.cveMetadata.state === 'PUBLISHED') {
+          usecveRecordStore().isPublished = true;
+        } else if (usecveRecordStore().recordData.cveMetadata.state === 'RESERVED') {
+          usecveRecordStore().isReserved = true;
+        } else if (usecveRecordStore().recordData.cveMetadata.state === 'REJECTED') {
+          usecveRecordStore().isRejected = true;
+        }
+        this.handleIsIdOrRecordFound(true);
+      }
+    },
+    handleServerError() {
+      usecveRecordStore().serverError = true;
+      this.setLoadingState(false);
+      usecveRecordStore().isArecord = undefined;
+    },
+    handleIsIdOrRecordFound(newState) {
+      usecveRecordStore().serverError = false;
+      usecveRecordStore().isIdOrRecordFound = newState;
+      this.setLoadingState(false);
+    },
+    setLoadingState(newState) {
+      usecveRecordStore().showHelpText = newState;
+      usecveRecordStore().isSearching = newState;
+      this.disabled = false;
+    },
+    onKeyUpEnter() {
+      this.validateCveId();
+
+      if (!this.disabled) this.startLookup();
+    },
+    isJson(value) {
+      if (typeof value === 'object') {
+        return true;
+      }
+      return false;
+    },
+  },
 };
 </script>
 
diff --git a/src/views/CVERecord/PublishedRecord.vue b/src/views/CVERecord/PublishedRecord.vue
index 914e2f8df..1f09a1bfa 100644
--- a/src/views/CVERecord/PublishedRecord.vue
+++ b/src/views/CVERecord/PublishedRecord.vue
@@ -7,7 +7,7 @@
           <nav class="level mb-0">
             <div class="level-left">
               <div class="level-item">
-                <h1 class="title">{{useCveRecordLookupStore.cveId}}</h1>
+                <h1 class="title">{{usecveRecordStore.cveId}}</h1>
               </div>
               <div v-if="cveFieldList.state.length > 0" class="level-item">
                 <span class="tag is-info is-light has-text-weight-bold cve-state-tag">{{cveFieldList.state}}</span>
@@ -16,7 +16,7 @@
             <div class="level-right ml-1">
               <div class="level-item">
                 <span class="icon-text">
-                  <a id="cve-view-json" :href="`https://${cveServicesBaseUrl}/api/cve/${useCveRecordLookupStore.cveId}`" target="_blank">
+                  <a id="cve-view-json" :href="`https://${cveServicesBaseUrl}/api/cve/${usecveRecordStore.cveId}`" target="_blank">
                     <span class="icon">
                       <p id="enewsletter" class="is-hidden">external site</p>
                       <font-awesome-icon icon="file-code" aria-labelledby="enewsletter"></font-awesome-icon>
@@ -47,10 +47,10 @@
             </div>
             <div class="level-right ml-1">
               <div class="level-item">
-                <div id="cve-accordian-expand-collapse-all-btn" class="buttons mb-0" style="justify-content: flex-end;">
-                  <button id="expand-collpse-all-btn" @click="toggleAccordian" class="button is-small cve-button"
+                <div id="cve-accordion-expand-collapse-all-btn" class="buttons mb-0 is-align-content-flex-end">
+                  <button id="expand-collpse-all-btn" @click="toggleAccordion" class="button is-small cve-button"
                   >
-                    {{ useCveRecordLookupStore.accordianState.collapseAll ? 'Collapse' : 'Expand' }} all
+                    {{ usecveRecordStore.accordionState.collapseAll ? 'Collapse' : 'Expand' }} all
                   </button>
                 </div>
               </div>
@@ -71,7 +71,7 @@
                   </span>
                 </h3>
               </AdpVulnerabilityEnrichment>
-              <!-- <AdpVulnerabilityEnrichment v-if="!useCveRecordLookupStore.hasHistoricalReferences" role="cna" :containerObject="cnaContainer"></AdpVulnerabilityEnrichment> -->
+              <!-- <AdpVulnerabilityEnrichment v-if="!usecveRecordStore.hasHistoricalReferences" role="cna" :containerObject="cnaContainer"></AdpVulnerabilityEnrichment> -->
               <AdpVulnerabilityEnrichment v-if="Object.keys(cveProgramContainer).length > 0" role='cveProgram' 
                 :selectedCnaData="{}" :containerObject="cveProgramContainer" :orgId="`cve-program-${cveProgramContainer.providerMetadata.orgId}`"
                 :anchorId="cveProgramContainer.onPageMenu.anchorId">
@@ -109,8 +109,8 @@
       </main>
     </div>
     <div class="column is-3 is-hidden-touch cve-sticky-nav">
-      <OnPageSidebar v-if="useCveRecordLookupStore.isIdOrRecordFound && useCveRecordLookupStore.isPublished"
-        :nav="useCveRecordLookupStore.onPageMenuItems"
+      <OnPageSidebar v-if="usecveRecordStore.isIdOrRecordFound && usecveRecordStore.isPublished"
+        :nav="usecveRecordStore.onPageMenuItems"
       />
     </div>
   </div>
@@ -121,7 +121,7 @@ import _ from 'lodash';
 import axios from 'axios';
 import AdpVulnerabilityEnrichment from '@/components/AdpVulnerabilityEnrichment.vue';
 import OnPageSidebar from '@/components/OnPageSidebar.vue';
-import { useCveRecordLookupStore } from '@/stores/cveRecordLookup.ts';
+import { usecveRecordStore } from '@/stores/cveRecord.ts';
 
 export default {
   name: 'PublishedRecord',
@@ -152,9 +152,9 @@ export default {
         references: [],
         tags: [],
       },
-      originalRecordData: useCveRecordLookupStore().recordData || {},
+      originalRecordData: usecveRecordStore().recordData || {},
       cveServicesBaseUrl: import.meta.env.VITE_CVE_SERVICES_BASE_URL,
-      useCveRecordLookupStore: useCveRecordLookupStore(),
+      usecveRecordStore: usecveRecordStore(),
       cpe: {},
       cnaContainer: {},
       cveProgramContainer: {},
@@ -163,10 +163,10 @@ export default {
     };
   },
   methods: {
-    toggleAccordian() {
-      const newPanelState = !useCveRecordLookupStore().accordianState.collapseAll;
-      Object.keys(useCveRecordLookupStore().accordianState).forEach( (panelName) => {
-        useCveRecordLookupStore().accordianState[panelName] = newPanelState;
+    toggleAccordion() {
+      const newPanelState = !usecveRecordStore().accordionState.collapseAll;
+      Object.keys(usecveRecordStore().accordionState).forEach( (panelName) => {
+        usecveRecordStore().accordionState[panelName] = newPanelState;
       });
     },
     populateOnPageMenu() {
@@ -177,7 +177,7 @@ export default {
         "id": "100.0.0",   
         "anchorId": "cve-cna-cve-program-containers",
         "label": "Required CVE Record Information",
-        "path": `CVERecord?id=${useCveRecordLookupStore().cveId}`,
+        "path": `CVERecord?id=${usecveRecordStore().cveId}`,
         "items": {}
       }
       
@@ -213,30 +213,30 @@ export default {
           "id": "100.0.1",
           "anchorId": "cve-adp-containers",
           "label": "Authorized Data Publishers",
-          "path": `CVERecord?id=${useCveRecordLookupStore().cveId}`,
+          "path": `CVERecord?id=${usecveRecordStore().cveId}`,
           "items": adpContainersMenu
         }
       }
 
-      useCveRecordLookupStore().onPageMenuItems.submenu = onPageMenu;
+      usecveRecordStore().onPageMenuItems.submenu = onPageMenu;
     },
     setupContainersAccordionStateOnPageMenu() {
       this.cnaContainer = this.originalRecordData.containers.cna;
       if (this.cnaContainer?.providerMetadata?.orgId) {
-        useCveRecordLookupStore().accordianState[`cna-${this.cnaContainer.providerMetadata.orgId}`] = true;
+        usecveRecordStore().accordionState[`cna-${this.cnaContainer.providerMetadata.orgId}`] = true;
       }
 
       if (this.originalRecordData?.containers?.adp) {
         this.originalRecordData.containers.adp.forEach((adp) => {
-          if (adp.providerMetadata.shortName.toLowerCase() === useCveRecordLookupStore().cveProgramShortName) {
+          if (adp.providerMetadata.shortName.toLowerCase() === usecveRecordStore().cveProgramShortName) {
             this.cveProgramContainer = adp;
-            useCveRecordLookupStore().accordianState[`cve-program-${adp.providerMetadata.orgId}`] = true;
+            usecveRecordStore().accordionState[`cve-program-${adp.providerMetadata.orgId}`] = true;
           }
         });
       }
       
       Object.keys(this.adpContainers).forEach( (adpName) => {
-        useCveRecordLookupStore().accordianState[`adp-${this.adpContainers[adpName].providerMetadata.orgId}`] = false;
+        usecveRecordStore().accordionState[`adp-${this.adpContainers[adpName].providerMetadata.orgId}`] = false;
       });
 
       this.populateOnPageMenu();
@@ -251,14 +251,14 @@ export default {
       await axios
         .get(url, { timeout: 30000 })
         .then((response) => {
-          useCveRecordLookupStore().orgIdAndLongNameMap = response.data;
+          usecveRecordStore().orgIdAndLongNameMap = response.data;
         });
     },
     getOrganizationName(orgShortName, partnerUUID) {
-      if (this.hasData(partnerUUID) && useCveRecordLookupStore().orgIdAndLongNameMap?.[partnerUUID]) {
-        return useCveRecordLookupStore().orgIdAndLongNameMap[partnerUUID];
+      if (this.hasData(partnerUUID) && usecveRecordStore().orgIdAndLongNameMap?.[partnerUUID]) {
+        return usecveRecordStore().orgIdAndLongNameMap[partnerUUID];
       } else if (this.hasData(orgShortName)) {
-        if (orgShortName.toLowerCase() === useCveRecordLookupStore().cveProgramShortName) {
+        if (orgShortName.toLowerCase() === usecveRecordStore().cveProgramShortName) {
           return 'CVE Program';
         } else {
           return orgShortName.replace('_', ' ');
@@ -297,7 +297,7 @@ export default {
       if (this.hasData(value)) {
         this.cveFieldList.cveId = value;
       } else {
-        this.cveFieldList.cveId = useCveRecordLookupStore().recordData.cveMetadata.cveId; // user-provided CVE ID
+        this.cveFieldList.cveId = usecveRecordStore().recordData.cveMetadata.cveId; // user-provided CVE ID
       }
     },
     getDescription() {
@@ -354,7 +354,7 @@ export default {
     },
     hasOnlyCisaAdpContainer(shortName) {
       if(shortName === 'CISA-ADP' ) {
-        useCveRecordLookupStore().hasOnlyCisaAdpInfo = true;
+        usecveRecordStore().hasOnlyCisaAdpInfo = true;
         return true;
       }
       return false;
@@ -502,9 +502,6 @@ export default {
     },
     getContentForField(field) {
       switch (field) {
-        // case 'CNA':
-        //   this.getOrgIdAndLongNameMap();
-        //   break;
         case 'Credits':
           this.getCredits();
           break;
@@ -564,9 +561,6 @@ export default {
       const [date] = dateTime.split('T');
       return date;
     },
-    toggleRecord() {
-      useCveRecordLookupStore().showJsonRecord = !useCveRecordLookupStore().showJsonRecord;
-    },
     create2DTable(affectedUnaffectedUnknownTable) {
       const tableWithHeaders = {
         headers: [],
@@ -632,16 +626,6 @@ export default {
   padding-left: 4px !important;
 }
 
-// .cve-versions-column:not(:last-child) {
-//   @include from($desktop) {
-//     border-right: $theme-color-base-light solid 2px;
-//   }
-
-//   @include until($tablet) {
-//     border-bottom: $theme-color-base-light solid 2px;
-//   }
-// }
-
 td {
   width: 33% !important;
 }
diff --git a/src/views/CVERecord/RejectedRecordOrId.vue b/src/views/CVERecord/RejectedRecordOrId.vue
index 64ab6afe9..9cd88a1a5 100644
--- a/src/views/CVERecord/RejectedRecordOrId.vue
+++ b/src/views/CVERecord/RejectedRecordOrId.vue
@@ -6,7 +6,7 @@
           <nav class="level mb-0">
             <div class="level-left">
               <div class="level-item">
-                <h1 class="title">{{useCveRecordLookupStore.cveId}}</h1>
+                <h1 class="title">{{usecveRecordStore.cveId}}</h1>
               </div>
               <div v-if="cveFieldList.state.length > 0" class="level-item">
                 <span class="tag cve-state-tag has-text-weight-bold">{{cveFieldList.state}}</span>
@@ -15,8 +15,8 @@
             <div class="level-right ml-1">
               <div class="level-item">
                 <a id="cve-view-json"
-                  :href="`https://${cveServicesBaseUrl}/api/${ useCveRecordLookupStore.isArecord ?
-                  'cve' : 'cve-id'}/${useCveRecordLookupStore.cveId}`"
+                  :href="`https://${cveServicesBaseUrl}/api/${ usecveRecordStore.isArecord ?
+                  'cve' : 'cve-id'}/${usecveRecordStore.cveId}`"
                   target="_blank">
                   View JSON
                 </a>
@@ -25,7 +25,7 @@
           </nav>
           <div role="information" class="notification is-info is-light p-3 mt-4">
             <div class="is-flex" style="justify-content: center;">
-                <section class="cve-accordian" style="flex: 0 0 100%;">
+                <section class="cve-accordion" style="flex: 0 0 100%;">
                     <div class="message" style="background: transparent !important;">
                       <div class="message-header p-0"
                         style="background: transparent !important;border-bottom: unset !important">
@@ -102,7 +102,7 @@
   </div>
 </template>
 
-<script>import { useCveRecordLookupStore } from '@/stores/cveRecordLookup.ts';
+<script>import { usecveRecordStore } from '@/stores/cveRecord.ts';
 
 export default {
   data() {
@@ -116,10 +116,10 @@ export default {
         dateUpdatedCveMetadata: '',
         dateRejectedCveMetadata: '',
       },
-      originalRecordData: useCveRecordLookupStore().recordData || {},
-      originalIdData: useCveRecordLookupStore().idData || {},
+      originalRecordData: usecveRecordStore().recordData || {},
+      originalIdData: usecveRecordStore().idData || {},
       cveServicesBaseUrl: import.meta.env.VITE_CVE_SERVICES_BASE_URL,
-      useCveRecordLookupStore: useCveRecordLookupStore()
+      usecveRecordStore: usecveRecordStore()
     };
   },
   mounted() {
@@ -136,22 +136,22 @@ export default {
       this.getDatePublishedCveMetadata();
     },
     getCVEid() {
-      this.cveFieldList.cveId = useCveRecordLookupStore().cveId;
+      this.cveFieldList.cveId = usecveRecordStore().cveId;
     },
     getState() {
-      const value = useCveRecordLookupStore().isArecord ? this.originalRecordData.cveMetadata?.state : this.originalIdData?.state;
+      const value = usecveRecordStore().isArecord ? this.originalRecordData.cveMetadata?.state : this.originalIdData?.state;
       if (this.hasData(value)) {
         this.cveFieldList.state = value;
       }
     },
     getAssigner() {
-      const value = useCveRecordLookupStore().isArecord ? this.originalRecordData.cveMetadata?.assignerShortName : this.originalIdData?.owning_cna;
+      const value = usecveRecordStore().isArecord ? this.originalRecordData.cveMetadata?.assignerShortName : this.originalIdData?.owning_cna;
       if (this.hasData(value)) {
         this.cveFieldList.assigner = value.replace('_', ' ');
       }
     },
     getRejectedReason() {
-      const value = useCveRecordLookupStore().isArecord ? this.originalRecordData?.containers?.cna?.rejectedReasons : '';
+      const value = usecveRecordStore().isArecord ? this.originalRecordData?.containers?.cna?.rejectedReasons : '';
       if (this.hasData(value)) {
         value.forEach((rejectReason) => {
           if (rejectReason.lang === 'en') this.cveFieldList.rejectedReasons.push(rejectReason.value);
diff --git a/src/views/CVERecord/ReservedId.vue b/src/views/CVERecord/ReservedId.vue
index ed01ef8dd..ea56d97c4 100644
--- a/src/views/CVERecord/ReservedId.vue
+++ b/src/views/CVERecord/ReservedId.vue
@@ -6,15 +6,15 @@
           <nav class="level">
             <div class="level-left">
               <div class="level-item">
-                <h1 class="title">{{useCveRecordLookupStore.cveId}}</h1>
+                <h1 class="title">{{usecveRecordStore.cveId}}</h1>
               </div>
               <div class="level-item" v-if="hasState">
-                <span class="tag cve-state-tag has-text-weight-bold">{{useCveRecordLookupStore.idData.state}}</span>
+                <span class="tag cve-state-tag has-text-weight-bold">{{usecveRecordStore.idData.state}}</span>
               </div>
             </div>
             <div class="level-right">
               <div class="level-item">
-                <a id="cve-view-json" :href="`https://${cveServicesBaseUrl}/api/cve-id/${useCveRecordLookupStore.cveId}`" target="_blank">
+                <a id="cve-view-json" :href="`https://${cveServicesBaseUrl}/api/cve-id/${usecveRecordStore.cveId}`" target="_blank">
                   View JSON
                 </a>
               </div>
@@ -22,7 +22,7 @@
           </nav>
           <div role="information" class="notification is-info is-light p-3">
             <div class="is-flex" style="justify-content: center;">
-                <section class="cve-accordian" style="flex: 0 0 100%;">
+                <section class="cve-accordion" style="flex: 0 0 100%;">
                     <div class="message" style="background: transparent !important;">
                       <div class="message-header p-0"
                         style="background: transparent !important;border-bottom: unset !important">
@@ -73,19 +73,19 @@
   </div>
 </template>
 
-<script>import { useCveRecordLookupStore } from '@/stores/cveRecordLookup.ts';
+<script>import { usecveRecordStore } from '@/stores/cveRecord.ts';
 
 export default {      
   data() {
     return {
       isMessageExpanded: false,
       cveServicesBaseUrl: import.meta.env.VITE_CVE_SERVICES_BASE_URL,
-      useCveRecordLookupStore: useCveRecordLookupStore()
+      usecveRecordStore: usecveRecordStore()
     };
   },
   methods: {
     hasState() {
-      if (useCveRecordLookupStore().idData?.state && useCveRecordLookupStore().idData.state.length > 0) {
+      if (usecveRecordStore().idData?.state && usecveRecordStore().idData.state.length > 0) {
         return true;
       }
 
diff --git a/src/views/CVERecord/SearchResults.vue b/src/views/CVERecord/SearchResults.vue
new file mode 100644
index 000000000..f29bce4e6
--- /dev/null
+++ b/src/views/CVERecord/SearchResults.vue
@@ -0,0 +1,286 @@
+<template>
+  <div id="cve-secondary-page-main-container">
+    <div class="columns is-centered">
+      <div class="column is-8-desktop cve-main-column-content-width">
+        <main id="cve-main-page-content" role="main">
+          <div>
+            <div v-if="cveListSearchStore.showHelpText && cveListSearchStore.totalSearchResultCount < 1">
+              <!-- cveListSearchStore.totalSearchResultCount < 1 so when there are results this doesn't flash while user is typing keyword -->
+              <p class="has-text-centered">
+                Please use the help text below the search box above to fix your keyword(s).
+              </p></div>
+            <div v-else>
+              <div v-if="cveListSearchStore.isSearching"
+                class="cve-loading-message has-text-centered"
+              >
+                <span class="icon-text">
+                  <span class="icon">
+                    <span class="loader is-loading" />
+                  </span>
+                  <span>Please wait. Loading...</span>
+                </span>
+              </div>
+              <div v-else>
+                <div v-if="cveListSearchStore.isSearchServerError">
+                  <ServiceUnavailable></ServiceUnavailable>
+                </div>
+                <div v-else>
+                  <div v-if="Object.keys(cveListSearchStore.recordData).length > 0">
+                    <h2 class="title">CVE Record Lookup</h2>
+                    <p class="cve-help-text">
+                      Find the information on the specific CVE Record below.
+                      If you're searching for that CVE Record, use the Search Results section below.
+                    </p>
+                    <div class="columns cve-columns is-variable is-1-desktop is-0-mobile mt-5 mr-2 mb-0 ml-2">
+                      <div class="column cve-column">
+                        <div class="columns cve-columns">
+                          <div class="column cve-column">
+                            <router-link :to="`/CVERecord?id=${cveListSearchStore.recordData.cveId}`" target="_blank">{{ cveListSearchStore.recordData.cveId }}</router-link>
+                          </div>
+                          <div class="column cve-column">
+                            <p><span>CNA: </span>{{ usePartnerStore?.[cveListSearchStore.recordData.cna] || cveListSearchStore.recordData.cna }}</p>
+                            <p></p>
+                          </div>
+                        </div>
+                        <div class="columns cve-columns">
+                          <div class="column cve-column">
+                            <div v-for="(description, index) in cveListSearchStore.recordData.descriptions" :key="description.key" class="mb-0">
+                              <p v-if="!description.showMore" class="mb-0">
+                                {{ description.firstChunk }}<span v-if="!description.showMore && description.secondChunk.length > 0">...</span>
+                              </p>
+                              <p v-else class="mb-0">{{ description.firstChunk.concat(` ${description.secondChunk}`) }}</p>
+                              <button v-if="description.secondChunk.length > 0"
+                                @click="cveListSearchStore.handleShowMoreChange(undefined, index)"
+                                class="button is-ghost cve-is-borderless p-0"
+                              >
+                                <span v-if="!description.showMore">Show more</span>
+                                <span v-else>Show less</span>
+                              </button>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <div id="cve-search-results-container" v-if="cveListSearchStore.totalSearchResultCount > 0">
+                    <h2 class="title">Search Results</h2>
+                    <div class="mt-2 mb-2">
+                      <p>
+                        <span>Showing </span>
+                        <span>
+                          <span v-if="parseInt(cveListSearchStore.pagination.toCount) === 1" class="has-text-weight-bold">1</span>
+                          <span v-else class="has-text-weight-bold">
+                            <span class="has-text-weight-bold">
+                              {{ cveListSearchStore.pagination.fromCount.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}
+                            </span>
+                            <span v-if="typeof cveListSearchStore.pagination.toCount !== 'undefined'" class="has-text-weight-bold">
+                              -
+                              {{ cveListSearchStore.pagination.toCount.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}
+                            </span>
+                          </span>
+                        </span>
+                        <span> of </span>
+                        <span class="has-text-weight-bold">
+                          {{ cveListSearchStore.totalSearchResultCount.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}
+                        </span>
+                        <span> results for </span>
+                        <span class="has-text-weight-bold">{{ cveListSearchStore.query }}</span>
+                      </p>
+                    </div>
+                    <div class="field is-grouped is-grouped-right pb-3 cve-filter-container" style="">
+                      <label class="label">Show:</label>
+                      <div class="control">
+                        <div class="select">
+                          <select v-model="cveListSearchStore.pagination.numberPerPage" aria-label="Select how many search results to show">
+                            <option v-for="num in cveListSearchStore.pagination.numberPerPageOptions" :key="`page-${num}`" :value="num">
+                              {{ num }}
+                            </option>
+                          </select>
+                        </div>
+                      </div>
+                      <label for="sort" class="label">Sort by:</label>
+                      <div class="control">
+                        <div class="select">
+                          <select name="partner" v-model="cveListSearchStore.pagination.sortBy" aria-label="Select a sort option">
+                            <option v-for="sort in cveListSearchStore.pagination.sortByOptions" :key="sort.key"
+                              :value="sort"
+                            >
+                              {{ sort.label }}
+                            </option>
+                          </select>
+                        </div>
+                      </div>
+                    </div>
+                    <div v-if="Object.keys(cveListSearchStore.recordData).length > 0 || cveListSearchStore.totalSearchResultCount > 0">
+                      <div class="columns cve-columns" v-for="(result, resultIndex) in cveListSearchStore.searchResults" :key="result.index">
+                          <div class="column cve-column">
+                            <div class="column cve-column" :class="{'cve-top-border': resultIndex !== 0}">
+                            </div>
+                            <div class="columns cve-columns">
+                              <div class="column cve-column">
+                                <router-link :to="`/CVERecord?id=${result.cveId}`" target="_blank">{{ result.cveId }}</router-link>
+                              </div>
+                              <div class="column cve-column">
+                                <p><span>CNA: </span>{{ usePartnerStore?.[result.cna] || result.cna }}</p>
+                                <p></p>
+                              </div>
+                            </div>
+                            <div class="columns cve-columns">
+                              <div class="column cve-column">
+                                <div v-for="(description, descriptionIndex) in result.descriptions" :key="description.key">
+                                  <p v-if="!description.showMore">
+                                    {{ description.firstChunk }}<span v-if="!description.showMore && description.secondChunk.length > 0">...</span>
+                                  </p>
+                                  <p v-else>{{ description.firstChunk.concat(` ${description.secondChunk}`) }}</p>
+                                  <button v-if="description.secondChunk.length > 0"
+                                    @click="cveListSearchStore.handleShowMoreChange(resultIndex, descriptionIndex)"
+                                    class="button is-ghost cve-is-borderless p-0"
+                                  >
+                                    <span v-if="!description.showMore">Show more</span>
+                                    <span v-else>Show less</span>
+                                  </button>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                      </div>
+                    </div>
+                    <div class="has-text-right">
+                      <button
+                        @click="backToTop"
+                        class="button is-ghost cve-is-borderless p-0"
+                      >
+                        Back to top of page
+                      </button>
+                    </div>
+                    <nav class="pagination is-centered pt-2 cve-pagination" role="navigation" aria-label="pagination">
+                      <button @click=cveListSearchStore.handlePreviousPageChange
+                        :disabled="cveListSearchStore.pagination.currentPage <= 1 ? true : false"
+                        :aria-disabled="cveListSearchStore.pagination.currentPage <= 1 ? true : false"
+                        class="pagination-previous button cve-button cve-button-outline"
+                      >
+                        Previous
+                      </button>
+                      <button @click=cveListSearchStore.handleNextPageChange
+                        :disabled="cveListSearchStore.pagination.currentPage < cveListSearchStore.pagination.totalPages ? false : true"
+                        :aria-disabled="cveListSearchStore.pagination.currentPage < cveListSearchStore.pagination.totalPages ? false : true"
+                        class="pagination-next button cve-button cve-button-outline"
+                      >
+                        Next
+                      </button>
+                      <ul class="pagination-list">
+                        <li>
+                          <button @click=cveListSearchStore.handlePreviousWindowChange
+                            :disabled="cveListSearchStore.pagination.startWindow > cveListSearchStore.pagination.firstPage ? false : true"
+                            :aria-disabled="cveListSearchStore.pagination.startWindow > cveListSearchStore.pagination.firstPage? false : true"
+                            class="pagination-next button cve-button cve-button-outline mt-1"
+                          >
+                            <span class="icon">
+                              <p id="previousWindowIcon" class="is-hidden">previous page window button</p>
+                              <font-awesome-icon icon="angles-left" aria-labelledby="previousWindowIcon" aria-hidden="false"/>
+                            </span>
+                          </button>
+                        </li>
+                        <li v-for="page in cveListSearchStore.pagination.currentPageWindow" :key="page.key">
+                          <button
+                            @click="cveListSearchStore.handlePageChange(page)"
+                            :class="{'is-current': page === cveListSearchStore.pagination.currentPage}"
+                            class="pagination-link button cve-button cve-button-outline" :aria-label="`Go to page ${cveListSearchStore.pagination.currentPage}`">
+                            {{ page }}
+                          </button>
+                        </li>
+                        <li>
+                          <button @click=cveListSearchStore.handleNextWindowChange
+                            :disabled="cveListSearchStore.pagination.endWindow < cveListSearchStore.pagination.totalPages ? false : true"
+                            :aria-disabled="cveListSearchStore.pagination.endWindow < cveListSearchStore.pagination.totalPages ? false : true"
+                            class="pagination-next button cve-button cve-button-outline"
+                          >
+                            <span class="icon">
+                              <p id="nextWindowIcon" class="is-hidden">next page window button</p>
+                              <font-awesome-icon icon="angles-right" aria-labelledby="nextWindowIcon" aria-hidden="false"/>
+                            </span>
+                          </button>
+                        </li>
+                      </ul>
+                    </nav>
+                  </div>
+                  <div v-else-if="cveListSearchStore.totalSearchResultCount === 0 && cveListSearchStore.query.length === 0" class="has-text-centered">
+                    <p>Please provide your search keywords and select the "Search" button.</p>
+                  </div>
+                  <div v-else>
+                    <p class="has-text-weight-bold">No search results found for: <span class="is-italic">{{ cveListSearchStore.query }}</span></p>
+                    <p>Please try your search again using the following
+                      <router-link to="/ResourcesSupport/FAQs#pc_cve_list_basicssearch_cve_list_tips">search tips and ticks</router-link> on the FAQs page.
+                    </p>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </main>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { useCveListSearchStore } from '@/stores/cveListSearch';
+import { usePartnerStore } from '@/stores/partners';
+import { createApp, watch } from 'vue';
+import { useRouter } from 'vue-router';
+import ServiceUnavailable from '@/components/ServiceUnavailable.vue'
+
+const cveListSearchStore = useCveListSearchStore();
+const router = useRouter();
+const app = createApp({});
+
+app.component('ServiceUnavailable', ServiceUnavailable);
+
+watch(()=>cveListSearchStore.pagination.numberPerPage, ()=>{
+  if (!cveListSearchStore.isSearching) cveListSearchStore.handleNumberPerPageChange();
+}, { deep: true });
+
+watch(()=>cveListSearchStore.pagination.sortBy, ()=>{
+  if (!cveListSearchStore.isSearching) cveListSearchStore.sortResults();
+}, { deep: true });
+
+function backToTop() {
+  router.push({
+    name: 'SearchResults',
+    query: {query: cveListSearchStore.query},
+    replace: true
+  });
+}
+</script>
+
+<style lang="scss">
+@import '@/assets/style/globals.scss';
+@import '@/assets/style/elements/cveTableStacked.scss';
+
+.pagination-link.is-current {
+  background-color: $theme-color-primary-darker !important;
+}
+
+.cve-columns {
+  margin: 0.5rem !important
+}
+
+.cve-column {
+  padding: 0px !important;
+}
+
+.cve-top-border {
+  background-color: #e5e5e5;
+  border: none;
+  display: block;
+  height: 1px;
+}
+
+.cve-filter-container {
+  border-bottom: 2px solid #e5e5e5;
+}
+
+.cve-pagination {
+  border-top: 2px solid #e5e5e5;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 9ae59fcc8..20cb60faa 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -15,7 +15,7 @@
           Currently, there are <span class="has-text-weight-bold">{{cveRecordsTotal}}</span> CVE Records accessible via
           <router-link to="/Downloads">Download</router-link> or
           <span class="icon-text">
-            <a href="https://cve.mitre.org/cve/search_cve_list.html" target="_blank">Search
+            <a :href="legacyCveWebsiteLink" target="_blank">Search
               <span class="icon cve-icon-xxs">
                 <p id="externalLinkIcon" class="is-hidden">external website</p>
                 <font-awesome-icon icon="up-right-from-square"
@@ -68,7 +68,8 @@ export default {
     return {
       cveRecordsTotal: 0,
       cveRecordsLoading: true,
-      cveRecordsRequestErrored: false
+      cveRecordsRequestErrored: false,
+      legacyCveWebsiteLink: this.GenericGlobalsStore.legacyCveWebsiteLink
     }
   },
   created() {
diff --git a/src/views/Media/News/BlogArchives.vue b/src/views/Media/News/BlogArchives.vue
index 46b51cc3f..6ca12ddcc 100644
--- a/src/views/Media/News/BlogArchives.vue
+++ b/src/views/Media/News/BlogArchives.vue
@@ -12,30 +12,30 @@
               to the <router-link to="/Media/News/Blogs">Blogs</router-link> page.
             </p>
             <div class="has-text-right pb-4">
-              <button class="button cve-button" @click="toggleAccordianAll()">
-                {{accordian.length > 1 ? 'Collapse All' : 'Expand All'}}
+              <button class="button cve-button" @click="toggleAccordionAll()">
+                {{accordion.length > 1 ? 'Collapse All' : 'Expand All'}}
               </button>
             </div>
-            <section class="cve-accordian">
+            <section class="cve-accordion">
               <div v-for="(archiveYear, index) in Object.keys(sortedEntries).sort(function(a,b){return b-a})"
                 :key="index" class="message">
                 <div class="message-header cve-base-light-gray-borders-bg">
                   <p class="message-label has-text-weight-bold" style="margin-top: auto; margin-bottom: auto;">
                     {{archiveYear}}
                   </p>
-                  <button class="button" @click="toggleAccordianItem(archiveYear)"
-                    :aria-expanded="!accordian.includes(archiveYear) ? 'true' : 'false'"
+                  <button class="button" @click="toggleAccordionItem(archiveYear)"
+                    :aria-expanded="!accordion.includes(archiveYear) ? 'true' : 'false'"
                     :aria-controls="archiveYear">
                     <span class="icon is-small">
                       <p :id="archiveYear + '-alttext'" class="is-hidden">
-                        {{accordian.includes(archiveYear) ? 'collapse' : 'expand'}}
+                        {{accordion.includes(archiveYear) ? 'collapse' : 'expand'}}
                       </p>
-                      <font-awesome-icon :icon="accordian.includes(archiveYear) ? 'plus' : 'minus'"
+                      <font-awesome-icon :icon="accordion.includes(archiveYear) ? 'plus' : 'minus'"
                         aria-hidden="false" focusable="true" :aria-labelledby="archiveYear + '-alttext'"/>
                     </span>
                   </button>
                 </div>
-                <div class="message-body" v-show="accordian.includes(archiveYear)" :id="archiveYear">
+                <div class="message-body" v-show="accordion.includes(archiveYear)" :id="archiveYear">
                   <div class="table-container" :id="archiveYear">
                     <table class="table is-striped is-hoverable cve-border-dark-blue cve-border-bottom-unset">
                       <thead>
@@ -85,7 +85,7 @@ export default {
   data() {
     return {
       archiveBlogs: newsData.archiveBlogs,
-      accordian: [],
+      accordion: [],
       sortedEntries: {},
       isNavSidebarHiddenTouch: false,
     };
@@ -121,7 +121,7 @@ export default {
       });
       Object.keys(blogArchivesByYear).forEach((archiveYear) => {
         sortedBlogArchives[archiveYear] = this.sortYearEntries(blogArchivesByYear[archiveYear]);
-        this.accordian.push(archiveYear);
+        this.accordion.push(archiveYear);
       });
       this.sortedEntries = sortedBlogArchives;
     },
@@ -133,21 +133,21 @@ export default {
       });
       return sortedEntries;
     },
-    toggleAccordianAll() {
-      if (this.accordian.length > 1) {
-        this.accordian = [];
+    toggleAccordionAll() {
+      if (this.accordion.length > 1) {
+        this.accordion = [];
       } else {
         Object.keys(this.sortedEntries).forEach((year) => {
-          this.accordian.push(year);
+          this.accordion.push(year);
         });
       }
     },
-    toggleAccordianItem(id) {
-      if (this.accordian.includes(id)) {
-        const index = this.accordian.indexOf(id);
-        this.accordian.splice(index, 1);
+    toggleAccordionItem(id) {
+      if (this.accordion.includes(id)) {
+        const index = this.accordion.indexOf(id);
+        this.accordion.splice(index, 1);
       } else {
-        this.accordian.push(id);
+        this.accordion.push(id);
       }
     },
   },
diff --git a/src/views/PartnerInformation/ListofPartners.vue b/src/views/PartnerInformation/ListofPartners.vue
index 083915334..92b094535 100644
--- a/src/views/PartnerInformation/ListofPartners.vue
+++ b/src/views/PartnerInformation/ListofPartners.vue
@@ -10,25 +10,25 @@
               Contact and other information for Top-Level Roots, Roots, CNAs, and CNA-LRs are below. Select the partner’s name to view its
               information.
             </p>
-            <section class="cve-accordian">
+            <section class="cve-accordion">
               <div class="message">
                 <div class="message-header cve-base-light-gray-borders-bg">
                   <p class="message-label has-text-weight-bold" style="margin-top: auto; margin-bottom: auto;">
                     Request a CVE ID / Update a CVE Record
                   </p>
-                  <button class="button" @click="toggleAccordianItem('report')"
-                    :aria-expanded="!accordian['report'] ? 'true' : 'false'"
+                  <button class="button" @click="toggleAccordionItem('report')"
+                    :aria-expanded="!accordion['report'] ? 'true' : 'false'"
                     aria-controls="report">
                     <span class="icon is-small">
                       <p id="record-alttext" class="is-hidden">
-                        {{accordian['report'] ? 'collapse' : 'expand'}}
+                        {{accordion['report'] ? 'collapse' : 'expand'}}
                       </p>
-                      <font-awesome-icon :icon="accordian['report'] ? 'plus' : 'minus'"
+                      <font-awesome-icon :icon="accordion['report'] ? 'plus' : 'minus'"
                         aria-hidden="false" focusable="true" aria-labelledby="record-alttext"/>
                     </span>
                   </button>
                 </div>
-                <div class="message-body" :class="{'is-hidden': accordian['report']}" id="report">
+                <div class="message-body" :class="{'is-hidden': accordion['report']}" id="report">
                   <div class="block" id="report">
                     <ol class="ml-4">
                       <li class="pb-1">To request a CVE ID from a CNA or CNA-LR, follow the
@@ -50,19 +50,19 @@
               <div class="message">
                 <div class="message-header cve-base-light-gray-borders-bg">
                   <p class="message-label has-text-weight-bold" style="margin-top: auto; margin-bottom: auto;">Program Roles / Organization Types</p>
-                  <button class="button" @click="toggleAccordianItem('programRoles')"
-                    :aria-expanded="!accordian['programRoles'] ? 'true' : 'false'"
+                  <button class="button" @click="toggleAccordionItem('programRoles')"
+                    :aria-expanded="!accordion['programRoles'] ? 'true' : 'false'"
                     aria-controls="programRoles">
                     <span class="icon is-small">
                       <p id="programRolesalttext" class="is-hidden">
-                        {{accordian['programRoles'] ? 'collapse' : 'expand'}}
+                        {{accordion['programRoles'] ? 'collapse' : 'expand'}}
                       </p>
-                      <font-awesome-icon :icon="accordian['programRoles'] ? 'plus' : 'minus'"
+                      <font-awesome-icon :icon="accordion['programRoles'] ? 'plus' : 'minus'"
                         aria-hidden="false" focusable="true" aria-labelledby="programRolesalttext"/>
                     </span>
                   </button>
                 </div>
-                <div class="message-body" :class="{'is-hidden': accordian['programRoles']}" id="programRoles">
+                <div class="message-body" :class="{'is-hidden': accordion['programRoles']}" id="programRoles">
                   <div class="block">
                     <p class="subtitle">Program Roles</p>
                     <ul>
@@ -102,15 +102,15 @@
               </button>
             </div>
           </div> <!-- end search field groups -->
-          <div class="cve-accordian mt-1">
-            <button href="/SiteSearch" @click="toggleAccordianItem('searchTips')" class="button cve-button-outline cve-base-light-gray-borders-bg">
+          <div class="cve-accordion mt-1">
+            <button href="/SiteSearch" @click="toggleAccordionItem('searchTips')" class="button cve-button-outline cve-base-light-gray-borders-bg">
               <span class="is-size-7 has-text-weight-bold">Search Tips</span>
               <span class="icon cve-icon-xxs">
-                <font-awesome-icon :icon="accordian['searchTips'] ? 'plus' : 'minus'"
+                <font-awesome-icon :icon="accordion['searchTips'] ? 'plus' : 'minus'"
                   aria-hidden="false" focusable="true" aria-labelledby="record-alttext"/>
               </span>
             </button>
-            <div class="message pt-1 pr-3 pb-1 pl-3" :class="{'is-hidden': accordian['searchTips']}" id="report">
+            <div class="message pt-1 pr-3 pb-1 pl-3" :class="{'is-hidden': accordion['searchTips']}" id="report">
               <p>
                 Search for a CNA partner by <b>name</b>, <b>scope</b> keyword(s), <b>program role</b>, or <b>organization type</b>.<br/>
                 For example: “Top-Level Root”, “Root”, or “CNA-LR”, finds partners by their Program Role.
@@ -285,7 +285,7 @@ export default {
       isPartnerRoleVisible: false,
       isParterOrgType: false,
       isFocus: false,
-      accordian: { report: true, programRoles: true, searchTips: true },
+      accordion: { report: true, programRoles: true, searchTips: true },
     };
   },
   created() {
@@ -446,8 +446,8 @@ export default {
         return null;
       });
     },
-    toggleAccordianItem(id) {
-      this.accordian[id] = !this.accordian[id];
+    toggleAccordionItem(id) {
+      this.accordion[id] = !this.accordion[id];
     },
   },
 };
diff --git a/src/views/PartnerInformation/Partner.vue b/src/views/PartnerInformation/Partner.vue
index 4d9d9318a..782f6a28f 100644
--- a/src/views/PartnerInformation/Partner.vue
+++ b/src/views/PartnerInformation/Partner.vue
@@ -179,23 +179,23 @@
                 <div class="timeline-content">
                   <h3 class="title">Meet Requirements</h3>
                   <p>Prospective partner meets requirements.</p>
-                  <section class="cve-accordian">
+                  <section class="cve-accordion">
                     <div class="message">
                       <div class="message-header">
                         <h4 class="title">Requirements</h4>
-                        <button class="button cve-process-list-btn" @click="toggleAccordianItem('requirements')"
-                          :aria-expanded="!accordian['requirements'] ? 'true' : 'false'"
+                        <button class="button cve-process-list-btn" @click="toggleAccordionItem('requirements')"
+                          :aria-expanded="!accordion['requirements'] ? 'true' : 'false'"
                           aria-controls="requirements">
                           <span class="icon is-small">
                             <p id="requirements-alttext" class="is-hidden">
-                              {{accordian['requirements'] ? 'collapse' : 'expand'}}
+                              {{accordion['requirements'] ? 'collapse' : 'expand'}}
                             </p>
-                            <font-awesome-icon :icon="accordian['requirements'] ? 'plus' : 'minus'"
+                            <font-awesome-icon :icon="accordion['requirements'] ? 'plus' : 'minus'"
                             aria-hidden="false" focusable="true" aria-labelledby="requirements-alttext"/>
                           </span>
                         </button>
                       </div>
-                      <div class="message-body" :class="{'is-hidden': accordian['requirements']}" id="requirements">
+                      <div class="message-body" :class="{'is-hidden': accordion['requirements']}" id="requirements">
                         <div class="block">
                           <p>
                             <ul>
@@ -233,23 +233,23 @@
                 <div class="timeline-content">
                   <h3 class="title">Onboard</h3>
                   <p>Organization is onboarded.</p>
-                  <section class="cve-accordian">
+                  <section class="cve-accordion">
                     <div class="message">
                       <div class="message-header">
                         <h4 class="title">Onboarding</h4>
-                        <button class="button cve-process-list-btn" @click="toggleAccordianItem('onboarding')"
-                          :aria-expanded="!accordian['onboarding'] ? 'true' : 'false'"
+                        <button class="button cve-process-list-btn" @click="toggleAccordionItem('onboarding')"
+                          :aria-expanded="!accordion['onboarding'] ? 'true' : 'false'"
                           aria-controls="onboarding">
                           <span class="icon is-small">
                             <p id="onboarding-alttext" class="is-hidden">
-                              {{accordian['onboarding'] ? 'collapse' : 'expand'}}
+                              {{accordion['onboarding'] ? 'collapse' : 'expand'}}
                             </p>
-                            <font-awesome-icon :icon="accordian['onboarding'] ? 'plus' : 'minus'"
+                            <font-awesome-icon :icon="accordion['onboarding'] ? 'plus' : 'minus'"
                             aria-hidden="false" focusable="true" aria-labelledby="onboarding-alttext"/>
                           </span>
                         </button>
                       </div>
-                      <div class="message-body" :class="{'is-hidden': accordian['onboarding']}" id="onboarding">
+                      <div class="message-body" :class="{'is-hidden': accordion['onboarding']}" id="onboarding">
                         <div class="block">
                           <p>
                             <ul>
@@ -318,12 +318,12 @@ export default {
   },
   data() {
     return {
-      accordian: { requirements: true, onboarding: true },
+      accordion: { requirements: true, onboarding: true },
     };
   },
   methods: {
-    toggleAccordianItem(id) {
-      this.accordian[id] = !this.accordian[id];
+    toggleAccordionItem(id) {
+      this.accordion[id] = !this.accordion[id];
     },
   },
 };
diff --git a/src/views/ProgramOrganization/Board.vue b/src/views/ProgramOrganization/Board.vue
index 1e949ae73..39698f119 100644
--- a/src/views/ProgramOrganization/Board.vue
+++ b/src/views/ProgramOrganization/Board.vue
@@ -69,17 +69,17 @@
               Members
             </h2>
 
-            <section class="cve-accordian mb-6">
+            <section class="cve-accordion mb-6">
               <div class="message has-text-centered">
                 <div class="message-header cve-base-light-gray-borders-bg">
                   <h3 class="title mb-0">Current Members</h3>
-                  <button class="button" @click="toggleAccordianItem('current-members')" aria-label="expandCollapseCurrentMembers">
+                  <button class="button" @click="toggleAccordionItem('current-members')" aria-label="expandCollapseCurrentMembers">
                     <span class="icon is-small">
-                      <font-awesome-icon :icon="accordian['current-members'] ? 'plus' : 'minus'"/>
+                      <font-awesome-icon :icon="accordion['current-members'] ? 'plus' : 'minus'"/>
                     </span>
                   </button>
                 </div>
-                <div class="message-body" :class="{'is-hidden': accordian['current-members']}">
+                <div class="message-body" :class="{'is-hidden': accordion['current-members']}">
                   <div class="block">
                     <div class="hero-body" v-for="(chuckedBoardMembersList, index) in
                       preprocessedBoardMembersList"
@@ -236,7 +236,7 @@ export default {
   data() {
     return {
       pastMembersTab: 0,
-      accordian: { 'current-members': false },
+      accordion: { 'current-members': false },
     };
   },
   computed: {
@@ -262,8 +262,8 @@ export default {
     },
   },
   methods: {
-    toggleAccordianItem(id) {
-      this.accordian[id] = !this.accordian[id];
+    toggleAccordionItem(id) {
+      this.accordion[id] = !this.accordion[id];
     },
   },
 };
diff --git a/src/views/ReportRequest/ReportRequestForNonCNAs.vue b/src/views/ReportRequest/ReportRequestForNonCNAs.vue
index b218dd678..c4ea84da0 100644
--- a/src/views/ReportRequest/ReportRequestForNonCNAs.vue
+++ b/src/views/ReportRequest/ReportRequestForNonCNAs.vue
@@ -48,7 +48,7 @@
                         <template #empty>No results found</template>
                         </b-autocomplete>
                       </b-field>
-                      <div class="cve-accordian">
+                      <div class="cve-accordion">
                         <button @click="showTip = !showTip" class="button is-ghost pt-0 pb-0 pl-0">
                           Tips for finding correct CNA
                         </button>
@@ -113,7 +113,7 @@
                       Identify the CNA that published the CVE Record by searching for the CVE Record on the CVE List at the top of the page.
                       If you do not know the CVE ID, you can
                       <span class="icon-text">
-                        <a href="https://cve.mitre.org/cve/search_cve_list.html" target="_blank">search for a CVE Record by keyword
+                        <a :href="legacyCveWebsiteLink" target="_blank">search for a CVE Record by keyword
                         <span class="icon cve-icon-xxs">
                           <p id="enewsletter" class="is-hidden">external site</p>
                           <font-awesome-icon icon="external-link-alt" aria-labelledby="enewsletter">
@@ -163,6 +163,7 @@
 import NavigationSidebar from '@/components/NavigationSidebar.vue';
 import SurveyLinkComponent from '@/components/SurveyLinkComponent.vue';
 import data from '@/assets/data/CNAsList.json';
+import ServiceUnavailable from '@/components/ServiceUnavailable.vue';
 
 export default {
   name: 'ReportRequestForNonCNAs',
@@ -175,6 +176,7 @@ export default {
   components: {
     NavigationSidebar,
     SurveyLinkComponent,
+    ServiceUnavailable
   },
   data() {
     return {
@@ -185,6 +187,7 @@ export default {
       clearable: false,
       showTip: true,
       pagePath: this.cvenavs['Right Menu']['Report/Request'].submenu['Non-CNAs'],
+      legacyCveWebsiteLink: this.GenericGlobalsStore.legacyCveWebsiteLink
     };
   },
   computed: {
diff --git a/src/views/ResourcesSupport/AllResources/CveServices.vue b/src/views/ResourcesSupport/AllResources/CveServices.vue
index 6ca211d1e..d4bea3790 100644
--- a/src/views/ResourcesSupport/AllResources/CveServices.vue
+++ b/src/views/ResourcesSupport/AllResources/CveServices.vue
@@ -293,7 +293,7 @@
               <p>CVE Services Clients are used to reserve CVE IDs and populate, submit, and update CVE Records.</p>
               <div role="information" class="notification is-info is-light p-3">
                 <div class="is-flex" style="justify-content: center;">
-                    <section class="cve-accordian" style="flex: 0 0 100%;">
+                    <section class="cve-accordion" style="flex: 0 0 100%;">
                         <div class="message" style="background: transparent !important;">
                           <div class="message-header p-0"
                             style="background: transparent !important;border-bottom: unset !important">
diff --git a/src/views/ResourcesSupport/FAQs.vue b/src/views/ResourcesSupport/FAQs.vue
index 6f1028668..ecd0b3aa1 100644
--- a/src/views/ResourcesSupport/FAQs.vue
+++ b/src/views/ResourcesSupport/FAQs.vue
@@ -5,7 +5,7 @@
           <aside class="menu is-hidden-touch cve-sidebar-menu mt-3">
             <p class="menu-label cve-capitalize-first-letter message-label">All Questions</p>
             <ul class="menu-list cve-capitalize-first-letter">
-              <li v-for="(submenuObj, index) in accordianList" :key="submenuObj.sectionId">
+              <li v-for="(submenuObj, index) in accordionList" :key="submenuObj.sectionId">
                 <span class="is-flex" style="justify-content: space-between; width: inherit">
                   <router-link
                     :to="`#${submenuObj.sectionId}`"
@@ -46,34 +46,34 @@
             <h1 class="title">Frequently Asked Questions (FAQs)</h1>
             <ExternalLinkMessage/>
             <div class="buttons mb-0" style="justify-content: flex-end;">
-              <button class="button cve-button" @click="setAccordian('sectionId', 'questionId')">{{isExpandAll ? 'Expand' : 'Collapse'}} all</button>
+              <button class="button cve-button" @click="setAccordion('sectionId', 'questionId')">{{isExpandAll ? 'Expand' : 'Collapse'}} all</button>
             </div>
-            <section class="cve-accordian">
-              <div class="message" v-for="item in accordianList" :key="item.sectionId">
+            <section class="cve-accordion">
+              <div class="message" v-for="item in accordionList" :key="item.sectionId">
                 <h2 :id="item.sectionId" class="title">{{item.sectionTitle}}</h2>
                 <div v-for="qAndA in item.sectionQuestions" :key="item.sectionId + qAndA.questionId">
                   <div class="message-header cve-base-light-gray-borders-bg">
                     <p :id="item.sectionId + qAndA.questionId" class="mt-2 mb-2">{{qAndA.questionText}}?</p>
-                    <button class="button message-header-button" @click="toggleAccordianItem(item.sectionId + qAndA.questionId)"
-                      :aria-expanded="accordian[item.sectionId + qAndA.questionId] ? 'false' : 'true'"
+                    <button class="button message-header-button" @click="toggleAccordionItem(item.sectionId + qAndA.questionId)"
+                      :aria-expanded="accordion[item.sectionId + qAndA.questionId] ? 'false' : 'true'"
                       :aria-controls="item.sectionId + qAndA.questionId + 'response'">
                       <span class="icon is-small">
                         <p :id="'expandCollapseAltText' + item.sectionId + qAndA.questionId" class="is-hidden">
-                          {{accordian[item.sectionId + qAndA.questionId] ? 'collapse' : 'expand'}}
+                          {{accordion[item.sectionId + qAndA.questionId] ? 'collapse' : 'expand'}}
                         </p>
-                        <font-awesome-icon :icon="accordian[item.sectionId + qAndA.questionId] ? 'plus' : 'minus'"
+                        <font-awesome-icon :icon="accordion[item.sectionId + qAndA.questionId] ? 'plus' : 'minus'"
                           aria-hidden="false" focusable="true" :aria-labelledby="'expandCollapseAltText' + item.sectionId + qAndA.questionId"/>
                       </span>
                     </button>
                   </div>
                   <div :id="item.sectionId + qAndA.questionId + 'response'" class="message-body"
-                    :class="{'is-hidden': accordian[item.sectionId + qAndA.questionId]}">
+                    :class="{'is-hidden': accordion[item.sectionId + qAndA.questionId]}">
                     <div v-if="qAndA.questionId == 'search_cve'" class="pb-3">
                       <p>The following methods are available:</p>
-                      <strong>CVE ID Lookup</strong>
+                      <strong>On this site</strong>
                       <ul>
-                        <li>Search for a specific CVE Record by its CVE ID using the
-                          <router-link :to="{ hash: '#cve-secondary-navbar' }">CVE ID lookup</router-link> at the top of this page.
+                        <li>Search the CVE List by keywords using the
+                          <router-link :to="{ hash: '#cve-secondary-navbar' }">search box</router-link> at the top of this page.
                         </li>
                       </ul>
                     </div>
@@ -98,29 +98,29 @@ export default {
   name: 'FAQs',
   data() {
     return {
-      accordian: {},
-      accordianList: faqsData,
+      accordion: {},
+      accordionList: faqsData,
       selectedSubmenu: [],
       isExpandAll: true,
     };
   },
   created() {
-    this.setAccordian('sectionId', 'questionId');
+    this.setAccordion('sectionId', 'questionId');
   },
   methods: {
     isExactPath(onPageLink) {
       return useLinkStore().isExactPath(`${this.$route.path}${onPageLink}`, this.$route.fullPath);
     },
-    setAccordian(parentId, childId) {
+    setAccordion(parentId, childId) {
       this.isExpandAll = !this.isExpandAll;
-      this.accordianList.forEach((item) => {
+      this.accordionList.forEach((item) => {
         item.sectionQuestions.forEach((qAndA) => {
-          this.accordian[(parentId === '') ? qAndA[childId] : `${item[parentId]}${qAndA[childId]}`] = this.isExpandAll;
+          this.accordion[(parentId === '') ? qAndA[childId] : `${item[parentId]}${qAndA[childId]}`] = this.isExpandAll;
         });
       });
     },
-    toggleAccordianItem(id) {
-      this.accordian[id] = !this.accordian[id];
+    toggleAccordionItem(id) {
+      this.accordion[id] = !this.accordion[id];
     },
     toggleSubmenuItem(id) {
       if (this.selectedSubmenu.includes(id)) {
diff --git a/src/views/ResourcesSupport/Resources.vue b/src/views/ResourcesSupport/Resources.vue
index 47138e09d..39d55b5d8 100644
--- a/src/views/ResourcesSupport/Resources.vue
+++ b/src/views/ResourcesSupport/Resources.vue
@@ -49,7 +49,7 @@
                           <br/><span class="cve-help-text">Details about selected fields shown on the CVE Record Detail page</span>
                         </li>
                         <li>
-                          <router-link to="/Resources/General/Key-Details-Phrasing.pdf"target="_blank">
+                          <router-link to="/Resources/General/Key-Details-Phrasing.pdf" target="_blank">
                             Key Details Phrasing (PDF, 0.3MB)
                           </router-link>
                           <br/><span class="cve-help-text">How to write a description for a CVE Record</span>
diff --git a/vue.config.js b/vue.config.js
new file mode 100644
index 000000000..e69de29bb