diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/CveDetails.vue b/pkg/sbombastic-image-vulnerability-scanner/components/CveDetails.vue
index 5e66464..dc6afc4 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/components/CveDetails.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/components/CveDetails.vue
@@ -317,7 +317,7 @@ export default {
     font-family: Lato;
     font-size: 24px;
     font-style: normal;
-    font-weight: 600;
+    font-weight: 400;
   }
 
   .filter-dropdown {
@@ -474,7 +474,7 @@ export default {
 
 .severity-badge {
   font-size: 14px;
-  font-weight: 500;
+  font-weight: 400;
 }
 
 .critical-severity {
diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/ImageDetails.vue b/pkg/sbombastic-image-vulnerability-scanner/components/ImageDetails.vue
index 020484b..f0be922 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/components/ImageDetails.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/components/ImageDetails.vue
@@ -99,7 +99,7 @@
             class="row"
           >
             <div class="col span-4">
-              <RouterLink>
+              <RouterLink :to="`/c/${this.$route.params.cluster}/${ this.PRODUCT_NAME }/${this.PAGE.VULNERABILITIES}/${vuln.cveId}`">
                 {{ vuln.cveId }}
               </RouterLink>
             </div>
@@ -217,6 +217,7 @@
       :namespaced="false"
       :row-actions="false"
       :search="true"
+      :key-field="'cveId'"
       @selection="onSelectionChange"
     >
       <template #header-left>
@@ -559,20 +560,20 @@ export default {
   align-items: center;
   gap: 12px;
   font-size: 24px;
-  font-weight: 600;
+  font-weight: 400;
   color: #141419;
   .resource-header-name {
     font-family: Lato;
     font-size: 24px;
     font-style: normal;
-    font-weight: 600;
+    font-weight: 400;
     line-height: 32px; /* 133.333% */
   }
 }
 
 .severity-badge {
   font-size: 14px;
-  font-weight: 500;
+  font-weight: 400;
 }
 
 .critical-severity {
@@ -599,13 +600,13 @@ export default {
 
 .label {
   color: #6C6C76;
-  font-weight: 500;
+  font-weight: 400;
   font-size: 14px;
 }
 
 .value {
   color: #141419;
-  font-weight: 500;
+  font-weight: 400;
   font-size: 14px;
 }
 
@@ -620,7 +621,7 @@ export default {
 .show-properties-link a {
   color: #007cba;
   text-decoration: none;
-  font-weight: 500;
+  font-weight: 400;
   font-size: 14px;
 }
 
@@ -691,7 +692,7 @@ export default {
   font-family: Lato;
   font-size: 18px;
   font-style: normal;
-  font-weight: 600;
+  font-weight: 400;
   line-height: 21px;
   margin-bottom: 8px;
 }
@@ -699,7 +700,7 @@ export default {
 .vulnerabilities-list {
   display: flex;
   flex-direction: column;
-  gap: 4px;
+  gap: 8px;
   width: 100%;
 }
 
@@ -709,8 +710,8 @@ export default {
 }
 
 .vulnerabilities-list .col {
-  padding: 8px 16px;
-  min-height: 32px;
+  padding: 0 16px;
+  min-height: 24px;
 }
 
 .cve-id {
@@ -737,7 +738,7 @@ export default {
 .score {
   color: #6C6C76;
   font-size: 13px;
-  font-weight: 500;
+  font-weight: 400;
   background: #E9ECEF;
   padding: 4px 8px;
   border-radius: 4px;
@@ -745,7 +746,7 @@ export default {
 
 .package {
   color: #141419;
-  font-weight: 500;
+  font-weight: 400;
 }
 
 .fix-status {
@@ -836,7 +837,7 @@ export default {
 }
 
 .selected-count {
-  font-weight: 500;
+  font-weight: 400;
   color: #6C6C76;
 }
 
diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/ImageRiskAssessment.vue b/pkg/sbombastic-image-vulnerability-scanner/components/ImageRiskAssessment.vue
index d373b14..3bf2856 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/components/ImageRiskAssessment.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/components/ImageRiskAssessment.vue
@@ -44,7 +44,7 @@
             font-family: Lato;
             font-size: 18px;
             font-style: normal;
-            font-weight: 600;
+            font-weight: 400;
             line-height: 21px; /* 116.667% */
         }
         .severity-bar-chart {
diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/RecentUpdatedRegistries.vue b/pkg/sbombastic-image-vulnerability-scanner/components/RecentUpdatedRegistries.vue
index 72103ef..bbdfa37 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/components/RecentUpdatedRegistries.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/components/RecentUpdatedRegistries.vue
@@ -41,7 +41,7 @@
             font-family: Lato;
             font-size: 18px;
             font-style: normal;
-            font-weight: 600;
+            font-weight: 400;
             line-height: 21px; /* 116.667% */
         }
         .status-list {
diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/RegistryDetails.vue b/pkg/sbombastic-image-vulnerability-scanner/components/RegistryDetails.vue
index c1d635a..491bf10 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/components/RegistryDetails.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/components/RegistryDetails.vue
@@ -203,7 +203,7 @@
             font-family: Lato;
             font-size: 24px;
             font-style: normal;
-            font-weight: 600;
+            font-weight: 400;
             line-height: 32px; /* 133.333% */
           }
         }
diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/StatusDistribution.vue b/pkg/sbombastic-image-vulnerability-scanner/components/StatusDistribution.vue
index ac87f58..865d3a5 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/components/StatusDistribution.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/components/StatusDistribution.vue
@@ -44,7 +44,7 @@
             font-family: Lato;
             font-size: 18px;
             font-style: normal;
-            font-weight: 600;
+            font-weight: 400;
             line-height: 21px; /* 116.667% */
         }
         .severity-bar-chart {
diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/TopRiskyImagesChart.vue b/pkg/sbombastic-image-vulnerability-scanner/components/TopRiskyImagesChart.vue
index 36aace7..0c33ca3 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/components/TopRiskyImagesChart.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/components/TopRiskyImagesChart.vue
@@ -51,7 +51,7 @@
         font-family: Lato;
         font-size: 18px;
         font-style: normal;
-        font-weight: 600;
+        font-weight: 400;
         line-height: 21px; /* 116.667% */
     }
     .image-record {
diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/TopSevereVulnerabilitiesChart.vue b/pkg/sbombastic-image-vulnerability-scanner/components/TopSevereVulnerabilitiesChart.vue
index 7a8aa49..c415ee0 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/components/TopSevereVulnerabilitiesChart.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/components/TopSevereVulnerabilitiesChart.vue
@@ -44,7 +44,7 @@
       font-family: Lato;
       font-size: 18px;
       font-style: normal;
-      font-weight: 600;
+      font-weight: 400;
       line-height: 21px; /* 116.667% */
     }
     .vulnerability-list {
diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/common/AmountBarBySeverity.vue b/pkg/sbombastic-image-vulnerability-scanner/components/common/AmountBarBySeverity.vue
index f8857ae..662ed25 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/components/common/AmountBarBySeverity.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/components/common/AmountBarBySeverity.vue
@@ -79,7 +79,7 @@
       font-family: Lato;
       font-size: 13px;
       font-style: normal;
-      font-weight: 500;
+      font-weight: 400;
       line-height: 20px; /* 153.846% */
     }
     .badge.critical {
diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/common/ScoreBadge.vue b/pkg/sbombastic-image-vulnerability-scanner/components/common/ScoreBadge.vue
index 6bcb635..bdf6d99 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/components/common/ScoreBadge.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/components/common/ScoreBadge.vue
@@ -72,7 +72,7 @@
       font-family: Lato;
       font-size: 13px;
       font-style: normal;
-      font-weight: 500;
+      font-weight: 400;
       line-height: 24px; /* 153.846% */
       &.na {
         color: #717179;
diff --git a/pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts b/pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts
index 4df293e..70ddae3 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts
+++ b/pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts
@@ -157,7 +157,7 @@ export const IMAGE_LIST_TABLE = [
     labelKey: "imageScanner.images.listTable.headers.identifiedCVEs",
     value: "spec.scanResult",
     formatter: "IdentifiedCVEsCell",
-    sort: "spec.scanResult",
+    sort: ["spec.scanResult.critical", "spec.scanResult.high", "spec.scanResult.medium", "spec.scanResult.low", "spec.scanResult.none"],
     width: 300,
   },
   {
@@ -278,7 +278,7 @@ export const VULNERABILITY_DETAILS_TABLE = [
     name: "cveId",
     labelKey: "imageScanner.imageDetails.table.headers.cveId",
     value: "cveId",
-    formatter: "CveIdCell",
+    formatter: "CveNameLink",
     sort: "cveId",
     width: 150,
   },
diff --git a/pkg/sbombastic-image-vulnerability-scanner/edit/sbombastic.rancher.io.registry.vue b/pkg/sbombastic-image-vulnerability-scanner/edit/sbombastic.rancher.io.registry.vue
index d168a45..a287884 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/edit/sbombastic.rancher.io.registry.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/edit/sbombastic.rancher.io.registry.vue
@@ -222,7 +222,7 @@ export default {
   margin-bottom: 16px;
   font-size: 16px;
   line-height: 20px;
-  font-weight: 500;
+  font-weight: 400;
   font-family: 'Lato', sans-serif;
   color: #141419;
   display: block;
diff --git a/pkg/sbombastic-image-vulnerability-scanner/formatters/CveIdCell.vue b/pkg/sbombastic-image-vulnerability-scanner/formatters/CveIdCell.vue
deleted file mode 100644
index 4564288..0000000
--- a/pkg/sbombastic-image-vulnerability-scanner/formatters/CveIdCell.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-    <RouterLink>
-      {{ row.cveId }}
-    </RouterLink>
-</template>
-
-<script>
-export default {
-  name: 'CveIdCell',
-  props: {
-    row: {
-      type: Object,
-      required: true
-    }
-  }
-};
-</script>
-
-<style scoped>
-.cve-link {
-  color: #007cba;
-  text-decoration: none;
-  font-weight: 500;
-}
-</style> 
\ No newline at end of file
diff --git a/pkg/sbombastic-image-vulnerability-scanner/formatters/ScoreCell.vue b/pkg/sbombastic-image-vulnerability-scanner/formatters/ScoreCell.vue
index 9b33251..ce01602 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/formatters/ScoreCell.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/formatters/ScoreCell.vue
@@ -34,7 +34,7 @@ export default {
   padding: 4px 8px;
   border-radius: 4px;
   font-size: 12px;
-  font-weight: 500;
+  font-weight: 400;
   width: 100%;
   height: 24px;
   text-align: center;
diff --git a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Dashboard.vue b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Dashboard.vue
index 364e158..0e2c35f 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Dashboard.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Dashboard.vue
@@ -521,7 +521,7 @@ export default {
     font-family: Lato;
     font-size: 24px;
     font-style: normal;
-    font-weight: 600;
+    font-weight: 400;
     line-height: 32px; /* 133.333% */
 
     .description {
@@ -572,7 +572,7 @@ export default {
         margin: 0;
         color: #141419;
         font-size: 18px;
-        font-weight: 600;
+        font-weight: 400;
         line-height: 24px;
       }
     }
@@ -592,7 +592,7 @@ export default {
       color: #007cbb;
       cursor: pointer;
       font-size: 14px;
-      font-weight: 500;
+      font-weight: 400;
       text-decoration: none;
 
       &:hover {
@@ -620,7 +620,7 @@ export default {
       color: #141419;
       cursor: pointer;
       font-size: 14px;
-      font-weight: 500;
+      font-weight: 400;
       text-decoration: underline;
 
       &:hover {
@@ -668,7 +668,7 @@ export default {
           .severity-label {
             min-width: 60px;
             font-size: 14px;
-            font-weight: 500;
+            font-weight: 400;
             color: #141419;
           }
 
@@ -696,7 +696,7 @@ export default {
             min-width: 40px;
             text-align: right;
             font-size: 14px;
-            font-weight: 600;
+            font-weight: 400;
             color: #141419;
           }
         }
@@ -770,7 +770,7 @@ export default {
 
         .vuln-id {
           font-size: 14px;
-          font-weight: 600;
+          font-weight: 400;
           color: #141419;
           min-width: 120px;
         }
@@ -779,7 +779,7 @@ export default {
           padding: 4px 8px;
           border-radius: 0px;
           font-size: 12px;
-          font-weight: 600;
+          font-weight: 400;
           min-width: 60px;
           text-align: center;
 
@@ -809,7 +809,7 @@ export default {
           min-width: 40px;
           text-align: right;
           font-size: 14px;
-          font-weight: 600;
+          font-weight: 400;
           color: #141419;
         }
       }
@@ -842,7 +842,7 @@ export default {
 
         .image-name {
           font-size: 14px;
-          font-weight: 500;
+          font-weight: 400;
           color: #5696ce;
           min-width: 200px;
           flex: 1;
@@ -856,7 +856,7 @@ export default {
             padding: 4px 8px;
             border-radius: 0px;
             font-size: 12px;
-            font-weight: 600;
+            font-weight: 400;
             min-width: 24px;
             text-align: center;
 
diff --git a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/ImageOverview.vue b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/ImageOverview.vue
index fd9045a..f931f60 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/ImageOverview.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/ImageOverview.vue
@@ -308,7 +308,7 @@ import { filter } from "lodash";
       font-family: Lato;
       font-size: 24px;
       font-style: normal;
-      font-weight: 600;
+      font-weight: 400;
       line-height: 32px; /* 133.333% */
     }
     .filter-dropdown {
diff --git a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/RegistriesConfiguration.vue b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/RegistriesConfiguration.vue
index b8e1986..ca61c35 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/RegistriesConfiguration.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/RegistriesConfiguration.vue
@@ -138,10 +138,13 @@
         this.loadData(true);
       },
       filterByStatus(status) {
-        console.log("filter by status", status);
-        this.rows = this.rows.filter(row => row.status === status);
-        this.registryStatusList = this.registryStatusList.filter(item => item.status === status);
-        this.statusSummary = this.statusSummary[status] || {};
+        const el = document.querySelector(
+          'input[type="search"][placeholder="Filter"][aria-label="Filter table results"]'
+        );
+        el.value = status;
+
+        el.dispatchEvent(new Event('input', { bubbles: true }));
+        el.dispatchEvent(new KeyboardEvent('keyup', { bubbles: true, key: 'a' }));
       },
       openAddEditRegistry() {
         this.$router.push({
@@ -206,7 +209,7 @@
         });
         return scanJobMap;
       },
-      getRegistryDataset(registriesCRD, scanJobMap) {
+      getRegistryDataset(registriesCRD, scanJobMap ) {
         let registryStatusList = [];
         const statusSummary = {
           pending: 0,
@@ -350,7 +353,7 @@
         font-family: Lato;
         font-size: 24px;
         font-style: normal;
-        font-weight: 600;
+        font-weight: 400;
         line-height: 32px; /* 133.333% */
       }
       .state {
@@ -379,7 +382,7 @@
           font-family: Lato;
           font-size: 14px;
           font-style: normal;
-          font-weight: 600;
+          font-weight: 400;
           line-height: 21px;
         }
       }
diff --git a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/VexManagement.vue b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/VexManagement.vue
index 9b203db..f0211e4 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/VexManagement.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/VexManagement.vue
@@ -87,7 +87,7 @@ export default {
       font-family: Lato;
       font-size: 24px;
       font-style: normal;
-      font-weight: 600;
+      font-weight: 400;
       line-height: 32px;
     }
   }
diff --git a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Vulnerabilities.vue b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Vulnerabilities.vue
index 4b5f45e..b9fbea0 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Vulnerabilities.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Vulnerabilities.vue
@@ -136,7 +136,7 @@
       font-family: Lato;
       font-size: 24px;
       font-style: normal;
-      font-weight: 600;
+      font-weight: 400;
       line-height: 32px; /* 133.333% */
     }