diff --git a/app/views/all_casa_admins/patch_notes/_patch_note.html.erb b/app/views/all_casa_admins/patch_notes/_patch_note.html.erb
index 00334238b0..f1298e1779 100644
--- a/app/views/all_casa_admins/patch_notes/_patch_note.html.erb
+++ b/app/views/all_casa_admins/patch_notes/_patch_note.html.erb
@@ -5,13 +5,9 @@
       <label for="patch-note-<%= patch_note.id %>-type">Patch Note Type:</label>
       <select id="patch-note-<%= patch_note.id %>-type" disabled="true">
         <% @patch_note_types&.each do |patch_note_type| %>
-          <% if patch_note_type.id === patch_note.patch_note_type_id %>
-            <option value="<%= patch_note_type.id %>" selected="selected">
-          <% else %>
-            <option value="<%= patch_note_type.id %>">
-          <% end %>
-              <%= patch_note_type.name %>
-            </option>
+          <option value="<%= patch_note_type.id %>" <% if patch_note_type.id === patch_note.patch_note_type_id %> selected="selected" <% end %>>
+            <%= patch_note_type.name %>
+          </option>
         <% end %>
       </select>
     </div>
diff --git a/app/views/casa_admins/index.html.erb b/app/views/casa_admins/index.html.erb
index 91e26740b1..b4d09f6684 100644
--- a/app/views/casa_admins/index.html.erb
+++ b/app/views/casa_admins/index.html.erb
@@ -34,7 +34,7 @@
 
           <tbody>
           <% @admins.each do |admin| %>
-            <tr id="admin-<%= admin.id %>" class="">
+            <tr id="admin-<%= admin.id %>">
               <td scope="row" class="min-wdth">
                 <span class="ml-10 mb-10 mt-10  pb-1"><%= admin.email %></span>
                 <% unless admin.active? %>
diff --git a/app/views/casa_cases/_calendar_button.html.erb b/app/views/casa_cases/_calendar_button.html.erb
index f0984b7d76..39949b81bb 100644
--- a/app/views/casa_cases/_calendar_button.html.erb
+++ b/app/views/casa_cases/_calendar_button.html.erb
@@ -1,5 +1,4 @@
 <!-- Button code -->
 <% if date.present? %>
-  <%= tag.div class: "cal-btn", id: id, data: { title: title, start: date[:start], end: date[:end], tooltip: tooltip } do %>
-  <% end %>
+  <%= tag.div class: "cal-btn", id: id, data: { title: title, start: date[:start], end: date[:end], tooltip: tooltip } %>
 <% end %>
diff --git a/app/views/casa_cases/_court_dates.html.erb b/app/views/casa_cases/_court_dates.html.erb
index 23b10075f4..759cc25fda 100644
--- a/app/views/casa_cases/_court_dates.html.erb
+++ b/app/views/casa_cases/_court_dates.html.erb
@@ -5,7 +5,7 @@
 <% else %>
   <ul>
     <% court_dates.each do |pcd| %>
-      <p>
+      <li>
         <div class="court-date-row">
           <%= link_to(pcd.decorate.court_date_info, casa_case_court_date_path(casa_case, pcd), class: "court-date-link") %>
           <%= render 'calendar_button',
@@ -22,7 +22,7 @@
             (Attached Report)
           <% end %>
         <% end %>
-      </p>
+      </li>
     <% end %>
   </ul>
 <% end %>
diff --git a/app/views/casa_cases/show.html.erb b/app/views/casa_cases/show.html.erb
index 74d4892ed7..e69cdb3864 100644
--- a/app/views/casa_cases/show.html.erb
+++ b/app/views/casa_cases/show.html.erb
@@ -37,24 +37,24 @@
     <% if !@casa_case.active %>
       <%= render "inactive_case", casa_case: @casa_case %>
     <% end %>
-    <p>
+    <div>
       <h6><strong>Case number:</strong> <%= @casa_case.case_number %>
         <%= volunteer_badge(@casa_case, current_user) %>
       </h6>
-    </p>
+    </div>
     <% if @casa_case.hearing_type %>
-      <p>
+      <div>
         <h6><strong>Hearing Type:</strong> <%= @casa_case.hearing_type_name %></h6>
-      </p>
+      </div>
     <% end %>
     <% if @casa_case.has_judge_name? %>
-      <p>
+      <div>
         <h6><strong>Judge:</strong> <%= @casa_case.judge_name %></h6>
-      </p>
+      </div>
     <% end %>
-    <p>
+    <div>
       <h6><strong>Transition Aged Youth:</strong> <%= @casa_case.decorate.transition_aged_youth %></h6>
-    </p>
+    </div>
     <div>
       <h6>
         <strong>
@@ -64,7 +64,7 @@
         <%= @casa_case.decorate.duration_in_care %>
       </h6>
     </div>
-    <p>
+    <div>
       <h6>
         <strong>Next Court Date:</strong>
         <%= I18n.l(@casa_case.next_court_date&.date, format: :day_and_date, default: '') %>
@@ -73,22 +73,22 @@
                  tooltip: "Add Next Court Date to Calendar",
                  title: "Next Court Date for [#{@casa_case.case_number}]" %>
       </h6>
-    </p>
-    <p>
+    </div>
+    <div>
       <h6>
         <strong>Court Report Status:</strong>
         <%= @casa_case.decorate.court_report_submission %></h6>
-    </p>
+    </div>
     <% unless @casa_case.court_report_not_submitted? %>
       <% if @casa_case.court_report_submitted? && @casa_case.court_reports.attached? %>
         <%= link_to('Click to download',
                     rails_blob_path(@casa_case.latest_court_report, disposition: 'attachment')) %>
       <% end %>
-      <p>
+      <div>
         <h6>
           <strong>Court Report Submitted Date:</strong>
           <%= @casa_case.decorate.court_report_submitted_date %></h6>
-      </p>
+      </div>
     <% end %>
     <% if @casa_case.case_court_orders.exists? %>
       <h6><strong>Court Orders:</strong></h6>
diff --git a/app/views/casa_org/_languages.html.erb b/app/views/casa_org/_languages.html.erb
index f76c8affa0..705de0b204 100644
--- a/app/views/casa_org/_languages.html.erb
+++ b/app/views/casa_org/_languages.html.erb
@@ -45,3 +45,4 @@
       </div>
     </div>
   </div>
+</div>
diff --git a/app/views/case_contacts/_case_contact.html.erb b/app/views/case_contacts/_case_contact.html.erb
index c3324c52a4..fbabde64af 100644
--- a/app/views/case_contacts/_case_contact.html.erb
+++ b/app/views/case_contacts/_case_contact.html.erb
@@ -4,7 +4,7 @@
       <div>
         <div class="mt-0">
           <i class=" <%= "text-primary" %> <%= contact.decorate.medium_icon_classes %>"></i>
-          <div class="">
+          <div>
             <h5 class="pt-0 mb-10 card-title d-flex align-items-center gap-2">
               <strong class="<%= "text-primary" %>">
                 <%= "[DELETE] " if policy(contact).restore? && contact.deleted? %>
diff --git a/app/views/case_contacts/_confirm_note_content_dialog.html.erb b/app/views/case_contacts/_confirm_note_content_dialog.html.erb
index f3e7214def..894e9ab0ef 100644
--- a/app/views/case_contacts/_confirm_note_content_dialog.html.erb
+++ b/app/views/case_contacts/_confirm_note_content_dialog.html.erb
@@ -6,10 +6,10 @@
       </div>
       <div class="modal-body">
         Please double check your notes to ensure they don't contain any identifying details about your youth or anyone else.
-        <p class="mt-3">
+        <div class="mt-3">
         <h6>Note</h6>
         <div id="note-content"></div>
-        </p>
+        </div>
       </div>
 
       <div class="modal-footer justify-content-between">
diff --git a/app/views/case_contacts/_followup.html.erb b/app/views/case_contacts/_followup.html.erb
index af56b14f68..6b1459b459 100644
--- a/app/views/case_contacts/_followup.html.erb
+++ b/app/views/case_contacts/_followup.html.erb
@@ -1,11 +1,9 @@
-<% if followup %>
-  <div>
+<div>
+  <% if followup %>
     <%= button_to resolve_followup_path(followup), method: :patch, class: "main-btn btn-sm success-btn btn-hover", id:"resolve", data: { turbo: false } do %>
       <i class="bi bi-calendar"></i>Resolve Reminder
     <% end %>
-  </div>
-<% else %>
-  <div>
+  <% else %>
     <button type="button"
             class="followup-button main-btn btn-sm primary-btn-outline btn-hover"
             id="followup-button-<%= contact.id %>"
@@ -13,5 +11,5 @@
       <i class="lni lni-calendar mr-5"></i>
       Make Reminder
     </button>
-  </div>
-<% end %>
+  <% end %>
+</div>
diff --git a/app/views/devise/invitations/edit.html.erb b/app/views/devise/invitations/edit.html.erb
index 0ff5fcc9b2..666d34b104 100644
--- a/app/views/devise/invitations/edit.html.erb
+++ b/app/views/devise/invitations/edit.html.erb
@@ -22,7 +22,7 @@
         type: "submit",
         class: "main-btn primary-btn btn-hover btn-sm"
       ) do %>
-        <i class="lni lni-lock-alt mr-10"></i></i>Set my password
+        <i class="lni lni-lock-alt mr-10"></i>Set my password
       <% end %>
     </div>
   <% end %>
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
index 43eb27a8a8..516fcc2aa5 100644
--- a/app/views/devise/mailer/reset_password_instructions.html.erb
+++ b/app/views/devise/mailer/reset_password_instructions.html.erb
@@ -52,7 +52,7 @@
                       <tbody style="box-sizing: border-box;">
                         <tr style="box-sizing: border-box;">
                           <td class="cell c1776" style="box-sizing: border-box; width: 70%; vertical-align: middle;text-align:center;" width="70%" valign="middle">
-                            <img style="max-width: 100%;" src="https://user-images.githubusercontent.com/8918762/120879374-7c813a00-c588-11eb-92d7-efa6fdfdfbf0.png" alt="Logo" class="c926" style="box-sizing: border-box; color: rgb(158, 83, 129); font-size: 50px;padding-top:10px;background:#00447c;">
+                            <img src="https://user-images.githubusercontent.com/8918762/120879374-7c813a00-c588-11eb-92d7-efa6fdfdfbf0.png" alt="Logo" class="c926" style="max-width: 100%; box-sizing: border-box; color: rgb(158, 83, 129); font-size: 50px;padding-top:10px;background:#00447c;">
                           </td>
                         </tr>
                       </tbody>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 4b62a5c109..9e2e3ffaf9 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -66,6 +66,8 @@
             ) do %>
               <i class="lni lni-chevron-right-circle mr-10"></i>Log In
             <% end %>
+          </div>
+        </div>
       <% end %>
       <div class="col-xxl-6 col-lg-12 col-md-6">
         <div class="text-start text-md-end text-lg-start text-xxl-end mb-30">
@@ -73,8 +75,6 @@
       </div>
       <div class="col-xxl-6 col-lg-12 col-md-6">
       </div>
-      </div>
-      </div>
     </div>
   </div>
 </div>
diff --git a/app/views/emancipations/show.html.erb b/app/views/emancipations/show.html.erb
index 090d7f2b13..5b39e11b5c 100644
--- a/app/views/emancipations/show.html.erb
+++ b/app/views/emancipations/show.html.erb
@@ -18,11 +18,12 @@
   <% @emancipation_form_data.each do |category| %>
     <h6 class="emancipation-category no-select" data-is-open="<%= emancipation_category_checkbox_checked(@current_case, category) ? "true" : "false" %>">
       <div class="checkbox-style emacipation-category-input-label-pair">
-        <input
-          type="checkbox"
-          class="emancipation-category-check-box form-check-input"
-          value="<%= category.id %>"
-          <%= emancipation_category_checkbox_checked(@current_case, category) %>>
+        <%= tag.input(
+          type: "checkbox",
+          class: "emancipation-category-check-box form-check-input",
+          value: category.id,
+          checked: emancipation_category_checkbox_checked(@current_case, category)) %>
+
         <div class="pt-10"><%= category.name %></div>
       </div>
       <% if category.emancipation_options.count > 0 %>
@@ -33,20 +34,20 @@
       <% category.emancipation_options.each do |option| %>
         <div class="check-item">
           <% if category.mutually_exclusive %>
-            <input
-              type="radio"
-              id="O<%= option.id %>"
-              class="emancipation-radio-button"
-              name="C<%= category.id %>"
-              value="<%= option.id %>"
-              <%= emancipation_option_checkbox_checked(@current_case, option) %>>
+            <%= tag.input(
+              type: "radio",
+              id: "O#{option.id}",
+              class: "emancipation-radio-button",
+              name: "C#{category.id}",
+              value: option.id,
+              checked: emancipation_option_checkbox_checked(@current_case, option)) %>
           <% else %>
-            <input
-              type="checkbox"
-              id="O<%= option.id %>"
-              class="emancipation-option-check-box"
-              value="<%= option.id %>"
-              <%= emancipation_option_checkbox_checked(@current_case, option) %>>
+            <%= tag.input(
+              type: "checkbox",
+              id: "O#{option.id}",
+              class: "emancipation-option-check-box",
+              value: option.id,
+              checked: emancipation_option_checkbox_checked(@current_case, option)) %>
           <% end %>
           <label><%= option.name %></label>
         </div>
diff --git a/app/views/imports/_cases.html.erb b/app/views/imports/_cases.html.erb
index f4ba0a6b1c..09ea55ba4c 100644
--- a/app/views/imports/_cases.html.erb
+++ b/app/views/imports/_cases.html.erb
@@ -26,7 +26,6 @@
                      class: 'form-control mt-4',
                      type: 'file',
                      style: "margin: auto;" %>
-    </div>
 
     <%= button_tag id: "case-import-button", class: "main-btn primary-btn btn-hover pull-right",
                    disabled: true, data: {disable_with: "<i class='fa fa-spinner fa-spin'></i> Importing File"} do %>
@@ -39,3 +38,4 @@
       })
     </script>
   <% end %>
+</div>
diff --git a/app/views/imports/_sms_opt_in_modal.html.erb b/app/views/imports/_sms_opt_in_modal.html.erb
index 1f8cdabfa6..20263345aa 100644
--- a/app/views/imports/_sms_opt_in_modal.html.erb
+++ b/app/views/imports/_sms_opt_in_modal.html.erb
@@ -17,7 +17,7 @@
         <span class="form-check checkbox-style">
           <%= form.label :sms_opt_in_label, "Opt into SMS notifications", { class: "form-check-label"} %>
           <%= form.check_box :sms_opt_in, { id: "sms-opt-in-checkbox", class: "form-check-input" } %>
-        <span>
+        </span>
       </div>
       <div class="modal-footer">
         <%= form.submit "Continue Import",
diff --git a/app/views/imports/_supervisors.html.erb b/app/views/imports/_supervisors.html.erb
index 632e27f51a..19fd4535e8 100644
--- a/app/views/imports/_supervisors.html.erb
+++ b/app/views/imports/_supervisors.html.erb
@@ -26,7 +26,6 @@
                      class: 'form-control mt-4',
                      type: 'file',
                      style: "margin: auto;" %>
-    </div>
 
     <%= render "sms_opt_in_modal", { form: f } if @sms_opt_in_warning == "supervisor" %>
     <%= button_tag id: "supervisor-import-button", class: "main-btn primary-btn btn-hover pull-right",
@@ -34,3 +33,4 @@
       <i class="lni lni-upload"></i> Import Supervisors CSV
     <% end %>
   <% end %>
+</div>
diff --git a/app/views/imports/_volunteers.html.erb b/app/views/imports/_volunteers.html.erb
index 75643d452b..110dbb86bf 100644
--- a/app/views/imports/_volunteers.html.erb
+++ b/app/views/imports/_volunteers.html.erb
@@ -27,7 +27,6 @@
                      class: 'form-control mt-4',
                      type: 'file',
                      style: "margin: auto;" %>
-    </div>
 
     <%= render "sms_opt_in_modal", { form: f } if @sms_opt_in_warning == "volunteer" %>
     <%= button_tag id: "volunteer-import-button", class: "main-btn primary-btn btn-hover pull-right",
@@ -35,3 +34,4 @@
       <i class="lni lni-upload"></i> Import Volunteers CSV
     <% end %>
   <% end %>
+</div>
diff --git a/app/views/layouts/_all_casa_admin_sidebar.html.erb b/app/views/layouts/_all_casa_admin_sidebar.html.erb
index 1c6ebebd9e..733fabdf5f 100644
--- a/app/views/layouts/_all_casa_admin_sidebar.html.erb
+++ b/app/views/layouts/_all_casa_admin_sidebar.html.erb
@@ -15,7 +15,6 @@
             Patch Notes
           <% end %>
         </li>
-        <li>
         <li class="<%= active_class(edit_all_casa_admins_path) %> nav-item">
           <%= link_to edit_all_casa_admins_path do %>
             <i class="lni lni-pencil-alt mr-10"></i>
diff --git a/app/views/layouts/_banner.html.erb b/app/views/layouts/_banner.html.erb
index f1814ebae5..48416a2b18 100644
--- a/app/views/layouts/_banner.html.erb
+++ b/app/views/layouts/_banner.html.erb
@@ -1,6 +1,6 @@
 <% if @active_banner %>
   <div class="bg-secondary-100 text-xl p-5 d-flex" data-controller="dismiss" data-dismiss-target="element" data-dismiss-url-value="<%= dismiss_banner_path(@active_banner) %>">
-    <div class="">
+    <div>
       <%= @active_banner.content %>
     </div>
     <div class="ms-auto">
diff --git a/app/views/learning_hours/_confirm_note.html.erb b/app/views/learning_hours/_confirm_note.html.erb
index 916364563e..99263c3b6d 100644
--- a/app/views/learning_hours/_confirm_note.html.erb
+++ b/app/views/learning_hours/_confirm_note.html.erb
@@ -6,10 +6,10 @@
       </div>
       <div class="modal-body">
         New entry created
-        <p>
+        <div>
         <h6>Note</h6>
         <div id="note-content"></div>
-        </p>
+        </div>
       </div>
 
       <div class="modal-footer">
diff --git a/app/views/other_duties/index.html.erb b/app/views/other_duties/index.html.erb
index 2010aa6804..3a57593464 100644
--- a/app/views/other_duties/index.html.erb
+++ b/app/views/other_duties/index.html.erb
@@ -37,6 +37,7 @@
                     </thead>
                     <tbody>
                     <% volunteer[:other_duties].decorate.each do |duty| %>
+                      <tr>
                       <td><%= I18n.l(duty.occurred_at, format: :full, default: nil) %></td>
                       <td><%= I18n.l(duty.created_at, format: :full, default: nil) %></td>
                       <td><%= duty.duration_in_minutes %></td>
diff --git a/app/views/shared/_manage_volunteers.html.erb b/app/views/shared/_manage_volunteers.html.erb
index 61520c1201..58ac5a0152 100644
--- a/app/views/shared/_manage_volunteers.html.erb
+++ b/app/views/shared/_manage_volunteers.html.erb
@@ -31,7 +31,7 @@
     <% end %>
     <br>
     <h3 class="title">Assign a Volunteer to Case</h3>
-    <fieldset class="border-0" <%= 'disabled' unless available_volunteers.any? %>>
+    <fieldset class="border-0" <% if available_volunteers.none? %> disabled <% end %>>
       <%= form_with(model: assignable_obj.new, url: assign_action) do |form| %>
         <div class='form-group select-style-1'>
           <label for="<%= select_id %>" class="mt-2">Select a Volunteer</label>
diff --git a/app/views/supervisors/_manage_active.html.erb b/app/views/supervisors/_manage_active.html.erb
index 88538caf69..560aa599a9 100644
--- a/app/views/supervisors/_manage_active.html.erb
+++ b/app/views/supervisors/_manage_active.html.erb
@@ -33,5 +33,5 @@
         Change to Admin
       <% end %>
     <% end %>
-    </div>
   <% end %>
+</div>
diff --git a/app/views/supervisors/index.html.erb b/app/views/supervisors/index.html.erb
index 29b597afe5..e6425910f2 100644
--- a/app/views/supervisors/index.html.erb
+++ b/app/views/supervisors/index.html.erb
@@ -151,10 +151,10 @@
               <% end %>
               </tbody>
             </table>
+          </div>
         <% else %>
           There are no active volunteers without supervisors to display here
         <% end %>
-        </div>
       </div>
     </div>
   </div>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 55b9f1683a..766568ad7d 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -73,6 +73,7 @@
                             data: {confirm: "Contact your administrator at Ruby For Good to deactivate this account."} %>
               <% end %>
             <% end %>
+          </div>
           <% end %>
           <div class="accordionGroup">
             <div id="collapseOne" class="collapse" aria-labelledby="headingOne" data-bs-parent="#accordionExample">
@@ -119,7 +120,6 @@
       </div>
     </div>
   </div>
-</div>
 
 <div>
   <%= form_with(model: @user, scope: :user, url: users_path, method: :patch) do |form| %>
diff --git a/app/views/volunteers/index.html.erb b/app/views/volunteers/index.html.erb
index b90f53baa8..841e3a2c5d 100644
--- a/app/views/volunteers/index.html.erb
+++ b/app/views/volunteers/index.html.erb
@@ -242,8 +242,6 @@
           <% end %>
         </div>
       </div>
+    </div>
   </div>
-  </div>
-
-</div>
 </div>
diff --git a/public/404.html b/public/404.html
index d6cf0e19f4..43d1bbe421 100644
--- a/public/404.html
+++ b/public/404.html
@@ -83,7 +83,7 @@ <h1>The page you were looking for doesn't exist.</h1>
   <div class="footer">
     <p class="copyright">
       &#169 CASA / Volunteer Tracking
-      </class>
+    </p>
   </div>
 </body>
 
diff --git a/public/500.html b/public/500.html
index 69aa248498..2fa58b0a85 100644
--- a/public/500.html
+++ b/public/500.html
@@ -83,7 +83,7 @@ <h1>We're sorry, but something went wrong.</h1>
   <div class="footer">
     <p class="copyright">
       &#169 CASA / Volunteer Tracking
-      </class>
+    </p>
   </div>
 </body>
 </html>