diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc
index 8668de0b0..e7949f4b6 100644
--- a/modules/ROOT/nav.adoc
+++ b/modules/ROOT/nav.adoc
@@ -45,7 +45,7 @@ include::ROOT:partial$_page-index.adoc[]
 * {get-started-verify-install--xref}
 
 .{data-modeling--xref}
-* {empty}
+* {data-modeling--xref}
 
 .Concepts
 * {xref-sgw-pg-users}
@@ -55,7 +55,7 @@ include::ROOT:partial$_page-index.adoc[]
 * {revisions--xref}
 
 .{configuration-properties--pfx}[Configuration]
-* {empty}
+* {configuration-properties--pfx}[Configuration]
 
 .REST API
 * {rest-api-access--xref}
@@ -104,9 +104,8 @@ include::ROOT:partial$_page-index.adoc[]
 * {xref-sgw-pg-indexing}
 * {setting-up-dr-cluster--xref}
 
-// Need a * {empty} line to force the .{topic} line to be output
 .{sgw--xref}{sgw-pg-upgrade}[Upgrade]
-* {empty}
+* {sgw--xref}{sgw-pg-upgrade}[Upgrade]
 
 .Server Compatibility
 * {sgw--xref}{server-compatibility-collections--page}[Collections]
@@ -130,6 +129,6 @@ include::ROOT:partial$_page-index.adoc[]
 * {xref-sgw-pg-legacy-logging-pre2-1}
 
 .{xref-sgw-pg-refer-sgw-glossary}
-* {empty}
+* {xref-sgw-pg-refer-sgw-glossary}
 
 // END::NAV MENU STRUCTURE
\ No newline at end of file