diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/common/BarChart.vue b/pkg/sbombastic-image-vulnerability-scanner/components/common/BarChart.vue
index f0ed57b..c5530d7 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/components/common/BarChart.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/components/common/BarChart.vue
@@ -6,8 +6,8 @@
     </div>
     <div class="severity-chart">
       <div v-for="(value, key) in chartData" :key="key" class="severity-item">
-        <div class="severity-item-name">{{ t(`imageScanner.enum.${ colorPrefix }.${ key }`) }}</div>
-        <PercentageBar class="severity-item-bar" :colorStops="{0: `--${colorPrefix}-${ key }`}" :value="percentage(value)" :height="7"/>
+        <div class="severity-item-name">{{ t(`imageScanner.enum.${ colorPrefix }.${ key.toLowerCase() }`) }}</div>
+        <PercentageBar class="severity-item-bar" :colorStops="{0: `--${ colorPrefix }-${ key.toLowerCase() }`}" :value="percentage(value)" :height="7"/>
         <div class="severity-item-value"> {{ value }}</div>
       </div>
     </div>
@@ -38,7 +38,7 @@ export default {
   },
   methods: {
     percentage(value) {
-      return (value / this.total) * 100;
+      return this.total > 0 ? (value / this.total) * 100 : 0;
     }
   },
   computed: {
@@ -128,8 +128,8 @@ export default {
 
     --status-pending: #DCDEE7;
     --status-scheduled: #0FCFF0;
-    --status-in_progress: #3D98D3;
-    --status-completed: #5BB04F;
+    --status-inprogress: #3D98D3;
+    --status-complete: #5BB04F;
     --status-failed: #DE2136;
   }
 </style>
\ No newline at end of file
diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/common/RegisterStatusBadge.vue b/pkg/sbombastic-image-vulnerability-scanner/components/common/RegisterStatusBadge.vue
index 2f5fcbf..0cdcc0e 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/components/common/RegisterStatusBadge.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/components/common/RegisterStatusBadge.vue
@@ -22,10 +22,10 @@
                 return "pending";
             case REGISTRY_STATUS.SCHEDULED:
                 return "scheduled";
-            case REGISTRY_STATUS.IN_PPROGRESS:
+            case REGISTRY_STATUS.IN_PROGRESS:
                 return "in-progress";
-            case REGISTRY_STATUS.COMPLETED:
-                return "completed";
+            case REGISTRY_STATUS.COMPLETE:
+                return "complete";
             case REGISTRY_STATUS.FAILED:
                 return "failed";
             default:
@@ -60,7 +60,7 @@
       color: #1C577D;
     }
 
-    &.completed {
+    &.complete {
       background: #DEEFDC;
       color: #376930;
     }
diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/common/RegistryStatusUpdate.vue b/pkg/sbombastic-image-vulnerability-scanner/components/common/RegistryStatusUpdate.vue
index 25be85a..5e49238 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/components/common/RegistryStatusUpdate.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/components/common/RegistryStatusUpdate.vue
@@ -1,17 +1,24 @@
 <template>
-    <div class="registry-status-record">
-        <div class="scan-name">{{ registryStatus.scan_name }}</div>
+    <div v-if="registryStatus.scan_name" class="registry-status-record">
+        <RouterLink class="scan-name" :to="`/c/${this.$route.params.cluster}/${ this.PRODUCT_NAME }/${ this.PAGE.REGISTRIES }/${ registryStatus.namespace }/${ registryStatus.scan_name }`">{{ registryStatus.scan_name }}</RouterLink>
         <div class="registry-name">{{ registryStatus.registry_name }}</div>
         <div class="prev-status"><RegisterStatusBadge :status="registryStatus.prev_status"/></div>
         <div class="arrow"></div>
         <div  class="curr-status"><RegisterStatusBadge :status="registryStatus.curr_status"/></div>
         <div class="update-time">{{ `${updateTime(registryStatus.last_update_time)} ${t("imageScanner.general.ago")}`}}</div>
     </div>
+    <div v-else class="registry-status-record">
+        <div class="no-data"></div>
+    </div>
 </template>
 
 <script>
   import RegisterStatusBadge from "./RegisterStatusBadge";
   import { elapsedTime } from "@shell/utils/time";
+  import {
+    PRODUCT_NAME,
+    PAGE,
+  } from "@sbombastic-image-vulnerability-scanner/types";
   export default {
     name: 'registryStatusUpdate',
     components: {
@@ -23,15 +30,31 @@
             required: true
         }
     },
+    data() {
+      return {
+        PRODUCT_NAME,
+        PAGE,
+     };
+    },
     methods: {
         updateTime(lastUpdateTime) {
-            return  elapsedTime(Date.now() / 1000 - lastUpdateTime).label;
+            return  elapsedTime(Date.now() / 1000 - new Date(lastUpdateTime).getTime() / 1000).label;
         }
     }
   }
 </script>
 
 <style lang="scss" scoped>
+    .no-data {
+        color: #6C6C76;
+        font-family: Lato;
+        font-size: 14px;
+        font-style: normal;
+        font-weight: 400;
+        line-height: 21px;
+        min-height: 21px;
+        width: 100%;
+    }
     .registry-status-record {
         display: flex;
         padding: 4px 0px;
@@ -52,7 +75,10 @@
             line-height: 21px;
         }
         .registry-name {
-            flex: 12;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 1;
+            flex: 10;
             overflow: hidden;
             color: #141419;
             text-overflow: ellipsis;
diff --git a/pkg/sbombastic-image-vulnerability-scanner/config/sbombastic-image-vulnerability-scanner.ts b/pkg/sbombastic-image-vulnerability-scanner/config/sbombastic-image-vulnerability-scanner.ts
index b6da066..4a245a1 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/config/sbombastic-image-vulnerability-scanner.ts
+++ b/pkg/sbombastic-image-vulnerability-scanner/config/sbombastic-image-vulnerability-scanner.ts
@@ -68,7 +68,6 @@ export function init($plugin: IPlugin, store: any) {
         PAGE.REGISTRIES,
         PAGE.IMAGE_OVERVIEW,
         PAGE.VULNERABILITY_OVERVIEW,
-        "demo"
     ]);
 
 }
\ No newline at end of file
diff --git a/pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts b/pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts
index 9aa7778..0bd9940 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts
+++ b/pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts
@@ -4,12 +4,13 @@ export const REGISTRY_SCAN_TABLE =[
         name:          "scan",
         labelKey:      "imageScanner.registries.registrytable.header.scan",
         value:         'metadata.name',
+        formatter:     "ScanNameCell",
         sort:          "scan",
     },
     {
         name:          "registry",
         labelKey:      "imageScanner.registries.registrytable.header.registry",
-        value:         "id",
+        value:         "registry.id",
         sort:          "id",
     },
     {
@@ -21,8 +22,8 @@ export const REGISTRY_SCAN_TABLE =[
     {
         name:          "repositories",
         labelKey:      "imageScanner.registries.registrytable.header.repos",
-        value:         "spec.repositories",
-        sort:          "spec.repositories",
+        value:         "registry.spec.repositories",
+        sort:          "registry.spec.repositories",
     },
     {
         name:          "schedule",
@@ -32,25 +33,25 @@ export const REGISTRY_SCAN_TABLE =[
         sort:          "schedule",
     },
     {
-        name:          "_status",
+        name:          "status",
         labelKey:      "imageScanner.registries.registrytable.header.status",
-        value:         "_status",
-        getValue:      (row: any) => row._status,
-        formatter:     "RegisterStatusCellBadge",
-        sort:          "_status",
+        value:         "registry.status.conditions.0.type",
+        formatter:     "RegistryStatusCellBadge",
+        sort:          "registry.status.conditions.0.type",
     },
     {
         name:          "_progress",
         labelKey:      "imageScanner.registries.registrytable.header.progress",
         value:         "progress",
         getValue:      (row: any) => row.progress.toString(),
-        formatter:     "Percentage",
+        formatter:     "ProgressCell",
         sort:          "progress",
     },
     {
         name:          "previousScan",
         labelKey:      "imageScanner.registries.registrytable.header.prevScan",
-        value:         "",
-        sort:          "previousScan",
+        value:         "status.conditions.1.type",
+        formatter:     "PreviousScanCell",
+        sort:          "status.conditions.1.type",
     },
 ];
\ No newline at end of file
diff --git a/pkg/sbombastic-image-vulnerability-scanner/formatters/PreviousScanCell.vue b/pkg/sbombastic-image-vulnerability-scanner/formatters/PreviousScanCell.vue
new file mode 100644
index 0000000..a7c8521
--- /dev/null
+++ b/pkg/sbombastic-image-vulnerability-scanner/formatters/PreviousScanCell.vue
@@ -0,0 +1,93 @@
+<script>
+import ProgressCell from "@sbombastic-image-vulnerability-scanner/formatters/ProgressCell";
+export default {
+  props: {
+    value: {
+      type:    String,
+      required: true
+    },
+    row: {
+      type: Object,
+      required: true
+    }
+  },
+  methods: {
+    getStatusStyle(row) {
+      if (row && row.status && row.status.conditions && row.status.conditions.length > 1) {
+        return { color: 'var(--text-secondary)' };
+      } else {
+        return { color: 'var(--text-muted)' };
+      }
+    },
+    getStatusText(row) {
+      if (row && row.status && row.status.conditions && row.status.conditions.length > 1) {
+        return this.t(`imageScanner.enum.status.${row.status.conditions[1].type.toLowerCase()}`);
+      } else {
+        return this.t('imageScanner.enum.status.none');
+      }
+    }
+  }
+};
+</script>
+
+<template>
+    <div class="previous-scan-cell">
+        <div class="dot" :class="row.status.conditions[1].type.toLowerCase()"></div>
+        <div class="status" :style="getStatusStyle(row)">{{ getStatusText(row) }}</div>  
+        <div v-if="row.status.conditions[1].progress">
+          <ProgressCell :status="row.status.conditions[1]" />
+        </div>
+    </div>
+</template>
+
+<style lang="scss" scoped>
+    .previous-scan-cell {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        color: var(--text-secondary);
+        font-size: 14px;
+        .status {
+            font-size: 14px;
+        }
+        .dot {
+            width: 8px;
+            height: 8px;
+            border-radius: 50%;
+            border-width: 1px;
+            border-style: solid;
+            display: inline-block; 
+            &.pending {
+                background-color: var(--status-pending);
+                border-color: var(--status-pending);
+            }
+            &.scheduled {
+                background-color: var(--status-scheduled);
+                border-color: var(--status-scheduled);
+            }
+            &.inprogress {
+                background-color: var(--status-inprogress);
+                border-color: var(--status-inprogress);
+            }
+            &.complete {
+                background-color: var(--status-complete);
+                border-color: var(--status-complete);
+            }
+            &.failed {
+                background-color: var(--status-failed);
+                border-color: var(--status-failed);
+            }
+            &.none {
+                background-color: var(--status-none);
+                border-color: #DCDEE4;
+            }
+
+            --status-pending: #DCDEE7;
+            --status-scheduled: #0FCFF0;
+            --status-inprogress: #3D98D3;
+            --status-complete: #5BB04F;
+            --status-failed: #DE2136;
+            --status-none: #FFFFFF;
+        }
+    }
+</style>
diff --git a/pkg/sbombastic-image-vulnerability-scanner/formatters/ProgressCell.vue b/pkg/sbombastic-image-vulnerability-scanner/formatters/ProgressCell.vue
new file mode 100644
index 0000000..16b9d26
--- /dev/null
+++ b/pkg/sbombastic-image-vulnerability-scanner/formatters/ProgressCell.vue
@@ -0,0 +1,28 @@
+<script>
+export default {
+  props: {
+    value: {
+      type: Object,
+      required: true
+    }
+  }
+};
+</script>
+<template>
+  <div class="progress-cell">
+    <span v-if="value.progress" class="progress-text">{{ value.progress }}% | <span v-if="value.errors">{{ value.errors }}</span></span>
+    <span v-else class="progress-text text-muted">n/a</span>
+  </div>
+</template>
+<style lang="scss" scoped>
+.progress-cell {
+  display: flex;
+  align-items: center;
+  font-size: 14px;
+  color: var(--text-secondary);
+  
+  .progress-text {
+    margin-left: 8px;
+  }
+}
+</style> 
\ No newline at end of file
diff --git a/pkg/sbombastic-image-vulnerability-scanner/formatters/RegistryStatusCellBadge.vue b/pkg/sbombastic-image-vulnerability-scanner/formatters/RegistryStatusCellBadge.vue
index 743229a..cb1c1c2 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/formatters/RegistryStatusCellBadge.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/formatters/RegistryStatusCellBadge.vue
@@ -14,5 +14,5 @@ export default {
 </script>
 
 <template>
-  <RegisterStatusBadge :status="value" />
+  <RegisterStatusBadge :status="value.toLowerCase()" />
 </template>
diff --git a/pkg/sbombastic-image-vulnerability-scanner/formatters/ScanNameCell.vue b/pkg/sbombastic-image-vulnerability-scanner/formatters/ScanNameCell.vue
new file mode 100644
index 0000000..58fe7f6
--- /dev/null
+++ b/pkg/sbombastic-image-vulnerability-scanner/formatters/ScanNameCell.vue
@@ -0,0 +1,25 @@
+<template>
+  <RouterLink :to="`/c/${this.$route.params.cluster}/${ this.PRODUCT_NAME }/${ this.PAGE.REGISTRIES }/${ row.metadata.namespace }/${ row.metadata.name }`">
+    {{ row.metadata.name }}
+  </RouterLink>
+</template>
+<script>
+import {
+    PRODUCT_NAME,
+    PAGE,
+} from "@sbombastic-image-vulnerability-scanner/types";
+export default {
+  props: {
+    row: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      PRODUCT_NAME,
+      PAGE,
+    };
+  },
+};
+</script>
\ No newline at end of file
diff --git a/pkg/sbombastic-image-vulnerability-scanner/l10n/en-us.yaml b/pkg/sbombastic-image-vulnerability-scanner/l10n/en-us.yaml
index 8be6b3d..d98504c 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/l10n/en-us.yaml
+++ b/pkg/sbombastic-image-vulnerability-scanner/l10n/en-us.yaml
@@ -11,13 +11,13 @@ imageScanner:
       subTitle: registry scans
     registrytable:
       header:
-        scan: scan
+        scan: Scan
         registry: Registry
-        namespace: namespace
-        repos: repositories
+        namespace: Namespace
+        repos: Repositories
         schedule: Scheduled
         status: Status
-        progress: progress
+        progress: Progress
         prevScan: Previous scan
     configuration:
       scan: Start Scan
@@ -55,11 +55,17 @@ imageScanner:
       low: Low
       none: None
     status:
-      pending: pending
+      pending: Pending
       scheduled: Scheduled
-      in_progress: In progress
-      completed: completed
+      inprogress: In progress
+      complete: Complete
       failed: Failed
+    prevScan:
+      none: n/a
+      scheduled: Scheduled
+      inprogress: In progress
+      complete: Finished at
+      failed: Failed at
   general:
     refresh: Refresh data
     ago: ago
diff --git a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Registries.vue b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Registries.vue
index eef1e0c..e3c6fae 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Registries.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/Registries.vue
@@ -14,7 +14,6 @@
             class="btn role-secondary"
             aria-label="Refresh data"
             type="button"
-            :disabled="disabled"
             @click="refresh()">
             <em class="icon-refresh-ss"></em>{{ t('imageScanner.registries.button.refresh') }}
           </button>
@@ -25,7 +24,6 @@
             class="btn role-primary"
             aria-label="Add new"
             type="button"
-            :disabled="disabled"
             @click="openAddEditRegistry()">
             <em class="icon-add"></em>{{ t('imageScanner.registries.button.addNew') }}
           </button>
@@ -40,14 +38,11 @@
       :schema="schema"
       :rows="rows"
       :namespaced="false"
+      :groupable="false"
+      :hasAdvancedFiltering="true"
       :headers="headers"
       :use-query-params-for-simple-filtering="true"
     />
-    <p v-for="row of rows">
-      <RouterLink :to="`/c/${this.$route.params.cluster}/${ this.PRODUCT_NAME }/registries/${ row.id }`">
-        {{ row.id }}
-      </RouterLink>
-    </p>
   </div>
 </template>
 
@@ -74,49 +69,14 @@
       return {
         content: ref("Registries"),
         PRODUCT_NAME: PRODUCT_NAME,
-        registryStatusList: [
-          {
-            scan_name: "prod repo",
-            registry_name: "https://registry.hub.com",
-            prev_status: "in_progress",
-            curr_status: "completed",
-            last_update_time: 1752491022
-          },
-           {
-            scan_name: "cfl-ctf",
-            registry_name: "https://registry.docker.com",
-            prev_status: "pending",
-            curr_status: "in_progress",
-            last_update_time: 1752735822
-          },
-           {
-            scan_name: "fed.kubewarden",
-            registry_name: "https://registry.hub.docker.com",
-            prev_status: "in_progress",
-            curr_status: "failed",
-            last_update_time: 1752840334
-          },
-           {
-            scan_name: "fed.onlinebutique",
-            registry_name: "https://registry.hub.com",
-            prev_status: "in_progress",
-            curr_status: "scheduled",
-            last_update_time: 1750262909
-          },
-           {
-            scan_name: "sys reg",
-            registry_name: "https://reg.docker..com",
-            prev_status: "scheduled",
-            curr_status: "in_progress",
-            last_update_time: 1745525244
-          },
-        ],
+        rows: [],
+        registryStatusList: [],
         statusSummary: {
-          pending: 39,
-          scheduled: 8,
-          in_progress: 46,
-          completed: 187,
-          failed: 35
+          scheduled: 0,
+          pending: 0,
+          inprogress: 0,
+          complete: 0,
+          failed: 0
         },
         headers: REGISTRY_SCAN_TABLE,
       }
@@ -124,55 +84,63 @@
 
     async fetch() {
       await this.$store.dispatch('cluster/findAll', { type: RESOURCE.REGISTRY });
+      let registriesCRD = this.$store.getters['cluster/all'](RESOURCE.REGISTRY);
+
+      let registryMap = {};
+      registriesCRD.forEach((rec) => {
+        rec.status.conditions[0].type = rec.status.conditions[0].type.toLowerCase() === "discovering" ? "InProgress" : rec.status.conditions[0].type;
+        registryMap[rec.id] = rec;
+      });
+
       if (this.$store.getters['cluster/canList'](RESOURCE.SCAN_JOB)) {
-        this.$store.dispatch('cluster/findAll', { type: RESOURCE.SCAN_JOB });
+        await this.$store.dispatch('cluster/findAll', { type: RESOURCE.SCAN_JOB });
+      }
+
+      let scanJobCRD = this.$store.getters['cluster/all'](RESOURCE.SCAN_JOB);
+
+      this.rows = scanJobCRD.map((rec) => {
+        const key = `${rec.metadata.namespace}/${rec.spec.registry}`;
+        const reg = registryMap[key];
+
+        if (rec.spec && rec.spec.registry && reg) {
+          rec.registry = reg;
+          const status = rec.status.conditions?.[0]?.type?.toLowerCase();
+          const prevStatus = rec.status.conditions?.[1]?.type?.toLowerCase();
+          this.registryStatusList.push({
+            scan_name: rec.metadata.name,
+            registry_name: reg.id,
+            namespace: rec.metadata.namespace,
+            prev_status: prevStatus,
+            curr_status: status,
+            last_update_time: rec.status.conditions?.[0]?.lastUpdateTime
+          });
+
+          if (status && this.statusSummary.hasOwnProperty(status)) {
+            this.statusSummary[status]++;
+          }
+        }
+        return rec;
+      });
+
+      this.registryStatusList.sort((a, b) => new Date(b.last_update_time) - new Date(a.last_update_time)).slice(0, 5)
+      while (this.registryStatusList.length < 5) {
+        this.registryStatusList.push({
+          scan_name: "",
+          registry_name: "",
+          prev_status: "",
+          curr_status: "",
+          last_update_time: new Date().toISOString()
+        });
       }
     },
     methods: {
       refresh() {},
-      openAddEditRegistry() {}
+      openAddEditRegistry() {},
     },
     computed: {
-      rows() {
-        let registriesCRD = this.$store.getters['cluster/all'](RESOURCE.REGISTRY);
-        //Make mock data for UI test
-        registriesCRD = registriesCRD.map((rec, index) => {
-          if (index === 0) {
-            rec.schedule = 3;
-            rec._status = "failed";
-            rec.errors = [
-              {
-                message: "Not enough resources to complete the scan. Could not connect to proxyu",
-              },
-            ];
-            rec.progress = 35;
-            rec.previous = {
-              _status: "scheduled",
-              errors: [],
-              progress: 0
-            };
-          } else {
-            rec.schedule = 29;
-            rec._status = "completed";
-            rec.errors = [];
-            rec.progress = 100;
-            rec.previous = {
-              _status: "Failed",
-              errors: [
-                {
-                  message: "Not enough resources to complete the scan. Could not connect to proxyu",
-                },
-              ],
-              progress: 49
-            };
-          }
-          return rec;
-        });
-        return registriesCRD;
-      },
       schema() {
-        return this.$store.getters['cluster/schemaFor'](RESOURCE.REGISTRY);
-      }
+        return this.$store.getters['cluster/schemaFor'](RESOURCE.SCAN_JOB);
+      },
     }
   }
 
diff --git a/pkg/sbombastic-image-vulnerability-scanner/types/registry.ts b/pkg/sbombastic-image-vulnerability-scanner/types/registry.ts
index c87654e..cab4170 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/types/registry.ts
+++ b/pkg/sbombastic-image-vulnerability-scanner/types/registry.ts
@@ -1,7 +1,7 @@
 export const REGISTRY_STATUS = {
     PENDING: "pending",
     SCHEDULED: "scheduled",
-    IN_PPROGRESS: "in_progress",
-    COMPLETED: "completed",
+    IN_PROGRESS: "inprogress",
+    COMPLETE: "complete",
     FAILED: "failed",
 };
\ No newline at end of file