diff --git a/antora.yml b/antora.yml
index 915d9e2dc650db7e298b90dc155eb192057ea1fa..c78a8587300d2f4a65b3354405171e62df514c2c 100644
--- a/antora.yml
+++ b/antora.yml
@@ -8,12 +8,14 @@ asciidoc:
     listing-caption: Example@
     release-version: '2.0.12'
 nav:
-- modules/ROOT/nav.adoc
+- modules/ROOT/nav-top.adoc
 - modules/blocks/nav-basics.adoc
-- modules/attributes/nav.adoc
+- modules/attributes/nav-document.adoc
+- modules/attributes/nav-element.adoc
 - modules/document/nav.adoc
 - modules/sections/nav.adoc
 - modules/blocks/nav-paragraph.adoc
+- modules/blocks/nav-breaks.adoc
 - modules/text/nav.adoc
 - modules/lists/nav.adoc
 - modules/macros/nav.adoc
diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav-top.adoc
similarity index 100%
rename from modules/ROOT/nav.adoc
rename to modules/ROOT/nav-top.adoc
diff --git a/modules/attributes/nav.adoc b/modules/attributes/nav-document.adoc
similarity index 76%
rename from modules/attributes/nav.adoc
rename to modules/attributes/nav-document.adoc
index 5a8789247d368e841e3d0d47436a808f77c6842a..19c2fcef420276bbae2d06ea45858dde61afcfc8 100644
--- a/modules/attributes/nav.adoc
+++ b/modules/attributes/nav-document.adoc
@@ -11,8 +11,3 @@
 ** xref:reference-attributes.adoc[]
 *** xref:unresolved-references.adoc[]
 ** xref:assignment-precedence.adoc[]
-* xref:element-attributes.adoc[]
-** xref:positional-and-named-attributes.adoc[]
-** xref:ids.adoc[]
-** xref:options.adoc[]
-** xref:roles.adoc[]
diff --git a/modules/attributes/nav-element.adoc b/modules/attributes/nav-element.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..7a85c1f04ef5f222508d68ea91c2588a8dd59a54
--- /dev/null
+++ b/modules/attributes/nav-element.adoc
@@ -0,0 +1,5 @@
+* xref:element-attributes.adoc[]
+** xref:positional-and-named-attributes.adoc[]
+** xref:ids.adoc[]
+** xref:options.adoc[]
+** xref:roles.adoc[]
diff --git a/modules/blocks/nav-breaks.adoc b/modules/blocks/nav-breaks.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..0b76f6f075549563a162c3f989d240c8d8b13c38
--- /dev/null
+++ b/modules/blocks/nav-breaks.adoc
@@ -0,0 +1 @@
+* xref:breaks.adoc[]
diff --git a/modules/blocks/nav-paragraph.adoc b/modules/blocks/nav-paragraph.adoc
index 515b276f2cf6546592833fa2c7ac2e4d94f706f4..63a090666c0cad75daa569a4b1ddabcac5a78e12 100644
--- a/modules/blocks/nav-paragraph.adoc
+++ b/modules/blocks/nav-paragraph.adoc
@@ -2,4 +2,3 @@
 ** xref:hard-line-breaks.adoc[]
 ** xref:preamble-and-lead.adoc[]
 ** xref:paragraph-alignment.adoc[]
-* xref:breaks.adoc[]
diff --git a/modules/blocks/nav-styles.adoc b/modules/blocks/nav-styles.adoc
index 172ca89dc2f4e9e50bbdae4dc40981c6b722bf32..eac15e5e74550b4818b2ee4f0d9f1a516bac717e 100644
--- a/modules/blocks/nav-styles.adoc
+++ b/modules/blocks/nav-styles.adoc
@@ -1,5 +1,14 @@
+[]
 * xref:admonitions.adoc[]
+
+[]
 * xref:sidebars.adoc[]
+
+[]
 * xref:example-blocks.adoc[]
+
+[]
 * xref:blockquotes.adoc[]
+
+[]
 * xref:verses.adoc[]
diff --git a/modules/directives/nav.adoc b/modules/directives/nav.adoc
index 367f35e0d63ef0eda668f3c503c7a36d6590252f..0f4bcbb4cc5f487ad69919fdec64bdec2ee1b94b 100644
--- a/modules/directives/nav.adoc
+++ b/modules/directives/nav.adoc
@@ -6,6 +6,8 @@
 ** xref:include-tagged-regions.adoc[]
 ** xref:include-lines.adoc[]
 ** xref:include-uri.adoc[]
+
+[]
 * xref:conditionals.adoc[]
 ** xref:ifdef-ifndef.adoc[]
 ** xref:ifeval.adoc[]
diff --git a/modules/document/nav.adoc b/modules/document/nav.adoc
index d72600fb0f1ce255eff5ba9363d027f0cef73fc9..c3bcba1c7ef4ec815b0207211b727f9676418fe5 100644
--- a/modules/document/nav.adoc
+++ b/modules/document/nav.adoc
@@ -14,4 +14,6 @@
 *** xref:reference-revision-attributes.adoc[]
 ** xref:metadata.adoc[]
 ** xref:header-ref.adoc[]
+
+[]
 * xref:doctypes.adoc[]
diff --git a/modules/lists/nav.adoc b/modules/lists/nav.adoc
index da9cede3b59d07c8a3d9e6624fac5d971833dce3..645e71f9c9f2c757b1bad0b3057279c54ab8ab5e 100644
--- a/modules/lists/nav.adoc
+++ b/modules/lists/nav.adoc
@@ -3,5 +3,7 @@
 ** xref:ordered.adoc[]
 ** xref:checklist.adoc[]
 ** xref:continuation.adoc[]
+
+[]
 * xref:description.adoc[]
 ** xref:qanda.adoc[]
diff --git a/modules/macros/nav.adoc b/modules/macros/nav.adoc
index 52781230f4d7d42892f1d0cc0b6f50868c8da4c3..a5f315faa486d80a81e1380c8ffef9f8fc39d4ec 100644
--- a/modules/macros/nav.adoc
+++ b/modules/macros/nav.adoc
@@ -6,11 +6,17 @@
 ** xref:link-macro-attribute-parsing.adoc[]
 ** xref:complex-urls.adoc[]
 ** xref:link-macro-ref.adoc[]
+
+[]
 * xref:xref.adoc[]
 ** xref:inter-document-xref.adoc[]
 ** xref:xref-text-and-style.adoc[]
 ** xref:xref-validate.adoc[]
+
+[]
 * xref:footnote.adoc[]
+
+[]
 * xref:images.adoc[]
 ** xref:images-directory.adoc[]
 ** xref:image-url.adoc[]
@@ -18,10 +24,12 @@
 ** xref:image-size.adoc[]
 ** xref:image-svg.adoc[]
 ** xref:image-ref.adoc[]
+
+[]
 * xref:audio-and-video.adoc[]
-* xref:icons.adoc[]
-** xref:icons-image.adoc[]
-** xref:icons-font.adoc[]
-** xref:icon-macro.adoc[]
+
+[]
 * xref:keyboard-macro.adoc[]
+
+[]
 * xref:ui-macros.adoc[]
diff --git a/modules/sections/nav.adoc b/modules/sections/nav.adoc
index 408a82c2ee6d6c53514aebd063038d1e05cddb96..fb00d72831764b91d7dd63dfcb10863c3c80bc1c 100644
--- a/modules/sections/nav.adoc
+++ b/modules/sections/nav.adoc
@@ -1,26 +1,26 @@
-.Sections
-* xref:titles-and-levels.adoc[]
-** xref:title-links.adoc[]
-** xref:discrete-titles.adoc[]
-* xref:ids.adoc[]
-** xref:id-prefix-and-separator.adoc[]
-* xref:custom-ids.adoc[]
-* xref:numbers.adoc[]
-* xref:styles.adoc[]
-** xref:special-section-titles.adoc[]
-** xref:special-section-numbers.adoc[]
+* Sections
+** xref:titles-and-levels.adoc[]
+*** xref:title-links.adoc[]
+*** xref:discrete-titles.adoc[]
+** xref:ids.adoc[]
+*** xref:id-prefix-and-separator.adoc[]
+** xref:custom-ids.adoc[]
+** xref:numbers.adoc[]
+** xref:styles.adoc[]
+*** xref:special-section-titles.adoc[]
+*** xref:special-section-numbers.adoc[]
 // Front matter
-** xref:colophon.adoc[]
-** xref:dedication.adoc[]
+*** xref:colophon.adoc[]
+*** xref:dedication.adoc[]
 // & Epigraph
-** xref:abstract.adoc[]
-** xref:preface.adoc[]
-** xref:parts.adoc[]
-*** xref:part-numbers-and-labels.adoc[]
-** xref:chapters.adoc[]
+*** xref:abstract.adoc[]
+*** xref:preface.adoc[]
+*** xref:parts.adoc[]
+**** xref:part-numbers-and-labels.adoc[]
+*** xref:chapters.adoc[]
 // Back matter
-** xref:appendix.adoc[]
-** xref:glossary.adoc[]
-** xref:bibliography.adoc[]
-** xref:index.adoc[]
-* xref:section-ref.adoc[]
+*** xref:appendix.adoc[]
+*** xref:glossary.adoc[]
+*** xref:bibliography.adoc[]
+*** xref:index.adoc[]
+** xref:section-ref.adoc[]
diff --git a/modules/verbatim/nav.adoc b/modules/verbatim/nav.adoc
index fd98e3c39765d958700adce0b80d70992b6225ee..79d6b0bfdb2305f7577f1b090b4778061c7352ca 100644
--- a/modules/verbatim/nav.adoc
+++ b/modules/verbatim/nav.adoc
@@ -1,8 +1,8 @@
-.Verbatim and Source Blocks
-* xref:source-blocks.adoc[]
-** xref:source-highlighter.adoc[]
-** xref:highlight-lines.adoc[]
-** xref:highlight-php.adoc[]
-* xref:listing-blocks.adoc[]
-* xref:literal-blocks.adoc[]
-* xref:callouts.adoc[]
+* Verbatim and Source Blocks
+** xref:source-blocks.adoc[]
+*** xref:source-highlighter.adoc[]
+*** xref:highlight-lines.adoc[]
+*** xref:highlight-php.adoc[]
+** xref:listing-blocks.adoc[]
+** xref:literal-blocks.adoc[]
+** xref:callouts.adoc[]