diff --git a/docs/_markbind/layouts/default.md b/docs/_markbind/layouts/default.md
index 1aee04b1bcb..306093a206b 100644
--- a/docs/_markbind/layouts/default.md
+++ b/docs/_markbind/layouts/default.md
@@ -29,20 +29,14 @@
 * [User Guide]({{ baseUrl }}/UserGuide.html) :expanded:
   * [Quick Start]({{ baseUrl }}/UserGuide.html#quick-start)
   * [Features]({{ baseUrl }}/UserGuide.html#features)
-  * [FAQ]({{ baseUrl }}/UserGuide.html#faq)
-  * [Command Summary]({{ baseUrl }}/UserGuide.html#faq)
 * [Developer Guide]({{ baseUrl }}/DeveloperGuide.html) :expanded:
-  * [Acknowledgements]({{ baseUrl }}/DeveloperGuide.html#acknowledgements)
-  * [Setting Up]({{ baseUrl }}/DeveloperGuide.html#setting-up-getting-started)
-  * [Design]({{ baseUrl }}/DeveloperGuide.html#design)
-  * [Implementation]({{ baseUrl }}/DeveloperGuide.html#implementation)
-  * [Documentation, logging, testing, configuration, dev-ops]({{ baseUrl }}/DeveloperGuide.html#documentation-logging-testing-configuration-dev-ops)
-  * [Appendix: Requirements]({{ baseUrl }}/DeveloperGuide.html#appendix-requirements)
-  * [Appendix: Instructions for manual testing]({{ baseUrl }}/DeveloperGuide.html#appendix-instructions-for-manual-testing)
-* Tutorials
-  * [Tracing code]({{ baseUrl }}/tutorials/TracingCode.html)
-  * [Adding a command]({{ baseUrl }}/tutorials/AddRemark.html)
-  * [Removing Fields]({{ baseUrl }}/tutorials/RemovingFields.html)
+  * [Acknowledgements]({{ baseUrl }}/DeveloperGuide.html#1.3. Acknowledgement)
+  * [Setting Up]({{ baseUrl }}/DeveloperGuide.html#1.2. Setting up, getting started)
+  * [Design]({{ baseUrl }}/DeveloperGuide.html#2. Design)
+  * [Implementation]({{ baseUrl }}/DeveloperGuide.html#Implementation)
+  * [Documentation, logging, testing, configuration, dev-ops]({{ baseUrl }}/DeveloperGuide.html#5. Documentation, logging, testing, configuration, dev-ops)
+  * [Appendix: Requirements]({{ baseUrl }}/DeveloperGuide.html#6. Appendix: Requirements)
+  * [Appendix: Instructions for manual testing]({{ baseUrl }}/DeveloperGuide.html#7. Appendix: Instructions for manual testing)
 * [About Us]({{ baseUrl }}/AboutUs.html)
       </site-nav>
     </div>