diff --git a/docker-lock.json b/docker-lock.json
index edf3d9edc..47c41ed28 100644
--- a/docker-lock.json
+++ b/docker-lock.json
@@ -4,12 +4,12 @@
 			{
 				"name": "mcr.microsoft.com/dotnet/sdk",
 				"tag": "8.0",
-				"digest": "ff705b99a06144190e2638f8ede64a753915df5ea27fff55f58d0eb5f7054b0b"
+				"digest": "cab0284cce7bc26d41055d0ac5859a69a8b75d9a201cd226999f4f00cc983f13"
 			},
 			{
 				"name": "mcr.microsoft.com/dotnet/aspnet",
 				"tag": "8.0",
-				"digest": "b3cdb99fb356091b6395f3444d355da8ae5d63572ba777bed95b65848d6e02be"
+				"digest": "3ded9ccf06f222ec934311be4f9facda83d144331c028340e3a694733cad7d4b"
 			}
 		]
 	}
diff --git a/src/GRA.Controllers/GRA.Controllers.csproj b/src/GRA.Controllers/GRA.Controllers.csproj
index c3b800f60..eb7c65f87 100644
--- a/src/GRA.Controllers/GRA.Controllers.csproj
+++ b/src/GRA.Controllers/GRA.Controllers.csproj
@@ -43,7 +43,7 @@
     <PackageReference Include="AutoMapper" Version="13.0.1" />
     <PackageReference Include="CommonMark.NET" Version="0.15.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Serilog" Version="4.0.2" />
+    <PackageReference Include="Serilog" Version="4.1.0" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
diff --git a/src/GRA.Domain.Service/GRA.Domain.Service.csproj b/src/GRA.Domain.Service/GRA.Domain.Service.csproj
index 1dafcfc89..66d17a9ea 100644
--- a/src/GRA.Domain.Service/GRA.Domain.Service.csproj
+++ b/src/GRA.Domain.Service/GRA.Domain.Service.csproj
@@ -42,7 +42,7 @@
     <PackageReference Include="ExcelDataReader" Version="3.7.0" />
     <PackageReference Include="MailKit" Version="4.8.0" />
     <PackageReference Include="MimeKit" Version="4.8.0" />
-    <PackageReference Include="Serilog" Version="4.0.2" />
+    <PackageReference Include="Serilog" Version="4.1.0" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
     <PackageReference Include="Stubble.Core" Version="1.10.8" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Avatars/BundleDetail.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Avatars/BundleDetail.cshtml
index 26f6ab86d..bf2110ebb 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Avatars/BundleDetail.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Avatars/BundleDetail.cshtml
@@ -10,7 +10,7 @@
 
     @if (Model.TriggersAwardingBundle?.Count > 0)
     {
-        <div class="list-group" style="padding-top:10px;" id="accordionTriggers" role="tablist" aria-multiselectable="true">
+        <div class="list-group pt-4" id="accordionTriggers" role="tablist" aria-multiselectable="true">
             <div class="card">
                 <div class="card-header" role="tab" id="headingTriggers">
                     <h4 class="card-title">
@@ -38,14 +38,14 @@
 
     @if (Model.Bundle?.HasBeenAwarded == true)
     {
-        <div class="row" style="padding: 10px 0;">
+        <div class="row pt-4">
             <div class="col-12">
                 <div style="font-size:large">This bundle has been awarded to a participant and can no longer be edited.</div>
             </div>
         </div>
     }
 
-    <div class="row" style="padding: 10px 0;">
+    <div class="row py-2">
         <div class="col-12">
             <label asp-for="Bundle.Name" class="col-form-label"></label>
             <input asp-for="Bundle.Name" class="form-control" disabled="@(Model.Bundle?.HasBeenAwarded == true ? "disabled" : null)" />
@@ -56,7 +56,7 @@
     <div class="row row-spacing">
         <div class="col-12">
             <label asp-for="Bundle.CanBeUnlocked" class="col-form-label">Bundle Type</label>
-            <select asp-for="Bundle.CanBeUnlocked" class="form-control" disabled="@(Model.Action == "Edit" ? "disabled" : null)">
+            <select asp-for="Bundle.CanBeUnlocked" class="form-select" disabled="@(Model.Action == "Edit" ? "disabled" : null)">
                 <option value="True">Unlockable</option>
                 <option value="False">Default</option>
             </select>
@@ -136,7 +136,7 @@
         </div>
     </div>
 
-    <div class="mb-3">
+    <div class="my-4">
         <a asp-action="Bundles" class="btn btn-outline-secondary">Return to List</a>
         @if (Model.Bundle?.HasBeenAwarded != true)
         {
@@ -175,7 +175,7 @@
                                         <label asp-for="Layers" class="col-form-label">Layer</label>
                                         <select id="layerId"
                                                 asp-items="Model.Layers"
-                                                class="form-control">
+                                                class="form-select">
                                             <option value="">All Layers</option>
                                         </select>
                                     </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Avatars/Bundles.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Avatars/Bundles.cshtml
index d34cf9308..66c60a4f7 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Avatars/Bundles.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Avatars/Bundles.cshtml
@@ -22,13 +22,13 @@
     </div>
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         <a asp-action="BundleCreate" class="btn btn-outline-primary">Create a new bundle</a>
     </div>
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         @if (Model.Bundles.Count() == 0)
         {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Avatars/Index.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Avatars/Index.cshtml
index 65eaa1880..b27c81cef 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Avatars/Index.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Avatars/Index.cshtml
@@ -4,7 +4,7 @@
     var invalid = Microsoft.AspNetCore.Mvc.ModelBinding.ModelValidationState.Invalid;
 }
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         @if (Model.Layers.Count() == 0)
         {
@@ -16,7 +16,7 @@
             {
                 <form asp-action="@nameof(AvatarsController.SetupAvatarZip)"
                       method="post"
-                      style="padding: 1em 0;">
+                      class="py-3">
                     <button type="submit" class="btn btn-outline-primary btn-spinner" button-spinner>
                         Import avatars.zip
                     </button>
@@ -26,7 +26,7 @@
             {
                 <form asp-action="@nameof(AvatarsController.SetupDefaultAvatars)"
                       method="post"
-                      style="padding: 1em 0;">
+                      class="py-3">
                     <button type="submit" class="btn btn-outline-primary btn-spinner" button-spinner>
                         Add default avatars
                     </button>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Avatars/Layer.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Avatars/Layer.cshtml
index 557baa54a..563e76d70 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Avatars/Layer.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Avatars/Layer.cshtml
@@ -1,12 +1,35 @@
 @model GRA.Controllers.ViewModel.MissionControl.Avatar.ItemsListViewModel
 
 <div class="row">
-    <div class="col-12">
-        <ul class="nav nav-pills" style="padding: 10px 0;">
-            <li class="@(!Model.Available && !Model.Unavailable && !Model.Unlockable ? "active" : null)"><a asp-route-search="@Model.Search">All</a></li>
-            <li class="@(Model.Available ? "active" : null)"><a asp-route-search="@Model.Search" asp-route-available="True">Available</a></li>
-            <li class="@(Model.Unavailable ? "active" : null)"><a asp-route-search="@Model.Search" asp-route-unavailable="True">Unavailable</a></li>
-            <li class="@(Model.Unlockable ? "active" : null)"><a asp-route-search="@Model.Search" asp-route-unlockable="True">Unlockable</a></li>
+    <div class="col-12 my-4">
+        <ul class="nav nav-pills flex-column flex-sm-row">
+            <li class="nav-item">
+                <a asp-route-search="@Model.Search" 
+                    class="nav-link @(!Model.Available && !Model.Unavailable && !Model.Unlockable ? "active" : "")">
+                    All
+                </a>
+             </li>
+            <li class="nav-item">
+                <a asp-route-search="@Model.Search" 
+                    asp-route-available="True"
+                    class="nav-link @(Model.Available ? "active" : "")">
+                    Available
+                </a>
+            </li>
+            <li class="nav-item">
+                <a asp-route-search="@Model.Search" 
+                    asp-route-unavailable="True"
+                    class="nav-link  @(Model.Unavailable ? "active" : "")">
+                    Unavailable
+                </a>
+            </li>
+            <li class="nav-item">
+                <a asp-route-search="@Model.Search" 
+                    asp-route-unlockable="True"
+                    class="nav-link  @(Model.Unlockable ? "active" : "")">
+                    Unlockable
+                </a>
+            </li>
         </ul>
     </div>
 </div>
@@ -15,11 +38,11 @@
     <input asp-for="Available" type="hidden" />
     <input asp-for="Unavailable" type="hidden" />
     <input asp-for="Unlockable" type="hidden" />
-    <div class="row row-spacing" style="padding-top: 10px;">
+    <div class="row row-spacing">
         <div class="col-8">
             <input name="Search" value="@Model.Search" class="form-control" />
         </div>
-        <div class="col-4">
+        <div class="col-4 mb-3">
             <input type="submit" value="Search" class="btn btn-outline-primary" style="margin-right: 8px;" />
             <a asp-action="Layer" asp-route-id="@Model.Id" class="btn btn-outline-secondary">Clear</a>
         </div>
@@ -27,7 +50,7 @@
 </form>
 
 
-<div class="row" style="padding: 10px 0">
+<div class="row mb-2">
     <div class="col-12">
         <div class="row">
             <form asp-controller="Avatars" method="post" role="form">
@@ -39,29 +62,42 @@
                 <input name="PaginateModel.CurrentPage" value="@Model.PaginateModel.CurrentPage" type="hidden" />
                 @foreach (var item in Model.Items)
                 {
-                    <div class="col-4 col-sm-3 col-md-2" style="padding-top:10px; padding-bottom:20px; text-align:center;">
-                        <img src="~/@item.Thumbnail" class="img-fluid img-thumbnail" />
-                        <div style="height: 40px;">
+                    <div class="col-sm-3 mb-4" style="text-align: center;">
+                        <img src="~/@item.Thumbnail"
+                            class="img-fluid img-thumbnail" />
+                        <div class="mb-4">
                             @item.Name
                         </div>
-                        <button asp-action="@nameof(AvatarsController.DecreaseItemSort)" name="ItemId" value="@item.Id" class="btn btn-sm btn-outline-secondary" style="margin-right: 6px;" disabled="@(Model.PaginateModel.FirstPage == null && item == Model.Items.First() ? "disabled" : null)">
-                            <span class="fas fa-arrow-left fa-fw"></span>
+                        <div class="btn-toolbar justify-content-center">
+                        <button 
+                            asp-action="@nameof(AvatarsController.DecreaseItemSort)" 
+                            name="ItemId" value="@item.Id" 
+                            class="btn btn-sm btn-outline-secondary me-2" 
+                            disabled="@(Model.PaginateModel.FirstPage == null && item == Model.Items.First() ? "disabled" : null)">
+                            <span
+                                class="fas fa-arrow-left fa-fw">
+                            </span>
                         </button>
                         @if (item.Unlockable)
                         {
-                            <button asp-action="@nameof(AvatarsController.SetItemAvailable)" name="ItemId" value="@item.Id" class="btn btn-sm btn-outline-primary" style="margin: 0 3px;">
-                                <span class="fas fa-lock"></span>
+                            <button 
+                                asp-action="@nameof(AvatarsController.SetItemAvailable)" 
+                                name="ItemId" 
+                                value="@item.Id" 
+                                class="btn btn-sm btn-outline-primary me-2">
+                                <span 
+                                    class="fas fa-lock">
+                                </span>
                             </button>
                         }
                         else
                         {
-                            <button asp-action="@nameof(AvatarsController.SetItemUnlockable)" name="ItemId" value="@item.Id" class="btn btn-sm btn-outline-success" style="margin: 0 3px;">
+                            <button asp-action="@nameof(AvatarsController.SetItemUnlockable)" name="ItemId" value="@item.Id" class="btn btn-sm btn-outline-success me-2">
                                 <span class="fas fa-unlock-alt fa-fw"></span>
                             </button>
                         }
                         <button type="button"
                                 class="btn btn-outline-danger btn-sm"
-                                style="margin: 0 3px;"
                                 data-bs-toggle="modal"
                                 data-bs-target="#deleteModal"
                                 data-id="@item.Id"
@@ -71,6 +107,7 @@
                         <button asp-action="@nameof(AvatarsController.IncreaseItemSort)" name="ItemId" value="@item.Id" class="btn btn-sm btn-outline-secondary" style="margin-left: 6px;" disabled="@(Model.PaginateModel.LastPage == null && item == Model.Items.Last() ? "disabled" : null)">
                             <span class="fas fa-arrow-right fa-fw"></span>
                         </button>
+                        </div>
                     </div>
 
                 }
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Carousels/Index.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Carousels/Index.cshtml
index 60ed394fd..6079f9866 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Carousels/Index.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Carousels/Index.cshtml
@@ -22,13 +22,13 @@
     </div>
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row mb-4">
     <div class="col-12">
         <a asp-action="Add" class="btn btn-outline-primary">Create a new dashboard carousel</a>
     </div>
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row">
     <div class="col-12">
         @if (Model.Carousels.Count() == 0)
         {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Categories/Index.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Categories/Index.cshtml
index 3901fda71..b5230a676 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Categories/Index.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Categories/Index.cshtml
@@ -1,7 +1,7 @@
 @model GRA.Controllers.ViewModel.MissionControl.Categories.CategoryListViewModel
 
 <form asp-controller="Categories" asp-action="Index" method="get" role="form">
-    <div class="row row-spacing" style="padding-top: 10px;">
+    <div class="row row-spacing my-4">
         <div class="col-8">
             <input asp-for="Search" class="form-control" />
         </div>
@@ -12,7 +12,7 @@
     </div>
 </form>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row mb-4">
     <div class="col-12">
         <a class="btn btn-outline-primary"
            data-bs-toggle="modal"
@@ -20,7 +20,7 @@
     </div>
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row">
     <div class="col-12">
         @if (Model.Categories.Count() == 0)
         {
@@ -52,7 +52,7 @@
                                     <span class="label" style="background-color:@category.Color">@category.Name</span>
                                 </td>
                                 <td>
-                                    <div class="btn-group-sm">
+                                    <div class="btn-toolbar">
                                         <button type="button"
                                                 class="btn btn-outline-primary btn-sm"
                                                 data-bs-toggle="modal"
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Challenges/Create.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Challenges/Create.cshtml
index 16be45d4e..30f1a0438 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Challenges/Create.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Challenges/Create.cshtml
@@ -46,7 +46,7 @@
             <select asp-for="Challenge.CategoryIds"
                     asp-items="Model.CategoryList"
                     autocomplete="off"
-                    class="form-control"
+                    class="form-select"
                     disabled="@(!Model.IgnorePointLimits && !string.IsNullOrEmpty(Model.MaxPointsWarningMessage) ? "disabled" : null)"
                     multiple="multiple"
                     size="1"></select>
@@ -66,7 +66,7 @@
             <label asp-for="Challenge.LimitToSystemId" class="col-form-label"></label>
             <select asp-for="Challenge.LimitToSystemId"
                     asp-items="Model.SystemList"
-                    class="form-control">
+                    class="form-select">
                 <option value="">No</option>
             </select>
             <span asp-validation-for="Challenge.LimitToSystemId" class="text-danger"></span>
@@ -78,7 +78,7 @@
             <label asp-for="Challenge.LimitToBranchId" class="col-form-label"></label>
             <select asp-for="Challenge.LimitToBranchId"
                     asp-items="Model.BranchList"
-                    class="form-control">
+                    class="form-select">
                 <option value="">No</option>
             </select>
             <span asp-validation-for="Challenge.LimitToBranchId" class="text-danger"></span>
@@ -90,7 +90,7 @@
             <label asp-for="Challenge.AssociatedProgramId" class="col-form-label"></label>
             <select asp-for="Challenge.AssociatedProgramId"
                     asp-items="Model.ProgramList"
-                    class="form-control">
+                    class="form-select">
                 <option value="">No</option>
             </select>
             <span asp-validation-for="Challenge.AssociatedProgramId" class="text-danger"></span>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Challenges/Edit.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Challenges/Edit.cshtml
index e4a257ec6..125539247 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Challenges/Edit.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Challenges/Edit.cshtml
@@ -636,7 +636,7 @@
             <select asp-for="Challenge.CategoryIds"
                     asp-items="Model.CategoryList"
                     autocomplete="off"
-                    class="form-control"
+                    class="form-select"
                     disabled="@(!Model.IgnorePointLimits && !string.IsNullOrEmpty(Model.MaxPointsWarningMessage) ? "disabled" : null)"
                     multiple="multiple"
                     size="1"></select>
@@ -656,7 +656,7 @@
             <label asp-for="Challenge.LimitToSystemId" class="col-form-label"></label>
             <select asp-for="Challenge.LimitToSystemId"
                     asp-items="Model.SystemList"
-                    class="form-control"
+                    class="form-select"
                     disabled="@(!Model.IgnorePointLimits && !string.IsNullOrEmpty(Model.MaxPointsWarningMessage) ? "disabled" : null)">
                 <option value="">No</option>
             </select>
@@ -669,7 +669,7 @@
             <label asp-for="Challenge.LimitToBranchId" class="col-form-label"></label>
             <select asp-for="Challenge.LimitToBranchId"
                     asp-items="Model.BranchList"
-                    class="form-control"
+                    class="form-select"
                     disabled="@(!Model.IgnorePointLimits && !string.IsNullOrEmpty(Model.MaxPointsWarningMessage) ? "disabled" : null)">
                 <option value="">No</option>
             </select>
@@ -682,7 +682,7 @@
             <label asp-for="Challenge.AssociatedProgramId" class="col-form-label"></label>
             <select asp-for="Challenge.AssociatedProgramId"
                     asp-items="Model.ProgramList"
-                    class="form-control"
+                    class="form-select"
                     disabled="@(!Model.IgnorePointLimits && !string.IsNullOrEmpty(Model.MaxPointsWarningMessage) ? "disabled" : null)">
                 <option value="">No</option>
             </select>
@@ -960,7 +960,7 @@
          role="dialog"
          aria-labelledby="badgeModalLabel">
         <div class="modal-content">
-            <div class="modal-body" style="padding: 30px;">
+            <div class="modal-body py-6">
                 <span class="close frame-close fa-stack fa-lg gra-close-stack gra-close-stack-absolute"
                       data-bs-dismiss="modal"
                       alt="Close dialog."
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Challenges/FeaturedDetails.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Challenges/FeaturedDetails.cshtml
index 7253e4bdb..17ec5421e 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Challenges/FeaturedDetails.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Challenges/FeaturedDetails.cshtml
@@ -20,7 +20,7 @@
             </div>
             <div class="mb-3">
                 <label asp-for="FeaturedGroup.ChallengeGroupId" class="col-form-label"></label>
-                <select asp-for="FeaturedGroup.ChallengeGroupId" asp-items="Model.ChallengeGroupList" class="form-control">
+                <select asp-for="FeaturedGroup.ChallengeGroupId" asp-items="Model.ChallengeGroupList" class="form-select">
                     <option></option>
                 </select>
                 <span asp-validation-for="FeaturedGroup.ChallengeGroupId" class="text-danger"></span>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Challenges/Index.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Challenges/Index.cshtml
index 72fcd5d3c..9203e42f5 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Challenges/Index.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Challenges/Index.cshtml
@@ -159,7 +159,7 @@
                 <select asp-for="CategoryIds"
                         asp-items="Model.CategoryList"
                         autocomplete="off"
-                        class="form-control"
+                        class="form-select"
                         multiple="multiple"
                         size="1"></select>
             </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/DailyTips/Index.cshtml b/src/GRA.Web/Areas/MissionControl/Views/DailyTips/Index.cshtml
index ca71c68a8..84e8e8cea 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/DailyTips/Index.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/DailyTips/Index.cshtml
@@ -2,7 +2,7 @@
 
 @using GRA.Controllers.ViewModel.MissionControl.DailyTips
 
-<div class="row" style="padding-top: 2rem; padding-bottom: 2rem;">
+<div class="row py-4">
     <div class="col-12">
         <a class="btn btn-outline-success"
            asp-action="@nameof(GRA.Controllers.MissionControl.DailyTipsController.Upload)">
diff --git a/src/GRA.Web/Areas/MissionControl/Views/DailyTips/Upload.cshtml b/src/GRA.Web/Areas/MissionControl/Views/DailyTips/Upload.cshtml
index c003cf6e5..057c93a7a 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/DailyTips/Upload.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/DailyTips/Upload.cshtml
@@ -61,7 +61,7 @@
             <div class="mb-3">
                 <label asp-for="IsLarge" class="col-form-label"></label>*
                 <description gra-description-for="IsLarge"></description>
-                <select asp-for="IsLarge" class="form-control">
+                <select asp-for="IsLarge" class="form-select">
                     <option value="True">Yes</option>
                     <option value="False">No</option>
                 </select>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Dashboard/Detail.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Dashboard/Detail.cshtml
index 725674f03..bf52dd90b 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Dashboard/Detail.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Dashboard/Detail.cshtml
@@ -6,7 +6,7 @@
 
 @if (Model.Action == "Edit")
 {
-    <a asp-action="Preview" asp-route-id="@Model.DashboardContent.Id" class="btn btn-secondary" style="margin:10px 0;"> Full Preview</a>
+    <a asp-action="Preview" asp-route-id="@Model.DashboardContent.Id" class="btn btn-secondary my-4"> Full Preview</a>
 }
 
 <form asp-controller="Dashboard" asp-action="@Model.Action" method="post" role="form">
@@ -19,7 +19,7 @@
     <div class="row row-spacing">
         <div class="col-12">
             <label asp-for="DashboardContent.StartTime" class="col-form-label"></label>
-            <div class="mb-3 date" id="pickerStart">
+            <div class="date" id="pickerStart">
                 <input asp-for="DashboardContent.StartTime" type="datetime-local" class="form-control"/>
             </div>
             <span asp-validation-for="DashboardContent.StartTime" class="text-danger"></span>
@@ -27,7 +27,7 @@
     </div>
 
     <div class="row row-spacing">
-        <div class="col-12">
+        <div class="col-12 mb-2">
             <label asp-for="DashboardContent.Content" class="col-form-label"></label>
             <div id="wmd-button-bar"></div>
             <textarea asp-for="DashboardContent.Content" id="wmd-input" class="form-control wmd-input"> </textarea>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Dashboard/Index.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Dashboard/Index.cshtml
index b8b304f4f..ed63cd71c 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Dashboard/Index.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Dashboard/Index.cshtml
@@ -2,7 +2,7 @@
 
 <div class="row">
     <div class="col-12">
-        <ul class="nav nav-pills" style="padding: 10px 0;">
+        <ul class="nav nav-pills my-4">
             <li class="nav-item">
                 <a ActiveBy routeKey="Archived" 
                 value=",false"
@@ -22,13 +22,13 @@
     </div>
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row mb-4">
     <div class="col-12">
         <a asp-controller="Dashboard" asp-action="Create" class="btn btn-outline-primary">Add Dashboard Content</a>
     </div>
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row">
     <div class="col-12">
         @if (Model.DashboardContents.Count() == 0)
         {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Dashboard/Preview.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Dashboard/Preview.cshtml
index ac051d0d6..eea0ffb86 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Dashboard/Preview.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Dashboard/Preview.cshtml
@@ -1,6 +1,6 @@
 @model GRA.Domain.Model.DashboardContent
 
-<a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-outline-secondary" style="margin-top:10px;">Return to Editor</a>
+<a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-outline-secondary my-4">Return to Editor</a>
 
 <hr />
 
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Downloads/Index.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Downloads/Index.cshtml
index b5a4d7e1d..f1bd386b8 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Downloads/Index.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Downloads/Index.cshtml
@@ -1,53 +1,56 @@
 @model GRA.Controllers.ViewModel.MissionControl.Downloads.IndexViewModel
 
-<h3>Download ZIP file of Badge Images</h3>
-<div class="row" style="padding: 10px 0;">
-    <div class="col-12 col-md-8 offset-md-2">
-        @if (Model.SystemBadgeCount.Count() == 0)
-        {
-            <div class="alert alert-warning">No Systems</div>
-        }
-        else
-        {
-            <div>
-                <table class="table table-sm table-bordered table-striped">
-                    <thead>
-                        <tr>
-                            <th>System Name</th>
-                            <th>Number of Badges</th>
-                            <th>Download ZIP</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach (var system in Model.SystemBadgeCount.Keys.OrderBy(_ => _.Name))
-                        {
+<div class="mt-3" style="text-align: center;">
+    <h3>Download ZIP file of Badge Images</h3>
+    <div class="row my-2">
+        <div class="col-12 col-md-8 offset-md-2">
+            @if (Model.SystemBadgeCount.Count() == 0)
+            {
+                <div class="alert alert-warning">No Systems</div>
+            }
+            else
+            {
+                <div>
+                    <table class="table table-sm table-bordered table-striped">
+                        <thead>
                             <tr>
-                                <td>
-                                    @system.Name
-                                </td>
-                                <td>
-                                    @Model.SystemBadgeCount[system]
-                                </td>
-                                <td class="gra-mc-icon">
-                                    @if (Model.SystemBadgeCount[system] > 0)
-                                    {
-                                        <a title="Download ZIP"
-                                           class="btn btn-outline-info btn-sm"
-                               asp-action="@nameof(DownloadsController.GetBadgeZipForSystem)"
-                               asp-route-id="@system.Id">
-                                            <span class="fas fa-file-download" aria-hidden="true"></span>
-                                        </a>
-                                    }
-                                    else
-                                    {
-                                        @:&nbsp;
-                                    }
-                                </td>
+                                <th>System Name</th>
+                                <th>Number of Badges</th>
+                                <th>Download ZIP</th>
                             </tr>
-                        }
-                    </tbody>
-                </table>
-            </div>
-        }
+                        </thead>
+                        <tbody>
+                            @foreach (var system in Model.SystemBadgeCount.Keys.OrderBy(_ => _.Name))
+                            {
+                                <tr>
+                                    <td>
+                                        @system.Name
+                                    </td>
+                                    <td>
+                                        @Model.SystemBadgeCount[system]
+                                    </td>
+                                    <td class="gra-mc-icon">
+                                        @if (Model.SystemBadgeCount[system] > 0)
+                                        {
+                                            <a title="Download ZIP"
+                                               class="btn btn-outline-info btn-sm"
+                                               asp-action="@nameof(DownloadsController.GetBadgeZipForSystem)"
+                                               asp-route-id="@system.Id">
+                                                <span class="fas fa-file-download" aria-hidden="true"></span>
+                                            </a>
+                                        }
+                                        else
+                                        {
+                                            @:&nbsp;
+                                        }
+                                    </td>
+                                </tr>
+                            }
+                        </tbody>
+                    </table>
+                </div>
+            }
+        </div>
     </div>
 </div>
+
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Drawing/Criteria.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Drawing/Criteria.cshtml
index 613263c26..8c390bfb1 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Drawing/Criteria.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Drawing/Criteria.cshtml
@@ -1,7 +1,7 @@
 @model GRA.Controllers.ViewModel.MissionControl.Drawing.CriterionListViewModel
 
-<div class="row" style="padding: 10px 0;">
-    <div class="col-12">
+<div class="row">
+    <div class="col-12 mt-4 mb-1">
         <a asp-action="Index" class="btn btn-outline-secondary">Drawings</a>
         <a asp-action="CriteriaCreate" class="btn btn-outline-primary">Create Criteria</a>
     </div>
@@ -9,7 +9,7 @@
 
 <div class="row">
     <div class="col-12 mb-2">
-        <ul class="nav nav-pills flex-column flex-sm-row">
+        <ul class="nav nav-pills flex-column flex-sm-row my-4">
             <li class="nav-item">
                 <a asp-route-Search="@Model.Search" asp-route-ProgramId="@Model.ProgramId" class="nav-link @(Model.ActiveNav == "All" ? "active" : "")">All</a>
             </li>
@@ -41,7 +41,7 @@
 </div>
 
 <div class="row row-spacing">
-    <div class="col-12">
+    <div class="col-12 mb-2">
         <span class="dropdown-label">Limited to Program:</span>
         <ul class="nav" style="display: inline-table;">
             <li>
@@ -80,7 +80,7 @@
     }
 
     <div class="row row-spacing">
-        <div class="col-8">
+        <div class="col-8 my-2">
             <input asp-for="Search" class="form-control" />
         </div>
         <div class="col-4">
@@ -90,7 +90,7 @@
     </div>
 </form>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row">
     <div class="col-12">
         @if (Model.Criteria.Count() == 0)
         {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Drawing/CriteriaCreate.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Drawing/CriteriaCreate.cshtml
index 2445cbb76..2705528c9 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Drawing/CriteriaCreate.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Drawing/CriteriaCreate.cshtml
@@ -1,7 +1,7 @@
 @model GRA.Controllers.ViewModel.MissionControl.Drawing.CriterionDetailViewModel
 
 <form asp-controller="Drawing" asp-action="CriteriaCreate" method="post" role="form">
-    <div class="row" style="padding: 10px 0;">
+    <div class="row my-2">
         <div class="col-12">
             <label asp-for="Criterion.Name" class="col-form-label"></label>
             <input asp-for="Criterion.Name" class="form-control" />
@@ -12,7 +12,7 @@
     <div class="row row-spacing">
         <div class="col-12">
             <label asp-for="Criterion.SystemId" class="col-form-label"></label>
-            <select asp-for="Criterion.SystemId" asp-items="Model.SystemList" class="form-control">
+            <select asp-for="Criterion.SystemId" asp-items="Model.SystemList" class="form-select">
                 <option></option>
             </select>
             <span asp-validation-for="Criterion.SystemId" class="text-danger"></span>
@@ -22,7 +22,7 @@
     <div class="row row-spacing">
         <div class="col-12">
             <label asp-for="Criterion.BranchId" class="col-form-label"></label>
-            <select asp-for="Criterion.BranchId" asp-items="Model.BranchList" class="form-control">
+            <select asp-for="Criterion.BranchId" asp-items="Model.BranchList" class="form-select">
                 <option></option>
             </select>
             <span asp-validation-for="Criterion.BranchId" class="text-danger"></span>
@@ -33,7 +33,7 @@
         <div class="col-12">
             <label asp-for="Criterion.ProgramId" class="col-form-label"></label>
             <input asp-for="ProgramPlaceholder" class="form-control" />
-            <select asp-for="Criterion.ProgramIds" asp-items="Model.ProgramList" class="form-control hidden" multiple="multiple"></select>
+            <select asp-for="Criterion.ProgramIds" asp-items="Model.ProgramList" class="form-select hidden" multiple="multiple"></select>
             <span asp-validation-for="Criterion.ProgramId" class="text-danger"></span>
         </div>
     </div>
@@ -73,7 +73,7 @@
     <div class="row row-spacing">
         <div class="col-12">
             <label asp-for="Criterion.ReadABook" class="col-form-label"></label>
-            <select asp-for="Criterion.ReadABook" class="form-control">
+            <select asp-for="Criterion.ReadABook" class="form-select">
                 <option value="false">No</option>
                 <option value="true">Yes</option>
             </select>
@@ -84,7 +84,7 @@
     <div class="row row-spacing">
         <div class="col-12">
             <label asp-for="Criterion.ExcludePreviousWinners" class="col-form-label"></label>
-            <select asp-for="Criterion.ExcludePreviousWinners" class="form-control">
+            <select asp-for="Criterion.ExcludePreviousWinners" class="form-select">
                 <option value="false">No</option>
                 <option value="true">Yes</option>
             </select>
@@ -95,7 +95,7 @@
     <div class="row row-spacing">
         <div class="col-12">
             <label asp-for="Criterion.IncludeAdmin" class="col-form-label"></label>
-            <select asp-for="Criterion.IncludeAdmin" class="form-control">
+            <select asp-for="Criterion.IncludeAdmin" class="form-select">
                 <option value="false">No</option>
                 <option value="true">Yes</option>
             </select>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Drawing/CriteriaDetail.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Drawing/CriteriaDetail.cshtml
index 5b4321713..f12d69fc0 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Drawing/CriteriaDetail.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Drawing/CriteriaDetail.cshtml
@@ -1,6 +1,6 @@
 @model GRA.Controllers.ViewModel.MissionControl.Drawing.CriterionDetailViewModel
 
-<div style="font-size:large;  padding-top:10px;">
+<div style="font-size:large;">
     Created By:
     @if (Model.CanViewParticipants)
     {
@@ -19,7 +19,7 @@
 <form asp-controller="Drawing" asp-action="CriteriaDetail" method="post" role="form">
     <input asp-for="Criterion.Id" type="hidden" />
 
-    <div class="row" style="padding: 10px 0;">
+    <div class="row">
         <div class="col-12">
             <label asp-for="Criterion.Name" class="col-form-label"></label>
             <input asp-for="Criterion.Name" class="form-control" />
@@ -30,7 +30,7 @@
     <div class="row row-spacing">
         <div class="col-12">
             <label asp-for="Criterion.SystemId" class="col-form-label"></label>
-            <select asp-for="Criterion.SystemId" asp-items="Model.SystemList" class="form-control">
+            <select asp-for="Criterion.SystemId" asp-items="Model.SystemList" class="form-select">
                 <option></option>
             </select>
             <span asp-validation-for="Criterion.SystemId" class="text-danger"></span>
@@ -40,7 +40,7 @@
     <div class="row row-spacing">
         <div class="col-12">
             <label asp-for="Criterion.BranchId" class="col-form-label"></label>
-            <select asp-for="Criterion.BranchId" asp-items="Model.BranchList" class="form-control">
+            <select asp-for="Criterion.BranchId" asp-items="Model.BranchList" class="form-select">
                 <option></option>
             </select>
             <span asp-validation-for="Criterion.BranchId" class="text-danger"></span>
@@ -51,7 +51,7 @@
         <div class="col-12">
             <label asp-for="Criterion.ProgramId" class="col-form-label"></label>
             <input asp-for="ProgramPlaceholder" class="form-control" />
-            <select asp-for="Criterion.ProgramIds" asp-items="Model.ProgramList" class="form-control hidden" multiple="multiple"></select>
+            <select asp-for="Criterion.ProgramIds" asp-items="Model.ProgramList" class="form-select hidden" multiple="multiple"></select>
             <span asp-validation-for="Criterion.ProgramId" class="text-danger"></span>
         </div>
     </div>
@@ -91,7 +91,7 @@
     <div class="row row-spacing">
         <div class="col-12">
             <label asp-for="Criterion.ReadABook" class="col-form-label"></label>
-            <select asp-for="Criterion.ReadABook" class="form-control">
+            <select asp-for="Criterion.ReadABook" class="form-select">
                 <option value="false">No</option>
                 <option value="true">Yes</option>
             </select>
@@ -102,7 +102,7 @@
     <div class="row row-spacing">
         <div class="col-12">
             <label asp-for="Criterion.ExcludePreviousWinners" class="col-form-label"></label>
-            <select asp-for="Criterion.ExcludePreviousWinners" class="form-control">
+            <select asp-for="Criterion.ExcludePreviousWinners" class="form-select">
                 <option value="false">No</option>
                 <option value="true">Yes</option>
             </select>
@@ -113,7 +113,7 @@
     <div class="row row-spacing">
         <div class="col-12">
             <label asp-for="Criterion.IncludeAdmin" class="col-form-label"></label>
-            <select asp-for="Criterion.IncludeAdmin" class="form-control">
+            <select asp-for="Criterion.IncludeAdmin" class="form-select">
                 <option value="false">No</option>
                 <option value="true">Yes</option>
             </select>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Drawing/Detail.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Drawing/Detail.cshtml
index a07946697..89774dd95 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Drawing/Detail.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Drawing/Detail.cshtml
@@ -1,6 +1,6 @@
 @model GRA.Controllers.ViewModel.MissionControl.Drawing.DrawingDetailViewModel
 
-<div style="font-size:large; padding-top:10px;">
+<div class="pt-2" style="font-size:large;">
     Created By:
     @if (Model.CanViewParticipants)
     {
@@ -17,7 +17,7 @@
     on @Model.Drawing.CreatedAt
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-2">
     <div class="col-12">
         <label class="col-form-label">Criteria</label>
         <input asp-for="Drawing.DrawingCriterion.Name" class="form-control" readonly />
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Drawing/Index.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Drawing/Index.cshtml
index 3368d6b48..1bbb6b0fa 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Drawing/Index.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Drawing/Index.cshtml
@@ -1,7 +1,7 @@
 @model GRA.Controllers.ViewModel.MissionControl.Drawing.DrawingListViewModel
 
-<div class="row" style="padding: 10px 0;">
-    <div class="col-12">
+<div class="row">
+    <div class="col-12 my-4">
         <a asp-action="Criteria" class="btn btn-outline-secondary">Drawing Criteria</a>
         @if (Model.Archived == true)
         {
@@ -15,7 +15,7 @@
 </div>
 
 <div class="row">
-    <div class="col-12 mb-2">
+    <div class="col-12 mb-4">
         <ul class="nav nav-pills flex-column flex-sm-row">
             <li class="nav-item"><a asp-route-Search="@Model.Search" asp-route-ProgramId="@Model.ProgramId" asp-route-Archived="@Model.Archived" class="nav-link @(Model.ActiveNav == "All" ? "active" : "")">All</a></li>
             <li class="nav-item">
@@ -99,7 +99,7 @@
     </div>
 </form>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-2">
     <div class="col-12">
         @if (Model.Drawings.Count() == 0)
         {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Drawing/New.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Drawing/New.cshtml
index 07388fdbd..d252805cb 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Drawing/New.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Drawing/New.cshtml
@@ -3,7 +3,7 @@
 <form asp-controller="Drawing" asp-action="New" method="post" role="form">
     <input asp-for="Drawing.DrawingCriterionId" type="hidden" />
 
-    <div class="row" style="padding: 10px 0;">
+    <div class="row">
         <div class="col-12">
             <label class="col-form-label">Criteria</label>
             <input asp-for="Drawing.DrawingCriterion.Name" class="form-control" readonly />
diff --git a/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/Addresses.cshtml b/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/Addresses.cshtml
index 1082c8fff..1b6321e44 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/Addresses.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/Addresses.cshtml
@@ -18,7 +18,7 @@
             <label asp-for="SignUpSource" class="col-form-label">Mailing list</label>
             <select asp-for="SignUpSource"
                     asp-items="@Model.SignUpSources"
-                    class="form-control">
+                    class="form-select">
                 @if (!@Model.HasSources)
                 {
                     <option>No lists available</option>
@@ -68,7 +68,7 @@
             <label asp-for="SignUpSource" class="col-form-label">Mailing list</label>
             <select asp-for="SignUpSource"
                     asp-items="@GRA.Controllers.ViewModel.MissionControl.EmailManagement.EmailAddressesViewModel.AllSources"
-                    class="form-control">
+                    class="form-select">
             </select>
             <span asp-validation-for="SignUpSource" class="text-danger"></span>
         </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/BaseDetails.cshtml b/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/BaseDetails.cshtml
index a846df79f..176afdc3c 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/BaseDetails.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/BaseDetails.cshtml
@@ -17,7 +17,7 @@
       method="post"
       role="form"
       enctype="multipart/form-data"
-      style="padding-top:10px;">
+      class="my-2">
     <input asp-for="Action" type="hidden" />
     <input asp-for="LanguageId" type="hidden" />
     @if (Model.Action == nameof(EmailManagementController.EditBaseTemplate))
diff --git a/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/Details.cshtml b/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/Details.cshtml
index 347864fbf..ca5cefb09 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/Details.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/Details.cshtml
@@ -35,8 +35,8 @@
       id="updateTemplate"
       method="post"
       role="form"
-      enctype="multipart/form-data"
-      style="padding-top:10px;">
+      enctype="multipart/form-data" 
+      class="my-2">
     <input asp-for="Action" type="hidden" />
     <input asp-for="LanguageId" type="hidden" />
     @if (Model.Action == nameof(EmailManagementController.EditTemplate))
@@ -56,7 +56,7 @@
             <div class="mb-3">
                 <label asp-for="EmailBaseId" class="col-form-label"></label>
                 <description gra-description-for="EmailBaseId"></description>
-                <select class="form-control" asp-for="EmailBaseId">
+                <select class="form-select" asp-for="EmailBaseId">
                     @foreach (var emailBase in Model.EmailBases.Where(_ => !_.Disabled))
                     {
                         <option value="@emailBase.Value">@emailBase.Text</option>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/ImportTemplate.cshtml b/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/ImportTemplate.cshtml
index ef0f7cda8..6ade383d4 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/ImportTemplate.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/ImportTemplate.cshtml
@@ -16,7 +16,7 @@
       method="post"
       role="form"
       enctype="multipart/form-data"
-      style="padding-top:10px;">
+      class="my-2">
         <input asp-for="LanguageId" type="hidden" />
         <div class="row">
             <div class="col-12">
@@ -30,7 +30,7 @@
                 <div class="mb-3">
                     <label asp-for="EmailBaseId" class="col-form-label"></label>
                     <description gra-description-for="EmailBaseId"></description>
-                    <select class="form-control" asp-for="EmailBaseId">
+                <select class="form-select" asp-for="EmailBaseId">
                         @foreach (var emailBase in Model.EmailBases.Where(_ => !_.Disabled))
                     {
                         <option value="@emailBase.Value">@emailBase.Text</option>
@@ -74,7 +74,7 @@
                 </div>
             }
 
-            <div class="mb-3">
+            <div class="mb-4">
                 <label asp-for="UploadedFile">Upload a .json file with the template content.</label>
                 <div class="input-group">
                     <label class="input-group-text">
diff --git a/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/Index.cshtml b/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/Index.cshtml
index 9a9752113..9d8d8a43b 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/Index.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/Index.cshtml
@@ -10,7 +10,7 @@
     </style>
 }
 
-<div class="row" style="margin: 1rem 0;">
+<div class="row my-4">
     <div class="col-12">
         <a class="btn btn-outline-success"
            asp-action="@nameof(EmailManagementController.CreateTemplate)">
@@ -23,17 +23,17 @@
             Import Template
         </a>
         <a asp-action="@nameof(EmailManagementController.Addresses)"
-           class="btn btn-secondary">
+           class="btn btn-outline-secondary">
             <span class="fas fa-list-alt"></span>
             Manage Lists
         </a>
-        <a class="btn btn-info"
+        <a class="btn btn-outline-info"
            asp-action="@nameof(EmailManagementController.BaseIndex)">
             Base Templates
         </a>
         @if (Context.User.HasClaim(GRA.ClaimType.Permission, GRA.Domain.Model.Permission.SendBulkEmails.ToString()))
         {
-            <a class="btn btn-secondary"
+            <a class="btn btn-outline-secondary"
                asp-action="@nameof(EmailManagementController.SetSpecialEmails)">
                 Set Special Emails
             </a>
@@ -41,7 +41,7 @@
     </div>
 </div>
 
-<div class="row" style="margin: 1rem 0;">
+<div class="row my-4">
     <div class="col-12">
         @if (Model.EmailTemplates.Count() == 0)
         {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/Send.cshtml b/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/Send.cshtml
index 09b6377d3..94fad5c4d 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/Send.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/EmailManagement/Send.cshtml
@@ -29,7 +29,7 @@
                     <select name="listName"
                     asp-items="@Model.SubscriptionLists"
                     placeholder="Select a mailing list"
-                    class="form-control"
+                            class="form-select"
                     formgroup>
                     </select>
                     <span asp-validation-for="SubscriptionLists" class="text-danger"></span>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Events/AddEditStreaming.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Events/AddEditStreaming.cshtml
index 761e278cf..64dda6474 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Events/AddEditStreaming.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Events/AddEditStreaming.cshtml
@@ -114,7 +114,7 @@
     <div class="row my-4">
         <div class="col-12">
             <label asp-for="Event.IsStreamingEmbed" class="col-form-label"></label>
-            <select asp-for="Event.IsStreamingEmbed" class="form-control">
+            <select asp-for="Event.IsStreamingEmbed" class="form-select">
                 <option value="true">Streaming link data is an embed</option>
                 <option value="false">Streaming link data is an external link</option>
             </select>
@@ -139,7 +139,7 @@
     <div class="row my-4">
         <div class="col-12">
             <label asp-for="Event.ProgramId" class="col-form-label"></label>
-            <select asp-for="Event.ProgramId" asp-items="Model.ProgramList" class="form-control">
+            <select asp-for="Event.ProgramId" asp-items="Model.ProgramList" class="form-select">
                 <option value="">All Programs</option>
             </select>
             <span asp-validation-for="Event.ProgramId" class="text-danger"></span>
@@ -528,7 +528,7 @@
                                         </div>
                                     </div>
                                     <div role="tabpanel" class="tab-pane" id="group">
-                                        <div class="row my-4" style="padding-top: 10px;">
+                                        <div class="row my-4">
                                             <div class="col-8">
                                                 <input id="groupSearchText"
                                                        class="form-control"
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Events/Create.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Events/Create.cshtml
index 45d4dbed9..0c26dbafe 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Events/Create.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Events/Create.cshtml
@@ -109,7 +109,7 @@
                     class="col-form-label"></label>
                 <select asp-for="SystemId"
                     asp-items="Model.SystemList"
-                    class="form-control"></select>
+                        class="form-select"></select>
                 <span asp-validation-for="SystemId"
                     class="text-danger"></span>
             </div>
@@ -126,7 +126,7 @@
                 </label>
                 <select asp-for="Event.AtBranchId"
                     asp-items="Model.BranchList"
-                    class="form-control">
+                        class="form-select">
                 </select>
                 <span asp-validation-for="Event.AtBranchId"
                     class="text-danger"></span>
@@ -149,7 +149,7 @@
             <div style="display:flex">
                 <select asp-for="Event.AtLocationId"
                     asp-items="Model.LocationList"
-                    class="form-control">
+                        class="form-select">
                 </select>
                 @if (Model.CanManageLocations)
                 {
@@ -173,7 +173,7 @@
                 class="col-form-label"></label>
             <select asp-for="Event.ProgramId"
                 asp-items="Model.ProgramList"
-                class="form-control">
+                    class="form-select">
                 <option value="">All Programs</option>
             </select>
             <span asp-validation-for="Event.ProgramId"
@@ -405,7 +405,7 @@
     }
 
 
-    <div class="mb-3 mb-4">
+    <div class="my-4">
         <a asp-action="Index"
            class="btn btn-outline-secondary">
             Return to List</a>
@@ -572,7 +572,7 @@
                                         </div>
                                     </div>
                                     <div role="tabpanel" class="tab-pane" id="group">
-                                        <div class="row my-4" style="padding-top: 10px;">
+                                        <div class="row my-4">
                                             <div class="col-8">
                                                 <input id="groupSearchText"
                                                        class="form-control"
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Events/Edit.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Events/Edit.cshtml
index 8d8bce6fc..65520124b 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Events/Edit.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Events/Edit.cshtml
@@ -72,7 +72,7 @@
             <label asp-for="Event.IsCommunityExperience"
                 class="col-form-label"></label>
             <select asp-for="Event.IsCommunityExperience"
-                class="form-control">
+                    class="form-select">
                 <option value="false">
                     Event</option>
                 <option value="true">
@@ -154,7 +154,7 @@
                     class="col-form-label"></label>
                 <select asp-for="SystemId"
                     asp-items="Model.SystemList"
-                    class="form-control"></select>
+                        class="form-select"></select>
                 <span asp-validation-for="SystemId"
                     class="text-danger"></span>
             </div>
@@ -171,7 +171,7 @@
                 </label>
                 <select asp-for="Event.AtBranchId"
                     asp-items="Model.BranchList"
-                    class="form-control">
+                        class="form-select">
                 </select>
                 <span asp-validation-for="Event.AtBranchId"
                     class="text-danger"></span>
@@ -194,7 +194,7 @@
             <div style="display:flex">
                 <select asp-for="Event.AtLocationId"
                     asp-items="Model.LocationList"
-                    class="form-control">
+                        class="form-select">
                 </select>
                 @if (Model.CanManageLocations)
                 {
@@ -218,7 +218,7 @@
             <label asp-for="Event.ProgramId"
                 class="col-form-label"></label>
             <select asp-for="Event.ProgramId"
-                asp-items="Model.ProgramList" class="form-control">
+                    asp-items="Model.ProgramList" class="form-select">
                 <option value="">
                     All Programs</option>
             </select>
@@ -368,7 +368,7 @@
         </div>
     }
 
-    <div class="mb-3">
+    <div class="my-4">
         <a asp-action="Index"
            class="btn btn-outline-secondary">
             Return to List</a>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Events/Locations.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Events/Locations.cshtml
index ca1365c82..22397a6b6 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Events/Locations.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Events/Locations.cshtml
@@ -93,7 +93,7 @@
                                     </td>
                                 }
                                 <td>
-                                    <div class="btn-group">
+                                    <div class="btn-toolbar">
                                         <button type="submit"
                                                 class="btn btn-outline-primary btn-sm"
                                                 data-bs-toggle="modal"
diff --git a/src/GRA.Web/Areas/MissionControl/Views/GroupTypes/Index.cshtml b/src/GRA.Web/Areas/MissionControl/Views/GroupTypes/Index.cshtml
index 40d367e32..3253cc8bd 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/GroupTypes/Index.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/GroupTypes/Index.cshtml
@@ -8,8 +8,7 @@
                 <table>
                     <tr>
                         <td>
-                            <span class="fas fa-exclamation-triangle text-danger fa-2x float-start"
-                                  style="padding-right: 1rem;"></span>
+                            <span class="fas fa-exclamation-triangle text-danger fa-2x float-start py-4"></span>
                         </td>
                         <td>
                             No maximum number of family members is configured for this site so
@@ -33,8 +32,7 @@ else
                 <table>
                     <tr>
                         <td>
-                            <span class="fas fa-info-circle fa-2x float-start"
-                                  style="padding-right: 1rem;"></span>
+                            <span class="fas fa-info-circle fa-2x float-start py-4"></span>
                         </td>
                         <td>
                             Families will be prompted to upgrade to a group when they exceed
@@ -53,7 +51,7 @@ else
 
 <div class="row row-spacing">
     <div class="col-12">
-        <a class="btn btn-outline-primary"
+        <a class="btn btn-outline-primary my-3"
            data-bs-toggle="modal"
            data-bs-target="#addModal">
             <span class="fas fa-plus-circle"></span>
@@ -68,7 +66,7 @@ else
         {
             <div class="alert alert-warning">
                 No group types configured.
-                <a class="btn btn-outline-primary"
+                <a class="btn btn-outline-primary my-3"
                    data-bs-toggle="modal"
                    data-bs-target="#addModal">
                     <span class="fas fa-plus-circle"></span>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Home/AuthorizationCode.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Home/AuthorizationCode.cshtml
index 2ced7bc84..87d20df58 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Home/AuthorizationCode.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Home/AuthorizationCode.cshtml
@@ -52,7 +52,7 @@
             </div>
         }
         <form asp-action="AuthorizationCode" method="post">
-            <div class="row" style="padding-top: 2rem;">
+            <div class="row py-6">
                 <div class="col-12 col-sm-10 offset-sm-1 col-md-8 offset-md-2">
                     <div class="card">
                         <div class="card-header">
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Mail/BroadcastDetail.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Mail/BroadcastDetail.cshtml
index fef08b560..f6378ca5e 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Mail/BroadcastDetail.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Mail/BroadcastDetail.cshtml
@@ -8,7 +8,7 @@
     <input asp-for="Broadcast.Id" type="hidden" />
     }
 
-    <div class="row" style="padding: 10px 0;">
+    <div class="row my-4">
         <div class="col-12">
             <label asp-for="Broadcast.Subject" class="col-form-label"></label>
             <input asp-for="Broadcast.Subject" class="form-control" disabled="@(Model.Sent == true ? "disabled" : null)" />
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Mail/Index.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Mail/Index.cshtml
index 42a07ac69..49adcd4e3 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Mail/Index.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Mail/Index.cshtml
@@ -2,7 +2,7 @@
 
 @await Html.PartialAsync("_MailPartial")
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         @if (Model.Mail.Count() == 0)
         {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Mail/ViewAll.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Mail/ViewAll.cshtml
index 1084421be..5febe455d 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Mail/ViewAll.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Mail/ViewAll.cshtml
@@ -2,7 +2,7 @@
 
 @await Html.PartialAsync("_MailPartial")
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         @if (Model.Mail.Count() == 0)
         {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/News/Categories.cshtml b/src/GRA.Web/Areas/MissionControl/Views/News/Categories.cshtml
index f040301ec..664e2d5cd 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/News/Categories.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/News/Categories.cshtml
@@ -2,13 +2,13 @@
 
 @await Html.PartialAsync("_NewsPartial")
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4" >
     <div class="col-12">
         <a asp-action="CreateCategory" class="btn btn-outline-primary">Add a Category</a>
     </div>
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row">
     <div class="col-12">
         @if (Model.Categories.Count() == 0)
         {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/News/Index.cshtml b/src/GRA.Web/Areas/MissionControl/Views/News/Index.cshtml
index 2ff729a87..32d312253 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/News/Index.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/News/Index.cshtml
@@ -47,13 +47,13 @@
     </div>
 }
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         <a asp-action="CreatePost" class="btn btn-outline-primary">Add a Post</a>
     </div>
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row">
     <div class="col-12">
         @if (Model.Posts.Count() == 0)
         {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/News/PostDetail.cshtml b/src/GRA.Web/Areas/MissionControl/Views/News/PostDetail.cshtml
index 421f42af6..a3a2271eb 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/News/PostDetail.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/News/PostDetail.cshtml
@@ -21,7 +21,7 @@
 
             <div class="mb-3">
                 <label asp-for="Post.CategoryId" class="col-form-label"></label>
-                <select asp-for="Post.CategoryId" asp-items="Model.Categories" class="form-control"></select>
+                <select asp-for="Post.CategoryId" asp-items="Model.Categories" class="form-select"></select>
                 <span asp-validation-for="Post.CategoryId" class="text-danger"></span>
             </div>
 
@@ -48,7 +48,7 @@
                 <div class="row row-spacing">
                     <div class="col-12">
                         <label asp-for="MarkUpdated" class="col-form-label"></label>
-                        <select asp-for="MarkUpdated" asp-items="Model.NoYes" class="form-control"></select>
+                        <select asp-for="MarkUpdated" asp-items="Model.NoYes" class="form-select"></select>
                     </div>
                 </div>
             }
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Pages/Detail.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Pages/Detail.cshtml
index 3dcda7384..e80440070 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Pages/Detail.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Pages/Detail.cshtml
@@ -4,7 +4,7 @@
     <link rel="stylesheet" href="/css/markdown.min.css" />
 }
 
-<div class="row" style="padding: 1rem 0;">
+<div class="row my-4">
     <div class="col-12">
         <div class="mb-3">
             <label asp-for="HeaderName" class="col-form-label"></label>
@@ -18,7 +18,7 @@
 
         <div>
             <label for="Language" class="col-form-label">Language</label>
-            <select id="Language" name="Language" asp-items="Model.LanguageList" class="form-control"></select>
+            <select id="Language" name="Language" asp-items="Model.LanguageList" class="form-select"></select>
         </div>
     </div>
 </div>
@@ -97,7 +97,7 @@
 
             <div class="mb-3">
                 <label asp-for="Page.IsPublished" class="col-form-label"></label>
-                <select asp-for="Page.IsPublished" class="form-control">
+                <select asp-for="Page.IsPublished" class="form-select">
                     <option value="True">Yes</option>
                     <option value="False">No</option>
                 </select>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Pages/Index.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Pages/Index.cshtml
index 37b2a618d..f02e1fa51 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Pages/Index.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Pages/Index.cshtml
@@ -1,6 +1,6 @@
 @model GRA.Controllers.ViewModel.MissionControl.Pages.PagesListViewModel
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         <button type="button"
                 class="btn btn-outline-primary"
@@ -12,7 +12,7 @@
 </div>
 
 
-<div class="row" style="padding: 10px 0;">
+<div class="row">
     <div class="col-12">
         @if (Model.PageHeaders.Count() == 0)
         {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Participants/HouseholdAdd.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Participants/HouseholdAdd.cshtml
index 26620b73f..db782fd2c 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Participants/HouseholdAdd.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Participants/HouseholdAdd.cshtml
@@ -1,7 +1,7 @@
 @model GRA.Controllers.ViewModel.MissionControl.Participants.HouseholdAddViewModel
 
 <form asp-controller="Participants" asp-action="AddHouseholdMember" method="post" role="form">
-    <div class="row" style="padding: 10px 0;">
+    <div class="row my-2">
         <div class="col-12">
 
             <input asp-for="Id" type="hidden" />
@@ -52,7 +52,7 @@
             <div class="row row-spacing">
                 <div class="col-12">
                     <label asp-for="User.SystemId" class="col-form-label"></label>
-                    <select asp-for="User.SystemId" asp-items="Model.SystemList" class="form-control"></select>
+                    <select asp-for="User.SystemId" asp-items="Model.SystemList" class="form-select"></select>
                     <span asp-validation-for="User.SystemId" class="text-danger"></span>
                 </div>
             </div>
@@ -60,7 +60,7 @@
             <div class="row row-spacing">
                 <div class="col-12">
                     <label asp-for="User.BranchId" class="col-form-label"></label>
-                    <select asp-for="User.BranchId" asp-items="Model.BranchList" class="form-control"></select>
+                    <select asp-for="User.BranchId" asp-items="Model.BranchList" class="form-select"></select>
                     <span asp-validation-for="User.BranchId" class="text-danger"></span>
                 </div>
             </div>
@@ -68,7 +68,7 @@
             <div class="row row-spacing">
                 <div class="col-12">
                     <label asp-for="User.ProgramId" class="col-form-label"></label>
-                    <select asp-for="User.ProgramId" asp-items="Model.ProgramList" class="form-control">
+                    <select asp-for="User.ProgramId" asp-items="Model.ProgramList" class="form-select">
                         <option value="-1"></option>
                     </select>
                     <span asp-validation-for="User.ProgramId" class="text-danger"></span>
@@ -94,7 +94,7 @@
                         <label asp-for="IsFirstTime" class="col-form-label"></label>
                         <select asp-for="IsFirstTime"
                                 asp-items="Model.AskFirstTime"
-                                class="form-control"></select>
+                                class="form-select"></select>
                         <span asp-validation-for="IsFirstTime" class="text-danger"></span>
                     </div>
                 </div>
@@ -107,7 +107,7 @@
                         <label asp-for="EmailSubscriptionRequested" class="col-form-label">@Model.AskEmailSubscriptionText</label>
                         <select asp-for="EmailSubscriptionRequested"
                                 asp-items="Model.AskEmailSubscription"
-                                class="form-control"></select>
+                                class="form-select"></select>
                         <span asp-validation-for="EmailSubscriptionRequested" class="text-danger"></span>
                     </div>
                 </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Participants/HouseholdImport.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Participants/HouseholdImport.cshtml
index 36446396b..268763964 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Participants/HouseholdImport.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Participants/HouseholdImport.cshtml
@@ -3,12 +3,12 @@
 <form asp-controller="Participants" asp-action="@nameof(ParticipantsController.HouseholdImport)" method="post" role="form" enctype="multipart/form-data">
     <input asp-for="Id" type="hidden" />
 
-    <div class="row" style="padding:10px 0">
+    <div class="row my-4">
         <div class="col-12">
             <div class="row row-spacing">
                 <div class="col-12">
                     <label asp-for="SystemId" class="col-form-label"></label>
-                    <select asp-for="SystemId" asp-items="Model.SystemList" class="form-control"></select>
+                    <select asp-for="SystemId" asp-items="Model.SystemList" class="form-select"></select>
                     <span asp-validation-for="SystemId" class="text-danger"></span>
                 </div>
             </div>
@@ -16,7 +16,7 @@
             <div class="row row-spacing">
                 <div class="col-12">
                     <label asp-for="BranchId" class="col-form-label"></label>
-                    <select asp-for="BranchId" asp-items="Model.BranchList" class="form-control"></select>
+                    <select asp-for="BranchId" asp-items="Model.BranchList" class="form-select"></select>
                     <span asp-validation-for="BranchId" class="text-danger"></span>
                 </div>
             </div>
@@ -24,7 +24,7 @@
             <div class="row row-spacing">
                 <div class="col-12">
                     <label asp-for="ProgramId" class="col-form-label"></label>
-                    <select asp-for="ProgramId" asp-items="Model.ProgramList" class="form-control">
+                    <select asp-for="ProgramId" asp-items="Model.ProgramList" class="form-select">
                         <option></option>
                     </select>
                     <span asp-validation-for="ProgramId" class="text-danger"></span>
@@ -42,7 +42,7 @@
                         <label asp-for="IsFirstTime" class="col-form-label"></label>
                         <select asp-for="IsFirstTime"
                                 asp-items="Model.AskFirstTime"
-                                class="form-control"></select>
+                                class="form-select"></select>
                         <span asp-validation-for="IsFirstTime" class="text-danger"></span>
                     </div>
                 </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Participants/HouseholdPrize.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Participants/HouseholdPrize.cshtml
index 4bbcb4d17..55d8039fa 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Participants/HouseholdPrize.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Participants/HouseholdPrize.cshtml
@@ -1,6 +1,6 @@
 @model GRA.Controllers.ViewModel.MissionControl.Participants.HouseholdPrizeViewModel
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         <h4>Select @(string.IsNullOrEmpty(Model.GroupName) ? "household" : "group") members to reedem the <strong>@Model.PrizeName</strong> prize</h4>
         <form id="form" asp-action="@nameof(ParticipantsController.HouseholdPrize)" method="post" role="form">
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Participants/HouseholdRegister.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Participants/HouseholdRegister.cshtml
index 4379c72f2..0e56e5a6d 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Participants/HouseholdRegister.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Participants/HouseholdRegister.cshtml
@@ -1,7 +1,7 @@
 @model GRA.Controllers.ViewModel.MissionControl.Participants.HouseholdRegisterViewModel
 
 <form asp-controller="Participants" asp-action="RegisterHouseholdMember" method="post" role="form">
-    <div class="row" style="padding: 10px 0;">
+    <div class="row my-4">
         <div class="col-12">
 
             <input asp-for="Id" type="hidden" />
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Participants/Roles.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Participants/Roles.cshtml
index aa67c3540..ddcbd8578 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Participants/Roles.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Participants/Roles.cshtml
@@ -2,7 +2,7 @@
 
 @await Html.PartialAsync("_ParticipantPartial")
 
-<form asp-action="Roles" method="post" role="form" style="padding-top:10px;">
+<form asp-action="Roles" method="post" role="form" class="my-4">
     <input asp-for="Id" type="hidden" />
 
     <div class="row">
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Participants/UpdateGroup.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Participants/UpdateGroup.cshtml
index 626c6fa9b..986a1f47d 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Participants/UpdateGroup.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Participants/UpdateGroup.cshtml
@@ -17,7 +17,7 @@
                         <label asp-for="GroupInfo.GroupTypeId" class="col-form-label"></label>
                         <select asp-for="GroupInfo.GroupTypeId"
                                 asp-items="Model.GroupTypes"
-                                class="form-control"></select>
+                                class="form-select"></select>
                         <span asp-validation-for="GroupInfo.GroupTypeId" class="text-danger"></span>
                     </div>
                 </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Participants/UpgradeToGroup.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Participants/UpgradeToGroup.cshtml
index c544d0309..4a07fc995 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Participants/UpgradeToGroup.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Participants/UpgradeToGroup.cshtml
@@ -22,7 +22,7 @@
                         <label asp-for="GroupInfo.GroupTypeId" class="col-form-label"></label>
                         <select asp-for="GroupInfo.GroupTypeId"
                                 asp-items="Model.GroupTypes"
-                                class="form-control"></select>
+                                class="form-select"></select>
                         <span asp-validation-for="GroupInfo.GroupTypeId"
                               class="text-danger"></span>
                     </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Participants/VendorCodes.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Participants/VendorCodes.cshtml
index 6cf5757f4..b062fd0a1 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Participants/VendorCodes.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Participants/VendorCodes.cshtml
@@ -254,7 +254,7 @@
                             <select name="vendorCodeTypeId"
                                     id="vendorCodeTypeId"
                                     asp-items="Model.VendorCodeTypeList"
-                                    class="form-control"></select>
+                                    class="form-select"></select>
                         </div>
                     </div>
                     <div class="modal-footer">
diff --git a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/AgeGroups.cshtml b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/AgeGroups.cshtml
index 70c8ba07f..1cd4e27b9 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/AgeGroups.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/AgeGroups.cshtml
@@ -2,7 +2,7 @@
 
 @await Html.PartialAsync("_PerformerManagementPartial")
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         <a class="btn btn-outline-primary"
            data-bs-toggle="modal"
@@ -10,7 +10,7 @@
     </div>
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row">
     <div class="col-12">
         @if (Model.AgeGroups.Count == 0)
         {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/BlackoutDates.cshtml b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/BlackoutDates.cshtml
index 8745a4b0f..8bfbe91df 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/BlackoutDates.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/BlackoutDates.cshtml
@@ -2,7 +2,7 @@
 
 @await Html.PartialAsync("_PerformerManagementPartial")
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         <a class="btn btn-outline-primary"
            data-bs-toggle="modal"
@@ -10,7 +10,7 @@
     </div>
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row">
     <div class="col-12">
         @if (Model.BlackoutDates.Count == 0)
         {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/ExcludedBranches.cshtml b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/ExcludedBranches.cshtml
index 15ebf618b..521fe1889 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/ExcludedBranches.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/ExcludedBranches.cshtml
@@ -2,7 +2,7 @@
 
 @await Html.PartialAsync("_PerformerManagementPartial")
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         <a class="btn btn-outline-primary"
            data-bs-toggle="modal"
@@ -10,7 +10,7 @@
     </div>
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row">
     <div class="col-12">
         @if (Model.ExcludedBranches.Count == 0)
         {
@@ -88,7 +88,7 @@
                             <label asp-for="BranchId" class="col-form-label"></label>
                             <select asp-for="BranchId"
                                     asp-items="Model.UnexcludedBranches"
-                                    class="form-control"></select>
+                                    class="form-select"></select>
                             <span asp-validation-for="BranchId" class="text-danger"></span>
                         </div>
                     </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/Kit.cshtml b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/Kit.cshtml
index ce7a696ed..0ff4115e4 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/Kit.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/Kit.cshtml
@@ -30,7 +30,7 @@
         <hr />
     </div>
 
-    <div class="col-12" style="padding-bottom:15px;">
+    <div class="col-12 mb-3">
         <a asp-action="KitDetails" asp-route-id="@Model.Kit.Id" class="btn btn-outline-primary">Edit Kit</a>
         @if (Model.SchedulingStage >= GRA.Domain.Model.PsSchedulingStage.SchedulingOpen)
         {
@@ -40,18 +40,18 @@
     <div class="col-12 col-sm-5 col-md-4">
         @if (!string.IsNullOrWhiteSpace(Model.ImagePath))
         {
-            <div class="row" style="padding-bottom:15px;">
+            <div class="row mb-3" style="text-align:center;">
                 <div class="col-12">
                     <img src="~/@Model.ImagePath" class="img-fluid" style="margin: 0 auto;" />
                 </div>
             </div>
         }
-        <div class="row" style="padding-bottom:15px;">
+        <div class="row mb-3">
             <div class="col-12" style="text-align:center;">
                 <a asp-action="KitImages" asp-route-id="@Model.Kit.Id" class="btn btn-outline-primary">View/Manage Images</a>
             </div>
         </div>
-        <div class="row" style="padding-bottom:15px;">
+        <div class="row mb-3">
             <div class="col-12" style="text-align:center;">
                 <a asp-action="Kits" asp-route-page="@Model.ReturnPage" class="btn btn-outline-secondary">Return to List</a>
             </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/KitDetails.cshtml b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/KitDetails.cshtml
index 9fb08f795..2ddba11f9 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/KitDetails.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/KitDetails.cshtml
@@ -90,7 +90,7 @@
             <label class="col-sm-3 col-form-label required-field">Age(s)</label>
             <div class="col-sm-9">
                 <input id="agePlaceholder" class="form-control" />
-                <select asp-for="AgeSelection" asp-items="Model.AgeList" class="form-control hidden" type="text" multiple="multiple"></select>
+                <select asp-for="AgeSelection" asp-items="Model.AgeList" class="form-select hidden" type="text" multiple="multiple"></select>
                 <span asp-validation-for="AgeSelection" class="text-danger"></span>
             </div>
         </div>
@@ -105,11 +105,11 @@
                 </button>
                 @if (Model.NewKit == false)
                 {
-                    <a asp-action="Kit" asp-route-id="@Model.Kit.Id" class="btn btn-lg btn-outline-secondary float-start" style="margin-right: 10px;">Return to Kit</a>
+                    <a asp-action="Kit" asp-route-id="@Model.Kit.Id" class="btn btn-lg btn-outline-secondary float-start me-2">Return to Kit</a>
                 }
                 else
                 {
-                    <a asp-action="Kits" class="btn btn-lg btn-outline-secondary float-start" style="margin-right: 10px;">Return to List</a>
+                    <a asp-action="Kits" class="btn btn-lg btn-outline-secondary float-start me-2">Return to List</a>
                 }
             </div>
         </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/KitImages.cshtml b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/KitImages.cshtml
index d1189c2d4..03bb0f66e 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/KitImages.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/KitImages.cshtml
@@ -74,7 +74,7 @@
                 {
                     @Html.Raw("<div class=\"row\">");
                 }
-                <div class="col-12 col-md-4" style="margin-bottom: 2rem;">
+                <div class="col-12 col-md-4 mb-6">
                     <div style="padding:10px;border:1px solid black;">
                         <img src="~/@Model.KitImages[i].Filename" class="img-fluid" style="margin: 0 auto;" />
                         <input class="deleteSelection form-control" type="checkbox" data-id="@Model.KitImages[i].Id" />
diff --git a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/KitSelections.cshtml b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/KitSelections.cshtml
index 88ff7cd9c..3b63efe1f 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/KitSelections.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/KitSelections.cshtml
@@ -147,7 +147,7 @@
                                 <select name="KitId"
                                         asp-for="BranchSelection.KitId"
                                         asp-items="Model.KitList"
-                                        class="form-control"></select>
+                                        class="form-select"></select>
                             </div>
                             <span id="KitValidationMessage"
                                   asp-validation-for="BranchSelection.KitId"
@@ -160,7 +160,7 @@
                                 <select name="AgeGroupId"
                                         asp-for="BranchSelection.AgeGroupId"
                                         asp-items="Model.AgeGroupList"
-                                        class="form-control"></select>
+                                        class="form-select"></select>
                             </div>
                         </div>
 
diff --git a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/Kits.cshtml b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/Kits.cshtml
index 3fc4d0af9..7bf9b8e53 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/Kits.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/Kits.cshtml
@@ -6,13 +6,13 @@
 
 @await Html.PartialAsync("_PerformerManagementPartial")
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         <a asp-action="KitAdd" class="btn btn-outline-primary">Add Kit</a>
     </div>
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row">
     <div class="col-12">
         @if (Model.Kits.Count == 0)
         {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/Performer.cshtml b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/Performer.cshtml
index 2126a7afe..ae5d2add4 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/Performer.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/Performer.cshtml
@@ -4,7 +4,7 @@
     <link rel="stylesheet" href="/css/performerregistration.min.css" />
 }
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         <table style="margin:0 auto;">
             <tr>
@@ -69,18 +69,18 @@
     <div class="col-12 col-sm-5 col-md-4">
         @if (!string.IsNullOrWhiteSpace(Model.ImagePath))
         {
-            <div class="row" style="padding-bottom:15px;">
+            <div class="row mb-3" style="text-align:center;">
                 <div class="col-12">
                     <img src="~/@Model.ImagePath" class="img-fluid" style="margin: 0 auto;" />
                 </div>
             </div>
         }
-        <div class="row" style="padding-bottom:15px;">
+        <div class="row mb-3">
             <div class="col-12" style="text-align:center;">
                 <a asp-action="PerformerImages" asp-route-id="@Model.Performer.Id" class="btn btn-outline-primary">View/Manage Images</a>
             </div>
         </div>
-        <div class="row" style="padding-bottom:15px;">
+        <div class="row mb-3">
             <div class="col-12" style="text-align:center;">
                 <a aria-label="View References (Opens new window)"
                    href="~/@Model.ReferencesPath"
@@ -90,13 +90,13 @@
         </div>
         @if (Context.User.HasClaim(GRA.ClaimType.Permission, GRA.Domain.Model.Permission.ViewParticipantDetails.ToString()))
         {
-            <div class="row" style="padding-bottom:15px;">
+            <div class="row mb-3">
                 <div class="col-12" style="text-align:center;">
                     <a asp-controller="Participants" asp-action="Detail" asp-route-id="@Model.Performer.UserId" class="btn btn-outline-primary">View Participant Profile</a>
                 </div>
             </div>
         }
-        <div class="row" style="padding-bottom:15px;">
+        <div class="row mb-3">
             <div class="col-12" style="text-align:center;">
                 <a asp-action="@nameof(PerformerManagementController.Performers)" asp-route-page="@Model.ReturnPage" class="btn btn-outline-secondary">Return to List</a>
             </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/PerformerDetails.cshtml b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/PerformerDetails.cshtml
index 2da484a4d..6da018d6e 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/PerformerDetails.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/PerformerDetails.cshtml
@@ -86,7 +86,7 @@
     <div class="mb-3">
         <label asp-for="Performer.PhonePreferred" class="col-sm-3 col-form-label required-field"></label>
         <div class="col-sm-9">
-            <select asp-for="Performer.PhonePreferred" class="form-control">
+            <select asp-for="Performer.PhonePreferred" class="form-select">
                 <option value="false">Email</option>
                 <option value="true">Phone</option>
             </select>
@@ -121,7 +121,7 @@
     <div class="mb-3">
         <label asp-for="Performer.HasFingerprintCard" class="col-sm-3 col-form-label required-field"></label>
         <div class="col-sm-9">
-            <select asp-for="Performer.HasFingerprintCard" class="form-control">
+            <select asp-for="Performer.HasFingerprintCard" class="form-select">
                 <option value="false">No</option>
                 <option value="true">Yes</option>
             </select>
@@ -134,7 +134,7 @@
         <div class="mb-3">
             <label asp-for="Performer.HasInsurance" class="col-sm-3 col-form-label required-field"></label>
             <div class="col-sm-9">
-                <select asp-for="Performer.HasInsurance" class="form-control">
+                <select asp-for="Performer.HasInsurance" class="form-select">
                     <option value="false">No</option>
                     <option value="true">Yes</option>
                 </select>
@@ -163,7 +163,7 @@
                     button-spinner>
                 Save Information
             </button>
-            <a asp-action="Performer" asp-route-id="@Model.Performer.Id" class="btn btn-lg btn-outline-secondary float-start" style="margin-right: 10px;">Return to Performer</a>
+            <a asp-action="Performer" asp-route-id="@Model.Performer.Id" class="btn btn-lg btn-outline-secondary float-start me-2">Return to Performer</a>
         </div>
     </div>
 </form>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/PerformerImages.cshtml b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/PerformerImages.cshtml
index 7f8c427dd..bc6bdff10 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/PerformerImages.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/PerformerImages.cshtml
@@ -74,7 +74,7 @@
                 {
                     @Html.Raw("<div class=\"row\">");
                 }
-                <div class="col-12 col-md-4" style="margin-bottom: 2rem;">
+                <div class="col-12 col-md-4 mb-6">
                     <div style="padding:10px;border:1px solid black;">
                         <img src="~/@Model.PerformerImages[i].Filename" class="img-fluid" style="margin: 0 auto;" />
                         <input class="deleteSelection form-control" type="checkbox" data-id="@Model.PerformerImages[i].Id" />
diff --git a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/PerformerSchedule.cshtml b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/PerformerSchedule.cshtml
index 91eb97757..de750d663 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/PerformerSchedule.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/PerformerSchedule.cshtml
@@ -111,7 +111,7 @@
                                 <input id="endTime" class="form-control timeInput" type="time"/> @* timepicker *@
                             </div>
                         </td>
-                        <td style="padding-right:10px">
+                        <td class="pr-4">
                             <button type="button"
                                     id="timeButton"
                                     class="btn btn-warning"
@@ -152,14 +152,14 @@
                 </li>
             </ul>
         </div>
-        <div class="col-12 col-sm-8 offset-sm-3" style="padding-top: 1em;">
+        <div class="col-12 col-sm-8 offset-sm-3 pt-4">
             <button type="submit"
                     class="btn btn-lg btn-outline-success btn-spinner"
                     style="margin-bottom: 0.5rem;"
                     button-spinner>
                 Save Schedule
             </button>
-            <a asp-action="Performer" asp-route-id="@Model.Performer.Id" class="btn btn-lg btn-outline-secondary float-start" style="margin-right: 10px;">Return to Performer</a>
+            <a asp-action="Performer" asp-route-id="@Model.Performer.Id" class="btn btn-lg btn-outline-secondary float-start me-4">Return to Performer</a>
         </div>
     </form>
 </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/PrepCoverSheet.cshtml b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/PrepCoverSheet.cshtml
index a9ffd0844..513d707ee 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/PrepCoverSheet.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/PrepCoverSheet.cshtml
@@ -14,7 +14,7 @@
             <form asp-controller="PerformerManagement" asp-action="PrintCoverSheet" method="post">
                 <div class="col-12 col-sm-6 offset-sm-3 mb-3">
                     <label for="month">Invoice Month: </label>
-                    <select class="form-control" name="month" asp-items="@Model.Months"></select>
+                    <select class="form-select" name="month" asp-items="@Model.Months"></select>
                 </div>
                 <div class="col-12 col-sm-6 offset-sm-3 mb-3">
                     <label for="invoiceNumber">Invoice Number: </label>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/Program.cshtml b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/Program.cshtml
index da3e3db89..cb903cefe 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/Program.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/Program.cshtml
@@ -15,18 +15,18 @@
     <div class="col-12 col-sm-5 col-md-4">
         @if (!string.IsNullOrWhiteSpace(Model.Image))
         {
-            <div class="row" style="padding-bottom:15px;">
+            <div class="row mb-3" style="text-align:center;">
                 <div class="col-12">
                     <img src="~/@Model.Image" class="img-fluid" style="margin: 0 auto;" />
                 </div>
             </div>
         }
-        <div class="row" style="padding-bottom:15px;">
+        <div class="row mb-3">
             <div class="col-12" style="text-align:center;">
                 <a asp-action="ProgramImages" asp-route-id="@Model.Program.Id" class="btn btn-primary">View/Manage Images</a>
             </div>
         </div>
-        <div class="row" style="padding-bottom:15px;">
+        <div class="row mb-3">
             <div class="col-12" style="text-align:center;">
                 <a asp-action="Performer" asp-route-id="@Model.Program.PerformerId" class="btn btn-outline-secondary">Return to Performer</a>
             </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/ProgramDetails.cshtml b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/ProgramDetails.cshtml
index cf4f8716d..30b5d8ba3 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/ProgramDetails.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/ProgramDetails.cshtml
@@ -81,7 +81,7 @@
                 <input asp-for="Program.MinimumCapacity" class="form-control form-control-lg" type="text" placeholder="" />
                 <span asp-validation-for="Program.MinimumCapacity" class="text-danger"></span>
             </div>
-            <div class="visible-xs" style="padding-bottom:10px;"></div>
+            <div class="visible-xs mb-2"></div>
             <label asp-for="Program.MaximumCapacity" class="col-sm-2 col-form-label required-field"></label>
             <div class="col-sm-2">
                 <input asp-for="Program.MaximumCapacity" class="form-control form-control-lg" type="text" placeholder="" />
@@ -98,7 +98,7 @@
             <label class="col-sm-3 col-form-label required-field">Age(s)</label>
             <div class="col-sm-9">
                 <input id="agePlaceholder" class="form-control" />
-                <select asp-for="AgeSelection" asp-items="Model.AgeList" class="form-control hidden" type="text" multiple="multiple"></select>
+                <select asp-for="AgeSelection" asp-items="Model.AgeList" class="form-select hidden" type="text" multiple="multiple"></select>
                 <span asp-validation-for="AgeSelection" class="text-danger"></span>
             </div>
         </div>
@@ -114,7 +114,7 @@
                 <input asp-for="Program.ProgramLengthMinutes" class="form-control form-control-lg" type="text" placeholder="" />
                 <span asp-validation-for="Program.ProgramLengthMinutes" class="text-danger"></span>
             </div>
-            <div class="visible-xs" style="padding-bottom:10px;"></div>
+            <div class="visible-xs mb-2"></div>
             <label asp-for="Program.SetupTimeMinutes" class="col-sm-2 col-form-label required-field"></label>
             <div class="col-sm-2">
                 <input asp-for="Program.SetupTimeMinutes" class="form-control form-control-lg" type="text" placeholder="" />
@@ -128,10 +128,10 @@
                 <input asp-for="Program.BreakdownTimeMinutes" class="form-control form-control-lg" type="text" placeholder="" />
                 <span asp-validation-for="Program.BreakdownTimeMinutes" class="text-danger"></span>
             </div>
-            <div class="visible-xs" style="padding-bottom:10px;"></div>
+            <div class="visible-xs mb-2"></div>
             <label asp-for="Program.BackToBackMinutes" class="col-sm-2 col-form-label required-field"></label>
             <div class="col-sm-2">
-                <select asp-for="Program.BackToBackMinutes" asp-items="Model.BackToBackSelection" class="form-control" type="text" ></select>
+                <select asp-for="Program.BackToBackMinutes" asp-items="Model.BackToBackSelection" class="form-select" type="text"></select>
                 <span asp-validation-for="Program.BackToBackMinutes" class="text-danger"></span>
             </div>
         </div>
@@ -187,7 +187,7 @@
                     </p>
                 </div>
                 <div class="col-sm-9 offset-sm-3">
-                    <select asp-for="Program.AllowStreaming" class="form-control">
+                    <select asp-for="Program.AllowStreaming" class="form-select">
                         <option value="true">Yes</option>
                         <option value="false">No</option>
                     </select>
@@ -202,7 +202,7 @@
                     </p>
                 </div>
                 <div class="col-sm-9 offset-sm-3">
-                    <select asp-for="Program.AllowArchiving" class="form-control">
+                    <select asp-for="Program.AllowArchiving" class="form-select">
                         <option value="true">Yes</option>
                         <option value="false">No</option>
                     </select>
@@ -221,11 +221,11 @@
                 </button>
                 @if (Model.PerformerId.HasValue)
                 {
-                    <a asp-action="Performer" asp-route-id="@Model.PerformerId" class="btn btn-lg btn-outline-secondary float-start" style="margin-right: 10px;">Return to Dashboard</a>
+                    <a asp-action="Performer" asp-route-id="@Model.PerformerId" class="btn btn-lg btn-outline-secondary float-start me-2">Return to Dashboard</a>
                 }
                 else
                 {
-                    <a asp-action="Program" asp-route-id="@Model.Program.Id" class="btn btn-lg btn-outline-secondary float-start" style="margin-right: 10px;">Return to Program</a>
+                    <a asp-action="Program" asp-route-id="@Model.Program.Id" class="btn btn-lg btn-outline-secondary float-start me-2">Return to Program</a>
                 }
             </div>
         </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/_PerformerCalendarPartial.cshtml b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/_PerformerCalendarPartial.cshtml
index ea5b31f98..6ed0ffee9 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/_PerformerCalendarPartial.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/PerformerManagement/_PerformerCalendarPartial.cshtml
@@ -112,7 +112,7 @@
                 <td>
                     Program Start Time:
                 </td>
-                <td style="padding-left:15px;" colspan="2">
+                <td class="pe-3" colspan="2">
                     Total Performer Time:
                 </td>
             </tr>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/PerformerScheduling/Index.cshtml b/src/GRA.Web/Areas/MissionControl/Views/PerformerScheduling/Index.cshtml
index c5d27a26f..003b697cb 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/PerformerScheduling/Index.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/PerformerScheduling/Index.cshtml
@@ -8,7 +8,7 @@
     <link rel="stylesheet" href="/css/performerregistration.min.css" />
 }
 
-<div class="row" style="margin-top: 1rem;">
+<div class="row mt-3">
     <div class="col-sm-8 offset-sm-2">
         <div class="card">
             <div class="card-header">
@@ -54,10 +54,10 @@
                         <p>
                             Scheduling has begun! Selections need to be compeleted by @Model.Settings.SchedulingClosed.Value.ToLongDateString() at @Model.Settings.SchedulingClosed.Value.ToLongTimeString().
                         </p>
-                        <div class="col-sm-6" style="margin-bottom: 0.5rem;">
+                        <div class="col-sm-6 my-4">
                             <a asp-action="Performers" class="btn btn-lg btn-outline-primary ">View Performers</a>
                         </div>
-                        <div class="col-sm-6" style="margin-bottom: 0.5rem;">
+                        <div class="col-sm-6 my-4">
                             <a asp-action="Kits" class="btn btn-lg btn-outline-primary">View Kits</a>
                         </div>
                     }
@@ -82,9 +82,9 @@
                         <form asp-action="Schedule" method="get" role="form">
                             <div class="row" style="margin-bottom:2rem;">
                                 <div class="col-9">
-                                    <select name="id" asp-items="Model.BranchList" class="form-control"></select>
+                                    <select name="id" asp-items="Model.BranchList" class="form-select"></select>
                                 </div>
-                                <div class="col-3" style="margin-top: 10px;">
+                                <div class="col-3">
                                     <button type="submit" class="btn btn-outline-primary">View</button>
                                 </div>
                             </div>
@@ -93,17 +93,17 @@
                     <p>
                         If you have any questions please contact <a href="@($"mailto:{Model.Settings.ContactEmail}")">@Model.Settings.ContactEmail</a>
                     </p>
-                    <div class="col-sm-6" style="margin-top: 10px;">
+                    <div class="col-sm-6 my-4">
                         <a asp-action="Performers" class="btn btn-lg btn-outline-primary ">View Performers</a>
                     </div>
-                    <div class="col-sm-6" style="margin-top: 10px;">
+                    <div class="col-sm-6 my-4">
                         <a asp-action="Kits" class="btn btn-lg btn-outline-primary">View Kits</a>
                     </div>
                 }
 
                 @if (Model.SchedulingStage >= GRA.Domain.Model.PsSchedulingStage.SchedulingOpen)
                 {
-                    <div class="clearfix" style="margin-bottom: 3rem;"></div>
+                    <div class="clearfix"></div>
                     <p class="lead"><strong>@Model.SystemName status</strong></p>
                     <table class="table table-striped table-hover table-sm"
                            style="width: 70%;">
diff --git a/src/GRA.Web/Areas/MissionControl/Views/PerformerScheduling/Kit.cshtml b/src/GRA.Web/Areas/MissionControl/Views/PerformerScheduling/Kit.cshtml
index 9b4f91626..935d21a6a 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/PerformerScheduling/Kit.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/PerformerScheduling/Kit.cshtml
@@ -33,7 +33,7 @@
     <div class="col-12 col-sm-5 col-md-4">
         @if (!string.IsNullOrWhiteSpace(Model.ImagePath))
         {
-            <div class="row" style="padding-bottom:15px;">
+            <div class="row pb-4">
                 <div class="col-12">
                     <img src="~/@Model.ImagePath" class="img-fluid" style="margin: 0 auto;" />
                 </div>
@@ -41,13 +41,13 @@
         }
         @if (Model.Kit.Images.Count > 1)
         {
-            <div class="row" style="padding-bottom:15px;">
+            <div class="row pb-4">
                 <div class="col-12" style="text-align:center;">
                     <a asp-action="KitImages" asp-route-id="@Model.Kit.Id" class="btn btn-outline-primary">View More Images</a>
                 </div>
             </div>
         }
-        <div class="row" style="padding-bottom:15px;">
+        <div class="row pb-4">
             <div class="col-12" style="text-align:center;">
                 <a asp-action="Kits" asp-route-page="@Model.ReturnPage" class="btn btn-outline-secondary">Return to List</a>
             </div>
@@ -110,7 +110,7 @@
                     <div class="mb-3">
                         <label asp-for="BranchSelection.BranchId" class="col-sm-3 col-form-label required-field"></label>
                         <div class="col-sm-9">
-                            <select asp-for="BranchSelection.BranchId" asp-items="Model.BranchList" class="form-control">
+                            <select asp-for="BranchSelection.BranchId" asp-items="Model.BranchList" class="form-select">
                                 <option></option>
                             </select>
                             <span id="BranchValidationMessage" asp-validation-for="BranchSelection.BranchId" class="text-danger"></span>
@@ -119,7 +119,7 @@
                     <div class="mb-3">
                         <label asp-for="BranchSelection.AgeGroupId" class="col-sm-3 col-form-label required-field"></label>
                         <div class="col-sm-9">
-                            <select asp-for="BranchSelection.AgeGroupId" asp-items="Model.AgeGroupList" class="form-control" disabled="disabled">
+                            <select asp-for="BranchSelection.AgeGroupId" asp-items="Model.AgeGroupList" class="form-select" disabled="disabled">
                                 <option></option>
                             </select>
                             <span asp-validation-for="BranchSelection.AgeGroupId" class="text-danger"></span>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/PerformerScheduling/Performer.cshtml b/src/GRA.Web/Areas/MissionControl/Views/PerformerScheduling/Performer.cshtml
index dcdd3f31e..d6038caaa 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/PerformerScheduling/Performer.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/PerformerScheduling/Performer.cshtml
@@ -37,7 +37,7 @@
     <div class="col-12 col-sm-5 col-md-4">
         @if (Model.Performer.Images != null)
         {
-            <div class="row" style="padding-bottom:15px;">
+            <div class="row pb-4">
                 <div class="col-12">
                     <img src="~/@Model.ImagePath" class="img-fluid" style="margin: 0 auto;" />
                 </div>
@@ -45,7 +45,7 @@
         }
         @if (Model.Performer.Images.Count > 1)
         {
-            <div class="row" style="padding-bottom:15px;">
+            <div class="row pb-4">
                 <div class="col-12" style="text-align:center;">
                     <a asp-action="PerformerImages" asp-route-id="@Model.Performer.Id" class="btn btn-primary">View More Images</a>
                 </div>
@@ -53,7 +53,7 @@
         }
         @if (!string.IsNullOrEmpty(Model?.ReferencesPath))
         {
-            <div class="row" style="padding-bottom:15px;">
+            <div class="row pb-4">
                 <div class="col-12" style="text-align:center;">
                     <a aria-label="View References (Opens new window)"
                    href="~/@Model.ReferencesPath"
@@ -62,7 +62,7 @@
                 </div>
             </div>
         }
-        <div class="row" style="padding-bottom:15px;">
+        <div class="row pb-4">
             <div class="col-12" style="text-align:center;">
                 <a asp-action="Performers" asp-route-page="@Model.ReturnPage" class="btn btn-outline-secondary">Return to List</a>
             </div>
@@ -119,7 +119,7 @@
                 <strong>@(Model.Performer.AllBranches || Model.BranchAvailability.Count == Model.System.Branches.Count ? "all" : $"{Model.BranchAvailability.Count} of {Model.System.Branches.Count}")</strong>
                 libraries in your system.
             </div>
-            <button type="button" class="btn btn-outline-primary" style="margin-top:10px;" data-bs-toggle="modal" data-bs-target="#branchModal">View Locations</button>
+            <button type="button" class="btn btn-outline-primary mt-2" data-bs-toggle="modal" data-bs-target="#branchModal">View Locations</button>
         </div>
     </div>
 
diff --git a/src/GRA.Web/Areas/MissionControl/Views/PerformerScheduling/Program.cshtml b/src/GRA.Web/Areas/MissionControl/Views/PerformerScheduling/Program.cshtml
index c71547e45..460d076cc 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/PerformerScheduling/Program.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/PerformerScheduling/Program.cshtml
@@ -42,7 +42,7 @@
     <div class="col-12 col-sm-5 col-md-4">
         @if (!string.IsNullOrWhiteSpace(Model.Image))
         {
-            <div class="row" style="padding-bottom:15px;">
+            <div class="row pb-5">
                 <div class="col-12">
                     <img src="~/@Model.Image" class="img-fluid" style="margin: 0 auto;" />
                 </div>
@@ -50,7 +50,7 @@
         }
         @if (Model.Program.Images.Count > 1)
         {
-            <div class="row" style="padding-bottom:15px;">
+            <div class="row pb-5">
                 <div class="col-12" style="text-align:center;">
                     <a asp-action="ProgramImages" asp-route-id="@Model.Program.Id" asp-route-list="@Model.List" asp-route-ageGroup="@Model.AgeGroup" class="btn btn-primary">View More Images</a>
                 </div>
@@ -58,7 +58,7 @@
         }
         @if (Model.List == true)
         {
-            <div class="row" style="padding-bottom:15px;">
+            <div class="row pb-5">
                 <div class="col-12" style="text-align:center;">
                     <a aria-label="View Performer (Opens new window)"
                        asp-action="Performer"
@@ -67,7 +67,7 @@
                        target="_blank">View Performer</a>
                 </div>
             </div>
-            <div class="row" style="padding-bottom:15px;">
+            <div class="row pb-5">
                 <div class="col-12" style="text-align:center;">
                     <a asp-action="Programs" asp-route-page="@Model.ReturnPage" asp-route-ageGroup="@Model.AgeGroup" class="btn btn-outline-secondary">Return to List</a>
                 </div>
@@ -75,7 +75,7 @@
         }
         else
         {
-            <div class="row" style="padding-bottom:15px;">
+            <div class="row pb-5">
                 <div class="col-12" style="text-align:center;">
                     <a asp-action="Performer" asp-route-id="@Model.Program.PerformerId" class="btn btn-outline-secondary">Return to Performer</a>
                 </div>
@@ -143,7 +143,7 @@
                 <strong>@(Model.AllBranches || Model.BranchAvailability.Count == Model.System.Branches.Count ? "all" : $"{Model.BranchAvailability.Count} of {Model.System.Branches.Count}")</strong>
                 libraries in your system.
             </div>
-            <button type="button" class="btn btn-outline-primary" style="margin-top:10px;" data-bs-toggle="modal" data-bs-target="#branchModal">View Locations</button>
+            <button type="button" class="btn btn-outline-primary mt-2" data-bs-toggle="modal" data-bs-target="#branchModal">View Locations</button>
         </div>
     </div>
 </div>
@@ -184,7 +184,7 @@
                         <div class="mb-3">
                             <label asp-for="BranchSelection.BranchId" class="col-sm-3 col-form-label required-field"></label>
                             <div class="col-sm-9">
-                                <select asp-for="BranchSelection.BranchId" asp-items="Model.BranchList" class="form-control">
+                                <select asp-for="BranchSelection.BranchId" asp-items="Model.BranchList" class="form-select">
                                     <option></option>
                                 </select>
                                 <span id="BranchValidationMessage" asp-validation-for="BranchSelection.BranchId" class="text-danger"></span>
@@ -193,7 +193,7 @@
                         <div class="mb-3">
                             <label asp-for="BranchSelection.AgeGroupId" class="col-sm-3 col-form-label required-field"></label>
                             <div class="col-sm-9">
-                                <select asp-for="BranchSelection.AgeGroupId" asp-items="Model.AgeGroupList" class="form-control" disabled="disabled">
+                                <select asp-for="BranchSelection.AgeGroupId" asp-items="Model.AgeGroupList" class="form-select" disabled="disabled">
                                     <option></option>
                                 </select>
                                 <span asp-validation-for="BranchSelection.AgeGroupId" class="text-danger"></span>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/PerformerScheduling/SelectProgram.cshtml b/src/GRA.Web/Areas/MissionControl/Views/PerformerScheduling/SelectProgram.cshtml
index a3a94cc36..d09177e98 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/PerformerScheduling/SelectProgram.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/PerformerScheduling/SelectProgram.cshtml
@@ -191,7 +191,7 @@
                         </td>
                         <td id="programDuration" style="padding-left: 15px; width: 175px;"></td>
                         <td>
-                            <button id="checkTime" type="button" class="btn btn-primary" style="margin-left:15px;" disabled="disabled">Check Time</button>
+                            <button id="checkTime" type="button" class="btn btn-primary ps-5" disabled="disabled">Check Time</button>
                         </td>
                     </tr>
                 </table>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Programs/Detail.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Programs/Detail.cshtml
index 442edd977..d730d22c3 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Programs/Detail.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Programs/Detail.cshtml
@@ -33,13 +33,13 @@
                       data-bs-toggle="tooltip"
                       data-bs-placement="top"></span>
                 <button type="button" class="btn btn-sm btn-outline-primary" id="previewAlertButton" data-bs-toggle="modal" data-bs-target="#previewAlertModal" style="margin-bottom: 0.25rem; margin-left: 0.5rem;">Preview alert</button>
-                <select asp-for="Program.DashboardAlertType" asp-items="Html.GetEnumSelectList<GRA.Domain.Model.AlertType>()" class="form-control" style="margin-bottom: 1rem;"></select>
+                <select asp-for="Program.DashboardAlertType" asp-items="Html.GetEnumSelectList<GRA.Domain.Model.AlertType>()" class="form-select" style="margin-bottom: 1rem;"></select>
                 <textarea asp-for="Program.DashboardAlert" class="form-control"></textarea>
             </div>
 
             <div class="mb-3">
                 <label class="col-form-label">Ask Age</label>
-                <select asp-for="AgeValues" class="form-control">
+                <select asp-for="AgeValues" class="form-select">
                     <option value="0">Don't Ask</option>
                     <option value="1">Ask</option>
                     <option value="2">Ask (Required)</option>
@@ -49,7 +49,7 @@
 
             <div class="mb-3">
                 <label class="col-form-label">Ask School</label>
-                <select asp-for="SchoolValues" class="form-control">
+                <select asp-for="SchoolValues" class="form-select">
                     <option value="0">Don't Ask</option>
                     <option value="1">Ask</option>
                     <option value="2">Ask (Required)</option>
@@ -77,13 +77,13 @@
 
             <div class="mb-3">
                 <label asp-for="Program.PointTranslationId" class="col-form-label"></label>
-                <select asp-for="Program.PointTranslationId" asp-items="Model.PointTranslationList" class="form-control" disabled="@(Model.PointTranslationList.Count() == 0 ? "disabled" : null)"></select>
+                <select asp-for="Program.PointTranslationId" asp-items="Model.PointTranslationList" class="form-select" disabled="@(Model.PointTranslationList.Count() == 0 ? "disabled" : null)"></select>
                 <span asp-validation-for="Program.PointTranslationId" class="text-danger"></span>
             </div>
 
             <div class="mb-3">
                 <label asp-for="Program.DailyLiteracyTipId" class="col-form-label"></label>
-                <select asp-for="Program.DailyLiteracyTipId" asp-items="Model.DailyLiteracyTipList" class="form-control" disabled="@(Model.DailyLiteracyTipList.Count() == 0 ? "disabled" : null)">
+                <select asp-for="Program.DailyLiteracyTipId" asp-items="Model.DailyLiteracyTipList" class="form-select" disabled="@(Model.DailyLiteracyTipList.Count() == 0 ? "disabled" : null)">
                     <option></option>
                 </select>
                 <span asp-validation-for="Program.DailyLiteracyTipId" class="text-danger"></span>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Programs/Index.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Programs/Index.cshtml
index 230634c12..2c1dc7a85 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Programs/Index.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Programs/Index.cshtml
@@ -3,7 +3,7 @@
 @await Html.PartialAsync("_ProgramsPartial")
 
 <form method="get" role="form">
-    <div class="row row-spacing" style="padding-top: 10px;">
+    <div class="row row-spacing pt-2">
         <div class="col-8">
             <input asp-for="Search" class="form-control" />
         </div>
@@ -14,13 +14,13 @@
     </div>
 </form>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row py-4">
     <div class="col-12">
         <a asp-action="Create" class="btn btn-outline-primary">Add a Program</a>
     </div>
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row py-2">
     <div class="col-12">
         @if (Model.Programs.Count() == 0)
         {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Programs/PointTranslationDetail.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Programs/PointTranslationDetail.cshtml
index 026fcf02b..2a6407fa8 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Programs/PointTranslationDetail.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Programs/PointTranslationDetail.cshtml
@@ -1,6 +1,6 @@
 @model GRA.Controllers.ViewModel.MissionControl.Programs.PointTranslationDetailViewModel
 
-<form asp-action="@Model.Action" method="post" role="form" style="padding-top:10px;">
+<form asp-action="@Model.Action" method="post" role="form" class="py-2">
     <input asp-for="PointTranslation.Id" type="hidden" />
     <input asp-for="Action" type="hidden" />
     <input asp-for="HasBeenUsed" type="hidden" />
@@ -15,7 +15,7 @@
             </div>
             <div class="mb-3">
                 <label asp-for="PointTranslation.IsSingleEvent" class="col-form-label"></label>
-                <select asp-for="PointTranslation.IsSingleEvent" class="form-control" disabled="@(Model.HasBeenUsed ? "readonly" : null)">
+                <select asp-for="PointTranslation.IsSingleEvent" class="form-select" disabled="@(Model.HasBeenUsed ? "readonly" : null)">
                     <option value="false">No</option>
                     <option value="true">Yes</option>
                 </select>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Programs/PointTranslations.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Programs/PointTranslations.cshtml
index c0e531826..b11a7ed4b 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Programs/PointTranslations.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Programs/PointTranslations.cshtml
@@ -2,7 +2,7 @@
 
 @await Html.PartialAsync("_ProgramsPartial")
 
-<div class="row" style="padding: 10px 0;">
+<div class="row py-2">
     <div class="col-12">
         @if (Model.PointTranslations.Count() == 0)
         {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Questionnaires/Edit.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Questionnaires/Edit.cshtml
index 8dbd43693..47b899ff5 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Questionnaires/Edit.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Questionnaires/Edit.cshtml
@@ -55,8 +55,7 @@
                         <span class="fas fa-lg fa-minus-circle text-danger removeRow"></span>
                     }
                     <button type="button"
-                            class="btn btn-outline-primary float-end editQuestionButton"
-                            style="margin-right:10px;"
+                            class="btn btn-outline-primary float-end editQuestionButton me-4"
                             data-id="@question.Id"
                             data-name="@question.Name"
                             data-text="@question.Text"
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Questionnaires/Index.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Questionnaires/Index.cshtml
index 56ed91e71..7821e7ed5 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Questionnaires/Index.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Questionnaires/Index.cshtml
@@ -1,12 +1,12 @@
 @model GRA.Controllers.ViewModel.MissionControl.Questionnaires.QuestionnairesListViewModel
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         <a asp-action="Create" class="btn btn-outline-primary">Create a new questionnaire</a>
     </div>
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row py-2">
     <div class="col-12">
         @if (Model.Questionnaires.Count() == 0)
         {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Reporting/ActivityByProgramCriteria.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Reporting/ActivityByProgramCriteria.cshtml
index b3eca9b60..1e719d7fb 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Reporting/ActivityByProgramCriteria.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Reporting/ActivityByProgramCriteria.cshtml
@@ -39,7 +39,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="SystemId" class="col-form-label"></label>
-            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-control">
+            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-select">
                 <option value="">All systems</option>
             </select>
         </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Reporting/BadgeCriteria.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Reporting/BadgeCriteria.cshtml
index 614413a3e..c1c07d78f 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Reporting/BadgeCriteria.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Reporting/BadgeCriteria.cshtml
@@ -5,7 +5,7 @@
     <input asp-for="BadgeRequiredList" type="hidden" />
     <input asp-for="ChallengeRequiredList" type="hidden" />
 
-    <div class="row" style="padding: 10px 0;">
+    <div class="row my-4">
         <div class="col-12">
             <btn type="button" class="btn btn-secondary time-selector" data-start="null" data-end="null">Entire program</btn>
             <btn type="button" class="btn btn-secondary time-selector" data-start="@DateTime.Now.AddDays(-8).ToString("MM/dd/yyyy")" data-end="@DateTime.Now.AddDays(-1).ToString("MM/dd/yyyy")">Last 7 days</btn>
@@ -33,7 +33,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="SystemId" class="col-form-label"></label>
-            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-control">
+            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-select">
                 <option value="">All systems</option>
             </select>
         </div>
@@ -128,7 +128,7 @@
                         <div class="card-body">
                             <div class="row">
                                 <div class="col-12">
-                                    <ul class="nav nav-pills" style="padding: 10px 0;">
+                                    <ul class="nav nav-pills py-2">
                                         <li id="All" class="active requirementScope">
                                             <a>All</a>
                                         </li>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Reporting/BadgeTopScoresCriteria.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Reporting/BadgeTopScoresCriteria.cshtml
index a3ef9e107..67a2e1a55 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Reporting/BadgeTopScoresCriteria.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Reporting/BadgeTopScoresCriteria.cshtml
@@ -5,7 +5,7 @@
     <input asp-for="BadgeRequiredList" type="hidden" />
     <input asp-for="ChallengeRequiredList" type="hidden" />
 
-    <div class="row" style="padding: 10px 0;">
+    <div class="row my-4">
         <div class="col-12">
             <btn type="button" class="btn btn-secondary time-selector" data-start="null" data-end="null">Entire program</btn>
             <btn type="button" class="btn btn-secondary time-selector" data-start="@DateTime.Now.AddDays(-8).ToString("MM/dd/yyyy")" data-end="@DateTime.Now.AddDays(-1).ToString("MM/dd/yyyy")">Last 7 days</btn>
@@ -33,7 +33,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="SystemId" class="col-form-label"></label>
-            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-control">
+            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-select">
                 <option value="">All systems</option>
             </select>
         </div>
@@ -128,7 +128,7 @@
                         <div class="card-body">
                             <div class="row">
                                 <div class="col-12">
-                                    <ul class="nav nav-pills" style="padding: 10px 0;">
+                                    <ul class="nav nav-pills py-2">
                                         <li id="All" class="active requirementScope">
                                             <a>All</a>
                                         </li>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Reporting/CommunityExperienceCriteria.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Reporting/CommunityExperienceCriteria.cshtml
index 8255cd597..2e3a59e4c 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Reporting/CommunityExperienceCriteria.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Reporting/CommunityExperienceCriteria.cshtml
@@ -6,7 +6,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="SystemId" class="col-form-label"></label>
-            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-control">
+            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-select">
                 <option></option>
             </select>
         </div>
@@ -15,7 +15,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="BranchId" class="col-form-label"></label>
-            <select asp-for="BranchId" asp-items="Model.BranchList" class="form-control">
+            <select asp-for="BranchId" asp-items="Model.BranchList" class="form-select">
                 <option></option>
             </select>
         </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Reporting/CurrentStatusCriteria.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Reporting/CurrentStatusCriteria.cshtml
index ade6f23b5..0e1260cbd 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Reporting/CurrentStatusCriteria.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Reporting/CurrentStatusCriteria.cshtml
@@ -10,7 +10,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="SystemId" class="col-form-label"></label>
-            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-control">
+            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-select">
                 <option value="">All systems</option>
             </select>
         </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Reporting/GroupVendorCodeCriteria.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Reporting/GroupVendorCodeCriteria.cshtml
index 61b139ada..ca914cb67 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Reporting/GroupVendorCodeCriteria.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Reporting/GroupVendorCodeCriteria.cshtml
@@ -6,7 +6,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="GroupInfoId" class="col-form-label"></label>
-            <select asp-for="GroupInfoId" asp-items="Model.GroupInfosList" class="form-control" data-val="true" data-val-required="Please select a group.">
+            <select asp-for="GroupInfoId" asp-items="Model.GroupInfosList" class="form-select" data-val="true" data-val-required="Please select a group.">
                 <option></option>
             </select>
             <span asp-validation-for="GroupInfoId" class="text-danger"></span>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Reporting/ParticipantCountandMinutesByProgramCriteria.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Reporting/ParticipantCountandMinutesByProgramCriteria.cshtml
index 4ac8c1583..f9a6624bd 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Reporting/ParticipantCountandMinutesByProgramCriteria.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Reporting/ParticipantCountandMinutesByProgramCriteria.cshtml
@@ -10,7 +10,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="SystemId" class="col-form-label"></label>
-            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-control"></select>
+            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-select"></select>
         </div>
     </div>
 
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Reporting/ParticipantPrizeCriteria.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Reporting/ParticipantPrizeCriteria.cshtml
index bf19f7a6c..9c2906e88 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Reporting/ParticipantPrizeCriteria.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Reporting/ParticipantPrizeCriteria.cshtml
@@ -6,7 +6,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="SystemId" class="col-form-label"></label>
-            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-control">
+            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-select">
                 <option value="">All Systems</option>
             </select>
         </div>
@@ -15,7 +15,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="BranchId" class="col-form-label"></label>
-            <select asp-for="BranchId" asp-items="Model.BranchList" class="form-control">
+            <select asp-for="BranchId" asp-items="Model.BranchList" class="form-select">
                 <option>All Branches</option>
             </select>
         </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Reporting/ParticipantProgressCriteria.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Reporting/ParticipantProgressCriteria.cshtml
index ad59f6c39..420e14c39 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Reporting/ParticipantProgressCriteria.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Reporting/ParticipantProgressCriteria.cshtml
@@ -8,7 +8,7 @@
       style="margin-top: 2rem; margin-bottom: 2rem;">
     <input asp-for="ReportId" type="hidden" />
 
-    <div class="row" style="padding: 10px 0;">
+    <div class="row my-4">
         <div class="col-12">
             <btn type="button" class="btn btn-secondary time-selector" data-start="null" data-end="null">Entire program</btn>
             <btn type="button" class="btn btn-secondary time-selector" data-start="@DateTime.Now.AddDays(-8).ToString("MM/dd/yyyy")" data-end="@DateTime.Now.AddDays(-1).ToString("MM/dd/yyyy")">Last 7 days</btn>
@@ -36,7 +36,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="SystemId" class="col-form-label"></label>
-            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-control">
+            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-select">
                 <option value="">All systems</option>
             </select>
         </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Reporting/PrizeRedemptionCountCriteria.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Reporting/PrizeRedemptionCountCriteria.cshtml
index 50b2a41f1..1b87aef0f 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Reporting/PrizeRedemptionCountCriteria.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Reporting/PrizeRedemptionCountCriteria.cshtml
@@ -6,7 +6,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="SystemId" class="col-form-label"></label>
-            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-control">
+            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-select">
                 <option value="">All Systems</option>
             </select>
         </div>
@@ -16,7 +16,7 @@
         <div class="col-12">
             <label asp-for="TriggerList" class="col-form-label"></label>
             <input id="triggerPlaceholder" class="form-control"/>
-            <select asp-for="TriggerList" asp-items="Model.PrizeList" class="form-control hidden" multiple="multiple" data-val="true" data-val-required="Please select one or more triggers."></select>
+            <select asp-for="TriggerList" asp-items="Model.PrizeList" class="form-select hidden" multiple="multiple" data-val="true" data-val-required="Please select one or more triggers."></select>
             <span asp-validation-for="TriggerList" class="text-danger"></span>
         </div>
     </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Reporting/PrizeRedemptionCriteria.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Reporting/PrizeRedemptionCriteria.cshtml
index 9dfb71b92..47d688054 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Reporting/PrizeRedemptionCriteria.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Reporting/PrizeRedemptionCriteria.cshtml
@@ -6,7 +6,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="SystemId" class="col-form-label"></label>
-            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-control">
+            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-select">
             </select>
         </div>
     </div>
@@ -14,7 +14,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="BranchId" class="col-form-label"></label>
-            <select asp-for="BranchId" asp-items="Model.BranchList" class="form-control">
+            <select asp-for="BranchId" asp-items="Model.BranchList" class="form-select">
                 <option>All Branches</option>
             </select>
         </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Reporting/RegistrationsAndAchieversBySchoolCriteria.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Reporting/RegistrationsAndAchieversBySchoolCriteria.cshtml
index 196379672..adbf92d3a 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Reporting/RegistrationsAndAchieversBySchoolCriteria.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Reporting/RegistrationsAndAchieversBySchoolCriteria.cshtml
@@ -6,7 +6,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="SchoolDistrictId" class="col-form-label"></label>
-            <select asp-for="SchoolDistrictId" asp-items="Model.SchoolDistrictList" class="form-control">
+            <select asp-for="SchoolDistrictId" asp-items="Model.SchoolDistrictList" class="form-select">
             </select>
         </div>
     </div>
@@ -14,7 +14,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="SchoolId" class="col-form-label"></label>
-            <select asp-for="SchoolId" asp-items="Model.SchoolList" class="form-control">
+            <select asp-for="SchoolId" asp-items="Model.SchoolList" class="form-select">
                 <option></option>
             </select>
         </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Reporting/RegistrationsAndAchieversCriteria.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Reporting/RegistrationsAndAchieversCriteria.cshtml
index 652c1e403..fe28a02a0 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Reporting/RegistrationsAndAchieversCriteria.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Reporting/RegistrationsAndAchieversCriteria.cshtml
@@ -3,7 +3,7 @@
 <form asp-controller="Reporting" asp-action="Run" method="post" role="form" class="form-horizontal" style="margin-top: 2rem; margin-bottom: 2rem;">
     <input asp-for="ReportId" type="hidden" />
 
-    <div class="row" style="padding: 10px 0;">
+    <div class="row my-4">
         <div class="col-12">
             <btn type="button" class="btn btn-secondary time-selector" data-start="null" data-end="null">Entire program</btn>
             <btn type="button" class="btn btn-secondary time-selector" data-start="@DateTime.Now.AddDays(-8).ToString("MM/dd/yyyy")" data-end="@DateTime.Now.AddDays(-1).ToString("MM/dd/yyyy")">Last 7 days</btn>
@@ -31,7 +31,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="SystemId" class="col-form-label"></label>
-            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-control">
+            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-select">
                 <option value="">All systems</option>
             </select>
         </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Reporting/RemainingVendorPrizePick-upCriteria.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Reporting/RemainingVendorPrizePick-upCriteria.cshtml
index 635b530ff..6ba57525b 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Reporting/RemainingVendorPrizePick-upCriteria.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Reporting/RemainingVendorPrizePick-upCriteria.cshtml
@@ -6,7 +6,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="SystemId" class="col-form-label"></label>
-            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-control">
+            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-select">
                 <option></option>
             </select>
         </div>
@@ -15,7 +15,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="BranchId" class="col-form-label">Select a pick-up branch</label>
-            <select asp-for="BranchId" asp-items="Model.BranchList" class="form-control">
+            <select asp-for="BranchId" asp-items="Model.BranchList" class="form-select">
             </select>
         </div>
     </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Reporting/TopScoresCriteria.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Reporting/TopScoresCriteria.cshtml
index e6ad807fa..144c7f820 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Reporting/TopScoresCriteria.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Reporting/TopScoresCriteria.cshtml
@@ -6,7 +6,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="SystemId" class="col-form-label"></label>
-            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-control">
+            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-select">
                 <option></option>
             </select>
         </div>
@@ -15,7 +15,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="BranchId" class="col-form-label"></label>
-            <select asp-for="BranchId" asp-items="Model.BranchList" class="form-control">
+            <select asp-for="BranchId" asp-items="Model.BranchList" class="form-select">
                 <option></option>
             </select>
         </div>
@@ -24,7 +24,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="ProgramId" class="col-form-label"></label>
-            <select asp-for="ProgramId" asp-items="Model.ProgramList" class="form-control">
+            <select asp-for="ProgramId" asp-items="Model.ProgramList" class="form-select">
                 <option></option>
             </select>
         </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Reporting/VendorCodeByProgramCriteria.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Reporting/VendorCodeByProgramCriteria.cshtml
index d7c22507e..49d845d2c 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Reporting/VendorCodeByProgramCriteria.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Reporting/VendorCodeByProgramCriteria.cshtml
@@ -6,7 +6,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="SystemId" class="col-form-label"></label>
-            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-control">
+            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-select">
                 <option value="">All systems</option>
             </select>
         </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Reporting/VendorCodeCriteria.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Reporting/VendorCodeCriteria.cshtml
index f9de9dbdb..534df3b61 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Reporting/VendorCodeCriteria.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Reporting/VendorCodeCriteria.cshtml
@@ -6,7 +6,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="SystemId" class="col-form-label"></label>
-            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-control">
+            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-select">
                 <option value="">All systems</option>
             </select>
         </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Reporting/VendorCodeDonationsCriteria.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Reporting/VendorCodeDonationsCriteria.cshtml
index 4745c8166..bcae2b50d 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Reporting/VendorCodeDonationsCriteria.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Reporting/VendorCodeDonationsCriteria.cshtml
@@ -6,7 +6,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="VendorCodeTypeId" class="col-form-label"></label>
-            <select asp-for="VendorCodeTypeId" asp-items="Model.VendorCodeTypeList" class="form-control" data-val="true" data-val-required="Please select a vendor code."></select>
+            <select asp-for="VendorCodeTypeId" asp-items="Model.VendorCodeTypeList" class="form-select" data-val="true" data-val-required="Please select a vendor code."></select>
             <span asp-validation-for="VendorCodeTypeId" class="text-danger"></span>
         </div>
     </div>
@@ -14,7 +14,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="SystemId" class="col-form-label"></label>
-            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-control">
+            <select asp-for="SystemId" asp-items="Model.SystemList" class="form-select">
                 <option value="">All systems</option>
             </select>
         </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Reporting/VendorPendingPrizeCriteria.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Reporting/VendorPendingPrizeCriteria.cshtml
index d6193810f..f9213e977 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Reporting/VendorPendingPrizeCriteria.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Reporting/VendorPendingPrizeCriteria.cshtml
@@ -6,7 +6,7 @@
     <div class="mb-3">
         <div class="col-12">
             <label asp-for="VendorCodeTypeId" class="col-form-label"></label>
-            <select asp-for="VendorCodeTypeId" asp-items="Model.VendorCodeTypeList" class="form-control" data-val="true" data-val-required="Please select a vendor code."></select>
+            <select asp-for="VendorCodeTypeId" asp-items="Model.VendorCodeTypeList" class="form-select" data-val="true" data-val-required="Please select a vendor code."></select>
             <span asp-validation-for="VendorCodeTypeId" class="text-danger"></span>
         </div>
     </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Reporting/View.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Reporting/View.cshtml
index 8e40ccedd..fcc541e8c 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Reporting/View.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Reporting/View.cshtml
@@ -10,7 +10,7 @@
     </div>
 }
 
-<div class="row" style="padding-top:10px;">
+<div class="row my-4">
     <div class="col-12">
         <table class="table table-bordered" style="border: none;margin-bottom:0; width:auto;">
             @if (Model.StartDate.HasValue)
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Roles/AuthorizationCodes.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Roles/AuthorizationCodes.cshtml
index 7f65e5563..47a65bd69 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Roles/AuthorizationCodes.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Roles/AuthorizationCodes.cshtml
@@ -2,7 +2,7 @@
 
 @await Html.PartialAsync("_RolesPartial")
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         <a class="btn btn-outline-primary"
            data-bs-toggle="modal"
@@ -10,7 +10,7 @@
     </div>
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         @if (Model.AuthorizationCodes.Count() == 0)
         {
@@ -116,7 +116,7 @@
                                    class="col-form-label"></label>
                             <select id="addRole" asp-for="AuthorizationCode.RoleId"
                                     asp-items="Model.RoleList"
-                                    class="form-control"></select>
+                                    class="form-select"></select>
                             <span asp-validation-for="AuthorizationCode.RoleId"
                                   class="text-danger"></span>
                         </div>
@@ -143,7 +143,7 @@
                                   data-bs-toggle="tooltip"
                                   title="Single use codes may be used once and then are deactivated."></span>
                             <select id="addSingle" asp-for="AuthorizationCode.IsSingleUse"
-                                    class="form-control">
+                                    class="form-select">
                                 <option value="true">Single Use</option>
                                 <option value="false">Multiple Use</option>
                             </select>
@@ -159,7 +159,7 @@
                             <select id="addProgram"
                                     asp-for="AuthorizationCode.ProgramId"
                                     asp-items="Model.ProgramList"
-                                    class="form-control">
+                                    class="form-select">
                                 <option value="null" selected>None</option>
                             </select>
                         </div>
@@ -172,7 +172,7 @@
                             <select id="addBranch"
                                     asp-for="AuthorizationCode.BranchId"
                                     asp-items="Model.BranchList"
-                                    class="form-control">
+                                    class="form-select">
                                 <option value="null" selected>None</option>
                             </select>
                         </div>
@@ -184,7 +184,7 @@
                                   title="Use a shortened, single-page sign-up to join with this code."></span>
                             <select id="addSinglePage"
                                     asp-for="AuthorizationCode.SinglePageSignUp"
-                                    class="form-control">
+                                    class="form-select">
                                 <option value="False">No</option>
                                 <option value="True">Yes</option>
                             </select>
@@ -246,7 +246,7 @@
                             <select id="editRole"
                                     asp-for="AuthorizationCode.RoleId"
                                     asp-items="Model.RoleList"
-                                    class="form-control"></select>
+                                    class="form-select"></select>
                             <span asp-validation-for="AuthorizationCode.RoleId"
                                   class="text-danger"></span>
                         </div>
@@ -275,7 +275,7 @@
                                   title="Single use codes may be used once and then are deactivated."></span>
                             <select id="editSingle"
                                     asp-for="AuthorizationCode.IsSingleUse"
-                                    class="form-control">
+                                    class="form-select">
                                 <option value="true">Single Use</option>
                                 <option value="false">Multiple Use</option>
                             </select>
@@ -291,7 +291,7 @@
                             <select id="editProgram"
                                     asp-for="AuthorizationCode.ProgramId"
                                     asp-items="Model.ProgramList"
-                                    class="form-control">
+                                    class="form-select">
                                 <option value="null" selected>None</option>
                             </select>
                         </div>
@@ -304,7 +304,7 @@
                             <select id="editBranch"
                                     asp-for="AuthorizationCode.BranchId"
                                     asp-items="Model.BranchList"
-                                    class="form-control">
+                                    class="form-select">
                                 <option value="null" selected>None</option>
                             </select>
                         </div>
@@ -316,7 +316,7 @@
                                   title="Use a shortened, single-page sign-up to join with this code."></span>
                             <select id="editSinglePage"
                                     asp-for="AuthorizationCode.SinglePageSignUp"
-                                    class="form-control">
+                                    class="form-select">
                                 <option value="False">No</option>
                                 <option value="True">Yes</option>
                             </select>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Roles/Detail.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Roles/Detail.cshtml
index 7fa3e6e64..acb7dc1bd 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Roles/Detail.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Roles/Detail.cshtml
@@ -1,6 +1,6 @@
 @model GRA.Controllers.ViewModel.MissionControl.Roles.RoleDetailViewModel
 
-<form asp-action="@Model.Action" method="post" role="form" enctype="multipart/form-data" style="padding-top:10px;">
+<form asp-action="@Model.Action" method="post" role="form" enctype="multipart/form-data" class="pt-2">
     <input asp-for="Action" type="hidden" />
     @if (Model.Action == nameof(RolesController.Edit))
     {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Roles/Index.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Roles/Index.cshtml
index 2f018e598..edb289ae1 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Roles/Index.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Roles/Index.cshtml
@@ -2,13 +2,13 @@
 
 @await Html.PartialAsync("_RolesPartial")
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         <a asp-action="Create" class="btn btn-outline-primary">Add a Role</a>
     </div>
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         @if (Model.Roles.Count() == 0)
         {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Schools/Districts.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Schools/Districts.cshtml
index 357373901..6552a25b2 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Schools/Districts.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Schools/Districts.cshtml
@@ -14,7 +14,7 @@
     </div>
 </form>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         <a class="btn btn-outline-primary"
            data-bs-toggle="modal"
@@ -22,7 +22,7 @@
     </div>
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row">
     <div class="col-12">
         @if (Model.SchoolDistricts.Count() == 0)
         {
@@ -46,7 +46,7 @@
                                     @district.Name
                                 </td>
                                 <td>
-                                    <div class="btn-group-sm">
+                                    <div class="btn-toolbar">
                                         <button type="button"
                                                 class="btn btn-outline-primary btn-sm"
                                                 data-bs-toggle="modal"
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Schools/Index.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Schools/Index.cshtml
index 6eba34c28..e88073271 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Schools/Index.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Schools/Index.cshtml
@@ -14,7 +14,7 @@
     </div>
 </form>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         <a class="btn btn-outline-primary"
            data-bs-toggle="modal"
@@ -22,7 +22,7 @@
     </div>
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         @if (Model.Schools.Count() == 0)
         {
@@ -50,7 +50,7 @@
                                     @school.SchoolDistrict.Name
                                 </td>
                                 <td class="gra-mc-icon">
-                                    <div class="btn-group-sm">
+                                    <div class="btn-toolbar">
                                         <button type="submit"
                                                 class="btn btn-outline-primary btn-sm"
                                                 data-bs-toggle="modal"
@@ -118,7 +118,7 @@
                             <label asp-for="School.SchoolDistrictId" class="col-form-label"></label>
                             <select id="addDistrict"
                                     asp-for="School.SchoolDistrictId"
-                                    class="form-control schoolDistrict">
+                                    class="form-select schoolDistrict">
                                 <option></option>
                                 @foreach (var district in Model.DistrictList)
                                 {
@@ -183,7 +183,7 @@
                             <label asp-for="School.SchoolDistrictId" class="col-form-label"></label>
                             <select id="editDistrict"
                                     asp-for="School.SchoolDistrictId"
-                                    class="form-control schoolDistrict">
+                                    class="form-select schoolDistrict">
                                 @foreach (var district in Model.DistrictList)
                                 {
                                     <option value="@district.Id">@district.Name</option>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Sites/Configuration.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Sites/Configuration.cshtml
index 246fd8327..7295c98a0 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Sites/Configuration.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Sites/Configuration.cshtml
@@ -17,7 +17,7 @@
     <div class="row row-spacing">
         <div class="col-12 col-sm-6">
             <label asp-for="SinglePageSignUp" class="col-form-label"></label>
-            <select asp-for="SinglePageSignUp" class="form-control">
+            <select asp-for="SinglePageSignUp" class="form-select">
                 <option value="false">No</option>
                 <option value="true">Yes</option>
             </select>
@@ -25,7 +25,7 @@
         </div>
         <div class="col-12 col-sm-6">
             <label asp-for="RequirePostalCode" class="col-form-label"></label>
-            <select asp-for="RequirePostalCode" class="form-control">
+            <select asp-for="RequirePostalCode" class="form-select">
                 <option value="false">No</option>
                 <option value="true">Yes</option>
             </select>
@@ -43,7 +43,7 @@
         <div class="col-12 col-sm-6">
             <label asp-for="IsHttpsForced" class="col-form-label"></label>
             <span class="far fa-question-circle wide-tooltip" title="If your site is placed behind a reverse proxy which handles SSL for you set this to true." data-bs-toggle="tooltip" data-bs-placement="top"></span>
-            <select asp-for="IsHttpsForced" class="form-control">
+            <select asp-for="IsHttpsForced" class="form-select">
                 <option value="false">No</option>
                 <option value="true">Yes</option>
             </select>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Sites/Index.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Sites/Index.cshtml
index 743120f0b..58a3ff295 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Sites/Index.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Sites/Index.cshtml
@@ -1,6 +1,6 @@
 @model GRA.Controllers.ViewModel.MissionControl.Sites.SiteListViewModel
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         @if (Model.Sites.Count() == 0)
         {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Sites/Settings.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Sites/Settings.cshtml
index de6104dbb..377d52b1d 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Sites/Settings.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Sites/Settings.cshtml
@@ -20,7 +20,7 @@
                     <span class="far fa-question-circle wide-tooltip" title="@Model.SiteSettingGroups[i].SettingInformations[j].Definition.Info" data-bs-toggle="tooltip" data-bs-placement="top"></span>
                     @if (Model.SiteSettingGroups[i].SettingInformations[j].Definition.Format == GRA.Domain.Model.SiteSettingFormat.Boolean)
                     {
-                        <select asp-for="SiteSettingGroups[i].SettingInformations[j].SiteSetting.Value" class="form-control">
+                        <select asp-for="SiteSettingGroups[i].SettingInformations[j].SiteSetting.Value" class="form-select">
                             <option></option>
                             <option value="True">Yes</option>
                         </select>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Social/AddSocialHeader.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Social/AddSocialHeader.cshtml
index 496840ef5..69b97cdb8 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Social/AddSocialHeader.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Social/AddSocialHeader.cshtml
@@ -45,7 +45,7 @@
                 <description gra-description-for="LanguageId"></description>
                 <select asp-for="LanguageId"
                         asp-items="Model.LanguageList"
-                        class="form-control"></select>
+                        class="form-select"></select>
                 <span asp-validation-for="LanguageId" class="text-danger"></span>
             </div>
             <div class="mb-3">
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Systems/Branches.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Systems/Branches.cshtml
index ccbc04a01..a5f420c14 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Systems/Branches.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Systems/Branches.cshtml
@@ -49,7 +49,7 @@
     </div>
 </form>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         <a class="btn btn-outline-primary"
            data-bs-toggle="modal"
@@ -57,7 +57,7 @@
     </div>
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         @if (Model.Branches.Count() == 0)
         {
@@ -174,7 +174,7 @@
                             <label asp-for="Branch.SystemId" class="col-form-label"></label>
                             <select asp-for="Branch.SystemId"
                                     asp-items="Model.SystemList"
-                                    class="form-control">
+                                    class="form-select">
                                 <option></option>
                             </select>
                             <span asp-validation-for="Branch.SystemId" class="text-danger"></span>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Systems/Import.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Systems/Import.cshtml
index 40abacf6c..07c61ace4 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Systems/Import.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Systems/Import.cshtml
@@ -2,7 +2,7 @@
 
 <div class="row">
     <div class="col-12">
-        <ul class="nav nav-pills" style="padding: 10px 0;">
+        <ul class="nav nav-pills my-4">
             <li ActiveBy routeKey="Action" value="Index"><a asp-action="Index">Systems</a></li>
             <li ActiveBy routeKey="Action" value="Branches"><a asp-action="Branches">Branches</a></li>
             <li class="float-end">
@@ -87,7 +87,7 @@
 
             <div class="row row-spacing">
                 <div class="col-12">
-                    <select class="form-control" asp-for="DoImport">
+                    <select class="form-select" asp-for="DoImport">
                         <option value="false">Test run - read the CSV file and analyze import</option>
                         <option value="true">Perform import</option>
                     </select>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Systems/Index.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Systems/Index.cshtml
index 22545bb7e..21a7bede3 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Systems/Index.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Systems/Index.cshtml
@@ -48,7 +48,7 @@
     </div>
 </form>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         <a class="btn btn-outline-primary"
            data-bs-toggle="modal"
@@ -56,7 +56,7 @@
     </div>
 </div>
 
-<div class="row" style="padding: 10px 0;">
+<div class="row my-4">
     <div class="col-12">
         @if (Model.Systems.Count() == 0)
         {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Systems/RemoveBranch.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Systems/RemoveBranch.cshtml
index 45964aba0..01eed007c 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Systems/RemoveBranch.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Systems/RemoveBranch.cshtml
@@ -22,7 +22,7 @@
                         <td>
                             <select asp-for="ReassignBranch"
                                 asp-items="Model.BranchList"
-                                class="form-control"></select>
+                                    class="form-select"></select>
                         </td>
                     </tr>
                 }
diff --git a/src/GRA.Web/Areas/MissionControl/Views/Triggers/Detail.cshtml b/src/GRA.Web/Areas/MissionControl/Views/Triggers/Detail.cshtml
index 28242725f..1432a9aef 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/Triggers/Detail.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/Triggers/Detail.cshtml
@@ -324,7 +324,7 @@
                 <label asp-for="Trigger.LimitToSystemId" class="col-form-label"></label>
                 <select asp-for="Trigger.LimitToSystemId"
                         asp-items="Model.SystemList"
-                        class="form-control"
+                        class="form-select"
                         disabled="@(!Model.IgnorePointLimits && !string.IsNullOrEmpty(Model.MaxPointsWarningMessage) ? "disabled" : null)">
                     <option value="">No</option>
                 </select>
@@ -335,7 +335,7 @@
                 <label asp-for="Trigger.LimitToBranchId" class="col-form-label"></label>
                 <select asp-for="Trigger.LimitToBranchId"
                         asp-items="Model.BranchList"
-                        class="form-control"
+                        class="form-select"
                         disabled="@(!Model.IgnorePointLimits && !string.IsNullOrEmpty(Model.MaxPointsWarningMessage) ? "disabled" : null)">
                     <option value="">No</option>
                 </select>
@@ -346,7 +346,7 @@
                 <label asp-for="Trigger.LimitToProgramId" class="col-form-label"></label>
                 <select asp-for="Trigger.LimitToProgramId"
                         asp-items="Model.ProgramList"
-                        class="form-control"
+                        class="form-select"
                         disabled="@(!Model.IgnorePointLimits && !string.IsNullOrEmpty(Model.MaxPointsWarningMessage) ? "disabled" : null)">
                     <option value="">No</option>
                 </select>
@@ -462,7 +462,7 @@
                     {
                         <select asp-for="Trigger.AwardVendorCodeTypeId"
                                 asp-items="Model.VendorCodeTypeList"
-                                class="form-control">
+                                class="form-select">
                             <option value="">No</option>
                         </select>
                     }
@@ -488,7 +488,7 @@
                     {
                         <select asp-for="Trigger.AwardAvatarBundleId"
                                 asp-items="Model.UnlockableAvatarBundleList"
-                                class="form-control">
+                                class="form-select">
                             <option value="">No</option>
                         </select>
                     }
diff --git a/src/GRA.Web/Areas/MissionControl/Views/VendorCodes/Configure.cshtml b/src/GRA.Web/Areas/MissionControl/Views/VendorCodes/Configure.cshtml
index b35bb1f32..4ce89f5bf 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/VendorCodes/Configure.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/VendorCodes/Configure.cshtml
@@ -97,7 +97,7 @@
                 <description gra-description-for="VendorCodeType.AwardPrizeOnShipDate"></description>
                 <select asp-for="VendorCodeType.AwardPrizeOnShipDate"
                         asp-items="VendorCodesController.ShipDateOptions"
-                        class="form-control">
+                        class="form-select">
                 </select>
                 <span asp-validation-for="VendorCodeType.AwardPrizeOnShipDate" class="text-danger"></span>
             </div>
@@ -110,7 +110,7 @@
                 <description gra-description-for="VendorCodeType.AwardPrizeOnPackingSlip"></description>
                 <select asp-for="VendorCodeType.AwardPrizeOnPackingSlip"
                         asp-items="VendorCodesController.PackingSlipOptions"
-                        class="form-control">
+                        class="form-select">
                 </select>
                 <span asp-validation-for="VendorCodeType.AwardPrizeOnPackingSlip" class="text-danger"></span>
             </div>
@@ -235,7 +235,7 @@
                     <description gra-description-for="VendorCodeType.ReadyForPickupEmailTemplateId"></description>
                     <select asp-for="VendorCodeType.ReadyForPickupEmailTemplateId"
                         asp-items="VendorCodesController.GetSelectList(Model.DirectEmailTemplates)"
-                            class="form-control">
+                            class="form-select">
                         <option value="">None</option>
                     </select>
                     <span asp-validation-for="VendorCodeType.ReadyForPickupEmailTemplateId" class="text-danger"></span>
@@ -243,7 +243,7 @@
             </div>
         </div>
     }
-    <div class="row row-spacing">
+    <div class="row my-3">
         <div class="col-12 text-right">
             @if (Model.VendorCodeType.Id > 0)
             {
diff --git a/src/GRA.Web/Areas/MissionControl/Views/VendorCodes/EmailAward.cshtml b/src/GRA.Web/Areas/MissionControl/Views/VendorCodes/EmailAward.cshtml
index 325a9fa0d..5e24e3ea3 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/VendorCodes/EmailAward.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/VendorCodes/EmailAward.cshtml
@@ -7,7 +7,7 @@
         <div class="col-12">
             <div class="mb-3">
                 <label for="vendorCodeTypeId">Vendor code:</label>
-                <select id="vendorCodeTypeId" name="vendorCodeTypeId" asp-items="@Model" class="form-control"></select>
+                <select id="vendorCodeTypeId" name="vendorCodeTypeId" asp-items="@Model" class="form-select"></select>
             </div>
         </div>
     </div>
diff --git a/src/GRA.Web/Areas/MissionControl/Views/VendorCodes/ImportStatus.cshtml b/src/GRA.Web/Areas/MissionControl/Views/VendorCodes/ImportStatus.cshtml
index ad82974a6..0777a8094 100644
--- a/src/GRA.Web/Areas/MissionControl/Views/VendorCodes/ImportStatus.cshtml
+++ b/src/GRA.Web/Areas/MissionControl/Views/VendorCodes/ImportStatus.cshtml
@@ -14,7 +14,7 @@
             <select id="vendorCodeTypeId"
                     name="vendorCodeTypeId"
                     asp-items="@Model"
-                    class="form-control"></select>
+                    class="form-select"></select>
         </div>
         <div class="mb-3">
             <label for="selectedFile">Select Excel file:</label>
diff --git a/src/GRA.Web/Areas/PerformerRegistration/Views/Home/Information.cshtml b/src/GRA.Web/Areas/PerformerRegistration/Views/Home/Information.cshtml
index 47e494363..0dadeb2d8 100644
--- a/src/GRA.Web/Areas/PerformerRegistration/Views/Home/Information.cshtml
+++ b/src/GRA.Web/Areas/PerformerRegistration/Views/Home/Information.cshtml
@@ -160,7 +160,7 @@ else
     <div class="mb-3">
         <label asp-for="Performer.PhonePreferred" class="col-sm-3 col-form-label required-field"></label>
         <div class="col-sm-9">
-            <select asp-for="Performer.PhonePreferred" class="form-control">
+            <select asp-for="Performer.PhonePreferred" class="form-select">
                 <option value="false">Email</option>
                 <option value="true">Phone</option>
             </select>
@@ -201,7 +201,7 @@ else
     <div class="mb-3">
         <label asp-for="Performer.HasFingerprintCard" class="col-sm-3 col-form-label required-field"></label>
         <div class="col-sm-9">
-            <select asp-for="Performer.HasFingerprintCard" class="form-control">
+            <select asp-for="Performer.HasFingerprintCard" class="form-select">
                 <option value="false">No</option>
                 <option value="true">Yes</option>
             </select>
@@ -213,7 +213,7 @@ else
         <div class="mb-3">
             <label asp-for="Performer.HasInsurance" class="col-sm-3 col-form-label required-field"></label>
             <div class="col-sm-9">
-                <select asp-for="Performer.HasInsurance" class="form-control">
+                <select asp-for="Performer.HasInsurance" class="form-select">
                     <option value="false">No</option>
                     <option value="true">Yes</option>
                 </select>
@@ -254,7 +254,7 @@ else
                         button-spinner>
                     Update Information
                 </button>
-                <a asp-action="Dashboard" class="btn btn-lg btn-outline-secondary float-start" style="margin-right: 10px;">Return to Dashboard</a>
+                <a asp-action="Dashboard" class="btn btn-lg btn-outline-secondary float-start me-4">Return to Dashboard</a>
             }
 
         </div>
diff --git a/src/GRA.Web/Areas/PerformerRegistration/Views/Home/Program.cshtml b/src/GRA.Web/Areas/PerformerRegistration/Views/Home/Program.cshtml
index 09ce712de..78afa7b6d 100644
--- a/src/GRA.Web/Areas/PerformerRegistration/Views/Home/Program.cshtml
+++ b/src/GRA.Web/Areas/PerformerRegistration/Views/Home/Program.cshtml
@@ -104,7 +104,7 @@ else
                 <input asp-for="Program.MinimumCapacity" class="form-control form-control-lg" type="text" placeholder="" />
                 <span asp-validation-for="Program.MinimumCapacity" class="text-danger"></span>
             </div>
-            <div class="visible-xs" style="padding-bottom:10px;"></div>
+            <div class="visible-xs pb-4"></div>
             <label asp-for="Program.MaximumCapacity" class="col-sm-2 col-form-label required-field"></label>
             <div class="col-sm-2">
                 <input asp-for="Program.MaximumCapacity" class="form-control form-control-lg" type="text" placeholder="" />
@@ -121,7 +121,7 @@ else
             <label class="col-sm-3 col-form-label required-field">Age(s)</label>
             <div class="col-sm-9">
                 <input id="agePlaceholder" class="form-control" />
-                <select asp-for="AgeSelection" asp-items="Model.AgeList" class="form-control hidden" type="text" multiple="multiple"></select>
+                <select asp-for="AgeSelection" asp-items="Model.AgeList" class="form-select hidden" type="text" multiple="multiple"></select>
                 <span asp-validation-for="AgeSelection" class="text-danger"></span>
             </div>
         </div>
@@ -137,7 +137,7 @@ else
                 <input asp-for="Program.ProgramLengthMinutes" class="form-control form-control-lg" type="text" placeholder="" />
                 <span asp-validation-for="Program.ProgramLengthMinutes" class="text-danger"></span>
             </div>
-            <div class="visible-xs" style="padding-bottom:10px;"></div>
+            <div class="visible-xs pb-4"></div>
             <label class="col-sm-2 col-form-label required-field">
                 Set-up Time
                 <span class="far fa-question-circle" data-bs-toggle="tooltip" data-bs-placement="top" title="How much time needed before program begins."></span>
@@ -157,13 +157,13 @@ else
                 <input asp-for="Program.BreakdownTimeMinutes" class="form-control form-control-lg" type="text" placeholder="" />
                 <span asp-validation-for="Program.BreakdownTimeMinutes" class="text-danger"></span>
             </div>
-            <div class="visible-xs" style="padding-bottom:10px;"></div>
+            <div class="visible-xs pb-4"></div>
             <label class="col-sm-2 col-form-label required-field">
                 Time between back-to-back programs
                 <span class="far fa-question-circle" data-bs-toggle="tooltip" data-bs-placement="top" title="If you are requested to do this program twice in a row, how much time do you require between them?"></span>
             </label>
             <div class="col-sm-2">
-                <select asp-for="Program.BackToBackMinutes" asp-items="Model.BackToBackSelection" class="form-control" type="text"></select>
+                <select asp-for="Program.BackToBackMinutes" asp-items="Model.BackToBackSelection" class="form-select" type="text"></select>
                 <span asp-validation-for="Program.BackToBackMinutes" class="text-danger"></span>
             </div>
         </div>
@@ -222,7 +222,7 @@ else
                     </p>
                 </div>
                 <div class="col-sm-9 offset-sm-3">
-                    <select asp-for="Program.AllowStreaming" class="form-control">
+                    <select asp-for="Program.AllowStreaming" class="form-select">
                         <option value="true">Yes</option>
                         <option value="false">No</option>
                     </select>
@@ -237,7 +237,7 @@ else
                 </p>
             </div>
             <div class="col-sm-9 offset-sm-3">
-                <select asp-for="Program.AllowArchiving" class="form-control">
+                    <select asp-for="Program.AllowArchiving" class="form-select">
                     <option value="true">Yes</option>
                     <option value="false">No</option>
                 </select>
@@ -258,11 +258,11 @@ else
                 {
                     if (Model.EditingProgram)
                     {
-                        <a asp-action="ProgramDetails" asp-route-id="@Model.Program.Id" class="btn btn-lg btn-outline-secondary float-start" style="margin-right: 10px;">Return to Program</a>
+                        <a asp-action="ProgramDetails" asp-route-id="@Model.Program.Id" class="btn btn-lg btn-outline-secondary float-start my-4">Return to Program</a>
                     }
                     else
                     {
-                        <a asp-action="Dashboard" class="btn btn-lg btn-outline-secondary float-start" style="margin-right: 10px;">Return to Dashboard</a>
+                        <a asp-action="Dashboard" class="btn btn-lg btn-outline-secondary float-start my-4">Return to Dashboard</a>
                     }
                 }
             </div>
diff --git a/src/GRA.Web/GRA.Web.csproj b/src/GRA.Web/GRA.Web.csproj
index e4e0e18eb..889432941 100644
--- a/src/GRA.Web/GRA.Web.csproj
+++ b/src/GRA.Web/GRA.Web.csproj
@@ -71,9 +71,9 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.10" />
     <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="8.0.10" />
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.10" />
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
     <PackageReference Include="Serilog.Filters.Expressions" Version="2.1.0" />
-    <PackageReference Include="Serilog.Sinks.MSSqlServer" Version="7.0.1" />
+    <PackageReference Include="Serilog.Sinks.MSSqlServer" Version="7.0.2" />
     <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
     <PackageReference Include="Serilog.Sinks.Seq" Version="8.0.0" />
     <PackageReference Include="Serilog.Sinks.Slack.Core" Version="0.1.5-beta" />
diff --git a/src/GRA.Web/Views/Avatar/Index.cshtml b/src/GRA.Web/Views/Avatar/Index.cshtml
index 34f680fd0..fb283abb1 100644
--- a/src/GRA.Web/Views/Avatar/Index.cshtml
+++ b/src/GRA.Web/Views/Avatar/Index.cshtml
@@ -5,9 +5,9 @@
 }
 <div class="alert alert-danger" id="error-container"></div>
 <div class="card">
-    <div class="row">
+    <div>
         <div class="col-12 col-sm-5 float-end">
-            <div class="visible-xs" id="mobile-container">
+            <div class="d-block d-sm-none" id="mobile-container">
                 <div class="avatar-container mx-auto">
                     @foreach (var layer in Model.LayerGroupings.SelectMany(_ => _))
                     {
@@ -22,7 +22,7 @@
                     <span class="fas fa-lg fa-search-plus"></span>
                 </button>
             </div>
-            <div class="hidden-xs" id="desktop-container">
+            <div class="d-none d-sm-block" id="desktop-container">
                 <div class="avatar-container mx-auto">
                     @foreach (var layer in Model.LayerGroupings.SelectMany(_ => _))
                     {
diff --git a/src/GRA.Web/Views/Challenges/Index.cshtml b/src/GRA.Web/Views/Challenges/Index.cshtml
index 298a165f7..545b88006 100644
--- a/src/GRA.Web/Views/Challenges/Index.cshtml
+++ b/src/GRA.Web/Views/Challenges/Index.cshtml
@@ -129,7 +129,7 @@
                                 <span style="font-size:large;">@SharedLocalizer[GRA.Domain.Model.DisplayNames.Program]:</span>
                             </div>
                             <div class="col-12 col-sm-10">
-                                <select asp-for="Program" asp-items="Model.ProgramList" class="form-control">
+                                <select asp-for="Program" asp-items="Model.ProgramList" class="form-select">
                                     <option value="">@SharedLocalizer[GRA.Annotations.Interface.AllPrograms]</option>
                                 </select>
                             </div>
@@ -144,7 +144,7 @@
                                     <select asp-for="CategoryIds"
                                             asp-items="Model.CategoryList"
                                             autocomplete="off"
-                                            class="form-control"
+                                            class="form-select"
                                             multiple="multiple"
                                             size="1"></select>
                                 </div>
@@ -185,7 +185,7 @@
                                     <span style="font-size:large;">@SharedLocalizer[GRA.Annotations.Interface.Status]:</span>
                                 </div>
                                 <div class="col-12 col-sm-10">
-                                    <select asp-for="Status" class="form-control">
+                                    <select asp-for="Status" class="form-select">
                                         <option value="@ChallengesController.StatusUncompleted">@SharedLocalizer[GRA.Annotations.Interface.ViewUncompleted]</option>
                                         <option value="@ChallengesController.StatusCompleted">@SharedLocalizer[GRA.Annotations.Interface.ViewCompleted]</option>
                                         <option value="@ChallengesController.StatusAll">@SharedLocalizer[GRA.Annotations.Interface.ViewAll]</option>
diff --git a/src/GRA.Web/Views/Events/Index.cshtml b/src/GRA.Web/Views/Events/Index.cshtml
index cfde79ec2..3a2978488 100644
--- a/src/GRA.Web/Views/Events/Index.cshtml
+++ b/src/GRA.Web/Views/Events/Index.cshtml
@@ -69,7 +69,7 @@
                             <div class="row row-spacing">
                                 <div class="col-6">
                                     <label asp-for="ProgramId" class="col-form-label"></label>
-                                    <select asp-for="ProgramId" asp-items="Model.ProgramList" class="form-control">
+                                    <select asp-for="ProgramId" asp-items="Model.ProgramList" class="form-select">
                                         <option>@SharedLocalizer[GRA.Annotations.Interface.AllPrograms]</option>
                                     </select>
                                 </div>
@@ -95,7 +95,7 @@
                             <div class="row row-spacing">
                                 <div class="col-12">
                                     <label asp-for="ProgramId" class="col-form-label"></label>
-                                    <select asp-for="ProgramId" asp-items="Model.ProgramList" class="form-control">
+                                    <select asp-for="ProgramId" asp-items="Model.ProgramList" class="form-select">
                                         <option>@SharedLocalizer[GRA.Annotations.Interface.AllPrograms]</option>
                                     </select>
                                 </div>
@@ -105,14 +105,14 @@
                                 <div class="col-6">
                                     <div class="mb-3">
                                         <label asp-for="SystemId" class="col-form-label"></label>
-                                        <select asp-for="SystemId" asp-items="Model.SystemList" class="form-control">
+                                        <select asp-for="SystemId" asp-items="Model.SystemList" class="form-select">
                                             <option></option>
                                         </select>
                                     </div>
 
                                     <div class="mb-3">
                                         <label asp-for="BranchId" class="col-form-label"></label>
-                                        <select asp-for="BranchId" asp-items="Model.BranchList" class="form-control">
+                                        <select asp-for="BranchId" asp-items="Model.BranchList" class="form-select">
                                             <option></option>
                                         </select>
                                     </div>
@@ -120,7 +120,7 @@
 
                                 <div class="col-6">
                                     <label asp-for="LocationId" class="col-form-label"></label>
-                                    <select asp-for="LocationId" asp-items="Model.LocationList" class="form-control">
+                                    <select asp-for="LocationId" asp-items="Model.LocationList" class="form-select">
                                         <option></option>
                                     </select>
                                 </div>
@@ -134,7 +134,7 @@
                                 @if (Model.EventType == GRA.EventType.StreamingEvent)
                                 {
                                     <label asp-for="Viewed" class="col-form-label"></label>
-                                    <select asp-for="Viewed" class="form-control">
+                                    <select asp-for="Viewed" class="form-select">
                                         <option value="@EventsController.VisitedNo">@SharedLocalizer[GRA.Annotations.Interface.No]</option>
                                         <option value="@EventsController.VisitedYes">@SharedLocalizer[GRA.Annotations.Interface.Yes]</option>
                                         <option value="@EventsController.VisitedAll">@SharedLocalizer[GRA.Annotations.Interface.ViewAll]</option>
@@ -143,7 +143,7 @@
                                 else
                                 {
                                     <label asp-for="Visited" class="col-form-label"></label>
-                                    <select asp-for="Visited" class="form-control">
+                                    <select asp-for="Visited" class="form-select">
                                         <option value="@EventsController.VisitedNo">@SharedLocalizer[GRA.Annotations.Interface.No]</option>
                                         <option value="@EventsController.VisitedYes">@SharedLocalizer[GRA.Annotations.Interface.Yes]</option>
                                         <option value="@EventsController.VisitedAll">@SharedLocalizer[GRA.Annotations.Interface.ViewAll]</option>
diff --git a/src/GRA.Web/Views/Join/Index.cshtml b/src/GRA.Web/Views/Join/Index.cshtml
index 6be79bede..acca5df48 100644
--- a/src/GRA.Web/Views/Join/Index.cshtml
+++ b/src/GRA.Web/Views/Join/Index.cshtml
@@ -80,7 +80,7 @@
                                 <label asp-for="SystemId" class="col-form-label"></label>
                                 <select asp-for="SystemId"
                                         asp-items="Model.SystemList"
-                                        class="form-control">
+                                        class="form-select">
                                     <option></option>
                                 </select>
                                 <span asp-validation-for="SystemId" class="text-danger"></span>
@@ -102,7 +102,7 @@
                                 <label asp-for="BranchId" class="col-form-label"></label>
                                 <select asp-for="BranchId"
                                         asp-items="Model.BranchList"
-                                        class="form-control"></select>
+                                        class="form-select"></select>
                                 <span asp-validation-for="BranchId" class="text-danger"></span>
                             </div>
                         </div>
@@ -115,7 +115,7 @@
                                 <label asp-for="ProgramId" class="col-form-label"></label>
                                 <select asp-for="ProgramId"
                                         asp-items="Model.ProgramList"
-                                        class="form-control">
+                                        class="form-select">
                                     <option></option>
                                 </select>
                                 <span asp-validation-for="ProgramId" class="text-danger"></span>
@@ -172,7 +172,7 @@
                                 <label asp-for="IsFirstTime" class="col-form-label"></label>
                                 <select asp-for="IsFirstTime"
                                         asp-items="Model.AskFirstTime"
-                                        class="form-control"></select>
+                                        class="form-select"></select>
                                 <span asp-validation-for="IsFirstTime" class="text-danger"></span>
                             </div>
                         </div>
@@ -185,7 +185,7 @@
                                 <label asp-for="EmailSubscriptionRequested" class="col-form-label">@Model.AskEmailSubscriptionText</label>
                                 <select asp-for="EmailSubscriptionRequested"
                                         asp-items="Model.AskEmailSubscription"
-                                        class="form-control"></select>
+                                        class="form-select"></select>
                                 <span asp-validation-for="EmailSubscriptionRequested" class="text-danger"></span>
                             </div>
                         </div>
diff --git a/src/GRA.Web/Views/Join/Step1.cshtml b/src/GRA.Web/Views/Join/Step1.cshtml
index d8fc076ff..eb07fc42b 100644
--- a/src/GRA.Web/Views/Join/Step1.cshtml
+++ b/src/GRA.Web/Views/Join/Step1.cshtml
@@ -54,7 +54,7 @@
                         <div class="row row-spacing">
                             <div class="col-12">
                                 <label asp-for="SystemId" class="col-form-label"></label>
-                                <select asp-for="SystemId" asp-items="Model.SystemList" class="form-control">
+                                <select asp-for="SystemId" asp-items="Model.SystemList" class="form-select">
                                     <option></option>
                                 </select>
                                 <span asp-validation-for="SystemId" class="text-danger"></span>
@@ -77,7 +77,7 @@
                                 <label asp-for="BranchId" class="col-form-label"></label>
                                 <select asp-for="BranchId"
                                         asp-items="Model.BranchList"
-                                        class="form-control"></select>
+                                        class="form-select"></select>
                                 <span asp-validation-for="BranchId" class="text-danger"></span>
                             </div>
                         </div>
diff --git a/src/GRA.Web/Views/Join/Step2.cshtml b/src/GRA.Web/Views/Join/Step2.cshtml
index 180816b89..d33aa3778 100644
--- a/src/GRA.Web/Views/Join/Step2.cshtml
+++ b/src/GRA.Web/Views/Join/Step2.cshtml
@@ -14,7 +14,7 @@
                     <div class="row row-spacing">
                         <div class="col-12">
                             <label asp-for="ProgramId" class="col-form-label"></label>
-                            <select asp-for="ProgramId" asp-items="Model.ProgramList" class="form-control">
+                            <select asp-for="ProgramId" asp-items="Model.ProgramList" class="form-select">
                                 <option></option>
                             </select>
                             <span asp-validation-for="ProgramId" class="text-danger"></span>
diff --git a/src/GRA.Web/Views/Join/Step3.cshtml b/src/GRA.Web/Views/Join/Step3.cshtml
index 58bdd19fb..de95219c8 100644
--- a/src/GRA.Web/Views/Join/Step3.cshtml
+++ b/src/GRA.Web/Views/Join/Step3.cshtml
@@ -80,7 +80,7 @@
                                 <label asp-for="IsFirstTime" class="col-form-label"></label>
                                 <select asp-for="IsFirstTime"
                                         asp-items="Model.AskFirstTime"
-                                        class="form-control"></select>
+                                        class="form-select"></select>
                                 <span asp-validation-for="IsFirstTime" class="text-danger"></span>
                             </div>
                         </div>
@@ -93,7 +93,7 @@
                                 <label asp-for="EmailSubscriptionRequested" class="col-form-label">@SharedLocalizer[Model.AskEmailSubscriptionText]</label>
                                 <select asp-for="EmailSubscriptionRequested"
                                         asp-items="Model.AskEmailSubscription"
-                                        class="form-control"></select>
+                                        class="form-select"></select>
                                 <span asp-validation-for="EmailSubscriptionRequested" class="text-danger"></span>
                             </div>
                         </div>
diff --git a/src/GRA.Web/Views/Profile/GroupUpgrade.cshtml b/src/GRA.Web/Views/Profile/GroupUpgrade.cshtml
index 4e0c12aec..5a943d7f8 100644
--- a/src/GRA.Web/Views/Profile/GroupUpgrade.cshtml
+++ b/src/GRA.Web/Views/Profile/GroupUpgrade.cshtml
@@ -20,7 +20,7 @@
                         <label asp-for="GroupInfo.GroupTypeId" class="col-form-label"></label>
                         <select asp-for="GroupInfo.GroupTypeId"
                                 asp-items="Model.GroupTypes"
-                                class="form-control"></select>
+                                class="form-select"></select>
                         <span asp-validation-for="GroupInfo.GroupTypeId" class="text-danger"></span>
                     </div>
                 </div>
diff --git a/src/GRA.Web/Views/Profile/HouseholdAdd.cshtml b/src/GRA.Web/Views/Profile/HouseholdAdd.cshtml
index 4068c7b4b..174e15eb0 100644
--- a/src/GRA.Web/Views/Profile/HouseholdAdd.cshtml
+++ b/src/GRA.Web/Views/Profile/HouseholdAdd.cshtml
@@ -62,7 +62,7 @@
                                 <div class="row row-spacing">
                                     <div class="col-12">
                                         <label asp-for="User.SystemId" class="col-form-label"></label>
-                                        <select asp-for="User.SystemId" asp-items="Model.SystemList" class="form-control"></select>
+                                        <select asp-for="User.SystemId" asp-items="Model.SystemList" class="form-select"></select>
                                         <span asp-validation-for="User.SystemId" class="text-danger"></span>
                                     </div>
                                 </div>
@@ -77,7 +77,7 @@
                                 <div class="row row-spacing">
                                     <div class="col-12">
                                         <label asp-for="User.BranchId" class="col-form-label"></label>
-                                        <select asp-for="User.BranchId" asp-items="Model.BranchList" class="form-control"></select>
+                                        <select asp-for="User.BranchId" asp-items="Model.BranchList" class="form-select"></select>
                                         <span asp-validation-for="User.BranchId" class="text-danger"></span>
                                     </div>
                                 </div>
@@ -92,7 +92,7 @@
                                 <div class="row row-spacing">
                                     <div class="col-12">
                                         <label asp-for="User.ProgramId" class="col-form-label"></label>
-                                        <select asp-for="User.ProgramId" asp-items="Model.ProgramList" class="form-control">
+                                        <select asp-for="User.ProgramId" asp-items="Model.ProgramList" class="form-select">
                                             <option value="-1"></option>
                                         </select>
                                         <span asp-validation-for="User.ProgramId" class="text-danger"></span>
@@ -123,7 +123,7 @@
                                         <label asp-for="IsFirstTime" class="col-form-label"></label>
                                         <select asp-for="IsFirstTime"
                                                 asp-items="Model.AskFirstTime"
-                                                class="form-control"></select>
+                                                class="form-select"></select>
                                         <span asp-validation-for="IsFirstTime" class="text-danger"></span>
                                     </div>
                                 </div>
@@ -136,7 +136,7 @@
                                         <label asp-for="EmailSubscriptionRequested" class="col-form-label">@Model.AskEmailSubscriptionText</label>
                                         <select asp-for="EmailSubscriptionRequested"
                                                 asp-items="Model.AskEmailSubscription"
-                                                class="form-control"></select>
+                                                class="form-select"></select>
                                         <span asp-validation-for="EmailSubscriptionRequested" class="text-danger"></span>
                                     </div>
                                 </div>
diff --git a/src/GRA.Web/Views/Profile/Index.cshtml b/src/GRA.Web/Views/Profile/Index.cshtml
index f28351713..4ca75e1d6 100644
--- a/src/GRA.Web/Views/Profile/Index.cshtml
+++ b/src/GRA.Web/Views/Profile/Index.cshtml
@@ -176,7 +176,7 @@
                                     <div class="row row-spacing">
                                         <div class="col-12">
                                             <label asp-for="User.SystemId" class="col-form-label"></label>
-                                            <select asp-for="User.SystemId" asp-items="Model.SystemList" class="form-control"></select>
+                                            <select asp-for="User.SystemId" asp-items="Model.SystemList" class="form-select"></select>
                                             <span asp-validation-for="User.SystemId" class="text-danger"></span>
                                         </div>
                                     </div>
@@ -191,7 +191,7 @@
                                     <div class="row row-spacing">
                                         <div class="col-12">
                                             <label asp-for="User.BranchId" class="col-form-label"></label>
-                                            <select asp-for="User.BranchId" asp-items="Model.BranchList" class="form-control"></select>
+                                            <select asp-for="User.BranchId" asp-items="Model.BranchList" class="form-select"></select>
                                             <span asp-validation-for="User.BranchId" class="text-danger"></span>
                                         </div>
                                     </div>
@@ -207,7 +207,7 @@
                                 <div class="row row-spacing">
                                     <div class="col-12">
                                         <label asp-for="User.ProgramId" class="col-form-label"></label>
-                                        <select asp-for="User.ProgramId" asp-items="Model.ProgramList" class="form-control"></select>
+                                        <select asp-for="User.ProgramId" asp-items="Model.ProgramList" class="form-select"></select>
                                         <span asp-validation-for="User.ProgramId" class="text-danger"></span>
                                     </div>
                                 </div>
@@ -234,7 +234,7 @@
                                 <div class="row row-spacing">
                                     <div class="col-12">
                                         <label asp-for="User.IsEmailSubscribed" class="col-form-label">@SharedLocalizer[Model.AskEmailSubscriptionText]</label>
-                                        <select asp-for="User.IsEmailSubscribed" class="form-control">
+                                        <select asp-for="User.IsEmailSubscribed" class="form-select">
                                             <option value="false">@SharedLocalizer[GRA.Annotations.Interface.No]</option>
                                             <option value="true">@SharedLocalizer[GRA.Annotations.Interface.Yes]</option>
                                         </select>
diff --git a/src/GRA.Web/Views/Share/Avatar.cshtml b/src/GRA.Web/Views/Share/Avatar.cshtml
index ac019ab87..69e017a05 100644
--- a/src/GRA.Web/Views/Share/Avatar.cshtml
+++ b/src/GRA.Web/Views/Share/Avatar.cshtml
@@ -10,8 +10,8 @@
         <a asp-controller="Join" asp-action="Index"><img src="@Model.ImageUrl" class="img-fluid" /></a>
     </div>
     <div class="col-12" style="text-align: center;">
-        <div class="h4 visible-xs" style="margin-bottom: 1.5rem; margin-top: 1.5rem;">Join now to create your own awesome avatar!</div>
-        <div class="h2 hidden-xs" style="margin-bottom: 2rem;">Join now to create your own awesome avatar!</div>
+        <div class="h4 d-block d-sm-none" style="margin-bottom: 1.5rem; margin-top: 1.5rem;">Join now to create your own awesome avatar!</div>
+        <div class="h2 d-none d-sm-block" style="margin-bottom: 2rem;">Join now to create your own awesome avatar!</div>
     </div>
     <div class="col-10 offset-xs-1 col-sm-6 offset-sm-3" style="margin-bottom: 2rem;">
         <a asp-controller="Join" asp-action="Index" class="btn btn-lg  btn-primary">
diff --git a/src/GRA.Web/Views/Shared/_SchoolSelectionPartial.cshtml b/src/GRA.Web/Views/Shared/_SchoolSelectionPartial.cshtml
index 82f14e715..fda252027 100644
--- a/src/GRA.Web/Views/Shared/_SchoolSelectionPartial.cshtml
+++ b/src/GRA.Web/Views/Shared/_SchoolSelectionPartial.cshtml
@@ -11,7 +11,7 @@
 <div id="schoolGroup" class="row row-spacing">
     <div class="col-12">
         <label class="col-form-label">@SharedLocalizer[GRA.Domain.Model.DisplayNames.School]</label>
-        <select asp-for="SchoolId" asp-items="Model.SchoolList" class="selectpicker form-control" data-live-search="true" data-none-selected-text="">
+        <select asp-for="SchoolId" asp-items="Model.SchoolList" class="selectpicker form-select" data-live-search="true" data-none-selected-text="">
             <option></option>
         </select>
         <span asp-validation-for="SchoolId" class="text-danger"></span>
diff --git a/src/GRA/GRA.csproj b/src/GRA/GRA.csproj
index e01020466..2774276ea 100644
--- a/src/GRA/GRA.csproj
+++ b/src/GRA/GRA.csproj
@@ -21,13 +21,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DocumentFormat.OpenXml" Version="3.1.0" />
+    <PackageReference Include="DocumentFormat.OpenXml" Version="3.1.1" />
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.10" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Serilog" Version="4.0.2" />
+    <PackageReference Include="Serilog" Version="4.1.0" />
     <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>