diff --git a/404.html b/404.html
index c4a871e..b793016 100644
--- a/404.html
+++ b/404.html
@@ -12,21 +12,14 @@
 <script>function gtag() { dataLayer.push(arguments) }; window.dataLayer = window.dataLayer || []; gtag('js', new Date()); gtag('config', 'G-21PT8RV6BR')</script>
   </head>
   <body class="status-404">
-<!-- Google tag (gtag.js) -->
-
-<!-- 
-  replace this with Google tag content 
--->
-
-<!-- Google tag (gtag.js) -->
 <header class="header">
+
   <script type="text/javascript">
     document.addEventListener('DOMContentLoaded', function () {
       const urlParams = new URLSearchParams(window.location.search);
-      const userId = urlParams.get('USERID');
       const subdomain = urlParams.get('SUBDOMAIN');
-      if (userId) {
-        showUserId(userId, subdomain);
+      if (subdomain) {
+        showUserId(subdomain);
       }
       else {
         showUserIdForm(subdomain);
@@ -34,10 +27,10 @@
     });
 
 
-    function showUserId(userId, subdomain) {
+    function showUserId(subdomain) {
+      
       document.getElementById('navbar-form-empty').style.display = "none";
       document.getElementById('navbar-form-filled').style.display = "flex";
-      document.getElementById('userIdDisplay').textContent = "User ID : " + userId;
       document.getElementById('subdomainDisplay').textContent = "Subdomain : " + subdomain;
     }
 
@@ -49,13 +42,11 @@
     }
 
     function goWithUserId() {
-      elUserIdInput = document.getElementById('userId');
       elSubdomainInput = document.getElementById('subdomain');
-      window.location.search = ('&USERID=' + elUserIdInput.value + '&SUBDOMAIN=' + elSubdomainInput.value);
+      window.location.search = ( '&SUBDOMAIN=' + elSubdomainInput.value);
     }
 
     function recycle() {
-      document.getElementById('userId').value = '';
       document.getElementById('subdomain').value = '';
       window.location.search = ('');
     }
@@ -67,63 +58,53 @@
         href="https://redhat-solution-patterns.github.io/solution-patterns">
         <img src="/solution-patterns/_/img/logo.png" height="35px" alt="Solution Patterns">&nbsp; Solution Patterns from Red Hat</a>
       <button class="navbar-burger" data-target="topbar-nav">
+        <span></span>
+        <span></span>
+        <span></span>
       </button>
     </div>
-    
-    <div class="navbar-item"><span class="navbar-text"
-        style="color: white; margin-left: 1rem; margin-right: 1rem;">|</span></div>
-
-    <div class="navbar-item has-dropdown is-hoverable">
-      <a class="navbar-link" href="#" style="color: white">Architectures &amp; Patterns</a>
-      <div class="navbar-dropdown">
-        <a class="navbar-item" href="https://www.redhat.com/architect/portfolio/" target="_blank">Portfolio Architecture&nbsp; </a>
-        <a class="navbar-item" href="https://redhat-solution-patterns.github.io/solution-patterns/patterns.html" target="_blank">Solution Patterns </a>
-        <a class="navbar-item" href="https://validatedpatterns.io/" target="_blank">Validated Patterns&nbsp;</a>
-        <a class="navbar-item" href="https://catalog.redhat.com/solutions" target="_blank">Ecosystem Solutions&nbsp;</a>
-      </div>
-    </div>
-
-    <div class="navbar-item has-dropdown is-hoverable">
-      <a class="navbar-link" href="#" style="color: white">Resources</a>
-      <div class="navbar-dropdown">
-        <a class="navbar-item" target="_blank" href="https://developers.redhat.com">Red Hat Developers</a>
-        <a class="navbar-item" target="_blank" href="https://developers.redhat.com/app-dev-platform">App Dev Platform</a>
-        <a class="navbar-item" target="_blank" href="https://www.redhat.com/en/products/application-foundations">Red Hat Application Services</a>
-      </div>
-    </div>
-
-
-
-    <a class="navbar-item" style="color: white" target="_blank" href="https://github.com/redhat-solution-patterns/redhat-solution-patterns.github.io/issues">Feedback</a>
+    <div id="topbar-nav" class="navbar-menu">
+      <div class="navbar-end">
+        <div class="navbar-item has-dropdown is-hoverable">
+          <a class="navbar-link" href="#">Architectures &amp; Patterns</a>
+          <div class="navbar-dropdown">
+            <a class="navbar-item" href="https://www.redhat.com/architect/portfolio/" target="_blank">Portfolio Architecture&nbsp; </a>
+            <a class="navbar-item" href="https://redhat-solution-patterns.github.io/solution-patterns/patterns.html"  target="_blank">Solution Patterns </a>
+            <a class="navbar-item" href="https://validatedpatterns.io/" target="_blank">Validated Patterns&nbsp;</a>
+            <a class="navbar-item" href="https://catalog.redhat.com/solutions" target="_blank">Ecosystem Solutions&nbsp;</a>
+          </div>
+        </div>
 
-    <a class="navbar-item" style="color: white" target="_blank" href="https://redhat-solution-patterns.github.io/solution-patterns/contributors-guide.html">Contribute</a>
+        <div class="navbar-item has-dropdown is-hoverable">
+          <a class="navbar-link" href="#">Resources</a>
+          <div class="navbar-dropdown">
+            <a class="navbar-item" target="_blank" href="https://developers.redhat.com">Red Hat Developers</a>
+            <a class="navbar-item" target="_blank" href="https://developers.redhat.com/app-dev-platform">App Dev Platform</a>
+            <a class="navbar-item" target="_blank" href="https://www.redhat.com/en/products/application-foundations">Red Hat Application Services</a>
+          </div>
+        </div>
 
-    <div class="navbar-item"><span class="navbar-text"
-        style="color: white; margin-left: 1rem; margin-right: 1rem;">|</span></div>
+        <a class="navbar-item" target="_blank" href="https://github.com/redhat-solution-patterns/redhat-solution-patterns.github.io/issues">Feedback</a>
+        <a class="navbar-item" target="_blank" href="https://redhat-solution-patterns.github.io/solution-patterns/contributors-guide.html">Contribute</a>
 
-    <div id="topbar-nav" class="navbar-menu">
-      <div class="navbar-end">
         <div class="navbar-item" id="navbar-form-empty">
           <span class="navbar-text" style="margin-left: 2rem;">
             <span class="navbar-text" style="margin-left: 1rem; margin-right: 1rem;">&nbsp;<i style="color: orange;"
                 class="fa fa-exclamation-triangle" aria-hidden="true"></i></span>
                 Your Workshop Environment
             <form action="javascript:void(0);" onsu>
-              <input size="20" id="userId" type="text" placeholder="USER ID">
               <input size="20" id="subdomain" type="text" placeholder="Subdomain">
               <button type="hidden" onclick="goWithUserId();">Set</button>
             </form>
         </div>
 
-        <div class="navbar-item" id="navbar-form-filled" style="display: none;">
+        <div class="navbar-item" id="navbar-form-filled">
           <span class="navbar-text" style="margin-left: 2rem;">
             <span class="navbar-text " style="margin-left: 1rem; margin-right: 1rem; float:left">
               &nbsp;Your Workshop Environment 
               <span class="navbar-text" style="margin-left: 1rem; margin-right: 1rem;">
                   &nbsp;<i alt="Clear details" title="Clear details" onclick="recycle();" style="color: green;" class="fa fa-recycle" aria-hidden="true"></i>
                 <br>
-                <span id="userIdDisplay"></span> 
-                <span style="color: white; margin-left: 1rem; margin-right: 1rem;">|</span>
                 <span id="subdomainDisplay"></span>
               </span>
             </span>
@@ -132,7 +113,9 @@
       </div>
     </div>
   </nav>
-</header><div class="body">
+</header>
+
+<div class="body">
 <div class="nav-container">
   <aside class="nav">
     <div class="panels">
diff --git a/event-driven-api-mgmt/01-pattern.html b/event-driven-api-mgmt/01-pattern.html
index 6424cf8..ebc8211 100644
--- a/event-driven-api-mgmt/01-pattern.html
+++ b/event-driven-api-mgmt/01-pattern.html
@@ -13,21 +13,14 @@
 <script>function gtag() { dataLayer.push(arguments) }; window.dataLayer = window.dataLayer || []; gtag('js', new Date()); gtag('config', 'G-21PT8RV6BR')</script>
   </head>
   <body class="article">
-<!-- Google tag (gtag.js) -->
-
-<!-- 
-  replace this with Google tag content 
--->
-
-<!-- Google tag (gtag.js) -->
 <header class="header">
+
   <script type="text/javascript">
     document.addEventListener('DOMContentLoaded', function () {
       const urlParams = new URLSearchParams(window.location.search);
-      const userId = urlParams.get('USERID');
       const subdomain = urlParams.get('SUBDOMAIN');
-      if (userId) {
-        showUserId(userId, subdomain);
+      if (subdomain) {
+        showUserId(subdomain);
       }
       else {
         showUserIdForm(subdomain);
@@ -35,10 +28,10 @@
     });
 
 
-    function showUserId(userId, subdomain) {
+    function showUserId(subdomain) {
+      
       document.getElementById('navbar-form-empty').style.display = "none";
       document.getElementById('navbar-form-filled').style.display = "flex";
-      document.getElementById('userIdDisplay').textContent = "User ID : " + userId;
       document.getElementById('subdomainDisplay').textContent = "Subdomain : " + subdomain;
     }
 
@@ -50,13 +43,11 @@
     }
 
     function goWithUserId() {
-      elUserIdInput = document.getElementById('userId');
       elSubdomainInput = document.getElementById('subdomain');
-      window.location.search = ('&USERID=' + elUserIdInput.value + '&SUBDOMAIN=' + elSubdomainInput.value);
+      window.location.search = ( '&SUBDOMAIN=' + elSubdomainInput.value);
     }
 
     function recycle() {
-      document.getElementById('userId').value = '';
       document.getElementById('subdomain').value = '';
       window.location.search = ('');
     }
@@ -68,63 +59,53 @@
         href="https://redhat-solution-patterns.github.io/solution-patterns">
         <img src="../_/img/logo.png" height="35px" alt="Solution Patterns">&nbsp; Solution Patterns from Red Hat</a>
       <button class="navbar-burger" data-target="topbar-nav">
+        <span></span>
+        <span></span>
+        <span></span>
       </button>
     </div>
-    
-    <div class="navbar-item"><span class="navbar-text"
-        style="color: white; margin-left: 1rem; margin-right: 1rem;">|</span></div>
-
-    <div class="navbar-item has-dropdown is-hoverable">
-      <a class="navbar-link" href="#" style="color: white">Architectures &amp; Patterns</a>
-      <div class="navbar-dropdown">
-        <a class="navbar-item" href="https://www.redhat.com/architect/portfolio/" target="_blank">Portfolio Architecture&nbsp; </a>
-        <a class="navbar-item" href="https://redhat-solution-patterns.github.io/solution-patterns/patterns.html" target="_blank">Solution Patterns </a>
-        <a class="navbar-item" href="https://validatedpatterns.io/" target="_blank">Validated Patterns&nbsp;</a>
-        <a class="navbar-item" href="https://catalog.redhat.com/solutions" target="_blank">Ecosystem Solutions&nbsp;</a>
-      </div>
-    </div>
-
-    <div class="navbar-item has-dropdown is-hoverable">
-      <a class="navbar-link" href="#" style="color: white">Resources</a>
-      <div class="navbar-dropdown">
-        <a class="navbar-item" target="_blank" href="https://developers.redhat.com">Red Hat Developers</a>
-        <a class="navbar-item" target="_blank" href="https://developers.redhat.com/app-dev-platform">App Dev Platform</a>
-        <a class="navbar-item" target="_blank" href="https://www.redhat.com/en/products/application-foundations">Red Hat Application Services</a>
-      </div>
-    </div>
-
-
-
-    <a class="navbar-item" style="color: white" target="_blank" href="https://github.com/redhat-solution-patterns/redhat-solution-patterns.github.io/issues">Feedback</a>
+    <div id="topbar-nav" class="navbar-menu">
+      <div class="navbar-end">
+        <div class="navbar-item has-dropdown is-hoverable">
+          <a class="navbar-link" href="#">Architectures &amp; Patterns</a>
+          <div class="navbar-dropdown">
+            <a class="navbar-item" href="https://www.redhat.com/architect/portfolio/" target="_blank">Portfolio Architecture&nbsp; </a>
+            <a class="navbar-item" href="https://redhat-solution-patterns.github.io/solution-patterns/patterns.html"  target="_blank">Solution Patterns </a>
+            <a class="navbar-item" href="https://validatedpatterns.io/" target="_blank">Validated Patterns&nbsp;</a>
+            <a class="navbar-item" href="https://catalog.redhat.com/solutions" target="_blank">Ecosystem Solutions&nbsp;</a>
+          </div>
+        </div>
 
-    <a class="navbar-item" style="color: white" target="_blank" href="https://redhat-solution-patterns.github.io/solution-patterns/contributors-guide.html">Contribute</a>
+        <div class="navbar-item has-dropdown is-hoverable">
+          <a class="navbar-link" href="#">Resources</a>
+          <div class="navbar-dropdown">
+            <a class="navbar-item" target="_blank" href="https://developers.redhat.com">Red Hat Developers</a>
+            <a class="navbar-item" target="_blank" href="https://developers.redhat.com/app-dev-platform">App Dev Platform</a>
+            <a class="navbar-item" target="_blank" href="https://www.redhat.com/en/products/application-foundations">Red Hat Application Services</a>
+          </div>
+        </div>
 
-    <div class="navbar-item"><span class="navbar-text"
-        style="color: white; margin-left: 1rem; margin-right: 1rem;">|</span></div>
+        <a class="navbar-item" target="_blank" href="https://github.com/redhat-solution-patterns/redhat-solution-patterns.github.io/issues">Feedback</a>
+        <a class="navbar-item" target="_blank" href="https://redhat-solution-patterns.github.io/solution-patterns/contributors-guide.html">Contribute</a>
 
-    <div id="topbar-nav" class="navbar-menu">
-      <div class="navbar-end">
         <div class="navbar-item" id="navbar-form-empty">
           <span class="navbar-text" style="margin-left: 2rem;">
             <span class="navbar-text" style="margin-left: 1rem; margin-right: 1rem;">&nbsp;<i style="color: orange;"
                 class="fa fa-exclamation-triangle" aria-hidden="true"></i></span>
                 Your Workshop Environment
             <form action="javascript:void(0);" onsu>
-              <input size="20" id="userId" type="text" placeholder="USER ID">
               <input size="20" id="subdomain" type="text" placeholder="Subdomain">
               <button type="hidden" onclick="goWithUserId();">Set</button>
             </form>
         </div>
 
-        <div class="navbar-item" id="navbar-form-filled" style="display: none;">
+        <div class="navbar-item" id="navbar-form-filled">
           <span class="navbar-text" style="margin-left: 2rem;">
             <span class="navbar-text " style="margin-left: 1rem; margin-right: 1rem; float:left">
               &nbsp;Your Workshop Environment 
               <span class="navbar-text" style="margin-left: 1rem; margin-right: 1rem;">
                   &nbsp;<i alt="Clear details" title="Clear details" onclick="recycle();" style="color: green;" class="fa fa-recycle" aria-hidden="true"></i>
                 <br>
-                <span id="userIdDisplay"></span> 
-                <span style="color: white; margin-left: 1rem; margin-right: 1rem;">|</span>
                 <span id="subdomainDisplay"></span>
               </span>
             </span>
@@ -133,7 +114,9 @@
       </div>
     </div>
   </nav>
-</header><div class="body">
+</header>
+
+<div class="body">
 <div class="nav-container" data-component="event-driven-api-mgmt" data-version="master">
   <aside class="nav">
     <div class="panels">
diff --git a/event-driven-api-mgmt/02-architecture.html b/event-driven-api-mgmt/02-architecture.html
index 86cea5e..8d6a712 100644
--- a/event-driven-api-mgmt/02-architecture.html
+++ b/event-driven-api-mgmt/02-architecture.html
@@ -15,21 +15,14 @@
 <script>function gtag() { dataLayer.push(arguments) }; window.dataLayer = window.dataLayer || []; gtag('js', new Date()); gtag('config', 'G-21PT8RV6BR')</script>
   </head>
   <body class="article">
-<!-- Google tag (gtag.js) -->
-
-<!-- 
-  replace this with Google tag content 
--->
-
-<!-- Google tag (gtag.js) -->
 <header class="header">
+
   <script type="text/javascript">
     document.addEventListener('DOMContentLoaded', function () {
       const urlParams = new URLSearchParams(window.location.search);
-      const userId = urlParams.get('USERID');
       const subdomain = urlParams.get('SUBDOMAIN');
-      if (userId) {
-        showUserId(userId, subdomain);
+      if (subdomain) {
+        showUserId(subdomain);
       }
       else {
         showUserIdForm(subdomain);
@@ -37,10 +30,10 @@
     });
 
 
-    function showUserId(userId, subdomain) {
+    function showUserId(subdomain) {
+      
       document.getElementById('navbar-form-empty').style.display = "none";
       document.getElementById('navbar-form-filled').style.display = "flex";
-      document.getElementById('userIdDisplay').textContent = "User ID : " + userId;
       document.getElementById('subdomainDisplay').textContent = "Subdomain : " + subdomain;
     }
 
@@ -52,13 +45,11 @@
     }
 
     function goWithUserId() {
-      elUserIdInput = document.getElementById('userId');
       elSubdomainInput = document.getElementById('subdomain');
-      window.location.search = ('&USERID=' + elUserIdInput.value + '&SUBDOMAIN=' + elSubdomainInput.value);
+      window.location.search = ( '&SUBDOMAIN=' + elSubdomainInput.value);
     }
 
     function recycle() {
-      document.getElementById('userId').value = '';
       document.getElementById('subdomain').value = '';
       window.location.search = ('');
     }
@@ -70,63 +61,53 @@
         href="https://redhat-solution-patterns.github.io/solution-patterns">
         <img src="../_/img/logo.png" height="35px" alt="Solution Patterns">&nbsp; Solution Patterns from Red Hat</a>
       <button class="navbar-burger" data-target="topbar-nav">
+        <span></span>
+        <span></span>
+        <span></span>
       </button>
     </div>
-    
-    <div class="navbar-item"><span class="navbar-text"
-        style="color: white; margin-left: 1rem; margin-right: 1rem;">|</span></div>
-
-    <div class="navbar-item has-dropdown is-hoverable">
-      <a class="navbar-link" href="#" style="color: white">Architectures &amp; Patterns</a>
-      <div class="navbar-dropdown">
-        <a class="navbar-item" href="https://www.redhat.com/architect/portfolio/" target="_blank">Portfolio Architecture&nbsp; </a>
-        <a class="navbar-item" href="https://redhat-solution-patterns.github.io/solution-patterns/patterns.html" target="_blank">Solution Patterns </a>
-        <a class="navbar-item" href="https://validatedpatterns.io/" target="_blank">Validated Patterns&nbsp;</a>
-        <a class="navbar-item" href="https://catalog.redhat.com/solutions" target="_blank">Ecosystem Solutions&nbsp;</a>
-      </div>
-    </div>
-
-    <div class="navbar-item has-dropdown is-hoverable">
-      <a class="navbar-link" href="#" style="color: white">Resources</a>
-      <div class="navbar-dropdown">
-        <a class="navbar-item" target="_blank" href="https://developers.redhat.com">Red Hat Developers</a>
-        <a class="navbar-item" target="_blank" href="https://developers.redhat.com/app-dev-platform">App Dev Platform</a>
-        <a class="navbar-item" target="_blank" href="https://www.redhat.com/en/products/application-foundations">Red Hat Application Services</a>
-      </div>
-    </div>
-
-
-
-    <a class="navbar-item" style="color: white" target="_blank" href="https://github.com/redhat-solution-patterns/redhat-solution-patterns.github.io/issues">Feedback</a>
+    <div id="topbar-nav" class="navbar-menu">
+      <div class="navbar-end">
+        <div class="navbar-item has-dropdown is-hoverable">
+          <a class="navbar-link" href="#">Architectures &amp; Patterns</a>
+          <div class="navbar-dropdown">
+            <a class="navbar-item" href="https://www.redhat.com/architect/portfolio/" target="_blank">Portfolio Architecture&nbsp; </a>
+            <a class="navbar-item" href="https://redhat-solution-patterns.github.io/solution-patterns/patterns.html"  target="_blank">Solution Patterns </a>
+            <a class="navbar-item" href="https://validatedpatterns.io/" target="_blank">Validated Patterns&nbsp;</a>
+            <a class="navbar-item" href="https://catalog.redhat.com/solutions" target="_blank">Ecosystem Solutions&nbsp;</a>
+          </div>
+        </div>
 
-    <a class="navbar-item" style="color: white" target="_blank" href="https://redhat-solution-patterns.github.io/solution-patterns/contributors-guide.html">Contribute</a>
+        <div class="navbar-item has-dropdown is-hoverable">
+          <a class="navbar-link" href="#">Resources</a>
+          <div class="navbar-dropdown">
+            <a class="navbar-item" target="_blank" href="https://developers.redhat.com">Red Hat Developers</a>
+            <a class="navbar-item" target="_blank" href="https://developers.redhat.com/app-dev-platform">App Dev Platform</a>
+            <a class="navbar-item" target="_blank" href="https://www.redhat.com/en/products/application-foundations">Red Hat Application Services</a>
+          </div>
+        </div>
 
-    <div class="navbar-item"><span class="navbar-text"
-        style="color: white; margin-left: 1rem; margin-right: 1rem;">|</span></div>
+        <a class="navbar-item" target="_blank" href="https://github.com/redhat-solution-patterns/redhat-solution-patterns.github.io/issues">Feedback</a>
+        <a class="navbar-item" target="_blank" href="https://redhat-solution-patterns.github.io/solution-patterns/contributors-guide.html">Contribute</a>
 
-    <div id="topbar-nav" class="navbar-menu">
-      <div class="navbar-end">
         <div class="navbar-item" id="navbar-form-empty">
           <span class="navbar-text" style="margin-left: 2rem;">
             <span class="navbar-text" style="margin-left: 1rem; margin-right: 1rem;">&nbsp;<i style="color: orange;"
                 class="fa fa-exclamation-triangle" aria-hidden="true"></i></span>
                 Your Workshop Environment
             <form action="javascript:void(0);" onsu>
-              <input size="20" id="userId" type="text" placeholder="USER ID">
               <input size="20" id="subdomain" type="text" placeholder="Subdomain">
               <button type="hidden" onclick="goWithUserId();">Set</button>
             </form>
         </div>
 
-        <div class="navbar-item" id="navbar-form-filled" style="display: none;">
+        <div class="navbar-item" id="navbar-form-filled">
           <span class="navbar-text" style="margin-left: 2rem;">
             <span class="navbar-text " style="margin-left: 1rem; margin-right: 1rem; float:left">
               &nbsp;Your Workshop Environment 
               <span class="navbar-text" style="margin-left: 1rem; margin-right: 1rem;">
                   &nbsp;<i alt="Clear details" title="Clear details" onclick="recycle();" style="color: green;" class="fa fa-recycle" aria-hidden="true"></i>
                 <br>
-                <span id="userIdDisplay"></span> 
-                <span style="color: white; margin-left: 1rem; margin-right: 1rem;">|</span>
                 <span id="subdomainDisplay"></span>
               </span>
             </span>
@@ -135,7 +116,9 @@
       </div>
     </div>
   </nav>
-</header><div class="body">
+</header>
+
+<div class="body">
 <div class="nav-container" data-component="event-driven-api-mgmt" data-version="master">
   <aside class="nav">
     <div class="panels">
diff --git a/event-driven-api-mgmt/03-demo.html b/event-driven-api-mgmt/03-demo.html
index 21fdabb..b5bd4bd 100644
--- a/event-driven-api-mgmt/03-demo.html
+++ b/event-driven-api-mgmt/03-demo.html
@@ -15,21 +15,14 @@
 <script>function gtag() { dataLayer.push(arguments) }; window.dataLayer = window.dataLayer || []; gtag('js', new Date()); gtag('config', 'G-21PT8RV6BR')</script>
   </head>
   <body class="article">
-<!-- Google tag (gtag.js) -->
-
-<!-- 
-  replace this with Google tag content 
--->
-
-<!-- Google tag (gtag.js) -->
 <header class="header">
+
   <script type="text/javascript">
     document.addEventListener('DOMContentLoaded', function () {
       const urlParams = new URLSearchParams(window.location.search);
-      const userId = urlParams.get('USERID');
       const subdomain = urlParams.get('SUBDOMAIN');
-      if (userId) {
-        showUserId(userId, subdomain);
+      if (subdomain) {
+        showUserId(subdomain);
       }
       else {
         showUserIdForm(subdomain);
@@ -37,10 +30,10 @@
     });
 
 
-    function showUserId(userId, subdomain) {
+    function showUserId(subdomain) {
+      
       document.getElementById('navbar-form-empty').style.display = "none";
       document.getElementById('navbar-form-filled').style.display = "flex";
-      document.getElementById('userIdDisplay').textContent = "User ID : " + userId;
       document.getElementById('subdomainDisplay').textContent = "Subdomain : " + subdomain;
     }
 
@@ -52,13 +45,11 @@
     }
 
     function goWithUserId() {
-      elUserIdInput = document.getElementById('userId');
       elSubdomainInput = document.getElementById('subdomain');
-      window.location.search = ('&USERID=' + elUserIdInput.value + '&SUBDOMAIN=' + elSubdomainInput.value);
+      window.location.search = ( '&SUBDOMAIN=' + elSubdomainInput.value);
     }
 
     function recycle() {
-      document.getElementById('userId').value = '';
       document.getElementById('subdomain').value = '';
       window.location.search = ('');
     }
@@ -70,63 +61,53 @@
         href="https://redhat-solution-patterns.github.io/solution-patterns">
         <img src="../_/img/logo.png" height="35px" alt="Solution Patterns">&nbsp; Solution Patterns from Red Hat</a>
       <button class="navbar-burger" data-target="topbar-nav">
+        <span></span>
+        <span></span>
+        <span></span>
       </button>
     </div>
-    
-    <div class="navbar-item"><span class="navbar-text"
-        style="color: white; margin-left: 1rem; margin-right: 1rem;">|</span></div>
-
-    <div class="navbar-item has-dropdown is-hoverable">
-      <a class="navbar-link" href="#" style="color: white">Architectures &amp; Patterns</a>
-      <div class="navbar-dropdown">
-        <a class="navbar-item" href="https://www.redhat.com/architect/portfolio/" target="_blank">Portfolio Architecture&nbsp; </a>
-        <a class="navbar-item" href="https://redhat-solution-patterns.github.io/solution-patterns/patterns.html" target="_blank">Solution Patterns </a>
-        <a class="navbar-item" href="https://validatedpatterns.io/" target="_blank">Validated Patterns&nbsp;</a>
-        <a class="navbar-item" href="https://catalog.redhat.com/solutions" target="_blank">Ecosystem Solutions&nbsp;</a>
-      </div>
-    </div>
-
-    <div class="navbar-item has-dropdown is-hoverable">
-      <a class="navbar-link" href="#" style="color: white">Resources</a>
-      <div class="navbar-dropdown">
-        <a class="navbar-item" target="_blank" href="https://developers.redhat.com">Red Hat Developers</a>
-        <a class="navbar-item" target="_blank" href="https://developers.redhat.com/app-dev-platform">App Dev Platform</a>
-        <a class="navbar-item" target="_blank" href="https://www.redhat.com/en/products/application-foundations">Red Hat Application Services</a>
-      </div>
-    </div>
-
-
-
-    <a class="navbar-item" style="color: white" target="_blank" href="https://github.com/redhat-solution-patterns/redhat-solution-patterns.github.io/issues">Feedback</a>
+    <div id="topbar-nav" class="navbar-menu">
+      <div class="navbar-end">
+        <div class="navbar-item has-dropdown is-hoverable">
+          <a class="navbar-link" href="#">Architectures &amp; Patterns</a>
+          <div class="navbar-dropdown">
+            <a class="navbar-item" href="https://www.redhat.com/architect/portfolio/" target="_blank">Portfolio Architecture&nbsp; </a>
+            <a class="navbar-item" href="https://redhat-solution-patterns.github.io/solution-patterns/patterns.html"  target="_blank">Solution Patterns </a>
+            <a class="navbar-item" href="https://validatedpatterns.io/" target="_blank">Validated Patterns&nbsp;</a>
+            <a class="navbar-item" href="https://catalog.redhat.com/solutions" target="_blank">Ecosystem Solutions&nbsp;</a>
+          </div>
+        </div>
 
-    <a class="navbar-item" style="color: white" target="_blank" href="https://redhat-solution-patterns.github.io/solution-patterns/contributors-guide.html">Contribute</a>
+        <div class="navbar-item has-dropdown is-hoverable">
+          <a class="navbar-link" href="#">Resources</a>
+          <div class="navbar-dropdown">
+            <a class="navbar-item" target="_blank" href="https://developers.redhat.com">Red Hat Developers</a>
+            <a class="navbar-item" target="_blank" href="https://developers.redhat.com/app-dev-platform">App Dev Platform</a>
+            <a class="navbar-item" target="_blank" href="https://www.redhat.com/en/products/application-foundations">Red Hat Application Services</a>
+          </div>
+        </div>
 
-    <div class="navbar-item"><span class="navbar-text"
-        style="color: white; margin-left: 1rem; margin-right: 1rem;">|</span></div>
+        <a class="navbar-item" target="_blank" href="https://github.com/redhat-solution-patterns/redhat-solution-patterns.github.io/issues">Feedback</a>
+        <a class="navbar-item" target="_blank" href="https://redhat-solution-patterns.github.io/solution-patterns/contributors-guide.html">Contribute</a>
 
-    <div id="topbar-nav" class="navbar-menu">
-      <div class="navbar-end">
         <div class="navbar-item" id="navbar-form-empty">
           <span class="navbar-text" style="margin-left: 2rem;">
             <span class="navbar-text" style="margin-left: 1rem; margin-right: 1rem;">&nbsp;<i style="color: orange;"
                 class="fa fa-exclamation-triangle" aria-hidden="true"></i></span>
                 Your Workshop Environment
             <form action="javascript:void(0);" onsu>
-              <input size="20" id="userId" type="text" placeholder="USER ID">
               <input size="20" id="subdomain" type="text" placeholder="Subdomain">
               <button type="hidden" onclick="goWithUserId();">Set</button>
             </form>
         </div>
 
-        <div class="navbar-item" id="navbar-form-filled" style="display: none;">
+        <div class="navbar-item" id="navbar-form-filled">
           <span class="navbar-text" style="margin-left: 2rem;">
             <span class="navbar-text " style="margin-left: 1rem; margin-right: 1rem; float:left">
               &nbsp;Your Workshop Environment 
               <span class="navbar-text" style="margin-left: 1rem; margin-right: 1rem;">
                   &nbsp;<i alt="Clear details" title="Clear details" onclick="recycle();" style="color: green;" class="fa fa-recycle" aria-hidden="true"></i>
                 <br>
-                <span id="userIdDisplay"></span> 
-                <span style="color: white; margin-left: 1rem; margin-right: 1rem;">|</span>
                 <span id="subdomainDisplay"></span>
               </span>
             </span>
@@ -135,7 +116,9 @@
       </div>
     </div>
   </nav>
-</header><div class="body">
+</header>
+
+<div class="body">
 <div class="nav-container" data-component="event-driven-api-mgmt" data-version="master">
   <aside class="nav">
     <div class="panels">
diff --git a/event-driven-api-mgmt/developer-resources.html b/event-driven-api-mgmt/developer-resources.html
index f281f6c..2744349 100644
--- a/event-driven-api-mgmt/developer-resources.html
+++ b/event-driven-api-mgmt/developer-resources.html
@@ -14,21 +14,14 @@
 <script>function gtag() { dataLayer.push(arguments) }; window.dataLayer = window.dataLayer || []; gtag('js', new Date()); gtag('config', 'G-21PT8RV6BR')</script>
   </head>
   <body class="article">
-<!-- Google tag (gtag.js) -->
-
-<!-- 
-  replace this with Google tag content 
--->
-
-<!-- Google tag (gtag.js) -->
 <header class="header">
+
   <script type="text/javascript">
     document.addEventListener('DOMContentLoaded', function () {
       const urlParams = new URLSearchParams(window.location.search);
-      const userId = urlParams.get('USERID');
       const subdomain = urlParams.get('SUBDOMAIN');
-      if (userId) {
-        showUserId(userId, subdomain);
+      if (subdomain) {
+        showUserId(subdomain);
       }
       else {
         showUserIdForm(subdomain);
@@ -36,10 +29,10 @@
     });
 
 
-    function showUserId(userId, subdomain) {
+    function showUserId(subdomain) {
+      
       document.getElementById('navbar-form-empty').style.display = "none";
       document.getElementById('navbar-form-filled').style.display = "flex";
-      document.getElementById('userIdDisplay').textContent = "User ID : " + userId;
       document.getElementById('subdomainDisplay').textContent = "Subdomain : " + subdomain;
     }
 
@@ -51,13 +44,11 @@
     }
 
     function goWithUserId() {
-      elUserIdInput = document.getElementById('userId');
       elSubdomainInput = document.getElementById('subdomain');
-      window.location.search = ('&USERID=' + elUserIdInput.value + '&SUBDOMAIN=' + elSubdomainInput.value);
+      window.location.search = ( '&SUBDOMAIN=' + elSubdomainInput.value);
     }
 
     function recycle() {
-      document.getElementById('userId').value = '';
       document.getElementById('subdomain').value = '';
       window.location.search = ('');
     }
@@ -69,63 +60,53 @@
         href="https://redhat-solution-patterns.github.io/solution-patterns">
         <img src="../_/img/logo.png" height="35px" alt="Solution Patterns">&nbsp; Solution Patterns from Red Hat</a>
       <button class="navbar-burger" data-target="topbar-nav">
+        <span></span>
+        <span></span>
+        <span></span>
       </button>
     </div>
-    
-    <div class="navbar-item"><span class="navbar-text"
-        style="color: white; margin-left: 1rem; margin-right: 1rem;">|</span></div>
-
-    <div class="navbar-item has-dropdown is-hoverable">
-      <a class="navbar-link" href="#" style="color: white">Architectures &amp; Patterns</a>
-      <div class="navbar-dropdown">
-        <a class="navbar-item" href="https://www.redhat.com/architect/portfolio/" target="_blank">Portfolio Architecture&nbsp; </a>
-        <a class="navbar-item" href="https://redhat-solution-patterns.github.io/solution-patterns/patterns.html" target="_blank">Solution Patterns </a>
-        <a class="navbar-item" href="https://validatedpatterns.io/" target="_blank">Validated Patterns&nbsp;</a>
-        <a class="navbar-item" href="https://catalog.redhat.com/solutions" target="_blank">Ecosystem Solutions&nbsp;</a>
-      </div>
-    </div>
-
-    <div class="navbar-item has-dropdown is-hoverable">
-      <a class="navbar-link" href="#" style="color: white">Resources</a>
-      <div class="navbar-dropdown">
-        <a class="navbar-item" target="_blank" href="https://developers.redhat.com">Red Hat Developers</a>
-        <a class="navbar-item" target="_blank" href="https://developers.redhat.com/app-dev-platform">App Dev Platform</a>
-        <a class="navbar-item" target="_blank" href="https://www.redhat.com/en/products/application-foundations">Red Hat Application Services</a>
-      </div>
-    </div>
-
-
-
-    <a class="navbar-item" style="color: white" target="_blank" href="https://github.com/redhat-solution-patterns/redhat-solution-patterns.github.io/issues">Feedback</a>
+    <div id="topbar-nav" class="navbar-menu">
+      <div class="navbar-end">
+        <div class="navbar-item has-dropdown is-hoverable">
+          <a class="navbar-link" href="#">Architectures &amp; Patterns</a>
+          <div class="navbar-dropdown">
+            <a class="navbar-item" href="https://www.redhat.com/architect/portfolio/" target="_blank">Portfolio Architecture&nbsp; </a>
+            <a class="navbar-item" href="https://redhat-solution-patterns.github.io/solution-patterns/patterns.html"  target="_blank">Solution Patterns </a>
+            <a class="navbar-item" href="https://validatedpatterns.io/" target="_blank">Validated Patterns&nbsp;</a>
+            <a class="navbar-item" href="https://catalog.redhat.com/solutions" target="_blank">Ecosystem Solutions&nbsp;</a>
+          </div>
+        </div>
 
-    <a class="navbar-item" style="color: white" target="_blank" href="https://redhat-solution-patterns.github.io/solution-patterns/contributors-guide.html">Contribute</a>
+        <div class="navbar-item has-dropdown is-hoverable">
+          <a class="navbar-link" href="#">Resources</a>
+          <div class="navbar-dropdown">
+            <a class="navbar-item" target="_blank" href="https://developers.redhat.com">Red Hat Developers</a>
+            <a class="navbar-item" target="_blank" href="https://developers.redhat.com/app-dev-platform">App Dev Platform</a>
+            <a class="navbar-item" target="_blank" href="https://www.redhat.com/en/products/application-foundations">Red Hat Application Services</a>
+          </div>
+        </div>
 
-    <div class="navbar-item"><span class="navbar-text"
-        style="color: white; margin-left: 1rem; margin-right: 1rem;">|</span></div>
+        <a class="navbar-item" target="_blank" href="https://github.com/redhat-solution-patterns/redhat-solution-patterns.github.io/issues">Feedback</a>
+        <a class="navbar-item" target="_blank" href="https://redhat-solution-patterns.github.io/solution-patterns/contributors-guide.html">Contribute</a>
 
-    <div id="topbar-nav" class="navbar-menu">
-      <div class="navbar-end">
         <div class="navbar-item" id="navbar-form-empty">
           <span class="navbar-text" style="margin-left: 2rem;">
             <span class="navbar-text" style="margin-left: 1rem; margin-right: 1rem;">&nbsp;<i style="color: orange;"
                 class="fa fa-exclamation-triangle" aria-hidden="true"></i></span>
                 Your Workshop Environment
             <form action="javascript:void(0);" onsu>
-              <input size="20" id="userId" type="text" placeholder="USER ID">
               <input size="20" id="subdomain" type="text" placeholder="Subdomain">
               <button type="hidden" onclick="goWithUserId();">Set</button>
             </form>
         </div>
 
-        <div class="navbar-item" id="navbar-form-filled" style="display: none;">
+        <div class="navbar-item" id="navbar-form-filled">
           <span class="navbar-text" style="margin-left: 2rem;">
             <span class="navbar-text " style="margin-left: 1rem; margin-right: 1rem; float:left">
               &nbsp;Your Workshop Environment 
               <span class="navbar-text" style="margin-left: 1rem; margin-right: 1rem;">
                   &nbsp;<i alt="Clear details" title="Clear details" onclick="recycle();" style="color: green;" class="fa fa-recycle" aria-hidden="true"></i>
                 <br>
-                <span id="userIdDisplay"></span> 
-                <span style="color: white; margin-left: 1rem; margin-right: 1rem;">|</span>
                 <span id="subdomainDisplay"></span>
               </span>
             </span>
@@ -134,7 +115,9 @@
       </div>
     </div>
   </nav>
-</header><div class="body">
+</header>
+
+<div class="body">
 <div class="nav-container" data-component="event-driven-api-mgmt" data-version="master">
   <aside class="nav">
     <div class="panels">
diff --git a/event-driven-api-mgmt/index.html b/event-driven-api-mgmt/index.html
index 8d23b98..089959e 100644
--- a/event-driven-api-mgmt/index.html
+++ b/event-driven-api-mgmt/index.html
@@ -14,21 +14,14 @@
 <script>function gtag() { dataLayer.push(arguments) }; window.dataLayer = window.dataLayer || []; gtag('js', new Date()); gtag('config', 'G-21PT8RV6BR')</script>
   </head>
   <body class="article">
-<!-- Google tag (gtag.js) -->
-
-<!-- 
-  replace this with Google tag content 
--->
-
-<!-- Google tag (gtag.js) -->
 <header class="header">
+
   <script type="text/javascript">
     document.addEventListener('DOMContentLoaded', function () {
       const urlParams = new URLSearchParams(window.location.search);
-      const userId = urlParams.get('USERID');
       const subdomain = urlParams.get('SUBDOMAIN');
-      if (userId) {
-        showUserId(userId, subdomain);
+      if (subdomain) {
+        showUserId(subdomain);
       }
       else {
         showUserIdForm(subdomain);
@@ -36,10 +29,10 @@
     });
 
 
-    function showUserId(userId, subdomain) {
+    function showUserId(subdomain) {
+      
       document.getElementById('navbar-form-empty').style.display = "none";
       document.getElementById('navbar-form-filled').style.display = "flex";
-      document.getElementById('userIdDisplay').textContent = "User ID : " + userId;
       document.getElementById('subdomainDisplay').textContent = "Subdomain : " + subdomain;
     }
 
@@ -51,13 +44,11 @@
     }
 
     function goWithUserId() {
-      elUserIdInput = document.getElementById('userId');
       elSubdomainInput = document.getElementById('subdomain');
-      window.location.search = ('&USERID=' + elUserIdInput.value + '&SUBDOMAIN=' + elSubdomainInput.value);
+      window.location.search = ( '&SUBDOMAIN=' + elSubdomainInput.value);
     }
 
     function recycle() {
-      document.getElementById('userId').value = '';
       document.getElementById('subdomain').value = '';
       window.location.search = ('');
     }
@@ -69,63 +60,53 @@
         href="https://redhat-solution-patterns.github.io/solution-patterns">
         <img src="../_/img/logo.png" height="35px" alt="Solution Patterns">&nbsp; Solution Patterns from Red Hat</a>
       <button class="navbar-burger" data-target="topbar-nav">
+        <span></span>
+        <span></span>
+        <span></span>
       </button>
     </div>
-    
-    <div class="navbar-item"><span class="navbar-text"
-        style="color: white; margin-left: 1rem; margin-right: 1rem;">|</span></div>
-
-    <div class="navbar-item has-dropdown is-hoverable">
-      <a class="navbar-link" href="#" style="color: white">Architectures &amp; Patterns</a>
-      <div class="navbar-dropdown">
-        <a class="navbar-item" href="https://www.redhat.com/architect/portfolio/" target="_blank">Portfolio Architecture&nbsp; </a>
-        <a class="navbar-item" href="https://redhat-solution-patterns.github.io/solution-patterns/patterns.html" target="_blank">Solution Patterns </a>
-        <a class="navbar-item" href="https://validatedpatterns.io/" target="_blank">Validated Patterns&nbsp;</a>
-        <a class="navbar-item" href="https://catalog.redhat.com/solutions" target="_blank">Ecosystem Solutions&nbsp;</a>
-      </div>
-    </div>
-
-    <div class="navbar-item has-dropdown is-hoverable">
-      <a class="navbar-link" href="#" style="color: white">Resources</a>
-      <div class="navbar-dropdown">
-        <a class="navbar-item" target="_blank" href="https://developers.redhat.com">Red Hat Developers</a>
-        <a class="navbar-item" target="_blank" href="https://developers.redhat.com/app-dev-platform">App Dev Platform</a>
-        <a class="navbar-item" target="_blank" href="https://www.redhat.com/en/products/application-foundations">Red Hat Application Services</a>
-      </div>
-    </div>
-
-
-
-    <a class="navbar-item" style="color: white" target="_blank" href="https://github.com/redhat-solution-patterns/redhat-solution-patterns.github.io/issues">Feedback</a>
+    <div id="topbar-nav" class="navbar-menu">
+      <div class="navbar-end">
+        <div class="navbar-item has-dropdown is-hoverable">
+          <a class="navbar-link" href="#">Architectures &amp; Patterns</a>
+          <div class="navbar-dropdown">
+            <a class="navbar-item" href="https://www.redhat.com/architect/portfolio/" target="_blank">Portfolio Architecture&nbsp; </a>
+            <a class="navbar-item" href="https://redhat-solution-patterns.github.io/solution-patterns/patterns.html"  target="_blank">Solution Patterns </a>
+            <a class="navbar-item" href="https://validatedpatterns.io/" target="_blank">Validated Patterns&nbsp;</a>
+            <a class="navbar-item" href="https://catalog.redhat.com/solutions" target="_blank">Ecosystem Solutions&nbsp;</a>
+          </div>
+        </div>
 
-    <a class="navbar-item" style="color: white" target="_blank" href="https://redhat-solution-patterns.github.io/solution-patterns/contributors-guide.html">Contribute</a>
+        <div class="navbar-item has-dropdown is-hoverable">
+          <a class="navbar-link" href="#">Resources</a>
+          <div class="navbar-dropdown">
+            <a class="navbar-item" target="_blank" href="https://developers.redhat.com">Red Hat Developers</a>
+            <a class="navbar-item" target="_blank" href="https://developers.redhat.com/app-dev-platform">App Dev Platform</a>
+            <a class="navbar-item" target="_blank" href="https://www.redhat.com/en/products/application-foundations">Red Hat Application Services</a>
+          </div>
+        </div>
 
-    <div class="navbar-item"><span class="navbar-text"
-        style="color: white; margin-left: 1rem; margin-right: 1rem;">|</span></div>
+        <a class="navbar-item" target="_blank" href="https://github.com/redhat-solution-patterns/redhat-solution-patterns.github.io/issues">Feedback</a>
+        <a class="navbar-item" target="_blank" href="https://redhat-solution-patterns.github.io/solution-patterns/contributors-guide.html">Contribute</a>
 
-    <div id="topbar-nav" class="navbar-menu">
-      <div class="navbar-end">
         <div class="navbar-item" id="navbar-form-empty">
           <span class="navbar-text" style="margin-left: 2rem;">
             <span class="navbar-text" style="margin-left: 1rem; margin-right: 1rem;">&nbsp;<i style="color: orange;"
                 class="fa fa-exclamation-triangle" aria-hidden="true"></i></span>
                 Your Workshop Environment
             <form action="javascript:void(0);" onsu>
-              <input size="20" id="userId" type="text" placeholder="USER ID">
               <input size="20" id="subdomain" type="text" placeholder="Subdomain">
               <button type="hidden" onclick="goWithUserId();">Set</button>
             </form>
         </div>
 
-        <div class="navbar-item" id="navbar-form-filled" style="display: none;">
+        <div class="navbar-item" id="navbar-form-filled">
           <span class="navbar-text" style="margin-left: 2rem;">
             <span class="navbar-text " style="margin-left: 1rem; margin-right: 1rem; float:left">
               &nbsp;Your Workshop Environment 
               <span class="navbar-text" style="margin-left: 1rem; margin-right: 1rem;">
                   &nbsp;<i alt="Clear details" title="Clear details" onclick="recycle();" style="color: green;" class="fa fa-recycle" aria-hidden="true"></i>
                 <br>
-                <span id="userIdDisplay"></span> 
-                <span style="color: white; margin-left: 1rem; margin-right: 1rem;">|</span>
                 <span id="subdomainDisplay"></span>
               </span>
             </span>
@@ -134,7 +115,9 @@
       </div>
     </div>
   </nav>
-</header><div class="body">
+</header>
+
+<div class="body">
 <div class="nav-container" data-component="event-driven-api-mgmt" data-version="master">
   <aside class="nav">
     <div class="panels">
diff --git a/sitemap.xml b/sitemap.xml
index 5c6e39c..1f49742 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -2,22 +2,22 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 <url>
 <loc>https://redhat-solution-patterns.github.io/solution-patterns/event-driven-api-mgmt/01-pattern.html</loc>
-<lastmod>2024-07-16T12:29:21.078Z</lastmod>
+<lastmod>2024-07-16T13:21:40.893Z</lastmod>
 </url>
 <url>
 <loc>https://redhat-solution-patterns.github.io/solution-patterns/event-driven-api-mgmt/02-architecture.html</loc>
-<lastmod>2024-07-16T12:29:21.078Z</lastmod>
+<lastmod>2024-07-16T13:21:40.893Z</lastmod>
 </url>
 <url>
 <loc>https://redhat-solution-patterns.github.io/solution-patterns/event-driven-api-mgmt/03-demo.html</loc>
-<lastmod>2024-07-16T12:29:21.078Z</lastmod>
+<lastmod>2024-07-16T13:21:40.893Z</lastmod>
 </url>
 <url>
 <loc>https://redhat-solution-patterns.github.io/solution-patterns/event-driven-api-mgmt/developer-resources.html</loc>
-<lastmod>2024-07-16T12:29:21.078Z</lastmod>
+<lastmod>2024-07-16T13:21:40.893Z</lastmod>
 </url>
 <url>
 <loc>https://redhat-solution-patterns.github.io/solution-patterns/event-driven-api-mgmt/index.html</loc>
-<lastmod>2024-07-16T12:29:21.078Z</lastmod>
+<lastmod>2024-07-16T13:21:40.893Z</lastmod>
 </url>
 </urlset>
