diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+layout.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+layout.svelte
deleted file mode 100644
index 637bc25c1..000000000
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+layout.svelte
+++ /dev/null
@@ -1,19 +0,0 @@
-<script lang="ts">
-    import { onMount } from 'svelte';
-    import { page } from '$app/state';
-    import { realtime } from '$lib/stores/sdk';
-    import { Dependencies } from '$lib/constants';
-    import { invalidate } from '$app/navigation';
-
-    onMount(() => {
-        return realtime
-            .forProject(page.params.region, page.params.project)
-            .subscribe('console', (response) => {
-                if (response.events.includes('projects.*.proxy.*.update')) {
-                    invalidate(Dependencies.FUNCTION_DOMAINS);
-                }
-            });
-    });
-</script>
-
-<slot />
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte
index 7324c14cc..4f011faec 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte
@@ -96,6 +96,18 @@
                                         variant="secondary"
                                         content="Generating certificate"
                                         size="xs" />
+                                    {#if proxyRule.logs && proxyRule.logs.length > 0}
+                                        <Link
+                                            size="s"
+                                            variant="muted"
+                                            on:click={(e) => {
+                                                e.preventDefault();
+                                                selectedProxyRule = proxyRule;
+                                                showLogs = true;
+                                            }}>
+                                            View logs
+                                        </Link>
+                                    {/if}
                                 </Layout.Stack>
                             {:else if proxyRule.status === 'unverified'}
                                 <Layout.Stack direction="row" gap="s" alignItems="center">
@@ -104,21 +116,20 @@
                                         type="error"
                                         content="Certificate generation failed"
                                         size="xs" />
+                                    {#if proxyRule.logs && proxyRule.logs.length > 0}
+                                        <Link
+                                            size="s"
+                                            variant="muted"
+                                            on:click={(e) => {
+                                                e.preventDefault();
+                                                selectedProxyRule = proxyRule;
+                                                showLogs = true;
+                                            }}>
+                                            View logs
+                                        </Link>
+                                    {/if}
                                 </Layout.Stack>
                             {/if}
-
-                            {#if proxyRule.logs && proxyRule.logs.length > 0}
-                                <Link
-                                    size="s"
-                                    variant="muted"
-                                    on:click={(e) => {
-                                        e.preventDefault();
-                                        selectedProxyRule = proxyRule;
-                                        showLogs = true;
-                                    }}>
-                                    View logs
-                                </Link>
-                            {/if}
                         </Layout.Stack>
                     {:else if column.id === 'target'}
                         {proxyTarget(proxyRule)}
diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/+layout.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/+layout.svelte
deleted file mode 100644
index bcfc8fb52..000000000
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/+layout.svelte
+++ /dev/null
@@ -1,19 +0,0 @@
-<script lang="ts">
-    import { onMount } from 'svelte';
-    import { page } from '$app/state';
-    import { realtime } from '$lib/stores/sdk';
-    import { Dependencies } from '$lib/constants';
-    import { invalidate } from '$app/navigation';
-
-    onMount(() => {
-        return realtime
-            .forProject(page.params.region, page.params.project)
-            .subscribe('console', (response) => {
-                if (response.events.includes('projects.*.proxy.*.update')) {
-                    invalidate(Dependencies.DOMAINS);
-                }
-            });
-    });
-</script>
-
-<slot />
diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte
index bac932100..4471fcbeb 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte
@@ -103,6 +103,18 @@
                                         variant="secondary"
                                         content="Generating certificate"
                                         size="xs" />
+                                    {#if domain.logs && domain.logs.length > 0}
+                                        <Link
+                                            size="s"
+                                            variant="muted"
+                                            on:click={(e) => {
+                                                e.preventDefault();
+                                                selectedDomain = domain;
+                                                showLogs = true;
+                                            }}>
+                                            View logs
+                                        </Link>
+                                    {/if}
                                 </Layout.Stack>
                             {:else if domain.status === 'unverified'}
                                 <Layout.Stack direction="row" gap="s" alignItems="center">
@@ -111,21 +123,20 @@
                                         type="error"
                                         content="Certificate generation failed"
                                         size="xs" />
+                                    {#if domain.logs && domain.logs.length > 0}
+                                        <Link
+                                            size="s"
+                                            variant="muted"
+                                            on:click={(e) => {
+                                                e.preventDefault();
+                                                selectedDomain = domain;
+                                                showLogs = true;
+                                            }}>
+                                            View logs
+                                        </Link>
+                                    {/if}
                                 </Layout.Stack>
                             {/if}
-
-                            {#if domain.logs && domain.logs.length > 0}
-                                <Link
-                                    size="s"
-                                    variant="muted"
-                                    on:click={(e) => {
-                                        e.preventDefault();
-                                        selectedDomain = domain;
-                                        showLogs = true;
-                                    }}>
-                                    View logs
-                                </Link>
-                            {/if}
                         </Layout.Stack>
                     {:else if column.id === 'updated'}
                         <Layout.Stack direction="row" justifyContent="flex-end">
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+layout.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+layout.svelte
deleted file mode 100644
index 0f63ee423..000000000
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+layout.svelte
+++ /dev/null
@@ -1,19 +0,0 @@
-<script lang="ts">
-    import { onMount } from 'svelte';
-    import { page } from '$app/state';
-    import { realtime } from '$lib/stores/sdk';
-    import { Dependencies } from '$lib/constants';
-    import { invalidate } from '$app/navigation';
-
-    onMount(() => {
-        return realtime
-            .forProject(page.params.region, page.params.project)
-            .subscribe('console', (response) => {
-                if (response.events.includes('projects.*.proxy.*.update')) {
-                    invalidate(Dependencies.SITES_DOMAINS);
-                }
-            });
-    });
-</script>
-
-<slot />
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte
index 6ac47471d..9c78f780e 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte
@@ -97,6 +97,18 @@
                                         variant="secondary"
                                         content="Generating certificate"
                                         size="xs" />
+                                    {#if rule.logs && rule.logs.length > 0}
+                                        <Link
+                                            size="s"
+                                            variant="muted"
+                                            on:click={(e) => {
+                                                e.preventDefault();
+                                                selectedProxyRule = rule;
+                                                showLogs = true;
+                                            }}>
+                                            View logs
+                                        </Link>
+                                    {/if}
                                 </Layout.Stack>
                             {:else if rule.status === 'unverified'}
                                 <Layout.Stack direction="row" gap="s" alignItems="center">
@@ -105,21 +117,20 @@
                                         type="error"
                                         content="Certificate generation failed"
                                         size="xs" />
+                                    {#if rule.logs && rule.logs.length > 0}
+                                        <Link
+                                            size="s"
+                                            variant="muted"
+                                            on:click={(e) => {
+                                                e.preventDefault();
+                                                selectedProxyRule = rule;
+                                                showLogs = true;
+                                            }}>
+                                            View logs
+                                        </Link>
+                                    {/if}
                                 </Layout.Stack>
                             {/if}
-
-                            {#if rule.logs && rule.logs.length > 0}
-                                <Link
-                                    size="s"
-                                    variant="muted"
-                                    on:click={(e) => {
-                                        e.preventDefault();
-                                        selectedProxyRule = rule;
-                                        showLogs = true;
-                                    }}>
-                                    View logs
-                                </Link>
-                            {/if}
                         </Layout.Stack>
                     {:else if column.id === 'target'}
                         {proxyTarget(rule)}