diff --git a/src/servala/frontend/templates/includes/tabbed_fieldset_form.html b/src/servala/frontend/templates/includes/tabbed_fieldset_form.html
index ace05af..009ad94 100644
--- a/src/servala/frontend/templates/includes/tabbed_fieldset_form.html
+++ b/src/servala/frontend/templates/includes/tabbed_fieldset_form.html
@@ -45,10 +45,10 @@
                             <button class="nav-link {% if forloop.first %}active{% endif %}{% if fieldset.has_mandatory %} has-mandatory{% endif %}"
                                     id="{{ fieldset.title|slugify }}-tab"
                                     data-bs-toggle="tab"
-                                    data-bs-target="#{{ fieldset.title|slugify }}"
+                                    data-bs-target="#custom-{{ fieldset.title|slugify }}"
                                     type="button"
                                     role="tab"
-                                    aria-controls="{{ fieldset.title|slugify }}"
+                                    aria-controls="custom-{{ fieldset.title|slugify }}"
                                     aria-selected="{% if forloop.first %}true{% else %}false{% endif %}">
                                 {{ fieldset.title }}
                                 {% if fieldset.has_mandatory %}<span class="mandatory-indicator">*</span>{% endif %}
@@ -60,9 +60,9 @@
             <div class="tab-content" id="myTabContent">
                 {% for fieldset in form.get_fieldsets %}
                     <div class="tab-pane fade my-2 {% if fieldset.hidden %}d-none{% endif %}{% if forloop.first %}show active{% endif %}"
-                         id="{{ fieldset.title|slugify }}"
+                         id="custom-{{ fieldset.title|slugify }}"
                          role="tabpanel"
-                         aria-labelledby="{{ fieldset.title|slugify }}-tab">
+                         aria-labelledby="custom-{{ fieldset.title|slugify }}-tab">
                         {% for field in fieldset.fields %}
                             {% with field=form|get_field:field %}{{ field.as_field_group }}{% endwith %}
                         {% endfor %}
diff --git a/src/servala/static/js/bootstrap-tabs.js b/src/servala/static/js/bootstrap-tabs.js
index 1d9eb89..d382475 100644
--- a/src/servala/static/js/bootstrap-tabs.js
+++ b/src/servala/static/js/bootstrap-tabs.js
@@ -3,22 +3,15 @@
 (function() {
     'use strict';
 
-    console.log("Loading bootstrap tab setup")
-
     const initBootstrapTabs = () => {
-        console.log("setting up bootstrap tabs")
         const customTabList = document.querySelectorAll('#myTab button[data-bs-toggle="tab"]');
-        console.log("found custom tabs", customTabList)
         customTabList.forEach(function(tabButton) {
             new bootstrap.Tab(tabButton);
-            console.log("setting up custom tab", tabButton)
         });
 
         const expertTabList = document.querySelectorAll('#expertTab button[data-bs-toggle="tab"]');
-        console.log("found expert tabs", expertTabList)
         expertTabList.forEach(function(tabButton) {
             new bootstrap.Tab(tabButton);
-            console.log("setting up expert tab", tabButton)
         });
     }