diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py
index d6b84421a..784518aab 100644
--- a/ietf/doc/tests.py
+++ b/ietf/doc/tests.py
@@ -278,7 +278,7 @@ class SearchTests(TestCase):
         r = self.client.get(urlreverse('ietf.doc.views_search.drafts_in_last_call'))
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, draft.title)
-        self.assertContains(r, escape(draft.action_holders.first().plain_name()))
+        self.assertContains(r, escape(draft.action_holders.first().name))
 
     def test_in_iesg_process(self):
         doc_in_process = IndividualDraftFactory()
@@ -350,7 +350,7 @@ class SearchTests(TestCase):
         self.assertEqual(q('td.status span.badge.bg-warning').text(),"for 15 days")
         self.assertEqual(q('td.status span.badge.bg-danger').text(),"for 29 days")
         for ah in [draft.action_holders.first() for draft in drafts]:
-            self.assertContains(r, escape(ah.plain_name()))
+            self.assertContains(r, escape(ah.name))
 
 class DocDraftTestCase(TestCase):
     draft_text = """
@@ -1278,7 +1278,7 @@ Man                    Expires September 22, 2015               [Page 3]
         q = PyQuery(r.content)
         self.assertEqual(len(self._pyquery_select_action_holder_string(q, '(None)')), 0)
         for person in draft.action_holders.all():
-            self.assertEqual(len(self._pyquery_select_action_holder_string(q, person.plain_name())), 1)
+            self.assertEqual(len(self._pyquery_select_action_holder_string(q, person.name)), 1)
         # check that one action holder was marked as old
         self.assertEqual(len(self._pyquery_select_action_holder_string(q, 'for 30 days')), 1)
 
@@ -2431,7 +2431,7 @@ class MaterialsTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
         q = PyQuery(r.content)
-        self.assertTrue(q('#materials-content > pre'))
+        self.assertTrue(q('#materials-content pre'))
 
         url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=self.doc.name,rev='01'))
         r = self.client.get(url)
diff --git a/ietf/group/tests_info.py b/ietf/group/tests_info.py
index e79e94a8d..88bb7e9f1 100644
--- a/ietf/group/tests_info.py
+++ b/ietf/group/tests_info.py
@@ -65,7 +65,7 @@ class GroupPagesTests(TestCase):
         self.assertContains(r, group.parent.name)
         self.assertContains(r, group.acronym)
         self.assertContains(r, group.name)
-        self.assertContains(r, escape(group.ad_role().person.plain_name()))
+        self.assertContains(r, escape(group.ad_role().person.name))
 
         for t in ('rg','area','ag', 'rag', 'dir','review','team','program','iabasg','adm'):
             g = GroupFactory.create(type_id=t,state_id='active') 
@@ -348,7 +348,7 @@ class GroupPagesTests(TestCase):
             self.assertEqual(r.status_code, 200)
 
             for role in group.role_set.all():
-                self.assertContains(r, escape(role.person.plain_name()))
+                self.assertContains(r, escape(role.person.name))
 
     def test_materials(self):
         group = GroupFactory(type_id="team", acronym="testteam", name="Test Team", state_id="active")
diff --git a/ietf/static/css/ietf.scss b/ietf/static/css/ietf.scss
index ad22b6758..a881a34de 100644
--- a/ietf/static/css/ietf.scss
+++ b/ietf/static/css/ietf.scss
@@ -170,14 +170,6 @@ $timeline-even-hover-color: shift-color($timeline-even-color, $link-shade-percen
     border: 2 * $table-border-width solid #000;
 }
 
-.is-blocking {
-    box-shadow: 0 0 8px 8px #dc0d12;
-    padding: 3px 0px 3px 3px;
-    margin: 5px 1px 3px 0px;
-    border: 1px solid #dc0d12;
-}
-
-
 // See https://getbootstrap.com/docs/5.0/customize/color/#all-colors
 $color-discuss: $red-500;
 $color-yes: $green-500;
@@ -186,6 +178,11 @@ $color-abstain: $orange-400;
 $color-recuse: $purple-400;
 $color-norecord: $gray-300;
 
+.is-blocking {
+    box-shadow: 0 0 map.get($spacers, 2) map.get($spacers, 2) $color-discuss;
+    margin: map.get($spacers, 2);
+}
+
 .color-discuss {
     color: $color-discuss;
 }
@@ -805,7 +802,7 @@ td.position-empty {
     align-items: baseline;
 }
 
-.edit-meeting-timeslots-and-misc-sessions .scheduling-panel .flowing-form .form-group {
+.edit-meeting-timeslots-and-misc-sessions .scheduling-panel .flowing-form .mb-3 {
     margin-right: 1em;
     margin-bottom: 0.5em;
 }
diff --git a/ietf/static/js/complete-review.js b/ietf/static/js/complete-review.js
index 9f373a2e1..e26f20267 100644
--- a/ietf/static/js/complete-review.js
+++ b/ietf/static/js/complete-review.js
@@ -2,7 +2,7 @@ $(document).ready(function () {
     var form = $("form.complete-review");
 
     var reviewedRev = form.find("[name=reviewed_rev]");
-    reviewedRev.closest(".form-group").find("a.rev").on("click", function (e) {
+    reviewedRev.closest(".mb-3").find("a.rev").on("click", function (e) {
         e.preventDefault();
         reviewedRev.val($(this).text());
     });
@@ -11,7 +11,7 @@ $(document).ready(function () {
     var mailArchiveSearchTemplate = form.find(".template .mail-archive-search").parent().html();
     var mailArchiveSearchResultTemplate = form.find(".template .mail-archive-search-result").parent().html();
 
-    form.find("[name=review_url]").closest(".form-group").before(mailArchiveSearchTemplate);
+    form.find("[name=review_url]").closest(".mb-3").before(mailArchiveSearchTemplate);
 
     var mailArchiveSearch = form.find(".mail-archive-search");
 
@@ -130,8 +130,8 @@ $(document).ready(function () {
             for (var i in shouldBeVisible[v]) {
                 var selector = shouldBeVisible[v][i];
                 var row = form.find(selector);
-                if (!row.is(".form-group"))
-                    row = row.closest(".form-group");
+                if (!row.is(".mb-3"))
+                    row = row.closest(".mb-3");
 
                 if ($.inArray(selector, shouldBeVisible[val]) != -1)
                     row.show();
diff --git a/ietf/static/js/edit-meeting-timeslots-and-misc-sessions.js b/ietf/static/js/edit-meeting-timeslots-and-misc-sessions.js
index b247e9e29..108bc0ddc 100644
--- a/ietf/static/js/edit-meeting-timeslots-and-misc-sessions.js
+++ b/ietf/static/js/edit-meeting-timeslots-and-misc-sessions.js
@@ -112,26 +112,26 @@ jQuery(document).ready(function () {
 
         let hide = {};
 
-        form.find("[name=group],[name=short],[name=\"agenda_note\"]").prop('disabled', false).closest(".form-group").show();
+        form.find("[name=group],[name=short],[name=\"agenda_note\"]").prop('disabled', false).closest(".mb-3").show();
 
         if (this.value == "break") {
-            form.find("[name=short]").closest(".form-group").hide();
+            form.find("[name=short]").closest(".mb-3").hide();
         }
         else if (this.value == "plenary") {
             let group = form.find("[name=group]");
             group.val(group.data('ietf'));
         }
         else if (this.value == "regular") {
-            form.find("[name=short]").closest(".form-group").hide();
+            form.find("[name=short]").closest(".mb-3").hide();
         }
 
         if (this.value != "regular")
-            form.find("[name=\"agenda_note\"]").closest(".form-group").hide();
+            form.find("[name=\"agenda_note\"]").closest(".mb-3").hide();
 
         if (['break', 'reg', 'reserved', 'unavail', 'regular'].indexOf(this.value) != -1) {
             let group = form.find("[name=group]");
             group.prop('disabled', true);
-            group.closest(".form-group").hide();
+            group.closest(".mb-3").hide();
         }
     });
 
diff --git a/ietf/static/js/ietf.js b/ietf/static/js/ietf.js
index cd0d7259a..7a3b8d28b 100644
--- a/ietf/static/js/ietf.js
+++ b/ietf/static/js/ietf.js
@@ -137,9 +137,10 @@ $(document)
                     var text = $(this)
                         .html()
                         .split("<")
-                        .shift();
+                        .shift()
+                        .trim();
 
-                    if (text === "") {
+                    if (text === undefined || text === "") {
                         // Nothing to do for empty headings.
                         return;
                     }
diff --git a/ietf/static/js/ipr-search.js b/ietf/static/js/ipr-search.js
index d2384061e..6b803e50f 100644
--- a/ietf/static/js/ipr-search.js
+++ b/ietf/static/js/ipr-search.js
@@ -16,7 +16,7 @@ $(document).ready(function() {
 
     // make enter presses submit through the nearby button
     $("form.ipr-search input,select").keyup(function (e) {
-        var submitButton = $(this).closest(".form-group").find('button[type=submit]');
+        var submitButton = $(this).closest(".mb-3").find('button[type=submit]');
         if (e.which == 13 && submitButton.length > 0) {
             submitButton.click();
             return false;
diff --git a/ietf/static/js/liaisons.js b/ietf/static/js/liaisons.js
index 436264304..d0d541801 100644
--- a/ietf/static/js/liaisons.js
+++ b/ietf/static/js/liaisons.js
@@ -4,7 +4,7 @@ var attachmentWidget = {
     count: 0,
 
     readConfig: function () {
-        var buttonFormGroup = attachmentWidget.button.parents('.form-group');
+        var buttonFormGroup = attachmentWidget.button.parents('.mb-3');
         var disabledLabel = buttonFormGroup.find('.attachDisabledLabel');
 
         if (disabledLabel.length) {
@@ -57,7 +57,7 @@ var attachmentWidget = {
         attachmentWidget.config.fields.each(function () {
             var field = $(this);
             var container = $(this)
-                .parents('.form-group');
+                .parents('.mb-3');
             if (container.find(':file')
                 .length) {
                 html += ' (' + field.val() + ')';
@@ -109,7 +109,7 @@ var attachmentWidget = {
         attachmentWidget.config.basefields.each(function () {
             var field = $(this);
             var oldcontainer = $(this)
-                .parents('.form-group');
+                .parents('.mb-3');
             var newcontainer = oldcontainer.clone();
             var newfield = newcontainer.find('#' + field.attr('id'));
             newfield.attr('name', newfield.attr('name') + '_' + attachmentWidget.count);
@@ -248,7 +248,7 @@ var liaisonForm = {
     },
 
     updatePurpose: function () {
-        var deadlinecontainer = liaisonForm.deadline.closest('.form-group');
+        var deadlinecontainer = liaisonForm.deadline.closest('.mb-3');
         var value = liaisonForm.purpose.val();
 
         if (value == 'action' || value == 'comment') {
diff --git a/ietf/static/js/list.js b/ietf/static/js/list.js
index 687f5628e..ceb477452 100644
--- a/ietf/static/js/list.js
+++ b/ietf/static/js/list.js
@@ -66,7 +66,9 @@ $(document)
                     .wrap(`<div id='tablewrapper-${n}'></div`);
                 $(header_row)
                     .children("[data-sort]")
-                    .addClass("sort")
+                    .addClass("sort");
+                $(header_row)
+                    .children("th, td")
                     .each((i, e) => field_magic(i, e, fields));
 
                 if ($(header_row)
diff --git a/ietf/static/js/upload-material.js b/ietf/static/js/upload-material.js
index c68b9c770..fb9f50587 100644
--- a/ietf/static/js/upload-material.js
+++ b/ietf/static/js/upload-material.js
@@ -4,7 +4,7 @@
         'use strict';
 
         /**
-         * Hide the inactive input form-group
+         * Hide the inactive input mb-3
          * @param form form to process
          */
         function showUrlOrFile(form) {
diff --git a/ietf/templates/debug.html b/ietf/templates/debug.html
index 4df9fa8fc..91a761821 100644
--- a/ietf/templates/debug.html
+++ b/ietf/templates/debug.html
@@ -110,7 +110,7 @@
         </div>
     {% else %}
         <small class='text-center text-muted'>
-            Add <samp>ietf.context_processors.sql_debug</samp> to <samp>settings.DEV_TEMPLATE_CONTEXT_PROCESSORS</samp> to turn on the SQL statement table.
+            Add <code>ietf.context_processors.sql_debug</code> to <code>settings.DEV_TEMPLATE_CONTEXT_PROCESSORS</code> to turn on the SQL statement table.
         </small>
     {% endif %}
 {% endif %}
diff --git a/ietf/templates/doc/ballot/approve_ballot.html b/ietf/templates/doc/ballot/approve_ballot.html
index 9d5205f90..4040bfa4e 100644
--- a/ietf/templates/doc/ballot/approve_ballot.html
+++ b/ietf/templates/doc/ballot/approve_ballot.html
@@ -13,7 +13,7 @@
     </h1>
     <form method="post">
         {% csrf_token %}
-        <pre class="border p-3">{{ announcement }}</pre>
+        <pre class="border p-3 mb-3">{{ announcement }}</pre>
         {% if action == "to_announcement_list" %}
             <button class="btn btn-primary" type="submit">Notify RFC Editor, send announcement & close ballot</button>
         {% elif action == "to_rfc_editor" %}
diff --git a/ietf/templates/doc/ballot/edit_position.html b/ietf/templates/doc/ballot/edit_position.html
index bee7877d5..4af073669 100644
--- a/ietf/templates/doc/ballot/edit_position.html
+++ b/ietf/templates/doc/ballot/edit_position.html
@@ -11,9 +11,11 @@
         <br>
         <small class="text-muted">{{ doc }}</small>
     </h1>
-    <div class="alert alert-warning my-3">
-        <b>{{ ballot.ballot_type.question }}</b>
-    </div>
+    {% if ballot.ballot_type.question %}
+        <div class="alert alert-warning my-3">
+            <b>{{ ballot.ballot_type.question }}</b>
+        </div>
+    {% endif %}
     {% if ballot_deferred %}
         <p class="alert alert-info my-3">
             Ballot deferred by {{ ballot_deferred.by }} on {{ ballot_deferred.time|date:"Y-m-d" }}.
diff --git a/ietf/templates/doc/document_bofreq.html b/ietf/templates/doc/document_bofreq.html
index 225173930..90ef1c0d4 100644
--- a/ietf/templates/doc/document_bofreq.html
+++ b/ietf/templates/doc/document_bofreq.html
@@ -153,7 +153,7 @@
             </p>
         {% endif %}
     {% endif %}
-    <div class="card ">
+    <div class="card mt-5">
         <div class="card-header">
             {{ doc.name }}-{{ doc.rev }}
         </div>
diff --git a/ietf/templates/doc/document_charter.html b/ietf/templates/doc/document_charter.html
index a021d5cb1..659942ecb 100644
--- a/ietf/templates/doc/document_charter.html
+++ b/ietf/templates/doc/document_charter.html
@@ -213,11 +213,6 @@
             {% endif %}
         {% endif %}
     </p>
-    <h2 class="my-3">
-        Charter
-        <br>
-        <small class="text-muted">{{ doc.canonical_name }}-{{ doc.rev }}</small>
-    </h2>
     {% if not snapshot and can_manage and chartering and group.state_id != "conclude" %}
         <p>
             <a class="btn btn-primary"
@@ -227,8 +222,15 @@
         </p>
     {% endif %}
     {% if doc.rev != "" %}
-        {# this content is already wrapped in 'pre' #}
-        {{ content|sanitize|maybewordwrap|safe }}
+        <div class="card mt-5">
+            <div class="card-header">
+                {{ doc.canonical_name }}-{{ doc.rev }}
+            </div>
+            <div class="card-body">
+                {# this content is already wrapped in 'pre' #}
+                {{ content|sanitize|maybewordwrap|safe }}
+            </div>
+        </div>
     {% endif %}
     {% if not snapshot and chartering %}
         <h2 class="my-3">
diff --git a/ietf/templates/doc/document_conflict_review.html b/ietf/templates/doc/document_conflict_review.html
index c5e62e484..c9746d94c 100644
--- a/ietf/templates/doc/document_conflict_review.html
+++ b/ietf/templates/doc/document_conflict_review.html
@@ -15,7 +15,7 @@
     {% if doc.rev != latest_rev %}
         <div class="alert alert-warning">The information below is for an old version of the document</div>
     {% endif %}
-    <table class="table table-sm table-borderless">
+    <table class="table table-sm table-borderless mb-3">
         <tbody class="meta border-top">
             <tr>
                 <th>Document</th>
@@ -117,11 +117,6 @@
             </tr>
         </tbody>
     </table>
-    <h2 class="mt-3">
-        Conflict review
-        <br>
-        <small class="text-muted">{{ conflictdoc.name }}-{{ conflictdoc.rev }}</small>
-    </h2>
     {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug != 'apprsent' %}
         <a class="btn btn-primary"
            href="{% url 'ietf.doc.views_conflict_review.submit' name=doc.name %}">
@@ -138,7 +133,16 @@
             {% endif %}
         {% endif %}
     {% endif %}
-    {% if doc.rev %}<pre>   {{ content|sanitize|maybewordwrap|safe }}</pre>{% endif %}
+    {% if doc.rev %}
+        <div class="card mt-5">
+            <div class="card-header">
+                {{ doc.name }}-{{ doc.rev }}
+            </div>
+            <div class="card-body">
+                <pre>   {{ content|sanitize|maybewordwrap|safe }}</pre>
+            </div>
+        </div>
+    {% endif %}
 {% endblock %}
 {% block js %}
     <script src="{% static 'ietf/js/d3.js' %}">
diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index 28a0112e4..bbf937df8 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -12,12 +12,7 @@
           title="Document changes"
           href="/feed/document-changes/{{ name }}/">
     <meta name="description"
-          content="{{ doc.title }} {% if doc.get_state_slug == "rfc" and not snapshot %}(RFC {{ rfc_number }}{% if published %}, {{ published.time|date:"F Y" }}{% endif %}{% if obsoleted_by %}; obsoleted by {{ obsoleted_by|join:"
-          {% endif %}
-          {% else %}
-          Internet-Draft
-          {{ doc.time|date:"Y" }}
-          {% endif %}>
+          content="{{ doc.title }} {% if doc.get_state_slug == 'rfc' and not snapshot %}(RFC {{ rfc_number }}{% if published %}, {{ published.time|date:'F Y' }}{% endif %}{% if obsoleted_by %}; obsoleted by {{ obsoleted_by|join:', ' }}{% endif %}){% else %}(Internet-Draft, {{ doc.time|date:'Y' }}){% endif %}">
 {% endblock %}
 {% block morecss %}.inline { display: inline; }{% endblock %}
 {% block title %}
@@ -104,12 +99,6 @@
                         {% person_link author %}
                         {% if not forloop.last %},{% endif %}
                     {% endfor %}
-                    {% comment %}
-                              {# Alternative implementation that uses the submission email (which might have turned invalid #}
-          {% for author in doc.documentauthor_set.all %}
-             {% email_person_link author.email %}{% if not forloop.last %},{% endif %}
-          {% endfor %}
-          {% endcomment %}
                 </td>
             </tr>
             <tr>
@@ -133,7 +122,13 @@
                                href="{% url 'ietf.doc.views_draft.replaces' name=doc.name %}">Edit</a>
                         {% endif %}
                     </td>
-                    <td>{{ replaces|urlize_related_target_list|join:", "|default:"(None)" }}</td>
+                    <td>
+                        {% if replaces %}
+                            {{ replaces|urlize_related_target_list|join:", " }}
+                        {% else %}
+                            <span class="text-muted">(None)</span>
+                        {% endif %}
+                    </td>
                 </tr>
             {% endif %}
             {% if replaced_by %}
@@ -203,8 +198,7 @@
                         </a>
                     {% endif %}
                 </td>
-                <td>
-                    {# {{ doc.stream|default:"(None)" }} #}
+                <td {% if stream_desc == "(None)" %}class="text-muted"{%endif%} >
                     {{ stream_desc }}
                 </td>
             </tr>
@@ -224,7 +218,13 @@
                         {% endif %}
                     </td>
                     <td>
-                        {{ doc.intended_std_level|default:"(None)" }}
+                        {% if doc.intended_std_level %}
+                            {{ doc.intended_std_level }}
+                        {% else %}
+                            <span class="text-muted">
+                                (None)
+                            </span>
+                        {% endif %}
                     </td>
                 </tr>
             {% endif %}
@@ -281,7 +281,9 @@
                                     {{ check.symbol|safe }}
                                 </span>
                             {% endif %}
-                            <a href="#" data-bs-toggle="modal" data-bs-target="#check-{{ check.pk }}">
+                            <a href="#"
+                               data-bs-toggle="modal"
+                               data-bs-target="#check-{{ check.pk }}">
                                 {{ check.errors }} errors, {{ check.warnings }} warnings.
                             </a>
                             {% include "doc/yang-check-modal-overlay.html" %}
@@ -310,24 +312,24 @@
                             will not review this version
                         {% endif %}
                         {% if can_request_review %}
-                            <div>
+                            <div class="mt-3">
                                 <a class="btn btn-primary btn-sm"
                                    href="{% url "ietf.doc.views_review.request_review" doc.name %}">
-                                    <span class="bi bi-check-circle-o">
+                                    <span class="bi bi-check-circle">
                                     </span>
                                     Request review
                                 </a>
                                 {% if can_submit_unsolicited_review_for_teams|length == 1 %}
                                     <a class="btn btn-primary btn-sm"
                                        href="{% url "ietf.doc.views_review.complete_review" doc.name can_submit_unsolicited_review_for_teams.0.acronym %}">
-                                        <span class="bi bi-pencil-square-o">
+                                        <span class="bi bi-pencil-square">
                                         </span>
                                         Submit unsolicited review
                                     </a>
                                 {% elif can_submit_unsolicited_review_for_teams %}
                                     <a class="btn btn-primary btn-sm"
                                        href="{% url "ietf.doc.views_review.submit_unsolicited_review_choose_team" doc.name %}">
-                                        <span class="bi bi-pencil-square-o">
+                                        <span class="bi bi-pencil-square">
                                         </span>
                                         Submit unsolicited review
                                     </a>
@@ -424,7 +426,13 @@
                         {% endif %}
                     </td>
                     <td>
-                        {{ stream_state|default:"(None)" }}
+                        {% if stream_state %}
+                            {{ stream_state }}
+                        {% else %}
+                            <span class="text-muted">
+                                (None)
+                            </span>
+                        {% endif %}
                         {% if milestones %}
                             (
                             <span class="milestone">
@@ -466,7 +474,7 @@
                     <th>
                     </th>
                     <th>
-                        Consensus Boilerplate
+                        Consensus boilerplate
                     </th>
                     <td class="edit">
                         {% if can_edit_stream_info and not snapshot %}
@@ -477,7 +485,8 @@
                         {% endif %}
                     </td>
                     <td>
-                        <span title="Whether the document is the result of a community consensus process as defined in RFC 5741">
+                        <span class="{% if consensus != "Yes" %}text-danger{% else %}text-success{% endif %}"
+                              title="Whether the document is the result of a community consensus process as defined in RFC 5741">
                             {{ consensus }}
                         </span>
                     </td>
@@ -509,7 +518,9 @@
                                 {% if not forloop.last %},{% endif %}
                             {% endfor %}
                         {% else %}
-                            None
+                            <span class="text-muted">
+                                (None)
+                            </span>
                         {% endif %}
                     </td>
                 </tr>
@@ -538,7 +549,9 @@
                         {% if doc.shepherd %}
                             {% person_link doc.shepherd.person %}
                         {% else %}
-                            No shepherd assigned
+                            <span class="text-muted">
+                                    (None)
+                                </span>
                         {% endif %}
                     </td>
                 </tr>
@@ -565,9 +578,11 @@
                                    href="{% url 'ietf.doc.views_doc.document_shepherd_writeup' name=doc.name %}">
                                     Show
                                 </a>
-                                (last changed {{ shepherd_writeup.time|date:"Y-m-d" }})
+                                <small class="text-muted">(last changed {{ shepherd_writeup.time|date:"Y-m-d" }})</small>
                             {% else %}
-                                (None)
+                                <span class="text-muted">
+                                    (None)
+                                </span>
                             {% endif %}
                         </td>
                     </tr>
@@ -591,7 +606,9 @@
                         {% if doc.has_rfc_editor_note %}
                             (last changed {{ doc.has_rfc_editor_note|date:"Y-m-d" }})
                         {% else %}
-                            (None)
+                            <span class="text-muted">
+                                (None)
+                            </span>
                         {% endif %}
                     </td>
                 </tr>
@@ -653,7 +670,7 @@
                                         </div>
                                     {% endfor %}
                                     {% if can_edit %}
-                                        <a class="btn btn-primary btn-sm"
+                                        <a class="btn btn-primary btn-sm mt-3"
                                            href="{% url "ietf.doc.views_doc.remind_action_holders" name=doc.name %}">
                                             <span class="bi bi-envelope">
                                             </span>
@@ -661,7 +678,9 @@
                                         </a>
                                     {% endif %}
                                 {% else %}
-                                    (None)
+                                    <span class="text-muted">
+                                        (None)
+                                    </span>
                                 {% endif %}
                             </div>
                         </td>
@@ -708,7 +727,11 @@
                                 On agenda of {{ telechat.telechat_date }} IESG telechat
                                 {% if telechat.returning_item %}(returning item){% endif %}
                             {% else %}
-                                {% if can_edit %}(None){% endif %}
+                                {% if can_edit %}
+                                    <span class="text-muted">
+                                        (None)
+                                    </span>
+                                {% endif %}
                             {% endif %}
                             {% if iesg_ballot_summary %}
                                 <br>
@@ -731,7 +754,13 @@
                             {% endif %}
                         </td>
                         <td>
-                            {{ doc.ad|default:"(None)" }}
+                            {% if doc.ad %}
+                                {% person_link doc.ad %}
+                            {% else %}
+                                <span class="text-muted">
+                                    (None)
+                                </span>
+                            {% endif %}
                         </td>
                     </tr>
                     {% if iesg_state.slug != 'idexists' %}
@@ -751,7 +780,13 @@
                                     {% endif %}
                                 </td>
                                 <td>
-                                    {{ doc.note|default:"(None)"|linebreaksbr }}
+                                    {% if doc.note %}
+                                        {{ doc.note|linebreaksbr }}
+                                    {% else %}
+                                        <span class="text-muted">
+                                            (None)
+                                        </span>
+                                    {% endif %}
                                 </td>
                             </tr>
                         {% endif %}
@@ -771,7 +806,13 @@
                             {% endif %}
                         </td>
                         <td>
-                            {{ doc.notify|linkify|default:"(None)" }}
+                            {% if doc.notify %}
+                                {{ doc.notify|linkify }}
+                            {% else %}
+                                <span class="text-muted">
+                                    (None)
+                                </span>
+                            {% endif %}
                         </td>
                     </tr>
                 </tbody>
@@ -796,8 +837,14 @@
                                     </a>
                                 {% endif %}
                             </td>
-                            <td class="{% if iana_review_state|truncatechars:7 != "IANA O…" %}text-danger{% else %}text-success{% endif %}">
-                                {{ iana_review_state }}
+                            <td class="{% if iana_review_state|slugify|slice:7 != "iana-ok" %}text-danger{% else %}text-success{% endif %}">
+                                {% if not iana_review_state %}
+                                    <span class="text-muted">
+                                        (None)
+                                    </span>
+                                {% else %}
+                                    {{ iana_review_state }}
+                                {% endif %}
                             </td>
                         </tr>
                     {% endif %}
@@ -820,7 +867,13 @@
                                 {% endif %}
                             </td>
                             <td>
-                                {{ iana_action_state }}
+                                {% if not iana_action_state %}
+                                    <span class="text-muted">
+                                        (None)
+                                    </span>
+                                {% else %}
+                                    {{ iana_action_state }}
+                                {% endif %}
                             </td>
                         </tr>
                     {% endif %}
@@ -842,8 +895,14 @@
                                     </a>
                                 {% endif %}
                             </td>
-                            <td>
-                                {{ iana_experts_state }}
+                            <td class="{% if iana_experts_state|slugify|slice:"-2:" != "ok" %}text-danger{% else %}text-success{% endif %}">
+                                {% if not iana_experts_state %}
+                                    <span class="text-muted">
+                                        (None)
+                                    </span>
+                                {% else %}
+                                    {{ iana_experts_state }}
+                                {% endif %}
                             </td>
                         </tr>
                     {% endif %}
@@ -866,7 +925,13 @@
                                 {% endif %}
                             </td>
                             <td>
-                                {{ iana_experts_comment }}
+                                {% if not iana_experts_comment %}
+                                    <span class="text-muted">
+                                        (None)
+                                    </span>
+                                {% else %}
+                                    {{ iana_experts_comment }}
+                                {% endif %}
                             </td>
                         </tr>
                     {% endif %}
@@ -1034,7 +1099,7 @@
                 <a class="btn btn-primary btn-sm review-wish-add-remove-doc {% if user.review_teams|length_is:"1" %}ajax {% endif %}{% if doc.has_review_wish %}hide{% endif %}"
                    href="{% url "ietf.doc.views_review.review_wish_add" name=doc.name %}?next={{ request.get_full_path|urlencode }}"
                    title="Add to your review wishes">
-                    <span class="bi bi-chats-o">
+                    <span class="bi bi-chats">
                     </span>
                     Add review wish
                 </a>
@@ -1062,21 +1127,30 @@
             {% endif %}
         </div>
         {% if doc.get_state_slug == "active" or doc.get_state_slug == "rfc" %}
-            {{ content|safe }}
+            <div class="card mt-5">
+                <div class="card-header">
+                    {% if doc.get_state_slug == "rfc" and not snapshot %}
+                        RFC {{ rfc_number }}
+                    {% else %}
+                        {{ name }}-{{ doc.rev }}
+                    {% endif %}
+                </div>
+                <div class="card-body">
+                    {{ content|sanitize|safe }}
+                </div>
+            </div>
             {% if split_content %}
-                <a class="btn btn-primary btn-block" href="?include_text=1">
+                <a class="btn btn-primary my-3" href="?include_text=1">
                     <span class="bi bi-caret-down">
                     </span>
                     Show full document text
                 </a>
             {% endif %}
         {% else %}
-            <p>
-            </p>
-            <div class="card border-warning">
+            <div class="card border-warning mt-5">
                 <div class="card-header bg-warning">
-                    This Internet-Draft is no longer active. A copy of
-                    the expired Internet-Draft can be found at
+                    <b>This Internet-Draft is no longer active. A copy of
+                    the expired Internet-Draft can be found at:</b>
                     <br />
                     <a href="{{ doc.get_href }}">
                         {{ doc.get_href }}
@@ -1094,20 +1168,11 @@
                     </h5>
                     <p class="card-text">
                         {% for author in doc.documentauthor_set.all %}
-                            {% if author.email %}
-                                <span class="bi bi-envelope">
-                                </span>
-                                <a href="mailto:{{ author.email.address }}">
-                                {% endif %}
-                                {{ author.person }}
-                                {% if author.email %}
-                                    ({{ author.email.address }})
-                                </a>
-                            {% endif %}
+                            {% person_link author.person %}
                             {% if not forloop.last %}<br>{% endif %}
                         {% endfor %}
                     </p>
-                    <p class="card-text">
+                    <p class="text-muted card-text">
                         (Note: The e-mail addresses provided for the authors of this Internet-Draft may no longer be valid.)
                     </p>
                 </div>
diff --git a/ietf/templates/doc/document_material.html b/ietf/templates/doc/document_material.html
index 9481942ca..c4a39425a 100644
--- a/ietf/templates/doc/document_material.html
+++ b/ietf/templates/doc/document_material.html
@@ -1,44 +1,35 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load static %}
 {% load ietf_filters %}
-
 {% block title %}{{ doc.title }}{% endblock %}
-
 {% block content %}
     {% origin %}
     {{ top|safe }}
-
     {% include "doc/revisions_list.html" %}
     <div id="timeline"></div>
-
-    <table class="table table-sm">
-        <thead id="message-row">
+    {% if doc.rev != latest_rev %}
+        <div class="alert alert-warning">The information below is for an old version of the document</div>
+    {% endif %}
+    <table class="table table-sm table-borderless">
+        <tbody class="meta border-top">
             <tr>
-                {% if doc.rev != latest_rev %}
-                    <th colspan="3" class="alert-warning">The information below is for an old version of the document</th>
-                {% else %}
-                    <th colspan="3"></th>
-                {% endif %}
-            </tr>
-        </thead>
-
-        <tbody class="meta">
-            <tr>
-                <th class="col-md-1">{% if doc.meeting_related %}Meeting{% endif %} {{ doc.type.name }}</th>
-                <td class="edit col-md-1"></td>
-                <td class="col-md-10">
+                <th>
+                    {% if doc.meeting_related %}Meeting{% endif %}
+                    {{ doc.type.name }}
+                </th>
+                <td></td>
+                <td>
                     {% if doc.group %}
                         {{ doc.group.name }}
-                        <a href="{{ doc.group.about_url }}">({{ doc.group.acronym }})</a> {{ doc.group.type.name }}
-                    {% endif %}
-                    {% if snapshot %}
-                        <span class="badge bg-warning">Snapshot</span>
+                        <a href="{{ doc.group.about_url }}">({{ doc.group.acronym }})</a>
+                        {{ doc.group.type.name }}
                     {% endif %}
+                    {% if snapshot %}<span class="badge bg-warning">Snapshot</span>{% endif %}
                 </td>
             </tr>
-
             <tr>
                 <th>Title</th>
                 <td class="edit">
@@ -46,9 +37,8 @@
                         {% doc_edit_button 'ietf.doc.views_material.edit_material' name=doc.name action="title" %}
                     {% endif %}
                 </td>
-                <td>{{ doc.title }}</td>
+                <th>{{ doc.title }}</th>
             </tr>
-
             {% if doc.abstract or doc.type_id == 'slides' and can_manage_material and not snapshot %}
                 <tr>
                     <th>Abstract</th>
@@ -60,7 +50,6 @@
                     <td>{{ doc.abstract|format_snippet }}</td>
                 </tr>
             {% endif %}
-
             <tr>
                 <th>State</th>
                 <td class="edit">
@@ -70,19 +59,18 @@
                 </td>
                 <td>{{ doc.get_state.name }}</td>
             </tr>
-
             {% if other_types %}
                 <tr>
                     <th>Other versions</th>
                     <td class="edit"></td>
                     <td>
                         {% for t, url in other_types %}
-                            <a href="{{ url }}">{{ t }}</a>{% if not forloop.last %},{% endif %}
+                            <a href="{{ url }}">{{ t }}</a>
+                            {% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </td>
                 </tr>
             {% endif %}
-
             {% if doc.type_id == 'procmaterials' and doc.external_url|length > 0 %}
                 <tr>
                     <th>External URL</th>
@@ -92,7 +80,6 @@
                     </td>
                 </tr>
             {% endif %}
-
             {% if doc.type_id != 'procmaterials' %}
                 {% if presentations or can_manage_material %}
                     <tr>
@@ -102,10 +89,13 @@
                                 {% doc_edit_button "ietf.doc.views_doc.all_presentations" name=doc.name %}
                             {% endif %}
                         </td>
-
                         <td>
                             {% if presentations %}
-                                {% for pres in presentations %}{{ pres.session.short_name }} at {{ pres.session.meeting }} {% if pres.rev != doc.rev %}(version -{{ pres.rev }}){% endif %}{% if not forloop.last %}, {% endif %}{% endfor %}
+                                {% for pres in presentations %}
+                                    {{ pres.session.short_name }} at {{ pres.session.meeting }}
+                                    {% if pres.rev != doc.rev %}(version -{{ pres.rev }}){% endif %}
+                                    {% if not forloop.last %},{% endif %}
+                                {% endfor %}
                             {% else %}
                                 None
                             {% endif %}
@@ -113,7 +103,6 @@
                     </tr>
                 {% endif %}
             {% endif %}
-
             <tr>
                 <th>Last updated</th>
                 <td class="edit"></td>
@@ -121,37 +110,34 @@
             </tr>
         </tbody>
     </table>
-
     <p class="buttonlist">
         {% if can_upload %}
-            <a class="btn btn-primary" href="{% url 'ietf.doc.views_material.edit_material' name=doc.name action="revise" %}">Upload New Revision</a>
+            <a class="btn btn-primary"
+               href="{% url 'ietf.doc.views_material.edit_material' name=doc.name action="revise" %}">
+                Upload New Revision
+            </a>
         {% endif %}
     </p>
-
-    <h2>{% if doc.meeting_related %}Meeting{% endif %} {{ doc.type.name }}<br><small class="text-muted">{{ doc.name }}</small></h2>
-
-    <div id='materials-content'>
-        {% if doc.rev and content != None %}
-            {% if content_is_html %}
-                <div class="card ">
-                    <div class="card-body">
-                        {{ content|sanitize|safe }}
-                    </div>
-                </div>
+    <div id='materials-content' class="card mt-5">
+        <div class="card-header">{{ doc.name }}-{{ doc.rev }}</div>
+        <div class="card-body">
+            {% if doc.rev and content != None %}
+                {% if content_is_html %}
+                    {{ content|sanitize|safe }}
+                {% else %}
+                    <pre>{{ content|sanitize|maybewordwrap|safe }}</pre>
+                {% endif %}
             {% else %}
-                <pre>{{ content|sanitize|maybewordwrap|safe }}</pre>
+                Not available as plain text.
+                {% if other_types %}
+                    <a href="{{ other_types.0.1 }}">Download as {{ other_types.0.0.upper }}</a>
+                    .
+                {% endif %}
             {% endif %}
-        {% else %}
-            <p>Not available as plain text.</p>
-
-            {% if other_types %}
-                <p class="download-instead"><a href="{{ other_types.0.1 }}">Download as {{ other_types.0.0.upper }}</a></p>
-            {% endif %}
-        {% endif %}
+        </div>
     </div>
 {% endblock %}
-
 {% block js %}
     <script src="{% static 'ietf/js/d3.js' %}"></script>
     <script src="{% static 'ietf/js/document_timeline.js' %}"></script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/document_referenced_by.html b/ietf/templates/doc/document_referenced_by.html
index b1a30a63e..3851770a0 100644
--- a/ietf/templates/doc/document_referenced_by.html
+++ b/ietf/templates/doc/document_referenced_by.html
@@ -1,34 +1,32 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin static ietf_filters %}
-
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
 {% endblock %}
-
-{% block title %}
-    References to {{alias_name}}
-{% endblock %}
-
+{% block title %}References to {{ alias_name }}{% endblock %}
 {% block content %}
     {% origin %}
-    <h1>References to {{alias_name}}</h1>
-
-    <p class="alert alert-info">
+    <h1>References to {{ alias_name }}</h1>
+    <p class="mt-3 alert alert-info">
         These dependencies are extracted using heuristics looking for strings with particular prefixes. Notably, this means that references to I-Ds by title only are not reflected here. If it's really important, please inspect the documents' references sections directly.
     </p>
-
     <p>
-        Showing RFCs and active Internet-Drafts, sorted by <a href="{% url 'ietf.doc.views_help.relationship_help' subset='reference' %}">reference type</a>, then document name.
+        Showing RFCs and active Internet-Drafts, sorted by
+        <a href="{% url 'ietf.doc.views_help.relationship_help' subset='reference' %}">reference type</a>
+        , then document name.
     </p>
-
     {% if numdocs %}
         <div class="alert alert-warning">
-            <p>Showing only the first 250 of {{ numdocs }} documents.</p>
-            <p><a class="btn btn-primary" href="?full=True">Show all</a></p>
+            <p>
+                Showing only the first 250 of {{ numdocs }} documents.
+            </p>
+            <p>
+                <a class="btn btn-primary" href="?full=True">Show all</a>
+            </p>
         </div>
     {% endif %}
-
     <table class="table table-sm table-striped tablesorter">
         <thead>
             <tr>
@@ -46,30 +44,45 @@
                         <td>
                             <a href="{% url 'ietf.doc.views_doc.document_main' name=name %}">{{ name|prettystdname }}</a>
                             {% if ref.target.name != alias_name %}
-                                <br><span class="badge bg-info">As {{ref.target.name}}</span>
+                                <br>
+                                <span class="badge bg-info">As {{ ref.target.name }}</span>
                             {% endif %}
                         </td>
                         <td>
-                            <b>{{ref.source.title}}</b><br>
-                            <a class="btn btn-primary btn-sm" href="{% url 'ietf.doc.views_doc.document_references' name %}" rel="nofollow"><span class="bi bi-arrow-left"></span> References</a>
-                            <a class="btn btn-primary btn-sm" href="{% url 'ietf.doc.views_doc.document_referenced_by' name %}" rel="nofollow"><span class="bi bi-arrow-right"></span> Referenced by</a>
+                            <b>{{ ref.source.title }}</b>
+                            <br>
+                            <a class="btn btn-primary btn-sm"
+                               href="{% url 'ietf.doc.views_doc.document_references' name %}"
+                               rel="nofollow">
+                                <span class="bi bi-arrow-left"></span>
+                                References
+                            </a>
+                            <a class="btn btn-primary btn-sm"
+                               href="{% url 'ietf.doc.views_doc.document_referenced_by' name %}"
+                               rel="nofollow">
+                                <span class="bi bi-arrow-right"></span>
+                                Referenced by
+                            </a>
                         </td>
                         <td>
                             {% ifequal ref.source.get_state.slug 'rfc' %}
-                                {% with ref.source.std_level as lvl %}{% if lvl %}{{lvl}}{% endif %}{%endwith%}
+                                {% with ref.source.std_level as lvl %}
+                                    {% if lvl %}{{ lvl }}{% endif %}
+                                {% endwith %}
                             {% else %}
-                                {% with ref.source.intended_std_level as lvl %}{% if lvl %}{{lvl}}{% endif %}{%endwith%}
+                                {% with ref.source.intended_std_level as lvl %}
+                                    {% if lvl %}{{ lvl }}{% endif %}
+                                {% endwith %}
                             {% endifequal %}
                         </td>
-                        <td>{{ref.relationship.name}}</td>
-                        <td>{{ref.is_downref|default:''}}</td>
+                        <td>{{ ref.relationship.name }}</td>
+                        <td>{{ ref.is_downref|default:'' }}</td>
                     </tr>
                 {% endwith %}
             {% endfor %}
         </tbody>
     </table>
 {% endblock %}
-
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/document_references.html b/ietf/templates/doc/document_references.html
index ff018cf6d..56d135195 100644
--- a/ietf/templates/doc/document_references.html
+++ b/ietf/templates/doc/document_references.html
@@ -1,26 +1,23 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin static ietf_filters %}
-
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
 {% endblock %}
-
-{% block title %}
-    References from {{doc.canonical_name}}
-{% endblock %}
-
+{% block title %}References from {{ doc.canonical_name }}{% endblock %}
 {% block content %}
     {% origin %}
-    <h1>References from {{doc.canonical_name}}</h1>
-
-    <p class="alert alert-info">
+    <h1>References from {{ doc.canonical_name }}</h1>
+    <p class="mb-3 alert alert-info">
         These dependencies are extracted using heuristics looking for strings with particular prefixes. Notably, this means that references to I-Ds by title only are not reflected here. If it's really important, please inspect the documents' references sections directly.
     </p>
     <p>
-        <a class="btn btn-primary" href="{% url 'ietf.doc.views_help.relationship_help' subset='reference' %}">Reference type help</a>
+        <a class="btn btn-primary"
+           href="{% url 'ietf.doc.views_help.relationship_help' subset='reference' %}">
+            Reference type help
+        </a>
     </p>
-
     <table class="table table-sm table-striped tablesorter">
         <thead>
             <tr>
@@ -35,28 +32,43 @@
             {% for ref in refs %}
                 {% with ref.target.name as name %}
                     <tr>
-                        <td><a href="{% url 'ietf.doc.views_doc.document_main' name=name %}">{{ name|prettystdname }}</a></td>
                         <td>
-                            <b>{{ref.target.document.title}}</b><br>
-                            <a class="btn btn-primary btn-sm" href="{% url 'ietf.doc.views_doc.document_references' name %}" rel="nofollow"><span class="bi bi-arrow-left"></span> References</a>
-                            <a class="btn btn-primary btn-sm" href="{% url 'ietf.doc.views_doc.document_referenced_by' name %}" rel="nofollow"><span class="bi bi-arrow-right"></span> Referenced by</a>
+                            <a href="{% url 'ietf.doc.views_doc.document_main' name=name %}">{{ name|prettystdname }}</a>
+                        </td>
+                        <td>
+                            <b>{{ ref.target.document.title }}</b>
+                            <br>
+                            <a class="btn btn-primary btn-sm"
+                               href="{% url 'ietf.doc.views_doc.document_references' name %}"
+                               rel="nofollow">
+                                <span class="bi bi-arrow-left"></span>
+                                References
+                            </a>
+                            <a class="btn btn-primary btn-sm"
+                               href="{% url 'ietf.doc.views_doc.document_referenced_by' name %}"
+                               rel="nofollow">
+                                <span class="bi bi-arrow-right"></span>
+                                Referenced by
+                            </a>
                         </td>
                         <td>
                             {% ifequal ref.target.document.get_state.slug 'rfc' %}
-                                {% with ref.target.document.std_level as lvl %}{% if lvl %}{{lvl}}{% endif %}{%endwith%}
+                                {% with ref.target.document.std_level as lvl %}
+                                    {% if lvl %}{{ lvl }}{% endif %}
+                                {% endwith %}
                             {% else %}
-                                {% with ref.target.document.intended_std_level as lvl %}{% if lvl %}{{lvl}}{% endif %}{%endwith%}
+                                {% with ref.target.document.intended_std_level as lvl %}
+                                    {% if lvl %}{{ lvl }}{% endif %}
+                                {% endwith %}
                             {% endifequal %}
                         </td>
-                        <td>{{ref.relationship.name}}</td>
-                        <td>{{ref.is_downref|default:''}}</td>
+                        <td>{{ ref.relationship.name }}</td>
+                        <td>{{ ref.is_downref|default:'' }}</td>
                     </tr>
                 {% endwith %}
             {% endfor %}
         </table>
-
-{% endblock %}
-
-{% block js %}
-    <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
\ No newline at end of file
+    {% endblock %}
+    {% block js %}
+        <script src="{% static "ietf/js/list.js" %}"></script>
+    {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/document_review.html b/ietf/templates/doc/document_review.html
index 83b632b25..781fa336b 100644
--- a/ietf/templates/doc/document_review.html
+++ b/ietf/templates/doc/document_review.html
@@ -1,33 +1,21 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2016-2019, All Rights Reserved #}
 {% load origin %}
 {% load static %}
 {% load ietf_filters %}
 {% load textfilters %}
-
 {% block title %}{{ doc.title }}{% endblock %}
-
 {% block content %}
     {% origin %}
     {{ top|safe }}
-
     {% include "doc/revisions_list.html" %}
-
     {% include "doc/review/request_info.html" %}
-
-    <table class="table table-sm">
-        <thead id="message-row">
-            <tr>
-                {% if doc.rev != latest_rev %}
-                    <th colspan="4" class="alert-warning">The information below is for an old version of the document</th>
-                {% elif doc.get_state_slug != "active" or other_reviews %}
-                    <th colspan="4"></th>
-                {% else %}
-
-                {% endif %}
-            </tr>
-        </thead>
-        <tbody class="meta">
+    {% if doc.rev != latest_rev %}
+        <div class="alert alert-warning">The information below is for an old version of the document.</div>
+    {% endif %}
+    <table class="table table-sm table-borderless">
+        <tbody class="meta border-top">
             {% if doc.get_state_slug != "active" %}
                 <tr>
                     <th></th>
@@ -36,7 +24,6 @@
                     <td>{{ doc.get_state.name }}</td>
                 </tr>
             {% endif %}
-
             {% if other_reviews %}
                 <tr>
                     <th></th>
@@ -51,10 +38,12 @@
             {% endif %}
         </tbody>
     </table>
-
-    <h2>{{ doc.type.name }}<br><small class="text-muted">{{ doc.name }}</small></h2>
-
     {% if doc.rev and content != None %}
-        <pre class="pasted">{{ content|linkify }}</pre>
+        <div class="card mt-5">
+            <div class="card-header">{{ doc.name }}-{{ doc.rev }}</div>
+            <div class="card-body">
+                <pre class="pasted">{{ content|linkify }}</pre>
+            </div>
+        </div>
     {% endif %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/document_status_change.html b/ietf/templates/doc/document_status_change.html
index 639e582f2..c9ff29d35 100644
--- a/ietf/templates/doc/document_status_change.html
+++ b/ietf/templates/doc/document_status_change.html
@@ -1,30 +1,22 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load static %}
 {% load ietf_filters %}
-
+{% load person_filters %}
+{% load textfilters %}
 {% block title %}{{ doc.title }}{% endblock %}
-
 {% block content %}
     {% origin %}
     {{ top|safe }}
-
     {% include "doc/revisions_list.html" %}
     <div id="timeline"></div>
-
-    <table class="table table-sm">
-        <thead id="message-row">
-            <tr>
-                {% if doc.rev != latest_rev %}
-                    <th colspan="4" class="alert-warning">The information below is for an old version of the document</th>
-                {% else %}
-                    <th colspan="4"></th>
-                {% endif %}
-            </tr>
-        </thead>
-
-        <tbody class="meta">
+    {% if doc.rev != latest_rev %}
+        <div class="alert alert-warning">The information below is for an old version of the document</div>
+    {% endif %}
+    <table class="table table-sm table-borderless">
+        <tbody class="meta border-top">
             <tr>
                 <th>Document</th>
                 <th>
@@ -36,56 +28,65 @@
                 </th>
                 <td class="edit">
                     {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
-                        <a class="btn btn-primary btn-sm float-end" href="{% url 'ietf.doc.views_status_change.edit_title' name=doc.name %}">Edit</a>
+                        <a class="btn btn-primary btn-sm float-end"
+                           href="{% url 'ietf.doc.views_status_change.edit_title' name=doc.name %}">
+                            Edit
+                        </a>
                     {% endif %}
                 </td>
-                <td>
+                <th>
                     {{ doc.title }}
-                    {% if snapshot %}
-                        <span class="badge bg-warning">Snapshot</span>
-                    {% endif %}
-                </td>
+                    {% if snapshot %}<span class="badge bg-warning">Snapshot</span>{% endif %}
+                </th>
             </tr>
-
             <tr>
                 <th></th>
                 <th>Last updated</th>
                 <td class="edit"></td>
                 <td>{{ doc.time|date:"Y-m-d" }}</td>
             </tr>
-
-
             {% regroup sorted_relations by relationship.name as relation_groups %}
             {% for relation_group in relation_groups %}
                 <tr>
                     <th></th>
-                    <th>{{relation_group.grouper}}</th>
+                    <th>{{ relation_group.grouper }}</th>
                     <td class="edit"></td>
-                    <td>{% for rel in relation_group.list %}{{rel.target.document.canonical_name|upper|urlize_ietf_docs}}{% if not forloop.last %}, {% endif %}{% endfor %}</td>
+                    <td>
+                        {% for rel in relation_group.list %}
+                            {{ rel.target.document.canonical_name|upper|urlize_ietf_docs }}
+                            {% if not forloop.last %},{% endif %}
+                        {% endfor %}
+                    </td>
                 </tr>
             {% endfor %}
-
             <tr>
                 <th></th>
-                <th><a href="{% url 'ietf.doc.views_help.state_help' type="status-change" %}">State</a></th>
+                <th>
+                    <a href="{% url 'ietf.doc.views_help.state_help' type="status-change" %}">State</a>
+                </th>
                 <td class="edit">
                     {% if not snapshot and user|has_role:"Area Director,Secretariat" %}
-                        <a class="btn btn-primary btn-sm float-end" href="{% url "ietf.doc.views_status_change.change_state" name=doc.name %}">Edit</a>
+                        <a class="btn btn-primary btn-sm float-end"
+                           href="{% url "ietf.doc.views_status_change.change_state" name=doc.name %}">
+                            Edit
+                        </a>
                     {% endif %}
                 </td>
                 <td>
                     <span title="{{ doc.get_state.desc }}">{{ doc.get_state.name }}</span>
                 </td>
             </tr>
-
         </tbody>
-        <tbody class="meta">
+        <tbody class="meta border-top">
             <tr>
                 <th>IESG</th>
                 <th>Telechat date</th>
                 <td class="edit">
                     {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
-                        <a class="btn btn-primary btn-sm float-end" href="{% url 'ietf.doc.views_doc.telechat_date;status-change' name=doc.name %}">Edit</a>
+                        <a class="btn btn-primary btn-sm float-end"
+                           href="{% url 'ietf.doc.views_doc.telechat_date;status-change' name=doc.name %}">
+                            Edit
+                        </a>
                     {% endif %}
                 </td>
                 <td>
@@ -95,66 +96,82 @@
                         On agenda of {{ telechat.telechat_date|date:"Y-m-d" }} IESG telechat
                         {% if doc.returning_item %}(returning item){% endif %}
                     {% endif %}
-
                     {% if ballot_summary %}
-                        <br><i>{{ ballot_summary }}</i>
+                        <br>
+                        <i>{{ ballot_summary }}</i>
                     {% endif %}
                 </td>
             </tr>
-
             <tr>
                 <th></th>
                 <th>Responsible AD</th>
                 <td class="edit">
                     {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
-                        <a class="btn btn-primary btn-sm float-end" href="{% url 'ietf.doc.views_status_change.edit_ad' name=doc.name %}">Edit</a>
+                        <a class="btn btn-primary btn-sm float-end"
+                           href="{% url 'ietf.doc.views_status_change.edit_ad' name=doc.name %}">
+                            Edit
+                        </a>
                     {% endif %}
                 </td>
-                <td>
-                    {{doc.ad}}
-                </td>
+                <td>{% person_link doc.ad %}</td>
             </tr>
-
             <tr>
                 <th></th>
                 <th>Send notices to</th>
                 <td class="edit">
                     {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
-                        <a class="btn btn-primary btn-sm float-end" href="{% url 'ietf.doc.views_doc.edit_notify;status-change' name=doc.name %}">Edit</a>
+                        <a class="btn btn-primary btn-sm float-end"
+                           href="{% url 'ietf.doc.views_doc.edit_notify;status-change' name=doc.name %}">
+                            Edit
+                        </a>
                     {% endif %}
                 </td>
                 <td>
-                    {{doc.notify}}
+                    {{ doc.notify|linkify }}
                 </td>
             </tr>
-
         </tbody>
     </table>
-
     <p class="buttonlist">
         {% if not snapshot and user|has_role:"Area Director,Secretariat" %}
             {% if doc.get_state_slug not in approved_states %}
-                <a class="btn btn-primary" href="{% url 'ietf.doc.views_status_change.edit_relations' name=doc.name %}">Edit affected RFCs</a>
-                <a class="btn btn-primary" href="{% url 'ietf.doc.views_status_change.last_call'  name=doc.name %}">Edit last call text</a>
+                <a class="btn btn-primary"
+                   href="{% url 'ietf.doc.views_status_change.edit_relations' name=doc.name %}">
+                    Edit affected RFCs
+                </a>
+                <a class="btn btn-primary"
+                   href="{% url 'ietf.doc.views_status_change.last_call'  name=doc.name %}">
+                    Edit last call text
+                </a>
             {% endif %}
-
             {% if doc.get_state_slug != 'apprsent' %}
-                <a class="btn btn-primary" href="{% url 'ietf.doc.views_status_change.submit' name=doc.name %}">Edit status change text</a>
+                <a class="btn btn-primary"
+                   href="{% url 'ietf.doc.views_status_change.submit' name=doc.name %}">
+                    Edit status change text
+                </a>
             {% endif %}
         {% endif %}
-
         {% if request.user|has_role:"Secretariat" and doc.get_state_slug == 'appr-pend' %}
-            <a class="btn btn-warning" href="{% url 'ietf.doc.views_status_change.approve' name=doc.name %}">Approve RFC status change</a>
+            <a class="btn btn-warning"
+               href="{% url 'ietf.doc.views_status_change.approve' name=doc.name %}">
+                Approve RFC status change
+            </a>
         {% endif %}
     </p>
-
     {% if doc.rev %}
-        <pre>   {{ content|sanitize|maybewordwrap|safe }}</pre>
+        <div class="card mt-5">
+            <div class="card-header">
+                {{ doc.name }}-{{ doc.rev }}
+            </div>
+            <div class="card-body">
+                <pre>   {{ content|sanitize|maybewordwrap|safe }}</pre>
+            </div>
+        </div>
     {% endif %}
-
 {% endblock %}
-
 {% block js %}
-    <script src="{% static 'ietf/js/d3.js' %}"></script>
-    <script src="{% static 'ietf/js/document_timeline.js' %}"></script>
+    <script src="{% static 'ietf/js/d3.js' %}">
+    </script>
+    <script src="{% static 'ietf/js/document_timeline.js' %}">
+    </script>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/document_writeup.html b/ietf/templates/doc/document_writeup.html
index 67ffcce0e..e6079abb3 100644
--- a/ietf/templates/doc/document_writeup.html
+++ b/ietf/templates/doc/document_writeup.html
@@ -1,31 +1,26 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-
 {% load ietf_filters %}
 {% load textfilters %}
-
 {% block title %}Writeups for {{ doc.name }}-{{ doc.rev }}{% endblock %}
-
 {% block content %}
     {% origin %}
     {{ top|safe }}
-
     {% for title, subtitle, writeups in sections %}
-        <h2>
+        <h2 class="my-3">
             {{ title|capfirst_allcaps }}
             {% if subtitle %}
-                <br><small class="text-muted">{{ subtitle|safe }}</small>
+                <br>
+                <small class="text-muted">{{ subtitle|safe }}</small>
             {% endif %}
         </h2>
-
         {% for name, text, url in writeups %}
-            {% if text %}
-                <pre>{{ text|linkify }}</pre>
-            {% endif %}
-
-            <p>
-                {% if can_edit %}
+            {% if name %}<h3 class="mt-5">{{ name }}</h3>{% endif %}
+            {% if text %}<pre class="border p-3 my-3">{{ text|linkify }}</pre>{% endif %}
+            {% if can_edit %}
+                <p>
                     <a href="{{ url }}" class="btn btn-primary">
                         {% if text %}
                             Edit
@@ -34,8 +29,8 @@
                         {% endif %}
                         {{ name|lower_allcaps }}
                     </a>
-                {% endif %}
-            </p>
+                </p>
+            {% endif %}
         {% endfor %}
     {% endfor %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/downref.html b/ietf/templates/doc/downref.html
index 39240ffdd..3c72e280f 100644
--- a/ietf/templates/doc/downref.html
+++ b/ietf/templates/doc/downref.html
@@ -1,25 +1,20 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2017, All Rights Reserved #}
 {% load origin %}
 {% load django_bootstrap5 %}
-
 {% load ietf_filters static %}
-
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
 {% endblock %}
-
 {% block title %}{{ title }}{% endblock %}
-
 {% block content %}
     {% origin %}
     <h1>{{ title }}</h1>
-
     {% if add_button %}
-            <a class="btn btn-warning my-3" href="{% url "ietf.doc.views_downref.downref_registry_add" %}">Add downref</a>
-
+        <a class="btn btn-warning my-3"
+           href="{% url "ietf.doc.views_downref.downref_registry_add" %}">Add downref</a>
     {% endif %}
-
     <table class="table table-sm table-striped tablesorter">
         <thead>
             <tr>
@@ -32,18 +27,19 @@
                 <tr>
                     <td>
                         <a href="{% url "ietf.doc.views_doc.document_main" target_doc.name %}">RFC {{ target_doc.rfc_number }}</a>
-                        <br><b>{{ target_doc.title }}</b>
+                        <br>
+                        <b>{{ target_doc.title }}</b>
                     </td>
                     <td>
                         <a href="{% url "ietf.doc.views_doc.document_main" source_doc.name %}">{{ source_doc.name }}</a>
-                        <br><b>{{ source_doc.title }}</b>
+                        <br>
+                        <b>{{ source_doc.title }}</b>
                     </td>
                 </tr>
             {% endfor %}
         </tbody>
     </table>
 {% endblock %}
-
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/downref_add.html b/ietf/templates/doc/downref_add.html
index 93ef0b14a..0d8c01c75 100644
--- a/ietf/templates/doc/downref_add.html
+++ b/ietf/templates/doc/downref_add.html
@@ -1,44 +1,37 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2017, All Rights Reserved #}
 {% load origin %}
 {% load django_bootstrap5 %}
 {% load static %}
-
 {% block title %}{{ title }}{% endblock %}
-
-{% block pagehead %}
-    {{ add_downref_form.media.css }}
-{% endblock %}
-
+{% block pagehead %}{{ add_downref_form.media.css }}{% endblock %}
 {% block content %}
     {% origin %}
     <h1>{{ title }}</h1>
-
     {% bootstrap_messages %}
-
-    <div class="alert alert-info">This form will add entries to the downref registry.</div>
-
+    <div class="my-3 alert alert-info">This form will add entries to the downref registry.</div>
     <form method="post">
         {% csrf_token %}
         {% bootstrap_form add_downref_form %}
-
-
-
         <p>
-            <button type="submit" class="btn btn-primary" name="save_downref" value="Save downref">Save downref</button>
+            <button type="submit"
+                    class="btn btn-primary"
+                    name="save_downref"
+                    value="Save downref">Save downref</button>
             {% for error in add_downref_form.non_field_errors %}
                 {% if 'There does not seem to be a normative reference' in error %}
-                    <button type="submit" class="btn btn-warning" name="save_downref_anyway" value="Save downref anyway">Save downref anyway</button>
+                    <button type="submit"
+                            class="btn btn-warning"
+                            name="save_downref_anyway"
+                            value="Save downref anyway">
+                        Save downref anyway
+                    </button>
                 {% endif %}
             {% endfor %}
-            <a class="btn btn-warning" href="{% url "ietf.doc.views_downref.downref_registry" %}">Cancel</a>
+            <a class="btn btn-secondary float-end"
+               href="{% url "ietf.doc.views_downref.downref_registry" %}">Cancel</a>
         </p>
-
-
-
     </form>
 {% endblock %}
-
-{% block js %}
-    {{ add_downref_form.media.js }}
-{% endblock %}
+{% block js %}{{ add_downref_form.media.js }}{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/add_iana_experts_comment.html b/ietf/templates/doc/draft/add_iana_experts_comment.html
index ba9fd199e..42a03bbb3 100644
--- a/ietf/templates/doc/draft/add_iana_experts_comment.html
+++ b/ietf/templates/doc/draft/add_iana_experts_comment.html
@@ -1,26 +1,24 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2019, All Rights Reserved #}
 {% load origin %}
-
 {% load django_bootstrap5 %}
-
 {% block title %}Add IANA Experts Review State comment for {{ doc }}{% endblock %}
-
 {% block content %}
     {% origin %}
-    <h1>Add IANA Experts Review State comment<br><small class="text-muted">{{ doc }}</small></h1>
-
-    <form method="post">
+    <h1>
+        Add IANA Experts Review State comment
+        <br>
+        <small class="text-muted">{{ doc }}</small>
+    </h1>
+    <form class="mt-3" method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
-        <p class="form-text">The comment will be added to the history trail.</p>
-
-
-
+        <p class="form-text">
+            The comment will be added to the history trail.
+        </p>
         <button type="submit" class="btn btn-primary">Submit</button>
-        <a class="btn btn-secondary float-end" href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back</a>
-
-
+        <a class="btn btn-secondary float-end"
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back</a>
     </form>
-
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/adopt_draft.html b/ietf/templates/doc/draft/adopt_draft.html
index a2c194e0e..77183bed0 100644
--- a/ietf/templates/doc/draft/adopt_draft.html
+++ b/ietf/templates/doc/draft/adopt_draft.html
@@ -1,30 +1,27 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-
 {% load django_bootstrap5 %}
-
-{% block title %}Manage Document Adoption of {{ doc }} in Group{% endblock %}
-
+{% block title %}Manage Document Adoption of {{ doc }}{% endblock %}
 {% block content %}
     {% origin %}
-    <h1>Manage Document Adoption of {{ doc }} in Group</h1>
-
-    <p class="alert alert-info">You can begin managing the group state of this draft.</p>
-
-    <p class="alert alert-info">For a WG, the draft enters the IETF stream.
-        For an RG, the draft enters the IRTF stream.</p>
-
+    <h1>
+        Manage Document Adoption
+        <br>
+        <small class="text-muted">{{ doc }}</small>
+    </h1>
+    <p class="my-3 alert alert-info">
+        You can begin managing the group state of this draft.
+    </p>
+    <p class="alert alert-info">
+        For a WG, the draft enters the IETF stream.
+        For an RG, the draft enters the IRTF stream.
+    </p>
     <form method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
-
-
-
         <button type="submit" class="btn btn-primary">Save</button>
         <a class="btn btn-secondary float-end" href="{{ doc.get_absolute_url }}">Back</a>
-
-
     </form>
-
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/change_ad.html b/ietf/templates/doc/draft/change_ad.html
index 2c67feda4..222f5a148 100644
--- a/ietf/templates/doc/draft/change_ad.html
+++ b/ietf/templates/doc/draft/change_ad.html
@@ -1,25 +1,21 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-
 {% load django_bootstrap5 %}
-
 {% block title %}Change responsible AD for {{ doc.name }}-{{ doc.rev }}{% endblock %}
-
 {% block content %}
     {% origin %}
-    <h1>Change responsible AD<br><small class="text-muted">{{ doc.name }}-{{ doc.rev }}</small></h1>
-
-    <form enctype="multipart/form-data" method="post">
+    <h1>
+        Change responsible AD
+        <br>
+        <small class="text-muted">{{ doc.name }}-{{ doc.rev }}</small>
+    </h1>
+    <form class="mt-3" enctype="multipart/form-data" method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
-
-
-
         <button type="submit" class="btn btn-primary">Submit</button>
-        <a class="btn btn-secondary float-end" href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back</a>
-
-
+        <a class="btn btn-secondary float-end"
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back</a>
     </form>
-
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/change_consensus.html b/ietf/templates/doc/draft/change_consensus.html
index c9fcf906f..f78dfd161 100644
--- a/ietf/templates/doc/draft/change_consensus.html
+++ b/ietf/templates/doc/draft/change_consensus.html
@@ -1,25 +1,21 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-
 {% load django_bootstrap5 %}
-
 {% block title %}Change consensus for {{ doc.name }}-{{ doc.rev }}{% endblock %}
-
 {% block content %}
     {% origin %}
-    <h1>Change consensus<br><small class="text-muted">{{ doc.name }}-{{ doc.rev }}</small></h1>
-
-    <form method="post">
+    <h1>
+        Change consensus
+        <br>
+        <small class="text-muted">{{ doc.name }}-{{ doc.rev }}</small>
+    </h1>
+    <form class="mt-3" method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
-
-
-
         <button type="submit" class="btn btn-primary">Submit</button>
-        <a class="btn btn-secondary float-end" href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back</a>
-
-
+        <a class="btn btn-secondary float-end"
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back</a>
     </form>
-
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/change_iana_state.html b/ietf/templates/doc/draft/change_iana_state.html
index 6f866c2bf..33e50a66e 100644
--- a/ietf/templates/doc/draft/change_iana_state.html
+++ b/ietf/templates/doc/draft/change_iana_state.html
@@ -1,24 +1,20 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-
 {% load django_bootstrap5 %}
-
 {% block title %}Change IANA state for {{ doc }}{% endblock %}
-
 {% block content %}
     {% origin %}
-    <h1>Change IANA state<br><small class="text-muted">{{ doc }}</small></h1>
-
-    <form method="post">
+    <h1>
+        Change IANA state
+        <br>
+        <small class="text-muted">{{ doc }}</small>
+    </h1>
+    <form class="mt-3" method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
-
-
-
         <button type="submit" class="btn btn-primary">Submit</button>
         <a class="btn btn-secondary float-end" href="{{ doc.get_absolute_url }}">Back</a>
-
-
     </form>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/change_intended_status.html b/ietf/templates/doc/draft/change_intended_status.html
index 55bd1e195..83cff17ff 100644
--- a/ietf/templates/doc/draft/change_intended_status.html
+++ b/ietf/templates/doc/draft/change_intended_status.html
@@ -1,24 +1,20 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-
 {% load django_bootstrap5 %}
-
 {% block title %}Change intended status for {{ doc }}{% endblock %}
-
 {% block content %}
     {% origin %}
-    <h1>Change intended status<br><small class="text-muted">{{ doc }}</small></h1>
-
-    <form method="post">
+    <h1>
+        Change intended status
+        <br>
+        <small class="text-muted">{{ doc }}</small>
+    </h1>
+    <form class="mt-3" method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
-
-
-
         <button type="submit" class="btn btn-primary">Save</button>
         <a class="btn btn-secondary float-end" href="{{ doc.get_absolute_url }}">Back</a>
-
-
     </form>
 {% endblock %}
diff --git a/ietf/templates/doc/draft/change_shepherd_writeup.html b/ietf/templates/doc/draft/change_shepherd_writeup.html
index d9d9c4dc0..4bb97e86e 100644
--- a/ietf/templates/doc/draft/change_shepherd_writeup.html
+++ b/ietf/templates/doc/draft/change_shepherd_writeup.html
@@ -1,28 +1,30 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-
 {% load django_bootstrap5 %}
-
-{% block title %}
-    Edit shepherd writeup for {{ doc.canonical_name }}-{{ doc.rev }}
-{% endblock %}
-
+{% block title %}Edit shepherd writeup for {{ doc.canonical_name }}-{{ doc.rev }}{% endblock %}
 {% block content %}
     {% origin %}
-    <h1>Edit shepherd writeup<br><small class="text-muted">{{ doc.canonical_name }}-{{ doc.rev }}</small></h1>
-
-    <form enctype="multipart/form-data" method="post">
+    <h1>
+        Edit shepherd writeup
+        <br>
+        <small class="text-muted">{{ doc.canonical_name }}-{{ doc.rev }}</small>
+    </h1>
+    <form class="mt-3" enctype="multipart/form-data" method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
-
-
-
-        <button type="submit" class="btn btn-primary" name="submit_response" value="Submit">Submit</button>
-        <button type="submit" class="btn btn-warning" name="reset_text" value="Reset to Template Text">Reset to template text</button>
-        <a class="btn btn-secondary float-end" href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back</a>
-
-
+        <button type="submit"
+                class="btn btn-primary"
+                name="submit_response"
+                value="Submit">Submit</button>
+        <button type="submit"
+                class="btn btn-warning"
+                name="reset_text"
+                value="Reset to Template Text">
+            Reset to template text
+        </button>
+        <a class="btn btn-secondary float-end"
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back</a>
     </form>
-
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/change_state.html b/ietf/templates/doc/draft/change_state.html
index bafaeb534..dab806178 100644
--- a/ietf/templates/doc/draft/change_state.html
+++ b/ietf/templates/doc/draft/change_state.html
@@ -1,23 +1,21 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-
 {% load django_bootstrap5 %}
-
 {% block title %}Change state for {{ doc }}{% endblock %}
-
 {% block content %}
     {% origin %}
-    <h1>Change state<br><small class="text-muted">{{ doc }}</small></h1>
-
-    <p>
-        <a class="btn btn-info" href="{% url 'ietf.doc.views_help.state_help' type="draft-iesg" %}">Help on states</a>
-    </p>
-
-    <form method="post">
+    <h1>
+        Change state
+        <br>
+        <small class="text-muted">{{ doc }}</small>
+    </h1>
+    <a class="btn btn-info my-3"
+       href="{% url 'ietf.doc.views_help.state_help' type="draft-iesg" %}">Help on states</a>
+    <form class="mt-3" method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
-
         {% if state and state.slug == "rfcqueue" %}
             <div class="form-text">
                 <b>Note:</b> If you pull the draft out of the
@@ -25,48 +23,47 @@
                 by email with this comment, so they can update their queues.
             </div>
         {% endif %}
-
-
-
         <button type="submit" class="btn btn-primary">Submit</button>
-        <a class="btn btn-secondary float-end" href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back</a>
-
-
+        <a class="btn btn-secondary float-end"
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back</a>
     </form>
-
     {% if next_states %}
-        <h2>Or jump directly to</h2>
-
-        <div class="buttonlist">
-            {% for n in next_states %}
-                <form method="post">
-                    {% csrf_token %}
-                    <input type="hidden" name="state" value="{{ n.pk }}">
-                    <input class="btn btn-primary" type="submit" value="{{ n.name }}">
-                </form>
-            {% endfor %}
+        <div class="mt-3">
+            <b>Or jump directly to</b>
         </div>
+        {% for n in next_states %}
+            <form class="d-inline" method="post">
+                {% csrf_token %}
+                <input type="hidden" name="state" value="{{ n.pk }}">
+                <input class="btn btn-primary" type="submit" value="{{ n.name }}">
+            </form>
+        {% endfor %}
     {% endif %}
-
     {% if to_iesg_eval %}
-        <h2>You could also jump directly to</h2>
-
+        <div class="mt-3">
+            <b>You could also jump directly to</b>
+        </div>
         <form method="post">
             {% csrf_token %}
             <input type="hidden" name="state" value="{{ to_iesg_eval.pk }}">
             <input class="btn btn-warning" type="submit" value="{{ to_iesg_eval.name }}">
             But the ballot for this document has not yet been issued.
-            <a class="btn btn-primary" href="{% url 'ietf.doc.views_ballot.ballot_writeupnotes' name=doc.name %}">Edit ballot text</a>
+            <a class="btn btn-primary"
+               href="{% url 'ietf.doc.views_ballot.ballot_writeupnotes' name=doc.name %}">
+                Edit ballot text
+            </a>
         </form>
     {% endif %}
-
     {% if prev_state %}
-        <h2>Or revert to previous state</h2>
-
+        <div class="mt-3">
+            <b>Or revert to previous state</b>
+        </div>
         <form method="post">
             {% csrf_token %}
             <input type="hidden" name="state" value="{{ prev_state.pk }}">
-            <input class="btn btn-warning" type="submit" value="Revert to {{ prev_state.name }}">
+            <input class="btn btn-warning"
+                   type="submit"
+                   value="Revert to {{ prev_state.name }}">
         </form>
     {% endif %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/change_stream_state.html b/ietf/templates/doc/draft/change_stream_state.html
index 3450736e1..83480b4d4 100644
--- a/ietf/templates/doc/draft/change_stream_state.html
+++ b/ietf/templates/doc/draft/change_stream_state.html
@@ -1,40 +1,33 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-
 {% load django_bootstrap5 %}
-
 {% block title %}Change {{ state_type.label }} for {{ doc }}{% endblock %}
-
-
 {% block content %}
     {% origin %}
-    <h1>Change {{ state_type.label }}<br><small class="text-muted">{{ doc }}</small></h1>
-
+    <h1>
+        Change {{ state_type.label }}
+        <br>
+        <small class="text-muted">{{ doc }}</small>
+    </h1>
     {% if next_states %}
+        <a class="my-3 btn btn-info"
+           href="{% url 'ietf.doc.views_help.state_help' type=state_type.slug %}">Help on states</a>
         <p>
             <b>Move document to {{ next_states|pluralize:"to one of" }} the recommended next state{{ next_states|pluralize }}:</b>
         </p>
-        <p class="buttonlist">
-            {% for state in next_states %}
-                <button class="btn btn-primary next-state" data-state="{{ state.pk }}">{{ state.name }}</button>
-            {% endfor %}
-            <a class="btn btn-info float-end" href="{% url 'ietf.doc.views_help.state_help' type=state_type.slug %}">Help on states</a>
-        </p>
+        {% for state in next_states %}
+            <button class="btn btn-primary next-state" data-state="{{ state.pk }}">{{ state.name }}</button>
+        {% endfor %}
     {% endif %}
-
-    <form method="post">
+    <form class="mt-5" method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
-
-
         <button type="submit" class="btn btn-primary">Submit</button>
         <a class="btn btn-secondary float-end" href="{{ doc.get_absolute_url }}">Back</a>
-
-
     </form>
 {% endblock %}
-
 {% block js %}
     <script>
         $(document).ready(function () {
@@ -47,4 +40,4 @@
             });
         });
     </script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/edit_iesg_note.html b/ietf/templates/doc/draft/edit_iesg_note.html
index b6bcf7093..4c1c50987 100644
--- a/ietf/templates/doc/draft/edit_iesg_note.html
+++ b/ietf/templates/doc/draft/edit_iesg_note.html
@@ -1,25 +1,20 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-
 {% load django_bootstrap5 %}
-
 {% block title %}Edit IESG note for {{ doc.name }}{% endblock %}
-
 {% block content %}
     {% origin %}
-    <h1>Edit IESG note<br><small class="text-muted">{{ doc.name }}</small></h1>
-
-    <form method="post">
+    <h1>
+        Edit IESG note
+        <br>
+        <small class="text-muted">{{ doc.name }}</small>
+    </h1>
+    <form class="mt-3" method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
-
-
-
         <button type="submit" class="btn btn-primary">Save</button>
         <a class="btn btn-secondary float-end" href="{{ doc.get_absolute_url }}">Back</a>
-
-
     </form>
-
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/edit_info.html b/ietf/templates/doc/draft/edit_info.html
index 42145c782..f7d2f8178 100644
--- a/ietf/templates/doc/draft/edit_info.html
+++ b/ietf/templates/doc/draft/edit_info.html
@@ -1,25 +1,21 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-
 {% load django_bootstrap5 %}
 {% load ietf_filters %}
-
 {% block title %}Edit info for {{ doc }}{% endblock %}
-
 {% block content %}
     {% origin %}
-    <h1>Edit info<br><small class="text-muted">{{ doc }}</small></h1>
-
-    <form method="post">
+    <h1>
+        Edit info
+        <br>
+        <small class="text-muted">{{ doc }}</small>
+    </h1>
+    <form class="mt-3" method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
-
-
-
         <button class="btn btn-primary" type="submit">Submit</button>
         <a class="btn btn-secondary float-end" href="{{ doc.get_absolute_url }}">Back</a>
-
-
     </form>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/last_call_requested.html b/ietf/templates/doc/draft/last_call_requested.html
index cdd48af2f..9e0ff9e5a 100644
--- a/ietf/templates/doc/draft/last_call_requested.html
+++ b/ietf/templates/doc/draft/last_call_requested.html
@@ -1,18 +1,18 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-
 {% block title %}Last call requested{% endblock %}
-
 {% block content %}
     {% origin %}
     <h1>Last call requested</h1>
-
-    <p>Your request to issue the <i>last call</i> has been submitted to the secretariat.</p>
-
-    <p>Note that the <i>last call</i> will not actually go out until the
+    <p>
+        Your request to issue the <i>last call</i> has been submitted to the secretariat.
+    </p>
+    <p>
+        Note that the <i>last call</i> will not actually go out until the
         secretariat takes appropriate steps. This may take up to one business
-        day, as it involves a person taking action.</p>
-
+        day, as it involves a person taking action.
+    </p>
     <a class="btn btn-primary" href="{{ url }}">Back</a>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/make_last_call.html b/ietf/templates/doc/draft/make_last_call.html
index 0daac0ed3..fff574d96 100644
--- a/ietf/templates/doc/draft/make_last_call.html
+++ b/ietf/templates/doc/draft/make_last_call.html
@@ -1,31 +1,25 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-
 {% load django_bootstrap5 %}
-
 {% block title %}Make last call for {{ doc.name }}{% endblock %}
-
 {% block content %}
     {% origin %}
-    <h1>Make last call<br><small class="text-muted">{{ doc.name }}</small></h1>
-
-    <p class="alert alert-info">
+    <h1>
+        Make last call
+        <br>
+        <small class="text-muted">{{ doc.name }}</small>
+    </h1>
+    <p class="my-3 alert alert-info">
         <b>Last call for:</b>
         {{ doc.name }} ({{ doc.group.acronym }}) to {{ doc.intended_std_level.name }}
     </p>
-
     <form method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
-
-
-
         <button type="submit" class="btn btn-primary">Make last call</button>
         <button type="reset" class="btn btn-warning">Reset</button>
         <a class="btn btn-secondary float-end" href="{{ doc.get_absolute_url }}">Back</a>
-
-
     </form>
-
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/release_draft.html b/ietf/templates/doc/draft/release_draft.html
index c0d8fedc2..12280872c 100644
--- a/ietf/templates/doc/draft/release_draft.html
+++ b/ietf/templates/doc/draft/release_draft.html
@@ -1,29 +1,31 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {% load origin %}
 {% load django_bootstrap5 %}
-
-{% block morecss %}
-    .center-button-text { text-align: center;}
-{% endblock %}
-
+{% block title %}Release draft {{ doc.name }}-{{ doc.rev }}{% endblock %}
 {% block content %}
-    <div class='col-md-12 center-button-text button btn-warning'>Warning</div>
-    <div class='col-md-12'>
+    <h1>
+        Release draft
+        <br>
+        <small class="text-muted">{{ doc.name }}-{{ doc.rev }}</small>
+    </h1>
+    <div class='my-3 alert alert-warning'>
+        <b>Warning:</b>
         {% if doc.stream.slug == 'ise' %}
-            This action will unset all Independent stream state and remove the document from the Independent stream.
+            This action will unset all Independent Stream state and remove the document from the Independent Stream.
         {% else %}
-            This action will unset all {{doc.group.acronym|upper}} group state, and remove the document from the {{doc.stream.name}} stream.<br>
-            This is appropriate, for example, if the group decided not to adopt a document after considering it.<br>
+            This action will unset all {{ doc.group.acronym|upper }} group state, and remove the document from the {{ doc.stream.name }} stream.
+            <br>
+            This is appropriate, for example, if the group decided not to adopt a document after considering it.
+            <br>
             It may also be appropriate if the group is abandoning the document.
         {% endif %}
     </div>
-    <div class='col-md-12 center-button-text button btn-warning'>Warning</div>
-    <div>
-        <form method='POST'>
-            {% csrf_token %}
-            {% bootstrap_form form %}
-            <button type="submit" class="btn btn-primary">Proceed</button>
-            <a class="btn btn-secondary float-end" href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Cancel</a>
-        </form>
-    </div>
+    <form method='post'>
+        {% csrf_token %}
+        {% bootstrap_form form %}
+        <button type="submit" class="btn btn-warning">Release</button>
+        <a class="btn btn-secondary float-end"
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back</a>
+    </form>
 {% endblock %}
diff --git a/ietf/templates/doc/draft/request_publication.html b/ietf/templates/doc/draft/request_publication.html
index 93311c8f6..6c4aeb4b5 100644
--- a/ietf/templates/doc/draft/request_publication.html
+++ b/ietf/templates/doc/draft/request_publication.html
@@ -1,63 +1,62 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-
 {% load django_bootstrap5 %}
-
 {% block title %}Request publication for {{ doc }}{% endblock %}
-
 {% block content %}
     {% origin %}
-    <h1>Request publication<br><small class="text-muted">{{ doc }}</small></h1>
-
-    <p class="alert alert-info">
+    <h1>
+        Request publication
+        <br>
+        <small class="text-muted">{{ doc }}</small>
+    </h1>
+    <p class="my-3 alert alert-info">
         Send a publication request to the RFC Editor for {{ doc }} and move it to the <i>{{ next_state.name }}</i> stream state.
         Please edit the message and remove any parts in brackets you do not
-        fill in. For independent submissions, see the <a
-            href="https://www.rfc-editor.org/indsubs.html">guidelines</a>.
+        fill in. For independent submissions, see the
+        <a href="https://www.rfc-editor.org/indsubs.html">guidelines</a>
+        .
     </p>
-
     {% if not doc.intended_std_level %}
         <p class="alert alert-warning">
             <b>Note:</b> Intended RFC status is not set for the document.
         </p>
     {% endif %}
-
     {% if doc.stream_id != "ise" and not consensus_filled_in %}
         <p class="alert alert-warning">
             <b>Note:</b> Consensus status is not set for the document.
         </p>
     {% endif %}
-
-    <form method="post">
+    <form class="mt-3" method="post">
         {% csrf_token %}
-
-        <div class="form-group">
-            <label>From</label>
-            <input class="form-control" type="text" placeholder="{{ message.frm }}" disabled>
+        <div class="mb-3">
+            <label class="form-label">From</label>
+            <input class="form-control"
+                   type="text"
+                   placeholder="{{ message.frm }}"
+                   disabled>
         </div>
-
-        <div class="form-group">
-            <label>To</label>
-            <input class="form-control" type="text" placeholder="{{ message.to|join:', ' }}" disabled>
+        <div class="mb-3">
+            <label class="form-label">To</label>
+            <input class="form-control"
+                   type="text"
+                   placeholder="{{ message.to|join:', ' }}"
+                   disabled>
         </div>
-
         {% if message.cc %}
-            <div class="form-group">
-                <label>Cc</label>
-                <input class="form-control" type="text" placeholder="{{ message.cc|join:', ' }}" disabled>
+            <div class="mb-3">
+                <label class="form-label">Cc</label>
+                <input class="form-control"
+                       type="text"
+                       placeholder="{{ message.cc|join:', ' }}"
+                       disabled>
             </div>
         {% endif %}
-
         {% bootstrap_form form %}
-
-
-
         <button type="submit" class="btn btn-danger">Email RFC Editor</button>
         <button type="reset" class="btn btn-warning">Reset</button>
-        <a class="btn btn-secondary float-end" href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back</a>
-
-
+        <a class="btn btn-secondary float-end"
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">Back</a>
     </form>
-
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/request_resurrect.html b/ietf/templates/doc/draft/request_resurrect.html
index 42fb5e610..d2b04ed31 100644
--- a/ietf/templates/doc/draft/request_resurrect.html
+++ b/ietf/templates/doc/draft/request_resurrect.html
@@ -1,28 +1,25 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-
 {% load django_bootstrap5 %}
-
 {% block title %}Request resurrection for {{ doc }}{% endblock %}
-
 {% block content %}
     {% origin %}
-    <h1>Request resurrection<br><small class="text-muted">{{ doc }}</small></h1>
-
-    <p>Request resurrection of the Internet-Draft {{ doc.file_tag }}?</p>
-
-    <p>This will send a notification to the Secretariat to resurrect the I-D.</p>
-
+    <h1>
+        Request resurrection
+        <br>
+        <small class="text-muted">{{ doc }}</small>
+    </h1>
+    <p>
+        Request resurrection of the Internet-Draft <b>{{ doc }}</b>?
+    </p>
+    <p>
+        This will send a notification to the Secretariat to resurrect the I-D.
+    </p>
     <form method="post">
         {% csrf_token %}
-
-
-
         <button class="btn btn-primary" type="submit">Request resurrection</button>
         <a class="btn btn-secondary float-end" href="{{ back_url }}">Back</a>
-
-
     </form>
-
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/resurrect.html b/ietf/templates/doc/draft/resurrect.html
index bf0557be2..0bbddf01c 100644
--- a/ietf/templates/doc/draft/resurrect.html
+++ b/ietf/templates/doc/draft/resurrect.html
@@ -1,31 +1,27 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-
 {% load django_bootstrap5 %}
-
 {% block title %}Resurrect {{ doc }}{% endblock %}
-
 {% block content %}
     {% origin %}
-
-    <h1>Resurrect<br><small class="text-muted">{{ doc }}</small></h1>
-
-    <p>Resurrect {{ doc }}?</p>
-
+    <h1>
+        Resurrect
+        <br>
+        <small class="text-muted">{{ doc }}</small>
+    </h1>
     <p>
-        This will change the status to Active{% if resurrect_requested_by %} and email a notice to {{ resurrect_requested_by }}{% endif %}.
+        Resurrect <b>{{ doc }}</b>?
+    </p>
+    <p>
+        This will change the status to <b>Active</b>
+        {% if resurrect_requested_by %}and email a notice to {{ resurrect_requested_by }}{% endif %}
+        .
     </p>
-
     <form method="post">
         {% csrf_token %}
-
-
-
         <button class="btn btn-primary" type="submit">Resurrect</button>
         <a class="btn btn-secondary float-end" href="{{ back_url }}">Back</a>
-
-
     </form>
-
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/review_possibly_replaces.html b/ietf/templates/doc/draft/review_possibly_replaces.html
index a8660731e..81891d468 100644
--- a/ietf/templates/doc/draft/review_possibly_replaces.html
+++ b/ietf/templates/doc/draft/review_possibly_replaces.html
@@ -1,25 +1,16 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load django_bootstrap5 %}
-
 {% block title %}Review suggestions for documents that {{ doc }} replaces{% endblock %}
-
 {% block content %}
     {% origin %}
     <h1>Review suggestions for documents that {{ doc }} replaces</h1>
-
     <form name="review-suggested-replaces" role="form" method="post">
         {% csrf_token %}
-
         {% bootstrap_form form %}
-
-
-
         <a class="btn btn-secondary float-end" href="{{ doc.get_absolute_url }}">Cancel</a>
         <button type="submit" value="Save" class="btn btn-primary">Save</button>
-
-
     </form>
-
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/rfceditor_note_duplicate_error.html b/ietf/templates/doc/draft/rfceditor_note_duplicate_error.html
index 1477d9105..6962f22f6 100644
--- a/ietf/templates/doc/draft/rfceditor_note_duplicate_error.html
+++ b/ietf/templates/doc/draft/rfceditor_note_duplicate_error.html
@@ -1,18 +1,19 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2016, All Rights Reserved #}
 {% load origin %}
-
 {% block title %}Duplicate RFC Editor Note Error{% endblock %}
-
 {% block content %}
     {% origin %}
-    <h1>There appear to be two RFC Editor Notes for this approved I-D</h1>
-
-    <p>Sorry, there appears to be an RFC Editor Note in the ballot writeup and
+    <h1>Duplicate RFC Editor Note</h1>
+    <p class="mt-3 alert alert-danger">
+        Sorry, there appears to be an RFC Editor Note in the ballot writeup and
         another one in the RFC Editor Note.  Please put all of the information for
-        the RFC Editor in the RFC Editor Note.</p>
-
-    <p>The document writeup can be edited
-        <a href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}writeup/"> <em>Here</em></a>.</p>
-
-{% endblock %}
+        the RFC Editor in the RFC Editor Note.
+    </p>
+    <p>
+        The document writeup can be edited
+        <a href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}writeup/">here</a>
+        .
+    </p>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/draft/rfceditor_post_approved_draft_failed.html b/ietf/templates/doc/draft/rfceditor_post_approved_draft_failed.html
index a458bdddb..28268788e 100644
--- a/ietf/templates/doc/draft/rfceditor_post_approved_draft_failed.html
+++ b/ietf/templates/doc/draft/rfceditor_post_approved_draft_failed.html
@@ -1,26 +1,27 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-
 {% block title %}Posting approved I-D to RFC Editor failed{% endblock %}
-
 {% block content %}
     {% origin %}
     <h1>Posting approved I-D to RFC Editor failed</h1>
-
-    <p>Sorry, when trying to notify the RFC Editor through HTTP, we hit an
-        error.</p>
-
-    <p>We have not changed the draft state or sent the announcement
+    <p>
+        Sorry, when trying to notify the RFC Editor through HTTP, we hit an
+        error.
+    </p>
+    <p>
+        We have not changed the draft state or sent the announcement
         yet so if this is an intermittent error, you can go back and try
-        again.</p>
-
-    <p>The error was:</p>
-    <p><code>{{ error }}</code></p>
-
+        again.
+    </p>
+    <p>
+        The error was: <code>{{ error }}</code>
+    </p>
     {% if response %}
-        <p>The response from the RFC Editor was:</p>
-        <p><code>{{ response|linebreaksbr }}</code></p>
+        <p>
+            The response from the RFC Editor was:
+            <code>{{ response|linebreaksbr }}</code>
+        </p>
     {% endif %}
-
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/drafts_for_ad.html b/ietf/templates/doc/drafts_for_ad.html
index 7de045135..19557decf 100644
--- a/ietf/templates/doc/drafts_for_ad.html
+++ b/ietf/templates/doc/drafts_for_ad.html
@@ -1,14 +1,13 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin static %}
 {% load ietf_filters %}
-
+{% load person_filters %}
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
 {% endblock %}
-
 {% block title %}Documents for {{ ad_name }}{% endblock %}
-
 {% block content %}
     {% origin %}
     {% if blocked_docs %}
@@ -22,22 +21,33 @@
                     <th data-sort="discusses">Discusses</th>
                 </tr>
             </thead>
-
             <tbody>
                 {% for doc in blocked_docs %}
                     <tr>
                         <td>{{ doc.displayname_with_link }}</td>
                         {% include "doc/search/status_columns.html" %}
-                        <td>{{ doc.ad|default:"" }}</td>
+                        <td>
+                            {% if doc.ad %}
+                                {% person_link doc.ad %}
+                            {% else %}
+                                <span class="text-muted">(None)</span>
+                            {% endif %}
+                        </td>
                         <td>
                             {% for p in doc.blocking_positions %}
-                                {{ p.balloter }}
-                                ({% if p.discuss_time %}{{ p.discuss_time|timesince_days }}{% endif %}
-                                days ago{% if doc.get_state_url != "rfc" and p.rev != doc.rev %}
-                                    for -{{ p.rev }}{% endif %})<br>
-                                {% if p.is_old_pos %}
-                                    </span>
-                                {% endif %}
+                                <span {% if p.is_old_pos %}class="text-muted"{% endif %}>
+                                    {% if p.is_old_pos %}
+                                        {% person_link p.balloter class="text-reset" %}
+                                    {% else %}
+                                        {% person_link p.balloter %}
+                                    {% endif %}
+                                    (
+                                    {% if p.discuss_time %}{{ p.discuss_time|timesince_days }}{% endif %}
+                                    days ago
+                                    {% if doc.get_state_url != "rfc" and p.rev != doc.rev %}for -{{ p.rev }}{% endif %}
+                                    )
+                                    <br>
+                                </span>
                             {% endfor %}
                         </td>
                     </tr>
@@ -45,15 +55,9 @@
             </tbody>
         </table>
     {% endif %}
-
-    <h1>Documents for {{ ad_name }}</h1>
+    <h1 class="mt-3">Documents for {{ ad_name }}</h1>
     {% include "doc/search/search_results.html" with start_table=True end_table=True %}
 {% endblock %}
-
-{% block morecss %}
-    .is-blocking {box-shadow: 0 0 0 0 #000000;}
-{% endblock %}
-
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/drafts_in_iesg_process.html b/ietf/templates/doc/drafts_in_iesg_process.html
index 7902dee0e..74b8a11b4 100644
--- a/ietf/templates/doc/drafts_in_iesg_process.html
+++ b/ietf/templates/doc/drafts_in_iesg_process.html
@@ -1,24 +1,27 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load ietf_filters static %}
 {% load textfilters person_filters %}
-
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
 {% endblock %}
-
 {% block title %}{{ title }}{% endblock %}
-
 {% block content %}
     {% origin %}
     <h1>{{ title }}</h1>
-
     <table class="table table-sm table-striped tablesorter">
         <thead>
             <tr>
-                <th data-sort="area" class="text-nowrap">Area</th>
-                <th data-sort="date" class="text-nowrap">{% if state.slug == "lc" %}Expires at{% else %}Date{% endif %}</th>
+                <th data-sort="area">Area</th>
+                <th data-sort="date">
+                    {% if state.slug == "lc" %}
+                        Expires at
+                    {% else %}
+                        Date
+                    {% endif %}
+                </th>
                 <th data-sort="doc">Document</th>
                 <th data-sort="level">Intended level</th>
                 <th data-sort="ad">AD</th>
@@ -26,43 +29,56 @@
         </thead>
         {% for state, docs in grouped_docs %}
             <thead>
-                <tr class="table-info"><th colspan="5">{{ state.name }}</th></tr>
+                <tr class="table-info">
+                    <th colspan="5">{{ state.name }}</th>
+                </tr>
             </thead>
             <tbody>
                 {% for doc in docs %}
                     <tr>
-                        <td class="text-nowrap">{% if doc.area_acronym %}{{ doc.area_acronym }}{% endif %}</td>
-                        <td class="text-nowrap">
+                        <td>
+                            {% if doc.area_acronym %}
+                                <a href="{% url "ietf.group.views.group_home" acronym=doc.area_acronym %}">{{ doc.area_acronym }}</a>
+                            {% endif %}
+                        </td>
+                        <td>
                             {% if state.slug == "lc" %}
                                 {% if doc.lc_expires %}{{ doc.lc_expires|date:"Y-m-d" }}{% endif %}
                             {% else %}
                                 {{ doc.time|date:"Y-m-d" }}
                             {% endif %}
                         </td>
-
                         <td>
                             <a href="{% url "ietf.doc.views_doc.document_main" doc.name %}">{{ doc.name }}</a>
-                            <br><b>{{ doc.title }}</b>
+                            <br>
+                            <b>{{ doc.title }}</b>
                             {% if doc.action_holders_enabled and doc.action_holders.exists %}
-                                <br>Action holders:
+                                <br>
+                                Action holders:
                                 {% for action_holder in doc.documentactionholder_set.all %}
-                                    {% person_link action_holder.person title=action_holder.role_for_doc %}{{ action_holder|action_holder_badge }}{% if not forloop.last %},{% endif %}
+                                    {% person_link action_holder.person title=action_holder.role_for_doc %}&nbsp;{{ action_holder|action_holder_badge }}
+                                    {% if not forloop.last %},{% endif %}
                                 {% endfor %}
                             {% endif %}
                             {% if doc.note %}
-                                <br><i>Note: {{ doc.note|linkify|linebreaksbr }}</i>
+                                <br>
+                                <i>Note: {{ doc.note|linkify|linebreaksbr }}</i>
                             {% endif %}
                         </td>
-                        <td>{{ doc.intended_std_level.name }}</td>
-                        <td><a href="mailto:{{ doc.ad.email_address|urlencode }}">{{ doc.ad.plain_name }}</a><</td>
+                        <td>
+                            {% if doc.intended_std_level %}
+                                {{ doc.intended_std_level.name }}
+                            {% else %}
+                                <span class='text-muted'>(None)</span>
+                            {% endif %}
+                        </td>
+                        <td>{% person_link doc.ad %}</td>
                     </tr>
                 {% endfor %}
             </tbody>
         {% endfor %}
     </table>
-
 {% endblock %}
-
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ietf/templates/doc/drafts_in_last_call.html b/ietf/templates/doc/drafts_in_last_call.html
index c23de4186..60e35db0f 100644
--- a/ietf/templates/doc/drafts_in_last_call.html
+++ b/ietf/templates/doc/drafts_in_last_call.html
@@ -1,27 +1,22 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin static %}
-
 {% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
 {% endblock %}
-
-{% block title %}Internet-Drafts in IETF last call{% endblock %}
-
+{% block title %}Internet-Drafts in IETF Last Call{% endblock %}
 {% block content %}
     {% origin %}
     <h1>
-        Internet-Drafts in IETF last call
+        Internet-Drafts in IETF Last Call
         {% if pages %}
             <br>
             <small class="text-muted">{{ pages }} pages</small>
         {% endif %}
     </h1>
-
-    {% include "doc/search/search_results.html" with start_table=True end_table=True%}
-
+    {% include "doc/search/search_results.html" with start_table=True end_table=True %}
 {% endblock %}
-
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/edit_authors.html b/ietf/templates/doc/edit_authors.html
index af6318d67..21e95fca6 100644
--- a/ietf/templates/doc/edit_authors.html
+++ b/ietf/templates/doc/edit_authors.html
@@ -1,79 +1,62 @@
+{# bs5ok #}
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2021, All Rights Reserved #}
 {% load origin %}
 {% load static %}
 {% load django_bootstrap5 %}
-
 {% block pagehead %}
     <link rel="stylesheet" href="{% static 'ietf/css/select2.css' %}">
 {% endblock %}
-
-{% block morecss %}
-
-    #empty-author-form {
-    display: none;
-    }
-{% endblock %}
-
-{% block title %}
-    Edit authors for {{ titletext }}
-{% endblock %}
-
+{% block title %}Edit authors for {{ titletext }}{% endblock %}
 {% block content %}
     {% origin %}
-    <h1>Edit authors<br><small class="text-muted">{{ titletext }}</small></h1>
-
+    <h1>
+        Edit authors
+        <br>
+        <small class="text-muted">{{ titletext }}</small>
+    </h1>
     <form enctype="multipart/form-data" method="post" id="authors-form">
         {% csrf_token %}
         {% bootstrap_form change_basis_form %}
-
-
-
-        <button id="add-author-button" type="button" class="btn btn-primary" onclick="local_js.add_author()">Add new author</button>
-
-
-
+        <button id="add-author-button"
+                type="button"
+                class="btn btn-primary my-3"
+                onclick="local_js.add_author()">
+            Add new author
+        </button>
         {% bootstrap_form formset.management_form %}
-        <div id="authors-list" class="well">
+        <div id="authors-list">
             {% for form in formset %}
-                <div class="card  author-panel">
+                <div class="card author-panel mb-3">
+                    <div role="button" class="handle card-header">
+                        <span class="bi bi-list"></span>
+                    </div>
                     <div class="card-body draggable">
-                        <span class="handle bi bi-list"></span>
-                        <div class="form-horizontal">
-                            {% bootstrap_form form layout='horizontal' %}
-                        </div>
+                        <div class="form-horizontal">{% bootstrap_form form layout='horizontal' %}</div>
                     </div>
                 </div>
             {% endfor %}
         </div>
-        <div id="empty-author-form" class="template">
-            <div class="card  author-panel">
+        <div id="empty-author-form" class="template" style="display: none;">
+            <div class="card  author-panel mb-3">
+                <div role="button" class="handle card-header">
+                    <span class="bi bi-list"></span>
+                </div>
                 <div class="card-body draggable">
-                    <span class="handle bi bi-list"></span>
-                    <div class="form-horizontal">
-                        {% bootstrap_form formset.empty_form layout='horizontal' %}
-                    </div>
+                    <div class="form-horizontal">{% bootstrap_form formset.empty_form layout='horizontal' %}</div>
                 </div>
             </div>
         </div>
-
-
-
         <button type="submit" class="btn btn-primary">Submit</button>
         <a class="btn btn-secondary float-end"
-            href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">Back</a>
-
-
+           href="{% url "ietf.doc.views_doc.document_main" name=doc.canonical_name %}">
+            Back
+        </a>
     </form>
-
 {% endblock %}
-
 {% block js %}
     <script src="{% static 'ietf/js/sortable.js' %}"></script>
     <script src="{% static 'ietf/js/select2.js' %}"></script>
-    <script>
-        var ajax_url = '{% url "ietf.person.ajax.person_email_json" personid="123454321" %}';
-    </script>
+    <script>var ajax_url = '{% url "ietf.person.ajax.person_email_json" personid="123454321" %}';</script>
     <script src="{% static 'ietf/js/edit_authors.js' %}"></script>
-
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/review/complete_review.html b/ietf/templates/doc/review/complete_review.html
index 318abdee9..38e22454a 100644
--- a/ietf/templates/doc/review/complete_review.html
+++ b/ietf/templates/doc/review/complete_review.html
@@ -60,7 +60,7 @@
 
         <div class="template" style="display:none">
             {% if mail_archive_query_urls %}
-                <div class="mail-archive-search form-group">
+                <div class="mail-archive-search mb-3">
                     <div class="col-md-offset-2 col-md-10">
                         <p class="form-inline">
                             Search mail archive subjects for:
diff --git a/ietf/templates/doc/review/request_info.html b/ietf/templates/doc/review/request_info.html
index bf55de2de..53782274a 100644
--- a/ietf/templates/doc/review/request_info.html
+++ b/ietf/templates/doc/review/request_info.html
@@ -1,19 +1,23 @@
-{# Copyright The IETF Trust 2017, All Rights Reserved #}{% load origin django_bootstrap5 %}{% origin %}
+{# bs5ok #}
+{# Copyright The IETF Trust 2017, All Rights Reserved #}
+{% load origin django_bootstrap5 %}
+{% origin %}
 {% load person_filters %}
-<table class="table table-sm">
-    <tbody class="meta">
+<table class="table table-sm table-borderless">
+    <tbody class="meta border-top">
         <tr>
             <th>Request</th>
             <th>Review of</th>
             <td>
                 {% if review_req.requested_rev %}
-                    <a href="{% url "ietf.doc.views_doc.document_main" name=review_req.doc.name rev=review_req.requested_rev %}">{{ review_req.doc.name }}-{{ review_req.requested_rev }}</a>
+                    <a href="{% url "ietf.doc.views_doc.document_main" name=review_req.doc.name rev=review_req.requested_rev %}">
+                        {{ review_req.doc.name }}-{{ review_req.requested_rev }}
+                    </a>
                 {% else %}
                     <a href="{% url "ietf.doc.views_doc.document_main" name=review_req.doc.name %}">{{ review_req.doc.name }}</a>
                 {% endif %}
             </td>
         </tr>
-
         <tr>
             <th></th>
             <th>Requested rev.</th>
@@ -21,46 +25,53 @@
                 {% if review_req.requested_rev %}
                     {{ review_req.requested_rev }}
                 {% else %}
-                    no specific revision
+                    No specific revision
+                {% endif %}
+                {% if review_req.reviewed_rev != review_req.doc.rev %}
+                    <span class="text-muted">(document currently at {{ review_req.doc.rev }})</span>
                 {% endif %}
-                {% if review_req.reviewed_rev != review_req.doc.rev %}(document currently at {{ review_req.doc.rev }}){% endif %}
             </td>
         </tr>
-
         <tr>
             <th></th>
             <th>Type</th>
             <td>{{ review_req.type.name }} Review</td>
         </tr>
-
         <tr>
             <th></th>
             <th>Team</th>
-            <td> {% if review_req %}
-                {{ review_req.team.name }}
-            {% else %}
-                {{ doc.group.name }}
-            {% endif %}
-                (<a href="{% url "ietf.group.views.review_requests" group_type=review_req.team.type_id acronym=review_req.team.acronym %}">{{ review_req.team.acronym }}</a>)
+            <td>
+                {% if review_req %}
+                    {{ review_req.team.name }}
+                {% else %}
+                    {{ doc.group.name }}
+                {% endif %}
+                (
+                <a href="{% url "ietf.group.views.review_requests" group_type=review_req.team.type_id acronym=review_req.team.acronym %}">
+                    {{ review_req.team.acronym }}
+                </a>
+                )
             </td>
         </tr>
-
         <tr>
             <th></th>
             <th>Deadline</th>
-            <td>{{ review_req.deadline|date:"Y-m-d" }}
+            <td>
+                {{ review_req.deadline|date:"Y-m-d" }}
                 {% if can_edit_deadline %}
-                    <a class="btn btn-primary btn-sm" href="{% url "ietf.doc.views_review.edit_deadline" name=doc.name request_id=review_req.pk %}"><span class="bi bi-pencil"></span> Edit</a>
+                    <a class="btn btn-primary btn-sm"
+                       href="{% url "ietf.doc.views_review.edit_deadline" name=doc.name request_id=review_req.pk %}">
+                        <span class="bi bi-pencil"></span>
+                        Edit
+                    </a>
                 {% endif %}
             </td>
         </tr>
-
         <tr>
             <th></th>
             <th>Requested</th>
             <td>{{ review_req.time|date:"Y-m-d" }}</td>
         </tr>
-
         {% if review_req.requested_by.name != "(System)" %}
             <tr>
                 <th></th>
@@ -68,162 +79,255 @@
                 <td>{{ review_req.requested_by }}</td>
             </tr>
         {% endif %}
-
         {% if review_req.doc.authors %}
             <tr>
                 <th></th>
                 <th>Authors</th>
-                <td>{{ review_req.doc.authors|join:", " }}</td>
+                <td>
+                    {% for author in review_req.doc.authors %}
+                        {% person_link author %}
+                        {% if not forloop.last %},{% endif %}
+                    {% endfor %}
+                </td>
             </tr>
         {% endif %}
-
         {% if wg_chairs %}
             <tr>
                 <th></th>
                 <th>WG chairs</th>
-                <td>{{ wg_chairs|join:", " }}</td>
+                <td>
+                    {{ wg_chairs|join:", " }}
+                </td>
             </tr>
         {% endif %}
-
         {% if doc.time %}
             <tr>
-                <th></th>
-                <th>Draft last updated</th>
-                <td>{{ doc.time|date:"Y-m-d" }}</td>
+                <th>
+                </th>
+                <th>
+                    Draft last updated
+                </th>
+                <td>
+                    {{ doc.time|date:"Y-m-d" }}
+                </td>
             </tr>
         {% endif %}
-
         {% if iesg_state_summary %}
             <tr>
-                <th></th>
-                <th>IESG document state</th>
-                <td>{{ iesg_state_summary }}</td>
+                <th>
+                </th>
+                <th>
+                    IESG document state
+                </th>
+                <td>
+                    {{ iesg_state_summary }}
+                </td>
             </tr>
         {% endif %}
-
         <tr>
-            <th></th>
-            <th>Completed reviews</th>
+            <th>
+            </th>
+            <th>
+                Completed reviews
+            </th>
             <td>
                 {% for a in review_req.all_completed_assignments_for_doc %}
                     {% if a.review %}
-                        <a href="{% url "ietf.doc.views_doc.document_main" name=a.review.name %}">{{a.review_request.team.acronym|capfirst}} {{a.review_request.type.name}} review of -{{a.reviewed_rev|default:"??"}} by {{a.reviewer.person.plain_name}}</a>
+                        <a href="{% url "ietf.doc.views_doc.document_main" name=a.review.name %}">
+                            {{ a.review_request.team.acronym|capfirst }} {{ a.review_request.type.name }} review of -{{ a.reviewed_rev|default:"??" }}
+                        </a>
+                        by {% person_link a.reviewer.person %}
                     {% else %}
-                        {{a.review_request.team.acronym|capfirst}} {{a.review_request.type.name}} review of -{{a.reviewed_rev|default:"??"}} by {{a.reviewer.person.plain_name}}
+                        {{ a.review_request.team.acronym|capfirst }} {{ a.review_request.type.name }} review of -{{ a.reviewed_rev|default:"??" }} by {% person_link a.reviewer.person %}
+                    {% endif %}
+                    {% if a.reviewed_rev and a.reviewed_rev != a.review_request.doc.rev %}
+                        (
+                        <a href="{{ rfcdiff_base_url }}?url1={{ a.review_request.doc.name }}-{{ a.reviewed_rev }}&amp;url2={{ a.review_request.doc.name }}-{{ a.review_request.doc.rev }}">
+                            diff
+                        </a>
+                        )
                     {% endif %}
-                    {% if a.reviewed_rev and a.reviewed_rev != a.review_request.doc.rev %} (<a href="{{ rfcdiff_base_url }}?url1={{ a.review_request.doc.name }}-{{ a.reviewed_rev }}&amp;url2={{ a.review_request.doc.name }}-{{ a.review_request.doc.rev }}">diff</a>){% endif %}
                     <br>
                 {% endfor %}
             </td>
         </tr>
-
         {% if review_req.comment %}
             <tr>
-                <th></th>
-                <th>Comments</th>
-                <td><pre class="pasted">{{review_req.comment}}</pre>
+                <th>
+                </th>
+                <th>
+                    Comments
+                </th>
+                <td>
+                    <pre class="pasted">{{review_req.comment}}</pre>
                     {% if can_edit_comment %}
-                        <a class="btn btn-primary btn-sm" href="{% url "ietf.doc.views_review.edit_comment" name=doc.name request_id=review_req.pk %}"><span class="bi bi-pencil"></span> Edit comment</a>
+                        <a class="btn btn-primary btn-sm"
+                           href="{% url "ietf.doc.views_review.edit_comment" name=doc.name request_id=review_req.pk %}">
+                            <span class="bi bi-pencil">
+                            </span>
+                            Edit comment
+                        </a>
                     {% endif %}
                 </td>
             </tr>
         {% endif %}
     </tbody>
-
     {% for assignment in assignments %}
-        <tbody class="meta">
+        <tbody class="meta border-top">
             <tr>
-                <th>{% if forloop.first %}Assignment{{assignments|pluralize}}{% endif %}</th>
-                <th>Reviewer</th>
+                <th>
+                    {% if forloop.first %}Assignment{{ assignments|pluralize }}{% endif %}
+                </th>
+                <th>
+                    Reviewer
+                </th>
                 <td>
                     <strong>{% person_link assignment.reviewer.person %}</strong>
-
                     {% if assignment.can_reject_reviewer_assignment or assignment.can_accept_reviewer_assignment %}
                         <div class="reviewer-assignment-not-accepted">
-                            {% if assignment.state_id == "assigned"%}
+                            {% if assignment.state_id == "assigned" %}
                                 <em>Assignment not accepted yet:</em>
                             {% else %}
                                 <em>Assignment accepted:</em>
                             {% endif %}
                             {% if assignment.can_reject_reviewer_assignment %}
-                                <a class="btn btn-danger btn-sm" href="{% url "ietf.doc.views_review.reject_reviewer_assignment" name=doc.name assignment_id=assignment.pk %}"><span class="bi bi-slash-circle"></span> Reject</a>
+                                <a class="btn btn-danger btn-sm"
+                                   href="{% url "ietf.doc.views_review.reject_reviewer_assignment" name=doc.name assignment_id=assignment.pk %}">
+                                    <span class="bi bi-slash-circle">
+                                    </span>
+                                    Reject
+                                </a>
                             {% endif %}
                             {% if assignment.can_accept_reviewer_assignment %}
-                                <form style="display:inline" method="post" action="{% url "ietf.doc.views_review.review_request" name=doc.name request_id=review_req.pk %}">{% csrf_token %}<button class="btn btn-success btn-sm" type="submit" name="action" value="accept"><span class="bi bi-check"></span> Accept</button></form>
+                                <form style="display:inline"
+                                      method="post"
+                                      action="{% url "ietf.doc.views_review.review_request" name=doc.name request_id=review_req.pk %}">
+                                    {% csrf_token %}
+                                    <button class="btn btn-success btn-sm"
+                                            type="submit"
+                                            name="action"
+                                            value="accept">
+                                        <span class="bi bi-check">
+                                        </span>
+                                        Accept
+                                    </button>
+                                </form>
                             {% endif %}
                         </div>
                     {% endif %}
                 </td>
             </tr>
-
             <tr>
-                <th></th>
-                <th>State</th>
-                <td>{{ assignment.state.name }}
+                <th>
+                </th>
+                <th>
+                    State
+                </th>
+                <td>
+                    {{ assignment.state.name }}
                     {% if snapshot %}
-                        <span class="badge bg-warning">Snapshot</span>
+                        <span class="badge bg-warning">
+                            Snapshot
+                        </span>
                     {% endif %}
                 </td>
             </tr>
-
             {% if assignment.state_id != "withdrawn" and assignment.state_id != "no-response" and assignment.state_id != "rejected" %}
                 <tr>
-                    <th></th>
-                    <th>Review</th>
+                    <th>
+                    </th>
+                    <th>
+                        Review
+                    </th>
                     <td>
                         {% if assignment.review %}
-                            <a href="{{ assignment.review.get_absolute_url }}">{{ assignment.review.name }}</a>
+                            <a href="{{ assignment.review.get_absolute_url }}">
+                                {{ assignment.review.name }}
+                            </a>
                         {% elif assignment.state_id == "assigned" or assignment.state_id == "accepted" %}
                             Not completed yet
                         {% else %}
                             Not available
                         {% endif %}
-
                         {% if assignment.can_complete_review %}
-                            <a class="btn btn-primary btn-sm" href="{% url "ietf.doc.views_review.complete_review" name=doc.name assignment_id=assignment.pk %}"><span class="bi bi-pencil-square-o"></span> {% if assignment.state_id == "assigned" or assignment.state_id == "accepted" %}Complete review{% else %}Correct review{% endif %}</a>
+                            <a class="btn btn-primary btn-sm"
+                               href="{% url "ietf.doc.views_review.complete_review" name=doc.name assignment_id=assignment.pk %}">
+                                <span class="bi bi-pencil-square-o">
+                                </span>
+                                {% if assignment.state_id == "assigned" or assignment.state_id == "accepted" %}
+                                    Complete review
+                                {% else %}
+                                    Correct review
+                                {% endif %}
+                            </a>
                         {% endif %}
-
                         {% if assignment.state_id == "assigned" or assignment.state_id == "accepted" %}
                             {% if can_assign_reviewer %}
-                                <a class="btn btn-danger btn-sm" href="{% url "ietf.doc.views_review.mark_reviewer_assignment_no_response" name=doc.name assignment_id=assignment.pk %}"><span class="bi bi-slash-circle"></span> No response</a>
-                                <a class="btn btn-danger btn-sm" href="{% url "ietf.doc.views_review.withdraw_reviewer_assignment" name=doc.name assignment_id=assignment.pk %}"><span class="bi bi-slash-circle"></span> Withdraw</a>
+                                <a class="btn btn-danger btn-sm"
+                                   href="{% url "ietf.doc.views_review.mark_reviewer_assignment_no_response" name=doc.name assignment_id=assignment.pk %}">
+                                    <span class="bi bi-slash-circle">
+                                    </span>
+                                    No response
+                                </a>
+                                <a class="btn btn-danger btn-sm"
+                                   href="{% url "ietf.doc.views_review.withdraw_reviewer_assignment" name=doc.name assignment_id=assignment.pk %}">
+                                    <span class="bi bi-slash-circle">
+                                    </span>
+                                    Withdraw
+                                </a>
                             {% endif %}
                         {% endif %}
                     </td>
                 </tr>
             {% endif %}
-
             {% if assignment.review and assignment.review.external_url %}
                 <tr>
-                    <th></th>
-                    <th>Posted at</th>
+                    <th>
+                    </th>
+                    <th>
+                        Posted at
+                    </th>
                     <td>
-                        <a href="{{ assignment.review.external_url }}">{{ assignment.review.external_url }}</a>
+                        <a href="{{ assignment.review.external_url }}">
+                            {{ assignment.review.external_url }}
+                        </a>
                     </td>
                 </tr>
             {% endif %}
-
             {% if assignment.reviewed_rev %}
                 <tr>
-                    <th></th>
-                    <th>Reviewed rev.</th>
-                    <td><a href="{% url "ietf.doc.views_doc.document_main" name=review_req.doc.name rev=assignment.reviewed_rev %}">{{ assignment.reviewed_rev }}</a> {% if assignment.reviewed_rev != review_req.doc.rev %}(document currently at {{ review_req.doc.rev }}){% endif %}</td>
+                    <th>
+                    </th>
+                    <th>
+                        Reviewed rev.
+                    </th>
+                    <td>
+                        <a href="{% url "ietf.doc.views_doc.document_main" name=review_req.doc.name rev=assignment.reviewed_rev %}">
+                            {{ assignment.reviewed_rev }}
+                        </a>
+                        {% if assignment.reviewed_rev != review_req.doc.rev %}(document currently at {{ review_req.doc.rev }}){% endif %}
+                    </td>
                 </tr>
             {% endif %}
-
             {% if assignment.result %}
                 <tr>
-                    <th></th>
-                    <th>Review result</th>
-                    <td>{{ assignment.result.name }}</td>
+                    <th>
+                    </th>
+                    <th>
+                        Review result
+                    </th>
+                    <td class="{% if assignment.result.name|slice:5 == 'Ready' %}text-success{% else %}text-danger{% endif %}">
+                        {{ assignment.result.name }}
+                    </td>
                 </tr>
             {% endif %}
-
-
             {% if assignment.state_id == "completed" or assignment.state_id == "part-completed" %}
                 <tr>
-                    <th></th>
-                    <th>Review completed:</th>
+                    <th>
+                    </th>
+                    <th>
+                        Review completed:
+                    </th>
                     <td>
                         {{ assignment.completed_on|date:"Y-m-d" }}
                     </td>
@@ -232,10 +336,13 @@
         </tbody>
     {% endfor %}
 </table>
-
 {% if can_assign_reviewer %}
     <p>
-        <a class="btn btn-primary btn-sm" href="{% url "ietf.doc.views_review.assign_reviewer" name=doc.name request_id=review_req.pk %}"><span class="bi bi-person"></span> Assign reviewer</a>
+        <a class="btn btn-primary btn-sm"
+           href="{% url "ietf.doc.views_review.assign_reviewer" name=doc.name request_id=review_req.pk %}">
+            <span class="bi bi-person">
+            </span>
+            Assign reviewer
+        </a>
     </p>
-{% endif %}
-
+{% endif %}
\ No newline at end of file
diff --git a/ietf/templates/doc/status_change/make_last_call.html b/ietf/templates/doc/status_change/make_last_call.html
index 9f92b7f90..184bb91bc 100644
--- a/ietf/templates/doc/status_change/make_last_call.html
+++ b/ietf/templates/doc/status_change/make_last_call.html
@@ -15,7 +15,7 @@
 
     <h1>Make last call<br><small class="text-muted">{{doc.name}}</small></h1>
 
-    <div class="form-group">
+    <div class="mb-3">
         <label>Last call text</label>
         <pre>{{ announcement }}</pre>
     </div>
diff --git a/ietf/templates/group/edit.html b/ietf/templates/group/edit.html
index a2fd1e1e0..6eb76143b 100644
--- a/ietf/templates/group/edit.html
+++ b/ietf/templates/group/edit.html
@@ -58,7 +58,7 @@
     {{ form.media.js }}
     <script>
         $(document).ready(function () {
-            $("#id_acronym").closest(".form-group").each(function() {
+            $("#id_acronym").closest(".mb-3").each(function() {
                 // fixup styling a bit in case the confirm checkbox is shown
                 if ($(this).next().find("#id_confirm_acronym").length > 0) {
                     $(this).css("margin-bottom", 0);
diff --git a/ietf/templates/ietfauth/apikeys.html b/ietf/templates/ietfauth/apikeys.html
index d842e8520..26cd56f53 100644
--- a/ietf/templates/ietfauth/apikeys.html
+++ b/ietf/templates/ietfauth/apikeys.html
@@ -13,7 +13,7 @@
     <h1>API keys for {{ user.username }}</h1>
 
     {% csrf_token %}
-    <div class="form-group">
+    <div class="mb-3">
         <label class="col-sm-2 col-form-label">Personal API keys</label>
         <div class="col-sm-10">
             <div>
diff --git a/ietf/templates/ipr/details_edit.html b/ietf/templates/ipr/details_edit.html
index f24822f7a..33f68f2ef 100644
--- a/ietf/templates/ipr/details_edit.html
+++ b/ietf/templates/ipr/details_edit.html
@@ -136,7 +136,7 @@
             {{ draft_formset.management_form }}
 
             {% for draft_form in draft_formset %}
-                <div class="form-group row draft-row {% if forloop.last %}template visually-hidden{% endif %}">
+                <div class="mb-3 row draft-row {% if forloop.last %}template visually-hidden{% endif %}">
 
                     <label class="col-md-2 fw-bold" for="{{ draft_form.document.id_for_label }}">
                         {{ draft_form.document.label }}
@@ -161,7 +161,7 @@
 
             {% comment %}
             {% for draft_form in draft_formset %}
-                <div class="form-group row draft-row {% if forloop.last %}template{% endif %}">
+                <div class="mb-3 row draft-row {% if forloop.last %}template{% endif %}">
                     <div class="col-md-2 fw-bold">
                         {% bootstrap_label draft_form.document.label %}
                     </div>
@@ -178,7 +178,7 @@
             {% endfor %}
             {% endcomment %}
 
-            <div class="form-group mb-3">
+            <div class="mb-3 mb-3">
                 <label class="col-md-2 col-form-label"></label>
                 <div class="col-md-10"><a class="draft-add-row btn btn-primary"><span class="bi bi-plus" aria-hidden="true"></span> Add more</a></div>
             </div>
diff --git a/ietf/templates/ipr/search_form.html b/ietf/templates/ipr/search_form.html
index 995d15000..d5e3c8ff3 100644
--- a/ietf/templates/ipr/search_form.html
+++ b/ietf/templates/ipr/search_form.html
@@ -9,7 +9,7 @@
         <div class="col-md-12">
             <h2>State Filter</h2>
 
-            <div class="form-group">
+            <div class="mb-3">
                 {% bootstrap_label form.state.label label_for=form.state.id_for_label label_class="col-form-label" %}
 
                 {% render_field form.state %}
@@ -20,7 +20,7 @@
     <div class="col-md-6">
         <h2>Document search</h2>
 
-        <div class="form-group">
+        <div class="mb-3">
             {% bootstrap_label form.draft.label label_for=form.draft.id_for_label label_class="col-form-label" %}
             <div class="input-group">
                 {% render_field form.draft class="form-control" placeholder="draft-..." %}
@@ -30,7 +30,7 @@
             </div>
         </div>
 
-        <div class="form-group">
+        <div class="mb-3">
             {% bootstrap_label form.rfc.label label_for=form.rfc.id_for_label label_class="col-form-label" %}
             <div class="input-group">
                 {% render_field form.rfc class="form-control" placeholder="123..." %}
@@ -40,7 +40,7 @@
             </div>
         </div>
 
-        <div class="form-group">
+        <div class="mb-3">
             {{ form.doctitle.label_tag }}
             <div class="input-group">
                 {% render_field form.doctitle class="form-control" placeholder="protocol..." %}
@@ -50,7 +50,7 @@
             </div>
         </div>
 
-        <div class="form-group">
+        <div class="mb-3">
             {{ form.group.label_tag }}
             <div class="row">
                 <div class="col-sm-8">
@@ -67,7 +67,7 @@
 
         <h2>IPR search</h2>
 
-        <div class="form-group">
+        <div class="mb-3">
             {{ form.holder.label_tag }}
             <div class="input-group">
                 {% render_field form.holder class="form-control" placeholder="John Doe..." %}
@@ -77,7 +77,7 @@
             </div>
         </div>
 
-        <div class="form-group">
+        <div class="mb-3">
             {{ form.iprtitle.label_tag }}
             <div class="input-group">
                 {% render_field form.iprtitle class="form-control" placeholder="protocol..." %}
@@ -87,7 +87,7 @@
             </div>
         </div>
 
-        <div class="form-group">
+        <div class="mb-3">
             {{ form.patent.label_tag }}
             <div class="input-group">
                 {% render_field form.patent class="form-control" %}
diff --git a/ietf/templates/meeting/interim_request.html b/ietf/templates/meeting/interim_request.html
index 2ac2060e2..b837b654c 100644
--- a/ietf/templates/meeting/interim_request.html
+++ b/ietf/templates/meeting/interim_request.html
@@ -18,14 +18,14 @@
         {% csrf_token %}
 
         {% if form.non_field_errors %}
-            <div class="form-group alert alert-danger">
+            <div class="mb-3 alert alert-danger">
                 {{ form.non_field_errors }}
             </div>
         {% endif %}
 
         {% bootstrap_field form.group layout='horizontal' %}
 
-        <div class="form-group form-inline">
+        <div class="mb-3 form-inline">
             <div class="col-md-offset-2">
                 <div class="col-md-2">
                     <label class="checkbox-inline">{% render_field form.in_person %}<strong>In Person</strong></label>
@@ -47,10 +47,10 @@
                 {% endfor %}
 
             </div> <!-- col-md-offset-2 -->
-        </div> <!-- form-group form-inline -->
+        </div> <!-- mb-3 form-inline -->
 
 
-        <div class="form-group meeting-type-help mth-multi" style="display: none;">
+        <div class="mb-3 meeting-type-help mth-multi" style="display: none;">
             <div class="col-md-offset-2">
                 <div class="col-md-10">
                     <p class="form-text">
@@ -62,7 +62,7 @@
             </div>
         </div>
 
-        <div class="form-group meeting-type-help mth-series" style="display: none;">
+        <div class="mb-3 meeting-type-help mth-series" style="display: none;">
             <div class="col-md-offset-2">
                 <div class="col-md-10">
                     <p class="form-text">
@@ -74,7 +74,7 @@
             </div>
         </div>
 
-        <div class="form-group">
+        <div class="mb-3">
             <label for="id_session_set-{{ forloop.counter0 }}-city" class="col-md-2 col-form-label">Location</label>
             <div class="col-md-10 form-inline">
                 {% render_field form.city class="form-control location" placeholder="City" %}
@@ -88,7 +88,7 @@
         {{ formset.management_form }}
 
         {% if formset.non_form_errors %}
-            <div class="form-group alert alert-danger">
+            <div class="mb-3 alert alert-danger">
                 {{ formset.non_form_errors }}
             </div>
         {% endif %}
@@ -96,13 +96,13 @@
         {% for form in formset %}
             <div class="fieldset{% if forloop.last %} template{% endif %}" >
 
-                <div class="form-group {% if form.date.errors %}alert alert-danger{% endif %}">
+                <div class="mb-3 {% if form.date.errors %}alert alert-danger{% endif %}">
                     <label for="id_session_set-{{ forloop.counter0 }}-date" class="col-md-2 col-form-label required">Date</label>
                     <div class="col-md-2">{% render_field form.date class="form-control" %}</div>
                     {% if form.date.errors %}<span class="help-inline">{{ form.date.errors }}</span>{% endif %}
                 </div>
 
-                <div class="form-group {% if form.time.errors or form.requested_duration.errors %}alert alert-danger{% endif %}">
+                <div class="mb-3 {% if form.time.errors or form.requested_duration.errors %}alert alert-danger{% endif %}">
                     <label for="id_session_set-{{ forloop.counter0 }}-time" class="col-md-2 col-form-label required">Start Time</label>
                     <div class="col-md-3 form-inline">
                         {% render_field form.time class="form-control time-field" placeholder="HH:MM" %}
@@ -120,7 +120,7 @@
                     </div>
                 </div>
 
-                <div class="form-group{% if form.remote_instructions.errors %} alert alert-danger{% endif %}">
+                <div class="mb-3{% if form.remote_instructions.errors %} alert alert-danger{% endif %}">
                     <label for="id_session_set-{{ forloop.counter0 }}-remote_instructions" class="col-md-2 col-form-label required">Remote Instructions</label>
                     <div class="col-md-10">{% render_field form.remote_instructions class="form-control" placeholder="Webex (or other) URL or descriptive information (see below)" %}
                         <p class="form-text">
@@ -132,12 +132,12 @@
                     {% if form.remote_instructions.errors %}<span class="help-inline">{{ form.remote_instructions.errors }}</span>{% endif %}
                 </div>
 
-                <div class="form-group">
+                <div class="mb-3">
                     <label for="id_session_set-{{ forloop.counter0 }}-agenda" class="col-md-2 col-form-label">Agenda</label>
                     <div class="col-md-10">{% render_field form.agenda class="form-control" rows="6" placeholder="Paste agenda here" %}</div>
                 </div>
 
-                <div class="form-group">
+                <div class="mb-3">
                     <label for="id_session_set-{{ forloop.counter0 }}-agenda_note" class="col-md-2 col-form-label">Additional Information</label>
                     <div class="col-md-10">{% render_field form.agenda_note class="form-control" %}</div>
                 </div>
@@ -145,7 +145,7 @@
             </div>  <!-- fieldset -->
         {% endfor %}
 
-        <div class="form-group">
+        <div class="mb-3">
             <div class="col-md-12">
                 <button id="add_session" type="button" class="btn btn-primary" style="display: none;"><span class="bi bi-plus" aria-hidden="true"></span>Add Session</button>
             </div>
diff --git a/ietf/templates/meeting/interim_request_cancel.html b/ietf/templates/meeting/interim_request_cancel.html
index bd9e97c61..9f4b7f75a 100644
--- a/ietf/templates/meeting/interim_request_cancel.html
+++ b/ietf/templates/meeting/interim_request_cancel.html
@@ -19,7 +19,7 @@
 
         {% bootstrap_form form layout='horizontal' %}
 
-        <div class="form-group">
+        <div class="mb-3">
 
 
             <button type="submit" class="btn btn-primary">Submit</button>
diff --git a/ietf/templates/meeting/interim_request_edit.html b/ietf/templates/meeting/interim_request_edit.html
index 7cf442337..0b275cd91 100644
--- a/ietf/templates/meeting/interim_request_edit.html
+++ b/ietf/templates/meeting/interim_request_edit.html
@@ -21,7 +21,7 @@
 
         <input type="hidden" name="group" value="{{ form.group.value }}">
 
-        <div class="form-group form-inline">
+        <div class="mb-3 form-inline">
             <div class="col-md-offset-2">
                 <div class="col-md-2">
                     <label class="checkbox-inline">{% render_field form.in_person %}<strong>In Person</strong></label>
@@ -31,9 +31,9 @@
                     <label class="checkbox-inline">{% render_field form.approved %}<strong>Preapproved by AD</strong></label>
                 </div>
             </div> <!-- col-md-offset-2 -->
-        </div> <!-- form-group form-inline -->
+        </div> <!-- mb-3 form-inline -->
 
-        <div class="form-group">
+        <div class="mb-3">
             <label for="id_session_set-{{ forloop.counter0 }}-city" class="col-md-2 col-form-label">Location</label>
             <div class="col-md-10 form-inline">
                 {% render_field form.city class="form-control location" placeholder="City" %}
@@ -50,13 +50,13 @@
 
                 <input id="id_session_set-{{ forloop.counter0 }}-id" name="session_set-{{ forloop.counter0 }}-id" type="hidden" value="{{ form.instance.pk|default_if_none:"" }}">
 
-                <div class="form-group{% if form.date.errors %} alert alert-danger{% endif %}">
+                <div class="mb-3{% if form.date.errors %} alert alert-danger{% endif %}">
                     <label for="id_session_set-{{ forloop.counter0 }}-date" class="col-md-2 col-form-label required">Date</label>
                     <div class="col-md-2">{% render_field form.date class="form-control" %}</div>
                     {% if form.date.errors %}<span class="help-inline">{{ form.date.errors }}</span>{% endif %}
                 </div>
 
-                <div class="form-group {% if form.time.errors or form.requested_duration.errors %}alert alert-danger{% endif %}">
+                <div class="mb-3 {% if form.time.errors or form.requested_duration.errors %}alert alert-danger{% endif %}">
                     <label for="id_session_set-{{ forloop.counter0 }}-time" class="col-md-2 col-form-label required">Start Time</label>
                     <div class="col-md-3 form-inline">
                         {% render_field form.time class="form-control time-field" placeholder="HH:MM" %}
@@ -73,18 +73,18 @@
                     </div>
                 </div>
 
-                <div class="form-group{% if form.remote_instructions.errors %} alert alert-danger{% endif %}">
+                <div class="mb-3{% if form.remote_instructions.errors %} alert alert-danger{% endif %}">
                     <label for="id_session_set-{{ forloop.counter0 }}-remote_instructions" class="col-md-2 col-form-label required">Remote Instructions</label>
                     <div class="col-md-10">{% render_field form.remote_instructions class="form-control" placeholder="ie. Webex address" %}</div>
                     {% if form.remote_instructions.errors %}<span class="help-inline">{{ form.remote_instructions.errors }}</span>{% endif %}
                 </div>
 
-                <div class="form-group">
+                <div class="mb-3">
                     <label for="id_session_set-{{ forloop.counter0 }}-agenda" class="col-md-2 col-form-label">Agenda</label>
                     <div class="col-md-10">{% render_field form.agenda class="form-control" rows="6" placeholder="paste agenda here" %}</div>
                 </div>
 
-                <div class="form-group">
+                <div class="mb-3">
                     <label for="id_session_set-{{ forloop.counter0 }}-agenda_note" class="col-md-2 col-form-label">Additional Information</label>
                     <div class="col-md-10">{% render_field form.agenda_note class="form-control" %}</div>
                 </div>
@@ -92,7 +92,7 @@
             </div>  <!-- fieldset -->
         {% endfor %}
 
-        <div class="form-group">
+        <div class="mb-3">
             <div class="col-md-12">
                 <button id="add_session" type="button" class="btn btn-primary"><span class="bi bi-plus" aria-hidden="true"></span>Add Session</button>
             </div>
diff --git a/ietf/templates/meeting/interim_send_announcement.html b/ietf/templates/meeting/interim_send_announcement.html
index a396909b5..92ed0e5fa 100644
--- a/ietf/templates/meeting/interim_send_announcement.html
+++ b/ietf/templates/meeting/interim_send_announcement.html
@@ -18,23 +18,23 @@
 
         <div class="fieldset" >
 
-            <div class="form-group">
+            <div class="mb-3">
                 <label for="id_to" class="col-md-2 col-form-label">To</label>
                 <div class="col-md-10">{% render_field form.to class="form-control" readonly="readonly" %}</div>
             </div>
-            <div class="form-group">
+            <div class="mb-3">
                 <label for="id_cc" class="col-md-2 col-form-label">Cc</label>
                 <div class="col-md-10">{% render_field form.cc class="form-control" %}</div>
             </div>
-            <div class="form-group">
+            <div class="mb-3">
                 <label for="id_from" class="col-md-2 col-form-label">From</label>
                 <div class="col-md-10">{% render_field form.frm class="form-control" readonly="readonly" %}</div>
             </div>
-            <div class="form-group">
+            <div class="mb-3">
                 <label for="id_subject" class="col-md-2 col-form-label">Subject</label>
                 <div class="col-md-10">{% render_field form.subject class="form-control" readonly="readonly" %}</div>
             </div>
-            <div class="form-group">
+            <div class="mb-3">
                 <label for="id_body" class="col-md-2 col-form-label">Body</label>
                 <div class="col-md-10">{% render_field form.body class="form-control" %}</div>
             </div>
diff --git a/ietf/templates/nomcom/feedback.html b/ietf/templates/nomcom/feedback.html
index 6df5d1f66..8614c4b6f 100644
--- a/ietf/templates/nomcom/feedback.html
+++ b/ietf/templates/nomcom/feedback.html
@@ -48,7 +48,7 @@
                 {% for p in positions %}
                     {% if p.nomineeposition_set.accepted.not_duplicated %}
                         <h4>{{ p.name }}</h4>
-                        <div class="btn-group-vertical form-group">
+                        <div class="btn-group-vertical mb-3">
                             {% for np in p.nomineeposition_set.accepted.not_duplicated %}
                                 <a class="btn btn-primary btn-sm" {% if nomcom.group.state_id != 'conclude' %}href="?nominee={{np.nominee.id}}&position={{ np.position.id}}"{% endif %}>
                                     {{ np.nominee.name }}
@@ -73,7 +73,7 @@
                 </p>
 
                 <h3>Topics</h3>
-                <div class="btn-group-vertical form-group">
+                <div class="btn-group-vertical mb-3">
                     {% for t in topics %}
                         <a class="btn btn-primary btn-sm" {% if nomcom.group.state_id != 'conclude' %}href="?topic={{t.id}}"{% endif %}>
                             {{t.subject}}
diff --git a/ietf/templates/nomcom/private_index.html b/ietf/templates/nomcom/private_index.html
index c314f2423..81b668bae 100644
--- a/ietf/templates/nomcom/private_index.html
+++ b/ietf/templates/nomcom/private_index.html
@@ -80,7 +80,7 @@
     <h2>Nominees by position</h2>
 
     <form class="form-inline" method="get">
-        <div class="form-group">
+        <div class="mb-3">
             <label>State: </label>
             <select class="form-select input-sm" name="state">
                 <option value="">All</option>
@@ -93,7 +93,7 @@
             </select>
         </div>
 
-        <div class="form-group">
+        <div class="mb-3">
             <label>Position:</label>
             <select class="form-select input-sm" name="position">
                 <option value="">All</option>
@@ -152,7 +152,7 @@
         {% if is_chair %}
 
             {% if nomcom.group.state_id == 'active' %}
-                <div class="form-group">
+                <div class="mb-3">
                     <label>Action:</label>
                     <select class="form-select" name="action">
                         <option value="" selected="selected">---------</option>
diff --git a/ietf/templates/person/merge.html b/ietf/templates/person/merge.html
index 276b6d18a..06c4b1701 100644
--- a/ietf/templates/person/merge.html
+++ b/ietf/templates/person/merge.html
@@ -11,7 +11,7 @@
     <p>This tool will merge two Person records into one.  If both records have logins and you want to retain the one on the left, use the Swap button to swap source and target records.</p>
     <form action="" method="{{ method }}">{% if method == 'post' %}{% csrf_token %}{% endif %}
         <div class="row">
-            <div class="form-group">
+            <div class="mb-3">
                 <div class="col-md-6">
                     {% bootstrap_field form.source %}
                     {% if source %}
diff --git a/ietf/templates/person/person_link.html b/ietf/templates/person/person_link.html
index 0ba8dea04..b30eb6c3d 100644
--- a/ietf/templates/person/person_link.html
+++ b/ietf/templates/person/person_link.html
@@ -1,22 +1,23 @@
 {# bs5ok #}
 {# Copyright The IETF Trust 2020, All Rights Reserved #}
 {% spaceless %}
-    <span class="text-nowrap">
-        {% if email %}
-            <a {% if title %}title="{{ title }}"{% endif %}
-                                    href="{% url 'ietf.person.views.profile' email_or_name=email %}">
-                <span class="{{ class }}">{{ name }}</span>
-            </a>&nbsp;
-            <a href="mailto:{{ email|urlencode }}">
-                <span class="bi bi-envelope"></span>
-            </a>
-        {% elif name %}
-            <a {% if title %}title="{{ title }}"{% endif %}
-                                    href="{% url 'ietf.person.views.profile' email_or_name=name %}">
-                <span class="{{ class }}">{{ name }}</span>
+    <span class="text-nowrap {{ class }}">
+        {% if email or name %}
+            <a {% if class %}class="text-reset"{% endif %}
+               {% if title %}title="{{ title }}"{% endif %}
+               {% if email %} href="{% url 'ietf.person.views.profile' email_or_name=email %}" {% else %} href="{% url 'ietf.person.views.profile' email_or_name=name %}" {% endif %}>
+                {{ name }}
             </a>
+            {% if email %}
+                &nbsp;
+                <a {% if class %}class="text-reset"{% endif %}
+                   href="mailto:{{ email|urlencode }}"
+                   title="Click to compose email.">
+                    <span class="bi bi-envelope"></span>
+                </a>
+            {% endif %}
         {% else %}
-            <span class="{{ class }}">{{ name }}</span>
+            {{ name }}
         {% endif %}
     </span>
 {% endspaceless %}
\ No newline at end of file
diff --git a/ietf/templates/submit/search_submission.html b/ietf/templates/submit/search_submission.html
index 5b2cb53e8..358b2950d 100644
--- a/ietf/templates/submit/search_submission.html
+++ b/ietf/templates/submit/search_submission.html
@@ -20,7 +20,7 @@
             <p class="alert alert-danger">{{ error }}</p>
         {% endif %}
 
-        <div class="form-group">
+        <div class="mb-3">
             <label>I-D name</label>
             <input type="text" class="form-control" placeholder="draft-..." name="name" value="{{ name|default:"" }}">
         </div>
diff --git a/package-lock.json b/package-lock.json
index 64af07e2f..a9bb850bc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,7 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "7.40.1.dev0-bs5",
       "dependencies": {
         "@fullcalendar/core": "^5.10.1",
         "@fullcalendar/daygrid": "^5.10.1",
@@ -45,9 +46,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.16.4",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz",
-      "integrity": "sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==",
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.8.tgz",
+      "integrity": "sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -108,12 +109,12 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.7.tgz",
-      "integrity": "sha512-/ST3Sg8MLGY5HVYmrjOgL60ENux/HfO/CsUh7y4MalThufhE/Ff/6EibFDHi4jiDCaWfJKoqbE6oTh21c5hrRg==",
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz",
+      "integrity": "sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.7",
+        "@babel/types": "^7.16.8",
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
       },
@@ -380,9 +381,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.7.tgz",
-      "integrity": "sha512-sR4eaSrnM7BV7QPzGfEX5paG/6wrZM3I0HDzfIAK06ESvo9oy3xBuVBxE3MbQaKNhvg8g/ixjMWo2CGpzpHsDA==",
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.8.tgz",
+      "integrity": "sha512-i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -437,19 +438,19 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.7.tgz",
-      "integrity": "sha512-8KWJPIb8c2VvY8AJrydh6+fVRo2ODx1wYBU2398xJVq0JomuLBZmVQzLPBblJgHIGYG4znCpUZUZ0Pt2vdmVYQ==",
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.8.tgz",
+      "integrity": "sha512-xe+H7JlvKsDQwXRsBhSnq1/+9c+LlQcCK3Tn/l5sbx02HYns/cn7ibp9+RV1sIUqu7hKg91NWsgHurO9dowITQ==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.16.7",
+        "@babel/generator": "^7.16.8",
         "@babel/helper-environment-visitor": "^7.16.7",
         "@babel/helper-function-name": "^7.16.7",
         "@babel/helper-hoist-variables": "^7.16.7",
         "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7",
+        "@babel/parser": "^7.16.8",
+        "@babel/types": "^7.16.8",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -467,9 +468,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.7.tgz",
-      "integrity": "sha512-E8HuV7FO9qLpx6OtoGfUQ2cjIYnbFwvZWYBS+87EwtdMvmUPJSwykpovFB+8insbpF0uJcpr8KMUi64XZntZcg==",
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz",
+      "integrity": "sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.16.7",
@@ -3466,9 +3467,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.38",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.38.tgz",
-      "integrity": "sha512-WhHt3sZazKj0KK/UpgsbGQnUUoFeAHVishzHFExMxagpZgjiGYSC9S0ZlbhCfSH2L2i+2A1yyqOIliTctMx7KQ==",
+      "version": "1.4.40",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.40.tgz",
+      "integrity": "sha512-j+eVIyQGt2EU5xPWUblhpp5P5z5xyAdRgzogBgfe2F5JGV17gr9pfzWBua6DlPL00LavbOjxubWkWkbVQe9Wlw==",
       "dev": true
     },
     "node_modules/elliptic": {
@@ -4216,9 +4217,9 @@
       "integrity": "sha512-Strct/A27o0TA25X7Z0pxKhwK4djiP1Kjeqj0tkiqrkRu1qYPqfbp5BYuxEL8CWDNtj85Uc0PnG2E2plo1+VMg=="
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz",
-      "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==",
+      "version": "1.14.7",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
+      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==",
       "dev": true,
       "funding": [
         {
@@ -6398,9 +6399,9 @@
       }
     },
     "node_modules/postcss-calc": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.0.tgz",
-      "integrity": "sha512-PueXCv288diX7OXyJicGNA6Q3+L4xYb2cALTAeFj9X6PXnj+s4pUf1vkZnwn+rldfu2taCA9ondjF93lhRTPFA==",
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.1.tgz",
+      "integrity": "sha512-FdGs2CYvGTWzDYrm71jydvr48zNStiiRtvxrCscsBLvtVwQ0YZ0gPx2HVFawu0xQuiPLCv66dJo3+/ymhZZLkA==",
       "dev": true,
       "dependencies": {
         "postcss-selector-parser": "^6.0.2",
@@ -7473,9 +7474,9 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
       "dev": true,
       "engines": {
         "node": ">=0.6"
@@ -8957,9 +8958,9 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.16.4",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz",
-      "integrity": "sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==",
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.8.tgz",
+      "integrity": "sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==",
       "dev": true
     },
     "@babel/core": {
@@ -9003,12 +9004,12 @@
       }
     },
     "@babel/generator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.7.tgz",
-      "integrity": "sha512-/ST3Sg8MLGY5HVYmrjOgL60ENux/HfO/CsUh7y4MalThufhE/Ff/6EibFDHi4jiDCaWfJKoqbE6oTh21c5hrRg==",
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz",
+      "integrity": "sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.16.7",
+        "@babel/types": "^7.16.8",
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
       }
@@ -9213,9 +9214,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.7.tgz",
-      "integrity": "sha512-sR4eaSrnM7BV7QPzGfEX5paG/6wrZM3I0HDzfIAK06ESvo9oy3xBuVBxE3MbQaKNhvg8g/ixjMWo2CGpzpHsDA==",
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.8.tgz",
+      "integrity": "sha512-i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw==",
       "dev": true
     },
     "@babel/plugin-syntax-flow": {
@@ -9249,19 +9250,19 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.7.tgz",
-      "integrity": "sha512-8KWJPIb8c2VvY8AJrydh6+fVRo2ODx1wYBU2398xJVq0JomuLBZmVQzLPBblJgHIGYG4znCpUZUZ0Pt2vdmVYQ==",
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.8.tgz",
+      "integrity": "sha512-xe+H7JlvKsDQwXRsBhSnq1/+9c+LlQcCK3Tn/l5sbx02HYns/cn7ibp9+RV1sIUqu7hKg91NWsgHurO9dowITQ==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.16.7",
+        "@babel/generator": "^7.16.8",
         "@babel/helper-environment-visitor": "^7.16.7",
         "@babel/helper-function-name": "^7.16.7",
         "@babel/helper-hoist-variables": "^7.16.7",
         "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7",
+        "@babel/parser": "^7.16.8",
+        "@babel/types": "^7.16.8",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -9275,9 +9276,9 @@
       }
     },
     "@babel/types": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.7.tgz",
-      "integrity": "sha512-E8HuV7FO9qLpx6OtoGfUQ2cjIYnbFwvZWYBS+87EwtdMvmUPJSwykpovFB+8insbpF0uJcpr8KMUi64XZntZcg==",
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz",
+      "integrity": "sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==",
       "dev": true,
       "requires": {
         "@babel/helper-validator-identifier": "^7.16.7",
@@ -11498,9 +11499,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.4.38",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.38.tgz",
-      "integrity": "sha512-WhHt3sZazKj0KK/UpgsbGQnUUoFeAHVishzHFExMxagpZgjiGYSC9S0ZlbhCfSH2L2i+2A1yyqOIliTctMx7KQ==",
+      "version": "1.4.40",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.40.tgz",
+      "integrity": "sha512-j+eVIyQGt2EU5xPWUblhpp5P5z5xyAdRgzogBgfe2F5JGV17gr9pfzWBua6DlPL00LavbOjxubWkWkbVQe9Wlw==",
       "dev": true
     },
     "elliptic": {
@@ -12089,9 +12090,9 @@
       "integrity": "sha512-Strct/A27o0TA25X7Z0pxKhwK4djiP1Kjeqj0tkiqrkRu1qYPqfbp5BYuxEL8CWDNtj85Uc0PnG2E2plo1+VMg=="
     },
     "follow-redirects": {
-      "version": "1.14.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz",
-      "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==",
+      "version": "1.14.7",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
+      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==",
       "dev": true
     },
     "foreach": {
@@ -13742,9 +13743,9 @@
       }
     },
     "postcss-calc": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.0.tgz",
-      "integrity": "sha512-PueXCv288diX7OXyJicGNA6Q3+L4xYb2cALTAeFj9X6PXnj+s4pUf1vkZnwn+rldfu2taCA9ondjF93lhRTPFA==",
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.1.tgz",
+      "integrity": "sha512-FdGs2CYvGTWzDYrm71jydvr48zNStiiRtvxrCscsBLvtVwQ0YZ0gPx2HVFawu0xQuiPLCv66dJo3+/ymhZZLkA==",
       "dev": true,
       "requires": {
         "postcss-selector-parser": "^6.0.2",
@@ -14543,9 +14544,9 @@
       }
     },
     "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
       "dev": true
     },
     "querystring": {