diff --git a/src/fobi/contrib/themes/bootstrap5/templates/bootstrap5/form_wizards_dashboard.html b/src/fobi/contrib/themes/bootstrap5/templates/bootstrap5/form_wizards_dashboard.html
index 7763a8ae..816ad3fa 100644
--- a/src/fobi/contrib/themes/bootstrap5/templates/bootstrap5/form_wizards_dashboard.html
+++ b/src/fobi/contrib/themes/bootstrap5/templates/bootstrap5/form_wizards_dashboard.html
@@ -3,6 +3,6 @@
 {% load i18n %}
 
 {% block navbar-menu-right-content %}
-            <li class="nav-item"><a class="nav-link active" href="{% url 'fobi.dashboard' %}">{% trans "Forms" %}</a></li>
-            <li class="nav-item"><a class="nav-link" href="{% url 'fobi.form_wizards_dashboard' %}">{% trans "Wizards" %}</a></li>
+    <li class="nav-item"><a class="nav-link active" href="{% url 'fobi.dashboard' %}">{% trans "Forms" %}</a></li>
+    <li class="nav-item"><a class="nav-link" href="{% url 'fobi.form_wizards_dashboard' %}">{% trans "Wizards" %}</a></li>
 {% endblock navbar-menu-right-content %}
\ No newline at end of file
diff --git a/src/fobi/contrib/themes/bootstrap5/templates/bootstrap5/snippets/form_wizard_ajax.html b/src/fobi/contrib/themes/bootstrap5/templates/bootstrap5/snippets/form_wizard_ajax.html
index d4950264..d95d34d0 100644
--- a/src/fobi/contrib/themes/bootstrap5/templates/bootstrap5/snippets/form_wizard_ajax.html
+++ b/src/fobi/contrib/themes/bootstrap5/templates/bootstrap5/snippets/form_wizard_ajax.html
@@ -21,30 +21,32 @@
 {% block form_wizard_previous_button_text %}{% trans "Previous" %}{% endblock %}
 
 {% block form_page_sub_title_wrapper %}
-<nav aria-label="...">
+<nav aria-label="Page navigation">
   <ul class="pagination">
-    <li class="disabled">
-      <span>
+    <li class="page-item">
+      <a class="page-link disabled" href="#" aria-label="{% trans 'Previous' %}">
         <span aria-hidden="true">&laquo;</span>
-      </span>
+      </a>
     </li>
     {% for step_index in steps_range %}
       {% if step_index == wizard.steps.step1 %}
-        <li class="active">
-          <span>{{ step_index }} <span class="sr-only">{% trans "(current)" %}</span></span>
+        <li class="page-item">
+          <a class="page-link active disabled" href="#" aria-label="{% trans '(current)' %}">
+            <span aria-hidden="true">{{ step_index }}</span>
+          </a>
         </li>
       {% else %}
-        <li class="disabled">
-          <span>
+        <li class="page-item">
+          <a class="page-link disabled" href="#" aria-label="{{step_index}}">      
             <span aria-hidden="true">{{ step_index }}</span>
-          </span>
+          </a>
         </li>
       {% endif %}
     {% endfor %}
-    <li class="disabled">
-      <span>
+    <li class="page-item">
+      <a class="page-link disabled" href="#" aria-label="{% trans 'Next' %}">
         <span aria-hidden="true">&raquo;</span>
-      </span>
+      </a>
     </li>
   </ul>
 </nav>
diff --git a/src/fobi/contrib/themes/bootstrap5/templates/bootstrap5/snippets/form_wizard_snippet.html b/src/fobi/contrib/themes/bootstrap5/templates/bootstrap5/snippets/form_wizard_snippet.html
index c21629df..93c47b63 100644
--- a/src/fobi/contrib/themes/bootstrap5/templates/bootstrap5/snippets/form_wizard_snippet.html
+++ b/src/fobi/contrib/themes/bootstrap5/templates/bootstrap5/snippets/form_wizard_snippet.html
@@ -2,11 +2,11 @@
 
 {% load i18n fobi_tags %}
 
-{% block form_required_fields_message_wrapper_class %}well well-sm{% endblock %}
+{% block form_required_fields_message_wrapper_class %}bg-light border rounded p-1 ps-3 pe-3 mb-3{% endblock %}
 
 {% block form_element_wrapper_hidden_html_class %}hidden{% endblock %}
 
-{% block form_element_wrapper_html_class %}form-group{% endblock %}
+{% block form_element_wrapper_html_class %}form-group row mb-1{% endblock %}
 
 {% block form_element_wrapper_error_html_class%}has-error{% endblock %}
 
@@ -18,4 +18,4 @@
 
 {% block form_element_error_html_class %}help-block has-error{% endblock %}
 
-{% block form_element_help_text_html_class %}help-block{% endblock %}
+{% block form_element_help_text_html_class %}help-block form-text{% endblock %}
diff --git a/src/fobi/contrib/themes/bootstrap5/templates/bootstrap5/view_form_entry.html b/src/fobi/contrib/themes/bootstrap5/templates/bootstrap5/view_form_entry.html
index df194950..0d53e58f 100644
--- a/src/fobi/contrib/themes/bootstrap5/templates/bootstrap5/view_form_entry.html
+++ b/src/fobi/contrib/themes/bootstrap5/templates/bootstrap5/view_form_entry.html
@@ -3,11 +3,11 @@
 {% load i18n %}
 
 {% block navbar-menu-content %}
-<li class="nav-item"><a class="nav-link" href="{% url 'fobi.edit_form_entry' form_entry.pk %}">{% trans "Edit" %}</a></li>
-<li class="nav-item"><a class="nav-link active" href="{% url 'fobi.view_form_entry' form_entry.slug %}">{% trans "View" %}</a></li>
+    <li class="nav-item"><a class="nav-link" href="{% url 'fobi.edit_form_entry' form_entry.pk %}">{% trans "Edit" %}</a></li>
+    <li class="nav-item"><a class="nav-link active" href="{% url 'fobi.view_form_entry' form_entry.slug %}">{% trans "View" %}</a></li>
 {% endblock navbar-menu-content %}
 
 {% block navbar-menu-right-content %}
-            <li class="nav-item"><a class="nav-link active" href="{% url 'fobi.dashboard' %}">{% trans "Forms" %}</a></li>
-            <li class="nav-item"><a class="nav-link" href="{% url 'fobi.form_wizards_dashboard' %}">{% trans "Wizards" %}</a></li>
+    <li class="nav-item"><a class="nav-link active" href="{% url 'fobi.dashboard' %}">{% trans "Forms" %}</a></li>
+    <li class="nav-item"><a class="nav-link" href="{% url 'fobi.form_wizards_dashboard' %}">{% trans "Wizards" %}</a></li>
 {% endblock navbar-menu-right-content %}
\ No newline at end of file
diff --git a/src/fobi/contrib/themes/bootstrap5/templates/bootstrap5/view_form_wizard_entry.html b/src/fobi/contrib/themes/bootstrap5/templates/bootstrap5/view_form_wizard_entry.html
index ee327418..c2973149 100644
--- a/src/fobi/contrib/themes/bootstrap5/templates/bootstrap5/view_form_wizard_entry.html
+++ b/src/fobi/contrib/themes/bootstrap5/templates/bootstrap5/view_form_wizard_entry.html
@@ -3,11 +3,11 @@
 {% load i18n %}
 
 {% block navbar-menu-content %}
-<li class="nav-item"><a class="nav-link" href="{% url 'fobi.edit_form_entry' form_entry.pk %}">{% trans "Edit" %}</a></li>
-<li class="nav-item"><a class="nav-link active" href="{% url 'fobi.view_form_entry' form_entry.slug %}">{% trans "View" %}</a></li>
+    <li class="nav-item"><a class="nav-link" href="{% url 'fobi.edit_form_wizard_entry' form_wizard_entry.pk %}">{% trans "Edit" %}</a></li>
+    <li class="nav-item"><a class="nav-link active" href="{% url 'fobi.view_form_wizard_entry' form_wizard_entry.slug %}">{% trans "View" %}</a></li>
 {% endblock navbar-menu-content %}
 
 {% block navbar-menu-right-content %}
-            <li class="nav-item"><a class="nav-link active" href="{% url 'fobi.dashboard' %}">{% trans "Forms" %}</a></li>
-            <li class="nav-item"><a class="nav-link" href="{% url 'fobi.form_wizards_dashboard' %}">{% trans "Wizards" %}</a></li>
+    <li class="nav-item"><a class="nav-link active" href="{% url 'fobi.dashboard' %}">{% trans "Forms" %}</a></li>
+    <li class="nav-item"><a class="nav-link" href="{% url 'fobi.form_wizards_dashboard' %}">{% trans "Wizards" %}</a></li>
 {% endblock navbar-menu-right-content %}
\ No newline at end of file