diff --git a/ckan/templates/group/index.html b/ckan/templates/group/index.html
index dc1a735a68a..5c137aea788 100644
--- a/ckan/templates/group/index.html
+++ b/ckan/templates/group/index.html
@@ -16,10 +16,15 @@
   <div class="module">
     <div class="module-content">
       <h1 class="hide-heading">{{ _('Groups') }}</h1>
+      {% block groups_search_form %}
       {% snippet 'snippets/simple_search.html', q=c.q, sort=c.sort_by_selected, placeholder=_('Search groups...') %}
+      {% endblock %}
       <h2 class="is-search-title">
+        {% block groups_search_result_text %}
         {% snippet 'snippets/search_result_text.html', query=c.q, count=c.page.item_count, type='group' %}
+        {% endblock %}
       </h2>
+      {% block groups_list %}
       {% if c.page.items or request.params %}
         {% snippet "group/snippets/group_list.html", groups=c.page.items %}
       {% else %}
@@ -30,8 +35,11 @@ <h2 class="is-search-title">
           {% endif %}
         </p>
       {% endif %}
+      {% endblock %}
     </div>
+    {% block page_pagination %}
     {{ c.page.pager() }}
+    {% endblock %}
   </div>
 {% endblock %}
 
diff --git a/ckan/templates/group/member_new.html b/ckan/templates/group/member_new.html
index f4ca100635c..3734453b3f4 100644
--- a/ckan/templates/group/member_new.html
+++ b/ckan/templates/group/member_new.html
@@ -17,11 +17,10 @@
 {% block primary_content %}
   <section class="module">
     <div class="module-content">
-      {% if c.user_name %}
-        <h1 class="page-heading">{{ _('Edit Member:') }} {{ c.user_name }}</h1>
-      {% else %}
-        <h1 class="page-heading">{{ _('Add Member') }}</h1>
-      {% endif %}
+      <h1 class="page-heading">
+        {% block page_heading %}{{ _('Edit Member') if user else _('Add Member') }}{% endblock %}
+      </h1>
+      {% block form %}
       <form class="dataset-form form-horizontal" method='post'>
         {% if c.user_name %}
             <input type="hidden" name="username" value="{{ c.user_name }}" />
@@ -33,6 +32,7 @@ <h1 class="page-heading">{{ _('Add Member') }}</h1>
         {{ form.select('role', label=_('Role'), options=c.roles, selected='', error='', attrs=format_attrs) }}
         <button class="btn btn-primary" type="submit" name="submit" >{{ _('Add') }}</button>
       </form>
+      {% endblock %}
     </div>
   </section>
 {% endblock %}
diff --git a/ckan/templates/group/read.html b/ckan/templates/group/read.html
index 6cdd3e769a7..f56359b37d9 100644
--- a/ckan/templates/group/read.html
+++ b/ckan/templates/group/read.html
@@ -4,9 +4,13 @@
 
 {% block primary_content_inner %}
   <div class="module-content">
+    {% block packages_list %}
     {% include "package/snippets/search_form.html" %}
+    {% endblock %}
   </div>
+  {% block page_pagination %}
   {{ c.page.pager(q=c.q) }}
+  {% endblock %}
 {% endblock %}
 
 {% block secondary_content %}