diff --git a/database/getContracts.js b/database/getContracts.js
index 3416725e..6f4002ec 100644
--- a/database/getContracts.js
+++ b/database/getContracts.js
@@ -1,4 +1,4 @@
-import { dateIntegerToString, dateStringToInteger, timeIntegerToString } from '@cityssm/utils-datetime';
+import { dateIntegerToString, dateStringToInteger, timeIntegerToPeriodString, timeIntegerToString } from '@cityssm/utils-datetime';
 import sqlite from 'better-sqlite3';
 import { getConfigProperty } from '../helpers/config.helpers.js';
 import { sunriseDB } from '../helpers/database.helpers.js';
@@ -11,6 +11,7 @@ export default async function getContracts(filters, options, connectedDatabase)
     const database = connectedDatabase ?? sqlite(sunriseDB);
     database.function('userFn_dateIntegerToString', dateIntegerToString);
     database.function('userFn_timeIntegerToString', timeIntegerToString);
+    database.function('userFn_timeIntegerToPeriodString', timeIntegerToPeriodString);
     const { sqlParameters, sqlWhereClause } = buildWhereClause(filters);
     let count = typeof options.limit === 'string'
         ? Number.parseInt(options.limit, 10)
@@ -40,7 +41,10 @@ export default async function getContracts(filters, options, connectedDatabase)
           o.funeralHomeId, o.funeralDirectorName, f.funeralHomeName,
 
           o.funeralDate, userFn_dateIntegerToString(o.funeralDate) as funeralDateString,
-          o.funeralTime, userFn_timeIntegerToString(o.funeralTime) as funeralTimeString,
+          o.funeralTime,
+          userFn_timeIntegerToString(o.funeralTime) as funeralTimeString,
+          userFn_timeIntegerToPeriodString(o.funeralTime) as funeralTimePeriodString,
+          o.directionOfArrival,
           o.committalTypeId, c.committalType
           from Contracts o
           left join ContractTypes t on o.contractTypeId = t.contractTypeId
diff --git a/database/getContracts.ts b/database/getContracts.ts
index 29e3b41f..8464e048 100644
--- a/database/getContracts.ts
+++ b/database/getContracts.ts
@@ -2,6 +2,7 @@ import {
   type DateString,
   dateIntegerToString,
   dateStringToInteger,
+  timeIntegerToPeriodString,
   timeIntegerToString
 } from '@cityssm/utils-datetime'
 import sqlite from 'better-sqlite3'
@@ -60,6 +61,8 @@ export default async function getContracts(
 
   database.function('userFn_dateIntegerToString', dateIntegerToString)
   database.function('userFn_timeIntegerToString', timeIntegerToString)
+  database.function(
+    'userFn_timeIntegerToPeriodString', timeIntegerToPeriodString)
 
   const { sqlParameters, sqlWhereClause } = buildWhereClause(filters)
 
@@ -101,7 +104,10 @@ export default async function getContracts(
           o.funeralHomeId, o.funeralDirectorName, f.funeralHomeName,
 
           o.funeralDate, userFn_dateIntegerToString(o.funeralDate) as funeralDateString,
-          o.funeralTime, userFn_timeIntegerToString(o.funeralTime) as funeralTimeString,
+          o.funeralTime,
+          userFn_timeIntegerToString(o.funeralTime) as funeralTimeString,
+          userFn_timeIntegerToPeriodString(o.funeralTime) as funeralTimePeriodString,
+          o.directionOfArrival,
           o.committalTypeId, c.committalType
           from Contracts o
           left join ContractTypes t on o.contractTypeId = t.contractTypeId
diff --git a/views/workOrder-view.ejs b/views/workOrder-view.ejs
index da4e92b0..755f7a0a 100644
--- a/views/workOrder-view.ejs
+++ b/views/workOrder-view.ejs
@@ -140,7 +140,7 @@
     </div>
 
     <div class="panel">
-      <h2 class="panel-heading">Related Burial Sites</h2>
+      <h2 class="panel-heading">Related Contracts</h2>
       <div class="panel-block is-block">
         <%
           const tabToSelect = (workOrder.workOrderContracts.length > 0 || workOrder.workOrderBurialSites.length === 0 ? "contracts" : "burialSites");
@@ -312,76 +312,99 @@
       </div>
     <% } %>
   </div>
-  <% if (workOrder.workOrderMilestones.length > 0) { %>
-    <div class="column is-4-desktop">
+
+  <div class="column is-4-desktop">
+    <% if (workOrder.workOrderContracts.length > 0) { %>
       <div class="panel">
-        <div class="panel-heading">
-          <div class="level is-mobile">
-            <div class="level-left">
-              <div class="level-item">
-                <h2 class="title is-5 has-text-white has-text-weight-bold">Milestones</h2>
-              </div>
+        <h2 class="panel-heading">Contract Milestones</h2>
+        <% let hasContractMilestones = false; %>
+        <% for (const contract of workOrder.workOrderContracts) { %>
+          <% if (contract.funeralDate !== null && contract.funeralDate >= workOrder.workOrderOpenDate && (workOrder.workOrderCloseDate === null || workOrderCloseDate >= contract.funeralDate)) { %>
+            <% hasContractMilestones = true; %>
+            <div class="panel-block is-block">
+              <strong>Funeral</strong><br />
+              <%= contract.funeralDateString %>
+              <% if (contract.funeralTime !== null && contract.funeralTime !== 0) { %>
+                <%= contract.funeralTimePeriodString %>
+              <% } %><br />
+              <%= contract.funeralHomeName %><br />
             </div>
-            <div class="level-right">
-              <div class="level-item">
-                <div class="dropdown is-right has-text-weight-normal">
-                  <div class="dropdown-trigger">
-                    <button class="button is-small has-tooltip-left" type="button" data-tooltip="Milestone Options" aria-label="Options">
-                      <i class="fas fa-ellipsis-v" aria-hidden="true"></i>
-                    </button>
-                  </div>
-                  <div class="dropdown-menu">
-                    <div class="dropdown-content">
-                      <a class="dropdown-item" href="<%= urlPrefix %>/api/<%= user.userProperties.apiKey %>/milestoneICS/?workOrderId=<%= workOrder.workOrderId %>">
-                        <span class="icon is-small"><i class="fas fa-calendar" aria-hidden="true"></i></span>
-                        <span>Download iCalendar</span>
-                      </a>
-                      <a class="dropdown-item" href="<%= urlPrefix %>/reports/workOrderMilestones-byWorkOrderId/?workOrderId=<%= workOrder.workOrderId %>" target="_blank" download>
-                        <span class="icon is-small"><i class="fas fa-download" aria-hidden="true"></i></span>
-                        <span>Export as CSV</span>
-                      </a>
-                    </div>
+          <% } %>
+        <% } %>
+        <% if (!hasContractMilestones) { %>
+          <div class="panel-block is-block">
+            <p class="has-text-grey">No relevant contract milestones available.</p>
+          </div>
+        <% } %>
+      </div>
+    <% } %>
+    <div class="panel">
+      <div class="panel-heading">
+        <div class="level is-mobile">
+          <div class="level-left">
+            <div class="level-item">
+              <h2 class="title is-5 has-text-white has-text-weight-bold">Milestones</h2>
+            </div>
+          </div>
+          <div class="level-right">
+            <div class="level-item">
+              <div class="dropdown is-right has-text-weight-normal">
+                <div class="dropdown-trigger">
+                  <button class="button is-small has-tooltip-left" type="button" data-tooltip="Milestone Options" aria-label="Options">
+                    <i class="fas fa-ellipsis-v" aria-hidden="true"></i>
+                  </button>
+                </div>
+                <div class="dropdown-menu">
+                  <div class="dropdown-content">
+                    <a class="dropdown-item" href="<%= urlPrefix %>/api/<%= user.userProperties.apiKey %>/milestoneICS/?workOrderId=<%= workOrder.workOrderId %>">
+                      <span class="icon is-small"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+                      <span>Download iCalendar</span>
+                    </a>
+                    <a class="dropdown-item" href="<%= urlPrefix %>/reports/workOrderMilestones-byWorkOrderId/?workOrderId=<%= workOrder.workOrderId %>" target="_blank" download>
+                      <span class="icon is-small"><i class="fas fa-download" aria-hidden="true"></i></span>
+                      <span>Export as CSV</span>
+                    </a>
                   </div>
                 </div>
               </div>
             </div>
           </div>
         </div>
-        <% for (const milestone of workOrder.workOrderMilestones) { %>
-          <div class="panel-block is-block">
-            <div class="columns is-mobile">
-              <div class="column is-narrow">
-                <% if (milestone.workOrderMilestoneCompletionDate) { %>
-                  <span class="icon is-small" data-tooltip="Completed <%= milestone.workOrderMilestoneCompletionDateString %>">
-                    <i class="fas fa-check" aria-label="Completed <%= milestone.workOrderMilestoneCompletionDateString %>"></i>
-                  </span>
-                <% } else { %>
-                  <span class="icon is-small">
-                    <i class="far fa-square has-text-grey" aria-label="Incomplete"></i>
-                  </span>
-                <% } %>
-              </div>
-              <div class="column">
-                <% if (milestone.workOrderMilestoneTypeId) { %>
-                  <strong><%= milestone.workOrderMilestoneType %></strong><br />
-                <% } %>
-                <% if (milestone.workOrderMilestoneDate === 0) { %>
-                  <span class="has-text-grey">(No Set Date)</span>
-                <% } else { %>
-                  <%= milestone.workOrderMilestoneDateString %>
-                <% } %>
-                <% if (milestone.workOrderMilestoneTime !== 0) { %>
-                  <%= milestone.workOrderMilestoneTimePeriodString %>
-                <% } %>
-                <br />
-                <span class="is-size-7"><%= milestone.workOrderMilestoneDescription %></span>
-              </div>
+      </div>
+      <% for (const milestone of workOrder.workOrderMilestones) { %>
+        <div class="panel-block is-block">
+          <div class="columns is-mobile">
+            <div class="column is-narrow">
+              <% if (milestone.workOrderMilestoneCompletionDate) { %>
+                <span class="icon is-small" data-tooltip="Completed <%= milestone.workOrderMilestoneCompletionDateString %>">
+                  <i class="fas fa-check" aria-label="Completed <%= milestone.workOrderMilestoneCompletionDateString %>"></i>
+                </span>
+              <% } else { %>
+                <span class="icon is-small">
+                  <i class="far fa-square has-text-grey" aria-label="Incomplete"></i>
+                </span>
+              <% } %>
+            </div>
+            <div class="column">
+              <% if (milestone.workOrderMilestoneTypeId) { %>
+                <strong><%= milestone.workOrderMilestoneType %></strong><br />
+              <% } %>
+              <% if (milestone.workOrderMilestoneDate === 0) { %>
+                <span class="has-text-grey">(No Set Date)</span>
+              <% } else { %>
+                <%= milestone.workOrderMilestoneDateString %>
+              <% } %>
+              <% if (milestone.workOrderMilestoneTime !== 0) { %>
+                <%= milestone.workOrderMilestoneTimePeriodString %>
+              <% } %>
+              <br />
+              <span class="is-size-7"><%= milestone.workOrderMilestoneDescription %></span>
             </div>
           </div>
-        <% } %>
-      </div>
+        </div>
+      <% } %>
     </div>
-  <% } %>
+  </div>
 </div>
 
 <%- include('_footerA'); -%>