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 @@
 
 <div class="tab-content">
 <div id="edit-metadata" class="tab-content tab-pane fade in active">
-  <div id="completeness-hints" class="progress">
-
-  <div class="mandatory-hint progress-bar" role="progressbar" style="width:25%">
-    {% trans "Mandatory" %}
-  </div>
-  <div class="advanced-hint progress-bar" role="progressbar" style="width:25%">
-    {% trans "Mandatory" %}
-  </div>
-  <div class="progress-bar" role="progressbar" style="width:50%">
-    {% trans "Optional" %}
-  </div>
-</div>
+  {% block edit_progress %}
+    <div id="completeness-hints" class="progress">
+      <div class="mandatory-hint progress-bar" role="progressbar" style="width:25%">
+        {% trans "Mandatory" %}
+      </div>
+      <div class="advanced-hint progress-bar" role="progressbar" style="width:25%">
+        {% trans "Mandatory" %}
+      </div>
+      <div class="progress-bar" role="progressbar" style="width:50%">
+        {% trans "Optional" %}
+      </div>
+    </div>
+  {% endblock edit_progress %}
+  {% block breadcrumbs %}
   <ul class="wizard--progress wizard--progress--medium">
       <li data-step="1" id="first" class="is-active" data-toggle="tab" href="#mandatory">
           <a>{% trans "Basic Metadata" %}</a>
@@ -255,6 +257,8 @@
           <a>{% trans "Dataset Attributes" %}</a>
       </li>
   </ul>
+  {% endblock breadcrumbs %}
+  {% block mandatory %}
     <div id="mandatory" class="tab-pane fade in active">
         <!--<br />-->
         <div class="panel-group">
@@ -370,7 +374,8 @@
             </div>
         </div>
     </div>
-
+    {% endblock mandatory %}
+    {% block advanced %}
     <div id="advanced" class="tab-pane fade">
         <div class="panel-group">
                 <div class="panel panel-default">
@@ -378,6 +383,7 @@
                     <div class="panel-body">
                         <div class="" id="mdinfo">
                             <div class="">
+                                {% block layer_attributes %}
                                 <div class="col-lg-4">
                                     <div>
                                         <span><label for="{{ layer_form.language|id }}">{{ layer_form.language.label }}</label></span>
@@ -398,6 +404,8 @@
                                         {{ layer_form.attribution }}
                                     </div>
                                 </div>
+                                {% endblock layer_attributes %}
+                                {% block layer_regions %}
                                 <div class="col-lg-4">
                                       <div id="regions_multiselect_container">
                                           <span><label for="{{ layer_form.regions|id }}">{{ layer_form.regions.label }}</label></span>
@@ -409,6 +417,8 @@
                                           {{ layer_form.data_quality_statement }}
                                       </div>
                                 </div>
+                                {% endblock layer_attributes %}
+                                {% block layer_constraints %}
                                 <div class="col-lg-4">
                                     <div>
                                         <span><label for="{{ layer_form.restriction_code_type|id }}">{{ layer_form.restriction_code_type.label }}</label></span>
@@ -421,6 +431,7 @@
                                         {{ layer_form.constraints_other }}
                                     </div>
                                 </div>
+                                {% endblock layer_constraints %}
                             </div>
                             <div class="row">
 
@@ -430,7 +441,9 @@
                 </div>
         </div>
     </div>
-
+    {% endblock advanced %}
+    {% block other_tab %}{% endblock other_tab %}
+    {% block ownership %}
     <div id="ownership" class="tab-pane fade">
         <div class="panel-group"><div class="panel panel-default"><div class="panel-body">
         <div>
@@ -529,6 +542,8 @@ <h4 class="modal-title" id="exampleModalLabel">{% trans "Message box" %}</h4>
         </div>
       </div></div></div>
     </div>
+    {% endblock ownership %}
+    {% block dataset %}
     <div id="dataset" class="tab-pane fade">
       <div class="panel-group"><div class="panel panel-default"><div class="panel-body">
         <div>
@@ -579,6 +594,7 @@ <h4 class="modal-title" id="exampleModalLabel">{% trans "Message box" %}</h4>
         </div>
       </div>
     </div>
+    {% endblock dataset %}
   </div>
 </div>
 <div id="preview" class="tab-pane fade" style="overflow: hidden;">
@@ -589,6 +605,8 @@ <h4 class="modal-title" id="exampleModalLabel">{% trans "Message box" %}</h4>
         <iframe id="preview_encoder_iframe" frameborder="0" scrolling="yes" onload="if(this.contentWindow.document.body) {$('#preview').height(this.contentWindow.document.body.scrollHeight)}" src="/catalogue/csw_to_extra_format/{{resource.uuid}}/{{resource.title}}.html"></iframe>
     {% endif %}
 </div>
+
+{% block settings %}
 <div id="settings" class="tab-pane fade" style="overflow: hidden;">
   <!--<br />-->
     <div class="col-xs-12 col-lg-4">
@@ -620,6 +638,8 @@ <h4 class="modal-title" id="exampleModalLabel">{% trans "Message box" %}</h4>
             </div>
      </div>
     </div>
+    {% endblock settings %}
+    {% block other_settings %}
     <div class="col-xs-12 col-lg-4">
       <div class="panel-group">
           <div class="panel panel-default">
@@ -654,6 +674,7 @@ <h4 class="modal-title" id="exampleModalLabel">{% trans "Message box" %}</h4>
             </div>
         </div>
     </div>
+    {% endblock other_settings %}
 </div>
 </div>
 
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  %}
         <div id="slide-pane">
+          {% 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 %}
         </div>
       </div>
     </div>
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 @@
 </style>
 
 {% endif %}
+{% block search_script_loading %}
 <script src="{% static "geonode/js/search/explore.js" %}"></script>
 <script src="{% static "geonode/js/search/search.js" %}"></script>
 <script src="{% static "geonode/js/search/cart.js" %}"></script>
+{% endblock search_script_loading %}
 <script type="text/javascript">
   $("body").attr('ng-controller', 'geonode_search_controller');
+  {% block search_scripts_endpoints %}
   CATEGORIES_ENDPOINT = '{% url 'api_dispatch_list' api_name='api' resource_name='categories' %}';
   GROUP_CATEGORIES_ENDPOINT = '{% url 'api_dispatch_list' api_name='api' resource_name='groupcategory' %}';
   KEYWORDS_ENDPOINT = '{% url 'api_dispatch_list' api_name='api' resource_name='keywords' %}';
@@ -36,7 +39,7 @@
   HAYSTACK_SEARCH = "{{ HAYSTACK_SEARCH }}".toLowerCase() === "true";
   HAYSTACK_FACET_COUNTS = "{{ HAYSTACK_FACET_COUNTS }}".toLowerCase() === "true";
   CLIENT_RESULTS_LIMIT = {{ CLIENT_RESULTS_LIMIT }};
-
+  {% endblock search_scripts_endpoints %}
   // Register autocomplete for text filters
   $(document).ready(function() {
     window.autocomplete = new Autocomplete({