diff --git a/Dockerfile b/Dockerfile
index 16da64c3..d8c6c910 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.11
-FROM node:current-alpine AS builder
+FROM node:lts-alpine AS builder
 
 WORKDIR /veritable-ui
 
@@ -32,20 +32,18 @@ ENV NODE_ENV=${NODE_ENV}
 
 RUN npx playwright install --with-deps
 
-
 CMD ["npm", "run", "test:playwright"]
 
-
-# service
-FROM node:current-alpine AS service
+# Service
+FROM node:lts-alpine AS service
 
 WORKDIR /veritable-ui
 
-RUN apk add --update coreutils curl 
+RUN apk add --no-cache coreutils curl
 RUN npm -g install npm@10.x.x
 
 COPY package*.json ./
-RUN npm ci --omit-dev
+RUN npm ci --omit=dev
 
 COPY public ./public
 COPY knexfile.js ./
diff --git a/package-lock.json b/package-lock.json
index 2807d98c..0f3e3523 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "veritable-ui",
-  "version": "0.14.17",
+  "version": "0.14.19",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "veritable-ui",
-      "version": "0.14.17",
+      "version": "0.14.19",
       "license": "Apache-2.0",
       "dependencies": {
         "@digicatapult/tsoa-oauth-express": "^0.1.69",
diff --git a/package.json b/package.json
index cfb1f607..4278a800 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "veritable-ui",
-  "version": "0.14.17",
+  "version": "0.14.19",
   "description": "UI for Veritable",
   "main": "src/index.ts",
   "type": "module",
diff --git a/public/styles/shared.css b/public/styles/shared.css
index 91fab54b..c96bc9e9 100644
--- a/public/styles/shared.css
+++ b/public/styles/shared.css
@@ -154,7 +154,9 @@
   background-repeat: no-repeat;
   background-position: center;
 }
-
+#connection-search-input {
+  min-width: 210px;
+}
 .search-window {
   border-color: var(--text-color-sub);
   border-radius: 5px;
diff --git a/src/controllers/credentials/__tests__/index.test.ts b/src/controllers/credentials/__tests__/index.test.ts
index 941cd339..6f51e1a7 100644
--- a/src/controllers/credentials/__tests__/index.test.ts
+++ b/src/controllers/credentials/__tests__/index.test.ts
@@ -23,7 +23,7 @@ describe('CredentialsController', () => {
       const result = await controller.listCredentials(req).then(toHTMLString)
 
       expect(result).to.equal(
-        'listCredentials_issuer-done-DIGITAL CATAPULT-Supplier credentials-holder-done-DIGITAL CATAPULT-Supplier credentials-issuer-done-CARE ONUS LTD-Supplier credentials-holder-done-CARE ONUS LTD-Supplier credentials_listCredentials'
+        'listCredentials_issuer-done-DIGITAL CATAPULT-Supplier credential-holder-done-DIGITAL CATAPULT-Supplier credential-issuer-done-CARE ONUS LTD-Supplier credential-holder-done-CARE ONUS LTD-Supplier credential_listCredentials'
       )
     })
 
@@ -103,7 +103,7 @@ describe('CredentialsController', () => {
       const res = await controller.listCredentials(req, '').then(toHTMLString)
 
       expect(res).to.equal(
-        'listCredentials_issuer-done-CARE ONUS LTD-Supplier credentials-holder-done-CARE ONUS LTD-Supplier credentials_listCredentials'
+        'listCredentials_issuer-done-CARE ONUS LTD-Supplier credential-holder-done-CARE ONUS LTD-Supplier credential_listCredentials'
       )
     })
 
@@ -114,7 +114,7 @@ describe('CredentialsController', () => {
       const res = await controller.listCredentials(req, '').then(toHTMLString)
 
       expect(res).to.equal(
-        'listCredentials_issuer-done-DIGITAL CATAPULT-Supplier credentials-holder-done-DIGITAL CATAPULT-Supplier credentials_listCredentials'
+        'listCredentials_issuer-done-DIGITAL CATAPULT-Supplier credential-holder-done-DIGITAL CATAPULT-Supplier credential_listCredentials'
       )
     })
   })
diff --git a/src/controllers/credentials/index.ts b/src/controllers/credentials/index.ts
index 5547cce6..1d10a526 100644
--- a/src/controllers/credentials/index.ts
+++ b/src/controllers/credentials/index.ts
@@ -56,7 +56,7 @@ export class CredentialsController extends HTMLController {
 
     const result = {
       companyName: connection.company_name,
-      type: 'Supplier credentials' as const,
+      type: 'Supplier credential' as const,
       ...credential,
     }
     req.log.debug('Credential found %s: %j', credential.id, result)
diff --git a/src/views/connection/__tests__/connection.test.ts.snap b/src/views/connection/__tests__/connection.test.ts.snap
index 871e7ef9..8edfc742 100644
--- a/src/views/connection/__tests__/connection.test.ts.snap
+++ b/src/views/connection/__tests__/connection.test.ts.snap
@@ -1,9 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ConnectionTemplates listPage should escape html in name 1`] = `"<!DOCTYPE html><html lang=\\"en\\"><head><script src=\\"/lib/htmx.org/htmx.min.js\\"></script><script src=\\"/lib/htmx-ext-json-enc/json-enc.js\\"></script><script src=\\"/public/scripts/auth-redirect.js\\"></script><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon-dark.ico\\" media=\\"(prefers-color-scheme: dark)\\"/><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon.ico\\" media=\\"(prefers-color-scheme: light), (prefers-color-scheme: no-preference)\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/main.css\\"/><title>Veritable - Connections</title></head><body hx-ext=\\"json-enc\\"><nav id=\\"side-bar\\"><a id=\\"veritable-logo\\" href=\\"/about\\"></a><div class=\\"profile-icon\\" style=\\"background-color:#38b6ff;\\">A</div><a title=\\"categories\\" href=\\"/\\" style=\\"--background-image:url('/public/images/category.svg');\\"></a><a title=\\"connections\\" href=\\"/connection\\" data-active style=\\"--background-image:url('/public/images/connection.svg');\\"></a><a title=\\"queries\\" href=\\"/queries\\" style=\\"--background-image:url('/public/images/query.svg');\\"></a><a title=\\"credentials\\" href=\\"/credentials\\" style=\\"--background-image:url('/public/images/credential.svg');\\"></a><a title=\\"settings\\" href=\\"/settings\\" style=\\"--background-image:url('/public/images/setting.svg');\\"></a></nav><main><div id=\\"content-header\\"><h1>Connections</h1><div id=\\"content-header-nav\\"><a title=\\"home\\" class=\\"nav icon\\" href=\\"/\\"></a><a title=\\"Connections\\" href=\\"#\\">Connections</a></div></div><div id=\\"content-main\\" hx-get=\\"/connection\\" hx-trigger=\\"every 10s\\" hx-select=\\"#search-results\\" hx-target=\\"#search-results\\" hx-swap=\\"outerHTML\\" hx-include=\\"#connection-search-input\\"><div class=\\"list-page-header\\"><span>Connections Summary</span><a class=\\"button \\" href=\\"connection/new\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>Invite New Connection</span></a><a class=\\"button \\" href=\\"connection/new?fromInvite=true\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>Add from Invitation</span></a></div><div class=\\"list-page\\"><div class=\\"list-nav\\"><span>Connections</span><input id=\\"connection-search-input\\" class=\\"search-window\\" type=\\"search\\" name=\\"search\\" value=\\"\\" placeholder=\\"Search by Company Name\\" hx-get=\\"/connection\\" hx-trigger=\\"input changed delay:500ms, search\\" hx-target=\\"#search-results\\" hx-select=\\"#search-results\\" hx-swap=\\"outerHTML\\"/></div><table class=\\"list-page\\"><thead><th><span>Company Name</span><a class=\\"list-filter-icon disabled\\"></a></th><th><span>Status</span><a class=\\"list-filter-icon disabled\\"></a></th><th><span>Actions</span><a class=\\"list-filter-icon disabled\\"></a></th></thead><tbody id=\\"search-results\\"><tr><td>&lt;div>I own you&lt;/div></td><td><div class=\\"list-item-status\\" data-status=\\"success\\">Connected</div></td><td><a class=\\"button \\" href=\\"/queries/new/scope-3-carbon-consumption?connectionId=someId\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/arrow-right-circle.svg&#34;);\\"></div><span>Send Query</span></a></td></tr></tbody></table></div></div></main></body></html>"`;
+exports[`ConnectionTemplates listPage should escape html in name 1`] = `"<!DOCTYPE html><html lang=\\"en\\"><head><script src=\\"/lib/htmx.org/htmx.min.js\\"></script><script src=\\"/lib/htmx-ext-json-enc/json-enc.js\\"></script><script src=\\"/public/scripts/auth-redirect.js\\"></script><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon-dark.ico\\" media=\\"(prefers-color-scheme: dark)\\"/><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon.ico\\" media=\\"(prefers-color-scheme: light), (prefers-color-scheme: no-preference)\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/main.css\\"/><title>Veritable - Connections</title></head><body hx-ext=\\"json-enc\\"><nav id=\\"side-bar\\"><a id=\\"veritable-logo\\" href=\\"/about\\"></a><div class=\\"profile-icon\\" style=\\"background-color:#38b6ff;\\">A</div><a title=\\"categories\\" href=\\"/\\" style=\\"--background-image:url('/public/images/category.svg');\\"></a><a title=\\"connections\\" href=\\"/connection\\" data-active style=\\"--background-image:url('/public/images/connection.svg');\\"></a><a title=\\"queries\\" href=\\"/queries\\" style=\\"--background-image:url('/public/images/query.svg');\\"></a><a title=\\"credentials\\" href=\\"/credentials\\" style=\\"--background-image:url('/public/images/credential.svg');\\"></a><a title=\\"settings\\" href=\\"/settings\\" style=\\"--background-image:url('/public/images/setting.svg');\\"></a></nav><main><div id=\\"content-header\\"><h1>Connections</h1><div id=\\"content-header-nav\\"><a title=\\"home\\" class=\\"nav icon\\" href=\\"/\\"></a><a title=\\"Connection Management\\" href=\\"#\\">Connection Management</a></div></div><div id=\\"content-main\\" hx-get=\\"/connection\\" hx-trigger=\\"every 10s\\" hx-select=\\"#search-results\\" hx-target=\\"#search-results\\" hx-swap=\\"outerHTML\\" hx-include=\\"#connection-search-input\\"><div class=\\"list-page-header\\"><span>Connection Management</span><a class=\\"button \\" href=\\"connection/new\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>Invite New Connection</span></a><a class=\\"button \\" href=\\"connection/new?fromInvite=true\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>Add from Invitation</span></a></div><div class=\\"list-page\\"><div class=\\"list-nav\\"><span>Connections</span><input id=\\"connection-search-input\\" class=\\"search-window\\" type=\\"search\\" name=\\"search\\" value=\\"\\" placeholder=\\"Search by Company Name\\" hx-get=\\"/connection\\" hx-trigger=\\"input changed delay:500ms, search\\" hx-target=\\"#search-results\\" hx-select=\\"#search-results\\" hx-swap=\\"outerHTML\\"/></div><table class=\\"list-page\\"><thead><th><span>Company Name</span><a class=\\"list-filter-icon disabled\\"></a></th><th><span>Status</span><a class=\\"list-filter-icon disabled\\"></a></th><th><span>Actions</span><a class=\\"list-filter-icon disabled\\"></a></th></thead><tbody id=\\"search-results\\"><tr><td>&lt;div>I own you&lt;/div></td><td><div class=\\"list-item-status\\" data-status=\\"success\\">Connected</div></td><td><a class=\\"button \\" href=\\"/queries/new/scope-3-carbon-consumption?connectionId=someId\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/arrow-right-circle.svg&#34;);\\"></div><span>Send Query</span></a></td></tr></tbody></table></div></div></main></body></html>"`;
 
-exports[`ConnectionTemplates listPage should render multiple with each status 1`] = `"<!DOCTYPE html><html lang=\\"en\\"><head><script src=\\"/lib/htmx.org/htmx.min.js\\"></script><script src=\\"/lib/htmx-ext-json-enc/json-enc.js\\"></script><script src=\\"/public/scripts/auth-redirect.js\\"></script><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon-dark.ico\\" media=\\"(prefers-color-scheme: dark)\\"/><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon.ico\\" media=\\"(prefers-color-scheme: light), (prefers-color-scheme: no-preference)\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/main.css\\"/><title>Veritable - Connections</title></head><body hx-ext=\\"json-enc\\"><nav id=\\"side-bar\\"><a id=\\"veritable-logo\\" href=\\"/about\\"></a><div class=\\"profile-icon\\" style=\\"background-color:#38b6ff;\\">A</div><a title=\\"categories\\" href=\\"/\\" style=\\"--background-image:url('/public/images/category.svg');\\"></a><a title=\\"connections\\" href=\\"/connection\\" data-active style=\\"--background-image:url('/public/images/connection.svg');\\"></a><a title=\\"queries\\" href=\\"/queries\\" style=\\"--background-image:url('/public/images/query.svg');\\"></a><a title=\\"credentials\\" href=\\"/credentials\\" style=\\"--background-image:url('/public/images/credential.svg');\\"></a><a title=\\"settings\\" href=\\"/settings\\" style=\\"--background-image:url('/public/images/setting.svg');\\"></a></nav><main><div id=\\"content-header\\"><h1>Connections</h1><div id=\\"content-header-nav\\"><a title=\\"home\\" class=\\"nav icon\\" href=\\"/\\"></a><a title=\\"Connections\\" href=\\"#\\">Connections</a></div></div><div id=\\"content-main\\" hx-get=\\"/connection\\" hx-trigger=\\"every 10s\\" hx-select=\\"#search-results\\" hx-target=\\"#search-results\\" hx-swap=\\"outerHTML\\" hx-include=\\"#connection-search-input\\"><div class=\\"list-page-header\\"><span>Connections Summary</span><a class=\\"button \\" href=\\"connection/new\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>Invite New Connection</span></a><a class=\\"button \\" href=\\"connection/new?fromInvite=true\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>Add from Invitation</span></a></div><div class=\\"list-page\\"><div class=\\"list-nav\\"><span>Connections</span><input id=\\"connection-search-input\\" class=\\"search-window\\" type=\\"search\\" name=\\"search\\" value=\\"\\" placeholder=\\"Search by Company Name\\" hx-get=\\"/connection\\" hx-trigger=\\"input changed delay:500ms, search\\" hx-target=\\"#search-results\\" hx-select=\\"#search-results\\" hx-swap=\\"outerHTML\\"/></div><table class=\\"list-page\\"><thead><th><span>Company Name</span><a class=\\"list-filter-icon disabled\\"></a></th><th><span>Status</span><a class=\\"list-filter-icon disabled\\"></a></th><th><span>Actions</span><a class=\\"list-filter-icon disabled\\"></a></th></thead><tbody id=\\"search-results\\"><tr><td>Company A</td><td><div class=\\"list-item-status\\" data-status=\\"disabled\\">Disconnected</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/arrow-right-circle.svg&#34;);\\"></div><span>Disconnected</span></a></td></tr><tr><td>Company B</td><td><div class=\\"list-item-status\\" data-status=\\"disabled\\">Invite Sent</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/arrow-right-circle.svg&#34;);\\"></div><span>Waiting for Response</span></a></td></tr><tr><td>Company C</td><td><div class=\\"list-item-status\\" data-status=\\"warning\\">Verification Code Required</div></td><td><a class=\\"button \\" href=\\"/connection/someId/pin-submission\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/arrow-right-circle.svg&#34;);\\"></div><span>Complete Verification</span></a></td></tr><tr><td>Company D</td><td><div class=\\"list-item-status\\" data-status=\\"success\\">Connected</div></td><td><a class=\\"button \\" href=\\"/queries/new/scope-3-carbon-consumption?connectionId=someId\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/arrow-right-circle.svg&#34;);\\"></div><span>Send Query</span></a></td></tr><tr><td>Company E</td><td><div class=\\"list-item-status\\" data-status=\\"warning\\">Verification Code Required</div></td><td><a class=\\"button \\" href=\\"/connection/someId/pin-submission\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/arrow-right-circle.svg&#34;);\\"></div><span>Complete Verification</span></a></td></tr><tr><td>Company F</td><td><div class=\\"list-item-status\\" data-status=\\"disabled\\">Waiting for Response</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/arrow-right-circle.svg&#34;);\\"></div><span>Waiting for Response</span></a></td></tr></tbody></table></div></div></main></body></html>"`;
+exports[`ConnectionTemplates listPage should render multiple with each status 1`] = `"<!DOCTYPE html><html lang=\\"en\\"><head><script src=\\"/lib/htmx.org/htmx.min.js\\"></script><script src=\\"/lib/htmx-ext-json-enc/json-enc.js\\"></script><script src=\\"/public/scripts/auth-redirect.js\\"></script><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon-dark.ico\\" media=\\"(prefers-color-scheme: dark)\\"/><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon.ico\\" media=\\"(prefers-color-scheme: light), (prefers-color-scheme: no-preference)\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/main.css\\"/><title>Veritable - Connections</title></head><body hx-ext=\\"json-enc\\"><nav id=\\"side-bar\\"><a id=\\"veritable-logo\\" href=\\"/about\\"></a><div class=\\"profile-icon\\" style=\\"background-color:#38b6ff;\\">A</div><a title=\\"categories\\" href=\\"/\\" style=\\"--background-image:url('/public/images/category.svg');\\"></a><a title=\\"connections\\" href=\\"/connection\\" data-active style=\\"--background-image:url('/public/images/connection.svg');\\"></a><a title=\\"queries\\" href=\\"/queries\\" style=\\"--background-image:url('/public/images/query.svg');\\"></a><a title=\\"credentials\\" href=\\"/credentials\\" style=\\"--background-image:url('/public/images/credential.svg');\\"></a><a title=\\"settings\\" href=\\"/settings\\" style=\\"--background-image:url('/public/images/setting.svg');\\"></a></nav><main><div id=\\"content-header\\"><h1>Connections</h1><div id=\\"content-header-nav\\"><a title=\\"home\\" class=\\"nav icon\\" href=\\"/\\"></a><a title=\\"Connection Management\\" href=\\"#\\">Connection Management</a></div></div><div id=\\"content-main\\" hx-get=\\"/connection\\" hx-trigger=\\"every 10s\\" hx-select=\\"#search-results\\" hx-target=\\"#search-results\\" hx-swap=\\"outerHTML\\" hx-include=\\"#connection-search-input\\"><div class=\\"list-page-header\\"><span>Connection Management</span><a class=\\"button \\" href=\\"connection/new\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>Invite New Connection</span></a><a class=\\"button \\" href=\\"connection/new?fromInvite=true\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>Add from Invitation</span></a></div><div class=\\"list-page\\"><div class=\\"list-nav\\"><span>Connections</span><input id=\\"connection-search-input\\" class=\\"search-window\\" type=\\"search\\" name=\\"search\\" value=\\"\\" placeholder=\\"Search by Company Name\\" hx-get=\\"/connection\\" hx-trigger=\\"input changed delay:500ms, search\\" hx-target=\\"#search-results\\" hx-select=\\"#search-results\\" hx-swap=\\"outerHTML\\"/></div><table class=\\"list-page\\"><thead><th><span>Company Name</span><a class=\\"list-filter-icon disabled\\"></a></th><th><span>Status</span><a class=\\"list-filter-icon disabled\\"></a></th><th><span>Actions</span><a class=\\"list-filter-icon disabled\\"></a></th></thead><tbody id=\\"search-results\\"><tr><td>Company A</td><td><div class=\\"list-item-status\\" data-status=\\"disabled\\">Disconnected</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/arrow-right-circle.svg&#34;);\\"></div><span>Disconnected</span></a></td></tr><tr><td>Company B</td><td><div class=\\"list-item-status\\" data-status=\\"disabled\\">Invite Sent</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/arrow-right-circle.svg&#34;);\\"></div><span>Waiting for Response</span></a></td></tr><tr><td>Company C</td><td><div class=\\"list-item-status\\" data-status=\\"warning\\">Verification Code Required</div></td><td><a class=\\"button \\" href=\\"/connection/someId/pin-submission\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/arrow-right-circle.svg&#34;);\\"></div><span>Complete Verification</span></a></td></tr><tr><td>Company D</td><td><div class=\\"list-item-status\\" data-status=\\"success\\">Connected</div></td><td><a class=\\"button \\" href=\\"/queries/new/scope-3-carbon-consumption?connectionId=someId\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/arrow-right-circle.svg&#34;);\\"></div><span>Send Query</span></a></td></tr><tr><td>Company E</td><td><div class=\\"list-item-status\\" data-status=\\"warning\\">Verification Code Required</div></td><td><a class=\\"button \\" href=\\"/connection/someId/pin-submission\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/arrow-right-circle.svg&#34;);\\"></div><span>Complete Verification</span></a></td></tr><tr><td>Company F</td><td><div class=\\"list-item-status\\" data-status=\\"disabled\\">Waiting for Response</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/arrow-right-circle.svg&#34;);\\"></div><span>Waiting for Response</span></a></td></tr></tbody></table></div></div></main></body></html>"`;
 
-exports[`ConnectionTemplates listPage should render with no connections 1`] = `"<!DOCTYPE html><html lang=\\"en\\"><head><script src=\\"/lib/htmx.org/htmx.min.js\\"></script><script src=\\"/lib/htmx-ext-json-enc/json-enc.js\\"></script><script src=\\"/public/scripts/auth-redirect.js\\"></script><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon-dark.ico\\" media=\\"(prefers-color-scheme: dark)\\"/><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon.ico\\" media=\\"(prefers-color-scheme: light), (prefers-color-scheme: no-preference)\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/main.css\\"/><title>Veritable - Connections</title></head><body hx-ext=\\"json-enc\\"><nav id=\\"side-bar\\"><a id=\\"veritable-logo\\" href=\\"/about\\"></a><div class=\\"profile-icon\\" style=\\"background-color:#38b6ff;\\">A</div><a title=\\"categories\\" href=\\"/\\" style=\\"--background-image:url('/public/images/category.svg');\\"></a><a title=\\"connections\\" href=\\"/connection\\" data-active style=\\"--background-image:url('/public/images/connection.svg');\\"></a><a title=\\"queries\\" href=\\"/queries\\" style=\\"--background-image:url('/public/images/query.svg');\\"></a><a title=\\"credentials\\" href=\\"/credentials\\" style=\\"--background-image:url('/public/images/credential.svg');\\"></a><a title=\\"settings\\" href=\\"/settings\\" style=\\"--background-image:url('/public/images/setting.svg');\\"></a></nav><main><div id=\\"content-header\\"><h1>Connections</h1><div id=\\"content-header-nav\\"><a title=\\"home\\" class=\\"nav icon\\" href=\\"/\\"></a><a title=\\"Connections\\" href=\\"#\\">Connections</a></div></div><div id=\\"content-main\\" hx-get=\\"/connection\\" hx-trigger=\\"every 10s\\" hx-select=\\"#search-results\\" hx-target=\\"#search-results\\" hx-swap=\\"outerHTML\\" hx-include=\\"#connection-search-input\\"><div class=\\"list-page-header\\"><span>Connections Summary</span><a class=\\"button \\" href=\\"connection/new\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>Invite New Connection</span></a><a class=\\"button \\" href=\\"connection/new?fromInvite=true\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>Add from Invitation</span></a></div><div class=\\"list-page\\"><div class=\\"list-nav\\"><span>Connections</span><input id=\\"connection-search-input\\" class=\\"search-window\\" type=\\"search\\" name=\\"search\\" value=\\"\\" placeholder=\\"Search by Company Name\\" hx-get=\\"/connection\\" hx-trigger=\\"input changed delay:500ms, search\\" hx-target=\\"#search-results\\" hx-select=\\"#search-results\\" hx-swap=\\"outerHTML\\"/></div><table class=\\"list-page\\"><thead><th><span>Company Name</span><a class=\\"list-filter-icon disabled\\"></a></th><th><span>Status</span><a class=\\"list-filter-icon disabled\\"></a></th><th><span>Actions</span><a class=\\"list-filter-icon disabled\\"></a></th></thead><tbody id=\\"search-results\\"><tr><td>No Connections for that search query. Try again or add a new connection</td></tr></tbody></table></div></div></main></body></html>"`;
+exports[`ConnectionTemplates listPage should render with no connections 1`] = `"<!DOCTYPE html><html lang=\\"en\\"><head><script src=\\"/lib/htmx.org/htmx.min.js\\"></script><script src=\\"/lib/htmx-ext-json-enc/json-enc.js\\"></script><script src=\\"/public/scripts/auth-redirect.js\\"></script><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon-dark.ico\\" media=\\"(prefers-color-scheme: dark)\\"/><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon.ico\\" media=\\"(prefers-color-scheme: light), (prefers-color-scheme: no-preference)\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/main.css\\"/><title>Veritable - Connections</title></head><body hx-ext=\\"json-enc\\"><nav id=\\"side-bar\\"><a id=\\"veritable-logo\\" href=\\"/about\\"></a><div class=\\"profile-icon\\" style=\\"background-color:#38b6ff;\\">A</div><a title=\\"categories\\" href=\\"/\\" style=\\"--background-image:url('/public/images/category.svg');\\"></a><a title=\\"connections\\" href=\\"/connection\\" data-active style=\\"--background-image:url('/public/images/connection.svg');\\"></a><a title=\\"queries\\" href=\\"/queries\\" style=\\"--background-image:url('/public/images/query.svg');\\"></a><a title=\\"credentials\\" href=\\"/credentials\\" style=\\"--background-image:url('/public/images/credential.svg');\\"></a><a title=\\"settings\\" href=\\"/settings\\" style=\\"--background-image:url('/public/images/setting.svg');\\"></a></nav><main><div id=\\"content-header\\"><h1>Connections</h1><div id=\\"content-header-nav\\"><a title=\\"home\\" class=\\"nav icon\\" href=\\"/\\"></a><a title=\\"Connection Management\\" href=\\"#\\">Connection Management</a></div></div><div id=\\"content-main\\" hx-get=\\"/connection\\" hx-trigger=\\"every 10s\\" hx-select=\\"#search-results\\" hx-target=\\"#search-results\\" hx-swap=\\"outerHTML\\" hx-include=\\"#connection-search-input\\"><div class=\\"list-page-header\\"><span>Connection Management</span><a class=\\"button \\" href=\\"connection/new\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>Invite New Connection</span></a><a class=\\"button \\" href=\\"connection/new?fromInvite=true\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>Add from Invitation</span></a></div><div class=\\"list-page\\"><div class=\\"list-nav\\"><span>Connections</span><input id=\\"connection-search-input\\" class=\\"search-window\\" type=\\"search\\" name=\\"search\\" value=\\"\\" placeholder=\\"Search by Company Name\\" hx-get=\\"/connection\\" hx-trigger=\\"input changed delay:500ms, search\\" hx-target=\\"#search-results\\" hx-select=\\"#search-results\\" hx-swap=\\"outerHTML\\"/></div><table class=\\"list-page\\"><thead><th><span>Company Name</span><a class=\\"list-filter-icon disabled\\"></a></th><th><span>Status</span><a class=\\"list-filter-icon disabled\\"></a></th><th><span>Actions</span><a class=\\"list-filter-icon disabled\\"></a></th></thead><tbody id=\\"search-results\\"><tr><td>No Connections for that search query. Try again or add a new connection</td></tr></tbody></table></div></div></main></body></html>"`;
 
-exports[`ConnectionTemplates listPage should render with single connection 1`] = `"<!DOCTYPE html><html lang=\\"en\\"><head><script src=\\"/lib/htmx.org/htmx.min.js\\"></script><script src=\\"/lib/htmx-ext-json-enc/json-enc.js\\"></script><script src=\\"/public/scripts/auth-redirect.js\\"></script><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon-dark.ico\\" media=\\"(prefers-color-scheme: dark)\\"/><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon.ico\\" media=\\"(prefers-color-scheme: light), (prefers-color-scheme: no-preference)\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/main.css\\"/><title>Veritable - Connections</title></head><body hx-ext=\\"json-enc\\"><nav id=\\"side-bar\\"><a id=\\"veritable-logo\\" href=\\"/about\\"></a><div class=\\"profile-icon\\" style=\\"background-color:#38b6ff;\\">A</div><a title=\\"categories\\" href=\\"/\\" style=\\"--background-image:url('/public/images/category.svg');\\"></a><a title=\\"connections\\" href=\\"/connection\\" data-active style=\\"--background-image:url('/public/images/connection.svg');\\"></a><a title=\\"queries\\" href=\\"/queries\\" style=\\"--background-image:url('/public/images/query.svg');\\"></a><a title=\\"credentials\\" href=\\"/credentials\\" style=\\"--background-image:url('/public/images/credential.svg');\\"></a><a title=\\"settings\\" href=\\"/settings\\" style=\\"--background-image:url('/public/images/setting.svg');\\"></a></nav><main><div id=\\"content-header\\"><h1>Connections</h1><div id=\\"content-header-nav\\"><a title=\\"home\\" class=\\"nav icon\\" href=\\"/\\"></a><a title=\\"Connections\\" href=\\"#\\">Connections</a></div></div><div id=\\"content-main\\" hx-get=\\"/connection\\" hx-trigger=\\"every 10s\\" hx-select=\\"#search-results\\" hx-target=\\"#search-results\\" hx-swap=\\"outerHTML\\" hx-include=\\"#connection-search-input\\"><div class=\\"list-page-header\\"><span>Connections Summary</span><a class=\\"button \\" href=\\"connection/new\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>Invite New Connection</span></a><a class=\\"button \\" href=\\"connection/new?fromInvite=true\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>Add from Invitation</span></a></div><div class=\\"list-page\\"><div class=\\"list-nav\\"><span>Connections</span><input id=\\"connection-search-input\\" class=\\"search-window\\" type=\\"search\\" name=\\"search\\" value=\\"\\" placeholder=\\"Search by Company Name\\" hx-get=\\"/connection\\" hx-trigger=\\"input changed delay:500ms, search\\" hx-target=\\"#search-results\\" hx-select=\\"#search-results\\" hx-swap=\\"outerHTML\\"/></div><table class=\\"list-page\\"><thead><th><span>Company Name</span><a class=\\"list-filter-icon disabled\\"></a></th><th><span>Status</span><a class=\\"list-filter-icon disabled\\"></a></th><th><span>Actions</span><a class=\\"list-filter-icon disabled\\"></a></th></thead><tbody id=\\"search-results\\"><tr><td>Company A</td><td><div class=\\"list-item-status\\" data-status=\\"disabled\\">Disconnected</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/arrow-right-circle.svg&#34;);\\"></div><span>Disconnected</span></a></td></tr></tbody></table></div></div></main></body></html>"`;
+exports[`ConnectionTemplates listPage should render with single connection 1`] = `"<!DOCTYPE html><html lang=\\"en\\"><head><script src=\\"/lib/htmx.org/htmx.min.js\\"></script><script src=\\"/lib/htmx-ext-json-enc/json-enc.js\\"></script><script src=\\"/public/scripts/auth-redirect.js\\"></script><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon-dark.ico\\" media=\\"(prefers-color-scheme: dark)\\"/><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon.ico\\" media=\\"(prefers-color-scheme: light), (prefers-color-scheme: no-preference)\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/main.css\\"/><title>Veritable - Connections</title></head><body hx-ext=\\"json-enc\\"><nav id=\\"side-bar\\"><a id=\\"veritable-logo\\" href=\\"/about\\"></a><div class=\\"profile-icon\\" style=\\"background-color:#38b6ff;\\">A</div><a title=\\"categories\\" href=\\"/\\" style=\\"--background-image:url('/public/images/category.svg');\\"></a><a title=\\"connections\\" href=\\"/connection\\" data-active style=\\"--background-image:url('/public/images/connection.svg');\\"></a><a title=\\"queries\\" href=\\"/queries\\" style=\\"--background-image:url('/public/images/query.svg');\\"></a><a title=\\"credentials\\" href=\\"/credentials\\" style=\\"--background-image:url('/public/images/credential.svg');\\"></a><a title=\\"settings\\" href=\\"/settings\\" style=\\"--background-image:url('/public/images/setting.svg');\\"></a></nav><main><div id=\\"content-header\\"><h1>Connections</h1><div id=\\"content-header-nav\\"><a title=\\"home\\" class=\\"nav icon\\" href=\\"/\\"></a><a title=\\"Connection Management\\" href=\\"#\\">Connection Management</a></div></div><div id=\\"content-main\\" hx-get=\\"/connection\\" hx-trigger=\\"every 10s\\" hx-select=\\"#search-results\\" hx-target=\\"#search-results\\" hx-swap=\\"outerHTML\\" hx-include=\\"#connection-search-input\\"><div class=\\"list-page-header\\"><span>Connection Management</span><a class=\\"button \\" href=\\"connection/new\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>Invite New Connection</span></a><a class=\\"button \\" href=\\"connection/new?fromInvite=true\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>Add from Invitation</span></a></div><div class=\\"list-page\\"><div class=\\"list-nav\\"><span>Connections</span><input id=\\"connection-search-input\\" class=\\"search-window\\" type=\\"search\\" name=\\"search\\" value=\\"\\" placeholder=\\"Search by Company Name\\" hx-get=\\"/connection\\" hx-trigger=\\"input changed delay:500ms, search\\" hx-target=\\"#search-results\\" hx-select=\\"#search-results\\" hx-swap=\\"outerHTML\\"/></div><table class=\\"list-page\\"><thead><th><span>Company Name</span><a class=\\"list-filter-icon disabled\\"></a></th><th><span>Status</span><a class=\\"list-filter-icon disabled\\"></a></th><th><span>Actions</span><a class=\\"list-filter-icon disabled\\"></a></th></thead><tbody id=\\"search-results\\"><tr><td>Company A</td><td><div class=\\"list-item-status\\" data-status=\\"disabled\\">Disconnected</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/arrow-right-circle.svg&#34;);\\"></div><span>Disconnected</span></a></td></tr></tbody></table></div></div></main></body></html>"`;
diff --git a/src/views/connection/connection.tsx b/src/views/connection/connection.tsx
index bf033b6a..28c56a38 100644
--- a/src/views/connection/connection.tsx
+++ b/src/views/connection/connection.tsx
@@ -55,7 +55,7 @@ export default class ConnectionTemplates {
         title="Veritable - Connections"
         heading="Connections"
         activePage="connections"
-        headerLinks={[{ name: 'Connections', url: '#' }]}
+        headerLinks={[{ name: 'Connection Management', url: '#' }]}
         // htmx props
         hx-get="/connection"
         hx-trigger="every 10s"
@@ -65,7 +65,7 @@ export default class ConnectionTemplates {
         hx-include="#connection-search-input"
       >
         <div class="list-page-header">
-          <span>Connections Summary</span>
+          <span>Connection Management</span>
           <LinkButton
             disabled={false}
             text="Invite New Connection"
diff --git a/src/views/credentials/__tests__/fixtures.ts b/src/views/credentials/__tests__/fixtures.ts
index d70e8231..0552db12 100644
--- a/src/views/credentials/__tests__/fixtures.ts
+++ b/src/views/credentials/__tests__/fixtures.ts
@@ -6,14 +6,14 @@ export const AliceCredentials = [
     state: 'done',
     role: 'issuer',
     companyName: 'DIGITAL CATAPULT',
-    type: 'Supplier credentials',
+    type: 'Supplier credential',
   },
   {
     id: 'dabfcec3-9232-4eaa-abf2-ce64193772ed',
     state: 'done',
     role: 'holder',
     companyName: 'CARE ONUS LTD',
-    type: 'Supplier credentials',
+    type: 'Supplier credential',
   },
 ] as ExtendedCredential[]
 
@@ -23,13 +23,13 @@ export const BobCredentials = [
     state: 'done',
     role: 'issuer',
     companyName: 'CARE ONUS LTD',
-    type: 'Supplier credentials',
+    type: 'Supplier credential',
   },
   {
     id: 'f70d675a-1915-42b5-b279-ce79a3aceb60',
     state: 'done',
     role: 'holder',
     companyName: 'DIGITAL CATAPULT',
-    type: 'Supplier credentials',
+    type: 'Supplier credential',
   },
 ] as ExtendedCredential[]
diff --git a/src/views/credentials/__tests__/index.test.ts.snap b/src/views/credentials/__tests__/index.test.ts.snap
index 910d67b8..caa37d9b 100644
--- a/src/views/credentials/__tests__/index.test.ts.snap
+++ b/src/views/credentials/__tests__/index.test.ts.snap
@@ -1,11 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`CredentialsTemplates listPage credentials case insensitive searches filters based on lower case input 1`] = `"<!DOCTYPE html><html lang=\\"en\\"><head><script src=\\"/lib/htmx.org/htmx.min.js\\"></script><script src=\\"/lib/htmx-ext-json-enc/json-enc.js\\"></script><script src=\\"/public/scripts/auth-redirect.js\\"></script><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon-dark.ico\\" media=\\"(prefers-color-scheme: dark)\\"/><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon.ico\\" media=\\"(prefers-color-scheme: light), (prefers-color-scheme: no-preference)\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/main.css\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/query.css\\"/><title>Veritable - Credentials</title></head><body hx-ext=\\"json-enc\\"><nav id=\\"side-bar\\"><a id=\\"veritable-logo\\" href=\\"/about\\"></a><div class=\\"profile-icon\\" style=\\"background-color:#38b6ff;\\">A</div><a title=\\"categories\\" href=\\"/\\" style=\\"--background-image:url('/public/images/category.svg');\\"></a><a title=\\"connections\\" href=\\"/connection\\" style=\\"--background-image:url('/public/images/connection.svg');\\"></a><a title=\\"queries\\" href=\\"/queries\\" style=\\"--background-image:url('/public/images/query.svg');\\"></a><a title=\\"credentials\\" href=\\"/credentials\\" data-active style=\\"--background-image:url('/public/images/credential.svg');\\"></a><a title=\\"settings\\" href=\\"/settings\\" style=\\"--background-image:url('/public/images/setting.svg');\\"></a></nav><main><div id=\\"content-header\\"><h1>Credential Management</h1><div id=\\"content-header-nav\\"><a title=\\"home\\" class=\\"nav icon\\" href=\\"/\\"></a><a title=\\"Credential Management\\" href=\\"/credentials\\">Credential Management</a></div></div><div id=\\"content-main\\" hx-get=\\"/credentials\\" hx-trigger=\\"every 10s\\" hx-select=\\"#search-results\\" hx-target=\\"#search-results\\" hx-swap=\\"outerHTML\\" hx-include=\\"#queries-search-input\\"><div class=\\"list-page-header\\"><span>Credential Management</span><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>New Credential</span></a></div><div class=\\"list-page \\"><div class=\\"list-nav\\"><span>Credentials</span><input id=\\"queries-search-input\\" class=\\"search-window\\" type=\\"search\\" name=\\"search\\" value=\\"digi\\" placeholder=\\"Search\\" hx-get=\\"/credentials\\" hx-trigger=\\"input changed delay:500ms, search\\" hx-target=\\"#search-results\\" hx-select=\\"#search-results\\" hx-swap=\\"outerHTML\\"/></div><table class=\\"list-page\\"><thead><th><span>Company Name</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Credential Type</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Direction</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Crendetial status</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Actions</span><a class=\\"list-filter-icon icon disabled\\"></a></th></thead><tbody id=\\"search-results\\"><tr><td>DIGITAL CATAPULT</td><td>Supplier credentials</td><td><p>Given</p></td><td><div class=\\"list-item-status\\" data-status=\\"success\\">Completed</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/dot-icon.svg&#34;);\\"></div><span>View Credential</span></a></td></tr><tr><td>CARE ONUS LTD</td><td>Supplier credentials</td><td><p>Received</p></td><td><div class=\\"list-item-status\\" data-status=\\"success\\">Completed</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/dot-icon.svg&#34;);\\"></div><span>View Credential</span></a></td></tr></tbody></table></div></div></main></body></html>"`;
+exports[`CredentialsTemplates listPage credentials case insensitive searches filters based on lower case input 1`] = `"<!DOCTYPE html><html lang=\\"en\\"><head><script src=\\"/lib/htmx.org/htmx.min.js\\"></script><script src=\\"/lib/htmx-ext-json-enc/json-enc.js\\"></script><script src=\\"/public/scripts/auth-redirect.js\\"></script><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon-dark.ico\\" media=\\"(prefers-color-scheme: dark)\\"/><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon.ico\\" media=\\"(prefers-color-scheme: light), (prefers-color-scheme: no-preference)\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/main.css\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/query.css\\"/><title>Veritable - Credentials</title></head><body hx-ext=\\"json-enc\\"><nav id=\\"side-bar\\"><a id=\\"veritable-logo\\" href=\\"/about\\"></a><div class=\\"profile-icon\\" style=\\"background-color:#38b6ff;\\">A</div><a title=\\"categories\\" href=\\"/\\" style=\\"--background-image:url('/public/images/category.svg');\\"></a><a title=\\"connections\\" href=\\"/connection\\" style=\\"--background-image:url('/public/images/connection.svg');\\"></a><a title=\\"queries\\" href=\\"/queries\\" style=\\"--background-image:url('/public/images/query.svg');\\"></a><a title=\\"credentials\\" href=\\"/credentials\\" data-active style=\\"--background-image:url('/public/images/credential.svg');\\"></a><a title=\\"settings\\" href=\\"/settings\\" style=\\"--background-image:url('/public/images/setting.svg');\\"></a></nav><main><div id=\\"content-header\\"><h1>Credential Management</h1><div id=\\"content-header-nav\\"><a title=\\"home\\" class=\\"nav icon\\" href=\\"/\\"></a><a title=\\"Credential Management\\" href=\\"/credentials\\">Credential Management</a></div></div><div id=\\"content-main\\" hx-get=\\"/credentials\\" hx-trigger=\\"every 10s\\" hx-select=\\"#search-results\\" hx-target=\\"#search-results\\" hx-swap=\\"outerHTML\\" hx-include=\\"#queries-search-input\\"><div class=\\"list-page-header\\"><span>Credential Management</span><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>New Credential</span></a></div><div class=\\"list-page \\"><div class=\\"list-nav\\"><span>Credentials</span><input id=\\"queries-search-input\\" class=\\"search-window\\" type=\\"search\\" name=\\"search\\" value=\\"digi\\" placeholder=\\"Search\\" hx-get=\\"/credentials\\" hx-trigger=\\"input changed delay:500ms, search\\" hx-target=\\"#search-results\\" hx-select=\\"#search-results\\" hx-swap=\\"outerHTML\\"/></div><table class=\\"list-page\\"><thead><th><span>Company Name</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Credential Type</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Relationship</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Status</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Actions</span><a class=\\"list-filter-icon icon disabled\\"></a></th></thead><tbody id=\\"search-results\\"><tr><td>DIGITAL CATAPULT</td><td>Supplier credential</td><td><p>Sender</p></td><td><div class=\\"list-item-status\\" data-status=\\"success\\">Completed</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/dot-icon.svg&#34;);\\"></div><span>View Credential</span></a></td></tr><tr><td>CARE ONUS LTD</td><td>Supplier credential</td><td><p>Recipient</p></td><td><div class=\\"list-item-status\\" data-status=\\"success\\">Completed</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/dot-icon.svg&#34;);\\"></div><span>View Credential</span></a></td></tr></tbody></table></div></div></main></body></html>"`;
 
-exports[`CredentialsTemplates listPage credentials case insensitive searches filters based on upper case input 1`] = `"<!DOCTYPE html><html lang=\\"en\\"><head><script src=\\"/lib/htmx.org/htmx.min.js\\"></script><script src=\\"/lib/htmx-ext-json-enc/json-enc.js\\"></script><script src=\\"/public/scripts/auth-redirect.js\\"></script><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon-dark.ico\\" media=\\"(prefers-color-scheme: dark)\\"/><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon.ico\\" media=\\"(prefers-color-scheme: light), (prefers-color-scheme: no-preference)\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/main.css\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/query.css\\"/><title>Veritable - Credentials</title></head><body hx-ext=\\"json-enc\\"><nav id=\\"side-bar\\"><a id=\\"veritable-logo\\" href=\\"/about\\"></a><div class=\\"profile-icon\\" style=\\"background-color:#38b6ff;\\">A</div><a title=\\"categories\\" href=\\"/\\" style=\\"--background-image:url('/public/images/category.svg');\\"></a><a title=\\"connections\\" href=\\"/connection\\" style=\\"--background-image:url('/public/images/connection.svg');\\"></a><a title=\\"queries\\" href=\\"/queries\\" style=\\"--background-image:url('/public/images/query.svg');\\"></a><a title=\\"credentials\\" href=\\"/credentials\\" data-active style=\\"--background-image:url('/public/images/credential.svg');\\"></a><a title=\\"settings\\" href=\\"/settings\\" style=\\"--background-image:url('/public/images/setting.svg');\\"></a></nav><main><div id=\\"content-header\\"><h1>Credential Management</h1><div id=\\"content-header-nav\\"><a title=\\"home\\" class=\\"nav icon\\" href=\\"/\\"></a><a title=\\"Credential Management\\" href=\\"/credentials\\">Credential Management</a></div></div><div id=\\"content-main\\" hx-get=\\"/credentials\\" hx-trigger=\\"every 10s\\" hx-select=\\"#search-results\\" hx-target=\\"#search-results\\" hx-swap=\\"outerHTML\\" hx-include=\\"#queries-search-input\\"><div class=\\"list-page-header\\"><span>Credential Management</span><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>New Credential</span></a></div><div class=\\"list-page \\"><div class=\\"list-nav\\"><span>Credentials</span><input id=\\"queries-search-input\\" class=\\"search-window\\" type=\\"search\\" name=\\"search\\" value=\\"CARE\\" placeholder=\\"Search\\" hx-get=\\"/credentials\\" hx-trigger=\\"input changed delay:500ms, search\\" hx-target=\\"#search-results\\" hx-select=\\"#search-results\\" hx-swap=\\"outerHTML\\"/></div><table class=\\"list-page\\"><thead><th><span>Company Name</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Credential Type</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Direction</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Crendetial status</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Actions</span><a class=\\"list-filter-icon icon disabled\\"></a></th></thead><tbody id=\\"search-results\\"><tr><td>DIGITAL CATAPULT</td><td>Supplier credentials</td><td><p>Given</p></td><td><div class=\\"list-item-status\\" data-status=\\"success\\">Completed</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/dot-icon.svg&#34;);\\"></div><span>View Credential</span></a></td></tr><tr><td>CARE ONUS LTD</td><td>Supplier credentials</td><td><p>Received</p></td><td><div class=\\"list-item-status\\" data-status=\\"success\\">Completed</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/dot-icon.svg&#34;);\\"></div><span>View Credential</span></a></td></tr></tbody></table></div></div></main></body></html>"`;
+exports[`CredentialsTemplates listPage credentials case insensitive searches filters based on upper case input 1`] = `"<!DOCTYPE html><html lang=\\"en\\"><head><script src=\\"/lib/htmx.org/htmx.min.js\\"></script><script src=\\"/lib/htmx-ext-json-enc/json-enc.js\\"></script><script src=\\"/public/scripts/auth-redirect.js\\"></script><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon-dark.ico\\" media=\\"(prefers-color-scheme: dark)\\"/><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon.ico\\" media=\\"(prefers-color-scheme: light), (prefers-color-scheme: no-preference)\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/main.css\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/query.css\\"/><title>Veritable - Credentials</title></head><body hx-ext=\\"json-enc\\"><nav id=\\"side-bar\\"><a id=\\"veritable-logo\\" href=\\"/about\\"></a><div class=\\"profile-icon\\" style=\\"background-color:#38b6ff;\\">A</div><a title=\\"categories\\" href=\\"/\\" style=\\"--background-image:url('/public/images/category.svg');\\"></a><a title=\\"connections\\" href=\\"/connection\\" style=\\"--background-image:url('/public/images/connection.svg');\\"></a><a title=\\"queries\\" href=\\"/queries\\" style=\\"--background-image:url('/public/images/query.svg');\\"></a><a title=\\"credentials\\" href=\\"/credentials\\" data-active style=\\"--background-image:url('/public/images/credential.svg');\\"></a><a title=\\"settings\\" href=\\"/settings\\" style=\\"--background-image:url('/public/images/setting.svg');\\"></a></nav><main><div id=\\"content-header\\"><h1>Credential Management</h1><div id=\\"content-header-nav\\"><a title=\\"home\\" class=\\"nav icon\\" href=\\"/\\"></a><a title=\\"Credential Management\\" href=\\"/credentials\\">Credential Management</a></div></div><div id=\\"content-main\\" hx-get=\\"/credentials\\" hx-trigger=\\"every 10s\\" hx-select=\\"#search-results\\" hx-target=\\"#search-results\\" hx-swap=\\"outerHTML\\" hx-include=\\"#queries-search-input\\"><div class=\\"list-page-header\\"><span>Credential Management</span><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>New Credential</span></a></div><div class=\\"list-page \\"><div class=\\"list-nav\\"><span>Credentials</span><input id=\\"queries-search-input\\" class=\\"search-window\\" type=\\"search\\" name=\\"search\\" value=\\"CARE\\" placeholder=\\"Search\\" hx-get=\\"/credentials\\" hx-trigger=\\"input changed delay:500ms, search\\" hx-target=\\"#search-results\\" hx-select=\\"#search-results\\" hx-swap=\\"outerHTML\\"/></div><table class=\\"list-page\\"><thead><th><span>Company Name</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Credential Type</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Relationship</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Status</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Actions</span><a class=\\"list-filter-icon icon disabled\\"></a></th></thead><tbody id=\\"search-results\\"><tr><td>DIGITAL CATAPULT</td><td>Supplier credential</td><td><p>Sender</p></td><td><div class=\\"list-item-status\\" data-status=\\"success\\">Completed</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/dot-icon.svg&#34;);\\"></div><span>View Credential</span></a></td></tr><tr><td>CARE ONUS LTD</td><td>Supplier credential</td><td><p>Recipient</p></td><td><div class=\\"list-item-status\\" data-status=\\"success\\">Completed</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/dot-icon.svg&#34;);\\"></div><span>View Credential</span></a></td></tr></tbody></table></div></div></main></body></html>"`;
 
-exports[`CredentialsTemplates listPage renders alice's credentials 1`] = `"<!DOCTYPE html><html lang=\\"en\\"><head><script src=\\"/lib/htmx.org/htmx.min.js\\"></script><script src=\\"/lib/htmx-ext-json-enc/json-enc.js\\"></script><script src=\\"/public/scripts/auth-redirect.js\\"></script><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon-dark.ico\\" media=\\"(prefers-color-scheme: dark)\\"/><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon.ico\\" media=\\"(prefers-color-scheme: light), (prefers-color-scheme: no-preference)\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/main.css\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/query.css\\"/><title>Veritable - Credentials</title></head><body hx-ext=\\"json-enc\\"><nav id=\\"side-bar\\"><a id=\\"veritable-logo\\" href=\\"/about\\"></a><div class=\\"profile-icon\\" style=\\"background-color:#38b6ff;\\">A</div><a title=\\"categories\\" href=\\"/\\" style=\\"--background-image:url('/public/images/category.svg');\\"></a><a title=\\"connections\\" href=\\"/connection\\" style=\\"--background-image:url('/public/images/connection.svg');\\"></a><a title=\\"queries\\" href=\\"/queries\\" style=\\"--background-image:url('/public/images/query.svg');\\"></a><a title=\\"credentials\\" href=\\"/credentials\\" data-active style=\\"--background-image:url('/public/images/credential.svg');\\"></a><a title=\\"settings\\" href=\\"/settings\\" style=\\"--background-image:url('/public/images/setting.svg');\\"></a></nav><main><div id=\\"content-header\\"><h1>Credential Management</h1><div id=\\"content-header-nav\\"><a title=\\"home\\" class=\\"nav icon\\" href=\\"/\\"></a><a title=\\"Credential Management\\" href=\\"/credentials\\">Credential Management</a></div></div><div id=\\"content-main\\" hx-get=\\"/credentials\\" hx-trigger=\\"every 10s\\" hx-select=\\"#search-results\\" hx-target=\\"#search-results\\" hx-swap=\\"outerHTML\\" hx-include=\\"#queries-search-input\\"><div class=\\"list-page-header\\"><span>Credential Management</span><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>New Credential</span></a></div><div class=\\"list-page \\"><div class=\\"list-nav\\"><span>Credentials</span><input id=\\"queries-search-input\\" class=\\"search-window\\" type=\\"search\\" name=\\"search\\" value=\\"\\" placeholder=\\"Search\\" hx-get=\\"/credentials\\" hx-trigger=\\"input changed delay:500ms, search\\" hx-target=\\"#search-results\\" hx-select=\\"#search-results\\" hx-swap=\\"outerHTML\\"/></div><table class=\\"list-page\\"><thead><th><span>Company Name</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Credential Type</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Direction</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Crendetial status</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Actions</span><a class=\\"list-filter-icon icon disabled\\"></a></th></thead><tbody id=\\"search-results\\"><tr><td>DIGITAL CATAPULT</td><td>Supplier credentials</td><td><p>Given</p></td><td><div class=\\"list-item-status\\" data-status=\\"success\\">Completed</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/dot-icon.svg&#34;);\\"></div><span>View Credential</span></a></td></tr><tr><td>CARE ONUS LTD</td><td>Supplier credentials</td><td><p>Received</p></td><td><div class=\\"list-item-status\\" data-status=\\"success\\">Completed</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/dot-icon.svg&#34;);\\"></div><span>View Credential</span></a></td></tr></tbody></table></div></div></main></body></html>"`;
+exports[`CredentialsTemplates listPage renders alice's credentials 1`] = `"<!DOCTYPE html><html lang=\\"en\\"><head><script src=\\"/lib/htmx.org/htmx.min.js\\"></script><script src=\\"/lib/htmx-ext-json-enc/json-enc.js\\"></script><script src=\\"/public/scripts/auth-redirect.js\\"></script><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon-dark.ico\\" media=\\"(prefers-color-scheme: dark)\\"/><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon.ico\\" media=\\"(prefers-color-scheme: light), (prefers-color-scheme: no-preference)\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/main.css\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/query.css\\"/><title>Veritable - Credentials</title></head><body hx-ext=\\"json-enc\\"><nav id=\\"side-bar\\"><a id=\\"veritable-logo\\" href=\\"/about\\"></a><div class=\\"profile-icon\\" style=\\"background-color:#38b6ff;\\">A</div><a title=\\"categories\\" href=\\"/\\" style=\\"--background-image:url('/public/images/category.svg');\\"></a><a title=\\"connections\\" href=\\"/connection\\" style=\\"--background-image:url('/public/images/connection.svg');\\"></a><a title=\\"queries\\" href=\\"/queries\\" style=\\"--background-image:url('/public/images/query.svg');\\"></a><a title=\\"credentials\\" href=\\"/credentials\\" data-active style=\\"--background-image:url('/public/images/credential.svg');\\"></a><a title=\\"settings\\" href=\\"/settings\\" style=\\"--background-image:url('/public/images/setting.svg');\\"></a></nav><main><div id=\\"content-header\\"><h1>Credential Management</h1><div id=\\"content-header-nav\\"><a title=\\"home\\" class=\\"nav icon\\" href=\\"/\\"></a><a title=\\"Credential Management\\" href=\\"/credentials\\">Credential Management</a></div></div><div id=\\"content-main\\" hx-get=\\"/credentials\\" hx-trigger=\\"every 10s\\" hx-select=\\"#search-results\\" hx-target=\\"#search-results\\" hx-swap=\\"outerHTML\\" hx-include=\\"#queries-search-input\\"><div class=\\"list-page-header\\"><span>Credential Management</span><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>New Credential</span></a></div><div class=\\"list-page \\"><div class=\\"list-nav\\"><span>Credentials</span><input id=\\"queries-search-input\\" class=\\"search-window\\" type=\\"search\\" name=\\"search\\" value=\\"\\" placeholder=\\"Search\\" hx-get=\\"/credentials\\" hx-trigger=\\"input changed delay:500ms, search\\" hx-target=\\"#search-results\\" hx-select=\\"#search-results\\" hx-swap=\\"outerHTML\\"/></div><table class=\\"list-page\\"><thead><th><span>Company Name</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Credential Type</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Relationship</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Status</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Actions</span><a class=\\"list-filter-icon icon disabled\\"></a></th></thead><tbody id=\\"search-results\\"><tr><td>DIGITAL CATAPULT</td><td>Supplier credential</td><td><p>Sender</p></td><td><div class=\\"list-item-status\\" data-status=\\"success\\">Completed</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/dot-icon.svg&#34;);\\"></div><span>View Credential</span></a></td></tr><tr><td>CARE ONUS LTD</td><td>Supplier credential</td><td><p>Recipient</p></td><td><div class=\\"list-item-status\\" data-status=\\"success\\">Completed</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/dot-icon.svg&#34;);\\"></div><span>View Credential</span></a></td></tr></tbody></table></div></div></main></body></html>"`;
 
-exports[`CredentialsTemplates listPage renders bob's credentials 1`] = `"<!DOCTYPE html><html lang=\\"en\\"><head><script src=\\"/lib/htmx.org/htmx.min.js\\"></script><script src=\\"/lib/htmx-ext-json-enc/json-enc.js\\"></script><script src=\\"/public/scripts/auth-redirect.js\\"></script><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon-dark.ico\\" media=\\"(prefers-color-scheme: dark)\\"/><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon.ico\\" media=\\"(prefers-color-scheme: light), (prefers-color-scheme: no-preference)\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/main.css\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/query.css\\"/><title>Veritable - Credentials</title></head><body hx-ext=\\"json-enc\\"><nav id=\\"side-bar\\"><a id=\\"veritable-logo\\" href=\\"/about\\"></a><div class=\\"profile-icon\\" style=\\"background-color:#38b6ff;\\">A</div><a title=\\"categories\\" href=\\"/\\" style=\\"--background-image:url('/public/images/category.svg');\\"></a><a title=\\"connections\\" href=\\"/connection\\" style=\\"--background-image:url('/public/images/connection.svg');\\"></a><a title=\\"queries\\" href=\\"/queries\\" style=\\"--background-image:url('/public/images/query.svg');\\"></a><a title=\\"credentials\\" href=\\"/credentials\\" data-active style=\\"--background-image:url('/public/images/credential.svg');\\"></a><a title=\\"settings\\" href=\\"/settings\\" style=\\"--background-image:url('/public/images/setting.svg');\\"></a></nav><main><div id=\\"content-header\\"><h1>Credential Management</h1><div id=\\"content-header-nav\\"><a title=\\"home\\" class=\\"nav icon\\" href=\\"/\\"></a><a title=\\"Credential Management\\" href=\\"/credentials\\">Credential Management</a></div></div><div id=\\"content-main\\" hx-get=\\"/credentials\\" hx-trigger=\\"every 10s\\" hx-select=\\"#search-results\\" hx-target=\\"#search-results\\" hx-swap=\\"outerHTML\\" hx-include=\\"#queries-search-input\\"><div class=\\"list-page-header\\"><span>Credential Management</span><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>New Credential</span></a></div><div class=\\"list-page \\"><div class=\\"list-nav\\"><span>Credentials</span><input id=\\"queries-search-input\\" class=\\"search-window\\" type=\\"search\\" name=\\"search\\" value=\\"\\" placeholder=\\"Search\\" hx-get=\\"/credentials\\" hx-trigger=\\"input changed delay:500ms, search\\" hx-target=\\"#search-results\\" hx-select=\\"#search-results\\" hx-swap=\\"outerHTML\\"/></div><table class=\\"list-page\\"><thead><th><span>Company Name</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Credential Type</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Direction</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Crendetial status</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Actions</span><a class=\\"list-filter-icon icon disabled\\"></a></th></thead><tbody id=\\"search-results\\"><tr><td>CARE ONUS LTD</td><td>Supplier credentials</td><td><p>Given</p></td><td><div class=\\"list-item-status\\" data-status=\\"success\\">Completed</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/dot-icon.svg&#34;);\\"></div><span>View Credential</span></a></td></tr><tr><td>DIGITAL CATAPULT</td><td>Supplier credentials</td><td><p>Received</p></td><td><div class=\\"list-item-status\\" data-status=\\"success\\">Completed</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/dot-icon.svg&#34;);\\"></div><span>View Credential</span></a></td></tr></tbody></table></div></div></main></body></html>"`;
+exports[`CredentialsTemplates listPage renders bob's credentials 1`] = `"<!DOCTYPE html><html lang=\\"en\\"><head><script src=\\"/lib/htmx.org/htmx.min.js\\"></script><script src=\\"/lib/htmx-ext-json-enc/json-enc.js\\"></script><script src=\\"/public/scripts/auth-redirect.js\\"></script><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon-dark.ico\\" media=\\"(prefers-color-scheme: dark)\\"/><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon.ico\\" media=\\"(prefers-color-scheme: light), (prefers-color-scheme: no-preference)\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/main.css\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/query.css\\"/><title>Veritable - Credentials</title></head><body hx-ext=\\"json-enc\\"><nav id=\\"side-bar\\"><a id=\\"veritable-logo\\" href=\\"/about\\"></a><div class=\\"profile-icon\\" style=\\"background-color:#38b6ff;\\">A</div><a title=\\"categories\\" href=\\"/\\" style=\\"--background-image:url('/public/images/category.svg');\\"></a><a title=\\"connections\\" href=\\"/connection\\" style=\\"--background-image:url('/public/images/connection.svg');\\"></a><a title=\\"queries\\" href=\\"/queries\\" style=\\"--background-image:url('/public/images/query.svg');\\"></a><a title=\\"credentials\\" href=\\"/credentials\\" data-active style=\\"--background-image:url('/public/images/credential.svg');\\"></a><a title=\\"settings\\" href=\\"/settings\\" style=\\"--background-image:url('/public/images/setting.svg');\\"></a></nav><main><div id=\\"content-header\\"><h1>Credential Management</h1><div id=\\"content-header-nav\\"><a title=\\"home\\" class=\\"nav icon\\" href=\\"/\\"></a><a title=\\"Credential Management\\" href=\\"/credentials\\">Credential Management</a></div></div><div id=\\"content-main\\" hx-get=\\"/credentials\\" hx-trigger=\\"every 10s\\" hx-select=\\"#search-results\\" hx-target=\\"#search-results\\" hx-swap=\\"outerHTML\\" hx-include=\\"#queries-search-input\\"><div class=\\"list-page-header\\"><span>Credential Management</span><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>New Credential</span></a></div><div class=\\"list-page \\"><div class=\\"list-nav\\"><span>Credentials</span><input id=\\"queries-search-input\\" class=\\"search-window\\" type=\\"search\\" name=\\"search\\" value=\\"\\" placeholder=\\"Search\\" hx-get=\\"/credentials\\" hx-trigger=\\"input changed delay:500ms, search\\" hx-target=\\"#search-results\\" hx-select=\\"#search-results\\" hx-swap=\\"outerHTML\\"/></div><table class=\\"list-page\\"><thead><th><span>Company Name</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Credential Type</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Relationship</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Status</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Actions</span><a class=\\"list-filter-icon icon disabled\\"></a></th></thead><tbody id=\\"search-results\\"><tr><td>CARE ONUS LTD</td><td>Supplier credential</td><td><p>Sender</p></td><td><div class=\\"list-item-status\\" data-status=\\"success\\">Completed</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/dot-icon.svg&#34;);\\"></div><span>View Credential</span></a></td></tr><tr><td>DIGITAL CATAPULT</td><td>Supplier credential</td><td><p>Recipient</p></td><td><div class=\\"list-item-status\\" data-status=\\"success\\">Completed</div></td><td><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"outlined\\"><div style=\\"--button-icon:url(&#34;/public/images/dot-icon.svg&#34;);\\"></div><span>View Credential</span></a></td></tr></tbody></table></div></div></main></body></html>"`;
 
-exports[`CredentialsTemplates listPage renders with no credentials 1`] = `"<!DOCTYPE html><html lang=\\"en\\"><head><script src=\\"/lib/htmx.org/htmx.min.js\\"></script><script src=\\"/lib/htmx-ext-json-enc/json-enc.js\\"></script><script src=\\"/public/scripts/auth-redirect.js\\"></script><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon-dark.ico\\" media=\\"(prefers-color-scheme: dark)\\"/><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon.ico\\" media=\\"(prefers-color-scheme: light), (prefers-color-scheme: no-preference)\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/main.css\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/query.css\\"/><title>Veritable - Credentials</title></head><body hx-ext=\\"json-enc\\"><nav id=\\"side-bar\\"><a id=\\"veritable-logo\\" href=\\"/about\\"></a><div class=\\"profile-icon\\" style=\\"background-color:#38b6ff;\\">A</div><a title=\\"categories\\" href=\\"/\\" style=\\"--background-image:url('/public/images/category.svg');\\"></a><a title=\\"connections\\" href=\\"/connection\\" style=\\"--background-image:url('/public/images/connection.svg');\\"></a><a title=\\"queries\\" href=\\"/queries\\" style=\\"--background-image:url('/public/images/query.svg');\\"></a><a title=\\"credentials\\" href=\\"/credentials\\" data-active style=\\"--background-image:url('/public/images/credential.svg');\\"></a><a title=\\"settings\\" href=\\"/settings\\" style=\\"--background-image:url('/public/images/setting.svg');\\"></a></nav><main><div id=\\"content-header\\"><h1>Credential Management</h1><div id=\\"content-header-nav\\"><a title=\\"home\\" class=\\"nav icon\\" href=\\"/\\"></a><a title=\\"Credential Management\\" href=\\"/credentials\\">Credential Management</a></div></div><div id=\\"content-main\\" hx-get=\\"/credentials\\" hx-trigger=\\"every 10s\\" hx-select=\\"#search-results\\" hx-target=\\"#search-results\\" hx-swap=\\"outerHTML\\" hx-include=\\"#queries-search-input\\"><div class=\\"list-page-header\\"><span>Credential Management</span><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>New Credential</span></a></div><div class=\\"list-page \\"><div class=\\"list-nav\\"><span>Credentials</span><input id=\\"queries-search-input\\" class=\\"search-window\\" type=\\"search\\" name=\\"search\\" value=\\"\\" placeholder=\\"Search\\" hx-get=\\"/credentials\\" hx-trigger=\\"input changed delay:500ms, search\\" hx-target=\\"#search-results\\" hx-select=\\"#search-results\\" hx-swap=\\"outerHTML\\"/></div><table class=\\"list-page\\"><thead><th><span>Company Name</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Credential Type</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Direction</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Crendetial status</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Actions</span><a class=\\"list-filter-icon icon disabled\\"></a></th></thead><tbody id=\\"search-results\\"><tr><td>No Credentials found</td></tr></tbody></table></div></div></main></body></html>"`;
+exports[`CredentialsTemplates listPage renders with no credentials 1`] = `"<!DOCTYPE html><html lang=\\"en\\"><head><script src=\\"/lib/htmx.org/htmx.min.js\\"></script><script src=\\"/lib/htmx-ext-json-enc/json-enc.js\\"></script><script src=\\"/public/scripts/auth-redirect.js\\"></script><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon-dark.ico\\" media=\\"(prefers-color-scheme: dark)\\"/><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon.ico\\" media=\\"(prefers-color-scheme: light), (prefers-color-scheme: no-preference)\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/main.css\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/query.css\\"/><title>Veritable - Credentials</title></head><body hx-ext=\\"json-enc\\"><nav id=\\"side-bar\\"><a id=\\"veritable-logo\\" href=\\"/about\\"></a><div class=\\"profile-icon\\" style=\\"background-color:#38b6ff;\\">A</div><a title=\\"categories\\" href=\\"/\\" style=\\"--background-image:url('/public/images/category.svg');\\"></a><a title=\\"connections\\" href=\\"/connection\\" style=\\"--background-image:url('/public/images/connection.svg');\\"></a><a title=\\"queries\\" href=\\"/queries\\" style=\\"--background-image:url('/public/images/query.svg');\\"></a><a title=\\"credentials\\" href=\\"/credentials\\" data-active style=\\"--background-image:url('/public/images/credential.svg');\\"></a><a title=\\"settings\\" href=\\"/settings\\" style=\\"--background-image:url('/public/images/setting.svg');\\"></a></nav><main><div id=\\"content-header\\"><h1>Credential Management</h1><div id=\\"content-header-nav\\"><a title=\\"home\\" class=\\"nav icon\\" href=\\"/\\"></a><a title=\\"Credential Management\\" href=\\"/credentials\\">Credential Management</a></div></div><div id=\\"content-main\\" hx-get=\\"/credentials\\" hx-trigger=\\"every 10s\\" hx-select=\\"#search-results\\" hx-target=\\"#search-results\\" hx-swap=\\"outerHTML\\" hx-include=\\"#queries-search-input\\"><div class=\\"list-page-header\\"><span>Credential Management</span><a class=\\"button disabled\\" href=\\"#\\" data-variant=\\"filled\\"><div style=\\"--button-icon:url(&#34;/public/images/plus.svg&#34;);\\"></div><span>New Credential</span></a></div><div class=\\"list-page \\"><div class=\\"list-nav\\"><span>Credentials</span><input id=\\"queries-search-input\\" class=\\"search-window\\" type=\\"search\\" name=\\"search\\" value=\\"\\" placeholder=\\"Search\\" hx-get=\\"/credentials\\" hx-trigger=\\"input changed delay:500ms, search\\" hx-target=\\"#search-results\\" hx-select=\\"#search-results\\" hx-swap=\\"outerHTML\\"/></div><table class=\\"list-page\\"><thead><th><span>Company Name</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Credential Type</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Relationship</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Status</span><a class=\\"list-filter-icon icon disabled\\"></a></th><th><span>Actions</span><a class=\\"list-filter-icon icon disabled\\"></a></th></thead><tbody id=\\"search-results\\"><tr><td>No Credentials found</td></tr></tbody></table></div></div></main></body></html>"`;
diff --git a/src/views/credentials/index.tsx b/src/views/credentials/index.tsx
index c0272f7c..cbe3e9fe 100644
--- a/src/views/credentials/index.tsx
+++ b/src/views/credentials/index.tsx
@@ -4,7 +4,7 @@ import { credentialStatusToClass, LinkButton, Page } from '../common.js'
 
 import type { Credential } from '../../models/veritableCloudagent/internal.js'
 
-export type ExtendedCredential = Credential & { companyName: string; type: 'Supplier credentials' }
+export type ExtendedCredential = Credential & { companyName: string; type: 'Supplier credential' }
 
 @singleton()
 export default class CredentialListTemplates {
@@ -13,9 +13,9 @@ export default class CredentialListTemplates {
   private roleToDirection = (role: Credential['role']): JSX.Element => {
     switch (role) {
       case 'holder':
-        return <p>Received</p>
+        return <p>Recipient</p>
       case 'issuer':
-        return <p>Given</p>
+        return <p>Sender</p>
       default:
         return <p>unknown</p>
     }
@@ -31,6 +31,14 @@ export default class CredentialListTemplates {
   }
 
   public listPage = (credentials: ExtendedCredential[], search: string = '') => {
+    // function adjustInputWidth(input: any) {
+    //   const span = document.getElementById('width-span')
+
+    //   // span.textContent = input.value || input.placeholder
+
+    //   return '200px'
+    // }
+
     return (
       <Page
         title="Veritable - Credentials"
@@ -74,7 +82,7 @@ export default class CredentialListTemplates {
           </div>
           <table class="list-page">
             <thead>
-              {['Company Name', 'Credential Type', 'Direction', 'Crendetial status', 'Actions'].map((name: string) => (
+              {['Company Name', 'Credential Type', 'Relationship', 'Status', 'Actions'].map((name: string) => (
                 <th>
                   <span>{Html.escapeHtml(name || 'unknown')}</span>
                   <a class="list-filter-icon icon disabled" />
diff --git a/src/views/homepage/__tests__/homepage.test.ts.snap b/src/views/homepage/__tests__/homepage.test.ts.snap
index f38525cc..5f398e7b 100644
--- a/src/views/homepage/__tests__/homepage.test.ts.snap
+++ b/src/views/homepage/__tests__/homepage.test.ts.snap
@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`HomepageTemplates should render homepage 1`] = `"<!DOCTYPE html><html lang=\\"en\\"><head><script src=\\"/lib/htmx.org/htmx.min.js\\"></script><script src=\\"/lib/htmx-ext-json-enc/json-enc.js\\"></script><script src=\\"/public/scripts/auth-redirect.js\\"></script><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon-dark.ico\\" media=\\"(prefers-color-scheme: dark)\\"/><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon.ico\\" media=\\"(prefers-color-scheme: light), (prefers-color-scheme: no-preference)\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/main.css\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/homepage.css\\"/><title>Veritable - Homepage</title></head><body hx-ext=\\"json-enc\\"><nav id=\\"side-bar\\"><a id=\\"veritable-logo\\" href=\\"/about\\"></a><div class=\\"profile-icon\\" style=\\"background-color:#38b6ff;\\">A</div><a title=\\"categories\\" href=\\"/\\" data-active style=\\"--background-image:url('/public/images/category.svg');\\"></a><a title=\\"connections\\" href=\\"/connection\\" style=\\"--background-image:url('/public/images/connection.svg');\\"></a><a title=\\"queries\\" href=\\"/queries\\" style=\\"--background-image:url('/public/images/query.svg');\\"></a><a title=\\"credentials\\" href=\\"/credentials\\" style=\\"--background-image:url('/public/images/credential.svg');\\"></a><a title=\\"settings\\" href=\\"/settings\\" style=\\"--background-image:url('/public/images/setting.svg');\\"></a></nav><main><div id=\\"content-header\\"><h1>Homepage</h1><div id=\\"content-header-nav\\"><a title=\\"home\\" class=\\"nav icon\\" href=\\"/\\"></a><a title=\\"\\" href=\\"/\\"></a></div></div><div id=\\"content-main\\"><div id=\\"homepage-container\\"><a href=\\"/connection\\"><img src=\\"/public/images/connection.svg\\"/><h1>Onboard/Refer</h1><p>Easily onboard new companies or refer companies to join your network.</p></a><a href=\\"/queries\\"><img src=\\"/public/images/query.svg\\"/><h1>Queries</h1><p>Ask and answer digitally verified questions from any of your contacts.</p></a><a href=\\"/credentials\\"><img src=\\"/public/images/credential.svg\\"/><h1>Credentials</h1><p>Manage and verify digital credentials securely within your network.</p></a><a href=\\"/settings\\"><img src=\\"/public/images/setting.svg\\"/><h1>Settings</h1><p>Manage your account preferences and profile settings.</p></a></div></div></main></body></html>"`;
+exports[`HomepageTemplates should render homepage 1`] = `"<!DOCTYPE html><html lang=\\"en\\"><head><script src=\\"/lib/htmx.org/htmx.min.js\\"></script><script src=\\"/lib/htmx-ext-json-enc/json-enc.js\\"></script><script src=\\"/public/scripts/auth-redirect.js\\"></script><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon-dark.ico\\" media=\\"(prefers-color-scheme: dark)\\"/><link rel=\\"icon\\" type=\\"image/ico\\" href=\\"/public/images/favicon.ico\\" media=\\"(prefers-color-scheme: light), (prefers-color-scheme: no-preference)\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/main.css\\"/><link rel=\\"stylesheet\\" type=\\"text/css\\" href=\\"/public/styles/homepage.css\\"/><title>Veritable - Homepage</title></head><body hx-ext=\\"json-enc\\"><nav id=\\"side-bar\\"><a id=\\"veritable-logo\\" href=\\"/about\\"></a><div class=\\"profile-icon\\" style=\\"background-color:#38b6ff;\\">A</div><a title=\\"categories\\" href=\\"/\\" data-active style=\\"--background-image:url('/public/images/category.svg');\\"></a><a title=\\"connections\\" href=\\"/connection\\" style=\\"--background-image:url('/public/images/connection.svg');\\"></a><a title=\\"queries\\" href=\\"/queries\\" style=\\"--background-image:url('/public/images/query.svg');\\"></a><a title=\\"credentials\\" href=\\"/credentials\\" style=\\"--background-image:url('/public/images/credential.svg');\\"></a><a title=\\"settings\\" href=\\"/settings\\" style=\\"--background-image:url('/public/images/setting.svg');\\"></a></nav><main><div id=\\"content-header\\"><h1>Homepage</h1><div id=\\"content-header-nav\\"><a title=\\"home\\" class=\\"nav icon\\" href=\\"/\\"></a></div></div><div id=\\"content-main\\"><div id=\\"homepage-container\\"><a href=\\"/connection\\"><img src=\\"/public/images/connection.svg\\"/><h1>Onboard/Refer</h1><p>Easily onboard new companies or refer companies to join your network.</p></a><a href=\\"/queries\\"><img src=\\"/public/images/query.svg\\"/><h1>Queries</h1><p>Ask and answer digitally verified questions from any of your contacts.</p></a><a href=\\"/credentials\\"><img src=\\"/public/images/credential.svg\\"/><h1>Credentials</h1><p>Manage and verify digital credentials securely within your network.</p></a><a href=\\"/settings\\"><img src=\\"/public/images/setting.svg\\"/><h1>Settings</h1><p>Manage your account preferences and profile settings.</p></a></div></div></main></body></html>"`;
diff --git a/src/views/homepage/homepage.tsx b/src/views/homepage/homepage.tsx
index 15681d21..42632d26 100644
--- a/src/views/homepage/homepage.tsx
+++ b/src/views/homepage/homepage.tsx
@@ -10,7 +10,7 @@ export default class HomepageTemplates {
         title="Veritable - Homepage"
         heading="Homepage"
         activePage="categories"
-        headerLinks={[{ name: '', url: '/' }]}
+        headerLinks={[]}
         stylesheets={['homepage.css']}
       >
         <div id="homepage-container">