diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/common/VexStatusBadge.vue b/pkg/sbombastic-image-vulnerability-scanner/components/common/VexStatusBadge.vue
index 7c43be7..61a6267 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/components/common/VexStatusBadge.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/components/common/VexStatusBadge.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="badge" :class="statusClass">
-    <div v-if="status" class="text">{{ t(`imageScanner.enum.status.${status.toLowerCase()}`) }}</div>
+    <div class="text">{{ t(`imageScanner.enum.status.${enabled? 'enabled' : 'disabled'}`) }}</div>
   </div>
   
 </template>
@@ -10,21 +10,13 @@ import { VEX_STATUS } from "@sbombastic-image-vulnerability-scanner/types";
 export default {
   name: 'VexStatusBadge',
   props: {
-    status: {
-      type: String,
-      default: ''
+    enabled: {
+      type: Boolean
     }
   },
   computed: {
     statusClass() {
-      switch ((this.status || '').toLowerCase()) {
-      case VEX_STATUS.ENABLED:
-        return 'enabled';
-      case VEX_STATUS.DISABLED:
-        return 'disabled';
-      default:
-        return '';
-      }
+      return this.enabled ? VEX_STATUS.ENABLED: VEX_STATUS.DISABLED;
     }
   }
 };
diff --git a/pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts b/pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts
index bccfd58..6a1e79a 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts
+++ b/pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts
@@ -110,40 +110,38 @@ export const REGISTRY_SCAN_HISTORY_TABLE = [
 ];
 
 export const VEX_MANAGEMENT_TABLE = [
-  {
-    name: "_status",
-    labelKey: "imageScanner.vexManagement.table.headers.status",
-    value: "_status",
-    getValue: (row: any) => row._status,
-    formatter: "VexStatusCellBadge",
-    sort: "_status",
-  },
-  {
-    name: "name",
-    labelKey: "imageScanner.vexManagement.table.headers.name",
-    value: "name",
-    formatter: "VexNameLink",
-    sort: "name",
-  },
-  {
-    name: "uri",
-    labelKey: "imageScanner.vexManagement.table.headers.uri",
-    value: "uri",
-    formatter: "UriExternalLink",
-    sort: "uri",
-  },
-  {
-    name: "createdBy",
-    labelKey: "imageScanner.vexManagement.table.headers.createdBy",
-    value: "createdBy",
-    sort: "createdBy",
-  },
-  {
-    name: "updated",
-    labelKey: "imageScanner.vexManagement.table.headers.updated",
-    value: "updated",
-    getValue: (row: any) => row.updated,
-    formatter: "VexDateFormatter",
-    sort: "updated",
-  },
+    {
+        name:          "_status",
+        labelKey:      "imageScanner.vexManagement.table.headers.status",
+        value:         "spec.enabled",
+        formatter:     "VexStatusCellBadge",
+        sort:          "spec.enabled",
+    },
+    {
+        name:          "name",
+        labelKey:      "imageScanner.vexManagement.table.headers.name",
+        value:         "metadata.name",
+        formatter:     "VexNameLink",
+        sort:          "metadata.name",
+    },
+    {
+        name:          "uri",
+        labelKey:      "imageScanner.vexManagement.table.headers.uri",
+        value:         "spec.url",
+        formatter:     "UriExternalLink",
+        sort:          "spec.url",
+    },
+    {
+        name:          "createdBy",
+        labelKey:      "imageScanner.vexManagement.table.headers.createdBy",
+        value:         (row: any) => row?.metadata?.generation === 1 ? 'Rancher' : 'Manual entry',
+        sort:          "metadata.generation",
+    },
+    {
+        name:          "updated",
+        labelKey:      "imageScanner.vexManagement.table.headers.updated",
+        value:      (row: any) => row?.metadata?.creationTimestamp || '',
+        formatter:     "VexDateFormatter",
+        sort:          "metadata.creationTimestamp",
+    }
 ];
diff --git a/pkg/sbombastic-image-vulnerability-scanner/formatters/VexStatusCellBadge.vue b/pkg/sbombastic-image-vulnerability-scanner/formatters/VexStatusCellBadge.vue
index e119ca2..b65516c 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/formatters/VexStatusCellBadge.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/formatters/VexStatusCellBadge.vue
@@ -6,7 +6,7 @@ export default {
   },
   props: {
     value: {
-      type:    String,
+      type:    Boolean,
       required: true
     },
   },
@@ -14,5 +14,5 @@ export default {
 </script>
 
 <template>
-  <VexStatusBadge :status="value.toLowerCase()" />
+  <VexStatusBadge :enabled="value" />
 </template>
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 ef3146c..41e2849 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
@@ -31,36 +31,7 @@
       :table-actions="true"
       :use-query-params-for-simple-filtering="true"
       :force-update-live-and-delayed="forceUpdateKey"
-      @selection="onSelectionChange"
     >
-      <template #header-left>
-        <div class="bulk-actions">
-          <button
-            class="btn role-primary"
-            :disabled="!hasDisabledSelected"
-            @click="enableSelected()"
-          >
-            <i class="icon icon-play"></i>
-            {{ t('imageScanner.vexManagement.buttons.enable') || 'Enable' }}
-          </button>
-          <button
-            class="btn role-primary"
-            :disabled="!hasEnabledSelected"
-            @click="disableSelected()"
-          >
-            <i class="icon icon-pause"></i>
-            {{ t('imageScanner.vexManagement.buttons.disable') || 'Disable' }}
-          </button>
-          <button
-            class="btn role-primary"
-            :disabled="!(selectedRows && selectedRows.length)"
-            @click="deleteSelected()"
-          >
-            <i class="icon icon-delete"></i>
-            {{ t('imageScanner.vexManagement.buttons.delete') || 'Delete' }}
-          </button>
-        </div>
-      </template>
     </ResourceTable>
   </div>
 </template>
@@ -68,6 +39,7 @@
 <script>
 import { RESOURCE } from "@sbombastic-image-vulnerability-scanner/types";
 import ResourceTable from "@shell/components/ResourceTable";
+import RegisterStatusBadge from "@sbombastic-image-vulnerability-scanner/components/common/RegisterStatusBadge";
 import { VEX_MANAGEMENT_TABLE } from "@sbombastic-image-vulnerability-scanner/config/table-headers";
 import {
   PRODUCT_NAME,
@@ -76,7 +48,8 @@ import {
 export default {
   name: 'VexManagement',
   components: {
-    ResourceTable
+    ResourceTable,
+    RegisterStatusBadge,
   },
   data() {
     return {
@@ -89,221 +62,59 @@ export default {
       forceUpdateKey: 0
     }
   },
-
   async fetch() {
     await this.$store.dispatch('cluster/findAll', { type: RESOURCE.VEX_HUB });
     let vexhubsCRD = this.$store.getters['cluster/all']?.(RESOURCE.VEX_HUB);
-
-    // Use mock data if no real CRs yet; fallback directly to mock data (no store wiring)
-    if (Object.keys(vexhubsCRD).length === 0) {
-      const apiBase = '/v1/sbombastic.rancher.io.vexhubs';
-      vexhubsCRD = [
-        {
-          id: 'aqua-security-vex-hub',
-          type: 'sbombastic.rancher.io.vexhub',
-          metadata: { name: 'aqua-security-vex-hub', creationTimestamp: '2025-01-29T23:07:00Z' },
-          spec: { enabled: false, url: 'https://github.com/aquasecurity/vexhub' },
-          links: { self: `${apiBase}/aqua-security-vex-hub`, update: `${apiBase}/aqua-security-vex-hub`, remove: `${apiBase}/aqua-security-vex-hub`, view: `${apiBase}/aqua-security-vex-hub` }
-        },
-        {
-          id: 'example-vex-hub',
-          type: 'sbombastic.rancher.io.vexhub',
-          metadata: { name: 'example-vex-hub', creationTimestamp: '2024-11-04T17:29:00Z' },
-          spec: { enabled: true, url: 'https://example.com/vex-hub/v0' },
-          links: { self: `${apiBase}/example-vex-hub`, update: `${apiBase}/example-vex-hub`, remove: `${apiBase}/example-vex-hub`, view: `${apiBase}/example-vex-hub` }
-        },
-        {
-          id: 'rancher-vex-hub',
-          type: 'sbombastic.rancher.io.vexhub',
-          metadata: { name: 'rancher-vex-hub', creationTimestamp: '2025-04-07T06:15:00Z' },
-          spec: { enabled: true, url: 'https://github.com/rancher/vexhub' },
-          links: { self: `${apiBase}/rancher-vex-hub`, update: `${apiBase}/rancher-vex-hub`, remove: `${apiBase}/rancher-vex-hub`, view: `${apiBase}/rancher-vex-hub` }
-        },
-        {
-          id: 'vex-hub-api',
-          type: 'sbombastic.rancher.io.vexhub',
-          metadata: { name: 'vex-hub-api', creationTimestamp: '2025-01-02T04:00:00Z' },
-          spec: { enabled: true, url: 'https://example.com/vex-api' },
-          links: { self: `${apiBase}/vex-hub-api`, update: `${apiBase}/vex-hub-api`, remove: `${apiBase}/vex-hub-api`, view: `${apiBase}/vex-hub-api` }
-        },
-        {
-          id: 'vex-hub-central',
-          type: 'sbombastic.rancher.io.vexhub',
-          metadata: { name: 'vex-hub-central', creationTimestamp: '2024-10-20T20:37:00Z' },
-          spec: { enabled: true, url: 'https://vexhub.io' },
-          links: { self: `${apiBase}/vex-hub-central`, update: `${apiBase}/vex-hub-central`, remove: `${apiBase}/vex-hub-central`, view: `${apiBase}/vex-hub-central` }
-        }
-      ];
-    }
-
-    this.rows = vexhubsCRD.map((rec) => {
-      const isSteveModel = !!rec?.availableActions || !!rec?.links;
-
-      const id = rec.id || rec?.metadata?.name;
-      const name = rec?.metadata?.name || rec.name || id;
-      const uri = rec?.spec?.url || rec.uri || '';
-      const enabled = typeof rec?.spec?.enabled === 'boolean' ? rec.spec.enabled : (rec._status === 'enabled');
-      const createdBy = /rancher/i.test(name) || /rancher/i.test(uri) ? 'Rancher' : 'Manual entry';
-      const updated = rec?.metadata?.creationTimestamp || rec.updated || new Date().toISOString();
-
-      if (isSteveModel) {
-        // Augment the existing Steve model instance in-place to preserve prototype & actions
-        rec.id = id || name;
-        rec.name = name;
-        rec.uri = uri;
-        rec._status = enabled ? 'enabled' : 'disabled';
-        rec.createdBy = createdBy;
-        rec.updated = updated;
-        if (!rec.availableActions || rec.availableActions.length === 0) {
-          rec.availableActions = this.buildRowActions(enabled);
-        }
-        return rec;
-      }
-
-      // Fallback: non-Steve mock object
-      return {
-        ...rec,
-        id: id || name,
-        name,
-        uri,
-        _status: enabled ? 'enabled' : 'disabled',
-        createdBy,
-        updated,
-        availableActions: this.buildRowActions(enabled)
-      };
-    });
+    this.rows = (vexhubsCRD || []).map((r) => this.rowWithActions(r));
   },
-  
   methods: {
-    createVexHub() {
-      console.log('Creating new VEX hub...');
-    },
-    onSelectionChange(selected) {
-      this.selectedRows = selected || [];
-    },
-    enableSelected(selected) {
-      const ids = (selected || this.selectedRows || []).map(r => r.id);
-      if (!ids.length) return;
-      this.rows.forEach(r => {
-        if (ids.includes(r.id)) {
-          r._status = 'enabled';
-          if (r.spec) { r.spec.enabled = true; }
-          r.updated = new Date().toISOString();
-          r.availableActions = this.buildRowActions(true);
-        }
-      });
+    rowWithActions(r) {
+      const isEnabled = !!r?.spec?.enabled;
+      const toggleAction = isEnabled
+        ? { action: 'disable', label: this.t('imageScanner.vexManagement.buttons.disable') || 'Disable', icon: 'icon-pause', enabled: true, bulkable: true, invoke: ({}, resources) => this.switchStatus(false, resources) }
+        : { action: 'enable',  label: this.t('imageScanner.vexManagement.buttons.enable')  || 'Enable',  icon: 'icon-play',  enabled: true, bulkable: true, invoke: ({}, resources) => this.switchStatus(true, resources) };
 
-      this.forceUpdateKey++;
-    },
-    disableSelected(selected) {
-      const ids = (selected || this.selectedRows || []).map(r => r.id);
-      if (!ids.length) return;
-      this.rows.forEach(r => {
-        if (ids.includes(r.id)) {
-          r._status = 'disabled';
-          if (r.spec) { r.spec.enabled = false; }
-          r.updated = new Date().toISOString();
-          r.availableActions = this.buildRowActions(false);
-        }
-      });
-
-      this.forceUpdateKey++;
-    },
-    buildRowActions(isEnabled) {
-      return [
-        {
-          action:   'enable',
-          label:    this.t('imageScanner.vexManagement.buttons.enable') || 'Enable',
-          icon:     'icon-play',
-          enabled:  !isEnabled,
-          bulkable: true,
-          invoke:   ({}, resources) => { this.enableSelected(resources); }
-        },
-        {
-          action:   'disable',
-          label:    this.t('imageScanner.vexManagement.buttons.disable') || 'Disable',
-          icon:     'icon-pause',
-          enabled:  !!isEnabled,
-          bulkable: true,
-          invoke:   ({}, resources) => { this.disableSelected(resources); }
-        },
-        {
-          action:   'clone',
-          label:    this.t('imageScanner.vexManagement.actions.clone') || 'Clone',
-          icon:     'icon-copy',
-          enabled:  true,
-          bulkable: false,
-          invoke:   ({}, resources = []) => {
-            const now = new Date().toISOString();
-            resources.forEach((r) => {
-              const baseId = r.id || r.name;
-              let newId = `${ baseId }-copy`;
-              let counter = 1;
-              while (this.rows.find(x => x.id === newId)) {
-                newId = `${ baseId }-copy-${ counter++ }`;
-              }
-              this.rows.push({
-                ...r,
-                id: newId,
-                name: r.name || baseId,
-                updated: now
-              });
-            });
-            this.forceUpdateKey++;
-          }
-        },
-        {
-          action:   'edit',
+      const actions = Array.isArray(r.availableActions) ? r.availableActions.filter(a => !['download','downloadYaml'].includes(a.action)): [];
+    
+      if (isEnabled && !actions.find(a => a && (a.action === 'edit' || a.action === 'goToEdit'))) {
+        const editAction = {
+          action:   'goToEdit',
           label:    this.t('imageScanner.vexManagement.actions.editConfig') || 'Edit configuration',
           icon:     'icon-edit',
           enabled:  true,
           bulkable: false,
-          invoke:   ({}, resources = []) => {
-            // Placeholder: wire to real edit route when CRD edit is available
-            console.debug('Edit configuration requested for', resources.map(r => r.id));
+          invoke:   ({}, res = []) => {
+            const target = (res && res.length ? res[0] : r);
+            const model = target._model || target;
+            if (model && typeof model.goToEdit === 'function') {
+              model.goToEdit();
+            }
           }
-        },
-        {
-          action:   'viewYaml',
-          label:    this.t('imageScanner.vexManagement.actions.editYaml') || 'Edit YAML',
-          icon:     'icon-file',
-          enabled:  true,
-          bulkable: false,
-          invoke:   ({}, resources = []) => {
-            // Placeholder: open YAML editor when available
-            console.debug('Edit YAML requested for', resources.map(r => r.id));
-          }
-        },
-        {
-          action:   'promptRemove',
-          label:    this.t('imageScanner.vexManagement.buttons.delete') || 'Delete',
-          icon:     'icon-delete',
-          enabled:  true,
-          bulkable: true,
-          invoke:   ({}, resources) => { this.deleteSelected(resources); }
-        }
-      ];
-    },
-    deleteSelected(selected) {
-      const ids = (selected || this.selectedRows || []).map(r => r.id);
-      if (!ids.length) return;
-      this.rows = this.rows.filter(r => !ids.includes(r.id));
-      if (this.$refs.rt) {
-        this.$refs.rt.clearSelection();
+        };
+        actions.unshift(editAction);
       }
-      this.selectedRows = [];
-      this.forceUpdateKey++;
+      const deleteAction = actions.find(a => a.action === 'promptRemove');
+
+      const availableActions = isEnabled
+        ? [toggleAction, ...actions]
+        : [toggleAction, deleteAction]; // when disabled show only Enable + Delete
+
+      return { ...r, _model: r, availableActions };
+    },
+    async switchStatus(desired, selected) {
+      const resources = selected && selected.length ? selected : (this.selectedRows || []);
+      if (!resources.length) return;
+      const models = resources.map((r) => r._model || r).filter(Boolean);
+      await Promise.all(models.map(async (m) => {
+        m.spec = { ...(m.spec || {}), enabled: desired };
+        await m.save();
+      }));
+      await this.$fetch();
     }
   },
   computed: {
     schema() {
       return this.$store.getters['cluster/schemaFor']?.(RESOURCE.VEX_HUB);
-    },
-    hasEnabledSelected() {
-      return this.selectedRows.some(row => row._status === 'enabled');
-    },
-    hasDisabledSelected() {
-      return this.selectedRows.some(row => row._status === 'disabled');
     }
   }
 }