diff --git a/app/routes/home.js b/app/routes/home.js
index a70f4c6d4..f36398a5 100644
--- a/app/routes/home.js
+++ b/app/routes/home.js
@@ -67,8 +67,93 @@ module.exports = router => {
 
     const data = req.session.data
     const allVaccinationsRecorded = data.vaccinationsRecorded
-    const dateToday = new Date()
+    const simulatedDateParam = req.query.simulatedDate
+    const simulatedDateMatch = (typeof simulatedDateParam === 'string')
+      ? simulatedDateParam.match(/^(\d{4})-(\d{2})-(\d{2})$/)
+      : null
+
+    const dateToday = simulatedDateMatch
+      ? new Date(Date.UTC(
+        parseInt(simulatedDateMatch[1]),
+        parseInt(simulatedDateMatch[2]) - 1,
+        parseInt(simulatedDateMatch[3]),
+        0,
+        0,
+        0
+      ))
+      : new Date()
+
+    const dateYesterday = new Date(dateToday)
+    dateYesterday.setDate(dateToday.getDate() - 1)
+
+    const startOfThisWeek = new Date(Date.UTC(
+      dateToday.getUTCFullYear(),
+      dateToday.getUTCMonth(),
+      dateToday.getUTCDate() - ((dateToday.getUTCDay() + 6) % 7),
+      0,
+      0,
+      0
+    ))
+    const startOfLastCalendarWeek = new Date(startOfThisWeek)
+    startOfLastCalendarWeek.setUTCDate(startOfThisWeek.getUTCDate() - 7)
+    const endOfLastCalendarWeek = new Date(startOfThisWeek)
+    endOfLastCalendarWeek.setUTCDate(startOfThisWeek.getUTCDate() - 1)
+    endOfLastCalendarWeek.setUTCHours(23, 59, 59, 999)
+
+    const monthNameFormatter = new Intl.DateTimeFormat('en-GB', {
+      month: 'long',
+      timeZone: 'UTC'
+    })
+    const shortMonthNameFormatter = new Intl.DateTimeFormat('en-GB', {
+      month: 'short',
+      timeZone: 'UTC'
+    })
+    const lastCalendarWeekStartDay = startOfLastCalendarWeek.getUTCDate()
+    const lastCalendarWeekEndDay = endOfLastCalendarWeek.getUTCDate()
+    const lastCalendarWeekEndMonth = monthNameFormatter.format(endOfLastCalendarWeek)
+    const lastCalendarWeekStartMonthShort = shortMonthNameFormatter.format(startOfLastCalendarWeek)
+    const lastCalendarWeekEndMonthShort = shortMonthNameFormatter.format(endOfLastCalendarWeek)
+    const isLastCalendarWeekInSameMonth = (
+      startOfLastCalendarWeek.getUTCMonth() === endOfLastCalendarWeek.getUTCMonth() &&
+      startOfLastCalendarWeek.getUTCFullYear() === endOfLastCalendarWeek.getUTCFullYear()
+    )
+
+    const lastCalendarWeekRangeLabel = isLastCalendarWeekInSameMonth
+      ? `${lastCalendarWeekStartDay} to ${lastCalendarWeekEndDay} ${lastCalendarWeekEndMonth}`
+      : `${lastCalendarWeekStartDay} ${lastCalendarWeekStartMonthShort} to ${lastCalendarWeekEndDay} ${lastCalendarWeekEndMonthShort}`
+
+    const lastCalendarWeekHeaderLineOne = isLastCalendarWeekInSameMonth
+      ? `${lastCalendarWeekStartDay} to ${lastCalendarWeekEndDay}`
+      : `${lastCalendarWeekStartDay} ${lastCalendarWeekStartMonthShort} to`
+
+    const lastCalendarWeekHeaderLineTwo = isLastCalendarWeekInSameMonth
+      ? lastCalendarWeekEndMonth
+      : `${lastCalendarWeekEndDay} ${lastCalendarWeekEndMonthShort}`
+
+    const startOfThisMonth = new Date(Date.UTC(
+      dateToday.getUTCFullYear(),
+      dateToday.getUTCMonth(),
+      1,
+      0,
+      0,
+      0
+    ))
+    const startOfLastCalendarMonth = new Date(Date.UTC(
+      startOfThisMonth.getUTCFullYear(),
+      startOfThisMonth.getUTCMonth() - 1,
+      1,
+      0,
+      0,
+      0
+    ))
+    const endOfLastCalendarMonth = new Date(startOfThisMonth)
+    endOfLastCalendarMonth.setUTCDate(0)
+    endOfLastCalendarMonth.setUTCHours(23, 59, 59, 999)
+
     const monthToday = (dateToday.getMonth() + 1) // JavaScript dates are 0-indexed
+    const currentYear = dateToday.getFullYear()
+    const lastCalendarMonth = (startOfLastCalendarMonth.getMonth() + 1)
+    const lastCalendarMonthYear = startOfLastCalendarMonth.getFullYear()
 
     // Vaccinations to count
     let vaccinationsRecorded = []
@@ -105,6 +190,20 @@ module.exports = router => {
     let totalsByVaccine = []
     let totalsByDay = []
 
+    const selectedSiteIdFromQuery = req.query.siteId
+    const hasMultipleVisibleSites = sites.length > 1
+    const selectedByVaccinationSiteId = (
+      hasMultipleVisibleSites &&
+      selectedSiteIdFromQuery &&
+      sites.some((site) => site.id === selectedSiteIdFromQuery)
+    )
+      ? selectedSiteIdFromQuery
+      : 'all'
+
+    const vaccinationsRecordedForByVaccine = (selectedByVaccinationSiteId === 'all')
+      ? vaccinationsRecorded
+      : vaccinationsRecorded.filter((vaccination) => vaccination.siteId === selectedByVaccinationSiteId)
+
     const totalVaccinationsRecorded = countVaccinations(vaccinationsRecorded)
 
     const totalVaccinationsRecordedToday = countVaccinations(
@@ -112,6 +211,11 @@ module.exports = router => {
       {date: dateToday}
     )
 
+    const totalVaccinationsRecordedYesterday = countVaccinations(
+      vaccinationsRecorded,
+      {date: dateYesterday}
+    )
+
     const sevenDaysAgo = new Date(Date.UTC(dateToday.getFullYear(), dateToday.getMonth(), dateToday.getDate() - 7, 0, 0, 0));
 
     const totalVaccinationsRecordedPast7Days = countVaccinations(
@@ -123,7 +227,24 @@ module.exports = router => {
       month: dateToday
     })
 
-    const uniqueVaccinesRecorded = [...new Set(vaccinationsRecorded.map((vaccination) => vaccination.vaccine))]
+    const totalVaccinationsRecordedLastCalendarWeek = countVaccinations(
+      vaccinationsRecorded,
+      {
+        // Range counting uses > minDate and <= maxDate, so move minDate back one day
+        // to include all vaccinations on the start date.
+        minDate: new Date(Date.UTC(
+          startOfLastCalendarWeek.getUTCFullYear(),
+          startOfLastCalendarWeek.getUTCMonth(),
+          startOfLastCalendarWeek.getUTCDate() - 1,
+          0,
+          0,
+          0
+        )),
+        maxDate: endOfLastCalendarWeek
+      }
+    )
+
+    const uniqueVaccinesRecorded = [...new Set(vaccinationsRecordedForByVaccine.map((vaccination) => vaccination.vaccine))]
 
     for (let i = 0; i < 7; i++) {
 
@@ -142,11 +263,39 @@ module.exports = router => {
 
       totalsByVaccine.push({
         vaccine: vaccine,
-        today: countVaccinations(vaccinationsRecorded, {
+        today: countVaccinations(vaccinationsRecordedForByVaccine, {
           date: dateToday,
           vaccine: vaccine
         }),
-        month: countVaccinations(vaccinationsRecorded, {
+        yesterday: countVaccinations(vaccinationsRecordedForByVaccine, {
+          date: dateYesterday,
+          vaccine: vaccine
+        }),
+        lastCalendarWeek: countVaccinations(vaccinationsRecordedForByVaccine, {
+          minDate: new Date(Date.UTC(
+            startOfLastCalendarWeek.getUTCFullYear(),
+            startOfLastCalendarWeek.getUTCMonth(),
+            startOfLastCalendarWeek.getUTCDate() - 1,
+            0,
+            0,
+            0
+          )),
+          maxDate: endOfLastCalendarWeek,
+          vaccine: vaccine
+        }),
+        lastCalendarMonth: countVaccinations(vaccinationsRecordedForByVaccine, {
+          minDate: new Date(Date.UTC(
+            startOfLastCalendarMonth.getUTCFullYear(),
+            startOfLastCalendarMonth.getUTCMonth(),
+            startOfLastCalendarMonth.getUTCDate() - 1,
+            0,
+            0,
+            0
+          )),
+          maxDate: endOfLastCalendarMonth,
+          vaccine: vaccine
+        }),
+        thisMonth: countVaccinations(vaccinationsRecordedForByVaccine, {
           month: dateToday,
           vaccine: vaccine
         }),
@@ -175,13 +324,36 @@ module.exports = router => {
             date: dateToday,
             siteId: site.id
           }),
-          month:countVaccinations(vaccinationsRecorded, {
-            month: dateToday,
+          yesterday: countVaccinations(vaccinationsRecorded, {
+            date: dateYesterday,
             siteId: site.id
           }),
-          past7Days: countVaccinations(vaccinationsRecorded, {
-            minDate: sevenDaysAgo,
-            maxDate: dateToday,
+          lastCalendarWeek: countVaccinations(vaccinationsRecorded, {
+            minDate: new Date(Date.UTC(
+              startOfLastCalendarWeek.getUTCFullYear(),
+              startOfLastCalendarWeek.getUTCMonth(),
+              startOfLastCalendarWeek.getUTCDate() - 1,
+              0,
+              0,
+              0
+            )),
+            maxDate: endOfLastCalendarWeek,
+            siteId: site.id
+          }),
+          lastCalendarMonth: countVaccinations(vaccinationsRecorded, {
+            minDate: new Date(Date.UTC(
+              startOfLastCalendarMonth.getUTCFullYear(),
+              startOfLastCalendarMonth.getUTCMonth(),
+              startOfLastCalendarMonth.getUTCDate() - 1,
+              0,
+              0,
+              0
+            )),
+            maxDate: endOfLastCalendarMonth,
+            siteId: site.id
+          }),
+          thisMonth: countVaccinations(vaccinationsRecorded, {
+            month: dateToday,
             siteId: site.id
           }),
           total: total
@@ -220,11 +392,20 @@ module.exports = router => {
     res.render('dashboard/index', {
       sites,
       pharmacies,
+      selectedByVaccinationSiteId,
       totalVaccinationsRecorded,
       totalVaccinationsRecordedToday,
+      totalVaccinationsRecordedYesterday,
       totalVaccinationsRecordedThisMonth,
+      totalVaccinationsRecordedLastCalendarWeek,
       totalVaccinationsRecordedPast7Days,
       monthToday,
+      currentYear,
+      lastCalendarWeekRangeLabel,
+      lastCalendarWeekHeaderLineOne,
+      lastCalendarWeekHeaderLineTwo,
+      lastCalendarMonth,
+      lastCalendarMonthYear,
       totalsBySite,
       totalsByVaccine,
       totalsByDay,
diff --git a/app/views/dashboard/_by-site.html b/app/views/dashboard/_by-site.html
index af72f9f8..14353c1f 100644
--- a/app/views/dashboard/_by-site.html
+++ b/app/views/dashboard/_by-site.html
@@ -9,13 +9,17 @@
         Today
       </th>
       <th role="columnheader" class="nhsuk-table__header--numeric" scope="col" aria-sort="none">
-        Past 7 days
+        Yesterday
       </th>
       <th role="columnheader" class="nhsuk-table__header--numeric" scope="col" aria-sort="none">
-        {{ (monthToday | monthName) }} to date
+        <span style="display:block;">{{ lastCalendarWeekHeaderLineOne }}</span>
+        <span style="display:block;">{{ lastCalendarWeekHeaderLineTwo }}</span>
       </th>
       <th role="columnheader" class="nhsuk-table__header--numeric" scope="col" aria-sort="none">
-        Total
+        {{ (lastCalendarMonth | monthName) }} {{ lastCalendarMonthYear }}
+      </th>
+      <th role="columnheader" class="nhsuk-table__header--numeric" scope="col" aria-sort="none">
+        {{ (monthToday | monthName) }} {{ currentYear }}
       </th>
     </tr>
   </thead>
@@ -30,13 +34,16 @@
           {{ totalBySite.today }}
         </td>
         <td class="nhsuk-table__cell--numeric">
-          {{ totalBySite.past7Days }}
+          {{ totalBySite.yesterday }}
         </td>
         <td class="nhsuk-table__cell nhsuk-table__cell--numeric">
-          {{ totalBySite.month }}
+          {{ totalBySite.lastCalendarWeek }}
+        </td>
+        <td class="nhsuk-table__cell--numeric">
+          {{ totalBySite.lastCalendarMonth }}
         </td>
         <td class="nhsuk-table__cell--numeric">
-          {{ totalBySite.total }}
+          {{ totalBySite.thisMonth }}
         </td>
       </tr>
     {% endfor %}
diff --git a/app/views/dashboard/_by-vaccine.html b/app/views/dashboard/_by-vaccine.html
index 56277088..fef9cdd1 100644
--- a/app/views/dashboard/_by-vaccine.html
+++ b/app/views/dashboard/_by-vaccine.html
@@ -1,46 +1,99 @@
-<table class="nhsuk-table" data-module="nhsuk-table">
-  <caption class="nhsuk-table__caption nhsuk-table__caption--m">By vaccination</caption>
-  <thead role="rowgroup" class="nhsuk-table__head">
-    <tr role="row">
-      <th role="columnheader" class="" scope="col" aria-sort="ascending">
-        Vaccination
-      </th>
-        <th role="columnheader" class=" nhsuk-table__header--numeric" scope="col" aria-sort="none">
-          Today
-        </th>
-        <th role="columnheader" class=" nhsuk-table__header--numeric" scope="col" aria-sort="none">
-          Past 7 days
-        </th>
-        <th role="columnheader" class="nhsuk-table__header--numeric" scope="col" aria-sort="none">
-          {{ (monthToday | monthName) }} to date
-        </th>
-        <th role="columnheader" class=" nhsuk-table__header--numeric" scope="col" aria-sort="none">
-          Total
-        </th>
-    </tr>
-  </thead>
-  <tbody class="nhsuk-table__body">
+<h2 class="nhsuk-heading-m nhsuk-u-margin-bottom-3">By vaccination</h2>
+
+{% if (sites | length) > 1 %}
+  {% set siteFilterItems = [{
+    text: "All sites",
+    value: "all",
+    selected: (selectedByVaccinationSiteId == "all")
+  }] %}
 
-  {% for totalByVaccine in (totalsByVaccine | sort(false, true, "vaccine") ) %}
-    <tr role="row">
-      <th class="nhsuk-table__header nhsuk-u-font-weight-normal" scope="col">
-        {{ (totalByVaccine.vaccine ) | capitaliseFirstLetter }}
-      </th>
-      <td class="nhsuk-table__cell--numeric">
-        {{ totalByVaccine.today }}
-      </td>
-      <td class="nhsuk-table__cell--numeric">
-        {{ totalByVaccine.past7Days }}
-      </td>
-      <td class="nhsuk-table__cell--numeric">
-        {{ totalByVaccine.month }}
-      </td>
-      <td class="nhsuk-table__cell--numeric">
-        {{ totalByVaccine.total }}
-      </td>
-    </tr>
+  {% for site in (sites | sort(false, false, "name")) %}
+    {% set siteFilterItems = (siteFilterItems.push({
+      text: site.name,
+      value: site.id,
+      selected: (selectedByVaccinationSiteId == site.id)
+    }), siteFilterItems) %}
   {% endfor %}
 
+  <form method="get" action="/home" class="nhsuk-u-margin-bottom-4">
+    {{ select({
+      id: "dashboard-by-vaccination-site-filter",
+      name: "siteId",
+      label: {
+        text: "Filter by site",
+        size: "s"
+      },
+      items: siteFilterItems,
+      attributes: {
+        onchange: "this.form.submit()"
+      }
+    }) }}
+  </form>
+{% endif %}
+
+{% if selectedByVaccinationSiteId != "all" and (totalsByVaccine | length) == 0 %}
+  {% set selectedSite = sites | findById(selectedByVaccinationSiteId) %}
+  <p>{{ selectedSite.name if selectedSite else "This site" }} has not yet recorded any vaccinations.</p>
+{% else %}
+  <table class="nhsuk-table-responsive" role="table" data-module="nhsuk-table">
+    <thead role="rowgroup" class="nhsuk-table__head">
+      <tr role="row">
+        <th role="columnheader" class="nhsuk-table__header" scope="col" aria-sort="ascending">
+          Vaccine
+        </th>
+          <th role="columnheader" class="nhsuk-table__header nhsuk-table__header--numeric" scope="col" aria-sort="none">
+            Today
+          </th>
+          <th role="columnheader" class="nhsuk-table__header nhsuk-table__header--numeric" scope="col" aria-sort="none">
+            Yesterday
+          </th>
+          <th role="columnheader" class="nhsuk-table__header nhsuk-table__header--numeric" scope="col" aria-sort="none">
+            <span style="display:block;">{{ lastCalendarWeekHeaderLineOne }}</span>
+            <span style="display:block;">{{ lastCalendarWeekHeaderLineTwo }}</span>
+          </th>
+          <th role="columnheader" class="nhsuk-table__header nhsuk-table__header--numeric" scope="col" aria-sort="none">
+            {{ (lastCalendarMonth | monthName) }} {{ lastCalendarMonthYear }}
+          </th>
+          <th role="columnheader" class="nhsuk-table__header nhsuk-table__header--numeric" scope="col" aria-sort="none">
+            {{ (monthToday | monthName) }} {{ currentYear }}
+          </th>
+      </tr>
+    </thead>
+    <tbody class="nhsuk-table__body">
+
+    {% for totalByVaccine in (totalsByVaccine | sort(false, true, "vaccine") ) %}
+      <tr role="row" class="nhsuk-table__row">
+        <th class="nhsuk-table__header nhsuk-u-font-weight-normal" scope="row">
+          <span class="nhsuk-table-responsive__heading">Vaccine</span>
+          <span>{{ (totalByVaccine.vaccine ) | capitaliseFirstLetter }}</span>
+        </th>
+        <td class="nhsuk-table__cell nhsuk-table__cell--numeric">
+          <span class="nhsuk-table-responsive__heading">Today</span>
+          <span>{{ totalByVaccine.today }}</span>
+        </td>
+        <td class="nhsuk-table__cell nhsuk-table__cell--numeric">
+          <span class="nhsuk-table-responsive__heading">Yesterday</span>
+          <span>{{ totalByVaccine.yesterday }}</span>
+        </td>
+        <td class="nhsuk-table__cell nhsuk-table__cell--numeric">
+          <span class="nhsuk-table-responsive__heading">
+            <span style="display:block;">{{ lastCalendarWeekHeaderLineOne }}</span>
+            <span style="display:block;">{{ lastCalendarWeekHeaderLineTwo }}</span>
+          </span>
+          <span>{{ totalByVaccine.lastCalendarWeek }}</span>
+        </td>
+        <td class="nhsuk-table__cell nhsuk-table__cell--numeric">
+          <span class="nhsuk-table-responsive__heading">{{ (lastCalendarMonth | monthName) }} {{ lastCalendarMonthYear }}</span>
+          <span>{{ totalByVaccine.lastCalendarMonth }}</span>
+        </td>
+        <td class="nhsuk-table__cell nhsuk-table__cell--numeric">
+          <span class="nhsuk-table-responsive__heading">{{ (monthToday | monthName) }} {{ currentYear }}</span>
+          <span>{{ totalByVaccine.thisMonth }}</span>
+        </td>
+      </tr>
+    {% endfor %}
+
 
-  </tbody>
-</table>
+    </tbody>
+  </table>
+{% endif %}
diff --git a/app/views/dashboard/_vaccination-totals.html b/app/views/dashboard/_vaccination-totals.html
index 64c03011..1b377cd5 100644
--- a/app/views/dashboard/_vaccination-totals.html
+++ b/app/views/dashboard/_vaccination-totals.html
@@ -8,18 +8,18 @@
   }), topStats) %}
 
   {% set topStats = (topStats.push({
-    label: "Past 7 days",
-    value: totalVaccinationsRecordedPast7Days
+    label: "Yesterday",
+    value: totalVaccinationsRecordedYesterday
   }), topStats) %}
 
   {% set topStats = (topStats.push({
-    label: (monthToday | monthName) + " to date",
-    value: totalVaccinationsRecordedThisMonth
+    label: lastCalendarWeekRangeLabel,
+    value: totalVaccinationsRecordedLastCalendarWeek
   }), topStats) %}
 
   {% set topStats = (topStats.push({
-    label: "Total",
-    value: totalVaccinationsRecorded
+    label: (monthToday | monthName) + " to date",
+    value: totalVaccinationsRecordedThisMonth
   }), topStats) %}
 
   {% for stat in topStats %}
@@ -27,6 +27,10 @@
       {% set cardHtml %}
         <p class="nhsuk-heading-xl nhsuk-u-font-size-64 nhsuk-u-margin-bottom-1">{{ stat.value }}</p>
         {{ stat.label }}
+        {% if stat.hint %}
+          <br>
+          <span class="nhsuk-hint nhsuk-u-margin-top-1 nhsuk-u-margin-bottom-0">{{ stat.hint }}</span>
+        {% endif %}
       {% endset %}
 
       {{ card({
diff --git a/app/views/dashboard/index.html b/app/views/dashboard/index.html
index 5d90a5e1..bd2c1dfc 100644
--- a/app/views/dashboard/index.html
+++ b/app/views/dashboard/index.html
@@ -15,6 +15,10 @@
 
       <h1 class="nhsuk-heading-l nhsuk-u-margin-bottom-6">{% if currentOrganisation %}{{ currentOrganisation.name }}{% else %}PCT Healthcare{% endif %}</h1>
 
+      {{ insetText({
+        text: "The data shown here is based on the date the vaccination was given."
+      }) }}
+
 
       {% if currentOrganisation and totalVaccinationsRecorded == 0 %}
         {% include "dashboard/_no-vaccinations-recorded.html" %}
@@ -54,19 +58,20 @@ <h2 class="nhsuk-heading-m nhsuk-u-margin-bottom-1">All vaccinations</h2>
     {{ tabs({
       items: [
       {
-        label: "By day",
-        id: "past-7-days",
+        label: "By vaccination",
+        id: "by-vaccination",
+        selected: true,
         panel: {
-          html: byDayHtml
+          html: byVaccinationHtml
           }
         },
         {
-          label: "By vaccination",
-          id: "by-vaccination",
+        label: "By day",
+        id: "past-7-days",
           panel: {
-            html: byVaccinationHtml
+            html: byDayHtml
           }
-        } if (totalsByVaccine | length) > 1,
+        },
         {
           label: "By site",
           id: "by-site",