From 5e0e4b892f333b2313af27c527362e41cd24f3d2 Mon Sep 17 00:00:00 2001
From: Tom Karasch <tom.karasch@dnr.ga.gov>
Date: Thu, 2 Nov 2023 16:07:42 -0400
Subject: [PATCH] Tweak color and container colors and shapes

---
 FMS/Pages/Cabinets/Add.cshtml                 |  2 +-
 FMS/Pages/Cabinets/Details.cshtml             |  2 +-
 FMS/Pages/Cabinets/Edit.cshtml                |  2 +-
 FMS/Pages/Facilities/Add.cshtml               |  4 +-
 FMS/Pages/Facilities/Delete.cshtml            |  2 +-
 FMS/Pages/Facilities/Details.cshtml           |  2 +-
 FMS/Pages/Facilities/Edit.cshtml              |  2 +-
 .../Facilities/EditRetentionRecord.cshtml     |  2 +-
 FMS/Pages/Facilities/Index.cshtml             | 10 ++--
 FMS/Pages/Facilities/Map.cshtml               |  2 +-
 FMS/Pages/Facilities/Undelete.cshtml          |  2 +-
 FMS/Pages/Files/Details.cshtml                |  2 +-
 FMS/Pages/Files/Index.cshtml                  |  8 +--
 FMS/Pages/Maintenance/BudgetCode/Add.cshtml   |  2 +-
 FMS/Pages/Maintenance/BudgetCode/Edit.cshtml  |  2 +-
 FMS/Pages/Maintenance/BudgetCode/Index.cshtml |  8 +--
 .../ComplianceOfficer/Index.cshtml            |  6 +--
 .../Maintenance/FacilityStatus/Add.cshtml     |  2 +-
 .../Maintenance/FacilityStatus/Edit.cshtml    |  2 +-
 .../Maintenance/FacilityStatus/Index.cshtml   |  6 +--
 FMS/Pages/Maintenance/FacilityType/Add.cshtml |  2 +-
 .../Maintenance/FacilityType/Edit.cshtml      |  2 +-
 .../Maintenance/FacilityType/Index.cshtml     | 54 +++++++++----------
 .../Maintenance/OrganizationalUnit/Add.cshtml |  2 +-
 .../OrganizationalUnit/Edit.cshtml            |  2 +-
 .../OrganizationalUnit/Index.cshtml           | 50 ++++++++---------
 .../DisplayTemplates/BoolRemoved.cshtml       |  2 +-
 FMS/Pages/Shared/_Layout.cshtml               |  6 +--
 FMS/Pages/Shared/_MenuPartial.cshtml          |  6 +--
 FMS/Pages/Users/Edit.cshtml                   |  2 +-
 FMS/Pages/Users/Index.cshtml                  |  4 +-
 FMS/wwwroot/css/site.css                      |  6 +++
 32 files changed, 106 insertions(+), 102 deletions(-)

diff --git a/FMS/Pages/Cabinets/Add.cshtml b/FMS/Pages/Cabinets/Add.cshtml
index 1aeb03a2..e845c153 100644
--- a/FMS/Pages/Cabinets/Add.cshtml
+++ b/FMS/Pages/Cabinets/Add.cshtml
@@ -9,7 +9,7 @@
     ViewData["Title"] = "Add Cabinet";
 }
 <h1>@ViewData["Title"]</h1>
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <div class="row">
diff --git a/FMS/Pages/Cabinets/Details.cshtml b/FMS/Pages/Cabinets/Details.cshtml
index bca1d31c..9a3b1a27 100644
--- a/FMS/Pages/Cabinets/Details.cshtml
+++ b/FMS/Pages/Cabinets/Details.cshtml
@@ -18,7 +18,7 @@
 <hr />
 <partial name="_AlertPartial" for="Message" />
 
-<div class="container">
+<div class="container bg-light-subtle rounded-3">
     <p>
         <em>File Label Range</em> is used for displaying the storage cabinets used for each File or Facility. The range is
         from the First File Label for the cabinet up to (but not including) the First File Label for the next cabinet.
diff --git a/FMS/Pages/Cabinets/Edit.cshtml b/FMS/Pages/Cabinets/Edit.cshtml
index 65150d33..b26407d4 100644
--- a/FMS/Pages/Cabinets/Edit.cshtml
+++ b/FMS/Pages/Cabinets/Edit.cshtml
@@ -10,7 +10,7 @@
 }
 <h1>@ViewData["Title"]</h1>
 
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <div class="row">
diff --git a/FMS/Pages/Facilities/Add.cshtml b/FMS/Pages/Facilities/Add.cshtml
index 4b744811..e0158b1e 100644
--- a/FMS/Pages/Facilities/Add.cshtml
+++ b/FMS/Pages/Facilities/Add.cshtml
@@ -14,7 +14,7 @@
     ViewData["Title"] = "Add Facility";
 }
 <h1>@ViewData["Title"]</h1>
-<div class="p-3 rounded-3 bg-light">
+<div class="p-3 rounded-3 bg-light-subtle">
     <form method="post" asp-fragment="ConfirmFacility">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <div class="mb-3 row">
@@ -204,7 +204,7 @@
                 <button asp-page-handler="Confirm" type="submit" class="btn btn-warning col-sm-5 col-md-4 mb-3 mb-sm-0">
                     Create the facility
                 </button>
-                <a asp-page="./Add" class="btn btn-outline-secondary text-dark bg-light col-sm-4 col-md-3">Cancel (clear the form)</a>
+                <a asp-page="./Add" class="btn btn-outline-secondary text-body bg-light-subtle col-sm-4 col-md-3">Cancel (clear the form)</a>
                 <input asp-for="Facility.Address" type="hidden" />
                 <input asp-for="Facility.City" type="hidden" />
                 <input asp-for="Facility.Latitude" type="hidden" />
diff --git a/FMS/Pages/Facilities/Delete.cshtml b/FMS/Pages/Facilities/Delete.cshtml
index dfa5c924..335cb358 100644
--- a/FMS/Pages/Facilities/Delete.cshtml
+++ b/FMS/Pages/Facilities/Delete.cshtml
@@ -7,7 +7,7 @@
 
 <h1><em>Confirm</em> @ViewData["Title"]</h1>
 
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle p-3 rounded-3">
     <p class="lead text-danger font-weight-medium">Are you sure you want to delete this Facility?</p>
     <dl class="row">
         <dt class="col-sm-3">
diff --git a/FMS/Pages/Facilities/Details.cshtml b/FMS/Pages/Facilities/Details.cshtml
index 5f7b4c74..22300375 100644
--- a/FMS/Pages/Facilities/Details.cshtml
+++ b/FMS/Pages/Facilities/Details.cshtml
@@ -159,7 +159,7 @@
     @if (Model.FacilityDetail.Active &&
     (User.IsInRole(UserRoles.FileCreator) || User.IsInRole(UserRoles.FileEditor)))
     {
-        <div class="container bg-light pt-3 mt-5">
+        <div class="container bg-light-subtle pt-3 mt-5 rounded-3">
             <h3 class="h5">Add a Retention Record</h3>
             <form method="post" asp-page-handler="RetentionRecord" asp-fragment="retention-records">
                 <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
diff --git a/FMS/Pages/Facilities/Edit.cshtml b/FMS/Pages/Facilities/Edit.cshtml
index 16b0a612..8a70765d 100644
--- a/FMS/Pages/Facilities/Edit.cshtml
+++ b/FMS/Pages/Facilities/Edit.cshtml
@@ -17,7 +17,7 @@
     @ViewData["Title"]
 </h1>
 
-<div class="p-3 rounded-3 bg-light">
+<div class="p-3 rounded-3 bg-light-subtle">
     <form method="post">
         <input type="hidden" asp-for="Facility.Active" />
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
diff --git a/FMS/Pages/Facilities/EditRetentionRecord.cshtml b/FMS/Pages/Facilities/EditRetentionRecord.cshtml
index c4be793b..600ef5c4 100644
--- a/FMS/Pages/Facilities/EditRetentionRecord.cshtml
+++ b/FMS/Pages/Facilities/EditRetentionRecord.cshtml
@@ -10,7 +10,7 @@
 }
 <h1>@ViewData["Title"]</h1>
 
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post" asp-fragment="retention-records">
         <p>
             For Facility <strong>@Html.DisplayFor(e => e.Facility.FacilityNumber):</strong> 
diff --git a/FMS/Pages/Facilities/Index.cshtml b/FMS/Pages/Facilities/Index.cshtml
index 1266c98b..a10b6b3d 100644
--- a/FMS/Pages/Facilities/Index.cshtml
+++ b/FMS/Pages/Facilities/Index.cshtml
@@ -12,7 +12,7 @@
 
 <h1>@ViewData["Title"]</h1>
 
-<div class="p-3 rounded-3 bg-light">
+<div class="p-3 rounded-3 bg-light-subtle">
     <form method="get" asp-fragment="SearchResults">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <div class="mb-3 row">
@@ -118,7 +118,7 @@
 
 @if (Model.ShowResults)
 {
-    <div class="border-top" id="SearchResults">
+    <div class="border-top bg-light-subtle rounded-3" id="SearchResults">
         @if (Model.FacilityList.CurrentCount == 0)
         {
             <div class="container pt-3">
@@ -166,7 +166,7 @@
                         </div>
                     </div>
                 </caption>
-                <thead class="table-light">
+                <thead class="thead-dark">
                     <tr>
                         <th scope="col" class="text-nowrap">
                             <a asp-fragment="SearchResults" asp-all-route-data="Model.Spec.AsRouteValues" asp-route-handler="search"
@@ -207,7 +207,7 @@
                 <tbody>
                     @foreach (FacilitySummaryDto item in Model.FacilityList.Items)
                     {
-                        <tr class="@(!item.Active ? "table-secondary" : "")">
+                        <tr class="@(!item.Active ? "table-warning" : "")">
                             <td>
                                 <a asp-page="Details" asp-route-id="@item.Id" class="btn @(item.Active ? "btn-outline-info" : "btn-outline-secondary") btn-sm">
                                     @Html.DisplayFor(m => item.FacilityNumber, "StringOrNone")
@@ -246,7 +246,7 @@
                 </tbody>
             </table>
 
-            <partial name="_PaginationNav" model="(Model.FacilityList, Model.Spec.AsRouteValues)" />
+            <span class="align-top"><partial name="_PaginationNav" model="(Model.FacilityList, Model.Spec.AsRouteValues)" /></span>
         }
     </div>
 }
\ No newline at end of file
diff --git a/FMS/Pages/Facilities/Map.cshtml b/FMS/Pages/Facilities/Map.cshtml
index 053f026e..cc91438c 100644
--- a/FMS/Pages/Facilities/Map.cshtml
+++ b/FMS/Pages/Facilities/Map.cshtml
@@ -97,7 +97,7 @@
 
 @if (Model.ShowResults)
 {
-    <div class="border-top text-muted" id="SearchResults">
+    <div class="border-top text-muted bg-light-subtle" id="SearchResults">
         @if (Model.ShowNone)
         {
             <div class="container pt-3">
diff --git a/FMS/Pages/Facilities/Undelete.cshtml b/FMS/Pages/Facilities/Undelete.cshtml
index 5341e9a1..0ee90611 100644
--- a/FMS/Pages/Facilities/Undelete.cshtml
+++ b/FMS/Pages/Facilities/Undelete.cshtml
@@ -7,7 +7,7 @@
 
 <h1><em>Confirm</em> @ViewData["Title"]</h1>
 
-<div class="container">
+<div class="container p-3 rounded-3 bg-light-subtle">
     <p class="lead text-warning font-weight-medium">Are you sure you want to restore (undelete) this Facility?</p>
     <dl class="row">
         <dt class="col-sm-3">
diff --git a/FMS/Pages/Files/Details.cshtml b/FMS/Pages/Files/Details.cshtml
index cf070ba6..e72628f7 100644
--- a/FMS/Pages/Files/Details.cshtml
+++ b/FMS/Pages/Files/Details.cshtml
@@ -38,7 +38,7 @@
     @if (Model.FileDetail.Facilities != null && Model.FileDetail.Facilities.Count > 0)
     {
         <table class="table table-borderless" aria-label="List of facilities in this file">
-            <thead class="table-light">
+            <thead class="thead-light">
                 <tr>
                     <th scope="col">Facility</th>
                     <th scope="col">Name</th>
diff --git a/FMS/Pages/Files/Index.cshtml b/FMS/Pages/Files/Index.cshtml
index 64745717..247f6586 100644
--- a/FMS/Pages/Files/Index.cshtml
+++ b/FMS/Pages/Files/Index.cshtml
@@ -13,7 +13,7 @@
 
 <h1>@ViewData["Title"]</h1>
 
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="get" asp-fragment="SearchResults">
         <div class="mb-3 row">
             <div class="col-md-3">
@@ -39,7 +39,7 @@
 
     @if (Model.FileList.CurrentCount > 0)
     {
-        <table class="table" aria-label="File search results">
+        <table class="table bg-light-subtle" aria-label="File search results">
             <caption class="container border-top py-3">
                 <div class="row">
                     <div class="col-md"></div>
@@ -51,7 +51,7 @@
                     </div>
                 </div>
             </caption>
-            <thead class="table-light">
+            <thead class="thead-light">
                 <tr>
                     <th scope="col">File Label</th>
                     <th scope="col">Cabinets</th>
@@ -81,7 +81,7 @@
     }
     else
     {
-        <div class="container mt-2">
+        <div class="container mt-2 bg-light-subtle">
             <p class="lead text-info">No search results found.</p>
         </div>
     }
diff --git a/FMS/Pages/Maintenance/BudgetCode/Add.cshtml b/FMS/Pages/Maintenance/BudgetCode/Add.cshtml
index 01f6c159..24964fb7 100644
--- a/FMS/Pages/Maintenance/BudgetCode/Add.cshtml
+++ b/FMS/Pages/Maintenance/BudgetCode/Add.cshtml
@@ -10,7 +10,7 @@
     ViewData["Title"] = $"Add {MaintenanceOptions.BudgetCode}";
 }
 <h1>@ViewData["Title"]</h1>
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <div class="row mb-3">
diff --git a/FMS/Pages/Maintenance/BudgetCode/Edit.cshtml b/FMS/Pages/Maintenance/BudgetCode/Edit.cshtml
index 2ced9547..b428dc89 100644
--- a/FMS/Pages/Maintenance/BudgetCode/Edit.cshtml
+++ b/FMS/Pages/Maintenance/BudgetCode/Edit.cshtml
@@ -17,7 +17,7 @@
     }
 </h1>
 
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <input type="hidden" asp-for="BudgetCode.Active" />
diff --git a/FMS/Pages/Maintenance/BudgetCode/Index.cshtml b/FMS/Pages/Maintenance/BudgetCode/Index.cshtml
index 50a55069..2674d3d2 100644
--- a/FMS/Pages/Maintenance/BudgetCode/Index.cshtml
+++ b/FMS/Pages/Maintenance/BudgetCode/Index.cshtml
@@ -12,7 +12,7 @@
 
 <form method="post">
     <table class="table" aria-label="List of budget codes">
-        <thead class="table-light">
+        <thead class="thead-light">
             <tr>
                 <th scope="col">Code</th>
                 <th scope="col">Name</th>
@@ -24,7 +24,7 @@
         <tbody>
             @foreach (var item in Model.BudgetCodes)
             {
-                <tr class="@(!item.Active ? "table-secondary" : "")">
+                <tr class="@(!item.Active ? "table-warning" : "")">
                     <td class="text-nowrap">
                         @Html.DisplayFor(m => item.Code, "StringOrNone")
                         @Html.DisplayFor(m => item.Active, "BoolRemoved")
@@ -40,11 +40,11 @@
                         <a asp-page="Edit" asp-route-id="@item.Id" class="btn btn-outline-primary btn-sm">Edit</a>
                         @if (item.Active)
                         {
-                            <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning text-dark btn-sm">Remove from list</button>
+                            <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning btn-sm">Remove from list</button>
                         }
                         else
                         {
-                            <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning text-dark btn-sm">Restore to list</button>
+                            <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning btn-sm">Restore to list</button>
                         }
                     </td>
                 </tr>
diff --git a/FMS/Pages/Maintenance/ComplianceOfficer/Index.cshtml b/FMS/Pages/Maintenance/ComplianceOfficer/Index.cshtml
index f08d3009..ad909094 100644
--- a/FMS/Pages/Maintenance/ComplianceOfficer/Index.cshtml
+++ b/FMS/Pages/Maintenance/ComplianceOfficer/Index.cshtml
@@ -13,7 +13,7 @@
 <p>New users are added to the Compliance Officers list the first time they sign into FMS.</p>
 <form method="post">
     <table class="table" aria-label="List of compliance officers">
-        <thead class="table-light">
+        <thead class="thead-light">
         <tr>
             <th scope="col">Name</th>
             <th scope="col">Email</th>
@@ -32,11 +32,11 @@
                 <td class="text-nowrap">
                     @if (item.Active)
                     {
-                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning text-dark btn-sm">Remove from list</button>
+                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning btn-sm">Remove from list</button>
                     }
                     else
                     {
-                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning text-dark btn-sm">Restore to list</button>
+                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning btn-sm">Restore to list</button>
                     }
                 </td>
             </tr>
diff --git a/FMS/Pages/Maintenance/FacilityStatus/Add.cshtml b/FMS/Pages/Maintenance/FacilityStatus/Add.cshtml
index 01c1be74..7e6e3f2f 100644
--- a/FMS/Pages/Maintenance/FacilityStatus/Add.cshtml
+++ b/FMS/Pages/Maintenance/FacilityStatus/Add.cshtml
@@ -10,7 +10,7 @@
     ViewData["Title"] = $"Add {MaintenanceOptions.FacilityStatus}";
 }
 <h1>@ViewData["Title"]</h1>
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <div class="row">
diff --git a/FMS/Pages/Maintenance/FacilityStatus/Edit.cshtml b/FMS/Pages/Maintenance/FacilityStatus/Edit.cshtml
index 2eee60d7..a3c0afbc 100644
--- a/FMS/Pages/Maintenance/FacilityStatus/Edit.cshtml
+++ b/FMS/Pages/Maintenance/FacilityStatus/Edit.cshtml
@@ -17,7 +17,7 @@
     }
 </h1>
 
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <input type="hidden" asp-for="FacilityStatus.Active" />
diff --git a/FMS/Pages/Maintenance/FacilityStatus/Index.cshtml b/FMS/Pages/Maintenance/FacilityStatus/Index.cshtml
index 7203ad99..2b62c019 100644
--- a/FMS/Pages/Maintenance/FacilityStatus/Index.cshtml
+++ b/FMS/Pages/Maintenance/FacilityStatus/Index.cshtml
@@ -21,7 +21,7 @@
         <tbody>
         @foreach (var item in Model.FacilityStatuses)
         {
-            <tr class="@(!item.Active ? "table-secondary" : "")">
+            <tr class="@(!item.Active ? "table-warning" : "")">
                 <td class="text-nowrap">
                     @Html.DisplayFor(m => item.Status, "StringOrNone")
                     @Html.DisplayFor(m => item.Active, "BoolRemoved")
@@ -30,11 +30,11 @@
                     <a asp-page="Edit" asp-route-id="@item.Id" class="btn btn-outline-primary btn-sm">Edit</a>
                     @if (item.Active)
                     {
-                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning text-dark btn-sm">Remove from list</button>
+                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning btn-sm">Remove from list</button>
                     }
                     else
                     {
-                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning text-dark btn-sm">Restore to list</button>
+                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning btn-sm">Restore to list</button>
                     }
                 </td>
             </tr>
diff --git a/FMS/Pages/Maintenance/FacilityType/Add.cshtml b/FMS/Pages/Maintenance/FacilityType/Add.cshtml
index 53edf2fe..c9c52ec2 100644
--- a/FMS/Pages/Maintenance/FacilityType/Add.cshtml
+++ b/FMS/Pages/Maintenance/FacilityType/Add.cshtml
@@ -10,7 +10,7 @@
     ViewData["Title"] = $"Add {MaintenanceOptions.FacilityType}";
 }
 <h1>@ViewData["Title"]</h1>
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <div class="row mb-3">
diff --git a/FMS/Pages/Maintenance/FacilityType/Edit.cshtml b/FMS/Pages/Maintenance/FacilityType/Edit.cshtml
index e2f4373c..e733598b 100644
--- a/FMS/Pages/Maintenance/FacilityType/Edit.cshtml
+++ b/FMS/Pages/Maintenance/FacilityType/Edit.cshtml
@@ -17,7 +17,7 @@
     }
 </h1>
 
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <input type="hidden" asp-for="Id" />
diff --git a/FMS/Pages/Maintenance/FacilityType/Index.cshtml b/FMS/Pages/Maintenance/FacilityType/Index.cshtml
index d28b352d..52e3728b 100644
--- a/FMS/Pages/Maintenance/FacilityType/Index.cshtml
+++ b/FMS/Pages/Maintenance/FacilityType/Index.cshtml
@@ -12,35 +12,35 @@
 
 <form method="post">
     <table class="table" aria-label="List of facility types">
-        <thead class="table-light">
-        <tr>
-            <th scope="col">Code</th>
-            <th scope="col">Description</th>
-            <th scope="col">Actions</th>
-        </tr>
+        <thead class="thead-light">
+            <tr>
+                <th scope="col">Code</th>
+                <th scope="col">Description</th>
+                <th scope="col">Actions</th>
+            </tr>
         </thead>
         <tbody>
-        @foreach (var item in Model.FacilityTypes)
-        {
-            <tr class="@(!item.Active ? "table-secondary" : "")">
-                <td class="text-nowrap">
-                    @Html.DisplayFor(m => item.Name, "StringOrNone")
-                    @Html.DisplayFor(m => item.Active, "BoolRemoved")
-                </td>
-                <td>@Html.DisplayFor(m => item.Description, "StringOrNone")</td>
-                <td class="text-nowrap">
-                    <a asp-page="Edit" asp-route-id="@item.Id" class="btn btn-outline-primary btn-sm">Edit</a>
-                    @if (item.Active)
-                    {
-                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning text-dark btn-sm">Remove from list</button>
-                    }
-                    else
-                    {
-                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning text-dark btn-sm">Restore to list</button>
-                    }
-                </td>
-            </tr>
-        }
+            @foreach (var item in Model.FacilityTypes)
+            {
+                <tr class="@(!item.Active ? "table-secondary" : "")">
+                    <td class="text-nowrap">
+                        @Html.DisplayFor(m => item.Name, "StringOrNone")
+                        @Html.DisplayFor(m => item.Active, "BoolRemoved")
+                    </td>
+                    <td>@Html.DisplayFor(m => item.Description, "StringOrNone")</td>
+                    <td class="text-nowrap">
+                        <a asp-page="Edit" asp-route-id="@item.Id" class="btn btn-outline-primary btn-sm">Edit</a>
+                        @if (item.Active)
+                        {
+                            <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning btn-sm">Remove from list</button>
+                        }
+                        else
+                        {
+                            <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning btn-sm">Restore to list</button>
+                        }
+                    </td>
+                </tr>
+            }
         </tbody>
     </table>
 </form>
\ No newline at end of file
diff --git a/FMS/Pages/Maintenance/OrganizationalUnit/Add.cshtml b/FMS/Pages/Maintenance/OrganizationalUnit/Add.cshtml
index 10aed629..e18d272a 100644
--- a/FMS/Pages/Maintenance/OrganizationalUnit/Add.cshtml
+++ b/FMS/Pages/Maintenance/OrganizationalUnit/Add.cshtml
@@ -10,7 +10,7 @@
     ViewData["Title"] = $"Add {MaintenanceOptions.OrganizationalUnit}";
 }
 <h1>@ViewData["Title"]</h1>
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <div class="row mb-3">
diff --git a/FMS/Pages/Maintenance/OrganizationalUnit/Edit.cshtml b/FMS/Pages/Maintenance/OrganizationalUnit/Edit.cshtml
index 5e116e6f..8cd8c54a 100644
--- a/FMS/Pages/Maintenance/OrganizationalUnit/Edit.cshtml
+++ b/FMS/Pages/Maintenance/OrganizationalUnit/Edit.cshtml
@@ -17,7 +17,7 @@
     }
 </h1>
 
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post">
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert"></div>
         <input type="hidden" asp-for="OrganizationalUnit.Active" />
diff --git a/FMS/Pages/Maintenance/OrganizationalUnit/Index.cshtml b/FMS/Pages/Maintenance/OrganizationalUnit/Index.cshtml
index 8f5f2b65..83b607e5 100644
--- a/FMS/Pages/Maintenance/OrganizationalUnit/Index.cshtml
+++ b/FMS/Pages/Maintenance/OrganizationalUnit/Index.cshtml
@@ -12,33 +12,33 @@
 
 <form method="post">
     <table class="table" aria-label="List of organizational units">
-        <thead class="table-light">
-        <tr>
-            <th scope="col">Name</th>
-            <th scope="col">Actions</th>
-        </tr>
+        <thead class="thead-light">
+            <tr>
+                <th scope="col">Name</th>
+                <th scope="col">Actions</th>
+            </tr>
         </thead>
         <tbody>
-        @foreach (var item in Model.OrganizationalUnits)
-        {
-            <tr class="@(!item.Active ? "table-secondary" : "")">
-                <td class="text-nowrap">
-                    @Html.DisplayFor(m => item.Name, "StringOrNone")
-                    @Html.DisplayFor(m => item.Active, "BoolRemoved")
-                </td>
-                <td class="text-nowrap">
-                    <a asp-page="Edit" asp-route-id="@item.Id" class="btn btn-outline-primary btn-sm">Edit</a>
-                    @if (item.Active)
-                    {
-                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning text-dark btn-sm">Remove from list</button>
-                    }
-                    else
-                    {
-                        <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning text-dark btn-sm">Restore to list</button>
-                    }
-                </td>
-            </tr>
-        }
+            @foreach (var item in Model.OrganizationalUnits)
+            {
+                <tr class="@(!item.Active ? "table-warning" : "")">
+                    <td class="text-nowrap">
+                        @Html.DisplayFor(m => item.Name, "StringOrNone")
+                        @Html.DisplayFor(m => item.Active, "BoolRemoved")
+                    </td>
+                    <td class="text-nowrap">
+                        <a asp-page="Edit" asp-route-id="@item.Id" class="btn btn-outline-primary btn-sm">Edit</a>
+                        @if (item.Active)
+                        {
+                            <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning btn-sm">Remove from list</button>
+                        }
+                        else
+                        {
+                            <button type="submit" name="itemId" value="@item.Id" class="btn btn-outline-warning btn-sm">Restore to list</button>
+                        }
+                    </td>
+                </tr>
+            }
         </tbody>
     </table>
 </form>
\ No newline at end of file
diff --git a/FMS/Pages/Shared/DisplayTemplates/BoolRemoved.cshtml b/FMS/Pages/Shared/DisplayTemplates/BoolRemoved.cshtml
index f89177cf..790f615a 100644
--- a/FMS/Pages/Shared/DisplayTemplates/BoolRemoved.cshtml
+++ b/FMS/Pages/Shared/DisplayTemplates/BoolRemoved.cshtml
@@ -1,5 +1,5 @@
 @model bool
 @if (!Model)
 {
-    <span class="text-muted">(Removed)</span>
+    <span class="text-info-emphasis">(Removed)</span>
 }
\ No newline at end of file
diff --git a/FMS/Pages/Shared/_Layout.cshtml b/FMS/Pages/Shared/_Layout.cshtml
index dab3b27d..1b530984 100644
--- a/FMS/Pages/Shared/_Layout.cshtml
+++ b/FMS/Pages/Shared/_Layout.cshtml
@@ -22,7 +22,7 @@
     <header role="banner">
         <div class="container h3 my-2">
             <img src="~/images/epd-icon.svg" alt="Georgia EPD" class="img-logo" />
-            <a href="/" aria-label="Home" class="link-dark link-offset-1 link-underline-opacity-0 link-underline-opacity-100-hover">File Management System</a>
+            <a href="/" aria-label="Home" class="nav-link d-inline-block">File Management System</a>
         </div>
         @if (User.Identity?.IsAuthenticated ?? false)
         {
@@ -30,13 +30,13 @@
         }
     </header>
 
-    <main id="main-content" role="main" class="pb-3">
+    <main id="main-content" role="main" class="pb-0">
         <div class="container">
             @RenderBody()
         </div>
     </main>
 
-    <footer class="footer pt-3">
+    <footer class="footer py-0">
         <div class="container text-brand">
             <a href="#">↑ Return to top</a>
         </div>
diff --git a/FMS/Pages/Shared/_MenuPartial.cshtml b/FMS/Pages/Shared/_MenuPartial.cshtml
index ebe41b43..cc488208 100644
--- a/FMS/Pages/Shared/_MenuPartial.cshtml
+++ b/FMS/Pages/Shared/_MenuPartial.cshtml
@@ -37,14 +37,13 @@
                 </li>
             </ul>
             <ul class="navbar-nav d-flex">
-                <li class="nav-item dropdown">
-                    @*  text-dark *@
+                <li class="nav-item dropdown text-body">
                     <button class="nav-link dropdown-toggle text-white" id="accountDropdownMenuLink" role="button" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="View account menu">
                         Account
                     </button>
                     <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="accountDropdownMenuLink">
                         <li>
-                            <a class="dropdown-item" asp-page="/Account/Index">Your profile</a>
+                            <a class="dropdown-item text-body" asp-page="/Account/Index">Your profile</a>
                         </li>
                         <li>
                             <hr class="dropdown-divider">
@@ -52,7 +51,6 @@
                         <li>
                             <form class="form-inline dropdown-item p-0" asp-page="/Account/Logout" method="post">
                                 <button type="submit" class="dropdown-item bg-danger  px-4 py-2">Sign out</button>
-                                @* text-light *@
                             </form>
                         </li>
                     </ul>
diff --git a/FMS/Pages/Users/Edit.cshtml b/FMS/Pages/Users/Edit.cshtml
index eae78180..ca2b7ec3 100644
--- a/FMS/Pages/Users/Edit.cshtml
+++ b/FMS/Pages/Users/Edit.cshtml
@@ -7,7 +7,7 @@
 
 <h1>@ViewData["Title"]</h1>
 
-<div class="container bg-light-subtle py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="post">
         <p>Roles for: <strong>@Model.DisplayName</strong> (@Model.Email)</p>
         <div asp-validation-summary="ModelOnly" class="alert alert-danger" role="alert">
diff --git a/FMS/Pages/Users/Index.cshtml b/FMS/Pages/Users/Index.cshtml
index 6c7db6fe..8000fcfc 100644
--- a/FMS/Pages/Users/Index.cshtml
+++ b/FMS/Pages/Users/Index.cshtml
@@ -11,7 +11,7 @@
 
 <h1>FMS @ViewData["Title"]</h1>
 
-<div class="container bg-light py-3">
+<div class="container bg-light-subtle py-3 rounded-3">
     <form method="get" asp-fragment="SearchResults">
         <div class="row mb-3">
             <div class="col">
@@ -43,7 +43,7 @@
     @if (Model.SearchResults is { Count: > 0 })
     {
         <table class="table table-borderless" aria-label="User information">
-            <thead class="table-light">
+            <thead class="thead-light">
                 <tr>
                     <th scope="col">@Html.DisplayNameFor(m => m.Name)</th>
                     <th scope="col">@Html.DisplayNameFor(m => m.Email)</th>
diff --git a/FMS/wwwroot/css/site.css b/FMS/wwwroot/css/site.css
index 98887016..17f5db65 100644
--- a/FMS/wwwroot/css/site.css
+++ b/FMS/wwwroot/css/site.css
@@ -287,4 +287,10 @@ a[target]::after {
     .banner-test-site::after {
         content: "—Not for public distribution";
     }
+}
+/* Bootstrap Icons
+-------------------------------------------------- */
+.invert-svg-color {
+    -webkit-filter: invert(100%); /* safari 6.0 - 9.0 */
+    filter: invert(100%);
 }
\ No newline at end of file