diff --git a/swh/web/templates/branches.html b/swh/web/templates/branches.html
index b12280f8c..b5a945d7a 100644
--- a/swh/web/templates/branches.html
+++ b/swh/web/templates/branches.html
@@ -1,64 +1,58 @@
 {% extends "browse.html" %}
 
 {% comment %}
 Copyright (C) 2017-2018  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
-{% block swh-browse-before-content %}
-{% if snapshot_context %}
-  {% include "includes/snapshot-context.html" %}
-{% endif %}
-{% endblock %}
-
 {% block swh-browse-content %}
 <div class="card-header bg-gray-light">
   <div class="float-left">
     <h4>{{ swh_object_name }}</h4>
   </div>
   <div class="clearfix"></div>
 </div>
 
 <div class="table-responsive">
   <table class="table swh-table-even-odd">
     <thead>
       <tr>
         <th><i class="fa fa-code-fork fa-fw"></i>Name</th>
         <th>Revision</th>
         <th>Message</th>
         <th>Date</th>
       </tr>
     </thead>
     <tbody>
       {% for branch in displayed_branches %}
         <tr class="swh-origin-branch">
           <td style="max-width: 300px"><i class="fa fa-code-fork fa-fw"></i><a href="{{ branch.directory_url }}">{{ branch.name }}</a></td>
           <td><a href="{{ branch.revision_url }}">{{ branch.revision|slice:":7" }}</a></td>
           <td class="swh-log-entry-message swh-table-cell-text-overflow" style="min-width: 500px" title="{{ branch.message }}">{{ branch.message }}</td>
           <td style="min-width: 250px">{{ branch.date }}</td
         </tr>
       {% endfor %}
     </tbody>
   </table>
 </div>
 {% endblock %}
 
 {% block swh-browse-after-content %}
 {% if prev_branches_url or next_branches_url %}
   <ul class="pagination justify-content-center">
     {% if prev_branches_url %}
       <li class="page-item"><a class="page-link" href="{{ prev_branches_url }}">Previous</a></li>
     {% else %}
       <li class="page-item disabled"><a class="page-link">Previous</a></li>
     {% endif %}
 
     {% if next_branches_url %}
       <li class="page-item"><a class="page-link" href="{{ next_branches_url }}">Next</a></li>
     {% else %}
       <li class="page-item disabled"><a class="page-link">Next</a></li>
     {% endif %}
   </ul>
 {% endif %}
 {% endblock %}
diff --git a/swh/web/templates/browse.html b/swh/web/templates/browse.html
index 23897ccd4..80607f891 100644
--- a/swh/web/templates/browse.html
+++ b/swh/web/templates/browse.html
@@ -1,46 +1,50 @@
 {% extends "browse-layout.html" %}
 
 {% comment %}
 Copyright (C) 2017-2018  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load swh_templatetags %}
 
 {% block title %}{{ heading }} &ndash; Software Heritage archive{% endblock %}
 
 {% block navbar-content %}
 <h4>Browse the archive</h4>
 {% endblock %}
 
 {% block browse-content %}
 
 {% if empty_browse %}
 
 <p>
   No Software Heritage object currently browsed.
   <br/>
   To browse the content of the archive, you can either use
   the <a href="{% url 'browse-search' %}">Search</a> interface or refer to the URI scheme described
   in the <a href="{% url 'browse-help' %}">Help</a> page.
 </p>
 
 {% else %}
 
-  {% block swh-browse-before-content %}{% endblock %}
+  {% block swh-browse-before-content %}
+  {% if snapshot_context %}
+    {% include "includes/snapshot-context.html" %}
+  {% endif %}
+  {% endblock %}
 
   <div class="card">
     {% block swh-browse-content %}{% endblock %}
   </div>
 
   {% block swh-browse-after-content %}{% endblock %}
 
 {% endif %}
 
 <script>
   swh.webapp.initPage('browse');
 </script>
 
 {% endblock %}
diff --git a/swh/web/templates/content.html b/swh/web/templates/content.html
index f627f8379..7fd562669 100644
--- a/swh/web/templates/content.html
+++ b/swh/web/templates/content.html
@@ -1,19 +1,13 @@
 {% extends "browse.html" %}
 
 {% comment %}
 Copyright (C) 2017-2018  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
-{% block swh-browse-before-content %}
-{% if snapshot_context %}
-  {% include "includes/snapshot-context.html" %}
-{% endif %}
-{% endblock %}
-
 {% block swh-browse-content %}
 {% include "includes/top-navigation.html" %}
 {% include "includes/content-display.html" %}
 {% endblock %}
diff --git a/swh/web/templates/directory.html b/swh/web/templates/directory.html
index ba19415b2..04623c5a8 100644
--- a/swh/web/templates/directory.html
+++ b/swh/web/templates/directory.html
@@ -1,24 +1,17 @@
 {% extends "browse.html" %}
 
 {% comment %}
 Copyright (C) 2017-2018  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
-
-{% block swh-browse-before-content %}
-{% if snapshot_context %}
-  {% include "includes/snapshot-context.html" %}
-{% endif %}
-{% endblock %}
-
 {% block swh-browse-content %}
 {% include "includes/top-navigation.html" %}
 {% include "includes/directory-display.html" %}
 {% endblock %}
 
 {% block swh-browse-after-content %}
 {% include "includes/readme-display.html" %}
 {% endblock %}
diff --git a/swh/web/templates/person.html b/swh/web/templates/person.html
index 68114c5e2..44ecb112c 100644
--- a/swh/web/templates/person.html
+++ b/swh/web/templates/person.html
@@ -1,37 +1,31 @@
 {% extends "browse.html" %}
 
 {% comment %}
 Copyright (C) 2017-2018  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load swh_templatetags %}
 
-{% block swh-browse-before-content %}
-{% if snapshot_context %}
-  {% include "includes/snapshot-context.html" %}
-{% endif %}
-{% endblock %}
-
 {% block swh-browse-content %}
 <div class="card-header bg-gray-light">
   <div class="float-left">
     <h4>{{ swh_object_name }}</h4>
   </div>
   <div class="clearfix"></div>
 </div>
 <table class="table">
   <tbody>
     {% for key, val in swh_object_metadata.items|dictsort:"0.lower" %}
       <tr>
         <th class="swh-metadata-table-row swh-metadata-table-key">{{ key }}</th>
         <td class="swh-metadata-table-row swh-metadata-table-value">
           <pre>{{ val | safe | urlize_links_and_mails | safe }}</pre>
         </td>
       </tr>
     {% endfor %}
   </tbody>
 </table>
 {% endblock %}
\ No newline at end of file
diff --git a/swh/web/templates/release.html b/swh/web/templates/release.html
index 123c6a4e7..eefef0b74 100644
--- a/swh/web/templates/release.html
+++ b/swh/web/templates/release.html
@@ -1,30 +1,24 @@
 {% extends "browse.html" %}
 
 {% comment %}
 Copyright (C) 2017-2018  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load swh_templatetags %}
 
-{% block swh-browse-before-content %}
-{% if snapshot_context %}
-  {% include "includes/snapshot-context.html" %}
-{% endif %}
-{% endblock %}
-
 {% block swh-browse-content %}
 {% include "includes/top-navigation.html" %}
 <div style="height: 35px;margin: 4px;">
   <i class="fa fa-tag fa-fw"></i>Release <b>{{ swh_object_metadata.name }}</b>
   created by {{ swh_object_metadata.author }} on <b>{{ swh_object_metadata.date }}</b>
 </div>
 <pre style="white-space: pre-wrap">
 <h6>{{ release_note_header }}</h6>{{ release_note_body }}
 </pre>
 <div style="margin: 4px;">
   {{ release_target_link }}
 </div>
 {% endblock %}
diff --git a/swh/web/templates/releases.html b/swh/web/templates/releases.html
index e7567cf62..47875d634 100644
--- a/swh/web/templates/releases.html
+++ b/swh/web/templates/releases.html
@@ -1,66 +1,60 @@
 {% extends "browse.html" %}
 
 {% comment %}
 Copyright (C) 2017-2018  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
-{% block swh-browse-before-content %}
-{% if snapshot_context %}
-  {% include "includes/snapshot-context.html" %}
-{% endif %}
-{% endblock %}
-
 {% block swh-browse-content %}
 <div class="card-header bg-gray-light">
   <div class="float-left">
     <h4>{{ swh_object_name }}</h4>
   </div>
   <div class="clearfix"></div>
 </div>
 
 <div class="table-responsive">
   <table class="table swh-table-even-odd">
     <thead>
       <tr>
         <th><i class="fa fa-tag fa-fw"></i>Name</th>
         <th>Target</th>
         <th>Message</th>
         <th>Date</th>
       </tr>
     </thead>
     <tbody>
       {% for release in displayed_releases %}
         <tr class="swh-origin-release">
           <td><i class="fa fa-tag fa-fw"></i><a href="{{ release.release_url }}">{{ release.name }}</a></td>
           <td>{{ release.target_type }}</td>
           <td class="swh-log-entry-message swh-table-cell-text-overflow" title="{{ release.message }}">{{ release.message }}</td>
           <td>{{ release.date }}</td>
         </tr>
       {% endfor %}
     </tbody>
   </table>
 </div>
 {% endblock %}
 
 {% block swh-browse-after-content %}
 {% if prev_releases_url or next_releases_url %}
   <ul class="pagination justify-content-center">
 
     {% if prev_releases_url %}
       <li class="page-item"><a class="page-link" href="{{ prev_releases_url }}">Previous</a></li>
     {% else %}
       <li class="page-item disabled"><a class="page-link">Previous</a></li>
     {% endif %}
 
     {% if next_releases_url %}
       <li class="page-item"><a class="page-link" href="{{ next_releases_url }}">Next</a></li>
     {% else %}
       <li class="page-item disabled"><a class="page-link">Next</a></li>
     {% endif %}
 
   </ul>
 {% endif %}
 {% endblock %}
diff --git a/swh/web/templates/revision-log.html b/swh/web/templates/revision-log.html
index db1f1e61e..e7ff6c0b9 100644
--- a/swh/web/templates/revision-log.html
+++ b/swh/web/templates/revision-log.html
@@ -1,74 +1,68 @@
 {% extends "browse.html" %}
 
 {% comment %}
 Copyright (C) 2017-2018  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load render_bundle from webpack_loader %}
 
 {% block header %}
 {{ block.super }}
 {% render_bundle 'revision' %}
 {% endblock %}
 
-{% block swh-browse-before-content %}
-{% if snapshot_context %}
-  {% include "includes/snapshot-context.html" %}
-{% endif %}
-{% endblock %}
-
 {% block swh-browse-content %}
 {% if snapshot_context %}
   {% include "includes/top-navigation.html" %}
 {% else %}
   <div class="card-header bg-gray-light">
     <div class="card-title float-left">
       <h4>{{ swh_object_name }}</h4>
     </div>
     <div class="clearfix"></div>
   </div>
 {% endif %}
 
 <div class="table-responsive">
   <table class="table table-striped">
     <thead>
       <tr>
         <th><i class="octicon octicon-git-commit fa-fw"></i>Revision</th>
         <th>Author</th>
         <th>Message</th>
         <th>Date</th>
         <th></th>
       </tr>
     </thead>
     <tbody>
       {% for log in revision_log %}
         <tr class="swh-revision-log-entry">
           <td class="swh-revision-log-entry-id"><i class="octicon octicon-git-commit fa-fw"></i>{{ log.revision }}</td>
           <td class="swh-revision-log-entry-author">{{ log.author }}</td>
           <td class="swh-log-entry-message swh-table-cell-text-overflow" title="{{ log.message }}">{{ log.message }}</td>
           <td class="swh-revision-log-entry-date">{{ log.date }}</td>
           <td>{{ log.directory }}</td>
         </tr>
       {% endfor %}
     </tbody>
   </table>
 </div>
 {% endblock %}
 
 {% block swh-browse-after-content %}
 <ul class="pagination justify-content-center">
   {% if next_log_url %}
     <li class="page-item"><a class="page-link" href="{{ next_log_url }}">Newer</a></li>
   {% else %}
     <li class="page-item disabled"><a class="page-link">Newer</a></li>
   {% endif %}
   {% if prev_log_url %}
     <li class="page-item"><a class="page-link" href="{{ prev_log_url }}">Older</a></li>
   {% else %}
     <li class="page-item disabled"><a class="page-link">Older</a></li>
   {% endif %}
 </ul>
 {% endblock %}
diff --git a/swh/web/templates/revision.html b/swh/web/templates/revision.html
index 9f0cfbc21..15b32e4b7 100644
--- a/swh/web/templates/revision.html
+++ b/swh/web/templates/revision.html
@@ -1,109 +1,103 @@
 {% extends "browse.html" %}
 
 {% comment %}
 Copyright (C) 2017-2018  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load static %}
 {% load swh_templatetags %}
 {% load render_bundle from webpack_loader %}
 
 {% block header %}
 {{ block.super }}
 {% render_bundle 'revision' %}
 {% endblock %}
 
-{% block swh-browse-before-content %}
-{% if snapshot_context %}
-  {% include "includes/snapshot-context.html" %}
-{% endif %}
-{% endblock %}
-
 {% block swh-browse-content %}
 <div style="height: 35px;margin: 4px;">
   <i class="octicon octicon-git-commit fa-fw"></i>Revision <b>{{ swh_object_metadata.id }}</b>
   authored by {{ swh_object_metadata.author }} on <b>{{ swh_object_metadata.date }}</b>
 </div>
 
 <div class="card">
   <div class="card-header bg-gray-light border-bottom-0">
     <a data-toggle="collapse" id="swh-collapse-revision-message" href="#swh-revision-message">
       <div class="float-left">
         <pre style="white-space: pre-wrap; background-color: inherit; padding: 0px; margin: 0px; border: none;"><h5 style="padding-bottom: 0px; font-weight: normal;">{{ message_header }}</h5></pre>
       </div>
       <div class="clearfix"></div>
     </a>
   </div>
   {% if message_body %}
     <div id="swh-revision-message" class="collapse show">
       <pre style="white-space: pre-wrap; margin: 0px; border: none; border-radius: 0px;">{{ message_body }}</pre>
     </div>
   {% endif %}
 </div>
 
 <div style="margin: 4px; padding-bottom: 5px;">
   {{ parents_links }}
 </div>
 
 <ul class="nav nav-tabs" style="padding-left: 5px;">
   <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#swh-revision-tree">Files</a></li>
   <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#swh-revision-changes">Changes</a></li>
 </ul>
 
 <div class="tab-content">
   <div id="swh-revision-tree" class="tab-pane active">
     {% include "includes/top-navigation.html" %}
     {% if content_size %}
       {% include "includes/content-display.html" %}
     {% else %}
       {% include "includes/directory-display.html" %}
     {% endif %}
   </div>
 
   <div id="swh-revision-changes" class="tab-pane">
     <div id="swh-too-large-revision-diff" class="alert alert-warning" role="alert" style="display: none; margin: 5px 5px 0px 5px">
       The diff you're trying to view is too large. Only the first <span id="swh-nb-loaded-diffs">1000</span> changed files have been loaded.
     </div>
     <div id="swh-revision-diffs" style="padding: 5px; padding-bottom: 0;">
       <div class="card">
         <div class="card-header bg-gray-light border-bottom-0">
           <a data-toggle="collapse" href="#swh-revision-changes-list">
             <div class="float-left">
               Showing <strong id="swh-revision-changed-files"></strong>
               with <strong id="swh-revision-lines-added" style="color:green">0 additions</strong>
               and <strong id="swh-revision-lines-deleted" style="color:red">0 deletions</strong>
               (<span id="swh-nb-diffs-computed">0</span> / <span id="swh-total-nb-diffs">0</span> diffs computed)
             </div>
             <div class="float-right">
               <button class="btn btn-default btn-sm" type="button" onclick="swh.revision.computeAllDiffs(event)" id="swh-compute-all-diffs"
                       title="By default, diffs will be computed as the view is scrolled.
 Pushing that button will request the immediate computation of all diffs." style="visibility: hidden;">Compute all diffs</button>
             </div>
             <div class="clearfix"></div>
           </a>
         </div>
         <div id="swh-revision-changes-list" class="collapse show">
           <div id="swh-revision-changes-loading" class="text-center">
             <img src="{% static "img/swh-spinner.gif" %}"></img>
             <p>Computing file changes ...</p>
           </div>
           <pre style="background: none; border: none; display: none;"></pre>
         </div>
       </div>
     </div>
   </div>
 </div>
 
 <script>
   var revMsgBody = {{ message_body|jsonify }};
   var diffRevUrl = {{ diff_revision_url|jsonify }};
   swh.revision.initRevisionDiff(revMsgBody, diffRevUrl);
 </script>
 {% endblock %}
 
 {% block swh-browse-after-content %}
 {% include "includes/readme-display.html" %}
 {% endblock %}