From ee0e79b60ae468be772d3eb0daf3b907b185a2fd Mon Sep 17 00:00:00 2001
From: Dan Gowans <dangowans@users.noreply.github.com>
Date: Fri, 28 Mar 2025 14:23:04 -0400
Subject: [PATCH] print out polish

---
 public/javascripts/burialSiteTypes.admin.js   |   4 +-
 public/javascripts/burialSiteTypes.admin.ts   |  19 ++-
 public/javascripts/contract.editWorkOrders.ts |   1 +
 public/javascripts/contract.search.js         |   6 +-
 public/javascripts/contract.search.ts         |   6 +-
 public/javascripts/contractTypes.admin.js     |  14 +-
 public/javascripts/contractTypes.admin.ts     |  30 ++--
 public/javascripts/fees.admin.js              |   4 +-
 public/javascripts/fees.admin.ts              |  22 +--
 public/javascripts/workOrder.search.js        |  11 +-
 public/javascripts/workOrder.search.ts        |  12 +-
 public/stylesheets/sunrise.css                |  20 +++
 views/_header.ejs                             |   2 +-
 views/admin-burialSiteTypes.ejs               |   4 +-
 views/admin-contractTypes.ejs                 |   4 +-
 views/admin-database.ejs                      |   2 +-
 views/admin-fees.ejs                          |   4 +-
 views/admin-ntfyStartup.ejs                   |   2 +-
 views/admin-tables.ejs                        |   2 +-
 views/cemetery-search.ejs                     |   2 +-
 views/dashboard.ejs                           |  23 ++-
 views/workOrder-milestoneCalendar.ejs         |   2 +-
 views/workOrder-outlook.ejs                   | 150 +++++++++---------
 views/workOrder-search.ejs                    |   2 +-
 24 files changed, 211 insertions(+), 137 deletions(-)

diff --git a/public/javascripts/burialSiteTypes.admin.js b/public/javascripts/burialSiteTypes.admin.js
index ea12945d..dc340898 100644
--- a/public/javascripts/burialSiteTypes.admin.js
+++ b/public/javascripts/burialSiteTypes.admin.js
@@ -286,7 +286,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
               </a>
             </div>
           </div>
-          <div class="level-right">
+          <div class="level-right is-hidden-print">
             <div class="level-item">
               ${sunrise.getMoveUpDownButtonFieldHTML('button--moveBurialSiteTypeFieldUp', 
                 // eslint-disable-next-line no-secrets/no-secrets
@@ -331,7 +331,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
               <h2 class="title is-4 has-text-white">${cityssm.escapeHTML(burialSiteType.burialSiteType)}</h2>
             </div>
           </div>
-          <div class="level-right">
+          <div class="level-right is-hidden-print">
             <div class="level-item">
               <button class="button is-danger is-small button--deleteBurialSiteType" type="button">
                 <span class="icon is-small"><i class="fas fa-trash" aria-hidden="true"></i></span>
diff --git a/public/javascripts/burialSiteTypes.admin.ts b/public/javascripts/burialSiteTypes.admin.ts
index 3f5d9377..34796ac1 100644
--- a/public/javascripts/burialSiteTypes.admin.ts
+++ b/public/javascripts/burialSiteTypes.admin.ts
@@ -18,13 +18,15 @@ declare const exports: Record<string, unknown>
 
 type ResponseJSON =
   | {
-      success: true
-      burialSiteTypes: BurialSiteType[]
-      burialSiteTypeFieldId?: number
+      success: false
+
+      errorMessage?: string
     }
   | {
-      success: false
-      errorMessage?: string
+      success: true
+
+      burialSiteTypeFieldId?: number
+      burialSiteTypes: BurialSiteType[]
     }
 ;(() => {
   const sunrise = exports.sunrise as Sunrise
@@ -176,6 +178,7 @@ type ResponseJSON =
 
         bulmaJS.toggleHtmlClipped()
       },
+
       onremoved() {
         bulmaJS.toggleHtmlClipped()
       }
@@ -241,6 +244,7 @@ type ResponseJSON =
 
         bulmaJS.toggleHtmlClipped()
       },
+      
       onremoved() {
         bulmaJS.toggleHtmlClipped()
       }
@@ -440,6 +444,7 @@ type ResponseJSON =
           .querySelector('#button--deleteBurialSiteTypeField')
           ?.addEventListener('click', confirmDoDelete)
       },
+
       onremoved() {
         bulmaJS.toggleHtmlClipped()
         cityssm.disableNavBlocker()
@@ -529,7 +534,7 @@ type ResponseJSON =
               </a>
             </div>
           </div>
-          <div class="level-right">
+          <div class="level-right is-hidden-print">
             <div class="level-item">
               ${sunrise.getMoveUpDownButtonFieldHTML(
                 'button--moveBurialSiteTypeFieldUp',
@@ -598,7 +603,7 @@ type ResponseJSON =
               <h2 class="title is-4 has-text-white">${cityssm.escapeHTML(burialSiteType.burialSiteType)}</h2>
             </div>
           </div>
-          <div class="level-right">
+          <div class="level-right is-hidden-print">
             <div class="level-item">
               <button class="button is-danger is-small button--deleteBurialSiteType" type="button">
                 <span class="icon is-small"><i class="fas fa-trash" aria-hidden="true"></i></span>
diff --git a/public/javascripts/contract.editWorkOrders.ts b/public/javascripts/contract.editWorkOrders.ts
index fa0a94d0..449b12c3 100644
--- a/public/javascripts/contract.editWorkOrders.ts
+++ b/public/javascripts/contract.editWorkOrders.ts
@@ -107,6 +107,7 @@ declare const exports: Record<string, unknown>
             .querySelector('form')
             ?.addEventListener('submit', doCreate)
         },
+        
         onremoved() {
           bulmaJS.toggleHtmlClipped()
           ;(
diff --git a/public/javascripts/contract.search.js b/public/javascripts/contract.search.js
index 36e6276f..6a51cf9a 100644
--- a/public/javascripts/contract.search.js
+++ b/public/javascripts/contract.search.js
@@ -76,7 +76,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
         </span>`;
             }
             // eslint-disable-next-line no-unsanitized/method
-            resultsTbodyElement.insertAdjacentHTML('beforeend', `<tr>
+            resultsTbodyElement.insertAdjacentHTML('beforeend', `<tr class="avoid-page-break">
           <td class="has-width-1">
             ${contractTimeHTML}
           </td><td>
@@ -105,7 +105,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                 : `<ul class="fa-ul ml-5">${contactsHTML}</ul>`}
           </td><td>
             ${feeIconHTML}
-          </td><td>
+          </td><td class="is-hidden-print">
             ${contract.printEJS
                 ? `<a class="button is-small" data-tooltip="Print"
                     href="${sunrise.urlPrefix}/print/${contract.printEJS}/?contractId=${contract.contractId.toString()}" target="_blank">
@@ -122,7 +122,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
       <th>End Date</th>
       <th>Contacts</th>
       <th class="has-width-1"><span class="is-sr-only">Fees and Transactions</span></th>
-      <th class="has-width-1"><span class="is-sr-only">Print</span></th>
+      <th class="has-width-1 is-hidden-print"><span class="is-sr-only">Print</span></th>
       </tr></thead>
       <table>`;
         searchResultsContainerElement
diff --git a/public/javascripts/contract.search.ts b/public/javascripts/contract.search.ts
index 87be8538..8044abe8 100644
--- a/public/javascripts/contract.search.ts
+++ b/public/javascripts/contract.search.ts
@@ -133,7 +133,7 @@ declare const exports: Record<string, unknown>
       // eslint-disable-next-line no-unsanitized/method
       resultsTbodyElement.insertAdjacentHTML(
         'beforeend',
-        `<tr>
+        `<tr class="avoid-page-break">
           <td class="has-width-1">
             ${contractTimeHTML}
           </td><td>
@@ -168,7 +168,7 @@ declare const exports: Record<string, unknown>
             }
           </td><td>
             ${feeIconHTML}
-          </td><td>
+          </td><td class="is-hidden-print">
             ${
               contract.printEJS
                 ? `<a class="button is-small" data-tooltip="Print"
@@ -189,7 +189,7 @@ declare const exports: Record<string, unknown>
       <th>End Date</th>
       <th>Contacts</th>
       <th class="has-width-1"><span class="is-sr-only">Fees and Transactions</span></th>
-      <th class="has-width-1"><span class="is-sr-only">Print</span></th>
+      <th class="has-width-1 is-hidden-print"><span class="is-sr-only">Print</span></th>
       </tr></thead>
       <table>`
 
diff --git a/public/javascripts/contractTypes.admin.js b/public/javascripts/contractTypes.admin.js
index 3a3a8543..086d3e57 100644
--- a/public/javascripts/contractTypes.admin.js
+++ b/public/javascripts/contractTypes.admin.js
@@ -315,6 +315,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
             }
         }
     }
+    /*
+     * Prints
+     */
     function openAddContractTypePrint(clickEvent) {
         const contractTypeId = clickEvent.currentTarget.closest('.container--contractTypePrintList').dataset.contractTypeId ?? '';
         let closeAddModalFunction;
@@ -412,7 +415,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
               ${cityssm.escapeHTML(printTitle || printEJS)}
             </div>
           </div>
-          <div class="level-right">
+          <div class="level-right is-hidden-print">
             <div class="level-item">
               ${sunrise.getMoveUpDownButtonFieldHTML('button--moveContractTypePrintUp', 'button--moveContractTypePrintDown')}
             </div>
@@ -432,6 +435,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
             }
         }
     }
+    /*
+     * Both
+     */
     function renderContractTypes() {
         contractTypesContainerElement.innerHTML = `<div class="panel container--contractType" id="container--allContractTypeFields" data-contract-type-id="">
       <div class="panel-heading">
@@ -441,7 +447,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
               <h2 class="title is-4 has-text-white">(All Contract Types)</h2>
             </div>
           </div>
-          <div class="level-right">
+          <div class="level-right is-hidden-print">
             <div class="level-item">
               <button class="button is-success is-small button--addContractTypeField" type="button">
                 <span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span>
@@ -494,7 +500,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                     </div>`
                 : ''}
           </div>
-          <div class="level-right">
+          <div class="level-right is-hidden-print">
             <div class="level-item">
               <button class="button is-danger is-small button--deleteContractType" type="button">
                 <span class="icon is-small"><i class="fas fa-trash" aria-hidden="true"></i></span>
@@ -550,7 +556,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
               <h2 class="title is-4 has-text-white">${cityssm.escapeHTML(contractType.contractType)}</h2>
             </div>
           </div>
-          <div class="level-right">
+          <div class="level-right is-hidden-print">
             <div class="level-item">
               <button class="button is-success is-small button--addContractTypePrint" type="button">
                 <span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span>
diff --git a/public/javascripts/contractTypes.admin.ts b/public/javascripts/contractTypes.admin.ts
index 7f9f7abe..e4cb04f4 100644
--- a/public/javascripts/contractTypes.admin.ts
+++ b/public/javascripts/contractTypes.admin.ts
@@ -18,14 +18,16 @@ declare const exports: Record<string, unknown>
 
 type ResponseJSON =
   | {
-      success: true
-      contractTypes: ContractType[]
-      allContractTypeFields: ContractTypeField[]
-      contractTypeFieldId?: number
+      success: false
+
+      errorMessage?: string
     }
   | {
-      success: false
-      errorMessage?: string
+      success: true
+
+      allContractTypeFields: ContractTypeField[]
+      contractTypeFieldId?: number
+      contractTypes: ContractType[]
     }
 ;(() => {
   const sunrise = exports.sunrise as Sunrise
@@ -589,6 +591,10 @@ type ResponseJSON =
     }
   }
 
+  /*
+   * Prints
+   */
+
   function openAddContractTypePrint(clickEvent: Event): void {
     const contractTypeId =
       (
@@ -757,7 +763,7 @@ type ResponseJSON =
               ${cityssm.escapeHTML(printTitle || printEJS)}
             </div>
           </div>
-          <div class="level-right">
+          <div class="level-right is-hidden-print">
             <div class="level-item">
               ${sunrise.getMoveUpDownButtonFieldHTML(
                 'button--moveContractTypePrintUp',
@@ -791,6 +797,10 @@ type ResponseJSON =
     }
   }
 
+  /*
+   * Both
+   */
+
   function renderContractTypes(): void {
     contractTypesContainerElement.innerHTML = `<div class="panel container--contractType" id="container--allContractTypeFields" data-contract-type-id="">
       <div class="panel-heading">
@@ -800,7 +810,7 @@ type ResponseJSON =
               <h2 class="title is-4 has-text-white">(All Contract Types)</h2>
             </div>
           </div>
-          <div class="level-right">
+          <div class="level-right is-hidden-print">
             <div class="level-item">
               <button class="button is-success is-small button--addContractTypeField" type="button">
                 <span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span>
@@ -880,7 +890,7 @@ type ResponseJSON =
                 : ''
             }
           </div>
-          <div class="level-right">
+          <div class="level-right is-hidden-print">
             <div class="level-item">
               <button class="button is-danger is-small button--deleteContractType" type="button">
                 <span class="icon is-small"><i class="fas fa-trash" aria-hidden="true"></i></span>
@@ -962,7 +972,7 @@ type ResponseJSON =
               <h2 class="title is-4 has-text-white">${cityssm.escapeHTML(contractType.contractType)}</h2>
             </div>
           </div>
-          <div class="level-right">
+          <div class="level-right is-hidden-print">
             <div class="level-item">
               <button class="button is-success is-small button--addContractTypePrint" type="button">
                 <span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span>
diff --git a/public/javascripts/fees.admin.js b/public/javascripts/fees.admin.js
index 974a69e5..6dff21ee 100644
--- a/public/javascripts/fees.admin.js
+++ b/public/javascripts/fees.admin.js
@@ -36,7 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                 ? '<span class="tag">Grouped Fee</span>'
                 : ''}
           </div>
-          <div class="column is-narrow">
+          <div class="column is-narrow is-hidden-print">
             <div class="field is-grouped is-justify-content-end">
             ${feeCategory.fees.length === 0
                 ? `<div class="control">
@@ -151,7 +151,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
               </div>
             </div>
           </div>
-          <div class="column is-narrow">
+          <div class="column is-narrow is-hidden-print">
             ${sunrise.getMoveUpDownButtonFieldHTML('button--moveFeeUp', 'button--moveFeeDown')}
           </div>
         </div>`;
diff --git a/public/javascripts/fees.admin.ts b/public/javascripts/fees.admin.ts
index c8c05f33..878c090a 100644
--- a/public/javascripts/fees.admin.ts
+++ b/public/javascripts/fees.admin.ts
@@ -29,12 +29,14 @@ declare const exports: Record<string, unknown>
 
   type ResponseJSON =
     | {
-        success: true
-        feeCategories: FeeCategory[]
+        success: false
+
+        errorMessage?: string
       }
     | {
-        success: false
-        errorMessage?: string
+        success: true
+
+        feeCategories: FeeCategory[]
       }
 
   function getFeeCategory(feeCategoryId: number): FeeCategory {
@@ -80,7 +82,7 @@ declare const exports: Record<string, unknown>
                 : ''
             }
           </div>
-          <div class="column is-narrow">
+          <div class="column is-narrow is-hidden-print">
             <div class="field is-grouped is-justify-content-end">
             ${
               feeCategory.fees.length === 0
@@ -156,11 +158,9 @@ declare const exports: Record<string, unknown>
             <p>
               <a class="has-text-weight-bold a--editFee" href="#">${cityssm.escapeHTML(fee.feeName ?? '')}</a><br />
               <small>
-              ${
-                cityssm
-                  .escapeHTML(fee.feeDescription ?? '')
-                  .replaceAll('\n', '<br />')
-              }
+              ${cityssm
+                .escapeHTML(fee.feeDescription ?? '')
+                .replaceAll('\n', '<br />')}
               </small>
             </p>
             ${
@@ -225,7 +225,7 @@ declare const exports: Record<string, unknown>
               </div>
             </div>
           </div>
-          <div class="column is-narrow">
+          <div class="column is-narrow is-hidden-print">
             ${sunrise.getMoveUpDownButtonFieldHTML(
               'button--moveFeeUp',
               'button--moveFeeDown'
diff --git a/public/javascripts/workOrder.search.js b/public/javascripts/workOrder.search.js
index 9ccbcb62..213edf90 100644
--- a/public/javascripts/workOrder.search.js
+++ b/public/javascripts/workOrder.search.js
@@ -39,11 +39,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
               <i class="fas fa-fw fa-user"></i>
             </span>
             ${cityssm.escapeHTML(interment.deceasedName ?? '')}
+            </li>`;
+                }
+                if (contract.funeralHomeName !== null) {
+                    relatedHTML += `<li class="has-tooltip-left"
+            data-tooltip="Funeral Home">
+            <span class="fa-li">
+              <i class="fas fa-fw fa-church"></i>
+            </span>
+            ${cityssm.escapeHTML(contract.funeralHomeName)}
             </li>`;
                 }
             }
             // eslint-disable-next-line no-unsanitized/method
-            resultsTbodyElement.insertAdjacentHTML('beforeend', `<tr>
+            resultsTbodyElement.insertAdjacentHTML('beforeend', `<tr class="avoid-page-break">
           <td>
             <a class="has-text-weight-bold" href="${sunrise.getWorkOrderURL(workOrder.workOrderId)}">
               ${workOrder.workOrderNumber?.trim() === ''
diff --git a/public/javascripts/workOrder.search.ts b/public/javascripts/workOrder.search.ts
index 0959190b..b3e89e50 100644
--- a/public/javascripts/workOrder.search.ts
+++ b/public/javascripts/workOrder.search.ts
@@ -77,12 +77,22 @@ declare const exports: Record<string, unknown>
             ${cityssm.escapeHTML(interment.deceasedName ?? '')}
             </li>`
         }
+
+        if (contract.funeralHomeName !== null) {
+          relatedHTML += `<li class="has-tooltip-left"
+            data-tooltip="Funeral Home">
+            <span class="fa-li">
+              <i class="fas fa-fw fa-church"></i>
+            </span>
+            ${cityssm.escapeHTML(contract.funeralHomeName)}
+            </li>`
+        }
       }
 
       // eslint-disable-next-line no-unsanitized/method
       resultsTbodyElement.insertAdjacentHTML(
         'beforeend',
-        `<tr>
+        `<tr class="avoid-page-break">
           <td>
             <a class="has-text-weight-bold" href="${sunrise.getWorkOrderURL(workOrder.workOrderId)}">
               ${
diff --git a/public/stylesheets/sunrise.css b/public/stylesheets/sunrise.css
index 688edab6..2d2ada91 100644
--- a/public/stylesheets/sunrise.css
+++ b/public/stylesheets/sunrise.css
@@ -187,3 +187,23 @@ span.button.is-static {
 .image svg text {
   user-select: none;
 }
+
+/*
+ * Print
+ */
+
+@media print {
+  .is-hidden-print,
+  .navbar.is-fixed-top,
+  .breadcrumb {
+    display: none !important;
+  }
+
+  html.has-navbar-fixed-top {
+    padding-top: 0 !important;
+  }
+}
+
+.avoid-page-break {
+  page-break-inside: avoid;
+}
\ No newline at end of file
diff --git a/views/_header.ejs b/views/_header.ejs
index f7867801..f352cdca 100644
--- a/views/_header.ejs
+++ b/views/_header.ejs
@@ -21,7 +21,7 @@
 </head>
 
 <body>
-  <nav class="navbar is-light is-fixed-top is-static-print" id="cityssm-theme--navbar" role="navigation"
+  <nav class="navbar is-light is-fixed-top" id="cityssm-theme--navbar" role="navigation"
     aria-label="main navigation">
     <div class="container">
       <div class="navbar-brand">
diff --git a/views/admin-burialSiteTypes.ejs b/views/admin-burialSiteTypes.ejs
index 9205a1d2..c2d71bd3 100644
--- a/views/admin-burialSiteTypes.ejs
+++ b/views/admin-burialSiteTypes.ejs
@@ -1,7 +1,7 @@
 <%- include('_header'); -%>
 
 <div class="columns is-mobile">
-    <div class="column is-2-desktop is-narrow-touch">
+    <div class="column is-2-desktop is-narrow-touch is-hidden-print">
       <%- include('_menu-admin'); -%>
     </div>
     <div class="column">
@@ -28,7 +28,7 @@
             Burial Site Type Management
           </h1>
         </div>
-        <div class="column has-text-right is-narrow">
+        <div class="column has-text-right is-narrow is-hidden-print">
           <button class="button is-success" id="button--addBurialSiteType" type="button" accesskey="n">
             <span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span>
             <span>Add Burial Site Type</span>
diff --git a/views/admin-contractTypes.ejs b/views/admin-contractTypes.ejs
index b2d0f944..66d64e05 100644
--- a/views/admin-contractTypes.ejs
+++ b/views/admin-contractTypes.ejs
@@ -1,7 +1,7 @@
 <%- include('_header'); -%>
 
 <div class="columns is-mobile">
-  <div class="column is-2-desktop is-narrow-touch">
+  <div class="column is-2-desktop is-narrow-touch is-hidden-print">
     <%- include('_menu-admin'); -%>
   </div>
   <div class="column">
@@ -28,7 +28,7 @@
             Contract Type Management
           </h1>
         </div>
-        <div class="column has-text-right is-narrow">
+        <div class="column has-text-right is-narrow is-hidden-print">
           <button class="button is-success" id="button--addContractType" type="button" accesskey="n">
             <span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span>
             <span>Add Contract Type</span>
diff --git a/views/admin-database.ejs b/views/admin-database.ejs
index f18007b2..a71610cd 100644
--- a/views/admin-database.ejs
+++ b/views/admin-database.ejs
@@ -1,7 +1,7 @@
 <%- include('_header'); -%>
 
 <div class="columns is-mobile">
-  <div class="column is-2-desktop is-narrow-touch">
+  <div class="column is-2-desktop is-narrow-touch is-hidden-print">
     <%- include('_menu-admin'); -%>
   </div>
   <div class="column">
diff --git a/views/admin-fees.ejs b/views/admin-fees.ejs
index 96d834ae..8638aaaa 100644
--- a/views/admin-fees.ejs
+++ b/views/admin-fees.ejs
@@ -1,7 +1,7 @@
 <%- include('_header'); -%>
 
 <div class="columns is-mobile">
-  <div class="column is-2-desktop is-narrow-touch">
+  <div class="column is-2-desktop is-narrow-touch is-hidden-print">
     <%- include('_menu-admin'); -%>
   </div>
   <div class="column">
@@ -28,7 +28,7 @@
           Fee Management
         </h1>
       </div>
-      <div class="column has-text-right is-narrow">
+      <div class="column has-text-right is-narrow is-hidden-print">
         <button class="button is-success" id="button--addFeeCategory" data-cy="addFeeCategory" type="button" accesskey="n">
           <span class="icon is-small"><i class="fas fa-plus" aria-hidden="true"></i></span>
           <span>Add Fee Category</span>
diff --git a/views/admin-ntfyStartup.ejs b/views/admin-ntfyStartup.ejs
index 52ef7aab..e9306f30 100644
--- a/views/admin-ntfyStartup.ejs
+++ b/views/admin-ntfyStartup.ejs
@@ -1,7 +1,7 @@
 <%- include('_header'); -%>
 
 <div class="columns is-mobile">
-  <div class="column is-2-desktop is-narrow-touch">
+  <div class="column is-2-desktop is-narrow-touch is-hidden-print">
     <%- include('_menu-admin'); -%>
   </div>
   <div class="column">
diff --git a/views/admin-tables.ejs b/views/admin-tables.ejs
index 301d4c46..f0be9f5b 100644
--- a/views/admin-tables.ejs
+++ b/views/admin-tables.ejs
@@ -1,7 +1,7 @@
 <%- include('_header'); -%>
 
 <div class="columns is-mobile">
-  <div class="column is-2-desktop is-narrow-touch">
+  <div class="column is-2-desktop is-narrow-touch is-hidden-print">
     <%- include('_menu-admin'); -%>
   </div>
   <div class="column">
diff --git a/views/cemetery-search.ejs b/views/cemetery-search.ejs
index c9e656ea..0bebae07 100644
--- a/views/cemetery-search.ejs
+++ b/views/cemetery-search.ejs
@@ -18,7 +18,7 @@
       Find a Cemetery
     </h1>
   </div>
-  <div class="column has-text-right is-narrow">
+  <div class="column has-text-right is-narrow is-hidden-print">
     <a class="button" href="<%= urlPrefix %>/reports/cemeteries-formatted" target="_blank" download>
       <span class="icon is-small"><i class="fas fa-download" aria-hidden="true"></i></span>
       <span>Export</span>
diff --git a/views/dashboard.ejs b/views/dashboard.ejs
index eeb18e7f..2bdfb8ae 100644
--- a/views/dashboard.ejs
+++ b/views/dashboard.ejs
@@ -277,14 +277,27 @@
     <% if (user.userProperties.isAdmin) { %>
       <div class="panel">
         <div class="panel-heading">
-          Administrator Tools
+          <div class="level">
+            <div class="level-left">
+              <div class="level-item">
+                <div class="has-text-weight-bold">
+                  Administrator Tools
+                </div>
+              </div>
+            </div>
+            <div class="level-right">
+              <div class="level-item">
+                <span class="icon"><i class="fas fa-cog" aria-hidden="true"></i></span>
+              </div>
+            </div>
+          </div>
         </div>
         <a class="panel-block" href="<%= urlPrefix %>/admin/fees">
           <div class="media">
             <div class="media-left">
               <span class="fa-layers fa-4x fa-fw" aria-hidden="true">
                 <i class="fas fa-dollar-sign"></i>
-                <i class="fas fa-cog" data-fa-transform="shrink-8 right-8 down-5" data-fa-glow="10"></i>
+                <i class="fas fa-cog" data-fa-transform="shrink-8 right-7 down-5" data-fa-glow="10"></i>
               </span>
             </div>
             <div class="media-content">
@@ -303,7 +316,7 @@
             <div class="media-left">
               <span class="fa-layers fa-4x fa-fw" aria-hidden="true">
                 <i class="fas fa-user-friends"></i>
-                <i class="fas fa-cog" data-fa-transform="shrink-8 right-8 down-5" data-fa-glow="10"></i>
+                <i class="fas fa-cog" data-fa-transform="shrink-8 right-7 down-5" data-fa-glow="10"></i>
               </span>
             </div>
             <div class="media-content">
@@ -323,7 +336,7 @@
             <div class="media-left">
               <span class="fa-layers fa-4x fa-fw" aria-hidden="true">
                 <i class="fas fa-vector-square"></i>
-                <i class="fas fa-cog" data-fa-transform="shrink-8 right-8 down-5" data-fa-glow="10"></i>
+                <i class="fas fa-cog" data-fa-transform="shrink-8 right-7 down-5" data-fa-glow="10"></i>
               </span>
             </div>
             <div class="media-content">
@@ -341,7 +354,7 @@
             <div class="media-left">
               <span class="fa-layers fa-4x fa-fw" aria-hidden="true">
                 <i class="fas fa-table"></i>
-                <i class="fas fa-cog" data-fa-transform="shrink-8 right-8 down-5" data-fa-glow="10"></i>
+                <i class="fas fa-cog" data-fa-transform="shrink-8 right-7 down-5" data-fa-glow="10"></i>
               </span>
             </div>
             <div class="media-content">
diff --git a/views/workOrder-milestoneCalendar.ejs b/views/workOrder-milestoneCalendar.ejs
index e4002bd3..3cd91671 100644
--- a/views/workOrder-milestoneCalendar.ejs
+++ b/views/workOrder-milestoneCalendar.ejs
@@ -1,7 +1,7 @@
 <%- include('_header'); -%>
 
 <div class="columns is-mobile">
-  <div class="column is-2-desktop is-narrow-touch">
+  <div class="column is-2-desktop is-narrow-touch is-hidden-print">
     <%- include('_menu-workOrders'); -%>
   </div>
   <div class="column">
diff --git a/views/workOrder-outlook.ejs b/views/workOrder-outlook.ejs
index 6198ddfa..73893db7 100644
--- a/views/workOrder-outlook.ejs
+++ b/views/workOrder-outlook.ejs
@@ -1,89 +1,89 @@
 <%- include('_header'); -%>
 
 <div class="columns is-mobile">
-    <div class="column is-2-desktop is-narrow-touch">
-      <%- include('_menu-workOrders'); -%>
-    </div>
-    <div class="column">
-        <nav class="breadcrumb">
-            <ul>
-                <li><a href="<%= urlPrefix %>/dashboard">Home</a></li>
-                <li>
-                    <a href="<%= urlPrefix %>/workOrders">
-                        <span class="icon is-small"><i class="fas fa-hard-hat" aria-hidden="true"></i></span>
-                        <span>Work Orders</span>
-                    </a>
-                </li>
-                <li class="is-active">
-                    <a href="#" aria-current="page">
-                        Outlook Integration
-                    </a>
-                </li>
-            </ul>
-        </nav>
-
-        <h1 class="title is-1">
+  <div class="column is-2-desktop is-narrow-touch is-hidden-print">
+    <%- include('_menu-workOrders'); -%>
+  </div>
+  <div class="column">
+    <nav class="breadcrumb">
+      <ul>
+        <li><a href="<%= urlPrefix %>/dashboard">Home</a></li>
+        <li>
+          <a href="<%= urlPrefix %>/workOrders">
+            <span class="icon is-small"><i class="fas fa-hard-hat" aria-hidden="true"></i></span>
+            <span>Work Orders</span>
+          </a>
+        </li>
+        <li class="is-active">
+          <a href="#" aria-current="page">
             Outlook Integration
-        </h1>
+          </a>
+        </li>
+      </ul>
+    </nav>
 
-        <div class="panel" id="panel--icsFilters">
-            <h2 class="panel-heading">Work Order Milestone Calendar (ICS)</h2>
-            <div class="panel-block is-block">
-                <div class="message is-info">
-                    <p class="message-body">
-                        Recent milestones can be exported in the iCalendar format.
-                        They can then imported into Outlook as Internet calendars that can be regularly refreshed.
-                    </p>
-                </div>
-                <div class="columns">
-                    <div class="column">
-                        <label class="label" for="icsFilters--workOrderTypeIds">Work Order Types</label>
-                        <label class="checkbox is-block">
-                            <input id="icsFilters--workOrderTypeIds-all" type="checkbox" checked />
-                            All Work Order Types
-                        </label>
-                        <div class="control mt-2">
-                            <div class="select is-multiple is-fullwidth">
-                                <select id="icsFilters--workOrderTypeIds" multiple size="<%= Math.min(Math.max(workOrderTypes.length, workOrderMilestoneTypes.length), 6) %>" disabled>
-                                    <% for (const workOrderType of workOrderTypes) { %>
-                                        <option value="<%= workOrderType.workOrderTypeId %>" selected>
-                                            <%= workOrderType.workOrderType %>
-                                        </option>
-                                    <% } %>
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="column">
-                        <label class="label" for="icsFilters--workOrderMilestoneTypeIds">Milestone Types</label>
-                        <label class="checkbox is-block">
-                            <input id="icsFilters--workOrderMilestoneTypeIds-all" type="checkbox" checked />
-                            All Work Order Milestone Types
-                        </label>
-                        <div class="control mt-2">
-                            <div class="select is-multiple is-fullwidth">
-                                <select id="icsFilters--workOrderMilestoneTypeIds" multiple size="<%= Math.min(Math.max(workOrderTypes.length, workOrderMilestoneTypes.length), 6) %>" disabled>
-                                    <% for (const workOrderMilestoneType of workOrderMilestoneTypes) { %>
-                                        <option value="<%= workOrderMilestoneType.workOrderMilestoneTypeId %>" selected>
-                                            <%= workOrderMilestoneType.workOrderMilestoneType %>
-                                        </option>
-                                    <% } %>
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+    <h1 class="title is-1">
+      Outlook Integration
+    </h1>
+
+    <div class="panel" id="panel--icsFilters">
+        <h2 class="panel-heading">Work Order Milestone Calendar (ICS)</h2>
+        <div class="panel-block is-block">
+            <div class="message is-info">
+                <p class="message-body">
+                    Recent milestones can be exported in the iCalendar format.
+                    They can then imported into Outlook as Internet calendars that can be regularly refreshed.
+                </p>
             </div>
-            <div class="panel-block is-block">
-                <div class="field">
-                    <label class="label" for="icsFilters--calendarURL">ICS Calendar Link</label>
-                    <div class="control">
-                        <textarea class="textarea" id="icsFilters--calendarURL" name="calendarURL" style="cursor:text" readonly></textarea>
+            <div class="columns">
+                <div class="column">
+                    <label class="label" for="icsFilters--workOrderTypeIds">Work Order Types</label>
+                    <label class="checkbox is-block">
+                        <input id="icsFilters--workOrderTypeIds-all" type="checkbox" checked />
+                        All Work Order Types
+                    </label>
+                    <div class="control mt-2">
+                        <div class="select is-multiple is-fullwidth">
+                            <select id="icsFilters--workOrderTypeIds" multiple size="<%= Math.min(Math.max(workOrderTypes.length, workOrderMilestoneTypes.length), 6) %>" disabled>
+                                <% for (const workOrderType of workOrderTypes) { %>
+                                    <option value="<%= workOrderType.workOrderTypeId %>" selected>
+                                        <%= workOrderType.workOrderType %>
+                                    </option>
+                                <% } %>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+                <div class="column">
+                    <label class="label" for="icsFilters--workOrderMilestoneTypeIds">Milestone Types</label>
+                    <label class="checkbox is-block">
+                        <input id="icsFilters--workOrderMilestoneTypeIds-all" type="checkbox" checked />
+                        All Work Order Milestone Types
+                    </label>
+                    <div class="control mt-2">
+                        <div class="select is-multiple is-fullwidth">
+                            <select id="icsFilters--workOrderMilestoneTypeIds" multiple size="<%= Math.min(Math.max(workOrderTypes.length, workOrderMilestoneTypes.length), 6) %>" disabled>
+                                <% for (const workOrderMilestoneType of workOrderMilestoneTypes) { %>
+                                    <option value="<%= workOrderMilestoneType.workOrderMilestoneTypeId %>" selected>
+                                        <%= workOrderMilestoneType.workOrderMilestoneType %>
+                                    </option>
+                                <% } %>
+                            </select>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
+        <div class="panel-block is-block">
+            <div class="field">
+                <label class="label" for="icsFilters--calendarURL">ICS Calendar Link</label>
+                <div class="control">
+                    <textarea class="textarea" id="icsFilters--calendarURL" name="calendarURL" style="cursor:text" readonly></textarea>
+                </div>
+            </div>
+        </div>
     </div>
+  </div>
 </div>
 
 <%- include('_footerA'); -%>
diff --git a/views/workOrder-search.ejs b/views/workOrder-search.ejs
index 38f96a53..5fb5552f 100644
--- a/views/workOrder-search.ejs
+++ b/views/workOrder-search.ejs
@@ -1,7 +1,7 @@
 <%- include('_header'); -%>
 
 <div class="columns is-mobile">
-  <div class="column is-2-desktop is-narrow-touch">
+  <div class="column is-2-desktop is-narrow-touch is-hidden-print">
     <%- include('_menu-workOrders'); -%>
   </div>
   <div class="column">