diff --git a/assets/components/search/DomainDiagram.tsx b/assets/components/search/DomainDiagram.tsx
index 6397454..86f4e7e 100644
--- a/assets/components/search/DomainDiagram.tsx
+++ b/assets/components/search/DomainDiagram.tsx
@@ -14,11 +14,11 @@ export function DomainDiagram({domain}: { domain: Domain }) {
     useEffect(() => {
         const e = getLayoutedElements([
             domainToNode(domain),
-            ...domainEntitiesToNode(domain),
+            ...domainEntitiesToNode(domain, true),
             tldToNode(domain.tld),
             ...domain.nameservers.map(nsToNode)
         ].flat(), [
-            domainEntitiesToEdges(domain),
+            domainEntitiesToEdges(domain, true),
             tldToEdge(domain),
             ...domainNSToEdges(domain)
         ].flat())
@@ -30,7 +30,7 @@ export function DomainDiagram({domain}: { domain: Domain }) {
     return <Flex style={{width: '80vw', height: '80vh'}}>
         <ReactFlow
             fitView
-            colorMode='system'
+            colorMode='dark'
             nodesConnectable={false}
             edgesReconnectable={false}
             nodes={nodes}
diff --git a/assets/components/tracking/watchlist/diagram/watchlistToEdges.tsx b/assets/components/tracking/watchlist/diagram/watchlistToEdges.tsx
index 24df8fb..7284258 100644
--- a/assets/components/tracking/watchlist/diagram/watchlistToEdges.tsx
+++ b/assets/components/tracking/watchlist/diagram/watchlistToEdges.tsx
@@ -4,16 +4,17 @@ import {t} from "ttag";
 
 const rolesToColor = (roles: string[]) => roles.includes('registrant') ? 'green' :
     roles.includes('administrative') ? 'blue' :
-        roles.includes('technical') ? 'orange' : 'violet'
+        roles.includes('technical') ? 'orange' :
+            roles.includes('registrar') ? 'violet' : 'white'
 
-export function domainEntitiesToEdges(d: Domain) {
+export function domainEntitiesToEdges(d: Domain, withRegistrar = false) {
     const domainRole = translateRoles()
     return d.entities
-        .filter(e => !e.roles.includes('registrar')) //
+        .filter(e => !withRegistrar ? !e.roles.includes('registrar') : true)
         .map(e => ({
             id: `e-${d.ldhName}-${e.entity.handle}`,
-            source: e.roles.includes('registrant') ? e.entity.handle : d.ldhName,
-            target: e.roles.includes('registrant') ? d.ldhName : e.entity.handle,
+            source: e.roles.includes('registrant') || e.roles.includes('registrar') ? e.entity.handle : d.ldhName,
+            target: e.roles.includes('registrant') || e.roles.includes('registrar') ? d.ldhName : e.entity.handle,
             style: {stroke: rolesToColor(e.roles), strokeWidth: 3},
             label: e.roles
                 .map(r => Object.keys(domainRole).includes(r) ? domainRole[r as keyof typeof domainRole] : r)
@@ -40,7 +41,7 @@ export const tldToEdge = (d: Domain) => ({
 })
 
 export function watchlistToEdges(watchlist: Watchlist) {
-    const entitiesEdges = watchlist.domains.map(domainEntitiesToEdges).flat()
+    const entitiesEdges = watchlist.domains.map(d => domainEntitiesToEdges(d)).flat()
     const nameserversEdges = watchlist.domains.map(domainNSToEdges).flat()
 
     return [...entitiesEdges, ...nameserversEdges]
diff --git a/assets/components/tracking/watchlist/diagram/watchlistToNodes.tsx b/assets/components/tracking/watchlist/diagram/watchlistToNodes.tsx
index 2a1d015..30186cb 100644
--- a/assets/components/tracking/watchlist/diagram/watchlistToNodes.tsx
+++ b/assets/components/tracking/watchlist/diagram/watchlistToNodes.tsx
@@ -11,8 +11,8 @@ export const domainToNode = (d: Domain) => ({
     }
 })
 
-export const domainEntitiesToNode = (d: Domain) => d.entities
-    .filter(e => !e.roles.includes('registrar')) //
+export const domainEntitiesToNode = (d: Domain, withRegistrar = false) => d.entities
+    .filter(e => !withRegistrar ? !e.roles.includes('registrar') : true)
     .map(e => {
         const jCard = vCard.fromJSON(e.entity.jCard)
         let label = e.entity.handle
@@ -46,7 +46,7 @@ export const nsToNode = (ns: Nameserver) => ({
 export function watchlistToNodes(watchlist: Watchlist) {
 
     const domains = watchlist.domains.map(domainToNode)
-    const entities = [...new Set(watchlist.domains.map(domainEntitiesToNode).flat())]
+    const entities = [...new Set(watchlist.domains.map(d => domainEntitiesToNode(d)).flat())]
     const tlds = [...new Set(watchlist.domains.map(d => d.tld))].map(tldToNode)
     const nameservers = [...new Set(watchlist.domains.map(d => d.nameservers))].flat().map(nsToNode)
 
diff --git a/assets/utils/index.ts b/assets/utils/index.ts
index f3e2911..f7ad570 100644
--- a/assets/utils/index.ts
+++ b/assets/utils/index.ts
@@ -16,7 +16,7 @@ export function showErrorAPI(e: AxiosError, messageApi: MessageInstance): Messag
 
     if (response.status === 429) {
         const duration = response.headers['retry-after']
-        return messageApi.error(t`Please retry after ${duration} seconds`)
+        return messageApi.error(t`Please retry after ${duration} minutes`)
     }
 
     if (response.status.toString()[0] === '4') {
diff --git a/translations/translations.pot b/translations/translations.pot
index 3d52be2..6b95a37 100644
--- a/translations/translations.pot
+++ b/translations/translations.pot
@@ -325,7 +325,7 @@ msgstr ""
 msgid "Watchlist Entity Diagram"
 msgstr ""
 
-#: assets/components/tracking/watchlist/diagram/watchlistToEdges.tsx:39
+#: assets/components/tracking/watchlist/diagram/watchlistToEdges.tsx:40
 msgid "Registry"
 msgstr ""
 
@@ -607,7 +607,7 @@ msgstr ""
 
 #: assets/utils/index.ts:19
 #, javascript-format
-msgid "Please retry after ${ duration } seconds"
+msgid "Please retry after ${ duration } minutes"
 msgstr ""
 
 #: assets/utils/index.ts:23