diff --git a/src/servala/frontend/templates/includes/tabbed_fieldset_form.html b/src/servala/frontend/templates/includes/tabbed_fieldset_form.html
index d07b4e3..ace05af 100644
--- a/src/servala/frontend/templates/includes/tabbed_fieldset_form.html
+++ b/src/servala/frontend/templates/includes/tabbed_fieldset_form.html
@@ -7,12 +7,11 @@
     {% csrf_token %}
     {% include "frontend/forms/errors.html" %}
     {% if form %}
-        <div class="mb-3">
-            <button type="button"
-                    class="btn btn-sm btn-outline-secondary ml-auto d-block"
-                    id="expert-mode-toggle">
-                <i class="bi bi-code-square"></i> {% translate "Show Expert Mode" %}
-            </button>
+        <div class="mb-3 text-end">
+            <a href="#"
+               class="text-muted small"
+               id="expert-mode-toggle"
+               style="text-decoration: none">{% translate "Show Expert Mode" %}</a>
         </div>
     {% endif %}
     <div id="custom-form-container"
diff --git a/src/servala/static/js/expert-mode.js b/src/servala/static/js/expert-mode.js
index d83bb69..2bfc2fa 100644
--- a/src/servala/static/js/expert-mode.js
+++ b/src/servala/static/js/expert-mode.js
@@ -15,7 +15,8 @@
             return;
         }
 
-        toggleButton.addEventListener('click', function() {
+        toggleButton.addEventListener('click', function(e) {
+            e.preventDefault();
             isExpertMode = !isExpertMode;
 
             const activeFormInput = document.getElementById('active-form-input');
@@ -23,12 +24,12 @@
             if (isExpertMode) {
                 customFormContainer.style.display = 'none';
                 expertFormContainer.style.display = 'block';
-                toggleButton.innerHTML = '<i class="bi bi-code-square-fill"></i> Show Simplified Form';
+                toggleButton.textContent = 'Show Simplified Form';
                 if (activeFormInput) activeFormInput.value = 'expert';
             } else {
                 customFormContainer.style.display = 'block';
                 expertFormContainer.style.display = 'none';
-                toggleButton.innerHTML = '<i class="bi bi-code-square"></i> Show Expert Mode';
+                toggleButton.textContent = 'Show Expert Mode';
                 if (activeFormInput) activeFormInput.value = 'custom';
             }
         });