diff --git a/templates/base.html.twig b/templates/base.html.twig
index 27ab6230..bbacaa6d 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -78,14 +78,14 @@
                     <button class="btn btn-outline-dark btn-sm p-0" type="button" id="sidebar-toggle-button" title="{% trans %}sidebar.big.toggle{% endtrans %}">
                         <i class="fas fa-angle-left"></i>
                     </button>
-                    <div class="container-fluid mr-0 pr-0" id="content">
-                        <div id="content-data">
+                    <div class="container-fluid mr-0 pr-0" id="content-container">
+                        <turbo-frame id="content">
                             {# Here will be the real content be injected#}
 
                             {% block content %}
                             {% endblock %}
 
-                        </div>
+                        </turbo-frame>
 
                         {% block scripts %}
 
@@ -96,24 +96,6 @@
         </div>
     </main>
 
-    {# Modal for loading bar #}
-    <div class="modal border-primary" id="progressModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
-        <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
-            <div class="modal-content shadow-lg">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="exampleModalLabel">{% trans %}loading.caption{% endtrans %}
-                        <small class="text-muted">{% trans %}loading.message{% endtrans %}</small></h5>
-                </div>
-                <div class="modal-body">
-                    <div class="progress-bar progress-bar-striped active progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0"
-                         aria-valuemax="100" style="width: 100%;">
-                        <span>{% trans %}loading.bar{% endtrans %}</span>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
     {# Back to top buton #}
 
     <!-- Back to top button -->