diff --git a/public/javascripts/contract.search.js b/public/javascripts/contract.search.js
index 6a51cf9a..2689d226 100644
--- a/public/javascripts/contract.search.js
+++ b/public/javascripts/contract.search.js
@@ -57,7 +57,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                 contract.funeralHomeName !== '') {
                 contactsHTML += `<li class="has-tooltip-left has-text-grey"
           data-tooltip="Funeral Home">
-          <span class="fa-li"><i class="fas fa-church"></i></span>
+          <span class="fa-li"><i class="fas fa-place-of-worship"></i></span>
           ${cityssm.escapeHTML(contract.funeralHomeName)}
           </li>`;
             }
diff --git a/public/javascripts/contract.search.ts b/public/javascripts/contract.search.ts
index 8044abe8..bcaa6b22 100644
--- a/public/javascripts/contract.search.ts
+++ b/public/javascripts/contract.search.ts
@@ -93,7 +93,7 @@ declare const exports: Record<string, unknown>
       ) {
         contactsHTML += `<li class="has-tooltip-left has-text-grey"
           data-tooltip="Funeral Home">
-          <span class="fa-li"><i class="fas fa-church"></i></span>
+          <span class="fa-li"><i class="fas fa-place-of-worship"></i></span>
           ${cityssm.escapeHTML(contract.funeralHomeName)}
           </li>`
       }
diff --git a/public/javascripts/workOrder.search.js b/public/javascripts/workOrder.search.js
index 213edf90..fc784690 100644
--- a/public/javascripts/workOrder.search.js
+++ b/public/javascripts/workOrder.search.js
@@ -45,7 +45,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
                     relatedHTML += `<li class="has-tooltip-left"
             data-tooltip="Funeral Home">
             <span class="fa-li">
-              <i class="fas fa-fw fa-church"></i>
+              <i class="fas fa-fw fa-place-of-worship"></i>
             </span>
             ${cityssm.escapeHTML(contract.funeralHomeName)}
             </li>`;
diff --git a/public/javascripts/workOrder.search.ts b/public/javascripts/workOrder.search.ts
index b3e89e50..e6130e09 100644
--- a/public/javascripts/workOrder.search.ts
+++ b/public/javascripts/workOrder.search.ts
@@ -82,7 +82,7 @@ declare const exports: Record<string, unknown>
           relatedHTML += `<li class="has-tooltip-left"
             data-tooltip="Funeral Home">
             <span class="fa-li">
-              <i class="fas fa-fw fa-church"></i>
+              <i class="fas fa-fw fa-place-of-worship"></i>
             </span>
             ${cityssm.escapeHTML(contract.funeralHomeName)}
             </li>`
diff --git a/public/stylesheets/sunrise.css b/public/stylesheets/sunrise.css
index 2d2ada91..fbc10695 100644
--- a/public/stylesheets/sunrise.css
+++ b/public/stylesheets/sunrise.css
@@ -30,7 +30,7 @@
 
 #is-login-page {
   overflow: auto;
-  background-position: top center;
+  background-position: bottom center;
   background-size: cover;
 }
 
diff --git a/views/cemetery-edit.ejs b/views/cemetery-edit.ejs
index 18ceea16..10802c50 100644
--- a/views/cemetery-edit.ejs
+++ b/views/cemetery-edit.ejs
@@ -252,7 +252,7 @@
                 </a>
             </div>
             <div class="level-item">
-              <a class="button is-small is-link has-text-weight-normal" href="<%=urlPrefix %>/reports/burialSites-byCemeteryId?cemeteryId=<%= cemetery.cemeteryId %>" download>
+              <a class="button is-small has-text-weight-normal" href="<%=urlPrefix %>/reports/burialSites-byCemeteryId?cemeteryId=<%= cemetery.cemeteryId %>" download>
                 <span class="icon"><i class="fas fa-download" aria-hidden="true"></i></span>
                 <span>Export All</span>
               </a>
diff --git a/views/cemetery-view.ejs b/views/cemetery-view.ejs
index e688f5bc..4fb18104 100644
--- a/views/cemetery-view.ejs
+++ b/views/cemetery-view.ejs
@@ -73,156 +73,158 @@
         </div>
       <% } %>
       <div class="column">
-          <strong>Address</strong><br />
-          <% if (cemetery.cemeteryAddress1 !== "") { %>
-              <%= cemetery.cemeteryAddress1 %><br />
-          <% } %>
-          <% if (cemetery.cemeteryAddress2 !== "") { %>
-              <%= cemetery.cemeteryAddress2 %><br />
-          <% } %>
-          <%= cemetery.cemeteryCity %>, <%= cemetery.cemeteryProvince %><br />
-          <%= cemetery.cemeteryPostalCode %>
+        <strong>Address</strong><br />
+        <% if (cemetery.cemeteryAddress1 !== "") { %>
+          <%= cemetery.cemeteryAddress1 %><br />
+        <% } %>
+        <% if (cemetery.cemeteryAddress2 !== "") { %>
+          <%= cemetery.cemeteryAddress2 %><br />
+        <% } %>
+        <%= cemetery.cemeteryCity %>, <%= cemetery.cemeteryProvince %><br />
+        <%= cemetery.cemeteryPostalCode %>
       </div>
       <% if (cemetery.cemeteryPhoneNumber !== "") { %>
-          <div class="column">
-              <strong>Phone Number</strong><br />
-              <%= cemetery.cemeteryPhoneNumber %>
-          </div>
+        <div class="column">
+          <strong>Phone Number</strong><br />
+          <%= cemetery.cemeteryPhoneNumber %>
+        </div>
       <% } %>
     </div>
   </div>
 </div>
 
 <div class="columns">
-    <div class="column">
-      <div class="panel">
-        <h2 class="panel-heading">Geographic Location</h2>
-        <div class="panel-block is-block">
-          <% if (cemetery.cemeteryLatitude && cemetery.cemeteryLongitude) { %>
-            <div id="cemetery--leaflet" data-cemetery-latitude="<%= cemetery.cemeteryLatitude %>" data-cemetery-longitude="<%= cemetery.cemeteryLongitude %>" style="height:300px"></div>
-          <% } else { %>
-            <div class="message is-info">
-              <p class="message-body">There are no geographic coordinates associated with this cemetery.</p>
-            </div>
-          <% } %>
-        </div>
+  <div class="column">
+    <div class="panel">
+      <h2 class="panel-heading">Geographic Location</h2>
+      <div class="panel-block is-block">
+        <% if (cemetery.cemeteryLatitude && cemetery.cemeteryLongitude) { %>
+          <div id="cemetery--leaflet" data-cemetery-latitude="<%= cemetery.cemeteryLatitude %>" data-cemetery-longitude="<%= cemetery.cemeteryLongitude %>" style="height:300px"></div>
+        <% } else { %>
+          <div class="message is-info">
+            <p class="message-body">
+              There are no geographic coordinates associated with this cemetery.
+            </p>
+          </div>
+        <% } %>
       </div>
     </div>
-    <div class="column">
-        <div class="panel">
-          <h2 class="panel-heading">Image</h2>
-          <div class="panel-block is-block">
-            <% if (cemetery.cemeterySvg) { %>
-              <% const imageURL = urlPrefix + "/internal/images/cemeteries/" + cemetery.cemeterySvg %>
-              <a class="image" href="<%= urlPrefix %>/internal/images/cemeteries/<%= cemetery.cemeterySvg %>" target="_blank">
-                <%- include('../public-internal/images/cemeteries/' + cemetery.cemeterySvg); -%>
-              </a>
-            <% } else { %>
-              <div class="message is-info">
-                <p class="message-body">There are no image associated with this cemetery.</p>
-              </div>
-            <% } %>
+  </div>
+  <div class="column">
+    <div class="panel">
+      <h2 class="panel-heading">Image</h2>
+      <div class="panel-block is-block">
+        <% if (cemetery.cemeterySvg) { %>
+          <% const imageURL = urlPrefix + "/internal/images/cemeteries/" + cemetery.cemeterySvg %>
+          <a class="image" href="<%= urlPrefix %>/internal/images/cemeteries/<%= cemetery.cemeterySvg %>" target="_blank">
+            <%- include('../public-internal/images/cemeteries/' + cemetery.cemeterySvg); -%>
+          </a>
+        <% } else { %>
+          <div class="message is-info">
+            <p class="message-body">There are no image associated with this cemetery.</p>
           </div>
-        </div>
+        <% } %>
+      </div>
     </div>
+  </div>
 </div>
 
 <% const burialSiteSearchUrl = urlPrefix + "/burialSites?cemeteryId=" + cemetery.cemeteryId; %>
 <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-weight-bold has-text-white">
-                  Burial Site Summaries
-                  <a class="tag is-link ml-2" href="<%= burialSiteSearchUrl %>">
-                    <%= cemetery.burialSiteCount %>
-                  </a>
-                </h2>
-              </div>
-            </div>
-            <div class="level-right">
-              <div class="level-item">
-                <a class="button is-small is-link has-text-weight-normal" href="<%=urlPrefix %>/reports/burialSites-byCemeteryId?cemeteryId=<%= cemetery.cemeteryId %>" download>
-                  <span class="icon"><i class="fas fa-download" aria-hidden="true"></i></span>
-                  <span>Export All</span>
-                </a>
-              </div>
-            </div>
+  <div class="panel-heading">
+    <div class="level is-mobile">
+      <div class="level-left">
+        <div class="level-item">
+          <h2 class="title is-5 has-text-weight-bold has-text-white">
+            Burial Site Summaries
+            <a class="tag is-link ml-2" href="<%= burialSiteSearchUrl %>">
+              <%= cemetery.burialSiteCount %>
+            </a>
+          </h2>
         </div>
+      </div>
+      <div class="level-right">
+        <div class="level-item">
+          <a class="button is-small has-text-weight-normal" href="<%=urlPrefix %>/reports/burialSites-byCemeteryId?cemeteryId=<%= cemetery.cemeteryId %>" download>
+            <span class="icon"><i class="fas fa-download" aria-hidden="true"></i></span>
+            <span>Export All</span>
+          </a>
+        </div>
+      </div>
     </div>
-    <div class="panel-block is-block">
-        <% if (cemetery.burialSiteCount === 0) { %>
-          <div class="message is-info">
-            <p class="message-body">
-              There are no burial sites associated with this cemetery.
-            </p>
-          </div>
-        <% } else { %>
-            <div class="columns">
-                <div class="column">
-                    <table class="table is-fullwidth is-striped is-hoverable">
-                        <thead>
-                          <tr>
-                            <th>Type</th>
-                            <th class="has-text-right">
-                              Burial Site Count
-                            </th>
-                            <th class="has-text-right">Percentage</th>
-                          </tr>
-                        </thead>
-                        <tbody>
-                          <% for (const burialSiteType of burialSiteTypeSummary) { %>
-                            <tr>
-                              <td>
-                                <a class="has-text-weight-bold" href="<%= burialSiteSearchUrl %>&burialSiteTypeId=<%= burialSiteType.burialSiteTypeId %>">
-                                  <%= burialSiteType.burialSiteType %>
-                                </a>
-                              </td>
-                              <td class="has-text-right">
-                                  <%= burialSiteType.burialSiteCount %>
-                              </td>
-                              <td class="has-text-right">
-                                  <%= ((burialSiteType.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>%
-                              </td>
-                            </tr>
-                          <% } %>
-                        </tbody>
-                    </table>
-                </div>
-                <div class="column">
-                    <table class="table is-fullwidth is-striped is-hoverable">
-                        <thead>
-                          <tr>
-                            <th>Status</th>
-                            <th class="has-text-right">
-                              Burial Site Count
-                            </th>
-                            <th class="has-text-right">Percentage</th>
-                          </tr>
-                        </thead>
-                        <tbody>
-                            <% for (const burialSiteStatus of burialSiteStatusSummary) { %>
-                              <tr>
-                                <td>
-                                  <a class="has-text-weight-bold" href="<%= burialSiteSearchUrl %>&burialSiteStatusId=<%= burialSiteStatus.burialSiteStatusId %>">
-                                      <%= burialSiteStatus.burialSiteStatus %>
-                                  </a>
-                                </td>
-                                <td class="has-text-right">
-                                    <%= burialSiteStatus.burialSiteCount %>
-                                </td>
-                                <td class="has-text-right">
-                                    <%= ((burialSiteStatus.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>%
-                                </td>
-                              </tr>
-                            <% } %>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        <% } %>
-    </div>
+  </div>
+  <div class="panel-block is-block">
+    <% if (cemetery.burialSiteCount === 0) { %>
+      <div class="message is-info">
+        <p class="message-body">
+          There are no burial sites associated with this cemetery.
+        </p>
+      </div>
+    <% } else { %>
+      <div class="columns">
+        <div class="column">
+          <table class="table is-fullwidth is-striped is-hoverable">
+            <thead>
+              <tr>
+                <th>Type</th>
+                <th class="has-text-right">
+                  Burial Site Count
+                </th>
+                <th class="has-text-right">Percentage</th>
+              </tr>
+            </thead>
+            <tbody>
+              <% for (const burialSiteType of burialSiteTypeSummary) { %>
+                <tr>
+                  <td>
+                    <a class="has-text-weight-bold" href="<%= burialSiteSearchUrl %>&burialSiteTypeId=<%= burialSiteType.burialSiteTypeId %>">
+                      <%= burialSiteType.burialSiteType %>
+                    </a>
+                  </td>
+                  <td class="has-text-right">
+                      <%= burialSiteType.burialSiteCount %>
+                  </td>
+                  <td class="has-text-right">
+                      <%= ((burialSiteType.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>%
+                  </td>
+                </tr>
+              <% } %>
+            </tbody>
+          </table>
+        </div>
+        <div class="column">
+          <table class="table is-fullwidth is-striped is-hoverable">
+            <thead>
+              <tr>
+                <th>Status</th>
+                <th class="has-text-right">
+                  Burial Site Count
+                </th>
+                <th class="has-text-right">Percentage</th>
+              </tr>
+            </thead>
+            <tbody>
+              <% for (const burialSiteStatus of burialSiteStatusSummary) { %>
+                <tr>
+                  <td>
+                    <a class="has-text-weight-bold" href="<%= burialSiteSearchUrl %>&burialSiteStatusId=<%= burialSiteStatus.burialSiteStatusId %>">
+                        <%= burialSiteStatus.burialSiteStatus %>
+                    </a>
+                  </td>
+                  <td class="has-text-right">
+                      <%= burialSiteStatus.burialSiteCount %>
+                  </td>
+                  <td class="has-text-right">
+                      <%= ((burialSiteStatus.burialSiteCount / cemetery.burialSiteCount) * 100).toFixed(1) %>%
+                  </td>
+                </tr>
+              <% } %>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    <% } %>
+  </div>
 </div>
 
 <%- include('_footerA'); -%>
diff --git a/views/contract-edit.ejs b/views/contract-edit.ejs
index 880bca4c..767c9b36 100644
--- a/views/contract-edit.ejs
+++ b/views/contract-edit.ejs
@@ -322,7 +322,20 @@
   </div>
 
   <div class="panel">
-    <h2 class="panel-heading">Funeral</h2>
+    <div class="panel-heading">
+      <div class="level is-mobile">
+        <div class="level-left">
+          <div class="level-item">
+            <h2 class="has-text-weight-bold">Funeral</h2>
+          </div>
+        </div>
+        <div class="level-right">
+          <div class="level-item">
+            <i class="fas fa-place-of-worship" aria-hidden="true"></i>
+          </div>
+        </div>
+      </div>
+    </div>
     <div class="panel-block is-block">
       <div class="columns">
         <div class="column">
@@ -425,7 +438,20 @@
   <div class="columns">
     <div class="column">
       <div class="panel">
-        <h2 class="panel-heading">Purchaser</h2>
+        <div class="panel-heading">
+          <div class="level is-mobile">
+            <div class="level-left">
+              <div class="level-item">
+                <h2 class="has-text-weight-bold is-size-5">Purchaser</h2>
+              </div>
+            </div>
+            <div class="level-right">
+              <div class="level-item">
+                <i class="fas fa-hand-holding-dollar" aria-hidden="true"></i>
+              </div>
+            </div>
+          </div>
+        </div>
         <div class="panel-block is-block">
           <div class="field">
             <label class="label" for="contract--purchaserName">
diff --git a/views/contract-view.ejs b/views/contract-view.ejs
index fcd312bd..e3d4a2c3 100644
--- a/views/contract-view.ejs
+++ b/views/contract-view.ejs
@@ -144,7 +144,20 @@
 </div>
 
 <div class="panel">
-  <h2 class="panel-heading">Funeral</h2>
+  <div class="panel-heading">
+    <div class="level is-mobile">
+      <div class="level-left">
+        <div class="level-item">
+          <h2 class="has-text-weight-bold">Funeral</h2>
+        </div>
+      </div>
+      <div class="level-right">
+        <div class="level-item">
+          <i class="fas fa-place-of-worship" aria-hidden="true"></i>
+        </div>
+      </div>
+    </div>
+  </div>
   <div class="panel-block is-block">
     <div class="columns">
       <div class="column">
@@ -201,7 +214,11 @@
         </div>
         <p>
           <strong>Committal Type</strong><br />
-          <%= contract.committalType %>
+          <% if (contract.committalType === null) { %>
+            <span class="has-text-grey">(No Committal Type)</span>
+          <% } else { %>
+            <%= contract.committalType %>
+          <% } %>
         </p>
       </div>
     </div>
@@ -211,7 +228,20 @@
 <div class="columns">
   <div class="column">
     <div class="panel">
-      <h2 class="panel-heading">Purchaser</h2>
+      <div class="panel-heading">
+        <div class="level is-mobile">
+          <div class="level-left">
+            <div class="level-item">
+              <h2 class="has-text-weight-bold is-size-5">Purchaser</h2>
+            </div>
+          </div>
+          <div class="level-right">
+            <div class="level-item">
+              <i class="fas fa-hand-holding-dollar" aria-hidden="true"></i>
+            </div>
+          </div>
+        </div>
+      </div>
       <div class="panel-block is-block">
         <div class="columns">
           <div class="column">
@@ -270,7 +300,7 @@
           </div>
           <div class="level-right">
             <div class="level-item">
-              <a class="button is-link is-small is-hidden-print has-text-weight-normal"
+              <a class="button is-small is-hidden-print has-text-weight-normal"
                 href="<%= urlPrefix %>/reports/contractInterments-byContractId/?contractId=<%= contract.contractId %>"  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/login.ejs b/views/login.ejs
index d6cc2146..3e372ce7 100644
--- a/views/login.ejs
+++ b/views/login.ejs
@@ -17,7 +17,7 @@
 </head>
 
 <body>
-  <div class="columns is-vcentered is-centered has-min-page-height is-marginless">
+  <div class="columns is-vcentered is-centered has-min-page-height mx-0 my-0">
     <div class="column is-half-widescreen is-two-thirds-desktop is-three-quarters-tablet">
       <main class="box mx-3 my-3">
         <div class="columns is-vcentered">