diff --git a/antora.yml b/antora.yml
index 0d774e19..b90229b2 100644
--- a/antora.yml
+++ b/antora.yml
@@ -1,5 +1,6 @@
 name: devon4j
 title: Devon4j
 version: '1.0'
+start_page: ROOT::index.adoc
 nav:
 - modules/ROOT/nav.adoc
diff --git a/modules/ROOT/pages/architecture.adoc b/modules/ROOT/pages/architecture.adoc
index 81e9e15b..cf17f9af 100644
--- a/modules/ROOT/pages/architecture.adoc
+++ b/modules/ROOT/pages/architecture.adoc
@@ -1,5 +1,3 @@
-:toc: macro
-toc::[]
 :idprefix:
 :idseparator: -
 
diff --git a/modules/ROOT/pages/coding-conventions.adoc b/modules/ROOT/pages/coding-conventions.adoc
index 1479c5b4..96b2be3b 100644
--- a/modules/ROOT/pages/coding-conventions.adoc
+++ b/modules/ROOT/pages/coding-conventions.adoc
@@ -1,5 +1,4 @@
 :toc: macro
-toc::[]
 
 == Coding Conventions
 
diff --git a/modules/ROOT/pages/guide-service-client.adoc b/modules/ROOT/pages/guide-service-client.adoc
index ab1ec6cf..f12d48c1 100644
--- a/modules/ROOT/pages/guide-service-client.adoc
+++ b/modules/ROOT/pages/guide-service-client.adoc
@@ -13,8 +13,8 @@ Various solutions already exist for calling services, such as `RestTemplate` fro
 
 *Spring*
 
-For Spring, follow the link:spring/guide-service-client-spring.adoc[Spring rest-client guide].
+For Spring, follow the xref:spring/guide-service-client-spring.adoc[Spring rest-client guide].
 
 *Quarkus*
 
-For Quarkus, we recommend to follow the the official xref:https://quarkus.io/guides/rest-client[Quarkus rest-client guide]
+For Quarkus, we recommend to follow the the official https://quarkus.io/guides/rest-client[Quarkus rest-client guide]