diff --git a/sapl/templates/base/login.html b/sapl/templates/base/login.html
index c2c7aa2c6..5db419fce 100644
--- a/sapl/templates/base/login.html
+++ b/sapl/templates/base/login.html
@@ -57,13 +57,10 @@
{% endblock base_content %}
- {% block javascript %}
-
-
+{% block extra_js %}
-
- {% endblock %}
+{% endblock %}
diff --git a/sapl/templates/compilacao/text_list.html b/sapl/templates/compilacao/text_list.html
index 7d3526cc1..c0ab6209e 100644
--- a/sapl/templates/compilacao/text_list.html
+++ b/sapl/templates/compilacao/text_list.html
@@ -113,7 +113,7 @@
{% endblock base_content %}
-{% block foot_js %}
+{% block extra_js %}
{{block.super}}
diff --git a/sapl/templates/compilacao/text_list__embedded.html b/sapl/templates/compilacao/text_list__embedded.html
index a448c9dd4..33b19695c 100644
--- a/sapl/templates/compilacao/text_list__embedded.html
+++ b/sapl/templates/compilacao/text_list__embedded.html
@@ -78,9 +78,14 @@
{% include 'compilacao/text_list_bloco.html'%}
-
-
+
+
+{% block extra_js %}
+
+
{% if perms.compilacao.add_nota %}
- {% endif %}
\ No newline at end of file
+ {% endif %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/sapl/templates/compilacao/text_list__print_version.html b/sapl/templates/compilacao/text_list__print_version.html
index 8aad1409c..aaf49babb 100644
--- a/sapl/templates/compilacao/text_list__print_version.html
+++ b/sapl/templates/compilacao/text_list__print_version.html
@@ -15,7 +15,7 @@
{% block footer_container %}{% endblock %}
-{% block foot_js %}{{block.super}}
+{% block extra_js %}{{block.super}}
{% endblock %}
diff --git a/sapl/templates/index.html b/sapl/templates/index.html
index 69c53e075..9dd611471 100644
--- a/sapl/templates/index.html
+++ b/sapl/templates/index.html
@@ -192,11 +192,15 @@
-
+
+{% endblock %}
+
+{% block extra_js %}
+
{% endblock %}
diff --git a/sapl/templates/norma/normajuridica_filter.html b/sapl/templates/norma/normajuridica_filter.html
index 0c7547661..a2a9c5f82 100644
--- a/sapl/templates/norma/normajuridica_filter.html
+++ b/sapl/templates/norma/normajuridica_filter.html
@@ -91,6 +91,12 @@
{% endif %}
{% endif %}
+{% endblock detail_content %}
+
+{% block table_content %}
+{% endblock table_content %}
+
+{% block extra_js %}
-{% endblock detail_content %}
-
-{% block table_content %}
-{% endblock table_content %}
+{% endblock table_content %}
\ No newline at end of file
diff --git a/sapl/templates/sessao/votacao/nominal_detail.html b/sapl/templates/sessao/votacao/nominal_detail.html
index 53d41084b..17ccb1f69 100644
--- a/sapl/templates/sessao/votacao/nominal_detail.html
+++ b/sapl/templates/sessao/votacao/nominal_detail.html
@@ -52,7 +52,7 @@
{% endblock detail_content %}
-{% block foot_js %}
+{% block extra_js %}
diff --git a/sapl/templates/sessao/votacao/nominal_edit.html b/sapl/templates/sessao/votacao/nominal_edit.html
index f751e21d9..c9d543c15 100644
--- a/sapl/templates/sessao/votacao/nominal_edit.html
+++ b/sapl/templates/sessao/votacao/nominal_edit.html
@@ -83,7 +83,7 @@
{% endblock detail_content %}
-{% block foot_js %}
+{% block extra_js %}
diff --git a/sapl/templates/sessao/votacao/nominal_transparencia.html b/sapl/templates/sessao/votacao/nominal_transparencia.html
index e373e7b03..920710a3e 100644
--- a/sapl/templates/sessao/votacao/nominal_transparencia.html
+++ b/sapl/templates/sessao/votacao/nominal_transparencia.html
@@ -58,7 +58,7 @@
{% endblock detail_content %}
-{% block foot_js %}
+{% block extra_js %}
diff --git a/sapl/templates/sessao/votacao/simbolica_transparencia.html b/sapl/templates/sessao/votacao/simbolica_transparencia.html
index 159dc1f94..57829dc3d 100644
--- a/sapl/templates/sessao/votacao/simbolica_transparencia.html
+++ b/sapl/templates/sessao/votacao/simbolica_transparencia.html
@@ -49,7 +49,7 @@
{% endblock detail_content %}
-{% block foot_js %}
+{% block extra_js %}