diff --git a/geonode/context_processors.py b/geonode/context_processors.py
index 3b4ba3a082f..2fb2510ca7f 100644
--- a/geonode/context_processors.py
+++ b/geonode/context_processors.py
@@ -181,7 +181,8 @@ def resource_urls(request):
         ),
         OGC_SERVER=getattr(settings, 'OGC_SERVER', None),
         DELAYED_SECURITY_SIGNALS=getattr(settings, 'DELAYED_SECURITY_SIGNALS', False),
-        READ_ONLY_MODE=getattr(Configuration.load(), 'read_only', False)
+        READ_ONLY_MODE=getattr(Configuration.load(), 'read_only', False),
+        ADVANCED_EDIT_EXCLUDE_FIELD=getattr(settings, "ADVANCED_EDIT_EXCLUDE_FIELD", []),
     )
 
     return defaults
diff --git a/geonode/documents/templates/documents/document_metadata_advanced.html b/geonode/documents/templates/documents/document_metadata_advanced.html
index 6f1b5f4bf30..d18f1bb3bb6 100644
--- a/geonode/documents/templates/documents/document_metadata_advanced.html
+++ b/geonode/documents/templates/documents/document_metadata_advanced.html
@@ -66,10 +66,32 @@ <h2 class="page-title">{% trans "Edit Metadata" %}</h2>
            Unfortunately this needs to appear at the top (or the bottom) of the form since tkeywords_form is a complete other django form. 
            There might be a better way to solve this.-->
         <div class="col-md-12 form-controls">
-          {{ document_form|as_bootstrap }}
+          {% block document_fields %}
+          {% for field in document_form %}
+            {% if field.name != 'use_featureinfo_custom_template' and field.name != 'featureinfo_custom_template' and field.name not in ADVANCED_EDIT_EXCLUDE_FIELD  %}
+            <div class="form_item_spacing">
+              <div {% if field.name in UI_MANDATORY_FIELDS %} id='adv_req' {% else %}{% endif %} >
+              <span><label for="{{ field.id }}">{{ field.label }}</label></span>
+                {{ field }}
+              </div>
+            </div>
+            {% endif %}
+          {% endfor %}
+          {% endblock document_fields %}
+
+          {% block thesauri %}
+          {# layer_form|as_bootstrap #}
           {% if THESAURI_FILTERS %}
-            {{ tkeywords_form }}
+            {% for field in tkeywords_form %}
+            <div class="form_item_spacing thesauri_keywords" id="tadv_req">
+              <p>
+              <label for="{{ field.thesaurus_id }}">{{ field.label }}</label>
+              {{ field }}
+              </p>
+            </div>
+            {% endfor %}
           {% endif %}
+
         </div>
         <div class="row">
           <div class="col-md-12">
diff --git a/geonode/documents/templates/layouts/doc_panels.html b/geonode/documents/templates/layouts/doc_panels.html
index 675a05083e0..a813ae9b104 100644
--- a/geonode/documents/templates/layouts/doc_panels.html
+++ b/geonode/documents/templates/layouts/doc_panels.html
@@ -252,6 +252,7 @@
           <a>{% trans "Optional Metadata" %}</a>
       </li>
   </ul>
+  {% block mandatory %}
     <div id="mandatory" class="tab-pane fade in active">
         <!--<br />-->
         <div class="panel-group">
@@ -268,6 +269,7 @@
                     <div class="row">
                         <div class="col">
                             <div id="basicDescriptiveInfo" class="container-fluid">
+                            {% block doc_thumbnail %}
                                 <div class="col-lg-3">
                                     <img id="image" style="max-height: 100%; max-width: 100%; min-height: 100%; min-width: 100%">
                                     <script>
@@ -285,42 +287,46 @@
                                         c_widget.init();
                                     </script>
                                 </div>
+                                {% endblock doc_thumbnail %}
                                 <div class="col-lg-4">
+                                {% block doc_title %}
                                     <div id="req_item">
                                       <span><label for="{{ document_form.title|id }}">{{ document_form.title.label }}</label></span>
                                       <!--<p class="xxs-font-size">(Name by which the cited resource is known)</p>-->
                                       {{ document_form.title }}
                                     </div>
+                                {% endblock doc_title %}
+                                {% block doc_links %}
                                     <div id="req_item">                                  
                                       <span><label for="{{ document_form.title|id }}">{{ document_form.links.label }}</label></span>
                                       {{ document_form.links }}
                                     </div>
+                                {% endblock doc_links %}
+                                {% block doc_abstract %}
                                     <div id="req_item">
                                         <span><label for="{{ document_form.abstract|id }}">{{ document_form.abstract.label }}</label></span>
                                         <!--<p class="xxs-font-size">(Brief narrative summary of the content of the resource/s)</p>-->
                                         {{ document_form.abstract }}
                                     </div>
+                                {% endblock doc_abstract %}
                                 </div>
                                 <div class="col-lg-5">
-                                    <div class="col-lg-12">
-                                        <span><label for="{{ document_form.date_type|id }}">{{ document_form.keywords.label }}</label></span>
-                                        {{ document_form.keywords }}
-                                    </div>
-                                    {% if THESAURI_FILTERS %}
-                                    <div class="col-lg-12 thesauri_keywords">
-                                        {{ tkeywords_form }}
-                                    </div>
-                                    {% endif %}
+                                    {% block doc_date_type %}
                                     <div class="col-lg-6 col-xs-12">
                                         <span><label for="{{ document_form.date_type|id }}">{{ document_form.date_type.label }}</label></span>
                                         <!--<p class="xxs-font-size">(Identification of when a given event occurred)</p>-->
                                         {{ document_form.date_type }}
                                     </div>
+                                    {% endblock doc_date_type %}
+
+                                    {% block doc_date %}
                                     <div class="col-lg-6 col-xs-12" id="req_date">
                                         <span><label for="{{ document_form.date|id }}">{{ document_form.date.label }}</label></span>
                                         <!--<p class="xxs-font-size">(When a given event occurred on the resource)</p>-->
                                         {{ document_form.date }}
                                     </div>
+                                    {% endblock doc_date %}
+                                    {% block doc_category %}
                                     <div id="basicCategoryInfo" class="col-lg-12">
                                         <span><label for="{{ category_form.category_choice_field|id }}" class="control-label required-field">{% trans "Category" %}</label></span>
                                         <select
@@ -340,6 +346,8 @@
                                           {% endfor %}
                                         </select>
                                     </div>
+                                    {% endblock doc_category %}
+                                    {% block doc_group %}
                                     <div id="basicGroupInfo" class="col-lg-12">
                                         <span><label for="id_resource-group" class="control-label required-field">{% trans "Group" %}</label></span>
                                         <select
@@ -361,6 +369,18 @@
                                             {% endfor %}
                                         </select>
                                     </div>
+                                    {% endblock doc_group %}
+                                    {% block doc_keywords %}
+                                    <div class="col-lg-12">
+                                        <span><label for="{{ document_form.date_type|id }}">{{ document_form.keywords.label }}</label></span>
+                                        {{ document_form.keywords }}
+                                    </div>
+                                    {% endblock doc_keywords %}
+                                    {% if THESAURI_FILTERS %}
+                                    <div class="col-lg-12 thesauri_keywords">
+                                        {{ tkeywords_form.as_p }}
+                                    </div>
+                                    {% endif %}
                                 </div>
                             </div>
                         </div>
@@ -370,6 +390,8 @@
         </div>
     </div>
 
+  {% endblock mandatory %}
+  {% block advanced %}
     <div id="advanced" class="tab-pane fade">
         <div class="panel-group">
                 <div class="panel panel-default">
@@ -378,51 +400,66 @@
                         <div class="" id="mdinfo">
                             <div class="">
                                 <div class="col-lg-4">
+                                    {% block doc_language %}
                                     <div>
                                         <span><label for="{{ document_form.language|id }}">{{ document_form.language.label }}</label></span>
                                         <!--<p class="xxs-font-size">(Language used within the dataset)</p>-->
                                         {{ document_form.language }}
                                     </div>
+                                    {% endblock doc_language %}
+                                    {% block doc_license %}
                                     <div>
                                         <span><label for="{{ document_form.license|id }}">{{ document_form.license.label }}</label></span>
                                         <!--<p class="xxs-font-size">(License of the dataset)</p>-->
                                         {{ document_form.license }}
                                     </div>
+                                    {% endblock doc_license %}
+                                    {% block doc_doi %}
                                     <div>
                                         <span><label for="{{ document_form.doi|id }}">{{ document_form.doi.label }}</label></span>
                                         {{ document_form.doi }}
                                     </div>
+                                    {% endblock doc_doi %}
+                                    {% block doc_attribution %}
                                     <div>
                                         <span><label for="{{ document_form.attribution|id }}">{{ document_form.attribution.label }}</label></span>
                                         {{ document_form.attribution }}
                                     </div>
+                                    {% endblock doc_attribution %}
                                 </div>
                                 <div class="col-lg-4">
+                                    {% block doc_regions %}
                                       <div id="regions_multiselect_container">
                                           <span><label for="{{ document_form.regions|id }}">{{ document_form.regions.label }}</label></span>
                                           {{ document_form.regions }}
                                       </div>
+                                    {% endblock doc_regions %}
+                                    {% block doc_data_quality_statement %}
                                       <div>
                                           <span><label for="{{ document_form.data_quality_statement|id }}">{{ document_form.data_quality_statement.label }}</label></span>
                                           <!--<p class="xxs-font-size">(General explanation of the data producer's knowledge about the lineage)</p>-->
                                           {{ document_form.data_quality_statement }}
                                       </div>
+                                    {% endblock doc_data_quality_statement %}
                                 </div>
                                 <div class="col-lg-4">
+                                    {% block doc_restriction_code_type %}
                                     <div>
                                         <span><label for="{{ document_form.restriction_code_type|id }}">{{ document_form.restriction_code_type.label }}</label></span>
                                         <!--<p class="xxs-font-size">(Limitation/s placed upon the access or use of data)</p>-->
                                         {{ document_form.restriction_code_type }}
                                     </div>
+                                    {% endblock doc_restriction_code_type %}
+                                    {% block doc_constraints_other %}
                                     <div>
                                         <span><label for="{{ document_form.constraints_other|id }}">{{ document_form.constraints_other.label }}</label></span>
                                         <!--<p class="xxs-font-size">(Other restrictions and legal prerequisites for accessing or use data and metadata)</p>-->
                                         {{ document_form.constraints_other }}
-                                    </div>
+                                    </div> 
+                                    {% endblock doc_constraints_other %}
                                 </div>
                             </div>
                             <div class="row">
-
                             </div>
                         </div>
                     </div>
@@ -430,53 +467,69 @@
         </div>
     </div>
 
+  {% endblock advanced %}
+  {% block ownership %}
     <div id="ownership" class="tab-pane fade">
         <div class="panel-group"><div class="panel panel-default"><div class="panel-body">
         <div>
             <div class="col-xs-12 col-lg-4">
               <p>{% trans "Other, Optional, Metadata" %}</p>
+               {% block doc_edition %}
                 <div>
                     <span><label for="{{ document_form.edition|id }}">{{ document_form.edition.label }}</label></span>
                     <!--<p class="xxs-font-size">(Version of the cited resource)</p>-->
                     {{ document_form.edition }}
                 </div>
+                {% endblock doc_edition %}
+                {% block doc_purpose %}
                 <div>
                     <span><label for="{{ document_form.purpose|id }}">{{ document_form.purpose.label }}</label></span>
                     <!--<p class="xxs-font-size">(Brief narrative summary of the intentions with which the resource/s ...)</p>-->
                     {{ document_form.purpose }}
                 </div>
+                {% endblock doc_purpose %}
+                {% block doc_supplemental_information %}
                 <div>
                     <span><label for="{{ document_form.supplemental_information|id }}">{{ document_form.supplemental_information.label }}</label></span>
                     <!--<p class="xxs-font-size">(Any other descriptive information about the dataset)</p>-->
                     {{ document_form.supplemental_information }}
                 </div>
+                {% endblock doc_supplemental_information %}
             </div>
             <div class="col-xs-12 col-lg-5">
                     <div class="col-xs-12 col-lg-6">
+                      {% block doc_temporal_extent_start %}
                       <div class="input-group date">
                         <span><label for="{{ document_form.temporal_extent_start|id }}">{{ document_form.temporal_extent_start.label }}</label></span>
                         <!--<p class="xxs-font-size">(When a given event occurred on the resource)</p>-->
                         {{ document_form.temporal_extent_start }}
                         </div>
+                        {% endblock doc_temporal_extent_start %}
                     </div>
                     <div class="col-xs-12 col-lg-6">
+                      {% block doc_temporal_extent_end %}
                         <div class="input-group date">
                         <span><label for="{{ document_form.temporal_extent_end|id }}">{{ document_form.temporal_extent_end.label }}</label></span>
                         <!--<p class="xxs-font-size">(Identification of when a given event occurred)</p>-->
                         {{ document_form.temporal_extent_end }}
                         </div>
+                      {% endblock doc_temporal_extent_end %}
                     </div>
                 <div class="col-xs-12">
+                      {% block doc_maintenance_frequency %}
                     <div style="margin-top: 5px">
                         <span><label for="{{ document_form.maintenance_frequency|id }}">{{ document_form.maintenance_frequency.label }}</label></span>
                         <!--<p class="xxs-font-size">(Identification of when a given event occurred)</p>-->
                         {{ document_form.maintenance_frequency }}
                     </div>
+                      {% endblock doc_maintenance_frequency %}
+                      {% block doc_spatial_representation_type %}
                     <div style="margin-top: 5px">
                         <span><label for="{{ document_form.spatial_representation_type|id }}">{{ document_form.spatial_representation_type.label }}</label></span>
                         <!--<p class="xxs-font-size">(Method used to represent geographic information in the dataset)</p>-->
                         {{ document_form.spatial_representation_type }}
                     </div>
+                      {% endblock doc_spatial_representation_type %}
                 </div>
             </div>
             <div class="col-xs-12 col-lg-3">
@@ -507,6 +560,8 @@
       </div></div></div>
     </div>
   </div>
+  {% endblock ownership %}
+
   <div id="settings" class="tab-pane fade" style="overflow: hidden;">
   <!--<br />-->
     <div class="col-xs-12 col-lg-4">
diff --git a/geonode/layers/templates/layers/layer_metadata_advanced.html b/geonode/layers/templates/layers/layer_metadata_advanced.html
index 515715f2641..35dc5dbe0e8 100644
--- a/geonode/layers/templates/layers/layer_metadata_advanced.html
+++ b/geonode/layers/templates/layers/layer_metadata_advanced.html
@@ -90,8 +90,8 @@ <h2 class="page-title">{% trans "Edit Metadata" %}</h2>
              There might be a better way to solve this. -->
         <div class="col-md-6 form-controls">
           {% for field in layer_form %}
-            {% if field.name != 'use_featureinfo_custom_template' and field.name != 'featureinfo_custom_template' %}
-            <div>
+            {% if field.name != 'use_featureinfo_custom_template' and field.name != 'featureinfo_custom_template' and field.name not in ADVANCED_EDIT_EXCLUDE_FIELD %}
+            <div class="form_item_spacing">
               <span><label for="{{ field.id }}">{{ field.label }}</label></span>
               {{ field }}
             </div>
diff --git a/geonode/layers/templates/layouts/panels.html b/geonode/layers/templates/layouts/panels.html
index cae0e92e9ed..c5df3fa1365 100644
--- a/geonode/layers/templates/layouts/panels.html
+++ b/geonode/layers/templates/layouts/panels.html
@@ -232,6 +232,7 @@
 
 <div class="tab-content">
 <div id="edit-metadata" class="tab-content tab-pane fade in active">
+{% block edit_progress %}
   <div id="completeness-hints" class="progress">
 
   <div class="mandatory-hint progress-bar" role="progressbar" style="width:25%">
@@ -244,6 +245,8 @@
     {% 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>
@@ -258,6 +261,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">
@@ -273,6 +278,7 @@
                     <div class="row">
                         <div class="col">
                             <div id="basicDescriptiveInfo" class="container-fluid">
+                              {% block thumbnail %}
                                 <div class="col-lg-3">
                                     <span><label for="{{ layer_form.thumbnail_url|id }}">{% trans "Thumbnail" %}</label></span>
                                     <div id="embedded_map" class="mrg-btm" style="height:250px;width: 250px;">
@@ -294,38 +300,39 @@
                                       </div>
                                     </div>
                                 </div>
+                                {% endblock thumbnail %}
                                 <div class="col-lg-4">
+                                    {% block layer_title %}
                                     <div id="req_item">
                                       <span><label for="{{ layer_form.title|id }}">{{ layer_form.title.label }}</label></span>
                                       <!--<p class="xxs-font-size">(Name by which the cited resource is known)</p>-->
                                       {{ layer_form.title }}
                                     </div>
+                                    {% endblock layer_title %}
+                                    {% block layer_abstract %}
                                     <div id="req_item">
                                         <span><label for="{{ layer_form.abstract|id }}">{{ layer_form.abstract.label }}</label></span>
                                         <!--<p class="xxs-font-size">(Brief narrative summary of the content of the resource/s)</p>-->
                                         {{ layer_form.abstract }}
                                     </div>
+                                    {% endblock layer_abstract %}
                                 </div>
                                 <div class="col-lg-5">
-                                    <div class="col-lg-12">
-                                        <span><label for="{{ layer_form.date_type|id }}">{{ layer_form.keywords.label }}</label></span>
-                                        {{ layer_form.keywords }}
-                                    </div>
-                                    {% if THESAURI_FILTERS %}
-                                    <div class="col-lg-12 thesauri_keywords">
-                                        {{ tkeywords_form }}
-                                    </div>
-                                    {% endif %}
+                                    {% block layer_date_type %}
                                     <div class="col-lg-6 col-xs-12">
                                         <span><label for="{{ layer_form.date_type|id }}">{{ layer_form.date_type.label }}</label></span>
                                         <!--<p class="xxs-font-size">(Identification of when a given event occurred)</p>-->
                                         {{ layer_form.date_type }}
                                     </div>
+                                    {% endblock layer_date_type %}
+                                    {% block layer_date %}
                                     <div class="col-lg-6 col-xs-12" id="req_item">
                                         <span><label for="{{ layer_form.date|id }}">{{ layer_form.date.label }}</label></span>
                                         <!--<p class="xxs-font-size">(When a given event occurred on the resource)</p>-->
                                         {{ layer_form.date }}
                                     </div>
+                                    {% endblock layer_date %}
+                                    {% block layer_category %}
                                     <div id="basicCategoryInfo" class="col-lg-12">
                                         <span><label for="{{ category_form.category_choice_field|id }}" class="control-label required-field">{% trans "Category" %}</label></span>
                                         <select
@@ -346,6 +353,8 @@
                                           {% endfor %}
                                         </select>
                                     </div>
+                                    {% endblock layer_category %}
+                                    {% block layer_group %}
                                     <div id="basicGroupInfo" class="col-lg-12">
                                         <span><label for="id_resource-group" class="control-label required-field">{% trans "Group" %}</label></span>
                                         <select
@@ -367,6 +376,18 @@
                                             {% endfor %}
                                         </select>
                                     </div>
+                                    {% endblock layer_group %}
+                                    {% block layer_free_keyword %}
+                                    <div class="col-lg-12">
+                                        <span><label for="{{ layer_form.date_type|id }}">{{ layer_form.keywords.label }}</label></span>
+                                        {{ layer_form.keywords }}
+                                    </div>
+                                    {% endblock layer_free_keyword %}
+                                    {% if THESAURI_FILTERS %}
+                                    <div class="col-lg-12 thesauri_keywords">
+                                      {{tkeywords_form.as_p}}
+                                    </div>
+                                    {% endif %}
                                 </div>
                             </div>
                         </div>
@@ -375,7 +396,8 @@
             </div>
         </div>
     </div>
-
+    {% endblock %}
+    {% block advanced %}
     <div id="advanced" class="tab-pane fade">
         <div class="panel-group">
                 <div class="panel panel-default">
@@ -383,6 +405,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>
@@ -403,6 +426,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>
@@ -414,6 +439,8 @@
                                           {{ layer_form.data_quality_statement }}
                                       </div>
                                 </div>
+                                {% endblock layer_regions %}
+                                {% 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>
@@ -426,6 +453,7 @@
                                         {{ layer_form.constraints_other }}
                                     </div>
                                 </div>
+                                {% endblock layer_constraints %}
                             </div>
                             <div class="row">
 
@@ -435,83 +463,107 @@
                 </div>
         </div>
     </div>
-
+    {% endblock %}
+    {% 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>
+        <div id="mdinfo">
             <div class="col-xs-12 col-lg-4">
               <p>{% trans "Other, Optional, Metadata" %}</p>
+                {% block layer_edition %}
                 <div>
                     <span><label for="{{ layer_form.edition|id }}">{{ layer_form.edition.label }}</label></span>
                     <!--<p class="xxs-font-size">(Version of the cited resource)</p>-->
                     {{ layer_form.edition }}
                 </div>
+                {% endblock layer_edition %}
+                {% block layer_purpose %}
                 <div>
                     <span><label for="{{ layer_form.purpose|id }}">{{ layer_form.purpose.label }}</label></span>
                     <!--<p class="xxs-font-size">(Brief narrative summary of the intentions with which the resource/s ...)</p>-->
                     {{ layer_form.purpose }}
                 </div>
+                {% endblock layer_purpose %}
+                {% block layer_supplemental_information %}
                 <div>
                     <span><label for="{{ layer_form.supplemental_information|id }}">{{ layer_form.supplemental_information.label }}</label></span>
                     <!--<p class="xxs-font-size">(Any other descriptive information about the dataset)</p>-->
                     {{ layer_form.supplemental_information }}
                 </div>
+                {% endblock layer_supplemental_information %}
             </div>
             <div class="col-xs-12 col-lg-5">
-                    <div class="col-xs-12 col-lg-6">
+                   {% block layer_temporal_extent_start %}
+                    <div class="col-xs-12 col-lg-6 check-select">
                       <div class="input-group date">
                         <span><label for="{{ layer_form.temporal_extent_start|id }}">{{ layer_form.temporal_extent_start.label }}</label></span>
                         <!--<p class="xxs-font-size">(When a given event occurred on the resource)</p>-->
                         {{ layer_form.temporal_extent_start }}
                         </div>
                     </div>
-                    <div class="col-xs-12 col-lg-6">
+                    {% endblock layer_temporal_extent_start %}
+                    {% block layer_temporal_extent_end %}
+                    <div class="col-xs-12 col-lg-6 check-select">
                         <div class="input-group date">
                         <span><label for="{{ layer_form.temporal_extent_end|id }}">{{ layer_form.temporal_extent_end.label }}</label></span>
                         <!--<p class="xxs-font-size">(Identification of when a given event occurred)</p>-->
                         {{ layer_form.temporal_extent_end }}
                         </div>
                     </div>
+                    {% endblock layer_temporal_extent_end %}
                 <div class="col-xs-12">
+                    {% block layer_maintenance_frequency %}
                     <div style="margin-top: 5px">
                         <span><label for="{{ layer_form.maintenance_frequency|id }}">{{ layer_form.maintenance_frequency.label }}</label></span>
                         <!--<p class="xxs-font-size">(Identification of when a given event occurred)</p>-->
                         {{ layer_form.maintenance_frequency }}
                     </div>
+                    {% endblock layer_maintenance_frequency %}
+                    {% block layer_spatial_representation_type %}
                     <div style="margin-top: 5px">
                         <span><label for="{{ layer_form.spatial_representation_type|id }}">{{ layer_form.spatial_representation_type.label }}</label></span>
                         <!--<p class="xxs-font-size">(Method used to represent geographic information in the dataset)</p>-->
                         {{ layer_form.spatial_representation_type }}
                     </div>
+                    {% endblock layer_spatial_representation_type %}
                 </div>
             </div>
             <div class="col-xs-12 col-lg-3">
               <div class="panel panel-default" style="margin-top: 5px">
                   <div class="panel-heading">{% trans "Responsible Parties" %}</div>
-                  <div class="panel-body">
-                      <span><label for="{{ layer_form.poc|id }}">{{ layer_form.poc.label }}</label></span>
-                      {{ layer_form.poc }}
-                  </div>
+                    {% block layer_poc %}
+                    <div class="panel-body check-select">
+                        <span><label for="{{ layer_form.poc|id }}">{{ layer_form.poc.label }}</label></span>
+                        {{ layer_form.poc }}
+                    </div>
+                    {% endblock layer_poc %}
               </div>
               <div class="panel panel-default">
                   <div class="panel-heading">{% trans "Responsible and Permissions" %}</div>
                   <div class="panel-body">
+                    {% block layer_owner %}
                       <div>
                           <span><label for="{{ layer_form.owner|id }}">{{ layer_form.owner.label }}</label></span>
                           <!--<p class="xxs-font-size">(Responsible of the cited resource)</p>-->
                           {{ layer_form.owner }}
                       </div>
+                    {% endblock layer_owner %}
+                    {% block layer_metadata_author %}
                       <div>
                           <span><label for="{{ layer_form.metadata_author|id }}">{{ layer_form.metadata_author.label }}</label></span>
                           <!--<p class="xxs-font-size">(Author of the metadata)</p>-->
                           {{ layer_form.metadata_author }}
                       </div>
+                    {% endblock layer_metadata_author %}
                   </div>
               </div>
             </div>
         </div>
       </div></div></div>
     </div>
+    {% endblock %}
+    {% block dataset %}
     <div id="dataset" class="tab-pane fade">
       <div class="panel-group"><div class="panel panel-default"><div class="panel-body">
         <div>
@@ -562,6 +614,7 @@
         </div>
       </div>
     </div>
+    {% endblock %}
   </div>
 </div>
 <div id="preview" class="tab-pane fade" style="overflow: hidden;">
diff --git a/geonode/maps/templates/layouts/map_panels.html b/geonode/maps/templates/layouts/map_panels.html
index 546056c40f3..e337f1741da 100644
--- a/geonode/maps/templates/layouts/map_panels.html
+++ b/geonode/maps/templates/layouts/map_panels.html
@@ -270,6 +270,7 @@
                     <div class="row">
                         <div class="col">
                             <div id="basicDescriptiveInfo" class="container-fluid">
+                            {% block map_thumbnail %}
                                 <div class="col-lg-3">
                                     <span><label for="{{ map_form.thumbnail_url|id }}">{% trans "Thumbnail" %}</label></span>
                                     <div id="embedded_map" class="mrg-btm" style="height:250px;width: 250px;">
@@ -290,38 +291,39 @@
                                       </div>
                                     </div>
                                 </div>
+                            {% endblock map_thumbnail %}
                                 <div class="col-lg-4">
+                                    {% block map_title %}
                                     <div id="req_item">
                                       <span><label for="{{ map_form.title|id }}">{{ map_form.title.label }}</label></span>
                                           <!--<p class="xxs-font-size">(Name by which the cited resource is known)</p>-->
                                           {{ map_form.title }}
                                     </div>
+                                  {% endblock map_title %}
+                                  {% block map_abstract %}
                                     <div id="req_item">
                                         <span><label for="{{ map_form.abstract|id }}">{{ map_form.abstract.label }}</label></span>
                                         <!--<p class="xxs-font-size">(Brief narrative summary of the content of the resource/s)</p>-->
                                         {{ map_form.abstract }}
                                     </div>
+                                  {% endblock map_abstract %}
                                 </div>
                                 <div class="col-lg-5">
-                                    <div class="col-lg-12">
-                                        <span><label for="{{ map_form.date_type|id }}">{{ map_form.keywords.label }}</label></span>
-                                        {{ map_form.keywords }}
-                                    </div>
-                                    {% if THESAURI_FILTERS %}
-                                    <div class="col-lg-12 thesauri_keywords">
-                                        {{ tkeywords_form }}
-                                    </div>
-                                    {% endif %}
+                                  {% block map_date_type %}
                                     <div class="col-lg-6 col-xs-12">
                                         <span><label for="{{ map_form.date_type|id }}">{{ map_form.date_type.label }}</label></span>
                                         <!--<p class="xxs-font-size">(Identification of when a given event occurred)</p>-->
                                         {{ map_form.date_type }}
                                     </div>
+                                  {% endblock map_date_type %}
+                                  {% block map_date %}
                                     <div class="col-lg-6 col-xs-12" id="req_item">
                                         <span><label for="{{ map_form.date|id }}">{{ map_form.date.label }}</label></span>
                                         <!--<p class="xxs-font-size">(When a given event occurred on the resource)</p>-->
                                         {{ map_form.date }}
                                     </div>
+                                  {% endblock map_date %}
+                                  {% block map_category %}
                                     <div id="basicCategoryInfo" class="col-lg-12">
                                         <span><label for="{{ category_form.category_choice_field|id }}" class="control-label required-field">{% trans "Category" %}</label></span>
                                         <select
@@ -341,6 +343,8 @@
                                           {% endfor %}
                                         </select>
                                     </div>
+                                  {% endblock map_category %}
+                                  {% block map_group %}
                                     <div id="basicGroupInfo" class="col-lg-12">
                                         <span><label for="id_resource-group" class="control-label required-field">{% trans "Group" %}</label></span>
                                         <select
@@ -362,6 +366,18 @@
                                             {% endfor %}
                                         </select>
                                     </div>
+                                  {% endblock map_group %}
+                                    {% block map_keywords %}
+                                    <div class="col-lg-12">
+                                        <span><label for="{{ map_form.date_type|id }}">{{ map_form.keywords.label }}</label></span>
+                                        {{ map_form.keywords }}
+                                    </div>
+                                    {% endblock map_keywords %}
+                                    {% if THESAURI_FILTERS %}
+                                    <div class="col-lg-12 thesauri_keywords">
+                                      {{tkeywords_form.as_p}}
+                                    </div>
+                                    {% endif %}
                                 </div>
                             </div>
                         </div>
@@ -379,47 +395,63 @@
                         <div class="" id="mdinfo">
                             <div class="">
                                 <div class="col-lg-4">
+                                    {% block map_language %}
                                     <div>
                                         <span><label for="{{ map_form.language|id }}">{{ map_form.language.label }}</label></span>
                                         <!--<p class="xxs-font-size">(Language used within the dataset)</p>-->
                                         {{ map_form.language }}
                                     </div>
+                                    {% endblock map_language %}
+                                    {% block map_license %}
                                     <div>
                                         <span><label for="{{ map_form.license|id }}">{{ map_form.license.label }}</label></span>
                                         <!--<p class="xxs-font-size">(License of the dataset)</p>-->
                                         {{ map_form.license }}
                                     </div>
+                                    {% endblock map_license %}
+                                    {% block map_doi %}
                                     <div>
                                         <span><label for="{{ map_form.doi|id }}">{{ map_form.doi.label }}</label></span>
                                         {{ map_form.doi }}
                                     </div>
+                                    {% endblock map_doi %}
+                                    {% block map_attribution %}
                                     <div>
                                         <span><label for="{{ map_form.attribution|id }}">{{ map_form.attribution.label }}</label></span>
                                         {{ map_form.attribution }}
                                     </div>
+                                    {% endblock map_attribution %}
                                 </div>
                                 <div class="col-lg-4">
+                                    {% block map_regions %}
                                       <div id="regions_multiselect_container">
-                                        <span><label for="{{ map_form.regions|id }}">{{ map_form.regions.label }}</label></span>
-                                        {{ map_form.regions }}
+                                          <span><label for="{{ map_form.regions|id }}">{{ map_form.regions.label }}</label></span>
+                                          {{ map_form.regions }}
                                       </div>
+                                    {% endblock map_regions %}
+                                    {% block map_data_quality_statement %}
                                       <div>
-                                        <span><label for="{{ map_form.data_quality_statement|id }}">{{ map_form.data_quality_statement.label }}</label></span>
-                                        <!--<p class="xxs-font-size">(General explanation of the data producer's knowledge about the lineage)</p>-->
-                                        {{ map_form.data_quality_statement }}
+                                          <span><label for="{{ map_form.data_quality_statement|id }}">{{ map_form.data_quality_statement.label }}</label></span>
+                                          <!--<p class="xxs-font-size">(General explanation of the data producer's knowledge about the lineage)</p>-->
+                                          {{ map_form.data_quality_statement }}
                                       </div>
+                                    {% endblock map_data_quality_statement %}
                                 </div>
                                 <div class="col-lg-4">
+                                    {% block map_restriction_code_type %}
                                     <div>
                                         <span><label for="{{ map_form.restriction_code_type|id }}">{{ map_form.restriction_code_type.label }}</label></span>
                                         <!--<p class="xxs-font-size">(Limitation/s placed upon the access or use of data)</p>-->
                                         {{ map_form.restriction_code_type }}
                                     </div>
+                                    {% endblock map_restriction_code_type %}
+                                    {% block map_constraints_other %}
                                     <div>
                                         <span><label for="{{ map_form.constraints_other|id }}">{{ map_form.constraints_other.label }}</label></span>
                                         <!--<p class="xxs-font-size">(Other restrictions and legal prerequisites for accessing or use data and metadata)</p>-->
                                         {{ map_form.constraints_other }}
-                                    </div>
+                                    </div> 
+                                    {% endblock map_constraints_other %}
                                 </div>
                             </div>
                             <div class="row">
@@ -436,21 +468,27 @@
         <div>
             <div class="col-xs-12 col-lg-4">
               <p>{% trans "Other, Optional, Metadata" %}</p>
+                {% block map_edition %}
                 <div>
                     <span><label for="{{ map_form.edition|id }}">{{ map_form.edition.label }}</label></span>
                     <!--<p class="xxs-font-size">(Version of the cited resource)</p>-->
                     {{ map_form.edition }}
                 </div>
+                {% endblock map_edition %}
+                {% block map_purpose %}
                 <div>
                     <span><label for="{{ map_form.purpose|id }}">{{ map_form.purpose.label }}</label></span>
                     <!--<p class="xxs-font-size">(Brief narrative summary of the intentions with which the resource/s ...)</p>-->
                     {{ map_form.purpose }}
                 </div>
+                {% endblock map_purpose %}
+                {% block map_supplemental_information %}
                 <div>
                     <span><label for="{{ map_form.supplemental_information|id }}">{{ map_form.supplemental_information.label }}</label></span>
                     <!--<p class="xxs-font-size">(Any other descriptive information about the dataset)</p>-->
                     {{ map_form.supplemental_information }}
                 </div>
+                {% endblock map_supplemental_information %}
             </div>
             <div class="col-xs-12 col-lg-5">
                 <div class="col-xs-12 col-lg-6">
@@ -461,11 +499,13 @@
                     </div>
                 </div>
                 <div class="col-xs-12 col-lg-6">
+                    {% block map_temporal_extent_end %}
                     <div class="input-group date">
                     <span><label for="{{ map_form.temporal_extent_end|id }}">{{ map_form.temporal_extent_end.label }}</label></span>
                     <!--<p class="xxs-font-size">(Identification of when a given event occurred)</p>-->
                     {{ map_form.temporal_extent_end }}
                     </div>
+                    {% endblock map_temporal_extent_end %}
                 </div>
                 <div class="col-xs-12">
                     <div style="margin-top: 5px">