diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index b981a4dd4..2c05c6737 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -147,9 +147,8 @@ include::maintain-cluster:partial$nav.adoc[]
 include::secure-cluster:partial$nav.adoc[]
 include::fault-tolerance:partial$nav.adoc[]
 ** xref:storage:high-density-memory.adoc[]
-include::tiered-storage:partial$nav.adoc[]
 include::cp-subsystem:partial$nav.adoc[]
-** xref:cluster-performance:thread-per-core-tpc.adoc[]
+include::tiered-storage:partial$nav.adoc[]
 include::data-connections:partial$nav.adoc[]
 include::wan:partial$nav.adoc[]
 * xref:extending-hazelcast:extending-hazelcast.adoc[]
@@ -210,6 +209,7 @@ include::wan:partial$nav.adoc[]
 * xref:clients:cplusplus.adoc[]
 * xref:clients:dotnet.adoc[]
 * xref:maintain-cluster:enterprise-rest-api.adoc[]
+** xref:maintain-cluster:rest-api.adoc[]
 * xref:clients:memcache.adoc[]
 * xref:clients:python.adoc[]
 * xref:clients:nodejs.adoc[]
diff --git a/docs/modules/computing/partials/nav.adoc b/docs/modules/computing/partials/nav.adoc
index c7f307927..c99e2aecf 100644
--- a/docs/modules/computing/partials/nav.adoc
+++ b/docs/modules/computing/partials/nav.adoc
@@ -1,5 +1,4 @@
 * Java Executor Service
 ** xref:computing:executor-service.adoc[]
 ** xref:computing:durable-executor-service.adoc[]
-** xref:computing:scheduled-executor-service.adoc[]
-** xref:computing:entry-processor.adoc[]
\ No newline at end of file
+** xref:computing:scheduled-executor-service.adoc[]
\ No newline at end of file
diff --git a/docs/modules/configuration/partials/nav.adoc b/docs/modules/configuration/partials/nav.adoc
index a26dc7d23..8e31059eb 100644
--- a/docs/modules/configuration/partials/nav.adoc
+++ b/docs/modules/configuration/partials/nav.adoc
@@ -13,4 +13,5 @@
 *** xref:configuration:dynamic-config-programmatic-api.adoc[Programmatic API]
 *** xref:configuration:dynamic-config-update-and-reload.adoc[Update and Reload with REST]
 *** xref:configuration:dynamic-config-persistence.adoc[Configuration Options]
+** xref:cluster-performance:thread-per-core-tpc.adoc[]
 ** xref:phone-homes.adoc[]
diff --git a/docs/modules/data-structures/partials/nav.adoc b/docs/modules/data-structures/partials/nav.adoc
index ea09729b2..1b757568e 100644
--- a/docs/modules/data-structures/partials/nav.adoc
+++ b/docs/modules/data-structures/partials/nav.adoc
@@ -12,6 +12,7 @@
 *** xref:data-structures:locking-maps.adoc[]
 *** xref:data-structures:listening-for-map-entries.adoc[]
 *** xref:data-structures:reading-map-metrics.adoc[]
+*** xref:computing:entry-processor.adoc[]
 ** JCache
 *** xref:jcache:jcache.adoc[Overview]
 *** xref:jcache:overview.adoc[]
diff --git a/docs/modules/integrate/pages/jms-connector.adoc b/docs/modules/integrate/pages/jms-connector.adoc
index 3d1ee5110..88fdb4d26 100644
--- a/docs/modules/integrate/pages/jms-connector.adoc
+++ b/docs/modules/integrate/pages/jms-connector.adoc
@@ -1,4 +1,4 @@
-= JMS Connector
+= JMS Message Queue Connector
 
 JMS (Java Message Service) is a standard API for communicating with
 various message brokers using the queue or publish-subscribe patterns.