diff --git a/Projects/Superalgos/UI/Spaces/Docs-Space/DocumentPage.js b/Projects/Superalgos/UI/Spaces/Docs-Space/DocumentPage.js
index cf1871426..512a63fd1 100644
--- a/Projects/Superalgos/UI/Spaces/Docs-Space/DocumentPage.js
+++ b/Projects/Superalgos/UI/Spaces/Docs-Space/DocumentPage.js
@@ -119,13 +119,7 @@ function newSuperalgosDocsDocumentPage() {
             HTML = HTML + '<div id="docs-context-menu-clickeable-div" class="docs-context-menu-clickeable-container">' // Clickeable Container Starts
 
             /* Title */
-            let titleLabel = ''
-            if (docsSchemaDocument.topic !== undefined) {
-                titleLabel = docsSchemaDocument.topic + ' - Page ' + docsSchemaDocument.pageNumber + '<br>' + docsSchemaDocument.type
-            } else {
-                titleLabel = docsSchemaDocument.type
-            }
-
+            let titleLabel = docsSchemaDocument.type
             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.objectBeingRendered.type.toLowerCase().replace(' ', '-') + '" > ' + titleLabel + '</h2></div><div id="projectImageDiv" class="docs-image-container"/></div></div>'
 
             addDefinitionTable(docsSchemaDocument, 'definition-editable-', UI.projects.superalgos.spaces.docsSpace.objectBeingRendered.category, UI.projects.superalgos.spaces.docsSpace.objectBeingRendered.project, UI.projects.superalgos.spaces.docsSpace.objectBeingRendered.type)
@@ -133,13 +127,19 @@ function newSuperalgosDocsDocumentPage() {
             let editableParagraphIndex = 0
             let autoGeneratedParagraphIndex = 0
 
-            if (UI.projects.superalgos.spaces.docsSpace.objectBeingRendered.category === 'Topic') {
-                generateMultiPageIndex()
-            }
-
             addContent()
 
             HTML = HTML + '</div>' // Clickeable Container Ends
+
+
+            if (UI.projects.superalgos.spaces.docsSpace.objectBeingRendered.category === 'Topic') {
+                /* Topic Title */
+                titleLabel = docsSchemaDocument.topic + ' - Page ' + docsSchemaDocument.pageNumber
+                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.objectBeingRendered.type.toLowerCase().replace(' ', '-') + '" > ' + titleLabel + '</h2></div><div id="projectImageDiv" class="docs-image-container"/></div></div>'
+
+                generateMultiPageIndex()
+            }
+
             HTML = HTML + '</div>' // Common Style Container Ends
 
             /*