diff --git a/tools/api-designer/src/html/index.html b/tools/api-designer/src/html/index.html
index 6d9f863a..9231e495 100644
--- a/tools/api-designer/src/html/index.html
+++ b/tools/api-designer/src/html/index.html
@@ -7,7 +7,6 @@
       name="viewport"
       content="width=device-width, initial-scale=1, shrink-to-fit=no"
     />
-
     <title>Rapid API Designer</title>
   </head>
 
@@ -44,8 +43,10 @@
                 RSDL editor
               </button>
             </li>
+            <!-- Hide Visual Designer-->
             <li class="nav-item" role="presentation">
-              <button
+              <button 
+                hidden="true"
                 type="button"
                 class="nav-link"
                 id="visual-editor-gui-tab"
@@ -59,26 +60,28 @@
               </button>
             </li>
           </ul>
+
           <div class="tab-content" id="editorTabContent">
             <div
               class="tab-pane fade show active"
               id="rsdl-editor"
               role="tabpanel"
-              aria-labelledby="swagger-ui-tab"
+              aria-labelledby="rsdl-editor-tab"
             >
               <div id="editor" class="mirror-editor"></div>
             </div>
+
             <div
               class="tab-pane fade"
               id="visual-editor-gui"
               role="tabpanel"
-              aria-labelledby="swagger-ui-tab"
+              aria-labelledby="visual-editor-gui-tab"
             >
               <div id="visual-editor-gui-content"></div>
             </div>
-          </div>
 
-<!--
+          </div>
+<!-- Hide Mock Service         
           <div class="row">
             <div class="col">
               <div class="input-group input-group-sm">
@@ -114,6 +117,7 @@
           </div>
 -->
         </div>
+
         <div class="col-md-6">
           <ul class="nav nav-tabs" id="myTab" role="tablist">
             <li class="nav-item" role="presentation">
@@ -212,6 +216,7 @@
         </div>
       </div>
 
+      <!--URL Editor-->
       <div class="my-3">
         <label for="uri-editor" class="form-label">
           Generate a request here
@@ -231,6 +236,7 @@
         <pre><code id="results" class="language-json"></code></pre>
       </div>
 -->
+      <!-- Export -->
       <div class="row">
         <div class="col">
           <div class="dropdown">
diff --git a/tools/api-designer/src/js/index.ts b/tools/api-designer/src/js/index.ts
index 4a906309..bd38deae 100644
--- a/tools/api-designer/src/js/index.ts
+++ b/tools/api-designer/src/js/index.ts
@@ -13,6 +13,7 @@ document.addEventListener("DOMContentLoaded", function (event) {
   // this was a quick hack, not the best solution
   const app = new App();
 
+  // RSDL Editor
   const rsdlEditor = initRsdlEditor(
     document.getElementById("editor"),
     (rsdl) => {
@@ -28,11 +29,12 @@ document.addEventListener("DOMContentLoaded", function (event) {
     () => {}
   );
   app.addListener(
-    new Listener("urlEditor", (rsdl) =>
-      urlEditor.updateSchema(rsdl, schemaFormat.rsdl)
-    )
+    new Listener("urlEditor", (rsdl) => {
+      urlEditor.updateSchema(rsdl, schemaFormat.rsdl);
+    })
   );
 
+  // Visual Editor
   const mermaidEditor = new MermaidEditor(
     document.getElementById("visual-editor-gui-content"),
     window,
@@ -62,6 +64,7 @@ document.addEventListener("DOMContentLoaded", function (event) {
 
   app.publishRsdl("main", currentRsdl);
 
+  // Export
   const dropdown = document.getElementById("export-dropdown");
 
   const downloadToFile = (content, filename, contentType) => {
diff --git a/tools/api-explorer/src/html/index.html b/tools/api-explorer/src/html/index.html
index b91c201b..e81a39a1 100644
--- a/tools/api-explorer/src/html/index.html
+++ b/tools/api-explorer/src/html/index.html
@@ -86,6 +86,7 @@
                 Swagger UI
               </button>
             </li>
+<!--
             <li class="nav-item" role="presentation">
               <button
                 type="button"
@@ -100,8 +101,10 @@
                 Visualize
               </button>
             </li>
+-->
           </ul>
           <div class="tab-content" id="schemaViewContent">
+            <!-- CSDL Tab -->
             <div
               class="tab-pane fade show active"
               id="csdl"
@@ -110,25 +113,29 @@
             >
               <pre><code id="csdl-desc" class="language-json"></code></pre>
             </div>
+
+            <!-- Swagger Tab -->
             <div
               class="tab-pane fade"
               id="swagger-ui"
               role="tabpanel"
               aria-labelledby="swagger-ui-tab"
             >
-              <div>
-                <div id="swagger-ui-desc"></div>
-              </div>
+              <div id="swagger-ui-desc"></div>
             </div>
+
+            <!-- Visual Editor Tab -->
+<!--
             <div
               class="tab-pane fade"
               id="visual-editor-gui"
               role="tabpanel"
-              aria-labelledby="swagger-ui-tab"
+              aria-labelledby="visual-editor-gui-tab"
             >
               <div id="visual-editor-gui-content"></div>
             </div>
-          </div>
+-->
+            </div>
         </div>
       </div>