diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc
index a93bc0c..7fac82f 100644
--- a/modules/ROOT/nav.adoc
+++ b/modules/ROOT/nav.adoc
@@ -1,124 +1,143 @@
-* xref:master@documentation:ROOT:modules/tx-control/advancedScopes.adoc[]
-* xref:master@documentation:ROOT:index.adoc[]
-* xref:master@documentation:ROOT:downloads/archived-releases/0.1-incubating/0.1-incubating.adoc[]
-* xref:master@documentation:ROOT:downloads/currentrelease.adoc[]
-* xref:master@documentation:ROOT:downloads/archived-releases/0.3/0.3.adoc[]
-* xref:master@documentation:ROOT:downloads/archived-releases/0.2-incubating/0.2-incubating.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/april-2011.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/april-2012.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/april-2013.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/april-2014.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/april-2015.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/april-2016.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/april-2018.adoc[]
-* xref:master@documentation:ROOT:downloads/archived-releases.adoc[]
-* xref:master@documentation:ROOT:documentation/application-dependencies.adoc[]
-* xref:master@documentation:ROOT:modules/applications.adoc[]
-* xref:master@documentation:ROOT:modules/containers.adoc[]
-* xref:master@documentation:ROOT:modules/jpaproject.adoc[]
-* xref:master@documentation:ROOT:modules/tx-control/localTransactions.adoc[]
-* xref:master@documentation:ROOT:modules/tx-control/localJDBC.adoc[]
-* xref:master@documentation:ROOT:modules/tx-control/xaJDBC.adoc[]
-* xref:master@documentation:ROOT:modules/tx-control/localJPA.adoc[]
-* xref:master@documentation:ROOT:modules/tx-control/xaJPA.adoc[]
-* xref:master@documentation:ROOT:modules/transactioncontrol.adoc[]
-* xref:master@documentation:ROOT:development/versionpolicy.adoc[]
-* xref:master@documentation:ROOT:modules/tx-control/xaTransactions.adoc[]
-* xref:master@documentation:ROOT:documentation/articles.adoc[]
-* xref:master@documentation:ROOT:modules/async-svcs.adoc[]
-* xref:master@documentation:ROOT:modules/blueprint.adoc[]
-* xref:master@documentation:ROOT:modules/blueprintnoosgi.adoc[]
-* xref:master@documentation:ROOT:modules/blueprint-maven-plugin.adoc[]
-* xref:master@documentation:ROOT:modules/blueprintannotation.adoc[]
-* xref:master@documentation:ROOT:documentation/tutorials/blueprinthelloworldtutorial.adoc[]
-* xref:master@documentation:ROOT:modules/blueprintweb.adoc[]
-* xref:master@documentation:ROOT:community/boardreports.adoc[]
-* xref:master@documentation:ROOT:development/buildingaries.adoc[]
-* xref:master@documentation:ROOT:development/guidelines.adoc[]
-* xref:master@documentation:ROOT:community/overview.adoc[]
-* xref:master@documentation:ROOT:community/resources.adoc[]
-* xref:master@documentation:ROOT:development/compliancetesting.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/december-2009.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/december-2010.adoc[]
-* xref:master@documentation:ROOT:development/resources.adoc[]
-* xref:master@documentation:ROOT:downloads/currentreleases.adoc[]
-* xref:master@documentation:ROOT:modules/ebamavenpluginproject.adoc[]
-* xref:master@documentation:ROOT:modules/esaanttask.adoc[]
-* xref:master@documentation:ROOT:modules/esamavenpluginproject.adoc[]
-* xref:master@documentation:ROOT:modules/tx-control/exceptionManagement.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/february-2011.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/feb-2015.adoc[]
-* xref:master@documentation:ROOT:community/gettinginvolved.adoc[]
-* xref:master@documentation:ROOT:modules/tx-control/quickstart.adoc[]
-* xref:master@documentation:ROOT:modules/samples/goatsample.adoc[]
-* xref:master@documentation:ROOT:documentation/tutorials/greetertutorial.adoc[]
-* xref:master@documentation:ROOT:documentation/integrators-guide.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/january-2011.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/january-2012.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/january-2013.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/january-2014.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/jan-2016.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/jan-2017.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/jan-2018.adoc[]
-* xref:master@documentation:ROOT:modules/jmx.adoc[]
-* xref:master@documentation:ROOT:modules/jndiproject.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/july-2011.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/july-2012.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/july-2013.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/july-2014.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/july-2015.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/july-2016.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/july-2017.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/july-2018.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/june-2010.adoc[]
-* xref:master@documentation:ROOT:community/logos.adoc[]
-* xref:master@documentation:ROOT:community/mailinglists.adoc[]
-* xref:master@documentation:ROOT:development/maintainingthewebpages.adoc[]
-* xref:master@documentation:ROOT:modules/tx-control/advancedResourceProviders.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/march-2010.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/march-2011.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/may-2017.adoc[]
-* xref:master@documentation:ROOT:modules/tx-control/spring-tx.adoc[]
-* xref:master@documentation:ROOT:development/architecture.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/november-2009.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/nov-2015.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/october-2009.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/october-2011.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/october-2012.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/oct-2013.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/oct-2014.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/september-2015.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/oct-2016.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/oct-2017.adoc[]
-* xref:master@documentation:ROOT:modules/subsystems.adoc[]
-* xref:master@documentation:ROOT:community/people.adoc[]
-* xref:master@documentation:ROOT:downloads/archived-releases/0.2-incubating/0.2-incubating-releasenotes.adoc[]
-* xref:master@documentation:ROOT:downloads/archived-releases/0.3/0.3-releasenotes.adoc[]
-* xref:master@documentation:ROOT:development/ReleaseProcessRequirements.adoc[]
-* xref:master@documentation:ROOT:development/releasingaries.adoc[]
-* xref:master@documentation:ROOT:documentation/tools/repositoryGenerator.adoc[]
-* xref:master@documentation:ROOT:modules/rsa.adoc[]
-* xref:master@documentation:ROOT:modules/samples.adoc[]
-* xref:master@documentation:ROOT:community/boardreports/september-2010.adoc[]
-* xref:master@documentation:ROOT:modules/spi-fly.adoc[]
-* xref:master@documentation:ROOT:downloads/ct/0.2-incubating/testresults.adoc[]
-* xref:master@documentation:ROOT:downloads/testresults.adoc[]
-* xref:master@documentation:ROOT:downloads/archived-releases/0.2-incubating/0.2-incubating-testresults.adoc[]
-* xref:master@documentation:ROOT:downloads/ct/0.3/testresults.adoc[]
-* xref:master@documentation:ROOT:downloads/ariestrader-1.0.0.adoc[]
-* xref:master@documentation:ROOT:downloads/archived-releases/0.3/ariestrader-0.3.adoc[]
-* xref:master@documentation:ROOT:downloads/archived-releases/0.2-incubating/ariestrader-0.2-incubating.adoc[]
-* xref:master@documentation:ROOT:modules/samples/ariestrader.adoc[]
-* xref:master@documentation:ROOT:downloads/archived-releases/0.1-incubating/ariestrader-0.1-incubating.adoc[]
-* xref:master@documentation:ROOT:modules/samples/blog-sample.adoc[]
-* xref:master@documentation:ROOT:downloads/archived-releases/0.3/blogsample-0.3.adoc[]
-* xref:master@documentation:ROOT:downloads/blogsample-1.0.0.adoc[]
-* xref:master@documentation:ROOT:downloads/archived-releases/0.2-incubating/blogsample-0.2-incubating.adoc[]
-* xref:master@documentation:ROOT:downloads/archived-releases/0.1-incubating/blogsample-0.1-incubating.adoc[]
-* xref:master@documentation:ROOT:modules/tx-control/index.adoc[]
-* xref:master@documentation:ROOT:documentation/tools.adoc[]
-* xref:master@documentation:ROOT:modules/transactionsproject.adoc[]
-* xref:master@documentation:ROOT:documentation/tutorials.adoc[]
-* xref:master@documentation:ROOT:modules/tx-control/coordinator.adoc[]
-* xref:master@documentation:ROOT:modules/tx-control/lastResourceGambit.adoc[]
-* xref:master@documentation:ROOT:development/verifyingrelease.adoc[]
+//ulist with attributes  { level: '2', relative: 'community/*.adoc' }
+* Community
+** xref:master@documentation:ROOT:community/boardreports.adoc[]
+** xref:master@documentation:ROOT:community/overview.adoc[]
+** xref:master@documentation:ROOT:community/resources.adoc[]
+** xref:master@documentation:ROOT:community/gettinginvolved.adoc[]
+** xref:master@documentation:ROOT:community/logos.adoc[]
+** xref:master@documentation:ROOT:community/mailinglists.adoc[]
+** xref:master@documentation:ROOT:community/people.adoc[]
+//ulist with attributes  { level: '3', relative: 'community/boardreports/*.adoc' }
+** Board Reports
+*** xref:master@documentation:ROOT:community/boardreports/april-2011.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/april-2012.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/april-2013.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/april-2014.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/april-2015.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/april-2016.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/april-2018.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/december-2009.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/december-2010.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/february-2011.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/feb-2015.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/january-2011.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/january-2012.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/january-2013.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/january-2014.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/jan-2016.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/jan-2017.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/jan-2018.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/july-2011.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/july-2012.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/july-2013.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/july-2014.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/july-2015.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/july-2016.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/july-2017.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/july-2018.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/june-2010.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/march-2010.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/march-2011.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/may-2017.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/november-2009.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/nov-2015.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/october-2009.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/october-2011.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/october-2012.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/oct-2013.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/oct-2014.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/september-2015.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/oct-2016.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/oct-2017.adoc[]
+*** xref:master@documentation:ROOT:community/boardreports/september-2010.adoc[]
+//ulist with attributes  { level: '2', relative: 'development/*.adoc' }
+* Development
+** xref:master@documentation:ROOT:development/versionpolicy.adoc[]
+** xref:master@documentation:ROOT:development/buildingaries.adoc[]
+** xref:master@documentation:ROOT:development/guidelines.adoc[]
+** xref:master@documentation:ROOT:development/compliancetesting.adoc[]
+** xref:master@documentation:ROOT:development/resources.adoc[]
+** xref:master@documentation:ROOT:development/maintainingthewebpages.adoc[]
+** xref:master@documentation:ROOT:development/architecture.adoc[]
+** xref:master@documentation:ROOT:development/ReleaseProcessRequirements.adoc[]
+** xref:master@documentation:ROOT:development/releasingaries.adoc[]
+** xref:master@documentation:ROOT:development/verifyingrelease.adoc[]
+//ulist with attributes  { level: '2', relative: 'documentation/*.adoc' }
+* Documentation
+** xref:master@documentation:ROOT:documentation/application-dependencies.adoc[]
+** xref:master@documentation:ROOT:documentation/articles.adoc[]
+** xref:master@documentation:ROOT:documentation/integrators-guide.adoc[]
+** xref:master@documentation:ROOT:documentation/tools.adoc[]
+** xref:master@documentation:ROOT:documentation/tutorials.adoc[]
+//ulist with attributes  { level: '3', relative: 'documentation/tools/*.adoc' }
+** Tools
+*** xref:master@documentation:ROOT:documentation/tools/repositoryGenerator.adoc[]
+//ulist with attributes  { level: '3', relative: 'documentation/tutorials/*.adoc' }
+** Tutorials
+*** xref:master@documentation:ROOT:documentation/tutorials/blueprinthelloworldtutorial.adoc[]
+*** xref:master@documentation:ROOT:documentation/tutorials/greetertutorial.adoc[]
+//ulist with attributes  { level: '2', relative: 'downloads/**/*.adoc' }
+* Downloads
+** xref:master@documentation:ROOT:downloads/archived-releases/0.1-incubating/0.1-incubating.adoc[]
+** xref:master@documentation:ROOT:downloads/archived-releases/0.3/0.3.adoc[]
+** xref:master@documentation:ROOT:downloads/archived-releases/0.2-incubating/0.2-incubating.adoc[]
+** xref:master@documentation:ROOT:downloads/currentrelease.adoc[]
+** xref:master@documentation:ROOT:downloads/archived-releases.adoc[]
+** xref:master@documentation:ROOT:downloads/currentreleases.adoc[]
+** xref:master@documentation:ROOT:downloads/archived-releases/0.2-incubating/0.2-incubating-releasenotes.adoc[]
+** xref:master@documentation:ROOT:downloads/archived-releases/0.3/0.3-releasenotes.adoc[]
+** xref:master@documentation:ROOT:downloads/testresults.adoc[]
+** xref:master@documentation:ROOT:downloads/archived-releases/0.2-incubating/0.2-incubating-testresults.adoc[]
+** xref:master@documentation:ROOT:downloads/ct/0.2-incubating/testresults.adoc[]
+** xref:master@documentation:ROOT:downloads/ct/0.3/testresults.adoc[]
+** xref:master@documentation:ROOT:downloads/archived-releases/0.3/ariestrader-0.3.adoc[]
+** xref:master@documentation:ROOT:downloads/ariestrader-1.0.0.adoc[]
+** xref:master@documentation:ROOT:downloads/archived-releases/0.1-incubating/ariestrader-0.1-incubating.adoc[]
+** xref:master@documentation:ROOT:downloads/archived-releases/0.2-incubating/ariestrader-0.2-incubating.adoc[]
+** xref:master@documentation:ROOT:downloads/blogsample-1.0.0.adoc[]
+** xref:master@documentation:ROOT:downloads/archived-releases/0.2-incubating/blogsample-0.2-incubating.adoc[]
+** xref:master@documentation:ROOT:downloads/archived-releases/0.3/blogsample-0.3.adoc[]
+** xref:master@documentation:ROOT:downloads/archived-releases/0.1-incubating/blogsample-0.1-incubating.adoc[]
+//ulist with attributes  { level: '2', relative: 'modules/*.adoc' }
+* Modules
+** xref:master@documentation:ROOT:modules/applications.adoc[]
+** xref:master@documentation:ROOT:modules/containers.adoc[]
+** xref:master@documentation:ROOT:modules/jpaproject.adoc[]
+** xref:master@documentation:ROOT:modules/transactioncontrol.adoc[]
+** xref:master@documentation:ROOT:modules/async-svcs.adoc[]
+** xref:master@documentation:ROOT:modules/blueprint.adoc[]
+** xref:master@documentation:ROOT:modules/blueprintnoosgi.adoc[]
+** xref:master@documentation:ROOT:modules/blueprint-maven-plugin.adoc[]
+** xref:master@documentation:ROOT:modules/blueprintannotation.adoc[]
+** xref:master@documentation:ROOT:modules/blueprintweb.adoc[]
+** xref:master@documentation:ROOT:modules/ebamavenpluginproject.adoc[]
+** xref:master@documentation:ROOT:modules/esaanttask.adoc[]
+** xref:master@documentation:ROOT:modules/esamavenpluginproject.adoc[]
+** xref:master@documentation:ROOT:modules/jmx.adoc[]
+** xref:master@documentation:ROOT:modules/jndiproject.adoc[]
+** xref:master@documentation:ROOT:modules/subsystems.adoc[]
+** xref:master@documentation:ROOT:modules/rsa.adoc[]
+** xref:master@documentation:ROOT:modules/samples.adoc[]
+** xref:master@documentation:ROOT:modules/spi-fly.adoc[]
+** xref:master@documentation:ROOT:modules/transactionsproject.adoc[]
+//ulist with attributes  { level: '3', relative: 'modules/samples/*.adoc' }
+** Samples
+*** xref:master@documentation:ROOT:modules/samples/goatsample.adoc[]
+*** xref:master@documentation:ROOT:modules/samples/ariestrader.adoc[]
+*** xref:master@documentation:ROOT:modules/samples/blog-sample.adoc[]
+//ulist with attributes  { level: '3', relative: 'modules/tx-control/*.adoc' }
+** Transaction Control
+*** xref:master@documentation:ROOT:modules/tx-control/advancedScopes.adoc[]
+*** xref:master@documentation:ROOT:modules/tx-control/localTransactions.adoc[]
+*** xref:master@documentation:ROOT:modules/tx-control/localJDBC.adoc[]
+*** xref:master@documentation:ROOT:modules/tx-control/xaJDBC.adoc[]
+*** xref:master@documentation:ROOT:modules/tx-control/localJPA.adoc[]
+*** xref:master@documentation:ROOT:modules/tx-control/xaJPA.adoc[]
+*** xref:master@documentation:ROOT:modules/tx-control/xaTransactions.adoc[]
+*** xref:master@documentation:ROOT:modules/tx-control/exceptionManagement.adoc[]
+*** xref:master@documentation:ROOT:modules/tx-control/quickstart.adoc[]
+*** xref:master@documentation:ROOT:modules/tx-control/advancedResourceProviders.adoc[]
+*** xref:master@documentation:ROOT:modules/tx-control/spring-tx.adoc[]
+*** xref:master@documentation:ROOT:modules/tx-control/index.adoc[]
+*** xref:master@documentation:ROOT:modules/tx-control/coordinator.adoc[]
+*** xref:master@documentation:ROOT:modules/tx-control/lastResourceGambit.adoc[]
diff --git a/modules/ROOT/pages/auto-index.adoc b/modules/ROOT/pages/auto-index.adoc
index ebbecc6..b7daa8f 100644
--- a/modules/ROOT/pages/auto-index.adoc
+++ b/modules/ROOT/pages/auto-index.adoc
@@ -2,4 +2,43 @@
 //uncomment to generate temporary nav file contents on console.
 //:antora-indexer-log-lists:
 
-indexList::[]
+* Community
+
+indexList::[level=2,relative=community/*.adoc]
+
+** Board Reports
+
+indexList::[level=3,relative=community/boardreports/*.adoc]
+
+* Development
+
+indexList::[level=2,relative=development/*.adoc]
+
+* Documentation
+
+indexList::[level=2,relative=documentation/*.adoc]
+
+** Tools
+
+indexList::[level=3,relative=documentation/tools/*.adoc]
+
+** Tutorials
+
+indexList::[level=3,relative=documentation/tutorials/*.adoc]
+
+* Downloads
+
+indexList::[level=2,relative=downloads/**/*.adoc]
+
+* Modules
+
+indexList::[level=2,relative=modules/*.adoc]
+
+** Samples
+
+indexList::[level=3,relative=modules/samples/*.adoc]
+
+** Transaction Control
+
+indexList::[level=3,relative=modules/tx-control/*.adoc]
+