diff --git a/functions/cdx/results.js b/functions/cdx/results.js
index 03a2496..9d9a673 100644
--- a/functions/cdx/results.js
+++ b/functions/cdx/results.js
@@ -24,7 +24,7 @@ export async function onRequestGet(context) {
         return Response.json({ ok: false, result: verificationResult.message })
     }
     const { searchParams } = new URL(request.url)
-    const take = parseInt(searchParams.get('take'), 10) || 25
+    const take = parseInt(searchParams.get('take'), 10) || 50
     const skip = parseInt(searchParams.get('skip'), 10) || 0
     const cdx = await prisma.CycloneDXInfo.findMany({
         where: {
diff --git a/functions/sarif/results.js b/functions/sarif/results.js
index 7ea4ec4..3bbbdf9 100644
--- a/functions/sarif/results.js
+++ b/functions/sarif/results.js
@@ -24,7 +24,7 @@ export async function onRequestGet(context) {
         return Response.json({ ok: false, result: verificationResult.message })
     }
     const { searchParams } = new URL(request.url)
-    const take = parseInt(searchParams.get('take'), 10) || 25
+    const take = parseInt(searchParams.get('take'), 10) || 50
     const skip = parseInt(searchParams.get('skip'), 10) || 0
     const sarif = await prisma.SARIFInfo.findMany({
         where: {
diff --git a/functions/spdx/results.js b/functions/spdx/results.js
index bec20ba..b04ef1b 100644
--- a/functions/spdx/results.js
+++ b/functions/spdx/results.js
@@ -24,25 +24,32 @@ export async function onRequestGet(context) {
         return Response.json({ ok: false, result: verificationResult.message })
     }
     const { searchParams } = new URL(request.url)
-    const take = parseInt(searchParams.get('take'), 10) || 25
+    const take = parseInt(searchParams.get('take'), 10) || 50
     const skip = parseInt(searchParams.get('skip'), 10) || 0
-    const spdx = await prisma.SPDXInfo.findMany({
+    let spdx = await prisma.SPDXInfo.findMany({
         where: {
             orgId: verificationResult.session.orgId,
         },
-        include: {
+        select: {
+            spdxId: true,
+            source: true,
+            repoName: true,
+            artifactUuid: true,
+            spdxVersion: true,
+            name: true,
+            createdAt: true,
+            toolName: true,
+            packagesCount: true,
             artifact: {
-                include: {
-                    downloadLinks: true
+                select: {
+                    downloadLinks: {
+                        select: {
+                            url: true,
+                        }
+                    }
                 }
             }
         },
-        omit: {
-            memberEmail: true,
-            comment: true,
-            documentNamespace: true,
-            documentDescribes: true,
-        },
         take,
         skip,
         orderBy: {
@@ -50,5 +57,29 @@ export async function onRequestGet(context) {
         },
     })
 
+    const repos = await prisma.gitRepo.findMany({
+        where: {
+            fullName: { in: spdx.map(s => s?.repoName).filter(s => !!s).filter((value, index, array) => array.indexOf(value) === index) },
+        },
+        select: {
+            avatarUrl: true,
+            fullName: true,
+        },
+    })
+    const repoMap = new Map(repos.map(repo => [repo.fullName, repo.avatarUrl]));
+
+    spdx = spdx.map(item => {
+        let updatedItem = { ...item }
+        if (item.repoName && repoMap.has(item.repoName)) {
+            updatedItem.avatarUrl = repoMap.get(item.repoName)
+        }
+        if (item.artifact && item.artifact.downloadLinks && item.artifact.downloadLinks.length) {
+            updatedItem.downloadLink = item.artifact.downloadLinks.pop().url
+        }
+        delete updatedItem.artifact
+
+        return updatedItem
+    })
+
     return Response.json({ ok: true, spdx })
 }
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 2858749..aad2d46 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -309,7 +309,7 @@ model Link {
   id           Int       @id @default(autoincrement())
   url          String
   contentType  String // OCI PLAIN_JSON OCTET_STREAM PLAIN_XML
-  Artifact     Artifact? @relation(fields: [artifactUuid], references: [uuid])
+  artifact     Artifact? @relation(fields: [artifactUuid], references: [uuid])
   artifactUuid String?
 }
 
diff --git a/src/pages/SARIFManager.vue b/src/pages/SARIFManager.vue
index 601f502..e34a85c 100644
--- a/src/pages/SARIFManager.vue
+++ b/src/pages/SARIFManager.vue
@@ -451,13 +451,13 @@ const controller = reactive(new Controller())
                                             </VTooltip>
                                             <VDialog
                                                 persistent
-                                                :activator="`#spdx${i}`"
+                                                :activator="`#sarif${i}`"
                                                 max-width="340"
                                             >
                                                 <template v-slot:default="{ isActive }">
                                                     <VCard
                                                         prepend-icon="weui:delete-on-filled"
-                                                        text="This will delete the SPDX Artifact permanantly, it cannot be undone."
+                                                        text="This will delete the SARIF Artifact permanantly, it cannot be undone."
                                                         title="Delete Artifact?"
                                                     >
                                                         <template v-slot:actions>
@@ -483,7 +483,7 @@ const controller = reactive(new Controller())
                                                 <template v-slot:activator="{ props }">
                                                     <VBtn
                                                         v-bind="props"
-                                                        :id="`spdx${i}`"
+                                                        :id="`sarif${i}`"
                                                         variant="plain"
                                                         icon="weui:delete-on-filled"
                                                         density="comfortable"
@@ -565,13 +565,13 @@ const controller = reactive(new Controller())
                                                 </VTooltip>
                                                 <VDialog
                                                     persistent
-                                                    :activator="`#spdx${k}`"
+                                                    :activator="`#sarif${k}`"
                                                     max-width="340"
                                                 >
                                                     <template v-slot:default="{ isActive }">
                                                         <VCard
                                                             prepend-icon="weui:delete-on-filled"
-                                                            text="This will delete the SPDX Artifact permanantly, it cannot be undone."
+                                                            text="This will delete the SARIF Artifact permanantly, it cannot be undone."
                                                             title="Delete Artifact?"
                                                         >
                                                             <template v-slot:actions>
@@ -597,7 +597,7 @@ const controller = reactive(new Controller())
                                                     <template v-slot:activator="{ props }">
                                                         <VBtn
                                                             v-bind="props"
-                                                            :id="`spdx${k}`"
+                                                            :id="`sarif${k}`"
                                                             variant="plain"
                                                             icon="weui:delete-on-filled"
                                                             density="comfortable"
diff --git a/src/pages/SPDXManager.vue b/src/pages/SPDXManager.vue
index 808f09b..e931702 100644
--- a/src/pages/SPDXManager.vue
+++ b/src/pages/SPDXManager.vue
@@ -159,8 +159,8 @@ function groupedByOrg() {
 
         if (!group) {
             group = {
-                orgName: orgName,
-                avatarUrl: spdx?.repo?.avatarUrl,
+                orgName,
+                avatarUrl: spdx?.avatarUrl,
                 spdx: []
             };
             acc.push(group)
@@ -169,7 +169,14 @@ function groupedByOrg() {
         return acc
     }, [])
 }
-
+function downloadArtifact(record, event) {
+    console.log(record)
+    event.preventDefault()
+}
+function deleteArtifact(record, isActive) {
+    console.log(record)
+    isActive.value = false
+}
 const controller = reactive(new Controller())
 </script>
 
@@ -333,13 +340,103 @@ const controller = reactive(new Controller())
                         v-for="(group, k) in groupedByOrg()"
                         :key="k"
                     >
-                        <VExpansionPanelTitle class="text-subtitle-1">
-                            <img
-                                :src="group.avatarUrl"
-                                width="25"
-                                class="me-3"
-                            >{{ group.orgName }} ({{ group.spdx.length }}
-                            results)
+                        <VExpansionPanelTitle
+                            v-slot="{ expanded }"
+                            class="text-subtitle-1"
+                            v-if="group.spdx.length"
+                        >
+                            <VRow no-gutters>
+                                <VCol
+                                    class="d-flex justify-start"
+                                    cols="10"
+                                >
+                                    <img
+                                        :src="group.avatarUrl"
+                                        width="25"
+                                        height="25"
+                                        class="me-3"
+                                    >
+                                    <span>{{ group.orgName }}&nbsp;
+                                        <span v-if="!expanded">({{ group.spdx.length }} results)</span>
+                                    </span>
+                                </VCol>
+                                <VCol
+                                    class="text--secondary"
+                                    cols="2"
+                                >
+                                    <VFadeTransition leave-absolute>
+                                        <VRow
+                                            style="width: 100%"
+                                            no-gutters
+                                        >
+                                            <VCol
+                                                class="d-flex justify-end"
+                                                cols="12"
+                                            >
+                                                <VTooltip
+                                                    text="Download"
+                                                    location="left"
+                                                >
+                                                    <template v-slot:activator="{ props }">
+                                                        <VBtn
+                                                            v-bind="props"
+                                                            variant="plain"
+                                                            icon="line-md:cloud-alt-download-filled-loop"
+                                                            density="comfortable"
+                                                            color="secondary"
+                                                            @click="downloadArtifact(group.spdx, $event)"
+                                                        >
+                                                        </VBtn>
+                                                    </template>
+                                                </VTooltip>
+                                                <VDialog
+                                                    persistent
+                                                    :activator="`#spdx${k}`"
+                                                    max-width="340"
+                                                >
+                                                    <template v-slot:default="{ isActive }">
+                                                        <VCard
+                                                            prepend-icon="weui:delete-on-filled"
+                                                            text="This will delete the SPDX Artifact permanantly, it cannot be undone."
+                                                            title="Delete Artifact?"
+                                                        >
+                                                            <template v-slot:actions>
+                                                                <VBtn
+                                                                    class="ml-auto"
+                                                                    text="Close"
+                                                                    @click="isActive.value = false"
+                                                                ></VBtn>
+                                                                <VBtn
+                                                                    color="error"
+                                                                    variant="tonal"
+                                                                    text="Delete"
+                                                                    @click="deleteArtifact(group.spdx, isActive)"
+                                                                ></VBtn>
+                                                            </template>
+                                                        </VCard>
+                                                    </template>
+                                                </VDialog>
+                                                <VTooltip
+                                                    text="Delete"
+                                                    location="left"
+                                                >
+                                                    <template v-slot:activator="{ props }">
+                                                        <VBtn
+                                                            v-bind="props"
+                                                            :id="`spdx${k}`"
+                                                            variant="plain"
+                                                            icon="weui:delete-on-filled"
+                                                            density="comfortable"
+                                                            color="error"
+                                                        >
+                                                        </VBtn>
+                                                    </template>
+                                                </VTooltip>
+                                            </VCol>
+                                        </VRow>
+                                    </VFadeTransition>
+                                </VCol>
+                            </VRow>
                         </VExpansionPanelTitle>
                         <VExpansionPanelText>
                             <VSkeletonLoader
@@ -473,6 +570,8 @@ const controller = reactive(new Controller())
                             <th>
                                 Created Date
                             </th>
+                            <th>
+                            </th>
                         </tr>
                     </thead>
 
@@ -524,6 +623,67 @@ const controller = reactive(new Controller())
                                     </template>
                                 </VTooltip>
                             </td>
+                            <td>
+                                <VTooltip
+                                    text="Download"
+                                    location="left"
+                                >
+                                    <template v-slot:activator="{ props }">
+                                        <VBtn
+                                            v-bind="props"
+                                            variant="plain"
+                                            icon="line-md:cloud-alt-download-filled-loop"
+                                            density="comfortable"
+                                            color="secondary"
+                                            @click="downloadArtifact(result, $event)"
+                                        >
+                                        </VBtn>
+                                    </template>
+                                </VTooltip>
+                                <VDialog
+                                    persistent
+                                    :activator="`#spdx${i}`"
+                                    max-width="340"
+                                >
+                                    <template v-slot:default="{ isActive }">
+                                        <VCard
+                                            prepend-icon="weui:delete-on-filled"
+                                            text="This will delete the SPDX Artifact permanantly, it cannot be undone."
+                                            title="Delete Artifact?"
+                                        >
+                                            <template v-slot:actions>
+                                                <VBtn
+                                                    class="ml-auto"
+                                                    text="Close"
+                                                    @click="isActive.value = false"
+                                                ></VBtn>
+                                                <VBtn
+                                                    color="error"
+                                                    variant="tonal"
+                                                    text="Delete"
+                                                    @click="deleteArtifact(result, isActive)"
+                                                ></VBtn>
+                                            </template>
+                                        </VCard>
+                                    </template>
+                                </VDialog>
+                                <VTooltip
+                                    text="Delete"
+                                    location="left"
+                                >
+                                    <template v-slot:activator="{ props }">
+                                        <VBtn
+                                            v-bind="props"
+                                            :id="`spdx${i}`"
+                                            variant="plain"
+                                            icon="weui:delete-on-filled"
+                                            density="comfortable"
+                                            color="error"
+                                        >
+                                        </VBtn>
+                                    </template>
+                                </VTooltip>
+                            </td>
                         </tr>
                     </tbody>
                 </VTable>