diff --git a/cypress/utils/table.js b/cypress/utils/table.js
index d484befb5..3f3b96d75 100644
--- a/cypress/utils/table.js
+++ b/cypress/utils/table.js
@@ -40,21 +40,26 @@ export const itHasNoActiveFilter = () => {
 };
 
 export const itExportsDataToFile = (jsonData, filenamePrefix) => {
-    it.skip('exports data to JSON and CSV files', () => {
+    it('exports data to JSON and CSV files', () => {
         cy.clock(Date.now());
 
-        cy.get('.pf-v5-c-toolbar__content-section > :nth-child(2) > .pf-v5-c-menu-toggle').click();
-        cy.get('[data-ouia-component-id=Export] .pf-v5-c-dropdown__menu-item').should(
+        // the toggle of the export dropdown has aria-label of "Export"
+        // the actual dropdown has ouiaId of "Export"
+
+        cy.get('[aria-label=Export]').click();
+
+        cy.get('[data-ouia-component-id=Export] .pf-v5-c-menu__item').should(
             'have.length',
             3
         );
-        cy.get('[data-ouia-component-id=Export] .pf-v5-c-dropdown__menu-item')
+
+        cy.get('[data-ouia-component-id=Export] .pf-v5-c-menu__item')
             .contains('Export to JSON')
             .click();
 
-        cy.get('[data-ouia-component-id=Export] button').click();
+        cy.get('[aria-label=Export]').click();
 
-        cy.get('[data-ouia-component-id=Export] .pf-v5-c-dropdown__menu-item')
+        cy.get('[data-ouia-component-id=Export] .pf-v5-c-menu__item')
             .contains('Export to CSV')
             .click();
 
diff --git a/src/Components/PresentationalComponents/CVEDetailsPageDescription/CVEDetailsPageDescription.test.js b/src/Components/PresentationalComponents/CVEDetailsPageDescription/CVEDetailsPageDescription.test.js
index dcb5e9d8a..77499a931 100644
--- a/src/Components/PresentationalComponents/CVEDetailsPageDescription/CVEDetailsPageDescription.test.js
+++ b/src/Components/PresentationalComponents/CVEDetailsPageDescription/CVEDetailsPageDescription.test.js
@@ -2,6 +2,7 @@ import React from 'react';
 import CVEDetailsPageDescription from './CVEDetailsPageDescription';
 import { render } from '@testing-library/react';
 import { IntlProvider } from '@redhat-cloud-services/frontend-components-translations';
+import { CVEPageContext } from '../../SmartComponents/CVEDetailsPage/CVEDetailsPage';
 
 describe('CVEDetailsPageDescription component', () => {
     const cveAttributes = {
@@ -22,10 +23,12 @@ describe('CVEDetailsPageDescription component', () => {
         systems_status_detail: { 0: 2 }
     };
 
-    it.skip('should render without props', () => {
+    it('should render without props', () => {
         const { asFragment } = render(
             <IntlProvider locale="en">
-                <CVEDetailsPageDescription cveAttributes={cveAttributes} />
+                <CVEPageContext.Provider value={{ isLoading: false }}>
+                    <CVEDetailsPageDescription cveAttributes={cveAttributes} />
+                </CVEPageContext.Provider>
             </IntlProvider>
         );
 
diff --git a/src/Components/PresentationalComponents/CVEDetailsPageDescription/__snapshots__/CVEDetailsPageDescription.test.js.snap b/src/Components/PresentationalComponents/CVEDetailsPageDescription/__snapshots__/CVEDetailsPageDescription.test.js.snap
index 2be89a200..88001eee8 100644
--- a/src/Components/PresentationalComponents/CVEDetailsPageDescription/__snapshots__/CVEDetailsPageDescription.test.js.snap
+++ b/src/Components/PresentationalComponents/CVEDetailsPageDescription/__snapshots__/CVEDetailsPageDescription.test.js.snap
@@ -1,228 +1,51 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`CVEDetailsPageDescription component should render without props 1`] = `
-<injectIntl(CVEDetailsPageDescription)
-  cveAttributes={
-    {
-      "business_risk": "Not defined",
-      "business_risk_id": 0,
-      "business_risk_justification": null,
-      "cvss3_metrics": "CVSS:3.1/AV:N/AC:H/PR:N/UI:N/S:U/C:N/I:N/A:H",
-      "cvss3_score": "5.900",
-      "description": "It was found that ghostscript could leak sensitive operators on the operand stack when a pseudo-operator pushes a subroutine. A specially crafted PostScript file could use this flaw to escape the -dSAFER protection in order to, for example, have access to the file system and execute commands.",
-      "impact": "Important",
-      "public_date": "12 May 2020",
-      "status": "Resolved via mitigation",
-      "status_id": 6,
-      "synopsis": "CVE-2020-10711",
-      "systems_status_detail": {
-        "0": 2,
-      },
-    }
-  }
->
-  <CVEDetailsPageDescription
-    cveAttributes={
-      {
-        "business_risk": "Not defined",
-        "business_risk_id": 0,
-        "business_risk_justification": null,
-        "cvss3_metrics": "CVSS:3.1/AV:N/AC:H/PR:N/UI:N/S:U/C:N/I:N/A:H",
-        "cvss3_score": "5.900",
-        "description": "It was found that ghostscript could leak sensitive operators on the operand stack when a pseudo-operator pushes a subroutine. A specially crafted PostScript file could use this flaw to escape the -dSAFER protection in order to, for example, have access to the file system and execute commands.",
-        "impact": "Important",
-        "public_date": "12 May 2020",
-        "status": "Resolved via mitigation",
-        "status_id": 6,
-        "synopsis": "CVE-2020-10711",
-        "systems_status_detail": {
-          "0": 2,
-        },
-      }
-    }
-    intl={
-      {
-        "$t": [Function],
-        "defaultFormats": {},
-        "defaultLocale": "en",
-        "defaultRichTextElements": undefined,
-        "fallbackOnEmptyString": true,
-        "formatDate": [Function],
-        "formatDateTimeRange": [Function],
-        "formatDateToParts": [Function],
-        "formatDisplayName": [Function],
-        "formatList": [Function],
-        "formatListToParts": [Function],
-        "formatMessage": [Function],
-        "formatNumber": [Function],
-        "formatNumberToParts": [Function],
-        "formatPlural": [Function],
-        "formatRelativeTime": [Function],
-        "formatTime": [Function],
-        "formatTimeToParts": [Function],
-        "formats": {},
-        "formatters": {
-          "getDateTimeFormat": [Function],
-          "getDisplayNames": [Function],
-          "getListFormat": [Function],
-          "getMessageFormat": [Function],
-          "getNumberFormat": [Function],
-          "getPluralRules": [Function],
-          "getRelativeTimeFormat": [Function],
-        },
-        "locale": "en",
-        "messages": {
-          "default.cancel": "Cancel",
-          "default.delete": "Delete",
-          "default.remove": "Remove",
-          "default.save": "Save",
-        },
-        "onError": [Function],
-        "onWarn": [Function],
-        "textComponent": Symbol(react.fragment),
-        "timeZone": undefined,
-        "wrapRichTextChunksInFragment": undefined,
-      }
-    }
+<DocumentFragment>
+  <div
+    class="pf-v5-l-stack pf-m-gutter"
   >
-    <Stack
-      hasGutter={true}
+    <div
+      class="pf-v5-l-stack__item pf-v5-u-mt-sm"
     >
       <div
-        className="pf-l-stack pf-m-gutter"
+        class="pf-v5-l-flex"
       >
-        <StackItem
-          className="pf-u-mt-sm"
+        <div
+          class=""
         >
-          <div
-            className="pf-l-stack__item pf-u-mt-sm"
-          >
-            <Flex>
-              <div
-                className="pf-l-flex"
-              >
-                <FlexItem>
-                  <div
-                    className=""
-                  >
-                    Publish date
-                    :
-                  </div>
-                </FlexItem>
-                <FlexItem
-                  grow={
-                    {
-                      "default": "grow",
-                    }
-                  }
-                >
-                  <div
-                    className="pf-m-grow"
-                  >
-                    <WithLoader
-                      isLoading={true}
-                      size="sm"
-                      variant="inlineSkeleton"
-                    >
-                      <Skeleton
-                        size="sm"
-                        style={
-                          {
-                            "display": "inline-block",
-                          }
-                        }
-                      >
-                        <Skeleton
-                          className="ins-c-skeleton ins-c-skeleton__sm"
-                          style={
-                            {
-                              "display": "inline-block",
-                            }
-                          }
-                        >
-                          <div
-                            className="pf-c-skeleton ins-c-skeleton ins-c-skeleton__sm"
-                            style={
-                              {
-                                "display": "inline-block",
-                              }
-                            }
-                          >
-                            <span
-                              className="pf-u-screen-reader"
-                            />
-                          </div>
-                        </Skeleton>
-                      </Skeleton>
-                    </WithLoader>
-                  </div>
-                </FlexItem>
-              </div>
-            </Flex>
-          </div>
-        </StackItem>
-        <StackItem>
-          <div
-            className="pf-l-stack__item"
-          >
-            <WithLoader
-              isLoading={true}
-              style={
-                {
-                  "height": "132px",
-                  "width": "100%",
-                }
-              }
-              variant="rectangle"
-            >
-              <Skeleton
-                shape="square"
-                style={
-                  {
-                    "height": "132px",
-                    "width": "100%",
-                  }
-                }
-              >
-                <Skeleton
-                  className="ins-c-skeleton ins-c-skeleton__md"
-                  shape="square"
-                  style={
-                    {
-                      "height": "132px",
-                      "width": "100%",
-                    }
-                  }
-                >
-                  <div
-                    className="pf-c-skeleton pf-m-square ins-c-skeleton ins-c-skeleton__md"
-                    style={
-                      {
-                        "height": "132px",
-                        "width": "100%",
-                      }
-                    }
-                  >
-                    <span
-                      className="pf-u-screen-reader"
-                    />
-                  </div>
-                </Skeleton>
-              </Skeleton>
-            </WithLoader>
-          </div>
-        </StackItem>
-        <StackItem
-          className="pf-u-mt-sm pf-u-mb-md"
+          Publish date:
+        </div>
+        <div
+          class="pf-m-grow"
         >
-          <div
-            className="pf-l-stack__item pf-u-mt-sm pf-u-mb-md"
-          >
-            For most up-to-date information, 
-          </div>
-        </StackItem>
+          12 May 2020
+        </div>
       </div>
-    </Stack>
-  </CVEDetailsPageDescription>
-</injectIntl(CVEDetailsPageDescription)>
+    </div>
+    <div
+      class="pf-v5-l-stack__item"
+    >
+      <div
+        class="pf-v5-c-content"
+        style="text-align: justify;"
+      >
+        <p
+          class=""
+          data-ouia-component-id="OUIA-Generated-Text-1"
+          data-ouia-component-type="PF5/Text"
+          data-ouia-safe="true"
+          data-pf-content="true"
+        >
+          It was found that ghostscript could leak sensitive operators on the operand stack when a pseudo-operator pushes a subroutine. A specially crafted PostScript file could use this flaw to escape the -dSAFER protection in order to, for example, have access to the file system and execute commands.
+        </p>
+      </div>
+    </div>
+    <div
+      class="pf-v5-l-stack__item pf-v5-u-mt-sm pf-v5-u-mb-md"
+    >
+      For most up-to-date information, 
+    </div>
+  </div>
+</DocumentFragment>
 `;
diff --git a/src/Components/PresentationalComponents/CVEDetailsPageSidebar/CVEDetailsPageSidebar.test.js b/src/Components/PresentationalComponents/CVEDetailsPageSidebar/CVEDetailsPageSidebar.test.js
index 81f112760..f08bb2266 100644
--- a/src/Components/PresentationalComponents/CVEDetailsPageSidebar/CVEDetailsPageSidebar.test.js
+++ b/src/Components/PresentationalComponents/CVEDetailsPageSidebar/CVEDetailsPageSidebar.test.js
@@ -2,6 +2,7 @@ import React from 'react';
 import CVEDetailsPageSidebar from './CVEDetailsPageSidebar';
 import { render } from '@testing-library/react';
 import { IntlProvider } from '@redhat-cloud-services/frontend-components-translations';
+import { CVEPageContext } from '../../SmartComponents/CVEDetailsPage/CVEDetailsPage';
 
 const cveAttributes = {
     business_risk: "Low",
@@ -26,10 +27,12 @@ const cveAttributes = {
 }
 
 describe('CVEDetailsPageSidebar component', () => {
-    it.skip('should render correctly', () => {
+    it('should render correctly', () => {
         const { asFragment } = render(
             <IntlProvider locale="en">
-                <CVEDetailsPageSidebar cveAttributes={cveAttributes} />
+                <CVEPageContext.Provider value={{ isLoading: false }}>
+                    <CVEDetailsPageSidebar cveAttributes={cveAttributes} />
+                </CVEPageContext.Provider>
             </IntlProvider>
         );
         expect(asFragment()).toMatchSnapshot();
diff --git a/src/Components/PresentationalComponents/CVEDetailsPageSidebar/__snapshots__/CVEDetailsPageSidebar.test.js.snap b/src/Components/PresentationalComponents/CVEDetailsPageSidebar/__snapshots__/CVEDetailsPageSidebar.test.js.snap
index d2a179521..d360b460e 100644
--- a/src/Components/PresentationalComponents/CVEDetailsPageSidebar/__snapshots__/CVEDetailsPageSidebar.test.js.snap
+++ b/src/Components/PresentationalComponents/CVEDetailsPageSidebar/__snapshots__/CVEDetailsPageSidebar.test.js.snap
@@ -1,1285 +1,196 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`CVEDetailsPageSidebar component should render correctly 1`] = `
-<CVEDetailsPageSidebar
-  cveAttributes={
-    {
-      "business_risk": "Low",
-      "business_risk_id": 1,
-      "business_risk_justification": "m",
-      "cvss2_metrics": null,
-      "cvss2_score": null,
-      "cvss3_metrics": "CVSS:3.1/AV:L/AC:L/PR:L/UI:N/S:U/C:H/I:H/A:H",
-      "cvss3_score": "7.800",
-      "description": "A flaw was found in sudo. A heap-based buffer overflow was found in the way sudo parses command line arguments. This flaw is exploitable by any local user who can execute the sudo command (by default, any local user can execute sudo) without authentication. Successful exploitation of this flaw could lead to privilege escalation. The highest threat from this vulnerability is to data confidentiality and integrity as well as system availability.",
-      "impact": "Important",
-      "public_date": "26 Jan 2021",
-      "status": "Resolved",
-      "status_id": 4,
-      "status_justification": null,
-      "synopsis": "CVE-2021-3156",
-      "systems_status_detail": {
-        "0": 114,
-        "4": 4,
-      },
-      "systems_status_divergent": 206,
-    }
-  }
->
-  <Stack
-    hasGutter={true}
+<DocumentFragment>
+  <div
+    class="pf-v5-l-stack pf-m-gutter"
   >
     <div
-      className="pf-l-stack pf-m-gutter"
+      class="pf-v5-l-stack__item"
     >
-      <StackItem>
+      <div
+        class="pf-v5-l-split pf-m-gutter"
+      >
         <div
-          className="pf-l-stack__item"
+          class="pf-v5-l-split__item"
         >
-          <Split
-            hasGutter={true}
+          <div
+            style="display: contents;"
           >
             <div
-              className="pf-l-split pf-m-gutter"
+              class="pf-v5-l-stack popover-content"
             >
-              <SplitItem>
-                <div
-                  className="pf-l-split__item"
+              <div
+                class="pf-v5-l-stack__item"
+              >
+                <span
+                  class="vuln-label "
+                  style="font-size: medium; display: block;"
                 >
-                  <SnippetWithHeaderAndPopover
-                    content={
-                      <Stack
-                        className="pf-u-p-xs"
-                      >
-                        <StackItem>
-                          <Label
-                            className="pf-u-mb-xs"
-                          >
-                            Justification note
-                          </Label>
-                        </StackItem>
-                        <StackItem>
-                          m
-                        </StackItem>
-                      </Stack>
-                    }
-                    title="Business risk"
-                    value={
-                      <WithLoader
-                        isLoading={true}
-                        style={
-                          {
-                            "width": "100px",
-                          }
-                        }
-                      >
-                        Low
-                      </WithLoader>
-                    }
-                  >
-                    <Popover
-                      appendTo={null}
-                      bodyContent={
-                        <Stack
-                          className="pf-u-p-xs"
-                        >
-                          <StackItem>
-                            <Label
-                              className="pf-u-mb-xs"
-                            >
-                              Justification note
-                            </Label>
-                          </StackItem>
-                          <StackItem>
-                            m
-                          </StackItem>
-                        </Stack>
-                      }
-                      headerContent=""
-                      id="popover"
-                      position="bottom"
-                    >
-                      <Popper
-                        appendTo={null}
-                        distance={25}
-                        enableFlip={true}
-                        flipBehavior={
-                          [
-                            "top",
-                            "bottom",
-                            "left",
-                            "right",
-                            "top-start",
-                            "top-end",
-                            "bottom-start",
-                            "bottom-end",
-                            "left-start",
-                            "left-end",
-                            "right-start",
-                            "right-end",
-                          ]
-                        }
-                        isVisible={false}
-                        onDocumentClick={[Function]}
-                        onDocumentKeyDown={[Function]}
-                        onTriggerClick={[Function]}
-                        placement="bottom"
-                        popper={
-                          <ForwardRef
-                            active={false}
-                            aria-describedby="popover-popover-body"
-                            aria-label=""
-                            aria-modal="true"
-                            className="pf-c-popover"
-                            focusTrapOptions={
-                              {
-                                "clickOutsideDeactivates": true,
-                                "fallbackFocus": [Function],
-                                "returnFocusOnDeactivate": true,
-                                "tabbableOptions": {
-                                  "displayCheck": "none",
-                                },
-                              }
-                            }
-                            onMouseDown={[Function]}
-                            preventScrollOnDeactivate={true}
-                            role="dialog"
-                            style={
-                              {
-                                "maxWidth": null,
-                                "minWidth": null,
-                                "opacity": 0,
-                                "transition": "opacity 300ms cubic-bezier(.54, 1.5, .38, 1.11)",
-                              }
-                            }
-                          >
-                            <PopoverArrow />
-                            <PopoverContent>
-                              <PopoverCloseButton
-                                aria-label="Close"
-                                onClose={[Function]}
-                              />
-                              
-                              <PopoverBody
-                                id="popover-popover-body"
-                              >
-                                <Stack
-                                  className="pf-u-p-xs"
-                                >
-                                  <StackItem>
-                                    <Label
-                                      className="pf-u-mb-xs"
-                                    >
-                                      Justification note
-                                    </Label>
-                                  </StackItem>
-                                  <StackItem>
-                                    m
-                                  </StackItem>
-                                </Stack>
-                              </PopoverBody>
-                            </PopoverContent>
-                          </ForwardRef>
-                        }
-                        popperMatchesTriggerWidth={false}
-                        positionModifiers={
-                          {
-                            "bottom": "pf-m-bottom",
-                            "bottom-end": "pf-m-bottom-right",
-                            "bottom-start": "pf-m-bottom-left",
-                            "left": "pf-m-left",
-                            "left-end": "pf-m-left-bottom",
-                            "left-start": "pf-m-left-top",
-                            "right": "pf-m-right",
-                            "right-end": "pf-m-right-bottom",
-                            "right-start": "pf-m-right-top",
-                            "top": "pf-m-top",
-                            "top-end": "pf-m-top-right",
-                            "top-start": "pf-m-top-left",
-                          }
-                        }
-                        removeFindDomNode={false}
-                        trigger={
-                          <Stack
-                            className="popover-content"
-                          >
-                            <StackItem>
-                              <Label
-                                isLarge={true}
-                              >
-                                Business risk
-                              </Label>
-                            </StackItem>
-                            <StackItem>
-                              <a>
-                                <WithLoader
-                                  isLoading={true}
-                                  style={
-                                    {
-                                      "width": "100px",
-                                    }
-                                  }
-                                >
-                                  Low
-                                </WithLoader>
-                              </a>
-                            </StackItem>
-                          </Stack>
-                        }
-                        zIndex={9999}
-                      >
-                        <FindRefWrapper
-                          onFoundRef={[Function]}
-                        >
-                          <Stack
-                            className="popover-content"
-                          >
-                            <div
-                              className="pf-l-stack popover-content"
-                            >
-                              <StackItem>
-                                <div
-                                  className="pf-l-stack__item"
-                                >
-                                  <Label
-                                    isLarge={true}
-                                  >
-                                    <span
-                                      className="vuln-label "
-                                      style={
-                                        {
-                                          "display": "block",
-                                          "fontSize": "medium",
-                                        }
-                                      }
-                                    >
-                                      Business risk
-                                    </span>
-                                  </Label>
-                                </div>
-                              </StackItem>
-                              <StackItem>
-                                <div
-                                  className="pf-l-stack__item"
-                                >
-                                  <a>
-                                    <WithLoader
-                                      isLoading={true}
-                                      style={
-                                        {
-                                          "width": "100px",
-                                        }
-                                      }
-                                    >
-                                      <Skeleton
-                                        size="lg"
-                                        style={
-                                          {
-                                            "width": "100px",
-                                          }
-                                        }
-                                      >
-                                        <Skeleton
-                                          className="ins-c-skeleton ins-c-skeleton__lg"
-                                          style={
-                                            {
-                                              "width": "100px",
-                                            }
-                                          }
-                                        >
-                                          <div
-                                            className="pf-c-skeleton ins-c-skeleton ins-c-skeleton__lg"
-                                            style={
-                                              {
-                                                "width": "100px",
-                                              }
-                                            }
-                                          >
-                                            <span
-                                              className="pf-u-screen-reader"
-                                            />
-                                          </div>
-                                        </Skeleton>
-                                      </Skeleton>
-                                    </WithLoader>
-                                  </a>
-                                </div>
-                              </StackItem>
-                            </div>
-                          </Stack>
-                        </FindRefWrapper>
-                      </Popper>
-                    </Popover>
-                  </SnippetWithHeaderAndPopover>
-                </div>
-              </SplitItem>
-              <SplitItem
-                className="pf-u-ml-lg"
+                  Business risk
+                </span>
+              </div>
+              <div
+                class="pf-v5-l-stack__item"
               >
-                <div
-                  className="pf-l-split__item pf-u-ml-lg"
+                <a>
+                  Low
+                </a>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div
+          class="pf-v5-l-split__item pf-v5-u-ml-lg"
+        >
+          <div
+            style="display: contents;"
+          >
+            <div
+              class="pf-v5-l-stack popover-content"
+            >
+              <div
+                class="pf-v5-l-stack__item"
+              >
+                <span
+                  class="vuln-label "
+                  style="font-size: medium; display: block;"
                 >
-                  <SnippetWithHeaderAndPopover
-                    content={
-                      <Stack
-                        className="pf-u-p-xs"
-                      >
-                        <StackItem>
-                          <Label
-                            className="pf-u-mb-xs"
-                          >
-                            CVE status
-                          </Label>
-                          Resolved
-                          <Label
-                            className="pf-u-mb-xs pf-u-mt-sm"
-                          >
-                            Justification note
-                          </Label>
-                          --
-                        </StackItem>
-                        <StackItem>
-                          <TextContent>
-                            <hr
-                              className="pf-u-mt-sm pf-u-mb-sm"
-                            />
-                          </TextContent>
-                          <Label
-                            isLarge={true}
-                          >
-                            Systems with this CVE
-                          </Label>
-                          <Table
-                            actionsMenuAppendTo="inline"
-                            aria-label="Status details"
-                            borders={true}
-                            canCollapseAll={false}
-                            canSelectAll={true}
-                            canSortFavorites={true}
-                            cells={
-                              [
-                                "Status",
-                                "Num. systems",
-                              ]
-                            }
-                            className="status-breakdown-table"
-                            collapseAllAriaLabel=""
-                            contentId="expanded-content"
-                            dropdownDirection="down"
-                            dropdownPosition="right"
-                            expandId="expandable-toggle"
-                            gridBreakPoint=""
-                            isHeaderSelectDisabled={false}
-                            isNested={false}
-                            isStickyHeader={false}
-                            isTreeTable={false}
-                            ouiaSafe={true}
-                            role="grid"
-                            rowLabeledBy="simple-node"
-                            rows={
-                              [
-                                [
-                                  "Not reviewed",
-                                  "114",
-                                ],
-                                [
-                                  "Resolved",
-                                  "4",
-                                ],
-                              ]
-                            }
-                            selectVariant="checkbox"
-                            variant="compact"
-                          >
-                            <TableHeader />
-                            <TableBody />
-                          </Table>
-                        </StackItem>
-                      </Stack>
-                    }
-                    title="Status"
-                    value={
-                      <WithLoader
-                        isLoading={true}
-                        style={
-                          {
-                            "width": "100px",
-                          }
-                        }
-                      >
-                        <span>
-                          <ExclamationTriangleIcon
-                            color="var(--pf-global--primary-color--100)"
-                            noVerticalAlign={false}
-                            size="sm"
-                          />
-                           
-                          Resolved
-                        </span>
-                      </WithLoader>
-                    }
-                  >
-                    <Popover
-                      appendTo={null}
-                      bodyContent={
-                        <Stack
-                          className="pf-u-p-xs"
-                        >
-                          <StackItem>
-                            <Label
-                              className="pf-u-mb-xs"
-                            >
-                              CVE status
-                            </Label>
-                            Resolved
-                            <Label
-                              className="pf-u-mb-xs pf-u-mt-sm"
-                            >
-                              Justification note
-                            </Label>
-                            --
-                          </StackItem>
-                          <StackItem>
-                            <TextContent>
-                              <hr
-                                className="pf-u-mt-sm pf-u-mb-sm"
-                              />
-                            </TextContent>
-                            <Label
-                              isLarge={true}
-                            >
-                              Systems with this CVE
-                            </Label>
-                            <Table
-                              actionsMenuAppendTo="inline"
-                              aria-label="Status details"
-                              borders={true}
-                              canCollapseAll={false}
-                              canSelectAll={true}
-                              canSortFavorites={true}
-                              cells={
-                                [
-                                  "Status",
-                                  "Num. systems",
-                                ]
-                              }
-                              className="status-breakdown-table"
-                              collapseAllAriaLabel=""
-                              contentId="expanded-content"
-                              dropdownDirection="down"
-                              dropdownPosition="right"
-                              expandId="expandable-toggle"
-                              gridBreakPoint=""
-                              isHeaderSelectDisabled={false}
-                              isNested={false}
-                              isStickyHeader={false}
-                              isTreeTable={false}
-                              ouiaSafe={true}
-                              role="grid"
-                              rowLabeledBy="simple-node"
-                              rows={
-                                [
-                                  [
-                                    "Not reviewed",
-                                    "114",
-                                  ],
-                                  [
-                                    "Resolved",
-                                    "4",
-                                  ],
-                                ]
-                              }
-                              selectVariant="checkbox"
-                              variant="compact"
-                            >
-                              <TableHeader />
-                              <TableBody />
-                            </Table>
-                          </StackItem>
-                        </Stack>
-                      }
-                      headerContent=""
-                      id="popover"
-                      position="bottom"
+                  Status
+                </span>
+              </div>
+              <div
+                class="pf-v5-l-stack__item"
+              >
+                <a>
+                  <span>
+                    <span
+                      class="pf-v5-c-icon"
                     >
-                      <Popper
-                        appendTo={null}
-                        distance={25}
-                        enableFlip={true}
-                        flipBehavior={
-                          [
-                            "top",
-                            "bottom",
-                            "left",
-                            "right",
-                            "top-start",
-                            "top-end",
-                            "bottom-start",
-                            "bottom-end",
-                            "left-start",
-                            "left-end",
-                            "right-start",
-                            "right-end",
-                          ]
-                        }
-                        isVisible={false}
-                        onDocumentClick={[Function]}
-                        onDocumentKeyDown={[Function]}
-                        onTriggerClick={[Function]}
-                        placement="bottom"
-                        popper={
-                          <ForwardRef
-                            active={false}
-                            aria-describedby="popover-popover-body"
-                            aria-label=""
-                            aria-modal="true"
-                            className="pf-c-popover"
-                            focusTrapOptions={
-                              {
-                                "clickOutsideDeactivates": true,
-                                "fallbackFocus": [Function],
-                                "returnFocusOnDeactivate": true,
-                                "tabbableOptions": {
-                                  "displayCheck": "none",
-                                },
-                              }
-                            }
-                            onMouseDown={[Function]}
-                            preventScrollOnDeactivate={true}
-                            role="dialog"
-                            style={
-                              {
-                                "maxWidth": null,
-                                "minWidth": null,
-                                "opacity": 0,
-                                "transition": "opacity 300ms cubic-bezier(.54, 1.5, .38, 1.11)",
-                              }
-                            }
-                          >
-                            <PopoverArrow />
-                            <PopoverContent>
-                              <PopoverCloseButton
-                                aria-label="Close"
-                                onClose={[Function]}
-                              />
-                              
-                              <PopoverBody
-                                id="popover-popover-body"
-                              >
-                                <Stack
-                                  className="pf-u-p-xs"
-                                >
-                                  <StackItem>
-                                    <Label
-                                      className="pf-u-mb-xs"
-                                    >
-                                      CVE status
-                                    </Label>
-                                    Resolved
-                                    <Label
-                                      className="pf-u-mb-xs pf-u-mt-sm"
-                                    >
-                                      Justification note
-                                    </Label>
-                                    --
-                                  </StackItem>
-                                  <StackItem>
-                                    <TextContent>
-                                      <hr
-                                        className="pf-u-mt-sm pf-u-mb-sm"
-                                      />
-                                    </TextContent>
-                                    <Label
-                                      isLarge={true}
-                                    >
-                                      Systems with this CVE
-                                    </Label>
-                                    <Table
-                                      actionsMenuAppendTo="inline"
-                                      aria-label="Status details"
-                                      borders={true}
-                                      canCollapseAll={false}
-                                      canSelectAll={true}
-                                      canSortFavorites={true}
-                                      cells={
-                                        [
-                                          "Status",
-                                          "Num. systems",
-                                        ]
-                                      }
-                                      className="status-breakdown-table"
-                                      collapseAllAriaLabel=""
-                                      contentId="expanded-content"
-                                      dropdownDirection="down"
-                                      dropdownPosition="right"
-                                      expandId="expandable-toggle"
-                                      gridBreakPoint=""
-                                      isHeaderSelectDisabled={false}
-                                      isNested={false}
-                                      isStickyHeader={false}
-                                      isTreeTable={false}
-                                      ouiaSafe={true}
-                                      role="grid"
-                                      rowLabeledBy="simple-node"
-                                      rows={
-                                        [
-                                          [
-                                            "Not reviewed",
-                                            "114",
-                                          ],
-                                          [
-                                            "Resolved",
-                                            "4",
-                                          ],
-                                        ]
-                                      }
-                                      selectVariant="checkbox"
-                                      variant="compact"
-                                    >
-                                      <TableHeader />
-                                      <TableBody />
-                                    </Table>
-                                  </StackItem>
-                                </Stack>
-                              </PopoverBody>
-                            </PopoverContent>
-                          </ForwardRef>
-                        }
-                        popperMatchesTriggerWidth={false}
-                        positionModifiers={
-                          {
-                            "bottom": "pf-m-bottom",
-                            "bottom-end": "pf-m-bottom-right",
-                            "bottom-start": "pf-m-bottom-left",
-                            "left": "pf-m-left",
-                            "left-end": "pf-m-left-bottom",
-                            "left-start": "pf-m-left-top",
-                            "right": "pf-m-right",
-                            "right-end": "pf-m-right-bottom",
-                            "right-start": "pf-m-right-top",
-                            "top": "pf-m-top",
-                            "top-end": "pf-m-top-right",
-                            "top-start": "pf-m-top-left",
-                          }
-                        }
-                        removeFindDomNode={false}
-                        trigger={
-                          <Stack
-                            className="popover-content"
-                          >
-                            <StackItem>
-                              <Label
-                                isLarge={true}
-                              >
-                                Status
-                              </Label>
-                            </StackItem>
-                            <StackItem>
-                              <a>
-                                <WithLoader
-                                  isLoading={true}
-                                  style={
-                                    {
-                                      "width": "100px",
-                                    }
-                                  }
-                                >
-                                  <span>
-                                    <ExclamationTriangleIcon
-                                      color="var(--pf-global--primary-color--100)"
-                                      noVerticalAlign={false}
-                                      size="sm"
-                                    />
-                                     
-                                    Resolved
-                                  </span>
-                                </WithLoader>
-                              </a>
-                            </StackItem>
-                          </Stack>
-                        }
-                        zIndex={9999}
+                      <span
+                        class="pf-v5-c-icon__content"
                       >
-                        <FindRefWrapper
-                          onFoundRef={[Function]}
+                        <svg
+                          aria-hidden="true"
+                          class="pf-v5-svg pf-v5-u-mr-xs"
+                          color="var(--pf-v5-global--primary-color--100)"
+                          fill="currentColor"
+                          height="1em"
+                          role="img"
+                          viewBox="0 0 576 512"
+                          width="1em"
                         >
-                          <Stack
-                            className="popover-content"
-                          >
-                            <div
-                              className="pf-l-stack popover-content"
-                            >
-                              <StackItem>
-                                <div
-                                  className="pf-l-stack__item"
-                                >
-                                  <Label
-                                    isLarge={true}
-                                  >
-                                    <span
-                                      className="vuln-label "
-                                      style={
-                                        {
-                                          "display": "block",
-                                          "fontSize": "medium",
-                                        }
-                                      }
-                                    >
-                                      Status
-                                    </span>
-                                  </Label>
-                                </div>
-                              </StackItem>
-                              <StackItem>
-                                <div
-                                  className="pf-l-stack__item"
-                                >
-                                  <a>
-                                    <WithLoader
-                                      isLoading={true}
-                                      style={
-                                        {
-                                          "width": "100px",
-                                        }
-                                      }
-                                    >
-                                      <Skeleton
-                                        size="lg"
-                                        style={
-                                          {
-                                            "width": "100px",
-                                          }
-                                        }
-                                      >
-                                        <Skeleton
-                                          className="ins-c-skeleton ins-c-skeleton__lg"
-                                          style={
-                                            {
-                                              "width": "100px",
-                                            }
-                                          }
-                                        >
-                                          <div
-                                            className="pf-c-skeleton ins-c-skeleton ins-c-skeleton__lg"
-                                            style={
-                                              {
-                                                "width": "100px",
-                                              }
-                                            }
-                                          >
-                                            <span
-                                              className="pf-u-screen-reader"
-                                            />
-                                          </div>
-                                        </Skeleton>
-                                      </Skeleton>
-                                    </WithLoader>
-                                  </a>
-                                </div>
-                              </StackItem>
-                            </div>
-                          </Stack>
-                        </FindRefWrapper>
-                      </Popper>
-                    </Popover>
-                  </SnippetWithHeaderAndPopover>
-                </div>
-              </SplitItem>
+                          <path
+                            d="M569.517 440.013C587.975 472.007 564.806 512 527.94 512H48.054c-36.937 0-59.999-40.055-41.577-71.987L246.423 23.985c18.467-32.009 64.72-31.951 83.154 0l239.94 416.028zM288 354c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z"
+                          />
+                        </svg>
+                      </span>
+                    </span>
+                     Resolved
+                  </span>
+                </a>
+              </div>
             </div>
-          </Split>
+          </div>
         </div>
-      </StackItem>
-      <StackItem>
+      </div>
+    </div>
+    <div
+      class="pf-v5-l-stack__item"
+    >
+      <span
+        class="vuln-label pf-v5-u-mb-xs"
+        style="font-size: medium; display: block;"
+      >
+        Severity
+      </span>
+      <span
+        id="severity-shield"
+      >
+        <span>
+          <div
+            style="display: contents;"
+          >
+            <span>
+              <span
+                class="pf-v5-c-icon pf-m-md"
+              >
+                <span
+                  class="pf-v5-c-icon__content"
+                >
+                  <svg
+                    aria-hidden="false"
+                    aria-label="Important"
+                    class="pf-v5-svg"
+                    color="#ec7a08"
+                    fill="currentColor"
+                    height="1em"
+                    role="img"
+                    viewBox="0 0 896 1024"
+                    width="1em"
+                  >
+                    <path
+                      d="M861.5,0 L34.5,0 C15.4,0 0,14.3 0,32 L0,452.1 C0,768 387.7,1024 448.5,1024 C509.3,1024 896,768 896,452.2 L896,32 C896,14.3 880.6,0 861.5,0 Z M490.7,768 L405.3,768 C393.5,767.8 384.2,757.5 384,744.7 L384,663.3 C384.2,650.5 393.6,640.3 405.3,640 L490.7,640 C502.5,640.2 511.8,650.5 512,663.3 L512,744.7 L512.1,744.7 C511.8,757.5 502.4,767.8 490.7,768 Z M543.9,162.7 L517.2,514.4 C515.8,530.9 502,544 485.3,544 L410.6,544 C394,544 380.1,531.2 378.7,514.7 L352.1,163 C350.5,144.3 365.3,128.3 384,128.3 L512,128 C530.7,128 545.4,144 543.9,162.7 Z"
+                    />
+                  </svg>
+                </span>
+              </span>
+               Important
+            </span>
+          </div>
+        </span>
+      </span>
+    </div>
+    <div
+      class="pf-v5-l-stack__item"
+    >
+      <div
+        class="pf-v5-c-content"
+      >
         <div
-          className="pf-l-stack__item"
+          style="display: contents;"
         >
-          <Label
-            className="pf-u-mb-xs"
-            isLarge={true}
+          <span
+            class="vuln-label pf-v5-u-mb-xs pointer"
+            style="font-size: medium; display: block;"
           >
+            CVSS 3.0  base score
             <span
-              className="vuln-label pf-u-mb-xs"
-              style={
-                {
-                  "display": "block",
-                  "fontSize": "medium",
-                }
-              }
-            >
-              Severity
-            </span>
-          </Label>
-          <WithLoader
-            isLoading={true}
-            style={
-              {
-                "width": "100px",
-              }
-            }
-          >
-            <Skeleton
-              size="lg"
-              style={
-                {
-                  "width": "100px",
-                }
-              }
+              class="pf-v5-c-icon"
             >
-              <Skeleton
-                className="ins-c-skeleton ins-c-skeleton__lg"
-                style={
-                  {
-                    "width": "100px",
-                  }
-                }
+              <span
+                class="pf-v5-c-icon__content"
               >
-                <div
-                  className="pf-c-skeleton ins-c-skeleton ins-c-skeleton__lg"
-                  style={
-                    {
-                      "width": "100px",
-                    }
-                  }
+                <svg
+                  aria-hidden="true"
+                  class="pf-v5-svg pf-v5-u-ml-xs"
+                  color="var(--pf-v5-global--secondary-color--100)"
+                  fill="currentColor"
+                  height="1em"
+                  role="img"
+                  viewBox="0 0 512 512"
+                  width="1em"
                 >
-                  <span
-                    className="pf-u-screen-reader"
+                  <path
+                    d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 448c-110.532 0-200-89.431-200-200 0-110.495 89.472-200 200-200 110.491 0 200 89.471 200 200 0 110.53-89.431 200-200 200zm107.244-255.2c0 67.052-72.421 68.084-72.421 92.863V300c0 6.627-5.373 12-12 12h-45.647c-6.627 0-12-5.373-12-12v-8.659c0-35.745 27.1-50.034 47.579-61.516 17.561-9.845 28.324-16.541 28.324-29.579 0-17.246-21.999-28.693-39.784-28.693-23.189 0-33.894 10.977-48.942 29.969-4.057 5.12-11.46 6.071-16.666 2.124l-27.824-21.098c-5.107-3.872-6.251-11.066-2.644-16.363C184.846 131.491 214.94 112 261.794 112c49.071 0 101.45 38.304 101.45 88.8zM298 368c0 23.159-18.841 42-42 42s-42-18.841-42-42 18.841-42 42-42 42 18.841 42 42z"
                   />
-                </div>
-              </Skeleton>
-            </Skeleton>
-          </WithLoader>
+                </svg>
+              </span>
+            </span>
+          </span>
         </div>
-      </StackItem>
-      <StackItem>
-        <div
-          className="pf-l-stack__item"
+        <span
+          class="pf-v5-u-mr-md"
         >
-          <injectIntl(CvssVector)
-            cvss2_metrics={null}
-            cvss3_metrics="CVSS:3.1/AV:L/AC:L/PR:L/UI:N/S:U/C:H/I:H/A:H"
-            score="7.8"
-          >
-            <CvssVector
-              cvss2_metrics={null}
-              cvss3_metrics="CVSS:3.1/AV:L/AC:L/PR:L/UI:N/S:U/C:H/I:H/A:H"
-              intl={
-                {
-                  "$t": [Function],
-                  "defaultFormats": {},
-                  "defaultLocale": "en",
-                  "defaultRichTextElements": undefined,
-                  "fallbackOnEmptyString": true,
-                  "formatDate": [Function],
-                  "formatDateTimeRange": [Function],
-                  "formatDateToParts": [Function],
-                  "formatDisplayName": [Function],
-                  "formatList": [Function],
-                  "formatListToParts": [Function],
-                  "formatMessage": [Function],
-                  "formatNumber": [Function],
-                  "formatNumberToParts": [Function],
-                  "formatPlural": [Function],
-                  "formatRelativeTime": [Function],
-                  "formatTime": [Function],
-                  "formatTimeToParts": [Function],
-                  "formats": {},
-                  "formatters": {
-                    "getDateTimeFormat": [Function],
-                    "getDisplayNames": [Function],
-                    "getListFormat": [Function],
-                    "getMessageFormat": [Function],
-                    "getNumberFormat": [Function],
-                    "getPluralRules": [Function],
-                    "getRelativeTimeFormat": [Function],
-                  },
-                  "locale": "en",
-                  "messages": {
-                    "default.cancel": "Cancel",
-                    "default.delete": "Delete",
-                    "default.remove": "Remove",
-                    "default.save": "Save",
-                  },
-                  "onError": [Function],
-                  "onWarn": [Function],
-                  "textComponent": Symbol(react.fragment),
-                  "timeZone": undefined,
-                  "wrapRichTextChunksInFragment": undefined,
-                }
-              }
-              score="7.8"
-            >
-              <TextContent>
-                <div
-                  className="pf-c-content"
-                >
-                  <Popover
-                    bodyContent={
-                      <WithLoader
-                        colSize={2}
-                        isLoading={true}
-                        rowSize={8}
-                        variant="compactTable"
-                      >
-                        <Table
-                          actionsMenuAppendTo="inline"
-                          aria-label="Metric breakdown"
-                          borders={true}
-                          canCollapseAll={false}
-                          canSelectAll={true}
-                          canSortFavorites={true}
-                          cells={
-                            [
-                              "Metric",
-                              "Value",
-                            ]
-                          }
-                          className=""
-                          collapseAllAriaLabel=""
-                          contentId="expanded-content"
-                          dropdownDirection="down"
-                          dropdownPosition="right"
-                          expandId="expandable-toggle"
-                          gridBreakPoint=""
-                          isHeaderSelectDisabled={false}
-                          isNested={false}
-                          isStickyHeader={false}
-                          isTreeTable={false}
-                          ouiaSafe={true}
-                          role="grid"
-                          rowLabeledBy="simple-node"
-                          rows={
-                            [
-                              [
-                                "Attack vector",
-                                "Local",
-                              ],
-                              [
-                                "Attack complexity",
-                                "Low",
-                              ],
-                              [
-                                "Privileges required",
-                                "Low",
-                              ],
-                              [
-                                "User interaction",
-                                "None",
-                              ],
-                              [
-                                "Scope",
-                                "Unchanged",
-                              ],
-                              [
-                                "Confidentiality",
-                                "High",
-                              ],
-                              [
-                                "Integrity",
-                                "High",
-                              ],
-                              [
-                                "Availability",
-                                "High",
-                              ],
-                            ]
-                          }
-                          selectVariant="checkbox"
-                          variant="compact"
-                        >
-                          <TableHeader />
-                          <TableBody />
-                        </Table>
-                      </WithLoader>
-                    }
-                    enableFlip={true}
-                    headerContent="CVSS 3.0  vector breakdown"
-                    id="popover-cvss"
-                    maxWidth="100%"
-                    position="bottom"
-                  >
-                    <Popper
-                      appendTo={[Function]}
-                      distance={25}
-                      enableFlip={true}
-                      flipBehavior={
-                        [
-                          "top",
-                          "bottom",
-                          "left",
-                          "right",
-                          "top-start",
-                          "top-end",
-                          "bottom-start",
-                          "bottom-end",
-                          "left-start",
-                          "left-end",
-                          "right-start",
-                          "right-end",
-                        ]
-                      }
-                      isVisible={false}
-                      onDocumentClick={[Function]}
-                      onDocumentKeyDown={[Function]}
-                      onTriggerClick={[Function]}
-                      placement="bottom"
-                      popper={
-                        <ForwardRef
-                          active={false}
-                          aria-describedby="popover-popover-cvss-body"
-                          aria-labelledby="popover-popover-cvss-header"
-                          aria-modal="true"
-                          className="pf-c-popover"
-                          focusTrapOptions={
-                            {
-                              "clickOutsideDeactivates": true,
-                              "fallbackFocus": [Function],
-                              "returnFocusOnDeactivate": true,
-                              "tabbableOptions": {
-                                "displayCheck": "none",
-                              },
-                            }
-                          }
-                          onMouseDown={[Function]}
-                          preventScrollOnDeactivate={true}
-                          role="dialog"
-                          style={
-                            {
-                              "maxWidth": "100%",
-                              "minWidth": null,
-                              "opacity": 0,
-                              "transition": "opacity 300ms cubic-bezier(.54, 1.5, .38, 1.11)",
-                            }
-                          }
-                        >
-                          <PopoverArrow />
-                          <PopoverContent>
-                            <PopoverCloseButton
-                              aria-label="Close"
-                              onClose={[Function]}
-                            />
-                            <PopoverHeader
-                              alertSeverityScreenReaderText="undefined alert:"
-                              icon={null}
-                              id="popover-popover-cvss-header"
-                              titleHeadingLevel="h6"
-                            >
-                              CVSS 3.0  vector breakdown
-                            </PopoverHeader>
-                            <PopoverBody
-                              id="popover-popover-cvss-body"
-                            >
-                              <WithLoader
-                                colSize={2}
-                                isLoading={true}
-                                rowSize={8}
-                                variant="compactTable"
-                              >
-                                <Table
-                                  actionsMenuAppendTo="inline"
-                                  aria-label="Metric breakdown"
-                                  borders={true}
-                                  canCollapseAll={false}
-                                  canSelectAll={true}
-                                  canSortFavorites={true}
-                                  cells={
-                                    [
-                                      "Metric",
-                                      "Value",
-                                    ]
-                                  }
-                                  className=""
-                                  collapseAllAriaLabel=""
-                                  contentId="expanded-content"
-                                  dropdownDirection="down"
-                                  dropdownPosition="right"
-                                  expandId="expandable-toggle"
-                                  gridBreakPoint=""
-                                  isHeaderSelectDisabled={false}
-                                  isNested={false}
-                                  isStickyHeader={false}
-                                  isTreeTable={false}
-                                  ouiaSafe={true}
-                                  role="grid"
-                                  rowLabeledBy="simple-node"
-                                  rows={
-                                    [
-                                      [
-                                        "Attack vector",
-                                        "Local",
-                                      ],
-                                      [
-                                        "Attack complexity",
-                                        "Low",
-                                      ],
-                                      [
-                                        "Privileges required",
-                                        "Low",
-                                      ],
-                                      [
-                                        "User interaction",
-                                        "None",
-                                      ],
-                                      [
-                                        "Scope",
-                                        "Unchanged",
-                                      ],
-                                      [
-                                        "Confidentiality",
-                                        "High",
-                                      ],
-                                      [
-                                        "Integrity",
-                                        "High",
-                                      ],
-                                      [
-                                        "Availability",
-                                        "High",
-                                      ],
-                                    ]
-                                  }
-                                  selectVariant="checkbox"
-                                  variant="compact"
-                                >
-                                  <TableHeader />
-                                  <TableBody />
-                                </Table>
-                              </WithLoader>
-                            </PopoverBody>
-                          </PopoverContent>
-                        </ForwardRef>
-                      }
-                      popperMatchesTriggerWidth={false}
-                      positionModifiers={
-                        {
-                          "bottom": "pf-m-bottom",
-                          "bottom-end": "pf-m-bottom-right",
-                          "bottom-start": "pf-m-bottom-left",
-                          "left": "pf-m-left",
-                          "left-end": "pf-m-left-bottom",
-                          "left-start": "pf-m-left-top",
-                          "right": "pf-m-right",
-                          "right-end": "pf-m-right-bottom",
-                          "right-start": "pf-m-right-top",
-                          "top": "pf-m-top",
-                          "top-end": "pf-m-top-right",
-                          "top-start": "pf-m-top-left",
-                        }
-                      }
-                      removeFindDomNode={false}
-                      trigger={
-                        <Label
-                          className="pf-u-mb-xs pointer"
-                          isLarge={true}
-                        >
-                          CVSS 3.0
-                           
-                           base score
-                          <OutlinedQuestionCircleIcon
-                            className="pf-u-ml-xs"
-                            color="var(--pf-global--secondary-color--100)"
-                            noVerticalAlign={false}
-                            size="sm"
-                          />
-                        </Label>
-                      }
-                      zIndex={9999}
-                    >
-                      <FindRefWrapper
-                        onFoundRef={[Function]}
-                      >
-                        <Label
-                          className="pf-u-mb-xs pointer"
-                          isLarge={true}
-                        >
-                          <span
-                            className="vuln-label pf-u-mb-xs pointer"
-                            style={
-                              {
-                                "display": "block",
-                                "fontSize": "medium",
-                              }
-                            }
-                          >
-                            CVSS 3.0
-                             
-                             base score
-                            <OutlinedQuestionCircleIcon
-                              className="pf-u-ml-xs"
-                              color="var(--pf-global--secondary-color--100)"
-                              noVerticalAlign={false}
-                              size="sm"
-                            >
-                              <svg
-                                aria-hidden={true}
-                                aria-labelledby={null}
-                                className="pf-u-ml-xs"
-                                fill="var(--pf-global--secondary-color--100)"
-                                height="1em"
-                                role="img"
-                                style={
-                                  {
-                                    "verticalAlign": "-0.125em",
-                                  }
-                                }
-                                viewBox="0 0 512 512"
-                                width="1em"
-                              >
-                                <path
-                                  d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 448c-110.532 0-200-89.431-200-200 0-110.495 89.472-200 200-200 110.491 0 200 89.471 200 200 0 110.53-89.431 200-200 200zm107.244-255.2c0 67.052-72.421 68.084-72.421 92.863V300c0 6.627-5.373 12-12 12h-45.647c-6.627 0-12-5.373-12-12v-8.659c0-35.745 27.1-50.034 47.579-61.516 17.561-9.845 28.324-16.541 28.324-29.579 0-17.246-21.999-28.693-39.784-28.693-23.189 0-33.894 10.977-48.942 29.969-4.057 5.12-11.46 6.071-16.666 2.124l-27.824-21.098c-5.107-3.872-6.251-11.066-2.644-16.363C184.846 131.491 214.94 112 261.794 112c49.071 0 101.45 38.304 101.45 88.8zM298 368c0 23.159-18.841 42-42 42s-42-18.841-42-42 18.841-42 42-42 42 18.841 42 42z"
-                                />
-                              </svg>
-                            </OutlinedQuestionCircleIcon>
-                          </span>
-                        </Label>
-                      </FindRefWrapper>
-                    </Popper>
-                  </Popover>
-                  <WithLoader
-                    isLoading={true}
-                    style={
-                      {
-                        "width": "320px",
-                      }
-                    }
-                  >
-                    <Skeleton
-                      size="lg"
-                      style={
-                        {
-                          "width": "320px",
-                        }
-                      }
-                    >
-                      <Skeleton
-                        className="ins-c-skeleton ins-c-skeleton__lg"
-                        style={
-                          {
-                            "width": "320px",
-                          }
-                        }
-                      >
-                        <div
-                          className="pf-c-skeleton ins-c-skeleton ins-c-skeleton__lg"
-                          style={
-                            {
-                              "width": "320px",
-                            }
-                          }
-                        >
-                          <span
-                            className="pf-u-screen-reader"
-                          />
-                        </div>
-                      </Skeleton>
-                    </Skeleton>
-                  </WithLoader>
-                </div>
-              </TextContent>
-            </CvssVector>
-          </injectIntl(CvssVector)>
-        </div>
-      </StackItem>
+          7.8
+        </span>
+        <span
+          id="cvss-vector-content"
+        >
+          Vector: AV:L/AC:L/PR:L/UI:N/S:U/C:H/I:H/A:H
+        </span>
+      </div>
     </div>
-  </Stack>
-</CVEDetailsPageSidebar>
+  </div>
+</DocumentFragment>
 `;
diff --git a/src/Components/PresentationalComponents/Kebab/KebabItems.js b/src/Components/PresentationalComponents/Kebab/KebabItems.js
index e5553dc34..7d1a39d8c 100644
--- a/src/Components/PresentationalComponents/Kebab/KebabItems.js
+++ b/src/Components/PresentationalComponents/Kebab/KebabItems.js
@@ -16,13 +16,13 @@ export const kebabItemDownloadPDF = (loading, downloadReport, props = {}) => (
 );
 
 export const kebabItemEditBusinessRisk = (showBusinessRiskModal, cves, props = {}) => (
-    <DropdownItem key="editBusinessRisk" onClick={() => showBusinessRiskModal(cves)} {...props}>
+    <DropdownItem key="editBusinessRisk" ouiaId="edit-business-risk" onClick={() => showBusinessRiskModal(cves)} {...props}>
         <FormattedMessage {...messages.kebabEditBusinessRisk} />
     </DropdownItem>
 );
 
 export const kebabItemEditStatus = (showStatusModal, cves, inventoryIds, props = {}) => (
-    <DropdownItem key="editStatus" onClick={() => showStatusModal(cves, inventoryIds)} {...props}>
+    <DropdownItem key="editStatus" ouiaId="edit-status" onClick={() => showStatusModal(cves, inventoryIds)} {...props}>
         <FormattedMessage {...messages.kebabEditStatus} />
     </DropdownItem>
 );
diff --git a/src/Components/PresentationalComponents/Kebab/__snapshots__/KebabItems.test.js.snap b/src/Components/PresentationalComponents/Kebab/__snapshots__/KebabItems.test.js.snap
index 73b7aa45e..4568aef6d 100644
--- a/src/Components/PresentationalComponents/Kebab/__snapshots__/KebabItems.test.js.snap
+++ b/src/Components/PresentationalComponents/Kebab/__snapshots__/KebabItems.test.js.snap
@@ -48,7 +48,7 @@ exports[`KebabItems component Should render without default params 1`] = `
       >
         <li
           class="pf-v5-c-menu__list-item"
-          data-ouia-component-id="OUIA-Generated-DropdownItem-1"
+          data-ouia-component-id="edit-business-risk"
           data-ouia-component-type="PF5/DropdownItem"
           data-ouia-safe="true"
           role="none"
@@ -72,7 +72,7 @@ exports[`KebabItems component Should render without default params 1`] = `
         </li>
         <li
           class="pf-v5-c-menu__list-item"
-          data-ouia-component-id="OUIA-Generated-DropdownItem-2"
+          data-ouia-component-id="edit-status"
           data-ouia-component-type="PF5/DropdownItem"
           data-ouia-safe="true"
           role="none"
diff --git a/src/Components/SmartComponents/CVEs/CVEs.cy.js b/src/Components/SmartComponents/CVEs/CVEs.cy.js
index eccaac91d..24413dbe9 100644
--- a/src/Components/SmartComponents/CVEs/CVEs.cy.js
+++ b/src/Components/SmartComponents/CVEs/CVEs.cy.js
@@ -70,17 +70,17 @@ describe('CVE list table', () => {
     it('shows buttons to edit status or business risk', () => {
         cy.get('.ins-c-primary-toolbar__actions > .pf-v5-c-menu-toggle').click();
 
-        cy.get('[data-ouia-component-id="OUIA-Generated-DropdownItem-1"] > .pf-v5-c-menu__item')
+        cy.get('[data-ouia-component-id="edit-business-risk"] > .pf-v5-c-menu__item')
             .contains('Edit business risk')
             .should('exist');
 
-        cy.get('[data-ouia-component-id="OUIA-Generated-DropdownItem-2"] > .pf-v5-c-menu__item')
+        cy.get('[data-ouia-component-id="edit-status"] > .pf-v5-c-menu__item')
             .contains('Edit status')
             .should('exist');
     });
 
-    it.skip('shows row actions', () => {
-        cy.get('[data-ouia-component-id="OUIA-Generated-TableRow-613"] > .pf-v5-c-table__action > .pf-v5-c-menu-toggle')
+    it('shows row actions', () => {
+        cy.get('.pf-v5-c-table__action > .pf-v5-c-menu-toggle')
             .should('exist');
     });
 
diff --git a/src/Components/SmartComponents/CVEs/CVEsTableToolbar.js b/src/Components/SmartComponents/CVEs/CVEsTableToolbar.js
index c2a1ce40f..680955935 100644
--- a/src/Components/SmartComponents/CVEs/CVEsTableToolbar.js
+++ b/src/Components/SmartComponents/CVEs/CVEsTableToolbar.js
@@ -96,7 +96,7 @@ const CVEsTableToolbarWithContext = ({ context, canEditStatusOrBusinessRisk, can
                     business_risk_id: attributes ? attributes.business_risk_id : business_risk_id,
                     justification: attributes ? attributes.business_risk_text : business_risk_text
                 })), true),
-                props: { isDisabled: !selectedCvesCount }
+                props: { isDisabled: !selectedCvesCount, ouiaId: 'edit-business-risk' }
             },
             {
                 label: intl.formatMessage(messages.editStatus),
@@ -112,7 +112,7 @@ const CVEsTableToolbarWithContext = ({ context, canEditStatusOrBusinessRisk, can
                     justification: attributes ? attributes.status_text : status_justification,
                     status_id: attributes ? attributes.status_id : status_id
                 }), []), true),
-                props: { isDisabled: !selectedCvesCount }
+                props: { isDisabled: !selectedCvesCount, ouiaId: 'edit-status' }
             }
         ] : [],
         {