diff --git a/geonode/layers/templates/layouts/panels.html b/geonode/layers/templates/layouts/panels.html
index c871a1391de..73822364065 100644
--- a/geonode/layers/templates/layouts/panels.html
+++ b/geonode/layers/templates/layouts/panels.html
@@ -229,18 +229,20 @@
-
-
-
- {% trans "Mandatory" %}
-
-
- {% trans "Mandatory" %}
-
-
- {% trans "Optional" %}
-
-
+ {% block edit_progress %}
+
+
+ {% trans "Mandatory" %}
+
+
+ {% trans "Mandatory" %}
+
+
+ {% trans "Optional" %}
+
+
+ {% endblock edit_progress %}
+ {% block breadcrumbs %}
+ {% endblock breadcrumbs %}
+ {% block mandatory %}
-
+ {% endblock mandatory %}
+ {% block advanced %}
@@ -378,6 +383,7 @@
+ {% block layer_attributes %}
@@ -398,6 +404,8 @@
{{ layer_form.attribution }}
+ {% endblock layer_attributes %}
+ {% block layer_regions %}
@@ -409,6 +417,8 @@
{{ layer_form.data_quality_statement }}
+ {% endblock layer_attributes %}
+ {% block layer_constraints %}
@@ -421,6 +431,7 @@
{{ layer_form.constraints_other }}
+ {% endblock layer_constraints %}
@@ -430,7 +441,9 @@
-
+ {% endblock advanced %}
+ {% block other_tab %}{% endblock other_tab %}
+ {% block ownership %}
@@ -529,6 +542,8 @@
{% trans "Message box" %}
+ {% endblock ownership %}
+ {% block dataset %}
@@ -579,6 +594,7 @@
{% trans "Message box" %}
+ {% endblock dataset %}
@@ -589,6 +605,8 @@
{% trans "Message box" %}
{% endif %}
+
+{% block settings %}
@@ -620,6 +638,8 @@
{% trans "Message box" %}
+ {% endblock settings %}
+ {% block other_settings %}
@@ -654,6 +674,7 @@
{% trans "Message box" %}
+ {% endblock other_settings %}
diff --git a/geonode/templates/search/_search_content.html b/geonode/templates/search/_search_content.html
index f02f5c7eeb3..e4dd137b1da 100644
--- a/geonode/templates/search/_search_content.html
+++ b/geonode/templates/search/_search_content.html
@@ -27,6 +27,7 @@
{% include "search/_text_filter.html" %}
{% endif %}
+ {% block search_facet_lists %}
{% if SEARCH_FILTERS.H_KEYWORDS_ENABLED %}
{% include "search/_h_keywords_filter.html" %}
{% endif %}
@@ -43,6 +44,7 @@
{% if SEARCH_FILTERS.EXTENT_ENABLED %}
{% include "search/_extent_filter.html" %}
{% endif %}
+ {% endblock search_facet_lists %}
diff --git a/geonode/templates/search/search_scripts.html b/geonode/templates/search/search_scripts.html
index 4cd182add44..98adf3de322 100644
--- a/geonode/templates/search/search_scripts.html
+++ b/geonode/templates/search/search_scripts.html
@@ -16,11 +16,14 @@
{% endif %}
+{% block search_script_loading %}
+{% endblock search_script_loading %}