diff --git a/rosmorport_tsts/templates-django/base.jinja b/rosmorport_tsts/templates-django/base.jinja
index 4f31dd0..36dd8a6 100644
--- a/rosmorport_tsts/templates-django/base.jinja
+++ b/rosmorport_tsts/templates-django/base.jinja
@@ -37,13 +37,12 @@
   {# <script type="text/javascript" src="{% static 'js/js.cookie.min.js' %}"></script> #}
 </head>
 <body>{% block BODY %}
-  {% block Top_CSS1 %}{% endblock %}{% block Top_CSS2 %}{% endblock %}{% block Top_CSS3 %}{% endblock %}{% include "blocks/header_nav.jinja" %}
+  {% block CSS_1 %}{% endblock %}{% block CSS_2 %}{% endblock %}{% block CSS_3 %}{% endblock %}{% include "blocks/header_nav.jinja" %}
   {% block CONTENT %}{% endblock CONTENT %}
 {#  {% include "blocks/footer.jinja" %} #}{#  {% if COOKIES %}#}
 {#  {% include "blocks/accept-cookies.jinja2" %}{% endif %} #}
-
-  {% block Top_JS1 %}{% endblock Top_JS1 %}{% block Top_JS2 %}{% endblock Top_JS2 %}{% block Top_JS3 %}{% endblock Top_JS3 %}
-
+  <!-- My JavaScript -->
+  {% block JS_1 %}{% endblock %}{% block JS_2 %}{% endblock %}{% block JS_3 %}{% endblock %}
   <!-- Bootstrap JavaScript -->
   <script type="text/javascript" src="{% static 'js/bootstrap.bundle.min.js' %}"></script>
 {% endblock BODY %}</body>
diff --git a/rosmorport_tsts/templates-django/not_auth.jinja b/rosmorport_tsts/templates-django/not_auth.jinja
index a6ff3f6..5270b20 100644
--- a/rosmorport_tsts/templates-django/not_auth.jinja
+++ b/rosmorport_tsts/templates-django/not_auth.jinja
@@ -18,11 +18,9 @@
         </div>
       </div>
     </div>
-  </div>
-  {% endblock CONTENT %}
-{% block Top_JS1 %}<script type="text/javascript">
+  </div>{% endblock CONTENT %}
+{% block JS_1 %}<script type="text/javascript">
     $(document).ready(function() {
       $('#bad_login_modal').modal('show');
     });
-  </script>
-  {% endblock Top_JS1 %}
\ No newline at end of file
+  </script>{% endblock %}
\ No newline at end of file