diff --git a/Projects/Superalgos/UI/Spaces/Docs-Space/DocumentPage.js b/Projects/Superalgos/UI/Spaces/Docs-Space/DocumentPage.js
index 2aebfe1c8..f0b1da754 100644
--- a/Projects/Superalgos/UI/Spaces/Docs-Space/DocumentPage.js
+++ b/Projects/Superalgos/UI/Spaces/Docs-Space/DocumentPage.js
@@ -151,7 +151,7 @@ function newSuperalgosDocsDocumentPage() {
 
                 buildOrderedTopicPageIndex(thisObject.docsSchemaDocument.topic)
 
-                HTML = HTML = HTML + '<div class="docs-topic-index">' // Container for whole Topic Navigation including buttons, title and index
+                HTML = HTML = HTML + '<div class="docs-topic-index">' // Container for Topic Navigation including buttons, title and index
 
                 /* Topic Title */
                 titleLabel = thisObject.docsSchemaDocument.topic + ' Topic Navigation'
@@ -165,18 +165,28 @@ function newSuperalgosDocsDocumentPage() {
 
                 generateTopicMultiPageIndex()
 
-                HTML = HTML = HTML + '</div>'  // END Container for whole Topic Navigation
+                HTML = HTML = HTML + '</div>'  // END Container for Topic Navigation
             }
 
             if (UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.category === 'Tutorial') {
 
                 buildOrderedTutorialPageIndex(thisObject.docsSchemaDocument.tutorial)
-                generateTutorialPreviousAndNextPageNavigation()
+
+                HTML = HTML = HTML + '<div class="docs-topic-index">' // Container for Topic Navigation including buttons, title and index
+
                 /* Tutorial Title */
-                titleLabel = thisObject.docsSchemaDocument.tutorial + ' Tutorial Content'
-                HTML = HTML + '<h2 id="' + UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type.toLowerCase().replace(' ', '-') + '" > ' + titleLabel + '</h2>'
+                titleLabel = thisObject.docsSchemaDocument.tutorial + ' Tutorial Navigation'
+                HTML = HTML + '<div id="docs-main-title-div" class="docs-title-table"><div class="docs-table-cell"><h2 class="docs-h2" id="' + UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type.toLowerCase().replace(' ', '-') + '" > ' + titleLabel + '</h2></div><div id="projectImageDiv" class="docs-image-container"/></div></div>'
+
+                generateTutorialPreviousAndNextPageNavigation()
+
+                /* TOC*/
+
+                HTML = HTML + '<h3 class="docs-h3"> Table of Contents</h3>'
 
                 generateTutorialMultiPageIndex()
+
+                HTML = HTML = HTML + '</div>'  // END Container for Tutorial Navigation
             }
 
             HTML = HTML + '</div>' // Common Style Container Ends
@@ -589,6 +599,8 @@ function newSuperalgosDocsDocumentPage() {
                         autoGeneratedParagraphIndex++
                     }
 
+                    HTML = HTML = HTML + '<div class="docs-topic-index">' // Container for Topic Index
+
                     switch (category) {
                         case 'Topic': {
                             generateTopicMultiPageIndex()
@@ -599,6 +611,8 @@ function newSuperalgosDocsDocumentPage() {
                             break
                         }
                     }
+
+                    HTML = HTML = HTML + '</div>' // Container for whole Topic Index
                 }
             }