diff --git a/app/templates/partials/jobs/count.html b/app/templates/partials/jobs/count.html
index 2755f3259..78003a22e 100644
--- a/app/templates/partials/jobs/count.html
+++ b/app/templates/partials/jobs/count.html
@@ -1,5 +1,5 @@
 {% from "components/pill.html" import pill %}
 
-<div class="bottom-gutter">
+<div class="bottom-gutter ajax-block-container">
   {{ pill('Status', counts, request.args.get('status', '')) }}
 </div>
diff --git a/app/templates/partials/jobs/notifications.html b/app/templates/partials/jobs/notifications.html
index 052d5b2ec..12d0d47e0 100644
--- a/app/templates/partials/jobs/notifications.html
+++ b/app/templates/partials/jobs/notifications.html
@@ -1,71 +1,73 @@
 {% from "components/table.html" import list_table, field, right_aligned_field_heading, date_field, row_heading %}
 
-{% if job.job_status == 'scheduled' %}
+<div class="ajax-block-container">
+  {% if job.job_status == 'scheduled' %}
 
-  <p>
-    Sending will start at {{ job.scheduled_for|format_time }}
-  </p>
+    <p>
+      Sending will start at {{ job.scheduled_for|format_time }}
+    </p>
 
-{% else %}
+  {% else %}
 
-  {% if notifications %}
-    <div class="dashboard-table">
-  {% endif %}
+    {% if notifications %}
+      <div class="dashboard-table">
+    {% endif %}
 
-    {% if not help %}
-      {% if percentage_complete < 100 %}
-        <p class="bottom-gutter-1-2 hint">
-          Report is {{ "{:.0f}%".format(percentage_complete) }} complete…
-        </p>
-      {% elif notifications %}
-        <p class="bottom-gutter">
-          <a href="{{ download_link }}" download="download" class="heading-small">Download this report</a>
-          &emsp;
-          <span id="time-left">{{ time_left }}</span>
+      {% if not help %}
+        {% if percentage_complete < 100 %}
+          <p class="bottom-gutter-1-2 hint">
+            Report is {{ "{:.0f}%".format(percentage_complete) }} complete…
+          </p>
+        {% elif notifications %}
+          <p class="bottom-gutter">
+            <a href="{{ download_link }}" download="download" class="heading-small">Download this report</a>
+            &emsp;
+            <span id="time-left">{{ time_left }}</span>
+          </p>
+        {% endif %}
+      {% endif %}
+
+      {% call(item, row_number) list_table(
+        notifications,
+        caption=uploaded_file_name,
+        caption_visible=False,
+        empty_message="No messages to show",
+        field_headings=[
+          'Recipient',
+          'Time',
+          'Status'
+        ],
+        field_headings_visible=False
+      ) %}
+        {% call row_heading() %}
+          {{ item.to }}
+        {% endcall %}
+        {{ date_field(
+          (item.updated_at or item.created_at)|format_datetime_short
+        ) }}
+        {% call field(
+          align='right',
+          status=item.status|format_notification_status_as_field_status
+        ) %}
+          {% if item.status|format_notification_status_as_url %}
+            <a href="{{ item.status|format_notification_status_as_url }}">
+          {% endif %}
+          {{ item.status|format_notification_status(item.template.template_type) }}
+          {% if item.status|format_notification_status_as_url %}
+            </a>
+          {% endif %}
+        {% endcall %}
+      {% endcall %}
+
+      {% if more_than_one_page %}
+        <p class="table-show-more-link">
+          Only showing the first 50 rows
         </p>
       {% endif %}
+
+    {% if notifications %}
+      </div>
     {% endif %}
 
-    {% call(item, row_number) list_table(
-      notifications,
-      caption=uploaded_file_name,
-      caption_visible=False,
-      empty_message="No messages to show",
-      field_headings=[
-        'Recipient',
-        'Time',
-        'Status'
-      ],
-      field_headings_visible=False
-    ) %}
-      {% call row_heading() %}
-        {{ item.to }}
-      {% endcall %}
-      {{ date_field(
-        (item.updated_at or item.created_at)|format_datetime_short
-      ) }}
-      {% call field(
-        align='right',
-        status=item.status|format_notification_status_as_field_status
-      ) %}
-        {% if item.status|format_notification_status_as_url %}
-          <a href="{{ item.status|format_notification_status_as_url }}">
-        {% endif %}
-        {{ item.status|format_notification_status(item.template.template_type) }}
-        {% if item.status|format_notification_status_as_url %}
-          </a>
-        {% endif %}
-      {% endcall %}
-    {% endcall %}
-
-    {% if more_than_one_page %}
-      <p class="table-show-more-link">
-        Only showing the first 50 rows
-      </p>
-    {% endif %}
-
-  {% if notifications %}
-    </div>
   {% endif %}
-
-{% endif %}
+</div>
diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html
index 6c46bbaf2..694bb117c 100644
--- a/app/templates/partials/jobs/status.html
+++ b/app/templates/partials/jobs/status.html
@@ -1,4 +1,4 @@
-<div>
+<div class="ajax-block-container">
   <p class='heading-small bottom-gutter'>
     Uploaded by {{ job.created_by.name }} on {{ job.created_at|format_datetime_short }}
   </p>
diff --git a/app/templates/views/dashboard/_jobs.html b/app/templates/views/dashboard/_jobs.html
index 3c70670e4..ea49cc3e7 100644
--- a/app/templates/views/dashboard/_jobs.html
+++ b/app/templates/views/dashboard/_jobs.html
@@ -1,7 +1,7 @@
 {% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading %}
 {% from "components/big-number.html" import big_number -%}
 
-<div class='dashboard-table'>
+<div class='dashboard-table ajax-block-container'>
   {% call(item, row_number) list_table(
     jobs,
     caption="Recent files uploaded",
diff --git a/app/templates/views/dashboard/_totals.html b/app/templates/views/dashboard/_totals.html
index a5dcc2f51..88725efb5 100644
--- a/app/templates/views/dashboard/_totals.html
+++ b/app/templates/views/dashboard/_totals.html
@@ -1,7 +1,7 @@
 {% from "components/big-number.html" import big_number_with_status %}
 {% from "components/message-count-label.html" import message_count_label %}
 
-<div class="grid-row">
+<div class="grid-row ajax-block-container">
   <div class="column-half">
     {{ big_number_with_status(
       statistics['email']['requested'],
diff --git a/app/templates/views/dashboard/_usage.html b/app/templates/views/dashboard/_usage.html
index 066dae104..ff0530549 100644
--- a/app/templates/views/dashboard/_usage.html
+++ b/app/templates/views/dashboard/_usage.html
@@ -1,6 +1,6 @@
 {% from "components/big-number.html" import big_number %}
 
-<div class='grid-row'>
+<div class='grid-row ajax-block-container'>
   <div class='column-half'>
     <div class="keyline-block">
       {{ big_number("Unlimited", 'free email allowance', smaller=True) }}