diff --git a/ui/src/routes/+layout.svelte b/ui/src/routes/+layout.svelte
index 90a93f0..366e641 100644
--- a/ui/src/routes/+layout.svelte
+++ b/ui/src/routes/+layout.svelte
@@ -38,8 +38,8 @@
  }
 
  let title = 'happyDomain';
- $: if ($page.data.selectedDomain) {
-     title = $page.data.selectedDomain.domain.substring(0, $page.data.selectedDomain.domain.length - 1) + ' - happyDomain';
+ $: if ($page.data.domain) {
+     title = $page.data.domain.domain.substring(0, $page.data.domain.domain.length - 1) + ' - happyDomain';
  } else {
      title = 'happyDomain';
  }
diff --git a/ui/src/routes/domains/[dn]/+layout.svelte b/ui/src/routes/domains/[dn]/+layout.svelte
new file mode 100644
index 0000000..519450a
--- /dev/null
+++ b/ui/src/routes/domains/[dn]/+layout.svelte
@@ -0,0 +1,304 @@
+<script lang="ts">
+ import { tick } from 'svelte';
+ import { goto, invalidateAll } from '$app/navigation';
+ import { page } from '$app/stores';
+
+ // @ts-ignore
+ import { escape } from 'html-escaper';
+ import {
+     Button,
+     ButtonDropdown,
+     ButtonGroup,
+     Col,
+     Container,
+     DropdownItem,
+     DropdownMenu,
+     DropdownToggle,
+     Icon,
+     Input,
+     Row,
+     Spinner,
+ } from 'sveltestrap';
+
+ import {
+     getDomain as APIGetDomain,
+     deleteDomain as APIDeleteDomain,
+ } from '$lib/api/domains';
+ import ModalDiffZone, { controls as ctrlDiffZone } from '$lib/components/ModalDiffZone.svelte';
+ import ModalDomainDelete, { controls as ctrlDomainDelete } from '$lib/components/ModalDomainDelete.svelte';
+ import ModalUploadZone, { controls as ctrlUploadZone } from '$lib/components/ModalUploadZone.svelte';
+ import ModalViewZone, { controls as ctrlViewZone } from '$lib/components/ModalViewZone.svelte';
+ import NewSubdomainPath, { controls as ctrlNewSubdomain } from '$lib/components/NewSubdomainPath.svelte';
+ import NewSubdomainModal from '$lib/components/domains/NewSubdomainModal.svelte';
+ import { fqdn } from '$lib/dns';
+ import type { Domain, DomainInList } from '$lib/model/domain';
+ import type { ZoneMeta } from '$lib/model/zone';
+ import { domains, domains_by_groups, domains_idx, refreshDomains } from '$lib/stores/domains';
+ import { retrieveZone as StoreRetrieveZone, sortedDomains, thisZone } from '$lib/stores/thiszone';
+ import { t } from '$lib/translations';
+
+ export let data: {domain: DomainInList;};
+
+ let selectedDomain = data.domain.domain;
+ $: if (selectedDomain != data.domain.domain) {
+     goto('/domains/' + encodeURIComponent(selectedDomain) + ($page.data.isAuditPage ? '/logs' : ($page.data.isHistoryPage ? '/history' : '')));
+ }
+
+ let selectedHistory: string | undefined;
+ $: selectedHistory = $page.data.history;
+
+ let retrievalInProgress = false;
+ async function retrieveZone(): void {
+     retrievalInProgress = true;
+     retrieveZoneDone(await StoreRetrieveZone(data.domain));
+ }
+
+ function retrieveZoneDone(zm: ZoneMeta): void {
+     retrievalInProgress = false;
+     if ($page.data.history) {
+         selectedHistory = zm.id;
+     } else {
+         invalidateAll();
+     }
+ }
+
+ async function getDomain(id: string): Promise<Domain> {
+     return await APIGetDomain(id);
+ }
+
+ function viewZone(): void {
+     if (!selectedHistory) {
+         return;
+     }
+
+     ctrlViewZone.Open(data.domain, selectedHistory);
+ }
+
+ function showDiff(): void {
+     if (!selectedHistory) {
+         return;
+     }
+
+     ctrlDiffZone.Open(data.domain, selectedHistory);
+ }
+
+ let deleteInProgress = false;
+ function detachDomain(): void {
+     deleteInProgress = true;
+     APIDeleteDomain($domains_idx[selectedDomain].id).then(
+         () => {
+             refreshDomains().then(() => {
+                 deleteInProgress = false;
+                 goto('/domains');
+             }, () => {
+                 deleteInProgress = false;
+                 goto('/domains');
+             });
+         },
+         (err: any) => {
+             deleteInProgress = false;
+             throw err;
+         }
+     );
+ }
+</script>
+
+<Container
+    fluid
+    class="d-flex flex-column flex-fill"
+>
+    <Row
+        class="flex-fill"
+    >
+        <Col
+            sm={4}
+            md={3}
+            class="bg-light py-2 sticky-top d-flex flex-column justify-content-between"
+            style="overflow-y: auto; max-height: 100vh; z-index: 0"
+        >
+            {#if $domains_idx[selectedDomain]}
+                <div class="d-flex">
+                    <Button href="/domains/" class="fw-bolder" color="link">
+                        <Icon name="chevron-up" />
+                    </Button>
+                    <Input
+                        type="select"
+                        bind:value={selectedDomain}
+                    >
+                        {#each Object.keys($domains_by_groups) as gname}
+                            {@const group = $domains_by_groups[gname]}
+                            <optgroup label={gname=="undefined"?$t("domaingroups.no-group"):gname}>
+                                {#each group as domain}
+                                    <option value={domain.domain}>{domain.domain}</option>
+                                {/each}
+                            </optgroup>
+                        {/each}
+                    </Input>
+                </div>
+
+                {#if $page.data.isHistoryPage || $page.data.isAuditPage}
+                    <Button
+                        class="mt-2"
+                        outline
+                        color="primary"
+                        href={"/domains/" + encodeURIComponent(data.domain.domain)}
+                    >
+                        <Icon name="chevron-left" />
+                        Retour à la zone
+                    </Button>
+                {:else if $page.data.streamed && $sortedDomains}
+                    <div class="d-flex gap-2 pb-2 sticky-top bg-light" style="padding-top: 10px">
+                        <Button
+                            type="button"
+                            color="secondary"
+                            outline
+                            size="sm"
+                            class="flex-fill"
+                            on:click={() => ctrlNewSubdomain.Open()}
+                        >
+                            <Icon name="server" />
+                            {$t('domains.add-a-subdomain')}
+                        </Button>
+                        <ButtonDropdown>
+                            <DropdownToggle
+                                color="secondary"
+                                outline
+                                size="sm"
+                            >
+                                {#if retrievalInProgress}
+                                    <Spinner size="sm" />
+                                {:else}
+                                    <Icon name="wrench-adjustable-circle" aria-hidden="true" />
+                                {/if}
+                            </DropdownToggle>
+                            <DropdownMenu>
+                                <DropdownItem header class="font-monospace">
+                                    {data.domain.domain}
+                                </DropdownItem>
+                                <DropdownItem
+                                    href={`/domains/${data.domain.domain}/history`}
+                                >
+                                    {$t('domains.actions.history')}
+                                </DropdownItem>
+                                <DropdownItem
+                                    href={`/domains/${data.domain.domain}/logs`}
+                                >
+                                    {$t('domains.actions.audit')}
+                                </DropdownItem>
+                                <DropdownItem divider />
+                                <DropdownItem
+                                    on:click={viewZone}
+                                >
+                                    {$t('domains.actions.view')}
+                                </DropdownItem>
+                                <DropdownItem
+                                    on:click={retrieveZone}
+                                >
+                                    {$t('domains.actions.reimport')}
+                                </DropdownItem>
+                                <DropdownItem
+                                    on:click={ctrlUploadZone.Open}
+                                >
+                                    {$t('domains.actions.upload')}
+                                </DropdownItem>
+                                <DropdownItem divider />
+                                <DropdownItem disabled title="Coming soon...">
+                                    {$t('domains.actions.share')}
+                                </DropdownItem>
+                                <DropdownItem
+                                    on:click={() => ctrlDomainDelete.Open()}
+                                >
+                                    {$t('domains.stop')}
+                                </DropdownItem>
+                                <DropdownItem divider />
+                                <DropdownItem
+                                    href={"/providers/" + encodeURIComponent($domains_idx[selectedDomain].id_provider)}
+                                >
+                                    {$t('provider.update')}
+                                </DropdownItem>
+                            </DropdownMenu>
+                        </ButtonDropdown>
+                    </div>
+                    {#await $page.data.streamed.zone then z}
+                        <div style="min-height:0; overflow-y: auto;">
+                        {#each $sortedDomains as dn}
+                            <a
+                                href={'#' + (dn?dn:'@')}
+                                title={fqdn(dn, data.domain.domain)}
+                                class="d-block text-truncate font-monospace text-muted text-decoration-none"
+                                style={'max-width: none; padding-left: ' + (dn === '' ? 0 : (dn.split('.').length * 10)) + 'px'}
+                            >
+                                {fqdn(dn, data.domain.domain)}
+                            </a>
+                        {/each}
+                        </div>
+                    {/await}
+                {/if}
+
+                <div class="flex-fill" />
+
+                {#if $page.data.isZonePage && data.domain.zone_history && $domains_idx[selectedDomain] && data.domain.id === $domains_idx[selectedDomain].id}
+                    <ButtonGroup class="mt-2 w-100">
+                        {#if $domains_idx[selectedDomain].zone_history && selectedHistory === $domains_idx[selectedDomain].zone_history[0]}
+                            <Button
+                                size="lg"
+                                color="success"
+                                title={$t('domains.actions.propagate')}
+                                on:click={showDiff}
+                            >
+                                <Icon name="cloud-upload" aria-hidden="true" />
+                                {$t('domains.actions.propagate')}
+                            </Button>
+                        {:else}
+                            <Button
+                                size="lg"
+                                color="warning"
+                                title={$t('domains.actions.rollback')}
+                                on:click={showDiff}
+                            >
+                                <Icon name="cloud-upload" aria-hidden="true" />
+                                {$t('domains.actions.rollback')}
+                            </Button>
+                        {/if}
+                    </ButtonGroup>
+                    <p class="mt-2 mb-1 text-center">
+                        X changes
+                    </p>
+                {/if}
+            {:else}
+                <div class="mt-4 text-center">
+                    <Spinner color="primary" />
+                </div>
+            {/if}
+        </Col>
+        <Col
+            sm={8}
+            md={9}
+            class="d-flex"
+        >
+            <slot />
+        </Col>
+    </Row>
+</Container>
+
+<NewSubdomainPath
+    origin={data.domain}
+/>
+
+<ModalUploadZone
+    domain={data.domain}
+    {selectedHistory}
+    on:retrieveZoneDone={retrieveZoneDone}
+/>
+
+<ModalDomainDelete
+    on:detachDomain={detachDomain}
+/>
+
+<ModalViewZone />
+
+<ModalDiffZone
+    domain={data.domain}
+    {selectedHistory}
+    on:retrieveZoneDone={retrieveZoneDone}
+/>
diff --git a/ui/src/routes/domains/[dn]/+layout.ts b/ui/src/routes/domains/[dn]/+layout.ts
index 56f4046..0e2c01e 100644
--- a/ui/src/routes/domains/[dn]/+layout.ts
+++ b/ui/src/routes/domains/[dn]/+layout.ts
@@ -17,8 +17,14 @@ export const load: Load = async({ parent, params }) => {
 	});
     }
 
+    let historyid = undefined;
+    if (domain.zone_history && domain.zone_history.length > 0) {
+        historyid = domain.zone_history[0];
+    }
+
     return {
         domain,
+        history: historyid,
         ...data,
     }
 }
diff --git a/ui/src/routes/domains/[dn]/[[historyid]]/+layout.svelte b/ui/src/routes/domains/[dn]/[[historyid]]/+layout.svelte
index 9d73054..d25f9d0 100644
--- a/ui/src/routes/domains/[dn]/[[historyid]]/+layout.svelte
+++ b/ui/src/routes/domains/[dn]/[[historyid]]/+layout.svelte
@@ -1,51 +1,19 @@
 <script lang="ts">
- import { tick } from 'svelte';
- import { goto, invalidateAll } from '$app/navigation';
+ import { goto } from '$app/navigation';
 
- // @ts-ignore
- import { escape } from 'html-escaper';
  import {
-     Alert,
-     Button,
-     ButtonDropdown,
-     ButtonGroup,
-     Col,
-     Container,
-     DropdownItem,
-     DropdownMenu,
-     DropdownToggle,
-     Icon,
-     Input,
-     Row,
      Spinner,
  } from 'sveltestrap';
 
- import {
-     getDomain as APIGetDomain,
-     deleteDomain as APIDeleteDomain,
- } from '$lib/api/domains';
- import ModalDiffZone, { controls as ctrlDiffZone } from '$lib/components/ModalDiffZone.svelte';
- import ModalDomainDelete, { controls as ctrlDomainDelete } from '$lib/components/ModalDomainDelete.svelte';
- import ModalUploadZone, { controls as ctrlUploadZone } from '$lib/components/ModalUploadZone.svelte';
- import ModalViewZone, { controls as ctrlViewZone } from '$lib/components/ModalViewZone.svelte';
- import NewSubdomainPath, { controls as ctrlNewSubdomain } from '$lib/components/NewSubdomainPath.svelte';
  import NewServicePath from '$lib/components/NewServicePath.svelte';
- import NewSubdomainModal from '$lib/components/domains/NewSubdomainModal.svelte';
  import ServiceModal from '$lib/components/domains/ServiceModal.svelte';
- import { fqdn } from '$lib/dns';
- import type { Domain, DomainInList } from '$lib/model/domain';
- import type { ZoneMeta } from '$lib/model/zone';
- import { domains, domains_by_groups, domains_idx, refreshDomains } from '$lib/stores/domains';
- import { retrieveZone as StoreRetrieveZone, sortedDomains, thisZone } from '$lib/stores/thiszone';
+ import { domains_idx } from '$lib/stores/domains';
+ import { thisZone } from '$lib/stores/thiszone';
  import { t } from '$lib/translations';
 
- export let data: {domain: DomainInList; history: string;};
+ export let data: {domain: DomainInList; history: string; streamed: Object;};
 
  let selectedDomain = data.domain.domain;
- $: if (selectedDomain != data.domain.domain) {
-     goto('/domains/' + encodeURIComponent(selectedDomain));
- }
-
  let selectedHistory: string | undefined;
  $: selectedHistory = data.history;
  $: if (!data.history && $domains_idx[selectedDomain] && $domains_idx[selectedDomain].zone_history && $domains_idx[selectedDomain].zone_history.length > 0) {
@@ -55,266 +23,25 @@
      goto('/domains/' + encodeURIComponent(selectedDomain) + '/' + encodeURIComponent(selectedHistory));
  }
 
- let retrievalInProgress = false;
- async function retrieveZone(): void {
-     retrievalInProgress = true;
-     retrieveZoneDone(await StoreRetrieveZone(data.domain));
- }
-
- function retrieveZoneDone(zm: ZoneMeta): void {
-     retrievalInProgress = false;
-     if (data.history) {
-         selectedHistory = zm.id;
-     } else {
-         invalidateAll();
-     }
- }
-
- async function getDomain(id: string): Promise<Domain> {
-     return await APIGetDomain(id);
- }
-
- function viewZone(): void {
-     if (!selectedHistory) {
-         return;
-     }
-
-     ctrlViewZone.Open(data.domain, selectedHistory);
- }
-
- function showDiff(): void {
-     if (!selectedHistory) {
-         return;
-     }
-
-     ctrlDiffZone.Open(data.domain, selectedHistory);
- }
-
- let deleteInProgress = false;
- function detachDomain(): void {
-     deleteInProgress = true;
-     APIDeleteDomain($domains_idx[selectedDomain].id).then(
-         () => {
-             refreshDomains().then(() => {
-                 deleteInProgress = false;
-                 goto('/domains');
-             }, () => {
-                 deleteInProgress = false;
-                 goto('/domains');
-             });
-         },
-         (err: any) => {
-             deleteInProgress = false;
-             throw err;
-         }
-     );
- }
 </script>
 
-<Container
-    fluid
-    class="d-flex flex-column flex-fill"
->
-    <Row
-        class="flex-fill"
-    >
-        <Col
-            sm={4}
-            md={3}
-            class="bg-light py-2 sticky-top d-flex flex-column justify-content-between"
-            style="overflow-y: auto; max-height: 100vh; z-index: 0"
-        >
-            {#if $domains_idx[selectedDomain]}
-                <div class="d-flex">
-                    <Button href="/domains/" class="fw-bolder" color="link">
-                        <Icon name="chevron-up" />
-                    </Button>
-                    <Input
-                        type="select"
-                        bind:value={selectedDomain}
-                    >
-                        {#each Object.keys($domains_by_groups) as gname}
-                            {@const group = $domains_by_groups[gname]}
-                            <optgroup label={gname=="undefined"?$t("domaingroups.no-group"):gname}>
-                                {#each group as domain}
-                                    <option value={domain.domain}>{domain.domain}</option>
-                                {/each}
-                            </optgroup>
-                        {/each}
-                    </Input>
-                </div>
+{#if data.history == selectedHistory}
+    <slot />
+{:else}
+    <div class="mt-5 text-center flex-fill">
+        <Spinner label="Spinning" />
+        <p>{$t('wait.loading')}</p>
+    </div>
+{/if}
 
-                {#if data && data.streamed && $sortedDomains}
-                    <div class="d-flex gap-2 pb-2 sticky-top bg-light" style="padding-top: 10px">
-                        <Button
-                            type="button"
-                            color="secondary"
-                            outline
-                            size="sm"
-                            class="flex-fill"
-                            on:click={() => ctrlNewSubdomain.Open()}
-                        >
-                            <Icon name="server" />
-                            {$t('domains.add-a-subdomain')}
-                        </Button>
-                        <ButtonDropdown>
-                            <DropdownToggle
-                                color="secondary"
-                                outline
-                                size="sm"
-                            >
-                                {#if retrievalInProgress}
-                                    <Spinner size="sm" />
-                                {:else}
-                                    <Icon name="wrench-adjustable-circle" aria-hidden="true" />
-                                {/if}
-                            </DropdownToggle>
-                            <DropdownMenu>
-                                <DropdownItem header class="font-monospace">
-                                    {data.domain.domain}
-                                </DropdownItem>
-                                <DropdownItem
-                                    href={`/domains/${data.domain.domain}/history`}
-                                >
-                                    {$t('domains.actions.history')}
-                                </DropdownItem>
-                                <DropdownItem
-                                    href={`/domains/${data.domain.domain}/logs`}
-                                >
-                                    {$t('domains.actions.audit')}
-                                </DropdownItem>
-                                <DropdownItem divider />
-                                <DropdownItem
-                                    on:click={viewZone}
-                                >
-                                    {$t('domains.actions.view')}
-                                </DropdownItem>
-                                <DropdownItem
-                                    on:click={retrieveZone}
-                                >
-                                    {$t('domains.actions.reimport')}
-                                </DropdownItem>
-                                <DropdownItem
-                                    on:click={ctrlUploadZone.Open}
-                                >
-                                    {$t('domains.actions.upload')}
-                                </DropdownItem>
-                                <DropdownItem divider />
-                                <DropdownItem disabled title="Coming soon...">
-                                    {$t('domains.actions.share')}
-                                </DropdownItem>
-                                <DropdownItem
-                                    on:click={() => ctrlDomainDelete.Open()}
-                                >
-                                    {$t('domains.stop')}
-                                </DropdownItem>
-                                <DropdownItem divider />
-                                <DropdownItem
-                                    href={"/providers/" + encodeURIComponent($domains_idx[selectedDomain].id_provider)}
-                                >
-                                    {$t('provider.update')}
-                                </DropdownItem>
-                            </DropdownMenu>
-                        </ButtonDropdown>
-                    </div>
-                    {#await data.streamed.zone then z}
-                        <div style="min-height:0; overflow-y: auto;">
-                        {#each $sortedDomains as dn}
-                            <a
-                                href={'#' + (dn?dn:'@')}
-                                title={fqdn(dn, data.domain.domain)}
-                                class="d-block text-truncate font-monospace text-muted text-decoration-none"
-                                style={'max-width: none; padding-left: ' + (dn === '' ? 0 : (dn.split('.').length * 10)) + 'px'}
-                            >
-                                {fqdn(dn, data.domain.domain)}
-                            </a>
-                        {/each}
-                        </div>
-                    {/await}
-                {/if}
-
-                <div class="flex-fill" />
-
-                {#if data.domain.zone_history && $domains_idx[selectedDomain] && data.domain.id === $domains_idx[selectedDomain].id}
-                    <ButtonGroup class="mt-2 w-100">
-                        {#if $domains_idx[selectedDomain].zone_history && selectedHistory === $domains_idx[selectedDomain].zone_history[0]}
-                            <Button
-                                size="lg"
-                                color="success"
-                                title={$t('domains.actions.propagate')}
-                                on:click={showDiff}
-                            >
-                                <Icon name="cloud-upload" aria-hidden="true" />
-                                {$t('domains.actions.propagate')}
-                            </Button>
-                        {:else}
-                            <Button
-                                size="lg"
-                                color="warning"
-                                title={$t('domains.actions.rollback')}
-                                on:click={showDiff}
-                            >
-                                <Icon name="cloud-upload" aria-hidden="true" />
-                                {$t('domains.actions.rollback')}
-                            </Button>
-                        {/if}
-                    </ButtonGroup>
-                {/if}
-                <p class="mt-2 mb-1 text-center">
-                    X changes
-                </p>
-            {:else}
-                <div class="mt-4 text-center">
-                    <Spinner color="primary" />
-                </div>
-            {/if}
-        </Col>
-        <Col
-            sm={8}
-            md={9}
-            class="d-flex"
-        >
-            {#if data.history == selectedHistory}
-                <slot />
-            {:else}
-                <div class="mt-5 text-center flex-fill">
-                    <Spinner label="Spinning" />
-                    <p>{$t('wait.loading')}</p>
-                </div>
-            {/if}
-        </Col>
-    </Row>
-</Container>
-
-<NewSubdomainPath
-    origin={data.domain}
-/>
 {#await data.streamed.zone then zone}
     <NewServicePath
         origin={data.domain}
-        {zone}
+        zone={zone}
     />
     <ServiceModal
         origin={data.domain}
-        {zone}
+        zone={zone}
         on:update-zone-services={(event) => thisZone.set(event.detail)}
     />
 {/await}
-
-<ModalUploadZone
-    domain={data.domain}
-    {selectedHistory}
-    on:retrieveZoneDone={retrieveZoneDone}
-/>
-
-<ModalDomainDelete
-    on:detachDomain={detachDomain}
-/>
-
-<ModalViewZone />
-
-<ModalDiffZone
-    domain={data.domain}
-    {selectedHistory}
-    on:retrieveZoneDone={retrieveZoneDone}
-/>
diff --git a/ui/src/routes/domains/[dn]/[[historyid]]/+layout.ts b/ui/src/routes/domains/[dn]/[[historyid]]/+layout.ts
index 93ca344..1c707c2 100644
--- a/ui/src/routes/domains/[dn]/[[historyid]]/+layout.ts
+++ b/ui/src/routes/domains/[dn]/[[historyid]]/+layout.ts
@@ -31,11 +31,11 @@ export const load: Load = async({ parent, params }) => {
     const zone = getZone(domain, zoneId);
 
     return {
+        ...data,
         history: params.historyid,
         zoneId,
         streamed: {
             zone,
         },
-        ...data,
     }
 }
diff --git a/ui/src/routes/domains/[dn]/[[historyid]]/+page.ts b/ui/src/routes/domains/[dn]/[[historyid]]/+page.ts
new file mode 100644
index 0000000..36184be
--- /dev/null
+++ b/ui/src/routes/domains/[dn]/[[historyid]]/+page.ts
@@ -0,0 +1,10 @@
+import type { Load } from '@sveltejs/kit';
+
+export const load: Load = async({ parent }) => {
+    const data = await parent();
+
+    return {
+        ...data,
+        isZonePage: true,
+    }
+}