diff --git a/africanlii/templates/africanlii/au_institution_detail.html b/africanlii/templates/africanlii/au_institution_detail.html
index 35bbae2c1..9f6341d89 100644
--- a/africanlii/templates/africanlii/au_institution_detail.html
+++ b/africanlii/templates/africanlii/au_institution_detail.html
@@ -24,7 +24,7 @@
{% block entity-profile %}
{% with entity_profile=author.au_institution.entity_profile.first entity_profile_title=author.name %}
{% if entity_profile %}
-
-
{{ entity_profile_title }}
+
{{ entity_profile_title|default:entity_profile.title }}
{% if entity_profile.about_html %}
{{ entity_profile.about_html|safe }}
{% endif %}
{% if entity_profile.address %}
diff --git a/peachjam/templates/peachjam/author_detail.html b/peachjam/templates/peachjam/author_detail.html
index a0d4fe659..b6dda3dee 100644
--- a/peachjam/templates/peachjam/author_detail.html
+++ b/peachjam/templates/peachjam/author_detail.html
@@ -2,7 +2,9 @@
{% load i18n %}
{% block title %}{{ author }}{% endblock %}
{% block page-title %}
-
{% blocktrans %} Documents by {{ author }} {% endblocktrans %}
+ {% if not entity_profile %}
+ {% blocktrans %} Documents by {{ author }} {% endblocktrans %}
+ {% endif %}
{% endblock %}
{% block entity-profile %}
{% with entity_profile_title=author entity_profile=author.entity_profile.first %}
diff --git a/peachjam/templates/peachjam/court_detail.html b/peachjam/templates/peachjam/court_detail.html
index efdd6403d..b967cc3a6 100644
--- a/peachjam/templates/peachjam/court_detail.html
+++ b/peachjam/templates/peachjam/court_detail.html
@@ -34,14 +34,9 @@
{% endblock %}
-{% block entity-profile %}
- {% with entity_profile=court.entity_profile.first entity_profile_title=court.name %}
- {% if entity_profile %}
-
{% include 'peachjam/_entity_profile.html' %}
- {% endif %}
- {% endwith %}
+{% block page-title %}
+ {% if not entity_profile %}
{{ page_title }}
{% endif %}
{% endblock %}
-{% block page-title %}
{{ page_title }}
{% endblock %}
{% block page-header %}
{{ block.super }}
{% block court_list %}
diff --git a/peachjam/templates/peachjam/gazette_list.html b/peachjam/templates/peachjam/gazette_list.html
index f3f9c8cdb..41dd9579a 100644
--- a/peachjam/templates/peachjam/gazette_list.html
+++ b/peachjam/templates/peachjam/gazette_list.html
@@ -1,89 +1,89 @@
-{% extends "peachjam/layouts/main.html" %}
+{% extends "peachjam/layouts/document_list.html" %}
{% load i18n %}
{% block title %}
{{ place|default_if_none:"" }} {% trans 'Gazettes' %} {{ year }}
{% endblock %}
-{% block page-content %}
-
-
- {% block breadcrumbs %}
-
- {% endblock %}
- {% block page-title %}
-
- {% if place %}{{ place }}{% endif %}
- {% trans 'Gazettes' %}
-
- {% endblock %}
- {% block count-and-search %}
- {% block localities %}
- {% if localities %}
- {% include 'peachjam/_gazette_localities.html' %}
- {% endif %}
- {% endblock %}
- {% include 'peachjam/_count_and_search.html' %}
- {% endblock %}
- {% if doc_count %}
- {% block years-list %}
-
- {% for year in years %}
-
-
-
-
- {% block gazette-year-link %}
- {% if locality %}
- {{ year.year }}
- {% elif country %}
- {{ year.year }}
- {% else %}
- {{ year.year }}
- {% endif %}
- {% endblock %}
-
-
- {% blocktrans trimmed count num_gazettes=year.count %}
- {{ num_gazettes }} gazette
- {% plural %}
- {{ num_gazettes }} gazettes
- {% endblocktrans %}
-
- {% block monthly-chart %}
- {% if locality %}
- {% url 'gazettes_by_year' locality.place_code year.year as url %}
- {% elif country %}
- {% url 'gazettes_by_year' country.pk.lower year.year as url %}
- {% else %}
- {% url 'gazettes_by_year' year.year as url %}
- {% endif %}
- {% include 'peachjam/_monthly_column_chart.html' %}
- {% endblock %}
-
+{% block breadcrumbs %}
+
+{% endblock %}
+{% block page-title %}
+ {% if not entity_profile %}
+
+ {% if place %}{{ place }}{% endif %}
+ {% trans 'Gazettes' %}
+
+ {% endif %}
+{% endblock %}
+{% block count-and-search %}
+ {% block localities %}
+ {% if localities %}
+ {% include 'peachjam/_gazette_localities.html' %}
+ {% endif %}
+ {% endblock %}
+ {% include 'peachjam/_count_and_search.html' %}
+{% endblock %}
+{% block document-table %}
+ {% if doc_count %}
+ {% block years-list %}
+
+ {% for year in years %}
+
+
+
+
+ {% block gazette-year-link %}
+ {% if locality %}
+ {{ year.year }}
+ {% elif country %}
+ {{ year.year }}
+ {% else %}
+ {{ year.year }}
+ {% endif %}
+ {% endblock %}
+
+
+ {% blocktrans trimmed count num_gazettes=year.count %}
+ {{ num_gazettes }} gazette
+ {% plural %}
+ {{ num_gazettes }} gazettes
+ {% endblocktrans %}
+ {% block monthly-chart %}
+ {% if locality %}
+ {% url 'gazettes_by_year' locality.place_code year.year as url %}
+ {% elif country %}
+ {% url 'gazettes_by_year' country.pk.lower year.year as url %}
+ {% else %}
+ {% url 'gazettes_by_year' year.year as url %}
+ {% endif %}
+ {% include 'peachjam/_monthly_column_chart.html' %}
+ {% endblock %}
- {% endfor %}
+
- {% endblock %}
- {% endif %}
-
-
+ {% endfor %}
+
+ {% endblock %}
+ {% endif %}
{% endblock %}
diff --git a/peachjam/templates/peachjam/judgment_list.html b/peachjam/templates/peachjam/judgment_list.html
index 2d7e280ef..1e7b44a39 100644
--- a/peachjam/templates/peachjam/judgment_list.html
+++ b/peachjam/templates/peachjam/judgment_list.html
@@ -1,28 +1,19 @@
-{% extends "peachjam/layouts/main.html" %}
+{% extends "peachjam/layouts/document_list.html" %}
{% load i18n %}
{% block title %}
{% trans 'Judgments' %}
{% endblock %}
-{% block page-content %}
-
-
- {% block page-header %}
- {% block page-title %}
-
{% trans 'Judgments' %}
- {% endblock %}
- {% block count-and-search %}
- {% include 'peachjam/_count_and_search.html' %}
- {% endblock %}
- {% endblock %}
- {% include 'peachjam/_court_list.html' %}
-
- {% if title %}
- {{ title }}
- {% else %}
- {% trans 'Recent judgments' %}
- {% endif %}
-
- {% include 'peachjam/_recent_document_list.html' with documents=recent_judgments %}
-
-
+{% block page-title %}
+
{% trans 'Judgments' %}
+{% endblock %}
+{% block document-table %}
+ {% include 'peachjam/_court_list.html' %}
+
+ {% if title %}
+ {{ title }}
+ {% else %}
+ {% trans 'Recent judgments' %}
+ {% endif %}
+
+ {% include 'peachjam/_recent_document_list.html' with documents=recent_judgments %}
{% endblock %}
diff --git a/peachjam/templates/peachjam/layouts/document_list.html b/peachjam/templates/peachjam/layouts/document_list.html
index dea61d2a9..e80f2b368 100644
--- a/peachjam/templates/peachjam/layouts/document_list.html
+++ b/peachjam/templates/peachjam/layouts/document_list.html
@@ -5,11 +5,17 @@
{% endblock %}
{% block page-content %}
{% block breadcrumbs %}{% endblock %}
- {% block entity-profile %}{% endblock %}
+ {% block entity-profile %}
+ {% if entity_profile %}
+ {% include 'peachjam/_entity_profile.html' %}
+ {% endif %}
+ {% endblock %}
{% block page-header %}
{% block page-title %}
-
{% trans 'Documents' %}
+ {% if not entity_profile %}
+
{% trans 'Documents' %}
+ {% endif %}
{% endblock %}
{% block count-and-search %}
{% include 'peachjam/_count_and_search.html' %}
diff --git a/peachjam/templates/peachjam/place_detail.html b/peachjam/templates/peachjam/place_detail.html
index 464062a8e..6faaaf85c 100644
--- a/peachjam/templates/peachjam/place_detail.html
+++ b/peachjam/templates/peachjam/place_detail.html
@@ -1,4 +1,6 @@
{% extends 'peachjam/layouts/document_list.html' %}
{% load i18n %}
{% block title %}{{ place }}{% endblock %}
-{% block page-title %}
{{ place }}
{% endblock %}
+{% block page-title %}
+ {% if not entity_profile %}
{{ place }}
{% endif %}
+{% endblock %}
diff --git a/peachjam/templates/peachjam/taxonomy_detail.html b/peachjam/templates/peachjam/taxonomy_detail.html
index a4395d671..e73d60074 100644
--- a/peachjam/templates/peachjam/taxonomy_detail.html
+++ b/peachjam/templates/peachjam/taxonomy_detail.html
@@ -1,7 +1,9 @@
{% extends 'peachjam/layouts/document_list.html' %}
{% load peachjam i18n %}
{% block title %}{{ taxonomy.name }}{% endblock %}
-{% block page-title %}
{{ taxonomy.name }}
{% endblock %}
+{% block page-title %}
+ {% if not entity_profile %}
{{ taxonomy.name }}
{% endif %}
+{% endblock %}
{% block breadcrumbs %}