diff --git a/ietf/doc/tests_bofreq.py b/ietf/doc/tests_bofreq.py
index 05a966944..375b4d5ee 100644
--- a/ietf/doc/tests_bofreq.py
+++ b/ietf/doc/tests_bofreq.py
@@ -8,7 +8,7 @@ from pathlib import Path
 from pyquery import PyQuery
 from random import randint
 from tempfile import NamedTemporaryFile
-from html import escape
+from html import escape, unescape
 
 from django.conf import settings
 from django.urls import reverse as urlreverse
@@ -191,7 +191,7 @@ This test section has some text.
             self.client.login(username=username,password=username+'+password')
             r = self.client.get(url)
             self.assertEqual(r.status_code,200)
-            unescaped = unicontent(r).encode('utf-8').decode('unicode-escape')
+            unescaped = unescape(unicontent(r).encode('utf-8').decode('unicode-escape'))
             for editor in previous_editors:
                 self.assertIn(editor.name,unescaped)
             new_editors = set(previous_editors)
@@ -231,9 +231,9 @@ This test section has some text.
             self.client.login(username=username,password=username+'+password')
             r = self.client.get(url)
             self.assertEqual(r.status_code,200)
-            unescaped = unicontent(r).encode('utf-8').decode('unicode-escape')
+            unescaped = unescape(unicontent(r).encode('utf-8').decode('unicode-escape'))
             for responsible in previous_responsible: 
-                self.assertIn(escape(responsible.name), unescaped)
+                self.assertIn(responsible.name, unescaped)
             new_responsible = set(previous_responsible)
             new_responsible.add(RoleFactory(group__type_id='area',name_id='ad').person)
             postdict = dict(responsible=[str(p.pk) for p in new_responsible])
diff --git a/ietf/liaisons/admin.py b/ietf/liaisons/admin.py
index bedb1d69f..c7cb7a4da 100644
--- a/ietf/liaisons/admin.py
+++ b/ietf/liaisons/admin.py
@@ -29,7 +29,7 @@ class LiaisonStatementAdmin(admin.ModelAdmin):
     inlines = [ RelatedLiaisonStatementInline, LiaisonStatementAttachmentInline ]
 
     def related_to(self, obj):
-        return '<br />'.join(['<a href="%s">%s</a>' % (reverse('admin:liaisons_liaisonstatement_change', None, (i.target.id, )), str(i.target)) for i in obj.source_of_set.select_related('target').all()])
+        return '<br>'.join(['<a href="%s">%s</a>' % (reverse('admin:liaisons_liaisonstatement_change', None, (i.target.id, )), str(i.target)) for i in obj.source_of_set.select_related('target').all()])
     related_to.allow_tags = True        # type: ignore # https://github.com/python/mypy/issues/2087
 
 class LiaisonStatementAttachmentAdmin(admin.ModelAdmin):
@@ -50,4 +50,4 @@ class LiaisonStatementEventAdmin(admin.ModelAdmin):
     raw_id_fields = ["statement", "by"]
 
 admin.site.register(LiaisonStatement, LiaisonStatementAdmin)
-admin.site.register(LiaisonStatementEvent, LiaisonStatementEventAdmin)
+admin.site.register(LiaisonStatementEvent, LiaisonStatementEventAdmin)
\ No newline at end of file
diff --git a/ietf/liaisons/forms.py b/ietf/liaisons/forms.py
index f72becd78..b4aaa386c 100644
--- a/ietf/liaisons/forms.py
+++ b/ietf/liaisons/forms.py
@@ -211,13 +211,13 @@ class CustomModelMultipleChoiceField(forms.ModelMultipleChoiceField):
 
 class LiaisonModelForm(BetterModelForm):
     '''Specify fields which require a custom widget or that are not part of the model.
-    NOTE: from_groups and to_groups are marked as not required because select2 has
-    a problem with validating
     '''
     from_groups = forms.ModelMultipleChoiceField(queryset=Group.objects.all(),label='Groups',required=False)
+    from_groups.widget.attrs["class"] = "select2-field"
     from_contact = forms.EmailField()   # type: Union[forms.EmailField, SearchableEmailField]
     to_contacts = forms.CharField(label="Contacts", widget=forms.Textarea(attrs={'rows':'3', }), strip=False)
     to_groups = forms.ModelMultipleChoiceField(queryset=Group.objects,label='Groups',required=False)
+    to_groups.widget.attrs["class"] = "select2-field"
     deadline = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label='Deadline', required=True)
     related_to = SearchableLiaisonStatementsField(label='Related Liaison Statement', required=False)
     submitted_date = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label='Submission date', required=True, initial=datetime.date.today())
@@ -247,8 +247,8 @@ class LiaisonModelForm(BetterModelForm):
         self.person = get_person_for_user(user)
         self.is_new = not self.instance.pk
 
-        self.fields["from_groups"].widget.attrs["placeholder"] = "Type in name to search for group"
-        self.fields["to_groups"].widget.attrs["placeholder"] = "Type in name to search for group"
+        self.fields["from_groups"].widget.attrs["data-placeholder"] = "Type in name to search for group"
+        self.fields["to_groups"].widget.attrs["data-placeholder"] = "Type in name to search for group"
         self.fields["to_contacts"].label = 'Contacts'
         self.fields["other_identifiers"].widget.attrs["rows"] = 2
         
@@ -449,7 +449,7 @@ class IncomingLiaisonForm(LiaisonModelForm):
         else:
             queryset = Group.objects.filter(type="sdo", state="active", role__person=self.person, role__name__in=("liaiman", "auth")).distinct().order_by('name')
             self.fields['from_contact'].initial = self.person.role_set.filter(group=queryset[0]).first().email.address
-            self.fields['from_contact'].widget.attrs['readonly'] = True
+            self.fields['from_contact'].widget.attrs['disabled'] = True
         self.fields['from_groups'].queryset = queryset
         self.fields['from_groups'].widget.submitter = str(self.person)
 
@@ -504,7 +504,7 @@ class OutgoingLiaisonForm(LiaisonModelForm):
         else:
             email = self.person.email_address()
         self.fields['from_contact'].initial = email
-        self.fields['from_contact'].widget.attrs['readonly'] = True
+        self.fields['from_contact'].widget.attrs['disabled'] = True
 
     def set_to_fields(self):
         '''Set to_groups and to_contacts options and initial value based on user
@@ -551,7 +551,7 @@ class EditLiaisonForm(LiaisonModelForm):
                 queryset = Group.objects.filter(type="sdo").order_by('name')
             else:
                 queryset = Group.objects.filter(type="sdo", role__person=self.person, role__name__in=("liaiman", "auth")).distinct().order_by('name')
-                self.fields['from_contact'].widget.attrs['readonly'] = True
+                self.fields['from_contact'].widget.attrs['disabled'] = True
             self.fields['from_groups'].queryset = queryset
 
     def set_to_fields(self):
@@ -571,5 +571,4 @@ class EditLiaisonForm(LiaisonModelForm):
 
 
 class EditAttachmentForm(forms.Form):
-    title = forms.CharField(max_length=255)
-
+    title = forms.CharField(max_length=255)
\ No newline at end of file
diff --git a/ietf/liaisons/widgets.py b/ietf/liaisons/widgets.py
index fe0f15e36..db27c3780 100644
--- a/ietf/liaisons/widgets.py
+++ b/ietf/liaisons/widgets.py
@@ -25,7 +25,7 @@ class ButtonWidget(Widget):
                 html += '<span style="display: none" class="attachRequiredField">%s</span>' % conditional_escape(i)
             required_str = 'Please fill in %s to attach a new file' % conditional_escape(self.required_label)
             html += '<span style="display: none" class="attachDisabledLabel">%s</span>' % conditional_escape(required_str)
-        html += '<input type="button" class="addAttachmentWidget btn btn-primary btn-sm" value="%s" />' % conditional_escape(self.label)
+        html += '<input type="button" class="addAttachmentWidget btn btn-primary btn-sm" value="%s">' % conditional_escape(self.label)
         return mark_safe(html)
 
 
@@ -39,8 +39,8 @@ class ShowAttachmentsWidget(Widget):
                 html += '<a class="initialAttach" href="%s">%s</a>&nbsp' % (conditional_escape(attachment.document.get_href()), conditional_escape(attachment.document.title))
                 html += '<a class="btn btn-primary btn-sm" href="{}">Edit</a>&nbsp'.format(urlreverse("ietf.liaisons.views.liaison_edit_attachment", kwargs={'object_id':attachment.statement.pk,'doc_id':attachment.document.pk}))
                 html += '<a class="btn btn-primary btn-sm" href="{}">Delete</a>&nbsp'.format(urlreverse("ietf.liaisons.views.liaison_delete_attachment", kwargs={'object_id':attachment.statement.pk,'attach_id':attachment.pk}))
-                html += '<br />'
+                html += '<br>'
         else:
             html += 'No files attached'
         html += '</div></div>'
-        return mark_safe(html)
+        return mark_safe(html)
\ No newline at end of file
diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py
index 289c20a60..047f374d4 100644
--- a/ietf/meeting/tests_views.py
+++ b/ietf/meeting/tests_views.py
@@ -3941,7 +3941,7 @@ class EditScheduleListTests(TestCase):
         self.assertTrue(r.status_code, 200)
 
         q = PyQuery(r.content)
-        self.assertEqual(len(q(".schedule-diffs tr")), 3)
+        self.assertEqual(len(q(".schedule-diffs tr")), 3+1)
 
     def test_delete_schedule(self):
         url = urlreverse('ietf.meeting.views.delete_schedule',
@@ -5758,14 +5758,14 @@ class MaterialsTests(TestCase):
             r = self.client.get(session_overview_url)
             self.assertEqual(r.status_code,200)
             q = PyQuery(r.content)
-            self.assertFalse(q('#uploadslides'))
-            self.assertFalse(q('#proposeslides'))
+            self.assertFalse(q('.uploadslides'))
+            self.assertFalse(q('.proposeslides'))
 
             self.client.login(username=newperson.user.username,password=newperson.user.username+"+password")
             r = self.client.get(session_overview_url)
             self.assertEqual(r.status_code,200)
             q = PyQuery(r.content)
-            self.assertTrue(q('#proposeslides'))
+            self.assertTrue(q('.proposeslides'))
             self.client.logout()
 
             login_testing_unauthorized(self,newperson.user.username,propose_url)
@@ -5783,7 +5783,7 @@ class MaterialsTests(TestCase):
             r = self.client.get(session_overview_url)
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
-            self.assertEqual(len(q('#proposedslidelist p')), 1)
+            self.assertEqual(len(q('.proposedslidelist p')), 1)
 
             SlideSubmissionFactory(session = session)
 
@@ -5792,7 +5792,7 @@ class MaterialsTests(TestCase):
             r = self.client.get(session_overview_url)
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
-            self.assertEqual(len(q('#proposedslidelist p')), 2)
+            self.assertEqual(len(q('.proposedslidelist p')), 2)
             self.client.logout()
 
     def test_disapprove_proposed_slides(self):
diff --git a/ietf/person/tests.py b/ietf/person/tests.py
index 7054bb676..bd754194d 100644
--- a/ietf/person/tests.py
+++ b/ietf/person/tests.py
@@ -92,7 +92,7 @@ class PersonTests(TestCase):
         #debug.show('person.photo_name()')
         self.assertContains(r, person.photo_name(), status_code=200)
         q = PyQuery(r.content)
-        self.assertIn("Photo of %s"%person, q("div.bio-text img").attr("alt"))
+        self.assertIn("Photo of %s"%person.name, q("div.bio-text img").attr("alt"))
 
         bio_text  = q("div.bio-text").text()
         self.assertIsNotNone(bio_text)
diff --git a/ietf/secr/announcement/forms.py b/ietf/secr/announcement/forms.py
index 92383631b..3aacbfe62 100644
--- a/ietf/secr/announcement/forms.py
+++ b/ietf/secr/announcement/forms.py
@@ -73,7 +73,7 @@ def get_to_choices():
 
 class AnnounceForm(forms.ModelForm):
     nomcom = forms.ModelChoiceField(queryset=Group.objects.filter(acronym__startswith='nomcom',type='nomcom',state='active'),required=False)
-    to_custom = MultiEmailField(required=False,label='')
+    to_custom = MultiEmailField(required=False)
 
     class Meta:
         model = Message
@@ -131,4 +131,4 @@ class AnnounceForm(forms.ModelForm):
         if nomcom:
             message.related_groups.add(nomcom)
 
-        return message
+        return message
\ No newline at end of file
diff --git a/ietf/secr/templates/base_site.html b/ietf/secr/templates/base_site.html
index 2c258efe4..f75b41d06 100644
--- a/ietf/secr/templates/base_site.html
+++ b/ietf/secr/templates/base_site.html
@@ -24,9 +24,7 @@
 {% block footer %}
     <div id="footer">
         <div id="footer-extras">
-            <ul>
-                {% block footer-extras %}{% endblock %}
-            </ul>
+            {% block footer-extras %}{% endblock %}
         </div>
         <div id="footer-version">
             <p>IETF Secretariat Tools v. {{ secr_version_num }}</p>
@@ -36,4 +34,4 @@
             <a href="https://www.amsl.com/"><img src="{% static 'secr/images/ams_logo.png' %}" alt="AMS" align="right" border="0" hspace="5" /></a>
         </div>
     </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/base_site_bootstrap.html b/ietf/secr/templates/base_site_bootstrap.html
index c8edb0124..d1ab1dfde 100644
--- a/ietf/secr/templates/base_site_bootstrap.html
+++ b/ietf/secr/templates/base_site_bootstrap.html
@@ -24,9 +24,7 @@
 {% block footer %}
     <div id="footer">
         <div id="footer-extras">
-            <ul>
-                {% block footer-extras %}{% endblock %}
-            </ul>
+            {% block footer-extras %}{% endblock %}
         </div>
         <div id="footer-version">
             <p>IETF Secretariat Tools v. {{ secr_version_num }}</p>
@@ -36,4 +34,4 @@
             <a href="https://www.amsl.com/"><img src="{% static 'secr/images/ams_logo.png' %}" alt="AMS" align="right" border="0" hspace="5" /></a>
         </div>
     </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/groups/people.html b/ietf/secr/templates/groups/people.html
index 817a614d2..ebcc1aeeb 100644
--- a/ietf/secr/templates/groups/people.html
+++ b/ietf/secr/templates/groups/people.html
@@ -28,16 +28,18 @@
                     <th>Action</th>
                 </tr>
             </thead>
-            <tbody>
-                {% for role in group.role_set.all %}
-                    <tr class="{% cycle 'row1' 'row2' %}">
-                        <td>{{ role.name }}</td>
-                        <td>{{ role.person }}</td>
-                        <td>{{ role.email }}</td>
-                        <td><a href="{% url 'ietf.secr.groups.views.delete_role' acronym=group.acronym id=role.id %}">Delete</a></td>
-                    </tr>
-                {% endfor %}
-            </tbody>
+            {% if group.role_set.all %}
+                <tbody>
+                    {% for role in group.role_set.all %}
+                        <tr class="{% cycle 'row1' 'row2' %}">
+                            <td>{{ role.name }}</td>
+                            <td>{{ role.person }}</td>
+                            <td>{{ role.email }}</td>
+                            <td><a href="{% url 'ietf.secr.groups.views.delete_role' acronym=group.acronym id=role.id %}">Delete</a></td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            {% endif %}
         </table>
 
         <div class="inline-related">
@@ -65,4 +67,4 @@
 
     </div> <!-- module -->
 
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/groups/search.html b/ietf/secr/templates/groups/search.html
index e5a8d9a70..a60455302 100644
--- a/ietf/secr/templates/groups/search.html
+++ b/ietf/secr/templates/groups/search.html
@@ -7,8 +7,6 @@
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
     <script src="{% static 'secr/js/utils.js' %}"></script>
     <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}{% endblock %}
-
 {% endblock %}
 
 {% block breadcrumbs %}{{ block.super }}
diff --git a/ietf/secr/templates/groups/view.html b/ietf/secr/templates/groups/view.html
index 40cbc80b0..a1c2e9ae3 100644
--- a/ietf/secr/templates/groups/view.html
+++ b/ietf/secr/templates/groups/view.html
@@ -63,38 +63,46 @@
         <div id="groups-view-col2">
             <div class="inline-related">
                 <h2>Chairperson(s)</h2>
-                <table>
-                    {% for role in group.chairs %}
-                        <tr><td><a href="{% url 'ietf.secr.rolodex.views.view' id=role.person.id %}">{{ role.person }}</a></td></tr>
-                    {% endfor %}
-                </table>
+                {% if group.chairs %}
+                    <table>
+                        {% for role in group.chairs %}
+                            <tr><td><a href="{% url 'ietf.secr.rolodex.views.view' id=role.person.id %}">{{ role.person }}</a></td></tr>
+                        {% endfor %}
+                    </table>
+                {% endif %}
             </div> <!-- inline-related -->
 
             <div class="inline-related">
                 <h2>Document Editor(s)</h2>
-                <table>
-                    {% for role in group.editors %}
-                        <tr><td><a href="{% url 'ietf.secr.rolodex.views.view' id=role.person.id %}">{{ role.person }}</a></td></tr>
-                    {% endfor %}
-                </table>
+                {% if group.editors %}
+                    <table>
+                        {% for role in group.editors %}
+                            <tr><td><a href="{% url 'ietf.secr.rolodex.views.view' id=role.person.id %}">{{ role.person }}</a></td></tr>
+                        {% endfor %}
+                    </table>
+                {% endif %}
             </div> <!-- inline-related -->
 
             <div class="inline-related">
                 <h2>Technical Advisor(s)</h2>
-                <table>
-                    {% for role in group.techadvisors %}
-                        <tr><td><a href="{% url 'ietf.secr.rolodex.views.view' id=role.person.id %}">{{ role.person }}</a></td></tr>
-                    {% endfor %}
-                </table>
+                {% if group.techadvisors %}
+                    <table>
+                        {% for role in group.techadvisors %}
+                            <tr><td><a href="{% url 'ietf.secr.rolodex.views.view' id=role.person.id %}">{{ role.person }}</a></td></tr>
+                        {% endfor %}
+                    </table>
+                {% endif %}
             </div> <!-- inline-related -->
 
             <div class="inline-related">
                 <h2>Secretary(ies)</h2>
-                <table>
-                    {% for role in group.secretaries %}
-                        <tr><td><a href="{% url 'ietf.secr.rolodex.views.view' id=role.person.id %}">{{ role.person }}</a></td></tr>
-                    {% endfor %}
-                </table>
+                {% if group.secretaries %}
+                    <table>
+                        {% for role in group.secretaries %}
+                            <tr><td><a href="{% url 'ietf.secr.rolodex.views.view' id=role.person.id %}">{{ role.person }}</a></td></tr>
+                        {% endfor %}
+                    </table>
+                {% endif %}
             </div> <!-- inline-related -->
 
         </div> <!-- groups-view-col2 -->
@@ -111,4 +119,4 @@
         </div> <!-- button-group -->
     </div> <!-- module -->
 
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/includes/meetings_footer.html b/ietf/secr/templates/includes/meetings_footer.html
index 64ba3764b..9e9e98677 100755
--- a/ietf/secr/templates/includes/meetings_footer.html
+++ b/ietf/secr/templates/includes/meetings_footer.html
@@ -1 +1,3 @@
+<ul>
 <li><a href="https://datatracker.ietf.org/meeting/{{ meeting.number }}/agenda.txt" target="_blank">View Agenda</a>.</li>
+</ul>
\ No newline at end of file
diff --git a/ietf/secr/templates/includes/search_results_table.html b/ietf/secr/templates/includes/search_results_table.html
index 7ee860226..ba7dfd787 100644
--- a/ietf/secr/templates/includes/search_results_table.html
+++ b/ietf/secr/templates/includes/search_results_table.html
@@ -6,13 +6,15 @@
             <th>ID</th>
         </tr>
     </thead>
-    <tbody>
-        {% for item in results %}
-            <tr class="{% cycle 'row1' 'row2' %}">
-                <td><a href="{% url 'ietf.secr.rolodex.views.view' id=item.person.id %}">{{item.name}}</a></td>
-                <td>{{item.person.email_address}}</td>
-                <td>{{item.person.id}}</a></td>
-            </tr>
-        {% endfor %}
-    </tbody>
-</table>
+    {% if results %}
+        <tbody>
+            {% for item in results %}
+                <tr class="{% cycle 'row1' 'row2' %}">
+                    <td><a href="{% url 'ietf.secr.rolodex.views.view' id=item.person.id %}">{{item.name}}</a></td>
+                    <td>{{item.person.email_address}}</td>
+                    <td>{{item.person.id}}</a></td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    {% endif %}
+</table>
\ No newline at end of file
diff --git a/ietf/secr/templates/includes/sessions_footer.html b/ietf/secr/templates/includes/sessions_footer.html
index ab26d53a4..a41a8b8db 100755
--- a/ietf/secr/templates/includes/sessions_footer.html
+++ b/ietf/secr/templates/includes/sessions_footer.html
@@ -1,4 +1,6 @@
+<ul>
 <li><a href="https://www.ietf.org/chairs/session-request-tool-instructions/" target="_blank">Instructions</a>.</li>
 <li><a href="{% url 'ietf.secr.proceedings.views.main' %}">IETF Meeting Materials Management Tool</a>.</li>
 <li>If you require assistance in using this tool, or wish to report a bug, then please send a message to <a href="mailto:ietf-action@ietf.org">ietf-action@ietf.org</a>.</li>
 <li>To submit your request via email, please send your request to <a href="mailto:agenda@ietf.org">agenda@ietf.org</a>.</li>
+</ul>
\ No newline at end of file
diff --git a/ietf/secr/templates/includes/upload_footer.html b/ietf/secr/templates/includes/upload_footer.html
index 8a32f8820..d2faf02c9 100755
--- a/ietf/secr/templates/includes/upload_footer.html
+++ b/ietf/secr/templates/includes/upload_footer.html
@@ -1,4 +1,6 @@
+<ul>
 <li><a href="https://www.ietf.org/instructions/meeting_materials_tool.html" target="_blank">Instructions</a>.</li>
 <li>If you require assistance in using this tool, or wish to report a bug, then please send a message to <a href="mailto:{{settings.SECRETARIAT_ACTION_EMAIL}}">ietf-action@ietf.org</a>.</li>
 <li>To submit your materials via email, please send agendas to <a href="mailto:agenda@ietf.org">agenda@ietf.org</a> and minutes/presentation slides to <a href="mailto:proceedings@ietf.org">proceedings@ietf.org</a>.</li>
-<li><b>Note:</b> Normal session materials materials management is now performed using the {% if meeting.number %}<a href="{% url 'ietf.meeting.views.materials' num=meeting.number %}">{% endif %}materials page{% if meeting.number %}</a>{% endif %}
\ No newline at end of file
+<li><b>Note:</b> Normal session materials materials management is now performed using the {% if meeting.number %}<a href="{% url 'ietf.meeting.views.materials' num=meeting.number %}">{% endif %}materials page{% if meeting.number %}</a>{% endif %}
+</ul>
\ No newline at end of file
diff --git a/ietf/secr/templates/proceedings/main.html b/ietf/secr/templates/proceedings/main.html
index e95de3620..33c1971c9 100644
--- a/ietf/secr/templates/proceedings/main.html
+++ b/ietf/secr/templates/proceedings/main.html
@@ -22,15 +22,17 @@
                         <th>IETF Meeting</th>
                     </tr>
                 </thead>
-                <tbody>
-                    {% for meeting in meetings %}
-                        <tr class = "{% cycle 'row1' 'row2' %}{% if meeting.get_submission_correction_date < today %} frozen{% else %} open{% endif %}">
-                            <td>
-                                <a href="{% url 'ietf.secr.proceedings.views.select' meeting_num=meeting.number %}">{{ meeting.number }}</a>
-                            </td>
-                        </tr>
-                    {% endfor %}
-                </tbody>
+                {% if meetings %}
+                    <tbody>
+                        {% for meeting in meetings %}
+                            <tr class = "{% cycle 'row1' 'row2' %}{% if meeting.get_submission_correction_date < today %} frozen{% else %} open{% endif %}">
+                                <td>
+                                    <a href="{% url 'ietf.secr.proceedings.views.select' meeting_num=meeting.number %}">{{ meeting.number }}</a>
+                                </td>
+                            </tr>
+                        {% endfor %}
+                    </tbody>
+                {% endif %}
             </table>
             {% if user|has_role:"Secretariat" %}
                 <div class="button-group">
@@ -49,15 +51,17 @@
                             <th>Interim Meeting</th>
                         </tr>
                     </thead>
-                    <tbody>
-                        {% for meeting in interim_meetings %}
+                    {% if interim_meetings %}
+                        <tbody>
+                            {% for meeting in interim_meetings %}
 
-                            <tr class = "{% cycle 'row1' 'row2' %}">
-                                <td>{{ meeting.group.acronym }}</td>
-                                <td><a href="{% url "ietf.meeting.views.session_details" num=meeting.number acronym=meeting.group.acronym %}">{{ meeting.date }}</a></td>
-                            </tr>
-                        {% endfor %}
-                    </tbody>
+                                <tr class = "{% cycle 'row1' 'row2' %}">
+                                    <td>{{ meeting.group.acronym }}</td>
+                                    <td><a href="{% url "ietf.meeting.views.session_details" num=meeting.number acronym=meeting.group.acronym %}">{{ meeting.date }}</a></td>
+                                </tr>
+                            {% endfor %}
+                        </tbody>
+                    {% endif %}
                 </table>
             </div> <!-- scroll -->
             <div class="button-group">
@@ -89,5 +93,4 @@
 {% endblock %}
 ~
 ~
-~
-
+~
\ No newline at end of file
diff --git a/ietf/secr/templates/proceedings/recording.html b/ietf/secr/templates/proceedings/recording.html
index d6adc3801..943239710 100755
--- a/ietf/secr/templates/proceedings/recording.html
+++ b/ietf/secr/templates/proceedings/recording.html
@@ -56,32 +56,34 @@
                         <th>Edit</th>
                     </tr>
                 </thead>
-                <tbody>
+                {% if sessions %}
+                    <tbody>
 
-                    {% for session in sessions %}
-                        {% if session.recordings %}
-                            {% for recording in session.recordings %}
+                        {% for session in sessions %}
+                            {% if session.recordings %}
+                                {% for recording in session.recordings %}
+                                    <tr>
+                                        <td>{{ session.group.acronym }}</td>
+                                        <td>{{ session.official_timeslotassignment.timeslot.time|date:"m-d H:i" }}</td>
+                                        <td class="document-name" >{{ recording.name }}</td>
+                                        <td><a href="{{ recording.get_href }}">{{ recording.get_href }}</a></td>
+                                        <td><a href="{% url 'ietf.secr.proceedings.views.recording_edit' meeting_num=meeting.number name=recording.name %}">Edit</a></td>
+                                    </tr>
+                                {% endfor %}
+                            {% else %}
                                 <tr>
                                     <td>{{ session.group.acronym }}</td>
                                     <td>{{ session.official_timeslotassignment.timeslot.time|date:"m-d H:i" }}</td>
-                                    <td class="document-name" >{{ recording.name }}</td>
-                                    <td><a href="{{ recording.get_href }}">{{ recording.get_href }}</a></td>
-                                    <td><a href="{% url 'ietf.secr.proceedings.views.recording_edit' meeting_num=meeting.number name=recording.name %}">Edit</a></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
                                 </tr>
-                            {% endfor %}
-                        {% else %}
-                            <tr>
-                                <td>{{ session.group.acronym }}</td>
-                                <td>{{ session.official_timeslotassignment.timeslot.time|date:"m-d H:i" }}</td>
-                                <td></td>
-                                <td></td>
-                                <td></td>
-                            </tr>
-                        {% endif %}
+                            {% endif %}
 
-                    {% endfor %}
+                        {% endfor %}
 
-                </tbody>
+                    </tbody>
+                {% endif %}
             </table>
         </div> <!-- inline-group -->
 
@@ -94,13 +96,15 @@
                             <th>Filename</th>
                         </tr>
                     </thead>
-                    <tbody>
-                        {% for file in unmatched_recordings %}
-                            <tr>
-                                <td>{{ file }}</td>
-                            </tr>
-                        {% endfor %}
-                    </tbody>
+                    {% if unmatched_recordings %}
+                        <tbody>
+                            {% for file in unmatched_recordings %}
+                                <tr>
+                                    <td>{{ file }}</td>
+                                </tr>
+                            {% endfor %}
+                        </tbody>
+                    {% endif %}
                 </table>
             </div> <!-- inline-group -->
         {% endif %}
@@ -112,4 +116,4 @@
 
 {% block footer-extras %}
     {% include "includes/upload_footer.html" %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/roles/main.html b/ietf/secr/templates/roles/main.html
index 84db0c85d..8033709e0 100755
--- a/ietf/secr/templates/roles/main.html
+++ b/ietf/secr/templates/roles/main.html
@@ -50,14 +50,11 @@
         <br>
 
         <div class="inline-related">
-            <h2></h2>
-            <h3><b>Role Details</b></h3>
+            <h3>Role Details</h3>
             <div id="roles-list"></div>
-            <p></p>
         </div> <!-- inline-related -->
 
         <div class="inline-related">
-            <h2></h2>
             <h3>Add Role</h3>
             {% with role_form as form %}
                     {{ role_form.non_field_errors }}
diff --git a/ietf/secr/templates/rolodex/view.html b/ietf/secr/templates/rolodex/view.html
index f3e07bf75..5f1854560 100644
--- a/ietf/secr/templates/rolodex/view.html
+++ b/ietf/secr/templates/rolodex/view.html
@@ -36,21 +36,23 @@
                                 <th>Email</th>
                             </tr>
                         </thead>
-                        <tbody>
-                            {% for role in roles %}
-                                <tr>
-                                    <td>{{ role.name }} </td>
-                                    <td>
-                                        {% if role.group.type.slug == "area" %}
-                                            <a href="{% url "ietf.secr.areas.views.view" name=role.group.acronym %}">{{ role.group.acronym }}{% if role.group.state.slug == "conclude" %} (concluded){% endif %}</a>
-                                        {% else %}
-                                            <a href="{% url 'ietf.secr.groups.views.view' acronym=role.group.acronym %}">{{ role.group.acronym }}{% if role.group.state.slug == "conclude" %} (concluded){% endif %}</a>
-                                        {% endif %}
-                                    </td>
-                                    <td>{{ role.email }}</td>
-                                </tr>
-                            {% endfor %}
-                        </tbody>
+                        {% if roles %}
+                            <tbody>
+                                {% for role in roles %}
+                                    <tr>
+                                        <td>{{ role.name }} </td>
+                                        <td>
+                                            {% if role.group.type.slug == "area" %}
+                                                <a href="{% url "ietf.secr.areas.views.view" name=role.group.acronym %}">{{ role.group.acronym }}{% if role.group.state.slug == "conclude" %} (concluded){% endif %}</a>
+                                            {% else %}
+                                                <a href="{% url 'ietf.secr.groups.views.view' acronym=role.group.acronym %}">{{ role.group.acronym }}{% if role.group.state.slug == "conclude" %} (concluded){% endif %}</a>
+                                            {% endif %}
+                                        </td>
+                                        <td>{{ role.email }}</td>
+                                    </tr>
+                                {% endfor %}
+                            </tbody>
+                        {% endif %}
                     </table>
                 </div> <!-- iniline-related -->
 
diff --git a/ietf/secr/templates/sreq/main.html b/ietf/secr/templates/sreq/main.html
index 0244e9ab9..b62a751db 100755
--- a/ietf/secr/templates/sreq/main.html
+++ b/ietf/secr/templates/sreq/main.html
@@ -39,13 +39,14 @@
                             <span class="required"> (Currently, this group does not plan to hold a session at IETF {{ meeting.number }})</span>
                         {% endif %}
                     </li>
+                {% empty %}
+                    <i>NONE</i>
                 {% endfor %}
             </ul>
         </div> <!-- inline-related -->
         <br>
         <div class="inline-related">
-            <h2></h2>
-            <h3><b>Edit / Cancel Previously Requested Sessions</b></h3>
+            <h3>Edit / Cancel Previously Requested Sessions</h3>
             <p>The list below includes those working groups for which you or your co-chair has requested sessions at the upcoming IETF meeting. You can click on an acronym to initiate changes to a session, or cancel a session.</p>
             <ul>
                 {% for group in scheduled_groups %}
@@ -61,4 +62,4 @@
 
 {% block footer-extras %}
     {% include "includes/sessions_footer.html" %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/static/css/liaisons.css b/ietf/static/css/liaisons.css
index c38b8bbac..81e180a93 100644
--- a/ietf/static/css/liaisons.css
+++ b/ietf/static/css/liaisons.css
@@ -122,14 +122,14 @@ input[id$='DELETE'] {
     display: none;
 }
 
-#id_from_groups + span {
+/*#id_from_groups + span {
     display: none;
 }
 
 #id_to_groups + span {
     display: none;
 }
-
+*/
 .liaison-group-col {
     min-width: 10em;
 }
\ No newline at end of file
diff --git a/ietf/static/js/ipr-edit.js b/ietf/static/js/ipr-edit.js
index 313e86017..7bf1e5c9d 100644
--- a/ietf/static/js/ipr-edit.js
+++ b/ietf/static/js/ipr-edit.js
@@ -27,10 +27,10 @@ $(document)
                 totalField.val(total);
 
                 template.before(el);
-                el.find(".select2-field")
-                    .each(function () {
-                        setupSelect2Field($(this));
-                    });
+                // el.find(".select2-field")
+                //     .each(function () {
+                //         setupSelect2Field($(this));
+                //     });
             });
 
         function updateRevisions() {
diff --git a/ietf/static/js/liaisons.js b/ietf/static/js/liaisons.js
index 224604541..8567c1b32 100644
--- a/ietf/static/js/liaisons.js
+++ b/ietf/static/js/liaisons.js
@@ -101,7 +101,7 @@ var attachmentWidget = {
 
     initTriggers: function () {
         attachmentWidget.config.showOnDisplay.on('click', 'a.removeAttach', attachmentWidget.removeAttachment);
-        attachmentWidget.button.click(attachmentWidget.doAttach);
+        attachmentWidget.button.on("click", attachmentWidget.doAttach);
     },
 
     initFileInput: function () {
@@ -121,8 +121,8 @@ var attachmentWidget = {
             fieldids.push('#' + newfield.attr('id'));
         });
         attachmentWidget.config.fields = $(fieldids.join(","));
-        attachmentWidget.config.fields.change(attachmentWidget.setState);
-        attachmentWidget.config.fields.keyup(attachmentWidget.setState);
+        attachmentWidget.config.fields.on("change", attachmentWidget.setState);
+        attachmentWidget.config.fields.on("keyup", attachmentWidget.setState);
     },
 
     initWidget: function () {
@@ -281,14 +281,10 @@ var liaisonForm = {
     init: function () {
         liaisonForm.form = $(this);
         liaisonForm.initVariables();
-        $('#id_from_groups')
-            .select2();
-        $('#id_to_groups')
-            .select2();
-        liaisonForm.to_groups.change(function () { liaisonForm.updateInfo(false, $(this)); });
-        liaisonForm.from_groups.change(function () { liaisonForm.updateInfo(false, $(this)); });
-        liaisonForm.purpose.change(liaisonForm.updatePurpose);
-        liaisonForm.form.submit(liaisonForm.checkSubmissionDate);
+        liaisonForm.to_groups.on("change", function () { liaisonForm.updateInfo(false, $(this)); });
+        liaisonForm.from_groups.on("change", function () { liaisonForm.updateInfo(false, $(this)); });
+        liaisonForm.purpose.on("change", liaisonForm.updatePurpose);
+        liaisonForm.form.on("submit", liaisonForm.checkSubmissionDate);
         $('.addAttachmentWidget')
             .each(attachmentWidget.initWidget);
 
diff --git a/ietf/static/js/select2.js b/ietf/static/js/select2.js
index bc3bb752d..112551993 100644
--- a/ietf/static/js/select2.js
+++ b/ietf/static/js/select2.js
@@ -18,13 +18,6 @@ $.fn.select2.defaults.set("escapeMarkup", function (m) {
 // JS for ietf.utils.fields.SearchableField subclasses
 window.setupSelect2Field = function (e) {
     var url = e.data("ajax--url");
-    if (!url) {
-        if (!e.attr("disabled")) {
-            console.log("data-ajax--url missing, not enabling select2 on field", e);
-        }
-        return;
-    }
-
     var maxEntries = e.data("max-entries");
     var options = e.data("pre");
     for (var id in options) {
@@ -34,7 +27,7 @@ window.setupSelect2Field = function (e) {
     e.select2({
         multiple: maxEntries !== 1,
         maximumSelectionSize: maxEntries,
-        ajax: {
+        ajax: url ? {
             url: url,
             dataType: "json",
             delay: 250,
@@ -52,8 +45,10 @@ window.setupSelect2Field = function (e) {
                     }
                 };
             }
-        }
+        } : undefined
     });
+
+    console.log(e);
 };
 
 $(document)
diff --git a/ietf/submit/forms.py b/ietf/submit/forms.py
index 0ac825c47..89030e82d 100644
--- a/ietf/submit/forms.py
+++ b/ietf/submit/forms.py
@@ -94,30 +94,30 @@ class SubmissionBaseUploadForm(forms.Form):
 
         if cutoff_00 == cutoff_01:
             if now.date() >= (cutoff_00.date() - meeting.idsubmit_cutoff_warning_days) and now.date() < cutoff_00.date():
-                self.cutoff_warning = ( 'The last submission time for Internet-Drafts before %s is %s.<br/><br/>' % (meeting, cutoff_00_str))
+                self.cutoff_warning = ( 'The last submission time for Internet-Drafts before %s is %s.<br><br>' % (meeting, cutoff_00_str))
             elif now <= cutoff_00:
                 self.cutoff_warning = (
-                    'The last submission time for new Internet-Drafts before the meeting is %s.<br/>'
+                    'The last submission time for new Internet-Drafts before the meeting is %s.<br>'
                     'After that, you will not be able to submit drafts until after %s (IETF-meeting local time)' % (cutoff_00_str, reopen_str, ))
         else:
             if now.date() >= (cutoff_00.date() - meeting.idsubmit_cutoff_warning_days) and now.date() < cutoff_00.date():
-                self.cutoff_warning = ( 'The last submission time for new documents (i.e., version -00 Internet-Drafts) before %s is %s.<br/><br/>' % (meeting, cutoff_00_str) +
-                                        'The last submission time for revisions to existing documents before %s is %s.<br/>' % (meeting, cutoff_01_str) )
+                self.cutoff_warning = ( 'The last submission time for new documents (i.e., version -00 Internet-Drafts) before %s is %s.<br><br>' % (meeting, cutoff_00_str) +
+                                        'The last submission time for revisions to existing documents before %s is %s.<br>' % (meeting, cutoff_01_str) )
             elif now.date() >= cutoff_00.date() and now <= cutoff_01:
                 # We are in the first_cut_off
                 if now < cutoff_00:
                     self.cutoff_warning = (
-                        'The last submission time for new documents (i.e., version -00 Internet-Drafts) before the meeting is %s.<br/>'
+                        'The last submission time for new documents (i.e., version -00 Internet-Drafts) before the meeting is %s.<br>'
                         'After that, you will not be able to submit a new document until after %s (IETF-meeting local time)' % (cutoff_00_str, reopen_str, ))
                 else:  # No 00 version allowed
                     self.cutoff_warning = (
-                        'The last submission time for new documents (i.e., version -00 Internet-Drafts) was %s.<br/>'
-                        'You will not be able to submit a new document until after %s (IETF-meeting local time).<br/><br>'
+                        'The last submission time for new documents (i.e., version -00 Internet-Drafts) was %s.<br>'
+                        'You will not be able to submit a new document until after %s (IETF-meeting local time).<br><br>'
                         'You can still submit a version -01 or higher Internet-Draft until %s' % (cutoff_00_str, reopen_str, cutoff_01_str, ))
                     self.in_first_cut_off = True
         if now > cutoff_01 and now < reopen:
             self.cutoff_warning = (
-                'The last submission time for the I-D submission was %s.<br/><br>'
+                'The last submission time for the I-D submission was %s.<br><br>'
                 'The I-D submission tool will be reopened after %s (IETF-meeting local time).' % (cutoff_01_str, reopen_str))
             self.shutdown = True
 
diff --git a/ietf/submit/templatetags/submit_tags.py b/ietf/submit/templatetags/submit_tags.py
index 465d93213..4b09b8f34 100644
--- a/ietf/submit/templatetags/submit_tags.py
+++ b/ietf/submit/templatetags/submit_tags.py
@@ -29,6 +29,8 @@ def show_submission_files(context, submission):
 
 @register.filter
 def two_pages_decorated_with_errors(submission, errors):
+    if not submission.first_two_pages:
+        return ''
     pages = submission.first_two_pages or ''
     if 'rev' not in list(errors.keys()):
         return mark_safe('<pre>%s</pre>' % escape(pages))
diff --git a/ietf/templates/admin/group/group/send_sdo_reminder.html b/ietf/templates/admin/group/group/send_sdo_reminder.html
index 43baa3ce9..c9d5ed3e4 100644
--- a/ietf/templates/admin/group/group/send_sdo_reminder.html
+++ b/ietf/templates/admin/group/group/send_sdo_reminder.html
@@ -40,7 +40,7 @@
             {% endif %}
 
             <form method="post">{% csrf_token %}
-                <input type="submit" name="send" value="Send reminder" />
+                <input type="submit" name="send" value="Send reminder">
             </form>
         {% endif %}
     </div>
diff --git a/ietf/templates/api/index.html b/ietf/templates/api/index.html
index 82accb076..760b9cef5 100644
--- a/ietf/templates/api/index.html
+++ b/ietf/templates/api/index.html
@@ -154,11 +154,11 @@ $ curl 'https://datatracker.ietf.org/api/v1/doc/document/?limit=0&amp;name__cont
             available for all documents at the relative url <code>doc.json</code>, e.g.,
             <code>{% url 'ietf.doc.views_doc.document_json' name='draft-ietf-poised95-std-proc-3' %}</code>
             <a href="{% url 'ietf.doc.views_doc.document_json' name='draft-ietf-poised95-std-proc-3' %}">
-                <span class="bi bi-box-arrow-up-right"></span>
+                <i class="bi bi-box-arrow-up-right"></i>
             </a>.
             You can also specify an RFC:  <code>{% url 'ietf.doc.views_doc.document_json' name='rfc2026' %}</code>
             <a href="{% url 'ietf.doc.views_doc.document_json' name='rfc2026' %}">
-                <span class="bi bi-box-arrow-up-right"></span>
+                <i class="bi bi-box-arrow-up-right"></i>
             </a>.
             No API key is needed to access this.
         </p>
diff --git a/ietf/templates/base.html b/ietf/templates/base.html
index ba4887891..2623e4a27 100644
--- a/ietf/templates/base.html
+++ b/ietf/templates/base.html
@@ -7,16 +7,16 @@
 {% load django_bootstrap5 %}
 <html lang="en">
     <head>
-        <meta charset="utf-8"/>
-        <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <title>
             {% block title %}No title{% endblock %}
         </title>
-        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+        <meta name="viewport" content="width=device-width, initial-scale=1">
         {% comment Halloween %}
-        <link href='https://fonts.googleapis.com/css?family=IM+Fell+English+SC|IM+Fell+DW+Pica:400,400italic|Nova+Mono|IM+Fell+English:400,400italic&subset=latin-ext,latin' rel='stylesheet' type='text/css'/>
+        <link href='https://fonts.googleapis.com/css?family=IM+Fell+English+SC|IM+Fell+DW+Pica:400,400italic|Nova+Mono|IM+Fell+English:400,400italic&subset=latin-ext,latin' rel='stylesheet' type='text/css'>
         {% endcomment %}
-        <link rel="stylesheet" href="{% static 'ietf/css/ietf.css' %}"/>
+        <link rel="stylesheet" href="{% static 'ietf/css/ietf.css' %}">
         <style>
             {% block morecss %}{% endblock %}
             .leftmenu { width: 13em; }
@@ -24,13 +24,13 @@
         {% block pagehead %}{% endblock %}
         {% if server_mode and server_mode == "production" %}
             <link rel="shortcut icon"
-                  href="{% static 'ietf/images/ietf-icon-blue3.png' %}"/>
+                  href="{% static 'ietf/images/ietf-icon-blue3.png' %}">
         {% else %}
             <link rel="shortcut icon"
-                  href="{% static 'ietf/images/ietf-icon-red3.png' %}"/>
+                  href="{% static 'ietf/images/ietf-icon-red3.png' %}">
         {% endif %}
         <link rel="apple-touch-icon"
-              href="{% static 'ietf/images/apple-touch-icon.png' %}"/>
+              href="{% static 'ietf/images/apple-touch-icon.png' %}">
         <script src="{% static 'ietf/js/ietf.js' %}"></script>
     </head>
     <body {% block bodyAttrs %}{% endblock %} class="position-relative"
@@ -39,7 +39,7 @@
             <div class="container-fluid">
                 <a class="navbar-brand" href="/">
                     <img alt="IETF Logo"
-                         src="{% static 'ietf/images/ietflogo-small-transparent.png' %}"/>
+                         src="{% static 'ietf/images/ietflogo-small-transparent.png' %}">
                     Datatracker
                     {% if server_mode and server_mode != "production" %}Dev Mode{% endif %}
                 </a>
@@ -61,9 +61,9 @@
                            type="text"
                            name="name"
                            placeholder="Document search"
-                           required/>
-                    <input type="hidden" name="activedrafts" value="on"/>
-                    <input type="hidden" name="rfcs" value="on"/>
+                           required>
+                    <input type="hidden" name="activedrafts" value="on">
+                    <input type="hidden" name="rfcs" value="on">
                 </form>
                 <button class="navbar-toggler"
                         type="button"
@@ -72,7 +72,7 @@
                         aria-controls="navbar-collapse"
                         aria-expanded="false"
                         aria-label="Toggle navigation">
-                    <span class="navbar-toggler-icon"></span>
+                    <i class="navbar-toggler-icon"></i>
                 </button>
             </div>
         </nav>
@@ -99,7 +99,7 @@
                     {% block content_end %}{% endblock %}
                 </div>
             </div>
-            <hr />
+            <hr>
             {% block footer %}
                 <footer class="col-md-12 col-sm-12 text-center">
                     <a href="https://www.ietf.org/" class="p-3">IETF</a>
@@ -121,15 +121,15 @@
                         Report a bug:
                         <a href="https://trac.ietf.org/trac/ietfdb/newticket">
                             Tracker
-                            <span class="bi bi-bug"></span>
+                            <i class="bi bi-bug"></i>
                         </a>
                         {% if bugreport_email %}
                             <a href="mailto:{{ bugreport_email }}">
                                 Email
-                                <span class="bi bi-envelope"></span>
+                                <i class="bi bi-envelope"></i>
                             </a>
                         {% endif %}
-                        <br />
+                        <br>
                         {% if python_version %}Python {{ python_version }}{% endif %}
                         {% if django_version %}Django {{ django_version }}{% endif %}
                         <br>
diff --git a/ietf/templates/base/menu.html b/ietf/templates/base/menu.html
index e1ffcad5a..2756e7dd1 100644
--- a/ietf/templates/base/menu.html
+++ b/ietf/templates/base/menu.html
@@ -30,7 +30,7 @@
         </a>
         {% active_groups_menu flavor %}
     </li>
-    {% if flavor == 'top' %}<li class="dropdown-divider"></li>{% endif %}
+    {% if flavor == 'top' %}<li><hr class="dropdown-divider"></li>{% endif %}
     <li {% if flavor == 'top' %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>New work</li>
     <li>
         <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
@@ -50,7 +50,7 @@
             BOF Requests
         </a>
     </li>
-    {% if flavor == 'top' %}<li class="dropdown-divider"></li>{% endif %}
+    {% if flavor == 'top' %}<li><hr class="dropdown-divider"></li>{% endif %}
     <li {% if flavor == 'top' %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>Other groups</li>
     <li>
         <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
@@ -108,7 +108,7 @@
             </a>
         </li>
         {% if user|has_role:"Area Director,Secretariat" %}
-            {% if flavor == 'top' %}<li class="dropdown-divider"></li>{% endif %}
+            {% if flavor == 'top' %}<li><hr class="dropdown-divider"></li>{% endif %}
             <li>
                 <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
                    href="{% url 'ietf.doc.views_status_change.rfc_status_changes' %}">
@@ -116,7 +116,7 @@
                 </a>
             </li>
         {% endif %}
-        {% if flavor == 'top' %}<li class="dropdown-divider"></li>{% endif %}
+        {% if flavor == 'top' %}<li><hr class="dropdown-divider"></li>{% endif %}
         <li>
             <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
                href="{% url 'ietf.doc.views_ballot.irsg_ballot_status' %}">
@@ -124,7 +124,7 @@
             </a>
         </li>
         {% if user|has_role:"WG Chair,RG Chair" %}
-            {% if flavor == 'top' %}<li class="dropdown-divider"></li>{% endif %}
+            {% if flavor == 'top' %}<li><hr class="dropdown-divider"></li>{% endif %}
             <li {% if flavor == 'top' %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>Manage</li>
             <li>
                 <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
@@ -151,7 +151,7 @@
         {% endif %}
         {% if user|has_role:"Review Team Secretary" %}
             {% if flavor == 'top' %}
-                <li class="dropdown-divider">
+                <li><hr class="dropdown-divider">
                 </li>
             {% endif %}
             <li {% if flavor == 'top' %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>
@@ -168,7 +168,7 @@
         {% endif %}
         {% if user|active_nomcoms %}
             {% if flavor == 'top' %}
-                <li class="dropdown-divider">
+                <li><hr class="dropdown-divider">
                 </li>
             {% endif %}
             <li {% if flavor == 'top' %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>
@@ -185,7 +185,7 @@
         {% endif %}
     {% endif %}
     {% if flavor == 'top' %}
-        <li class="dropdown-divider">
+        <li><hr class="dropdown-divider">
         </li>
     {% endif %}
     <li {% if flavor == 'top' %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>
@@ -273,7 +273,7 @@
     </li>
     {% if flavor == 'top' %}
         {% if flavor == 'top' %}
-            <li class="dropdown-divider">
+            <li><hr class="dropdown-divider">
             </li>
         {% endif %}
         <li {% if flavor == 'top' %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>
@@ -288,7 +288,7 @@
     </li>
     {% if flavor == 'top' %}
         {% if flavor == 'top' %}
-            <li class="dropdown-divider">
+            <li><hr class="dropdown-divider">
             </li>
         {% endif %}
         <li {% if flavor == 'top' %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>
@@ -404,14 +404,14 @@
         </a>
     </li>
     {% if flavor == 'top' %}
-        <li class="dropdown-divider">
+        <li><hr class="dropdown-divider">
         </li>
     {% endif %}
     <li>
         <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
            href="https://trac.ietf.org/trac/ietfdb/newticket">
-            <span class="bi bi-bug">
-            </span>
+            <i class="bi bi-bug">
+            </i>
             Report a bug
         </a>
     </li>
diff --git a/ietf/templates/base/menu_user.html b/ietf/templates/base/menu_user.html
index ae56e198d..d4e262b4e 100644
--- a/ietf/templates/base/menu_user.html
+++ b/ietf/templates/base/menu_user.html
@@ -126,7 +126,7 @@
         </li>
     {% endif %}
     {% if user|has_role:"Area Director" %}
-        {% if flavor == "top" %}<li class="dropdown-divider"></li>{% endif %}
+        {% if flavor == "top" %}<li><hr class="dropdown-divider"></li>{% endif %}
         <li {% if flavor == "top" %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>AD dashboard</li>
         <li>
             <a class="dropdown-item {% if flavor != 'top' %} text-wrap link-primary{% endif %}"
@@ -160,7 +160,7 @@
         </li>
     {% endif %}
     {% if user|has_role:"Secretariat" %}
-        {% if flavor == "top" %}<li class="dropdown-divider"></li>{% endif %}
+        {% if flavor == "top" %}<li><hr class="dropdown-divider"></li>{% endif %}
         <li {% if flavor == "top" %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>
             IETF secretariat
         </li>
@@ -197,7 +197,7 @@
     {% endif %}
     {% if user|has_role:"IANA" %}
         {% if flavor == "top" %}
-            <li class="dropdown-divider">
+            <li><hr class="dropdown-divider">
             </li>
         {% endif %}
         <li {% if flavor == "top" %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>
@@ -212,7 +212,7 @@
     {% endif %}
     {% if user|has_role:"RFC Editor" %}
         {% if flavor == "top" %}
-            <li class="dropdown-divider">
+            <li><hr class="dropdown-divider">
             </li>
         {% endif %}
         <li {% if flavor == "top" %}class="dropdown-header"{% else %}class="nav-item fw-bolder"{% endif %}>
@@ -225,4 +225,4 @@
             </a>
         </li>
     {% endif %}
-    {% if flavor == "top" %}</ul>{% endif %}
+    {% if flavor == "top" %}</ul>{% endif %}
\ No newline at end of file
diff --git a/ietf/templates/community/manage_list.html b/ietf/templates/community/manage_list.html
index 929d7ab2f..f1a4ffe7f 100644
--- a/ietf/templates/community/manage_list.html
+++ b/ietf/templates/community/manage_list.html
@@ -58,7 +58,7 @@
     {% else %}
         <p>
             Conveniently track individual documents in your personal list with the track icon
-            <span class="bi bi-bookmark"></span>
+            <i class="bi bi-bookmark"></i>
             in
             <a href="/doc/search/">search results</a>.
         </p>
diff --git a/ietf/templates/doc/ballot_popup.html b/ietf/templates/doc/ballot_popup.html
index 26857678d..8c8c1f483 100644
--- a/ietf/templates/doc/ballot_popup.html
+++ b/ietf/templates/doc/ballot_popup.html
@@ -1,9 +1,9 @@
 {# bs5ok #}
-<!doctype html>
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% origin %}
 {% load ietf_filters %}
+<!doctype html>
 <html lang="en">
     <head>
         <meta charset="utf-8">
diff --git a/ietf/templates/doc/bofreq/bof_requests.html b/ietf/templates/doc/bofreq/bof_requests.html
index f86302e2c..74c000e42 100644
--- a/ietf/templates/doc/bofreq/bof_requests.html
+++ b/ietf/templates/doc/bofreq/bof_requests.html
@@ -49,14 +49,12 @@
                             <td>{{ req.title }}</td>
                             <td>
                                 {% for person in req.responsible %}
-                                    {% person_link person %}
-                                    {% if not forloop.last %},{% endif %}
+                                    {% person_link person %}{% if not forloop.last %},{% endif %}
                                 {% endfor %}
                             </td>
                             <td>
                                 {% for person in req.editors %}
-                                    {% person_link person %}
-                                    {% if not forloop.last %},{% endif %}
+                                    {% person_link person %}{% if not forloop.last %},{% endif %}
                                 {% endfor %}
                             </td>
                         </tr>
diff --git a/ietf/templates/doc/charter/change_state.html b/ietf/templates/doc/charter/change_state.html
index 2ad0e1c53..ff47de511 100644
--- a/ietf/templates/doc/charter/change_state.html
+++ b/ietf/templates/doc/charter/change_state.html
@@ -48,9 +48,9 @@
                 {% csrf_token %}
                 <input type="hidden"
                        name="charter_state"
-                       value="{{ prev_charter_state.pk }}"/>
-                <input type="hidden" name="state" value="{{ prev_state.slug }}" />
-                <input type="submit" value="Back to {{ prev_charter_state.name }}" />
+                       value="{{ prev_charter_state.pk }}">
+                <input type="hidden" name="state" value="{{ prev_state.slug }}">
+                <input type="submit" value="Back to {{ prev_charter_state.name }}">
             </form>
         </div>
     {% endif %}
diff --git a/ietf/templates/doc/charter/review_announcement_text.html b/ietf/templates/doc/charter/review_announcement_text.html
index 8152278c9..1ed8a757c 100644
--- a/ietf/templates/doc/charter/review_announcement_text.html
+++ b/ietf/templates/doc/charter/review_announcement_text.html
@@ -22,15 +22,15 @@
             <input type="submit"
                    class="btn btn-primary"
                    name="send_annc_only"
-                   value="Send only to IETF-Announce"/>
+                   value="Send only to IETF-Announce">
             <input type="submit"
                    class="btn btn-primary"
                    name="send_nw_only"
-                   value="Send only to New-Work"/>
+                   value="Send only to New-Work">
             <input type="submit"
                    class="btn btn-primary"
                    name="send_both"
-                   value="Send to both"/>
+                   value="Send to both">
         {% endif %}
         <a class="btn btn-secondary float-end" href="{{ back_url }}">Back</a>
     </form>
diff --git a/ietf/templates/doc/charter/submit.html b/ietf/templates/doc/charter/submit.html
index 07334cf6c..5eb06851c 100644
--- a/ietf/templates/doc/charter/submit.html
+++ b/ietf/templates/doc/charter/submit.html
@@ -44,6 +44,7 @@
                 </td>
             </tr>
         </tbody>
+        {% if group.personnel %}
         <tbody class="meta border-top">
             {% for slug, label, roles in group.personnel %}
                 <tr>
@@ -62,6 +63,7 @@
                 </tr>
             {% endfor %}
         </tbody>
+        {% endif %}
         {% if group.list_email %}
             <tbody class="meta border-top">
                 <tr>
diff --git a/ietf/templates/doc/document_ballot_content.html b/ietf/templates/doc/document_ballot_content.html
index c4321e195..4bc957a71 100644
--- a/ietf/templates/doc/document_ballot_content.html
+++ b/ietf/templates/doc/document_ballot_content.html
@@ -123,17 +123,17 @@
                                     {% if not p.for_current_revision %}for -{{ p.get_dochistory.rev }}{% endif %}
                                     )
                                     {% if p.send_email %}
-                                        <span class="bi bi-envelope float-end"
-                                              title="Email requested to be sent for this discuss"></span>
+                                        <i class="bi bi-envelope float-end"
+                                              title="Email requested to be sent for this discuss"></i>
                                     {% elif p.any_email_sent == True %}
-                                        <span class="bi bi-envelope float-end"
-                                              title="Email requested to be sent for earlier discuss"></span>
+                                        <i class="bi bi-envelope float-end"
+                                              title="Email requested to be sent for earlier discuss"></i>
                                     {% elif p.any_email_sent == False %}
-                                        <span class="bi bi-chat-o float-end"
-                                              title="No email send requests for this discuss"></span>
+                                        <i class="bi bi-chat-o float-end"
+                                              title="No email send requests for this discuss"></i>
                                     {% else %}
-                                        <span class="bi bi-chat-o float-end"
-                                              title="No email send requests for this discuss"></span>
+                                        <i class="bi bi-chat-o float-end"
+                                              title="No email send requests for this discuss"></i>
                                     {% endif %}
                                 </div>
                             </div>
@@ -150,17 +150,17 @@
                                     {% if not p.for_current_revision %}for -{{ p.get_dochistory.rev }}{% endif %}
                                     )
                                     {% if p.send_email %}
-                                        <span class="bi bi-envelope-check float-end"
-                                              title="Email requested to be sent for this comment"></span>
+                                        <i class="bi bi-envelope-check float-end"
+                                              title="Email requested to be sent for this comment"></i>
                                     {% elif p.any_email_sent == True %}
-                                        <span class="bi bi-envelope-plus float-end"
-                                              title="Email requested to be sent for earlier comment"></span>
+                                        <i class="bi bi-envelope-plus float-end"
+                                              title="Email requested to be sent for earlier comment"></i>
                                     {% elif p.any_email_sent == False %}
-                                        <span class="bi bi-envelope-dash float-end"
-                                              title="No email send requests for this comment"></span>
+                                        <i class="bi bi-envelope-dash float-end"
+                                              title="No email send requests for this comment"></i>
                                     {% else %}
-                                        <span class="bi bi-envelope-exclamation float-end"
-                                              title="No ballot position send log available"></span>
+                                        <i class="bi bi-envelope-exclamation float-end"
+                                              title="No ballot position send log available"></i>
                                     {% endif %}
                                 </div>
                             </div>
@@ -203,19 +203,19 @@
                                     )
                                 {% endif %}
                                 {% if p.send_email %}
-                                    <span class="bi bi-envelope float-end"
-                                          title="Email requested to be sent for this ballot position"></span>
+                                    <i class="bi bi-envelope float-end"
+                                          title="Email requested to be sent for this ballot position"></i>
                                 {% elif p.any_email_sent == True %}
-                                    <span class="bi bi-envelope float-end"
-                                          title="Email requested to be sent for earlier ballot position"></span>
+                                    <i class="bi bi-envelope float-end"
+                                          title="Email requested to be sent for earlier ballot position"></i>
                                 {% elif p.any_email_sent == False %}
-                                    <span class="bi bi-chat-o float-end"
-                                          title="No email send requests for this ballot position"></span>
+                                    <i class="bi bi-chat-o float-end"
+                                          title="No email send requests for this ballot position"></i>
                                 {% else %}
                                     <div class="float-end small italic"
                                          title="No ballot position send log available">
                                         No email
-                                        <br />
+                                        <br>
                                         send info
                                     </div>
                                 {% endif %}
diff --git a/ietf/templates/doc/document_bofreq.html b/ietf/templates/doc/document_bofreq.html
index 7e1c68b23..8a63df48a 100644
--- a/ietf/templates/doc/document_bofreq.html
+++ b/ietf/templates/doc/document_bofreq.html
@@ -4,7 +4,7 @@
 {% load origin %}
 {% load static %}
 {% load ietf_filters %}
-{% load person_filters %}
+{% load person_filters textfilters %}
 {% block title %}{{ doc.title }}{% endblock %}
 {% block content %}
     {% origin %}
@@ -73,8 +73,7 @@
                 </td>
                 <td>
                     {% for editor in editors %}
-                        {% person_link editor %}
-                        {% if not forloop.last %},{% endif %}
+                        {% person_link editor %}{% if not forloop.last %},{% endif %}
                     {% endfor %}
                 </td>
             </tr>
@@ -90,8 +89,7 @@
                 </td>
                 <td>
                     {% for leader in responsible %}
-                        {% person_link leader %}
-                        {% if not forloop.last %},{% endif %}
+                        {% person_link leader %}{% if not forloop.last %},{% endif %}
                     {% endfor %}
                 </td>
             </tr>
@@ -158,7 +156,7 @@
             {{ doc.name }}-{{ doc.rev }}
         </div>
         <div class="card-body">
-            {{ content|sanitize|safe }}
+            {{ content|linkify|urlize_ietf_docs }}
         </div>
     </div>
 {% endblock %}
diff --git a/ietf/templates/doc/document_charter.html b/ietf/templates/doc/document_charter.html
index d34cd34f8..3b3d5c374 100644
--- a/ietf/templates/doc/document_charter.html
+++ b/ietf/templates/doc/document_charter.html
@@ -4,7 +4,7 @@
 {% load origin %}
 {% load static %}
 {% load ietf_filters %}
-{% load person_filters %}
+{% load person_filters textfilters %}
 {% block pagehead %}
     <link rel="alternate"
           type="application/atom+xml"
@@ -227,8 +227,7 @@
                 {{ doc.canonical_name }}-{{ doc.rev }}
             </div>
             <div class="card-body">
-                {# this content is already wrapped in 'pre' #}
-                {{ content|sanitize|maybewordwrap|safe }}
+                <pre>{{ content|maybewordwrap|linkify|urlize_ietf_docs }}</pre>
             </div>
         </div>
     {% endif %}
diff --git a/ietf/templates/doc/document_conflict_review.html b/ietf/templates/doc/document_conflict_review.html
index b909a79d9..38e88740d 100644
--- a/ietf/templates/doc/document_conflict_review.html
+++ b/ietf/templates/doc/document_conflict_review.html
@@ -139,7 +139,7 @@
                 {{ doc.name }}-{{ doc.rev }}
             </div>
             <div class="card-body">
-                {{ content|sanitize|maybewordwrap|safe }}
+                <pre>{{ content|maybewordwrap|linkify|urlize_ietf_docs }}</pre>
             </div>
         </div>
     {% endif %}
diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index 1482e8eed..f6563a03a 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -96,8 +96,7 @@
                 <td>
                     {# Implementation that uses the current primary email for each author #}
                     {% for author in doc.authors %}
-                        {% person_link author %}
-                        {% if not forloop.last %},{% endif %}
+                        {% person_link author %}{% if not forloop.last %},{% endif %}
                     {% endfor %}
                 </td>
             </tr>
@@ -245,8 +244,8 @@
                     {% if file_urls %}
                         {% for label, url in file_urls %}
                             <a class="btn btn-primary btn-sm" href="{{ url }}">
-                                <span class="bi bi-file-{% if label == "pdf" %}pdf{% elif label == "xml" or label == "htmlized" %}code{% elif label == "bibtex" %}ruled{% elif label == "plain text" %}text{% endif %}">
-                                </span>
+                                <i class="bi bi-file-{% if label == "pdf" %}pdf{% elif label == "xml" or label == "htmlized" %}code{% elif label == "bibtex" %}ruled{% elif label == "plain text" %}text{% endif %}">
+                                </i>
                                 {{ label }}
                             </a>
                         {% endfor %}
@@ -306,8 +305,7 @@
                         {% endfor %}
                         {% if no_review_from_teams %}
                             {% for team in no_review_from_teams %}
-                                {{ team.acronym.upper }}
-                                {% if not forloop.last %},{% endif %}
+                                {{ team.acronym.upper }}{% if not forloop.last %},{% endif %}
                             {% endfor %}
                             will not review this version
                         {% endif %}
@@ -316,23 +314,23 @@
                                 {% if can_request_review %}
                                 <a class="btn btn-primary btn-sm"
                                    href="{% url "ietf.doc.views_review.request_review" doc.name %}">
-                                    <span class="bi bi-check-circle">
-                                    </span>
+                                    <i class="bi bi-check-circle">
+                                    </i>
                                     Request review
                                 </a>
                                 {% endif %}
                                 {% 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">
-                                        </span>
+                                        <i class="bi bi-pencil-square">
+                                        </i>
                                         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">
-                                        </span>
+                                        <i class="bi bi-pencil-square">
+                                        </i>
                                         Submit unsolicited review
                                     </a>
                                 {% endif %}
@@ -444,16 +442,14 @@
                                 <span title="{{ m.desc }} ({{ m.group.acronym }} milestone)"
                                       class="milestone">
                                     {{ m.due|date:"M Y" }} - {{m }}
-                                </span>
-                                {% if not forloop.last %},{% endif %}
+                                </span>{% if not forloop.last %},{% endif %}
                             {% endfor %}
                             )
                         {% endif %}
                         {% if stream_tags %}
                             <div class="stream-tags">
                                 {% for tag in stream_tags %}
-                                    {{ tag.name }}
-                                    {% if not forloop.last %},{% endif %}
+                                    {{ tag.name }}{% if not forloop.last %},{% endif %}
                                 {% endfor %}
                             </div>
                         {% endif %}
@@ -512,12 +508,11 @@
                         {% if presentations %}
                             {% for pres in presentations %}
                                 <a href="{% url 'ietf.meeting.views.agenda_ical' num=pres.session.meeting.number session_id=pres.session.id %}">
-                                    <span class="bi bi-calendar">
-                                    </span>
+                                    <i class="bi bi-calendar">
+                                    </i>
                                 </a>
                                 {{ pres.session.short_name }} at {{ pres.session.meeting }}
-                                {% if pres.rev and pres.rev != doc.rev %}(version -{{ pres.rev }}){% endif %}
-                                {% if not forloop.last %},{% endif %}
+                                {% if pres.rev and pres.rev != doc.rev %}(version -{{ pres.rev }}){% endif %}{% if not forloop.last %},{% endif %}
                             {% endfor %}
                         {% else %}
                             <span class="text-muted">
@@ -674,8 +669,8 @@
                                     {% if can_edit %}
                                         <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>
+                                            <i class="bi bi-envelope">
+                                            </i>
                                             Send reminder email
                                         </a>
                                     {% endif %}
@@ -939,8 +934,8 @@
                     {% endif %}
                 </tbody>
             {% endif %}
-            <tbody class="meta border-top">
-                {% if rfc_editor_state %}
+            {% if rfc_editor_state %}
+                <tbody class="meta border-top">
                     <tr>
                         <th>
                             RFC Editor
@@ -981,29 +976,29 @@
                         <td>
                         </td>
                     </tr>
-                {% endif %}
-            </tbody>
+                </tbody>
+            {% endif %}
         </table>
         <div class="buttonlist">
             <a class="btn btn-primary btn-sm"
                href="mailto:{{ doc.name }}@ietf.org?subject=Mail%20regarding%20{{ doc.name }}">
-                <span class="bi bi-envelope">
-                </span>
+                <i class="bi bi-envelope">
+                </i>
                 Email authors
             </a>
             {% if doc.group.type.slug == 'wg' or doc.group.type.slug == 'rg' %}
                 <a class="btn btn-primary btn-sm"
                    href="mailto:{{ doc.group.list_email }}?subject=Mail%20regarding%20{{ doc.name }}">
-                    <span class="bi bi-envelope">
-                    </span>
+                    <i class="bi bi-envelope">
+                    </i>
                     Email {{ doc.group.type }}
                 </a>
             {% endif %}
             <a class="btn btn-primary btn-sm"
                href="{% url "ietf.ipr.views.search" %}?submit=draft&amp;id={{ doc.name }}"
                rel="nofollow">
-                <span class="bi bi-lightning">
-                </span>
+                <i class="bi bi-lightning">
+                </i>
                 IPR
                 {% if doc.related_ipr %}
                     <span class="badge">
@@ -1014,23 +1009,23 @@
             <a class="btn btn-primary btn-sm"
                href="{% url 'ietf.doc.views_doc.document_references' doc.canonical_name %}"
                rel="nofollow">
-                <span class="bi bi-arrow-left">
-                </span>
+                <i class="bi bi-arrow-left">
+                </i>
                 References
             </a>
             <a class="btn btn-primary btn-sm"
                href="{% url 'ietf.doc.views_doc.document_referenced_by' doc.canonical_name %}"
                rel="nofollow">
-                <span class="bi bi-arrow-right">
-                </span>
+                <i class="bi bi-arrow-right">
+                </i>
                 Referenced by
             </a>
             <a class="btn btn-primary btn-sm"
                href="{{ settings.IDNITS_BASE_URL }}?url=https://www.ietf.org/archive/id/{{ doc.filename_with_rev }}"
                rel="nofollow"
                target="_blank">
-                <span class="bi bi-exclamation">
-                </span>
+                <i class="bi bi-exclamation">
+                </i>
                 Nits
             </a>
             <div class="dropdown inline">
@@ -1039,11 +1034,11 @@
                         id="ddSearchMenu"
                         data-bs-toggle="dropdown"
                         aria-expanded="true">
-                    <span class="bi bi-search">
-                    </span>
+                    <i class="bi bi-search">
+                    </i>
                     Search lists
-                    <span class="caret">
-                    </span>
+                    <i class="caret">
+                    </i>
                 </button>
                 <ul class="dropdown-menu" role="menu">
                     <li role="presentation">
@@ -1078,15 +1073,15 @@
                 <a class="btn btn-primary btn-sm track-untrack-doc {% if not doc.tracked_in_personal_community_list %}hide{% endif %}"
                    href="{% url "ietf.community.views.untrack_document" username=user.username name=doc.name %}"
                    title="Remove from your personal ID list">
-                    <span class="bi bi-bookmark-check-fill">
-                    </span>
+                    <i class="bi bi-bookmark-check-fill">
+                    </i>
                     Untrack
                 </a>
                 <a class="btn btn-primary btn-sm track-untrack-doc {% if doc.tracked_in_personal_community_list %}hide{% endif %}"
                    href="{% url "ietf.community.views.track_document" username=user.username name=doc.name %}"
                    title="Add to your personal ID list">
-                    <span class="bi bi-bookmark">
-                    </span>
+                    <i class="bi bi-bookmark">
+                    </i>
                     Track
                 </a>
             {% endif %}
@@ -1094,15 +1089,15 @@
                 <a class="btn btn-primary btn-sm review-wish-add-remove-doc ajax {% if not doc.has_review_wish %}hide{% endif %}"
                    href="{% url "ietf.doc.views_review.review_wishes_remove" name=doc.name %}?next={{ request.get_full_path|urlencode }}"
                    title="Remove from your review wishes for all teams">
-                    <span class="bi bi-chats">
-                    </span>
+                    <i class="bi bi-chats">
+                    </i>
                     Remove review wishes
                 </a>
                 <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">
-                    </span>
+                    <i class="bi bi-chats">
+                    </i>
                     Add review wish
                 </a>
             {% endif %}
@@ -1138,13 +1133,13 @@
                     {% endif %}
                 </div>
                 <div class="card-body">
-                    {{ content|sanitize|safe }}
+                    <pre>{{ content|sanitize|safe|default:"(Unavailable)" }}</pre>
                 </div>
             </div>
             {% if split_content %}
                 <a class="btn btn-primary my-3" href="?include_text=1">
-                    <span class="bi bi-caret-down">
-                    </span>
+                    <i class="bi bi-caret-down">
+                    </i>
                     Show full document text
                 </a>
             {% endif %}
@@ -1153,7 +1148,7 @@
                 <div class="card-header bg-warning">
                     <b>This Internet-Draft is no longer active. A copy of
                     the expired Internet-Draft can be found at:</b>
-                    <br />
+                    <br>
                     <a href="{{ doc.get_href }}">
                         {{ doc.get_href }}
                     </a>
diff --git a/ietf/templates/doc/document_history.html b/ietf/templates/doc/document_history.html
index 02ac71203..b4fc67770 100644
--- a/ietf/templates/doc/document_history.html
+++ b/ietf/templates/doc/document_history.html
@@ -11,7 +11,7 @@
 {% block pagehead %}
     <link rel="alternate"
           type="application/atom+xml"
-          href="/feed/document-changes/{{ doc.name }}/"/>
+          href="/feed/document-changes/{{ doc.name }}/">
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
 {% endblock %}
 {% block content %}
@@ -104,7 +104,7 @@
         <div class="buttonlist">
             <a class="btn btn-primary"
                href="{% url 'ietf.doc.views_doc.add_comment' name=doc.name %}">
-                <span class="bi bi-plus"></span>
+                <i class="bi bi-plus"></i>
                 Add comment
             </a>
         </div>
diff --git a/ietf/templates/doc/document_material.html b/ietf/templates/doc/document_material.html
index 10f6cf73f..a9452f042 100644
--- a/ietf/templates/doc/document_material.html
+++ b/ietf/templates/doc/document_material.html
@@ -3,7 +3,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load static %}
-{% load ietf_filters %}
+{% load ietf_filters textfilters %}
 {% block title %}{{ doc.title }}{% endblock %}
 {% block content %}
     {% origin %}
@@ -92,8 +92,7 @@
                             {% 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 %}
+                                    {% if pres.rev != doc.rev %}(version -{{ pres.rev }}){% endif %}{% if not forloop.last %},{% endif %}
                                 {% endfor %}
                             {% else %}
                                 None
@@ -124,7 +123,7 @@
                 {% if content_is_html %}
                     {{ content|sanitize|safe }}
                 {% else %}
-                    <pre>{{ content|sanitize|maybewordwrap|safe }}</pre>
+                    <pre>{{ content|maybewordwrap|linkify|urlize_ietf_docs }}</pre>
                 {% endif %}
             {% else %}
                 Not available as plain text.
diff --git a/ietf/templates/doc/document_referenced_by.html b/ietf/templates/doc/document_referenced_by.html
index a8a7981cf..be4d6f611 100644
--- a/ietf/templates/doc/document_referenced_by.html
+++ b/ietf/templates/doc/document_referenced_by.html
@@ -54,13 +54,13 @@
                             <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>
+                                <i class="bi bi-arrow-left"></i>
                                 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>
+                                <i class="bi bi-arrow-right"></i>
                                 Referenced by
                             </a>
                         </td>
diff --git a/ietf/templates/doc/document_references.html b/ietf/templates/doc/document_references.html
index dbf9d1ff2..ce208ed6b 100644
--- a/ietf/templates/doc/document_references.html
+++ b/ietf/templates/doc/document_references.html
@@ -41,13 +41,13 @@
                             <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>
+                                <i class="bi bi-arrow-left"></i>
                                 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>
+                                <i class="bi bi-arrow-right"></i>
                                 Referenced by
                             </a>
                         </td>
diff --git a/ietf/templates/doc/document_review.html b/ietf/templates/doc/document_review.html
index 77662d749..a91cc1045 100644
--- a/ietf/templates/doc/document_review.html
+++ b/ietf/templates/doc/document_review.html
@@ -14,35 +14,37 @@
     {% if doc.rev != latest_rev %}
         <div class="alert alert-warning my-3">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>
-                    <th>State</th>
-                    <td class="edit"></td>
-                    <td>{{ doc.get_state.name }}</td>
-                </tr>
-            {% endif %}
-            {% if other_reviews %}
-                <tr>
-                    <th></th>
-                    <th>Other reviews</th>
-                    <td class="edit"></td>
-                    <td>
-                        {% for review_assignment in other_reviews %}
-                            {% include "doc/review_assignment_summary.html" with current_doc_name=review_assignemnt.review_request.doc.name current_rev=review_assignment.reviewed_rev %}
-                        {% endfor %}
-                    </td>
-                </tr>
-            {% endif %}
-        </tbody>
-    </table>
+    {% if doc.get_state_slug != "active" or other_reviews %}
+        <table class="table table-sm table-borderless">
+            <tbody class="meta border-top">
+                {% if doc.get_state_slug != "active" %}
+                    <tr>
+                        <th></th>
+                        <th>State</th>
+                        <td class="edit"></td>
+                        <td>{{ doc.get_state.name }}</td>
+                    </tr>
+                {% endif %}
+                {% if other_reviews %}
+                    <tr>
+                        <th></th>
+                        <th>Other reviews</th>
+                        <td class="edit"></td>
+                        <td>
+                            {% for review_assignment in other_reviews %}
+                                {% include "doc/review_assignment_summary.html" with current_doc_name=review_assignemnt.review_request.doc.name current_rev=review_assignment.reviewed_rev %}
+                            {% endfor %}
+                        </td>
+                    </tr>
+                {% endif %}
+            </tbody>
+        </table>
+    {% endif %}
     {% if doc.rev and content != None %}
         <div class="card mt-5">
             <div class="card-header">{{ doc.name }}-{{ doc.rev }}</div>
             <div class="card-body">
-                <pre class="pasted">{{ content|linkify|urlize_ietf_docs }}</pre>
+                <pre class="pasted">{{ content|maybewordwrap|linkify|urlize_ietf_docs }}</pre>
             </div>
         </div>
     {% endif %}
diff --git a/ietf/templates/doc/document_status_change.html b/ietf/templates/doc/document_status_change.html
index ae378e90d..df2b1a707 100644
--- a/ietf/templates/doc/document_status_change.html
+++ b/ietf/templates/doc/document_status_change.html
@@ -53,8 +53,7 @@
                     <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 %}
+                            {{ rel.target.document.canonical_name|upper|urlize_ietf_docs }}{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </td>
                 </tr>
@@ -164,7 +163,7 @@
                 {{ doc.name }}-{{ doc.rev }}
             </div>
             <div class="card-body">
-                <pre>   {{ content|sanitize|maybewordwrap|safe }}</pre>
+                <pre>{{ content|maybewordwrap|linkify|urlize_ietf_docs }}</pre>
             </div>
         </div>
     {% endif %}
diff --git a/ietf/templates/doc/drafts_in_iesg_process.html b/ietf/templates/doc/drafts_in_iesg_process.html
index 611abb4b7..1403be1a1 100644
--- a/ietf/templates/doc/drafts_in_iesg_process.html
+++ b/ietf/templates/doc/drafts_in_iesg_process.html
@@ -56,8 +56,7 @@
                                 <br>
                                 Action holder{{ doc.documentactionholder_set.all|pluralize }}:
                                 {% 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 %} {{ action_holder|action_holder_badge }}{% if not forloop.last %},{% endif %}
                                 {% endfor %}
                             {% endif %}
                             {% if doc.note %}
diff --git a/ietf/templates/doc/edit_authors.html b/ietf/templates/doc/edit_authors.html
index 21e95fca6..1154ae904 100644
--- a/ietf/templates/doc/edit_authors.html
+++ b/ietf/templates/doc/edit_authors.html
@@ -29,7 +29,7 @@
             {% for form in formset %}
                 <div class="card author-panel mb-3">
                     <div role="button" class="handle card-header">
-                        <span class="bi bi-list"></span>
+                        <i class="bi bi-list"></i>
                     </div>
                     <div class="card-body draggable">
                         <div class="form-horizontal">{% bootstrap_form form layout='horizontal' %}</div>
@@ -40,7 +40,7 @@
         <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>
+                    <i class="bi bi-list"></i>
                 </div>
                 <div class="card-body draggable">
                     <div class="form-horizontal">{% bootstrap_form formset.empty_form layout='horizontal' %}</div>
diff --git a/ietf/templates/doc/frontpage.html b/ietf/templates/doc/frontpage.html
index 039cef0bd..214f093d5 100644
--- a/ietf/templates/doc/frontpage.html
+++ b/ietf/templates/doc/frontpage.html
@@ -23,7 +23,7 @@
                 <p>
                     The IETF Datatracker is the day-to-day front-end to the IETF database for people
                     who work on IETF standards.
-                    <br />
+                    <br>
                     It contains data about the documents, working groups,
                     meetings, agendas, minutes, presentations, and more, of the IETF.
                 </p>
diff --git a/ietf/templates/doc/irsg_ballot_status.html b/ietf/templates/doc/irsg_ballot_status.html
index acc215b83..155b32a84 100644
--- a/ietf/templates/doc/irsg_ballot_status.html
+++ b/ietf/templates/doc/irsg_ballot_status.html
@@ -18,14 +18,16 @@
                 <th data-sort="status">Status</th>
             </tr>
         </thead>
-        <tbody>
-            {% for doc in docs %}
-                <tr>
-                    <td>{{ doc.displayname_with_link }}</td>
-                    {% include "doc/search/status_columns.html" %}
-                </tr>
-            {% endfor %}
-        </tbody>
+        {% if docs %}
+            <tbody>
+                {% for doc in docs %}
+                    <tr>
+                        <td>{{ doc.displayname_with_link }}</td>
+                        {% include "doc/search/status_columns.html" %}
+                    </tr>
+                {% endfor %}
+            </tbody>
+        {% endif %}
     </table>
 {% endblock %}
 {% block js %}
diff --git a/ietf/templates/doc/remind_action_holders.html b/ietf/templates/doc/remind_action_holders.html
index 63319795c..54576158d 100644
--- a/ietf/templates/doc/remind_action_holders.html
+++ b/ietf/templates/doc/remind_action_holders.html
@@ -20,10 +20,8 @@
             This reminder will be sent to
             {% for person in doc.action_holders.all %}
                 {% if forloop.last and not forloop.first %}and{% endif %}
-                {%  person_link person %}
-                {% if not forloop.last %},{% endif %}
-            {% endfor %}
-            .
+                {%  person_link person %}{% if not forloop.last %},{% endif %}
+            {% endfor %}.
         </p>
         <button type="submit"
                 class="btn btn-primary"
diff --git a/ietf/templates/doc/review/complete_review.html b/ietf/templates/doc/review/complete_review.html
index 5cf08c2af..611fd6fd4 100644
--- a/ietf/templates/doc/review/complete_review.html
+++ b/ietf/templates/doc/review/complete_review.html
@@ -117,10 +117,10 @@
                             <div class="list-group"></div>
                         </div>
                         <div class="error alert alert-warning visually-hidden my-3">
-                            <span class="content"></span>
+                            <span class="content">&nbsp;</span>
                             <span class="visually-hidden try-yourself">
                                 (searched for
-                                <a class="query-url" href="#">"<span class="query"></span>"</a>,
+                                <a class="query-url" href="#">"<span class="query">&nbsp;</span>"</a>,
                                 corresponding
                                 <a class="query-data-url" href="#">export</a>).
                             </span>
@@ -137,9 +137,9 @@
         {% spaceless %}
             <div class="template" style="display:none">
                 <button type="button" class="mail-archive-search-result list-group-item">
-                    <small class="date float-end"></small>
-                    <small class="from float-end"></small>
-                    <span class="subject"></span>
+                    <small class="date float-end">&nbsp;</small>
+                    <small class="from float-end">&nbsp;</small>
+                    <span class="subject">&nbsp;</span>
                 </button>
             </div>
         {% endspaceless %}
diff --git a/ietf/templates/doc/review/request_info.html b/ietf/templates/doc/review/request_info.html
index 4ffc6392f..f667e56a3 100644
--- a/ietf/templates/doc/review/request_info.html
+++ b/ietf/templates/doc/review/request_info.html
@@ -59,7 +59,7 @@
                 {% 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>
+                        <i class="bi bi-pencil"></i>
                         Edit
                     </a>
                 {% endif %}
@@ -83,8 +83,7 @@
                 <th>Authors</th>
                 <td>
                     {% for author in review_req.doc.authors %}
-                        {% person_link author %}
-                        {% if not forloop.last %},{% endif %}
+                        {% person_link author %}{% if not forloop.last %},{% endif %}
                     {% endfor %}
                 </td>
             </tr>
@@ -95,8 +94,7 @@
                 <th>WG chairs</th>
                 <td>
                     {% for chair in wg_chairs %}
-                        {% person_link chair %}
-                        {% if not forloop.last %},{% endif %}
+                        {% person_link chair %}{% if not forloop.last %},{% endif %}
                     {% endfor %}
                 </td>
             </tr>
@@ -160,8 +158,8 @@
                     {% 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>
+                            <i class="bi bi-pencil">
+                            </i>
                             Edit comment
                         </a>
                     {% endif %}
@@ -192,8 +190,8 @@
                                 {% 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-x-circle">
-                                        </span>
+                                        <i class="bi bi-x-circle">
+                                        </i>
                                         Reject
                                     </a>
                                 {% endif %}
@@ -206,8 +204,8 @@
                                                 type="submit"
                                                 name="action"
                                                 value="accept">
-                                            <span class="bi bi-check">
-                                            </span>
+                                            <i class="bi bi-check">
+                                            </i>
                                             Accept
                                         </button>
                                     </form>
@@ -254,8 +252,8 @@
                             {% 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">
-                                    </span>
+                                    <i class="bi bi-pencil">
+                                    </i>
                                     {% if assignment.state_id == "assigned" or assignment.state_id == "accepted" %}
                                         Complete review
                                     {% else %}
@@ -267,14 +265,14 @@
                                 {% 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-question-circle">
-                                        </span>
+                                        <i class="bi bi-question-circle">
+                                        </i>
                                         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-x-circle">
-                                        </span>
+                                        <i class="bi bi-x-circle">
+                                        </i>
                                         Withdraw
                                     </a>
                                 {% endif %}
@@ -342,8 +340,8 @@
 {% if can_assign_reviewer %}
     <a class="btn btn-primary"
        href="{% url "ietf.doc.views_review.assign_reviewer" name=doc.name request_id=review_req.pk %}">
-        <span class="bi bi-forward">
-        </span>
+        <i class="bi bi-forward">
+        </i>
         Assign reviewer
     </a>
 {% endif %}
\ No newline at end of file
diff --git a/ietf/templates/doc/review/review_request.html b/ietf/templates/doc/review/review_request.html
index 8a55de263..b4e3d62b8 100644
--- a/ietf/templates/doc/review/review_request.html
+++ b/ietf/templates/doc/review/review_request.html
@@ -17,7 +17,7 @@
     {% if can_close_request %}
         <a class="btn btn-danger"
            href="{% url "ietf.doc.views_review.close_request" name=doc.name request_id=review_req.pk %}">
-            <span class="bi bi-x-circle"></span>
+            <i class="bi bi-x-circle"></i>
             Close request
         </a>
     {% endif %}
@@ -31,17 +31,15 @@
                     <th data-sort="description">Description</th>
                 </tr>
             </thead>
-            <tbody>
-                {% for h in history %}
-                    {% if h.history_change_reason %}
-                        <tr>
-                            <td>{{ h.history_date|date }}</td>
-                            <td>{% person_link h.history_user.person %}</td>
-                            <td>{{ h.history_change_reason }}</td>
-                        </tr>
-                    {% endif %}
-                {% endfor %}
-            </tbody>
+            {% for h in history %}
+                {% if h.history_change_reason %}
+                    <tr>
+                        <td>{{ h.history_date|date }}</td>
+                        <td>{% person_link h.history_user.person %}</td>
+                        <td>{{ h.history_change_reason }}</td>
+                    </tr>
+                {% endif %}
+            {% endfor %}
         </table>
     </div>
 {% endblock %}
diff --git a/ietf/templates/doc/review/review_wishes_remove.html b/ietf/templates/doc/review/review_wishes_remove.html
index e2994752a..c6f3fbf17 100644
--- a/ietf/templates/doc/review/review_wishes_remove.html
+++ b/ietf/templates/doc/review/review_wishes_remove.html
@@ -7,8 +7,10 @@
     {% origin %}
     <h1>
         Remove review wish
-        <br>
-        <small class="text-muted">{{ doc.name }}</small>
+        {% if doc.name %}
+            <br>
+            <small class="text-muted">{{ doc.name }}</small>
+        {% endif %}
     </h1>
     <form class="my-3" method="post">
         {% csrf_token %}
diff --git a/ietf/templates/doc/search/search_form.html b/ietf/templates/doc/search/search_form.html
index 8f1761008..4d9162ada 100644
--- a/ietf/templates/doc/search/search_form.html
+++ b/ietf/templates/doc/search/search_form.html
@@ -12,7 +12,7 @@
         {{ form.name|add_class:"form-control"|attr:"placeholder:Document name/title/RFC number" }}
         <span class="input-group-btn">
             <button class="btn btn-primary" type="submit">
-                <span class="bi bi-search"/>
+                <i class="bi bi-search"></i>
                 Search
             </button>
         </span>
@@ -59,7 +59,7 @@
                                            {% if value in form.doctypes.value %}checked{% endif %}
                                            name="doctypes"
                                            value="{{ value }}"
-                                           id="id_doctypes_{{ value }}"/>
+                                           id="id_doctypes_{{ value }}">
                                     <label class="form-check-label" for="id_doctypes_{{ value }}">{{ label|safe|capfirst_allcaps }}</label>
                                 </div>
                             {% endfor %}
@@ -73,7 +73,7 @@
                                        name="by"
                                        value="author"
                                        {% if form.by.value == "author" %}checked{% endif %}
-                                       id="author"/>
+                                       id="author">
                                 <label for="author" class="form-check-label fw-bold">Author or Affiliation Name</label>
                             </div>
                         </div>
@@ -87,7 +87,7 @@
                                        name="by"
                                        value="group"
                                        {% if form.by.value == "group" %}checked{% endif %}
-                                       id="group"/>
+                                       id="group">
                                 <label for="group" class="form-check-label fw-bold">WG</label>
                             </div>
                         </div>
@@ -101,7 +101,7 @@
                                        name="by"
                                        value="area"
                                        {% if form.by.value == "area" %}checked{% endif %}
-                                       id="area"/>
+                                       id="area">
                                 <label for="area" class="form-check-label fw-bold">Area</label>
                             </div>
                         </div>
@@ -115,7 +115,7 @@
                                        name="by"
                                        value="ad"
                                        {% if form.by.value == "ad" %}checked{% endif %}
-                                       id="areadir"/>
+                                       id="areadir">
                                 <label for="areadir" class="form-check-label fw-bold">AD</label>
                             </div>
                         </div>
@@ -129,7 +129,7 @@
                                        name="by"
                                        value="state"
                                        {% if form.by.value == "state" %}checked{% endif %}
-                                       id="state"/>
+                                       id="state">
                                 <label for="state" class="form-check-label fw-bold">IESG State</label>
                             </div>
                         </div>
@@ -144,7 +144,7 @@
                                        name="by"
                                        value="irtfstate"
                                        {% if form.by.value == "irtfstate" %}checked{% endif %}
-                                       id="irtfstate"/>
+                                       id="irtfstate">
                                 <label for="irtfstate" class="form-check-label fw-bold">IRTF State</label>
                             </div>
                         </div>
@@ -158,7 +158,7 @@
                                        name="by"
                                        value="stream"
                                        {% if form.by.value == "stream" %}checked{% endif %}
-                                       id="stream"/>
+                                       id="stream">
                                 <label for="stream" class="form-check-label fw-bold">Stream</label>
                             </div>
                         </div>
@@ -167,7 +167,7 @@
                     <div class="row mb-3 search_field">
                         <div class="col-sm-4 d-grid">
                             <button class="btn btn-primary" type="submit">
-                                <span class="bi bi-search"/>
+                                <i class="bi bi-search"></i>
                                 Search
                             </button>
                         </div>
diff --git a/ietf/templates/doc/search/search_result_row.html b/ietf/templates/doc/search/search_result_row.html
index 69f1b5cfc..aa83defc6 100644
--- a/ietf/templates/doc/search/search_result_row.html
+++ b/ietf/templates/doc/search/search_result_row.html
@@ -17,12 +17,12 @@
             <a href="{% url "ietf.community.views.untrack_document" username=request.user.username name=doc.name %}"
                class="track-untrack-doc {% if not doc.tracked_in_personal_community_list %}visually-hidden{% endif %}"
                title="Remove from your personal ID list">
-                <span class="bi bi-bookmark-check-fill"></span>
+                <i class="bi bi-bookmark-check-fill"></i>
             </a>
             <a href="{% url "ietf.community.views.track_document" username=request.user.username name=doc.name %}"
                class="track-untrack-doc {% if doc.tracked_in_personal_community_list %}visually-hidden{% endif %}"
                title="Add to your personal ID list">
-                <span class="bi bi-bookmark"></span>
+                <i class="bi bi-bookmark"></i>
             </a>
             <br>
         {% endif %}
@@ -30,19 +30,19 @@
             <a class="review-wish-add-remove-doc ajax {% if not doc.has_review_wish %}visually-hidden{% endif %}"
                href="{% url "ietf.doc.views_review.review_wishes_remove" name=doc.name %}?next={{ request.get_full_path|urlencode }}"
                title="Remove from your review wishes for all teams">
-                <span class="bi bi-chats"></span>
+                <i class="bi bi-chats"></i>
             </a>
             <a class="review-wish-add-remove-doc {% if user.review_teams|length_is:"1" %}ajax {% endif %} {% if doc.has_review_wish %}visually-hidden{% 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>
+                <i class="bi bi-chats-o"></i>
             </a>
             <br>
         {% endif %}
         {% for session in doc.sessions %}
             <a href="{% url 'ietf.meeting.views.agenda_ical' num=session.meeting.number session_id=session.id %}"
                title="Calendar entry: document is on the agenda for {{ session.group.acronym }}@{{ session.meeting }}">
-                <span class="bi bi-calendar"></span>
+                <i class="bi bi-calendar"></i>
             </a>
         {% endfor %}
     </td>
diff --git a/ietf/templates/doc/search/search_results.html b/ietf/templates/doc/search/search_results.html
index 39ec343eb..343150c28 100644
--- a/ietf/templates/doc/search/search_results.html
+++ b/ietf/templates/doc/search/search_results.html
@@ -24,9 +24,9 @@
                                     {{ h.title|cut:" " }}
                                     {% if h.sorted and meta.max %}
                                         {% if h.direction == "asc" %}
-                                            <span class="bi bi-caret-up"></span>
+                                            <i class="bi bi-caret-up"></i>
                                         {% else %}
-                                            <span class="bi bi-caret-down"></span>
+                                            <i class="bi bi-caret-down"></i>
                                         {% endif %}
                                     {% endif %}
                                 </a>
diff --git a/ietf/templates/doc/search/status_columns.html b/ietf/templates/doc/search/status_columns.html
index 81eb59986..0e28295ee 100644
--- a/ietf/templates/doc/search/status_columns.html
+++ b/ietf/templates/doc/search/status_columns.html
@@ -56,23 +56,20 @@
             Review{{ doc.reviewed_by_teams|pluralize }}:
             {% spaceless %}
                 {% for acronym in doc.reviewed_by_teams %}
-                    <a href="{% url "ietf.group.views.group_home" acronym=acronym %}">{{ acronym }}</a>
-                    {% if not forloop.last %},{% endif %}
+                    <a href="{% url "ietf.group.views.group_home" acronym=acronym %}">{{ acronym }}</a>{% if not forloop.last %},{% endif %}
                 {% endfor %}
             {% endspaceless %}
         {% endif %}
         {% for m in doc.milestones %}
             {% if forloop.first %}<br>{% endif %}
             <span title="Part of {{ m.group.acronym }} milestone: {{ m.desc }}"
-                  class="milestone">{{ m.due|date:"M Y" }}</span>
-            {% if not forloop.last %},{% endif %}
+                  class="milestone">{{ m.due|date:"M Y" }}</span>{% if not forloop.last %},{% endif %}
         {% endfor %}
         {% if doc.action_holders_enabled and doc.action_holders.exists %}
             <br>
             Action Holder{{ doc.documentactionholder_set.all|pluralize }}:
             {% 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 %} {{ action_holder|action_holder_badge }}{% if not forloop.last %},{% endif %}
             {% endfor %}
         {% endif %}
     {% else %}
diff --git a/ietf/templates/doc/state_help.html b/ietf/templates/doc/state_help.html
index 00ee27883..9a1d4eb4e 100644
--- a/ietf/templates/doc/state_help.html
+++ b/ietf/templates/doc/state_help.html
@@ -33,7 +33,7 @@
                         <td>
                             {% for s in state.next_states.all %}
                                 {{ s.name }}
-                                <br />
+                                <br>
                             {% endfor %}
                         </td>
                     {% endif %}
diff --git a/ietf/templates/doc/status_change/make_last_call.html b/ietf/templates/doc/status_change/make_last_call.html
index e8a4680e5..a26f3d2f2 100644
--- a/ietf/templates/doc/status_change/make_last_call.html
+++ b/ietf/templates/doc/status_change/make_last_call.html
@@ -34,6 +34,6 @@
             format: "yyyy-mm-dd",
             todayBtn: "linked",
             todayHighlight: true
-        }).wrap('<div class="input-group mb-3"></div>').parent().prepend('<span class="input-group-text"><span class="bi bi-calendar"></span></span>');
+        }).wrap('<div class="input-group mb-3"></div>').parent().prepend('<span class="input-group-text"><i class="bi bi-calendar"></i></span>');
     </script>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/doc/submit_to_iesg.html b/ietf/templates/doc/submit_to_iesg.html
index 425fd4bb6..60d075f05 100644
--- a/ietf/templates/doc/submit_to_iesg.html
+++ b/ietf/templates/doc/submit_to_iesg.html
@@ -67,8 +67,7 @@
                         (None)
                     {% else %}
                         {% for tag in tags %}
-                            {{ tag }}
-                            {% if not forloop.last %},{% endif %}
+                            {{ tag }}{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     {% endif %}
                 </td>
diff --git a/ietf/templates/form.html b/ietf/templates/form.html
index 7999e9e8e..25fb81a65 100644
--- a/ietf/templates/form.html
+++ b/ietf/templates/form.html
@@ -11,9 +11,11 @@
 {% block content %}
     {% origin %}
     <h1>{{ title|safe }}</h1>
-    <p>
-        {{ description|safe }}
-    </p>
+    {% if description %}
+        <p>
+            {{ description|safe }}
+        </p>
+    {% endif %}
     <form method="post" class="show-required">
         {% csrf_token %}
         {% bootstrap_form form layout='horizontal' %}
diff --git a/ietf/templates/googlea30ad1dacffb5e5b.html b/ietf/templates/googlea30ad1dacffb5e5b.html
index b41526290..152779061 100644
--- a/ietf/templates/googlea30ad1dacffb5e5b.html
+++ b/ietf/templates/googlea30ad1dacffb5e5b.html
@@ -2,7 +2,13 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% origin %}
+<!doctype html>
 <html>
+    <head>
+        <title>
+            Google Webmaster Tools Verification
+        </title>
+    </head>
     <body>
         <h3>
             This is a verification page for the
diff --git a/ietf/templates/group/active_ags.html b/ietf/templates/group/active_ags.html
index 46f17e195..b822adf9f 100644
--- a/ietf/templates/group/active_ags.html
+++ b/ietf/templates/group/active_ags.html
@@ -28,21 +28,17 @@
                     <td>{{ group.name }}</td>
                     <td>
                         {% for ad in group.ads %}
-                            {% person_link ad.person %}
-                            {% if not forloop.last %},{% endif %}
+                            {% person_link ad.person %}{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </td>
                     <td>
                         {% for secretary in group.secretaries %}
-                            {% person_link
-                            {{.%erson.plain_nam
-                            {% if not forloop.last %},{% endif %}
+                            {% person_link secretary.person %}{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </td>
                     <td>
                         {% for chair in group.chairs %}
-                            {% person_link chair.person %}
-                            {% if not forloop.last %},{% endif %}
+                            {% person_link chair.person %}{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </td>
                 </tr>
diff --git a/ietf/templates/group/active_areas.html b/ietf/templates/group/active_areas.html
index 8bc4f360d..a93a4362d 100644
--- a/ietf/templates/group/active_areas.html
+++ b/ietf/templates/group/active_areas.html
@@ -49,8 +49,10 @@
             {{ area.name }}
             <a href="{% url 'ietf.group.views.active_groups' group_type='wg' %}#{{ area.acronym }}">({{ area.acronym|upper }})</a>
         </h2>
-        <p>
-            {{ area.description|linkify|urlize_ietf_docs|safe }}
-        </p>
+        {% if area.description %}
+            <p>
+                {{ area.description|linkify|urlize_ietf_docs|safe }}
+            </p>
+        {% endif %}
     {% endfor %}
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/active_dirs.html b/ietf/templates/group/active_dirs.html
index f36590475..765612253 100644
--- a/ietf/templates/group/active_dirs.html
+++ b/ietf/templates/group/active_dirs.html
@@ -30,7 +30,7 @@
                     <td>{{ group.name }}</td>
                     <td class="text-center">
                         {% if group.type_id == 'review' %}
-                            <span class="bi bi-check-lg text-success"></span>
+                            <i class="bi bi-check-lg text-success"></i>
                             <span class="visually-hidden">yes</span>
                         {% endif %}
                     </td>
@@ -39,20 +39,17 @@
                     </td>
                     <td>
                         {% for ad in group.ads %}
-                            {% person_link ad.person %}
-                            {% if not forloop.last %},{% endif %}
+                            {% person_link ad.person %}{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </td>
                     <td>
                         {% for secretary in group.secretaries %}
-                            {% person_link secretary.person %}
-                            {% if not forloop.last %},{% endif %}
+                            {% person_link secretary.person %}{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </td>
                     <td>
                         {% for chair in group.chairs %}
-                            {% person_link chair.person %}
-                            {% if not forloop.last %},{% endif %}
+                            {% person_link chair.person %}{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </td>
                 </tr>
diff --git a/ietf/templates/group/active_iabgroups.html b/ietf/templates/group/active_iabgroups.html
index 28f1024d2..07246658e 100644
--- a/ietf/templates/group/active_iabgroups.html
+++ b/ietf/templates/group/active_iabgroups.html
@@ -34,8 +34,7 @@
                         <td>{{ group.name }}</td>
                         <td>
                             {% for lead in group.leads %}
-                                {% person_link lead.person %}
-                                {% if not forloop.last %},{% endif %}
+                                {% person_link lead.person %}{% if not forloop.last %},{% endif %}
                             {% endfor %}
                         </td>
                     </tr>
diff --git a/ietf/templates/group/active_rags.html b/ietf/templates/group/active_rags.html
index e56420635..b5aa0b6f2 100644
--- a/ietf/templates/group/active_rags.html
+++ b/ietf/templates/group/active_rags.html
@@ -27,14 +27,12 @@
                     <td>{{ group.name }}</td>
                     <td>
                         {% for secretary in group.secretaries %}
-                            {% person_link secretary.person %}
-                            {% if not forloop.last %},{% endif %}
+                            {% person_link secretary.person %}{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </td>
                     <td>
                         {% for chair in group.chairs %}
-                            {% person_link chair.person %}
-                            {% if not forloop.last %},{% endif %}
+                            {% person_link chair.person %}{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </td>
                 </tr>
@@ -44,4 +42,4 @@
 {% endblock %}
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/active_review_dirs.html b/ietf/templates/group/active_review_dirs.html
index aee428f54..4148a59c3 100644
--- a/ietf/templates/group/active_review_dirs.html
+++ b/ietf/templates/group/active_review_dirs.html
@@ -32,20 +32,17 @@
                     </td>
                     <td>
                         {% for ad in group.ads %}
-                            {% person_link ad.person %}
-                            {% if not forloop.last %},{% endif %}
+                            {% person_link ad.person %}{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </td>
                     <td>
                         {% for secretary in group.secretaries %}
-                            {% person_link secretary.person %}
-                            {% if not forloop.last %},{% endif %}
+                            {% person_link secretary.person %}{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </td>
                     <td>
                         {% for chair in group.chairs %}
-                            {% person_link chair.person %}
-                            {% if not forloop.last %},{% endif %}
+                            {% person_link chair.person %}{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </td>
                 </tr>
diff --git a/ietf/templates/group/active_rgs.html b/ietf/templates/group/active_rgs.html
index fcaa57420..762ab5c2b 100644
--- a/ietf/templates/group/active_rgs.html
+++ b/ietf/templates/group/active_rgs.html
@@ -37,8 +37,7 @@
                     <td>{{ group.name }}</td>
                     <td>
                         {% for chair in group.chairs %}
-                            {% person_link chair.person %}
-                            {% if not forloop.last %},{% endif %}
+                            {% person_link chair.person %}{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </td>
                 </tr>
diff --git a/ietf/templates/group/active_teams.html b/ietf/templates/group/active_teams.html
index 406835424..f2912599f 100644
--- a/ietf/templates/group/active_teams.html
+++ b/ietf/templates/group/active_teams.html
@@ -26,8 +26,7 @@
                     <td>{{ group.name }}</td>
                     <td>
                         {% for chair in group.chairs %}
-                            {% person_link chair.person %}
-                            {% if not forloop.last %},{% endif %}
+                            {% person_link chair.person %}{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </td>
                 </tr>
diff --git a/ietf/templates/group/active_wgs.html b/ietf/templates/group/active_wgs.html
index ec76569d4..98bee9cdf 100644
--- a/ietf/templates/group/active_wgs.html
+++ b/ietf/templates/group/active_wgs.html
@@ -74,8 +74,7 @@
                             <td>{{ group.name }}</td>
                             <td>
                                 {% for chair in group.chairs %}
-                                    {% role_person_link chair %}
-                                    {% if not forloop.last %},{% endif %}
+                                    {% role_person_link chair %}{% if not forloop.last %},{% endif %}
                                 {% endfor %}
                                 {% if group.ad_out_of_area %}
                                     (Assigned AD: {% role_person_link group.ad_role %})
diff --git a/ietf/templates/group/change_reviewer_settings.html b/ietf/templates/group/change_reviewer_settings.html
index 0a8f3fb00..15e9f116c 100644
--- a/ietf/templates/group/change_reviewer_settings.html
+++ b/ietf/templates/group/change_reviewer_settings.html
@@ -103,15 +103,17 @@
                     <th data-sort="description">Description</th>
                 </tr>
             </thead>
-            <tbody>
-                {% for h in reviewersettings.history.all %}
-                    <tr>
-                        <td>{{ h.history_date|date }}</td>
-                        <td>{% person_link h.history_user.person %}</td>
-                        <td>{{ h.history_change_reason }}</td>
-                    </tr>
-                {% endfor %}
-            </tbody>
+            {% if reviewersettings.history.all %}
+                <tbody>
+                    {% for h in reviewersettings.history.all %}
+                        <tr>
+                            <td>{{ h.history_date|date }}</td>
+                            <td>{% person_link h.history_user.person %}</td>
+                            <td>{{ h.history_change_reason }}</td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            {% endif %}
         </table>
     </div>
     <h2 class="mt-5">History of unavailable periods</h2>
@@ -128,21 +130,23 @@
                     </th>
                 </tr>
             </thead>
-            <tbody>
-                {% for h in unavailable_periods_history.all %}
-                    <tr>
-                        <td>
-                            {{ h.history_date|date }}
-                        </td>
-                        <td>
-                            {% person_link h.history_user.person %}
-                        </td>
-                        <td>
-                            {{ h.history_change_reason }}
-                        </td>
-                    </tr>
-                {% endfor %}
-            </tbody>
+            {% if unavailable_periods_history.all %}
+                <tbody>
+                    {% for h in unavailable_periods_history.all %}
+                        <tr>
+                            <td>
+                                {{ h.history_date|date }}
+                            </td>
+                            <td>
+                                {% person_link h.history_user.person %}
+                            </td>
+                            <td>
+                                {{ h.history_change_reason }}
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            {% endif %}
         </table>
     </div>
     <p style="padding-top: 2em;">
diff --git a/ietf/templates/group/customize_workflow.html b/ietf/templates/group/customize_workflow.html
index 8d43703b4..6eb540243 100644
--- a/ietf/templates/group/customize_workflow.html
+++ b/ietf/templates/group/customize_workflow.html
@@ -83,8 +83,8 @@
                                     </label>
                                 </div>
                             {% endfor %}
-                            <input type="hidden" name="state" value="{{ state.pk }}" />
-                            <input type="hidden" name="action" value="setnextstates" />
+                            <input type="hidden" name="state" value="{{ state.pk }}">
+                            <input type="hidden" name="action" value="setnextstates">
                             <button class="mt-2 btn btn-primary btn-sm" type="submit">Save</button>
                         </form>
                     </td>
@@ -92,9 +92,9 @@
                         {% if not state.mandatory %}
                             <form class="set-state text-end" method="post">
                                 {% csrf_token %}
-                                <input type="hidden" name="state" value="{{ state.pk }}" />
-                                <input type="hidden" name="action" value="setstateactive" />
-                                <input type="hidden" name="active" value="{{ state.used|yesno:"0,1" }}" />
+                                <input type="hidden" name="state" value="{{ state.pk }}">
+                                <input type="hidden" name="action" value="setstateactive">
+                                <input type="hidden" name="active" value="{{ state.used|yesno:"0,1" }}">
                                 <button class="btn btn-{% if state.used %}danger{% else %}success{% endif %} btn-sm"
                                         type="submit"
                                         title="Click to {% if state.used %}de{% endif %}activate this state">
@@ -129,9 +129,9 @@
                     <td>
                         <form class="set-tag text-end" method="post">
                             {% csrf_token %}
-                            <input type="hidden" name="tag" value="{{ tag.pk }}" />
-                            <input type="hidden" name="action" value="settagactive" />
-                            <input type="hidden" name="active" value="{{ tag.used|yesno:"0,1" }}" />
+                            <input type="hidden" name="tag" value="{{ tag.pk }}">
+                            <input type="hidden" name="action" value="settagactive">
+                            <input type="hidden" name="active" value="{{ tag.used|yesno:"0,1" }}">
                             <button class="btn btn-{% if tag.used %}danger{% else %}success{% endif %} btn-sm"
                                     type="submit"
                                     title="Click to {% if tag.used %}de{% endif %}activate this tag">
diff --git a/ietf/templates/group/edit_milestones.html b/ietf/templates/group/edit_milestones.html
index 88a13fce2..90a3afa8d 100644
--- a/ietf/templates/group/edit_milestones.html
+++ b/ietf/templates/group/edit_milestones.html
@@ -68,10 +68,8 @@
                         <div class="due handle col-md-2 col-form-label col-form-label-md">
                             {% if form.milestone.resolved %}
                                 <span class="badge bg-success">{{ form.milestone.resolved }}</span>
-                            {% else %}
-                                <b>
-                                    {% if group.uses_milestone_dates %}{{ form.milestone.due|date:"M Y" }}{% endif %}
-                                </b>
+                            {% elif group.uses_milestone_dates and form.milestone.due %}
+                                <b>{{ form.milestone.due|date:"M Y" }}</b>
                             {% endif %}
                         </div>
                         <div class="col-md-10 col-form-label col-form-label-md">
diff --git a/ietf/templates/group/email_aliases.html b/ietf/templates/group/email_aliases.html
index 0ea2e0f10..66faa4bc2 100644
--- a/ietf/templates/group/email_aliases.html
+++ b/ietf/templates/group/email_aliases.html
@@ -22,28 +22,30 @@
     <table class="table table-striped table-sm tablesorter my-3">
         <thead>
             <tr>
-                <th data-sort="Alias">Alias</th>
-                <th data-sort="Expansion">Expansion</th>
+                <th data-sort="alias">Alias</th>
+                <th data-sort="expansion">Expansion</th>
             </tr>
         </thead>
-        <tbody>
-            {% for alias in alias_list %}
-                {% for item in alias.list %}
-                    <tr>
-                        <td>
-                            {% with alias.grouper|add:item.alias_type|default:'' as x %}
-                                {% with x|add:"@"|add:ietf_domain as email %}
-                                    {{ email|linkify }}
+        {% if alias_list %}
+            <tbody>
+                {% for alias in alias_list %}
+                    {% for item in alias.list %}
+                        <tr>
+                            <td>
+                                {% with alias.grouper|add:item.alias_type|default:'' as x %}
+                                    {% with x|add:"@"|add:ietf_domain as email %}
+                                        {{ email|linkify }}
+                                    {% endwith %}
                                 {% endwith %}
-                            {% endwith %}
-                        </td>
-                        <td>{{ item.expansion|linkify }}</td>
-                    </tr>
+                            </td>
+                            <td>{{ item.expansion|linkify }}</td>
+                        </tr>
+                    {% endfor %}
                 {% endfor %}
-            {% endfor %}
-        </tbody>
+            </tbody>
+        {% endif %}
     </table>
 {% endblock %}
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/group_about.html b/ietf/templates/group/group_about.html
index 842167aa9..43c2d6566 100644
--- a/ietf/templates/group/group_about.html
+++ b/ietf/templates/group/group_about.html
@@ -167,6 +167,7 @@
                 {% endif %}
             {% endwith %}
         </tbody>
+        {% if group.personnel %}
         <tbody class="meta border-top">
             {% for slug, label, roles in group.personnel %}
                 <tr>
@@ -198,6 +199,7 @@
                 </tr>
             {% endfor %}
         </tbody>
+        {% endif %}
         {% if group.list_email %}
             <tbody class="meta border-top">
                 <tr>
@@ -314,8 +316,8 @@
             {% if group.state_id == "proposed" %}proposed{% endif %}
             {{ group.type.desc.title }}
         </h2>
-        {# the linebreaks filter adds <p />, no surrounding <p /> necessary: #}
-        {{ group.charter_text|linebreaks }}
+        {# the linebreaks filter adds <p>, no surrounding <p> necessary: #}
+        {{ group.charter_text|linkify|urlize_ietf_docs|linebreaks }}
     {% else %}
         <h2 class="mt-3">
             {% if requested_close or group.state_id == "conclude" %}Final{% endif %}
diff --git a/ietf/templates/group/history.html b/ietf/templates/group/history.html
index eee33a310..9a1dae7bc 100644
--- a/ietf/templates/group/history.html
+++ b/ietf/templates/group/history.html
@@ -13,7 +13,7 @@
     {% if can_add_comment %}
         <a class="btn btn-primary"
            href="{% url 'ietf.group.views.add_comment' acronym=group.acronym %}">
-            <span class="bi bi-plus"></span>
+            <i class="bi bi-plus"></i>
             Add comment
         </a>
     {% endif %}
@@ -25,15 +25,17 @@
                 <th data-sort="action">Action</th>
             </tr>
         </thead>
-        <tbody>
-            {% for e in events %}
-                <tr>
-                    <td class="text-nowrap">{{ e.time|date:"Y-m-d" }}</td>
-                    <td class="text-nowrap">{% person_link e.by %}</td>
-                    <td>{{ e.desc|format_history_text }}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
+        {% if events %}
+            <tbody>
+                {% for e in events %}
+                    <tr>
+                        <td class="text-nowrap">{{ e.time|date:"Y-m-d" }}</td>
+                        <td class="text-nowrap">{% person_link e.by %}</td>
+                        <td>{{ e.desc|format_history_text }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        {% endif %}
     </table>
 {% endblock %}
 {% block js %}
diff --git a/ietf/templates/group/manage_review_requests.html b/ietf/templates/group/manage_review_requests.html
index bd88cbadf..295a04997 100644
--- a/ietf/templates/group/manage_review_requests.html
+++ b/ietf/templates/group/manage_review_requests.html
@@ -70,8 +70,7 @@
                                 {% if r.doc.authors %}
                                     <span class="fw-bold">Authors:</span>
                                     {% for person in r.doc.authors %}
-                                        {% person_link person %}
-                                        {% if not forloop.last %},{% endif %}
+                                        {% person_link person %}{% if not forloop.last %},{% endif %}
                                     {% endfor %}
                                     <br>
                                 {% endif %}
@@ -85,8 +84,7 @@
                                 {% if r.wg_chairs %}
                                     <span class="fw-bold">{{ r.doc.group.type.name }} chairs:</span>
                                     {% for person in r.wg_chairs %}
-                                        {% person_link person %}
-                                        {% if not forloop.last %},{% endif %}
+                                        {% person_link person %}{% if not forloop.last %},{% endif %}
                                     {% endfor %}
                                     <br>
                                 {% endif %}
diff --git a/ietf/templates/group/materials.html b/ietf/templates/group/materials.html
index 15b72dc74..6756d1207 100644
--- a/ietf/templates/group/materials.html
+++ b/ietf/templates/group/materials.html
@@ -45,8 +45,7 @@
                                         {% for pr in p.list %}
                                             {% if pr.rev != d.rev %}(-{{ pr.rev }}){% endif %}
                                         {% endfor %}
-                                    {% endif %}
-                                    {% if not forloop.last %},{% endif %}
+                                    {% endif %}{% if not forloop.last %},{% endif %}
                                 {% endfor %}
                             </td>
                             <td>
@@ -59,8 +58,7 @@
                                         {% for pr in p.list %}
                                             {% if pr.rev != d.rev %}(-{{ pr.rev }}){% endif %}
                                         {% endfor %}
-                                    {% endif %}
-                                    {% if not forloop.last %},{% endif %}
+                                    {% endif %}{% if not forloop.last %},{% endif %}
                                 {% endfor %}
                             </td>
                         </tr>
diff --git a/ietf/templates/group/meetings-row.html b/ietf/templates/group/meetings-row.html
index 4b246df9f..78b0a2bd8 100644
--- a/ietf/templates/group/meetings-row.html
+++ b/ietf/templates/group/meetings-row.html
@@ -33,12 +33,12 @@
                     {{ s.time|date:"H:i" }}
                     <a class="btn btn-primary btn-sm"
                        href="{% url 'ietf.meeting.views.agenda_ical' num=s.meeting.number session_id=s.id %}">
-                        <span class="bi bi-calendar"></span>
+                        <i class="bi bi-calendar"></i>
                     </a>
                 {% else %}
                     <a class="btn btn-primary btn-sm"
                        href="{% url 'ietf.meeting.views.agenda_ical' num=s.meeting.number acronym=s.group.acronym %}">
-                        <span class="bi bi-calendar"></span>
+                        <i class="bi bi-calendar"></i>
                     </a>
                 {% endif %}
             {% endif %}
diff --git a/ietf/templates/group/meetings.html b/ietf/templates/group/meetings.html
index 361d045df..38de4befc 100644
--- a/ietf/templates/group/meetings.html
+++ b/ietf/templates/group/meetings.html
@@ -44,7 +44,7 @@
             <a class="float-end"
                title="icalendar entry for all scheduled future {{ group.acronym }} meetings"
                href="{% url 'ietf.meeting.views.upcoming_ical' %}?show={{ group.acronym }}">
-                <span class="bi bi-calendar"></span>
+                <i class="bi bi-calendar"></i>
             </a>
         </h2>
         <table class="table table-sm table-striped tablesorter">
@@ -81,10 +81,10 @@
                 {% with sessions=past can_edit_materials=False %}
                     {% include "group/meetings-row.html" %}
                 {% endwith %}
-                <tbody>
-                </table>
-            {% endif %}
-            <p>
-                This page shows meetings within the last four years. For earlier meetings, please see the proceedings.
-            </p>
-        {% endblock %}
+            </tbody>
+        </table>
+    {% endif %}
+    <p>
+        This page shows meetings within the last four years. For earlier meetings, please see the proceedings.
+    </p>
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/group/milestone_form.html b/ietf/templates/group/milestone_form.html
index 6ac2d210b..4546c4e43 100644
--- a/ietf/templates/group/milestone_form.html
+++ b/ietf/templates/group/milestone_form.html
@@ -4,5 +4,5 @@
 {% origin %}
 {# assumes group, form, needs_review, reviewer are in the context #}
 {% load django_bootstrap5 %}
-<input type="hidden" name="prefix" value="{{ form.prefix|default:"" }}"/>
+<input type="hidden" name="prefix" value="{{ form.prefix|default:"" }}">
 {% bootstrap_form form layout='horizontal' %}
\ No newline at end of file
diff --git a/ietf/templates/group/review_requests.html b/ietf/templates/group/review_requests.html
index bb7a282a3..73af4a977 100644
--- a/ietf/templates/group/review_requests.html
+++ b/ietf/templates/group/review_requests.html
@@ -13,7 +13,7 @@
     {% if can_access_stats %}
         <div class="float-end">
             <a href="{% url "ietf.stats.views.review_stats" %}" class="icon-link">
-                <span class="bi bi-bar-chart-line"></span>
+                <i class="bi bi-bar-chart-line"></i>
             </a>
         </div>
     {% endif %}
diff --git a/ietf/templates/group/reviewer_overview.html b/ietf/templates/group/reviewer_overview.html
index 874ad1e44..8ecec5d4b 100644
--- a/ietf/templates/group/reviewer_overview.html
+++ b/ietf/templates/group/reviewer_overview.html
@@ -14,7 +14,7 @@
         <div class="float-end">
             <a href="{% url "ietf.stats.views.review_stats" stats_type="completion" acronym=group.acronym %}"
                class="icon-link">
-                <span class="bi bi-bar-chart-line">&nbsp;</span>
+                <i class="bi bi-bar-chart-line"></i>
             </a>
         </div>
     {% endif %}
diff --git a/ietf/templates/group/stream_edit.html b/ietf/templates/group/stream_edit.html
index 022c23c9f..c2d110e6e 100644
--- a/ietf/templates/group/stream_edit.html
+++ b/ietf/templates/group/stream_edit.html
@@ -13,8 +13,7 @@
     <p>
         <b>Chair{{ chairs|pluralize }}:</b>
         {% for chair in chairs %}
-            {% person_link chair.person %}
-            {% if not forloop.last %},{% endif %}
+            {% person_link chair.person %}{% if not forloop.last %},{% endif %}
         {% endfor %}
     </p>
     <p>
diff --git a/ietf/templates/iesg/agenda.html b/ietf/templates/iesg/agenda.html
index 7182586ff..335cabd36 100644
--- a/ietf/templates/iesg/agenda.html
+++ b/ietf/templates/iesg/agenda.html
@@ -3,7 +3,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load ietf_filters %}
-{% block pagehead %}<link rel="alternate" type="application/atom+xml" href="/feed/iesg-agenda/"/>{% endblock %}
+{% block pagehead %}<link rel="alternate" type="application/atom+xml" href="/feed/iesg-agenda/">{% endblock %}
 {% block title %}IESG agenda: {{ date }}{% endblock %}
 {% block content %}
     {% origin %}
diff --git a/ietf/templates/iesg/agenda_documents.html b/ietf/templates/iesg/agenda_documents.html
index 62d9223c2..157290d0f 100644
--- a/ietf/templates/iesg/agenda_documents.html
+++ b/ietf/templates/iesg/agenda_documents.html
@@ -26,13 +26,13 @@
             </h2>
             <div class="buttonlist">
                 <a class="btn btn-primary" role="button" href="/iesg/agenda/">
-                    <span class="bi bi-list"></span>
+                    <i class="bi bi-list"></i>
                     Full IESG agenda
                 </a>
                 <a class="btn btn-primary"
                    role="button"
                    href="/iesg/agenda/telechat-{{ t.date|date:'Y' }}-{{ t.date|date:'m' }}-{{ t.date|date:'d' }}-docs.tgz">
-                    <span class="bi bi-download"></span>
+                    <i class="bi bi-download"></i>
                     Download documents
                 </a>
             </div>
diff --git a/ietf/templates/iesg/moderator_package.html b/ietf/templates/iesg/moderator_package.html
index f9260f270..423aff489 100644
--- a/ietf/templates/iesg/moderator_package.html
+++ b/ietf/templates/iesg/moderator_package.html
@@ -35,13 +35,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
 {% endcomment %}
 {% load ietf_filters static %}
+<!doctype html>
 <html lang="en">
     <head>
-        <meta charset="utf-8"/>
-        <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>Moderator Package for {{ date }} IESG Telechat</title>
-        <link rel="stylesheet" href="{% static 'ietf/css/ietf.css' %}"/>
+        <link rel="stylesheet" href="{% static 'ietf/css/ietf.css' %}">
         <style type="text/css">
             h3 { page-break-before:always; }
             @media print {
@@ -153,4 +154,4 @@ Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
             {% endif %}
         {% endfor %}
     </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/ietf/templates/iesg/nav.html b/ietf/templates/iesg/nav.html
index facd98918..91dbe41e0 100644
--- a/ietf/templates/iesg/nav.html
+++ b/ietf/templates/iesg/nav.html
@@ -20,7 +20,7 @@
     </li>
     <li class="nav-item">
         <a class="nav-link
-            {% if active == 'discusses' %}active{% endif %}""
+            {% if active == 'discusses' %}active{% endif %}"
             href="{% url 'ietf.iesg.views.discusses' %}">DISCUSS positions
         </a>
     </li>
diff --git a/ietf/templates/iesg/past_documents.html b/ietf/templates/iesg/past_documents.html
index 9efbbcb85..a568633c1 100644
--- a/ietf/templates/iesg/past_documents.html
+++ b/ietf/templates/iesg/past_documents.html
@@ -30,36 +30,38 @@
                 <th data-sort="discusses">Discusses</th>
             </tr>
         </thead>
-        <tbody>
-            {% for doc in docs %}
-                <tr class="{% if doc.by_me %}
-                               byme
-                           {% endif %}
+        {% if docs %}
+            <tbody>
+                {% for doc in docs %}
+                    <tr class="{% if doc.by_me %}
+                                   byme
+                               {% endif %}
 
-                           {% if doc.for_me %}
-                               forme
-                           {% endif %}">
-                    <td>
-                        {{ doc.displayname_with_link }}
-                        <br>
-                        <span class="fw-bold">{{ doc.title }}</span>
-                    </td>
-                    <td>{{ doc.telechat }}</td>
-                    {% include "doc/search/status_columns.html" %}
-                    <td>{% person_link doc.ad nowrap=False %}</td>
-                    <td>
-                        {% for p in doc.blocking_positions %}
-                            {% if p.is_old_pos %}<span class="text-muted">{% endif %}
-                            {% person_link p.balloter nowrap=False %}
-                            ({% if p.discuss_time %}{{ p.discuss_time|timesince_days }} days ago{% endif %}
-                            {% if doc.get_state_url != "rfc" and p.rev != doc.rev %}for -{{ p.rev }}{% endif %})
+                               {% if doc.for_me %}
+                                   forme
+                               {% endif %}">
+                        <td>
+                            {{ doc.displayname_with_link }}
                             <br>
-                            {% if p.is_old_pos %}</span>{% endif %}
-                        {% endfor %}
-                    </td>
-                </tr>
-            {% endfor %}
-        </tbody>
+                            <span class="fw-bold">{{ doc.title }}</span>
+                        </td>
+                        <td>{{ doc.telechat }}</td>
+                        {% include "doc/search/status_columns.html" %}
+                        <td>{% person_link doc.ad nowrap=False %}</td>
+                        <td>
+                            {% for p in doc.blocking_positions %}
+                                {% if p.is_old_pos %}<span class="text-muted">{% endif %}
+                                {% person_link p.balloter nowrap=False %}
+                                ({% if p.discuss_time %}{{ p.discuss_time|timesince_days }} days ago{% endif %}
+                                {% if doc.get_state_url != "rfc" and p.rev != doc.rev %}for -{{ p.rev }}{% endif %})
+                                <br>
+                                {% if p.is_old_pos %}</span>{% endif %}
+                            {% endfor %}
+                        </td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        {% endif %}
     </table>
 {% endblock %}
 {% block js %}
diff --git a/ietf/templates/iesg/review_decisions.html b/ietf/templates/iesg/review_decisions.html
index 4818094e2..88acde4df 100644
--- a/ietf/templates/iesg/review_decisions.html
+++ b/ietf/templates/iesg/review_decisions.html
@@ -12,8 +12,7 @@
     <p>
         <b>Announcements in:</b>
         {% for y in years %}
-            <a {% if y != year %}href="{% url "ietf.iesg.views.review_decisions" year=y %}"{% endif %}>{{ y }}</a>
-            {% if not forloop.last %},{% endif %}
+            <a {% if y != year %}href="{% url "ietf.iesg.views.review_decisions" year=y %}"{% endif %}>{{ y }}</a>{% if not forloop.last %},{% endif %}
         {% endfor %}
     </p>
     {% for e in events %}
diff --git a/ietf/templates/ietfauth/whitelist_form.html b/ietf/templates/ietfauth/whitelist_form.html
index 2ad9c3026..f5acc5a62 100644
--- a/ietf/templates/ietfauth/whitelist_form.html
+++ b/ietf/templates/ietfauth/whitelist_form.html
@@ -22,54 +22,54 @@
         </p>
         <p>
             Before you do so, please complete the following 3 verification steps:
-            <ol>
-                <li>
-                    Has the person provided relevant information in his request, or has he simply
-                    copied the text from the account creation failure message?  All genuine (non-spam)
-                    account creation requests seen between 2009 and 2016 for tools.ietf.org have
-                    contained a reasonable request message, rather than just copy-pasting the account
-                    creation failure message.  If there's no proper request message, step 2 below can
-                    be performed to make sure the request is bogus, but if that also fails, no further
-                    effort should be needed.
-                </li>
-                <li>
-                    Google for the person's name within the ietf.org site: "Jane Doe site:ietf.org".  If
-                    found, and the email address matches an address used in drafts or discussions,
-                    things are fine, and it's OK to add the address to the whitelist using this form,
-                    and ask the person to please try the
+        </p>
+        <ol class="d-grid gap-3">
+            <li>
+                Has the person provided relevant information in his request, or has he simply
+                copied the text from the account creation failure message?  All genuine (non-spam)
+                account creation requests seen between 2009 and 2016 for tools.ietf.org have
+                contained a reasonable request message, rather than just copy-pasting the account
+                creation failure message.  If there's no proper request message, step 2 below can
+                be performed to make sure the request is bogus, but if that also fails, no further
+                effort should be needed.
+            </li>
+            <li>
+                Google for the person's name within the ietf.org site: "Jane Doe site:ietf.org".  If
+                found, and the email address matches an address used in drafts or discussions,
+                things are fine, and it's OK to add the address to the whitelist using this form,
+                and ask the person to please try the
+                <a href="{% url 'ietf.ietfauth.views.create_account' %}">account creation form</a>
+                again.
+            </li>
+            <li>
+                <p>
+                    If google finds no trace of the person being an ietf participant, he or she could
+                    still be somebody who is just getting involved in IETF work.  A datatracker account
+                    is probably not necessary, (no account is necessary to 'join' a WG -- the right thing
+                    in that case is to join the right mailing list, and the person could be told so) --
+                    but in case this is a legitimate request, please email the person and ask:
+                    <i>
+                        "Which wgs do you require a password for?"
+                    </i>
+                </p>
+                <p>
+                    This is a bit of a trick question, because it is very unlikely that somebody who
+                    isn't involved in IETF work will give a reasonable response, while almost any answer
+                    from somebody who is doing IETF work will show that they have some clue.
+                </p>
+                <p>
+                    Please note the exact wording.  Do <b><i>not</i></b> ask about "working groups" --
+                    that will make it easier for people to google for IETF working groups.  Ask the
+                    question as given above, with lowercase "wgs".
+                </p>
+                <p>
+                    If the answer to this question shows clue, then add the address to the whitelist
+                    using this form, and ask the person to please try the
                     <a href="{% url 'ietf.ietfauth.views.create_account' %}">account creation form</a>
                     again.
-                </li>
-                <li>
-                    <p>
-                        If google finds no trace of the person being an ietf participant, he or she could
-                        still be somebody who is just getting involved in IETF work.  A datatracker account
-                        is probably not necessary, (no account is necessary to 'join' a WG -- the right thing
-                        in that case is to join the right mailing list, and the person could be told so) --
-                        but in case this is a legitimate request, please email the person and ask:
-                        <i>
-                            "Which wgs do you require a password for?"
-                        </i>
-                    </p>
-                    <p>
-                        This is a bit of a trick question, because it is very unlikely that somebody who
-                        isn't involved in IETF work will give a reasonable response, while almost any answer
-                        from somebody who is doing IETF work will show that they have some clue.
-                    </p>
-                    <p>
-                        Please note the exact wording.  Do <b><i>not</i></b> ask about "working groups" --
-                        that will make it easier for people to google for IETF working groups.  Ask the
-                        question as given above, with lowercase "wgs".
-                    </p>
-                    <p>
-                        If the answer to this question shows clue, then add the address to the whitelist
-                        using this form, and ask the person to please try the
-                        <a href="{% url 'ietf.ietfauth.views.create_account' %}">account creation form</a>
-                        again.
-                    </p>
-                </li>
-            </ol>
-        </p>
+                </p>
+            </li>
+        </ol>
         <form role="form" method="post">
             {% csrf_token %}
             {% bootstrap_form form %}
diff --git a/ietf/templates/ipr/details_edit.html b/ietf/templates/ipr/details_edit.html
index 0a930ae60..398f78123 100644
--- a/ietf/templates/ipr/details_edit.html
+++ b/ietf/templates/ipr/details_edit.html
@@ -90,7 +90,7 @@
         {% endif %}
         <p class="required">
             Fields marked with
-            <label></label>
+            <label class="required">&nbsp;</label>
             are required.
         </p>
         <h2 class="mt-4">Updates</h2>
@@ -98,7 +98,7 @@
         {% if user|has_role:"Secretariat" %}
             {% bootstrap_field form.compliant layout="horizontal" %}
         {% else %}
-            <input type="hidden" id="id_compliant" name="compliant" value="checked" />
+            <input type="hidden" id="id_compliant" name="compliant" value="checked">
         {% endif %}
         <h2 class="mt-4">
             {% cycle 'I' 'II' 'III' 'IV' 'V' 'VI' 'VII' 'VIII' as section %}.
@@ -167,7 +167,7 @@
                 <div class="col-md-2"></div>
                 <div class="col-md-10">
                     <a class="draft-add-row btn btn-primary">
-                        <span class="bi bi-plus" aria-hidden="true"></span> Add more
+                        <i class="bi bi-plus" aria-hidden="true"></i> Add more
                     </a>
                 </div>
             </div>
diff --git a/ietf/templates/ipr/details_history.html b/ietf/templates/ipr/details_history.html
index 4c6f5dfaf..e00222ba2 100644
--- a/ietf/templates/ipr/details_history.html
+++ b/ietf/templates/ipr/details_history.html
@@ -38,28 +38,30 @@
                 <th data-sort="text">Text</th>
             </tr>
         </thead>
-        <tbody>
-            {% for e in events %}
-                <tr id="history-{{ e.pk }}">
-                    <td class="text-nowrap">{{ e.time|date:"Y-m-d" }}</td>
-                    <td>
-                        {{ e.type }}
-                        {% if e.response_due and e.response_past_due %}
-                            <span class="bi bi-exclamation-circle" title="Response overdue"></span>
-                        {% endif %}
-                    </td>
-                    <td>{% person_link e.by %}</td>
-                    <td>
-                        {% if e.message %}
-                            {% if e.response_due %}<span class="badge bg-info">Response due: {{ e.response_due|date:"Y-m-d" }}</span>{% endif %}
-                            <pre>{{ e.message|render_message_for_history|format_history_text:"100" }}</pre>
-                        {% else %}
-                            {{ e.desc|format_history_text }}
-                        {% endif %}
-                    </td>
-                </tr>
-            {% endfor %}
-        </tbody>
+        {% if events %}
+            <tbody>
+                {% for e in events %}
+                    <tr id="history-{{ e.pk }}">
+                        <td class="text-nowrap">{{ e.time|date:"Y-m-d" }}</td>
+                        <td>
+                            {{ e.type }}
+                            {% if e.response_due and e.response_past_due %}
+                                <i class="bi bi-exclamation-circle" title="Response overdue"></i>
+                            {% endif %}
+                        </td>
+                        <td>{% person_link e.by %}</td>
+                        <td>
+                            {% if e.message %}
+                                {% if e.response_due %}<span class="badge bg-info">Response due: {{ e.response_due|date:"Y-m-d" }}</span>{% endif %}
+                                <pre>{{ e.message|render_message_for_history|format_history_text:"100" }}</pre>
+                            {% else %}
+                                {{ e.desc|format_history_text }}
+                            {% endif %}
+                        </td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        {% endif %}
     </table>
 {% endblock %}
 {% block js %}
diff --git a/ietf/templates/ipr/details_view.html b/ietf/templates/ipr/details_view.html
index b7d31a822..1bea1ed43 100644
--- a/ietf/templates/ipr/details_view.html
+++ b/ietf/templates/ipr/details_view.html
@@ -5,9 +5,7 @@
 {% load ietf_filters ipr_filters %}
 {% block title %}IPR Details - {{ ipr.title }}{% endblock %}
 {% block pagehead %}
-    <meta name="description"
-          content="IPR disclosure #{{ ipr.ipr_id }}: {{ ipr.title }} ({{ ipr.time|date:"
-          Y/>
+    <meta name="description" content="IPR disclosure #{{ipr.ipr_id}}: {{ ipr.title }} ({{ ipr.time|date:'Y' }})">
 {% endblock %}
 {% block content %}
     {% origin %}
@@ -37,13 +35,13 @@
             {% if ipr.updates and ipr.state_id == 'pending' and ipr.update_notified_date or not ipr.updates and ipr.state_id == 'pending' %}
                 <a class="btn btn-primary"
                    href="{% url 'ietf.ipr.views.post' id=ipr.id %}">
-                    <span class="bi bi-check" aria-hidden="true"></span> Post
+                    <i class="bi bi-check" aria-hidden="true"></i> Post
                 </a>
             {% endif %}
             <a class="btn btn-primary"
                href="{% url 'ietf.ipr.views.email' id=ipr.id %}"
                title="Email submitter of this disclsoure">
-                <span class="bi bi-envelope" aria-hidden="true"></span> Email
+                <i class="bi bi-envelope" aria-hidden="true"></i> Email
             </a>
             <a class="btn btn-primary"
                href="{% url 'ietf.ipr.views.edit' id=ipr.id %}">Edit</a>
@@ -78,12 +76,12 @@
         <strong>Submitted:</strong>
         {{ ipr.time|date:"F j, Y" }} under the rules in {{ in_force_ipr_rfc }}
     </div>
-    <div>
-        {% if user|has_role:"Secretariat" %}
+    {% if user|has_role:"Secretariat" %}
+        <div>
             <strong>State:</strong>
             {{ ipr.state }}
-        {% endif %}
-    </div>
+        </div>
+    {% endif %}
     {% if ipr.state_id == 'posted' %}
         <p class="alert alert-info my-3">
             Note: Updates to IPR disclosures must only be made by authorized
@@ -220,7 +218,9 @@
                         Holder contact info
                     </th>
                     <td class="ipr-this">
-                        {{ ipr.holder_contact_info|linebreaks }}
+                        {% if ipr.holder_contact_info %}
+                            {{ ipr.holder_contact_info|linebreaks }}
+                        {% endif %}
                     </td>
                 </tr>
             </tbody>
diff --git a/ietf/templates/ipr/ipr_table.html b/ietf/templates/ipr/ipr_table.html
index 80e565d88..beba83cd1 100644
--- a/ietf/templates/ipr/ipr_table.html
+++ b/ietf/templates/ipr/ipr_table.html
@@ -15,51 +15,53 @@
             {% endif %}
         </tr>
     </thead>
-    <tbody>
-        {% for ipr in iprs %}
-            <tr>
-                <td class="text-nowrap text-end">{{ ipr.time|date:"Y-m-d" }}</td>
-                <td class="text-end">{{ ipr.id }}</td>
-                <td>
-                    {% if ipr.state_id == 'posted' or administrative_list %}
-                        <div>
-                            <a href="{% url "ietf.ipr.views.show" ipr.id %}">{{ ipr.title }}</a>
-                        </div>
-                        {% for item in ipr.relatedipr_source_set.all %}
-                            {% if item.target.state_id == 'posted' %}
-                                <small>Updates ID
-                                    <a href="{% url "ietf.ipr.views.show" item.target.id %}">#{{ item.target.id }}</a>.
-                                </small>
-                            {% endif %}
-                        {% endfor %}
-                        {% for item in ipr.relatedipr_target_set.all %}
-                            {% if item.source.state_id == "posted" %}
-                                <small>Updated by ID
-                                    <a href="{% url "ietf.ipr.views.show" item.source.id %}">#{{ item.source.id }}</a>.
-                                </small>
-                            {% endif %}
-                        {% endfor %}
-                    {% else %}
-                        <div>{{ ipr.title }}</div>
-                        <small><i>This IPR disclosure was removed at the request of the submitter.</i></small>
-                    {% endif %}
-                </td>
-                {% if administrative_list == 'pending' %}
-                    {% with ipr.get_latest_event_msgout as latest_msgout %}
-                        <td>
-                            {% if latest_msgout %}{{ latest_msgout.time|date:"Y-m-d" }}{% endif %}
-                        </td>
-                        <td>
-                            {% if latest_msgout and latest_msgout.response_due %}
-                                {{ latest_msgout.response_due|date:"Y-m-d" }}
-                                {% if latest_msgout.response_past_due %}
-                                    <span class="bi bi-exclamation-circle" title="Response overdue"></span>
+    {% if iprs %}
+        <tbody>
+            {% for ipr in iprs %}
+                <tr>
+                    <td class="text-nowrap text-end">{{ ipr.time|date:"Y-m-d" }}</td>
+                    <td class="text-end">{{ ipr.id }}</td>
+                    <td>
+                        {% if ipr.state_id == 'posted' or administrative_list %}
+                            <div>
+                                <a href="{% url "ietf.ipr.views.show" ipr.id %}">{{ ipr.title }}</a>
+                            </div>
+                            {% for item in ipr.relatedipr_source_set.all %}
+                                {% if item.target.state_id == 'posted' %}
+                                    <small>Updates ID
+                                        <a href="{% url "ietf.ipr.views.show" item.target.id %}">#{{ item.target.id }}</a>.
+                                    </small>
                                 {% endif %}
-                            {% endif %}
-                        </td>
-                    {% endwith %}
-                {% endif %}
-            </tr>
-        {% endfor %}
-    </tbody>
+                            {% endfor %}
+                            {% for item in ipr.relatedipr_target_set.all %}
+                                {% if item.source.state_id == "posted" %}
+                                    <small>Updated by ID
+                                        <a href="{% url "ietf.ipr.views.show" item.source.id %}">#{{ item.source.id }}</a>.
+                                    </small>
+                                {% endif %}
+                            {% endfor %}
+                        {% else %}
+                            <div>{{ ipr.title }}</div>
+                            <small><i>This IPR disclosure was removed at the request of the submitter.</i></small>
+                        {% endif %}
+                    </td>
+                    {% if administrative_list == 'pending' %}
+                        {% with ipr.get_latest_event_msgout as latest_msgout %}
+                            <td>
+                                {% if latest_msgout %}{{ latest_msgout.time|date:"Y-m-d" }}{% endif %}
+                            </td>
+                            <td>
+                                {% if latest_msgout and latest_msgout.response_due %}
+                                    {{ latest_msgout.response_due|date:"Y-m-d" }}
+                                    {% if latest_msgout.response_past_due %}
+                                        <i class="bi bi-exclamation-circle" title="Response overdue"></i>
+                                    {% endif %}
+                                {% endif %}
+                            </td>
+                        {% endwith %}
+                    {% endif %}
+                </tr>
+            {% endfor %}
+        </tbody>
+    {% endif %}
 </table>
\ No newline at end of file
diff --git a/ietf/templates/ipr/search_doc_list.html b/ietf/templates/ipr/search_doc_list.html
index 988ec1ea5..645ba801b 100644
--- a/ietf/templates/ipr/search_doc_list.html
+++ b/ietf/templates/ipr/search_doc_list.html
@@ -16,7 +16,7 @@
     <ul>
         {% for docalias in docs %}
             <li>
-                <a href="?submit=draft&id={{ docalias.name }}">{{ docalias.name }}</a>
+                <a href="?submit=draft&amp;id={{ docalias.name }}">{{ docalias.name }}</a>
             </li>
         {% endfor %}
     </ul>
diff --git a/ietf/templates/ipr/search_doc_result.html b/ietf/templates/ipr/search_doc_result.html
index 08c69628e..5c332b9bd 100644
--- a/ietf/templates/ipr/search_doc_result.html
+++ b/ietf/templates/ipr/search_doc_result.html
@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
 {% endblock %}
 
-{% block search_header %}<div class="mt-5">Document IPR search results<br><small class="text-muted">{{doc}}</small></div>{% endblock %}
+{% block search_header %}Document IPR search results<br><small class="text-muted">{{doc}}</small>{% endblock %}
 
 {% block search_result %}
     <p class="alert alert-info my-3">Total number of IPR disclosures found: <b>{{ iprs|length }}</b>.</p>
@@ -72,7 +72,7 @@
                                     <td>{{ ipr.disclosure.time|date:"Y-m-d" }}</td>
                                     <td>{{ ipr.disclosure.id }}</td>
                                     <td><a href="{% url "ietf.ipr.views.show" id=ipr.disclosure.id %}">{{ ipr.disclosure.title }}</a>{% if ipr.disclosure.state_id == 'removed' %} (Removed) {% endif %}
-                                        {% if ipr.disclosure.updates %} <br/>(Updates ID#: {% for upd in ipr.disclosure.updates %}{{upd.target_id}}{% if not forloop.last %}, {% endif %}{% endfor %}){% endif %}
+                                        {% if ipr.disclosure.updates %} <br>(Updates ID#: {% for upd in ipr.disclosure.updates %}{{upd.target_id}}{% if not forloop.last %}, {% endif %}{% endfor %}){% endif %}
                                     </td>
                                 </tr>
                             {% endif %}
@@ -110,7 +110,7 @@
                         <td>{{ ipr.time|date:"Y-m-d" }}</td>
                         <td>{{ ipr.id }}</td>
                         <td><a href="{% url "ietf.ipr.views.show" id=ipr.id %}">{{ ipr.title }}</a>
-                            {% if ipr.updates %} <br/>(Updates ID#: {% for upd in ipr.updates %}{{upd.target_id}}{% if not forloop.last %}, {% endif %}{% endfor %}){% endif %}
+                            {% if ipr.updates %} <br>(Updates ID#: {% for upd in ipr.updates %}{{upd.target_id}}{% if not forloop.last %}, {% endif %}{% endfor %}){% endif %}
                         </td>
                     </tr>
                 {% endfor %}
diff --git a/ietf/templates/ipr/search_doctitle_result.html b/ietf/templates/ipr/search_doctitle_result.html
index 10100da3e..965cf8dad 100644
--- a/ietf/templates/ipr/search_doctitle_result.html
+++ b/ietf/templates/ipr/search_doctitle_result.html
@@ -19,9 +19,11 @@
         </p>
         <table class="table table-sm table-striped tablesorter">
             <thead>
-                <th data-sort="date">Date</th>
-                <th data-sort="id">ID</th>
-                <th data-sort="statement">Statement</th>
+                <tr>
+                    <th data-sort="date">Date</th>
+                    <th data-sort="id">ID</th>
+                    <th data-sort="statement">Statement</th>
+                </tr>
             </thead>
             {% for alias in docs %}
                 <thead>
diff --git a/ietf/templates/ipr/search_form.html b/ietf/templates/ipr/search_form.html
index 164b32e55..f0a1fcb1c 100644
--- a/ietf/templates/ipr/search_form.html
+++ b/ietf/templates/ipr/search_form.html
@@ -15,7 +15,7 @@
         <div class="input-group">
             {% render_field form.draft class="form-control" placeholder="draft-..." %}
             <button class="btn btn-primary" type="submit" name="submit" value="draft">
-                <span class="bi bi-search"></span> Search
+                <i class="bi bi-search"></i> Search
             </button>
         </div>
     </div>
@@ -24,7 +24,7 @@
         <div class="input-group">
             {% render_field form.rfc class="form-control" placeholder="123..." %}
             <button class="btn btn-primary" type="submit" name="submit" value="rfc">
-                <span class="bi bi-search"></span> Search
+                <i class="bi bi-search"></i> Search
             </button>
         </div>
     </div>
@@ -33,7 +33,7 @@
         <div class="input-group">
             {% render_field form.doctitle class="form-control" placeholder="protocol..." %}
             <button class="btn btn-primary" type="submit" name="submit" value="doctitle">
-                <span class="bi bi-search"></span> Search
+                <i class="bi bi-search"></i> Search
             </button>
         </div>
     </div>
@@ -45,7 +45,7 @@
                     type="submit"
                     name="submit"
                     value="group">
-                <span class="bi bi-search"></span> Search
+                <i class="bi bi-search"></i> Search
             </button>
         </div>
     </div>
@@ -55,7 +55,7 @@
         <div class="input-group">
             {% render_field form.holder class="form-control" placeholder="John Doe..." %}
             <button class="btn btn-primary" type="submit" name="submit" value="holder">
-                <span class="bi bi-search"></span> Search
+                <i class="bi bi-search"></i> Search
             </button>
         </div>
     </div>
@@ -64,7 +64,7 @@
         <div class="input-group">
             {% render_field form.iprtitle class="form-control" placeholder="protocol..." %}
             <button class="btn btn-primary" type="submit" name="submit" value="iprtitle">
-                <span class="bi bi-search"></span> Search
+                <i class="bi bi-search"></i> Search
             </button>
         </div>
     </div>
@@ -73,7 +73,7 @@
         <div class="input-group">
             {% render_field form.patent class="form-control" %}
             <button class="btn btn-primary" type="submit" name="submit" value="patent">
-                <span class="bi bi-search"></span> Search
+                <i class="bi bi-search"></i> Search
             </button>
         </div>
         <div class="form-text">
diff --git a/ietf/templates/ipr/search_result.html b/ietf/templates/ipr/search_result.html
index f9ba9a0a3..1b4070bd7 100644
--- a/ietf/templates/ipr/search_result.html
+++ b/ietf/templates/ipr/search_result.html
@@ -12,7 +12,7 @@
 {% block content %}
     {% origin %}
     {% include "ipr/search_form.html" %}
-    <h2>
+    <h2 class="mt-5">
         {% block search_header %}Patent owner/applicant search result{% endblock %}
     </h2>
     {% block search_result %}
@@ -26,9 +26,11 @@
             </p>
             <table class="table table-sm table-striped tablesorter">
                 <thead>
-                    <th data-sort="date">Date</th>
-                    <th data-sort="id">ID</th>
-                    <th data-sort="statement">Statement</th>
+                    <tr>
+                        <th data-sort="date">Date</th>
+                        <th data-sort="id">ID</th>
+                        <th data-sort="statement">Statement</th>
+                    </tr>
                 </thead>
                 {% block iprlist %}
                     {% for ipr in iprs %}
@@ -53,8 +55,7 @@
                                                 is related to
                                                 {% for item in iprdocrels %}
                                                     {% if forloop.last and forloop.counter > 1 %}and{% endif %}
-                                                    {{ item.formatted_name|urlize_ietf_docs }} ("{{ item.document.document.title }}")
-                                                    {% if not forloop.last and forloop.counter > 1 %},{% endif %}
+                                                    {{ item.formatted_name|urlize_ietf_docs }} ("{{ item.document.document.title }}"){% if not forloop.last and forloop.counter > 1 %},{% endif %}
                                                 {% endfor %}
                                             {% endif %}
                                         {% endwith %}
diff --git a/ietf/templates/liaisons/detail.html b/ietf/templates/liaisons/detail.html
index 6d39be124..9552f84fb 100644
--- a/ietf/templates/liaisons/detail.html
+++ b/ietf/templates/liaisons/detail.html
@@ -170,7 +170,7 @@
                                 Liaison #{{ rel.pk }}
                             {% endif %}
                         </a>
-                        <br />
+                        <br>
                     {% endfor %}
                 </td>
             </tr>
@@ -189,7 +189,7 @@
                                 Liaison #{{ rel.pk }}
                             {% endif %}
                         </a>
-                        <br />
+                        <br>
                     {% endfor %}
                 </td>
             </tr>
@@ -225,11 +225,11 @@
             </a>
         {% endif %}
         {% if liaison.state.slug == 'pending' and can_edit %}
-            <input class="btn btn-primary" type="submit" value="Approve" name='approved' />
+            <input class="btn btn-primary" type="submit" value="Approve" name='approved'>
             <input class="btn btn-primary"
                    type="submit"
                    value="Mark as Dead"
-                   name='dead'/>
+                   name='dead'>
         {% endif %}
         {% if liaison.state.slug == 'posted' and  user|has_role:"Secretariat" %}
             <a class="btn btn-primary"
@@ -241,7 +241,7 @@
             <input class="btn btn-primary"
                    type="submit"
                    value="Resurrect"
-                   name='resurrect'/>
+                   name='resurrect'>
         {% endif %}
     </form>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/liaisons/detail_history.html b/ietf/templates/liaisons/detail_history.html
index 15420fe90..ef8597486 100644
--- a/ietf/templates/liaisons/detail_history.html
+++ b/ietf/templates/liaisons/detail_history.html
@@ -30,21 +30,23 @@
                 <th data-sort="text">Text</th>
             </tr>
         </thead>
-        <tbody>
-            {% for e in events %}
-                <tr>
-                    <td class="text-nowrap">{{ e.time|date:"Y-m-d" }}</td>
-                    <td>
-                        {{ e.type }}
-                        {% if e.response_due and e.response_past_due %}
-                            <span class="bi bi-exclamation-circle" title="Response overdue"></span>
-                        {% endif %}
-                    </td>
-                    <td>{{ e.by }}</td>
-                    <td>{{ e.desc|format_history_text }}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
+        {% if events %}
+            <tbody>
+                {% for e in events %}
+                    <tr>
+                        <td class="text-nowrap">{{ e.time|date:"Y-m-d" }}</td>
+                        <td>
+                            {{ e.type }}
+                            {% if e.response_due and e.response_past_due %}
+                                <i class="bi bi-exclamation-circle" title="Response overdue"></i>
+                            {% endif %}
+                        </td>
+                        <td>{{ e.by }}</td>
+                        <td>{{ e.desc|format_history_text }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        {% endif %}
     </table>
 {% endblock %}
 {% block js %}
diff --git a/ietf/templates/liaisons/edit.html b/ietf/templates/liaisons/edit.html
index d32f32e03..894709831 100644
--- a/ietf/templates/liaisons/edit.html
+++ b/ietf/templates/liaisons/edit.html
@@ -18,9 +18,9 @@
 {% endblock %}
 {% block content %}
     {% origin %}
-    <h1>
+    <h1 class="mb-3">
         {% if liaison %}
-            Edit liaison: {{ liaison }}
+            Edit liaison<br><small class="text-muted">{{ liaison }}</small>
         {% else %}
             Send Liaison Statement
         {% endif %}
@@ -32,13 +32,13 @@
     {% endif %}
     {% bootstrap_form_errors form %}
     {% if not liaison %}
-        <p class="form-text">
+        <p>
             If you wish to submit your liaison statement by e-mail, then please send it to
             <a href="mailto:statements@ietf.org">statements@ietf.org</a>
         </p>
-        <p class="form-text">
+        <p>
             Fields marked with
-            <label class="required"></label>
+            <label class="required">&nbsp;FIXME-LARS</label>
             are required. For detailed descriptions of the fields see the
             <a href="{% url 'liaison-help-fields' %}">field help</a>.
         </p>
@@ -57,11 +57,7 @@
             {% endfor %}
         {% endfor %}
         <a class="btn btn-danger float-end"
-           href="{% if liaison %}
-                     {% url "ietf.liaisons.views.liaison_detail" object_id=liaison.pk %}
-                 {% else %}
-                     {% url "ietf.liaisons.views.liaison_list" %}
-                 {% endif %}">
+           href="{% if liaison %}{% url 'ietf.liaisons.views.liaison_detail' object_id=liaison.pk %}{% else %}{% url 'ietf.liaisons.views.liaison_list' %}{% endif %}">
             Cancel
         </a>
         {% if not liaison %}
diff --git a/ietf/templates/liaisons/field_help.html b/ietf/templates/liaisons/field_help.html
index bd01bc843..929543b72 100644
--- a/ietf/templates/liaisons/field_help.html
+++ b/ietf/templates/liaisons/field_help.html
@@ -62,13 +62,13 @@
             <th>From</th>
             <th>Response Contacts</th>
             <td>The e-mail address(es) to which any response should be sent, separated by commas.</td>
-            <td>Mandatory format: Name &lt;e-mail address&gt</td>
-        </tr
+            <td>Mandatory format: <code>Name &lt;e-mail address&gt;</code></td>
+        </tr>
         <tr>
             <th>To</th>
             <th>Groups</th>
             <td>The organization(s) (and sub-group, if applicable) to which the liaison statement is being sent.</td>
-            <td>Drop-down menu with available choices.  If an SDO is not listed, please contact statements@ietf.org</td>
+            <td>Drop-down menu with available choices.  If an SDO is not listed, please contact <a href="mailto:statements@ietf.org">statements@ietf.org</a>.</td>
         </tr>
         <tr>
             <th>
@@ -95,7 +95,7 @@
                 The e-mail address(es) of individuals or lists that may be contacted for clarification of the liaison statement, separated by commas.
             </td>
             <td>
-                Optional. Suggested format: Name &lt;e-mail address&gt
+                Optional. Suggested format: <code>Name &lt;e-mail address&gt;</code>
             </td>
         </tr>
         <tr>
@@ -109,7 +109,7 @@
                 The e-mail address(es) of the persons responsible for acting on the statement.
             </td>
             <td>
-                Optional. Suggested format: Name &lt;e-mail address&gt
+                Optional. Suggested format: <code>Name &lt;e-mail address&gt;</code>
             </td>
         </tr>
         <tr>
@@ -123,7 +123,7 @@
                 The e-mail address(es) of the copy recipient(s) of the liaison statement, one on each line.
             </td>
             <td>
-                Optional. Suggested format: Name &lt;e-mail address&gt
+                Optional. Suggested format: <code>Name &lt;e-mail address&gt;</code>
             </td>
         </tr>
         <tr>
diff --git a/ietf/templates/liaisons/guide_from_ietf.html b/ietf/templates/liaisons/guide_from_ietf.html
index 62977af79..e05f92573 100644
--- a/ietf/templates/liaisons/guide_from_ietf.html
+++ b/ietf/templates/liaisons/guide_from_ietf.html
@@ -52,7 +52,7 @@
                 The IAB Chair (if not the submitter) &lt;iab-chair@iab.org&gt;
                 <br>
                 The IAB &lt;iab@iab.org&gt;
-            </li>
+
         </td>
     </tr>
     <tr>
@@ -64,7 +64,7 @@
             The IETF Chair (if not the submitter) &lt;chair@ietf.org&gt;
             <br>
             The IESG &lt;iesg@ietf.org&gt;
-        </li>
+
     </td>
 </tr>
 <tr>
@@ -76,7 +76,7 @@
         The IETF Chair (if not the submitter) &lt;chair@ietf.org&gt;
         <br>
         The IESG &lt;iesg@ietf.org&gt;
-    </li>
+
 </td>
 </tr>
 <tr>
@@ -91,7 +91,7 @@
         The IETF Chair &lt;chair@ietf.org&gt;
         <br>
         The IETF Area Directorate Mailing List (where applicable) <sup><small>(5)</small></sup>
-    </li>
+
 </td>
 </tr>
 <tr>
@@ -106,7 +106,7 @@
         <a href="/wg/">The IETF Area Director(s)</a>
         <br>
         <a href="/wg/">The IETF Working Group Discussion List</a>
-    </li>
+
 </td>
 </tr>
 </table>
diff --git a/ietf/templates/liaisons/liaison_table.html b/ietf/templates/liaisons/liaison_table.html
index fec05ffa9..774dd15cc 100644
--- a/ietf/templates/liaisons/liaison_table.html
+++ b/ietf/templates/liaisons/liaison_table.html
@@ -11,28 +11,30 @@
             <th data-sort="title">Title</th>
         </tr>
     </thead>
-    <tbody>
-        {% for liaison in liaisons %}
-            <tr>
-                <td class="text-nowrap">{{ liaison.sort_date|date:"Y-m-d" }}</td>
-                <td class="liaison-group-col">{{ liaison.from_groups_display }}</td>
-                <td class="liaison-group-col">{{ liaison.to_groups_display }}</td>
-                <td class="text-nowrap">
-                    {{ liaison.deadline|default:"-"|date:"Y-m-d" }}
-                    {% if liaison.deadline and not liaison.action_taken %}
-                        <br>
-                        <span class="badge
-                                     {% if liaison.is_outgoing %}
-                                         bg-warning
-                                     {% else %}
-                                         bg-info
-                                     {% endif %}">Action Needed</span>
-                    {% endif %}
-                </td>
-                <td>
-                    <a href="{% url "ietf.liaisons.views.liaison_detail" object_id=liaison.pk %}">{{ liaison.title }}</a>
-                </td>
-            </tr>
-        {% endfor %}
-    </tbody>
+    {% if liaisons %}
+        <tbody>
+            {% for liaison in liaisons %}
+                <tr>
+                    <td class="text-nowrap">{{ liaison.sort_date|date:"Y-m-d" }}</td>
+                    <td class="liaison-group-col">{{ liaison.from_groups_display }}</td>
+                    <td class="liaison-group-col">{{ liaison.to_groups_display }}</td>
+                    <td class="text-nowrap">
+                        {{ liaison.deadline|default:"-"|date:"Y-m-d" }}
+                        {% if liaison.deadline and not liaison.action_taken %}
+                            <br>
+                            <span class="badge
+                                         {% if liaison.is_outgoing %}
+                                             bg-warning
+                                         {% else %}
+                                             bg-info
+                                         {% endif %}">Action Needed</span>
+                        {% endif %}
+                    </td>
+                    <td>
+                        <a href="{% url "ietf.liaisons.views.liaison_detail" object_id=liaison.pk %}">{{ liaison.title }}</a>
+                    </td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    {% endif %}
 </table>
\ No newline at end of file
diff --git a/ietf/templates/liaisons/search_form.html b/ietf/templates/liaisons/search_form.html
index f6cc3951e..9d078ac60 100644
--- a/ietf/templates/liaisons/search_form.html
+++ b/ietf/templates/liaisons/search_form.html
@@ -11,7 +11,7 @@
     <div class="input-group search_field my-3">
         {{ form.text|add_class:"form-control"|attr:"placeholder:Title, body, identifiers, etc." }}
         <button class="btn btn-primary" type="submit">
-            <span class="bi bi-search"/>
+            <i class="bi bi-search"></i>
             Search
         </button>
     </div>
@@ -38,7 +38,7 @@
                     <div class="row">
                         <div class="offset-md-2 col-md-10 search_field">
                             <button class="btn btn-primary" type="submit">
-                                <span class="bi bi-search"></span>
+                                <i class="bi bi-search"></i>
                                 Search
                             </button>
                             <button id="search-clear-btn" class="btn btn-secondary float-end" type="button">Clear</button>
diff --git a/ietf/templates/mailinglists/group_archives.html b/ietf/templates/mailinglists/group_archives.html
index 4c0c76fd1..dfe71d3bd 100644
--- a/ietf/templates/mailinglists/group_archives.html
+++ b/ietf/templates/mailinglists/group_archives.html
@@ -33,16 +33,18 @@
                 <th data-sort="name">Name</th>
             </tr>
         </thead>
-        <tbody>
-            {% for group in groups %}
-                <tr>
-                    <td>
-                        <a href="{{ group.list_archive }}">{{ group.acronym }}</a>
-                    </td>
-                    <td>{{ group.name }}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
+        {% if groups %}
+            <tbody>
+                {% for group in groups %}
+                    <tr>
+                        <td>
+                            <a href="{{ group.list_archive }}">{{ group.acronym }}</a>
+                        </td>
+                        <td>{{ group.name }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        {% endif %}
     </table>
 {% endblock %}
 {% block js %}
diff --git a/ietf/templates/mailtrigger/recipient.html b/ietf/templates/mailtrigger/recipient.html
index ed0daff77..501aff4ae 100644
--- a/ietf/templates/mailtrigger/recipient.html
+++ b/ietf/templates/mailtrigger/recipient.html
@@ -18,36 +18,40 @@
                 <th data-sort="code">Code</th>
             </tr>
         </thead>
-        <tbody>
-            {% for recipient in recipients %}
-                <tr>
-                    <td>
-                        <span title="{{ recipient.desc }}">{{ recipient.slug }}</span>
-                    </td>
-                    <td>
-                        {% for mailtrigger in recipient.used_in_to.all %}
-                            <a href="{% url 'ietf.mailtrigger.views.show_triggers' mailtrigger.slug %}"
-                               title="{{ mailtrigger.desc }}">
-                                {{ mailtrigger.slug }}
-                            </a>
-                            {% if not forloop.last %},{% endif %}
-                        {% endfor %}
-                        {% if recipient.used_in_to.exists and recipient.used_in_cc.exists %},{% endif %}
-                        {% for mailtrigger in recipient.used_in_cc.all %}
-                            <a href="{% url 'ietf.mailtrigger.views.show_triggers' mailtrigger.slug %}"
-                               title="{{ mailtrigger.desc }}">
-                                {{ mailtrigger.slug }}
-                            </a>
-                            {% if not forloop.last %},{% endif %}
-                        {% endfor %}
-                    </td>
-                    <td>{{ recipient.template|linkify|urlize_ietf_docs }}</td>
-                    <td>
-                        {% if recipient.code %}<code>{{ recipient.code }}</code>{% endif %}
-                    </td>
-                </tr>
-            {% endfor %}
-        </tbody>
+        {% if recipients %}
+            <tbody>
+                {% for recipient in recipients %}
+                    <tr>
+                        <td>
+                            <span title="{{ recipient.desc }}">{{ recipient.slug }}</span>
+                        </td>
+                        <td>
+                            {% for mailtrigger in recipient.used_in_to.all %}
+                                <a href="{% url 'ietf.mailtrigger.views.show_triggers' mailtrigger.slug %}"
+                                   title="{{ mailtrigger.desc }}">
+                                    {{ mailtrigger.slug }}</a>{% if not forloop.last %},{% endif %}
+                            {% endfor %}
+                            {% if recipient.used_in_to.exists and recipient.used_in_cc.exists %},{% endif %}
+                            {% for mailtrigger in recipient.used_in_cc.all %}
+                                <a href="{% url 'ietf.mailtrigger.views.show_triggers' mailtrigger.slug %}"
+                                   title="{{ mailtrigger.desc }}">
+                                    {{ mailtrigger.slug }}</a>{% if not forloop.last %},{% endif %}
+                            {% endfor %}
+                        </td>
+                        <td>
+                            {% if recipient.template %}
+                                <code>{{ recipient.template|escape|linebreaksbr }}</code>
+                            {% endif %}
+                        </td>
+                        <td>
+                            {% if recipient.code %}
+                                <code>{{ recipient.code|escape|linebreaksbr }}</code>
+                            {% endif %}
+                        </td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        {% endif %}
     </table>
 {% endblock %}
 {% block js %}
diff --git a/ietf/templates/mailtrigger/trigger.html b/ietf/templates/mailtrigger/trigger.html
index 88d933296..618414261 100644
--- a/ietf/templates/mailtrigger/trigger.html
+++ b/ietf/templates/mailtrigger/trigger.html
@@ -28,9 +28,7 @@
                             {% comment %}<span title="{{recipient.desc}}">{{recipient.slug}}</span>{% endcomment %}
                             <a href="{% url 'ietf.mailtrigger.views.show_recipients' recipient.slug %}"
                                title="{{ recipient.desc }}">
-                                {{ recipient.slug }}
-                            </a>
-                            {% if not forloop.last %},{% endif %}
+                                {{ recipient.slug }}</a>{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </td>
                     <td>
@@ -39,9 +37,7 @@
                                 {% comment %}<span title="{{recipient.desc}}">{{recipient.slug}}</span>{% endcomment %}
                                 <a href="{% url 'ietf.mailtrigger.views.show_recipients' recipient.slug %}"
                                    title="{{ recipient.desc }}">
-                                    {{ recipient.slug }}
-                                </a>
-                                {% if not forloop.last %},{% endif %}
+                                    {{ recipient.slug }}</a>{% if not forloop.last %},{% endif %}
                             {% endfor %}
                         {% endif %}
                     </td>
diff --git a/ietf/templates/meeting/add_session_drafts.html b/ietf/templates/meeting/add_session_drafts.html
index d36ad661d..07d85c11d 100644
--- a/ietf/templates/meeting/add_session_drafts.html
+++ b/ietf/templates/meeting/add_session_drafts.html
@@ -31,20 +31,22 @@
                 <th data-sort="document">Document</th>
             </tr>
         </thead>
-        <tbody>
-            {% for sp in already_linked %}
-                <tr>
-                    <td>
-                        {% if sp.rev %}
-                            -{{ sp.rev }}
-                        {% else %}
-                            (current)
-                        {% endif %}
-                    </td>
-                    <td>{{ sp.document.title }} ({{ sp.document.name }})</td>
-                </tr>
-            {% endfor %}
-        </tbody>
+        {% if already_linked %}
+            <tbody>
+                {% for sp in already_linked %}
+                    <tr>
+                        <td>
+                            {% if sp.rev %}
+                                -{{ sp.rev }}
+                            {% else %}
+                                (current)
+                            {% endif %}
+                        </td>
+                        <td>{{ sp.document.title }} ({{ sp.document.name }})</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        {% endif %}
     </table>
     <h2 class="mt-5">Additional drafts to link to this session</h2>
     <form method="post">
diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index 87de11f70..3f8f02ecb 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -44,10 +44,9 @@
             {{ schedule.meeting.agenda_info_note|removetags:"h1"|safe }}
         </p>
     {% endif %}
+    XXX1
     {% include 'meeting/tz-display.html' with id_suffix="" timezone=timezone %}
-    <p>
-        {% include "meeting/agenda_filter.html" with filter_categories=filter_categories customize_button_text="Personalize the agenda view..." always_show=personalize %}
-    </p>
+    {% include "meeting/agenda_filter.html" with filter_categories=filter_categories customize_button_text="Personalize the agenda view..." always_show=personalize %}
     {% include "meeting/agenda_personalize_buttonlist.html" with meeting=schedule.meeting only %}
     <div class="input-group input-group-sm mb-3">
         <button class="btn btn-outline-primary dropdown-toggle"
@@ -303,8 +302,6 @@
 </tbody>
 </table>
 {% include "meeting/agenda_personalize_buttonlist.html" with meeting=schedule.meeting only %}
-</div>
-</div>
 {% endcache %}
 {% endblock %}
 {% block js %}
diff --git a/ietf/templates/meeting/agenda_by_room.html b/ietf/templates/meeting/agenda_by_room.html
index acc65c34c..963d1b579 100644
--- a/ietf/templates/meeting/agenda_by_room.html
+++ b/ietf/templates/meeting/agenda_by_room.html
@@ -21,10 +21,8 @@
                             </li>
                         {% endfor %}
                     </ul>
-                </li>
-            {% endfor %}
-        </div>
-    </li>
-{% endfor %}
-</div>
+                {% endfor %}
+            </div>
+        {% endfor %}
+    </div>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/agenda_by_type.html b/ietf/templates/meeting/agenda_by_type.html
index e932bdcd2..55f6c2aa6 100644
--- a/ietf/templates/meeting/agenda_by_type.html
+++ b/ietf/templates/meeting/agenda_by_type.html
@@ -13,8 +13,7 @@
             <div class="typelistentry">
                 <h2 class="mt-5">{{ type.grouper|title }}</h2>
                 {% if schedule == meeting.schedule %}
-                    <a id="ical-link"
-                       class="btn btn-primary"
+                    <a class="btn btn-primary ical-link"
                        href="{% url "ietf.meeting.views.agenda_by_type_ics" num=meeting.number type=type.grouper %}">
                         Download to Calendar
                     </a>
diff --git a/ietf/templates/meeting/diff_schedules.html b/ietf/templates/meeting/diff_schedules.html
index 63ee6cd50..1492fcd6a 100644
--- a/ietf/templates/meeting/diff_schedules.html
+++ b/ietf/templates/meeting/diff_schedules.html
@@ -23,6 +23,9 @@
         {% if diffs %}
             <table class="table table-sm table-striped schedule-diffs">
                 <thead>
+                    <tr>
+                        <th></th>
+                    </tr>
                 </thead>
                 <tbody>
                     {% for d in diffs %}
diff --git a/ietf/templates/meeting/edit_meeting_schedule_session.html b/ietf/templates/meeting/edit_meeting_schedule_session.html
index 6b51af0eb..9a571f282 100644
--- a/ietf/templates/meeting/edit_meeting_schedule_session.html
+++ b/ietf/templates/meeting/edit_meeting_schedule_session.html
@@ -57,8 +57,7 @@
             <div>
                 Resources:
                 {% for r in session.resources.all %}
-                    {{ r.name }}
-                    {% if not forloop.last %},{% endif %}
+                    {{ r.name }}{% if not forloop.last %},{% endif %}
                 {% endfor %}
             </div>
         {% endif %}
diff --git a/ietf/templates/meeting/edit_session.html b/ietf/templates/meeting/edit_session.html
index d64124252..1abc6390f 100644
--- a/ietf/templates/meeting/edit_session.html
+++ b/ietf/templates/meeting/edit_session.html
@@ -12,7 +12,7 @@
         <br>
         <small class="text-muted">{{ session }}</small>
     </h1>
-    <form class="session-details-form" method="post" class="my-3">
+    <form class="session-details-form my-3" method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
         <button type="submit" class="btn btn-primary">Save</button>
diff --git a/ietf/templates/meeting/floor-plan.html b/ietf/templates/meeting/floor-plan.html
index 6e8323b0e..031fbd909 100644
--- a/ietf/templates/meeting/floor-plan.html
+++ b/ietf/templates/meeting/floor-plan.html
@@ -38,28 +38,29 @@
                 <div class="floor-plan position-relative">
                     {% if floor.image %}
                         <img id="floor-{{ floor.name|xslugify }}-image"
+                             alt="{{ floor.name }} Map"
                              class="img-fluid w-100"
                              src="{{ floor.image.url }}">
                         {# We need as many of these as we can have individual rooms combining into one #}
                         <div id="floor-{{ floor.name|xslugify }}-arrowdiv0"
                              class="position-absolute"
                              style="visibility: hidden;">
-                            <img id="arrow" src="{% static 'ietf/images/arrow-ani.webp' %}">
+                            <img alt="Location arrow" src="{% static 'ietf/images/arrow-ani.webp' %}">
                         </div>
                         <div id="floor-{{ floor.name|xslugify }}-arrowdiv1"
                              class="position-absolute"
                              style="visibility: hidden;">
-                            <img id="arrow" src="{% static 'ietf/images/arrow-ani.webp' %}">
+                            <img alt="Location arrow" src="{% static 'ietf/images/arrow-ani.webp' %}">
                         </div>
                         <div id="floor-{{ floor.name|xslugify }}-arrowdiv2"
                              class="position-absolute"
                              style="visibility: hidden;">
-                            <img id="arrow" src="{% static 'ietf/images/arrow-ani.webp' %}">
+                            <img alt="Location arrow" src="{% static 'ietf/images/arrow-ani.webp' %}">
                         </div>
                         <div id="floor-{{ floor.name|xslugify }}-arrowdiv3"
                              class="position-absolute"
                              style="visibility: hidden;">
-                            <img id="arrow" src="{% static 'ietf/images/arrow-ani.webp' %}">
+                            <img alt="Location arrow" src="{% static 'ietf/images/arrow-ani.webp' %}">
                         </div>
                     {% else %}
                         No floor image available yet.
diff --git a/ietf/templates/meeting/group_materials.html b/ietf/templates/meeting/group_materials.html
index af83b1d76..9ece7fd76 100644
--- a/ietf/templates/meeting/group_materials.html
+++ b/ietf/templates/meeting/group_materials.html
@@ -27,8 +27,8 @@
                 {% for agenda in session.all_meeting_agendas %}
                     {% if session.all_meeting_agendas|length == 1 %}
                         {% if agenda.time > old %}
-                            <span class="small bi bi-bell"
-                                  title="Last Update: {{ agenda.time|utc|date:"Y-m-d H:i:s" }} UTC"></span>
+                            <i class="small bi bi-bell"
+                                  title="Last Update: {{ agenda.time|utc|date:"Y-m-d H:i:s" }} UTC"></i>
                         {% endif %}
                         <a href="{{ session.all_meeting_agendas.0|meeting_href:session.meeting }}">Agenda</a>
                         <br>
@@ -68,7 +68,7 @@
                         {% for bluesheets in session.all_meeting_bluesheets %}
                             <a href="{{ bluesheets|meeting_href:session.meeting }}">
                                 Bluesheets
-                                <br />
+                                <br>
                                 <span class="small float-end">{{ bluesheets.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i" }}</span>
                             </a>
                             <br>
@@ -83,8 +83,8 @@
             {% with session.all_meeting_slides as slides %}
                 {% for slide in slides %}
                     {% if slide.time > old %}
-                        <span class="small bi bi-bell"
-                              title="Last Update: {{ slide.time|utc|date:"Y-m-d H:i:s" }} UTC"></span>
+                        <i class="small bi bi-bell"
+                              title="Last Update: {{ slide.time|utc|date:"Y-m-d H:i:s" }} UTC"></i>
                     {% endif %}
                     <a href="{{ slide|meeting_href:session.meeting }}">{{ slide.title|clean_whitespace }}</a>
                     <br>
@@ -97,8 +97,8 @@
             {% with session.all_meeting_drafts as drafts %}
                 {% for draft in drafts %}
                     {% if draft.time > old %}
-                        <span class="small bi bi-bell"
-                              title="Last Update: {{ draft.time|utc|date:"Y-m-d H:i:s" }} UTC"></span>
+                        <i class="small bi bi-bell"
+                              title="Last Update: {{ draft.time|utc|date:"Y-m-d H:i:s" }} UTC"></i>
                     {% endif %}
                     <a href="{{ draft.get_href }}">{{ draft.name }}</a>
                     <br>
diff --git a/ietf/templates/meeting/group_proceedings.html b/ietf/templates/meeting/group_proceedings.html
index b753831c1..7d7d25679 100644
--- a/ietf/templates/meeting/group_proceedings.html
+++ b/ietf/templates/meeting/group_proceedings.html
@@ -82,12 +82,12 @@
         <td>
             {% if session.all_meeting_sessions_for_group|length == 1 %}
                 {% for rec in session.all_meeting_recordings %}
-                    <a href="{{ rec|meeting_href:meeting }}">{{ rec|hack_recording_title:False }}</a>
+                    <a href="{{ rec|meeting_href:meeting|default:"#" }}">{{ rec|hack_recording_title:False }}</a>
                     <br>
                 {% endfor %}
             {% else %}
                 {% for rec in session.all_meeting_recordings %}
-                    <a href="{{ rec|meeting_href:meeting }}">{{ rec|hack_recording_title:True }}</a>
+                    <a href="{{ rec|meeting_href:meeting|default:"#" }}">{{ rec|hack_recording_title:True }}</a>
                     <br>
                 {% endfor %}
             {% endif %}
diff --git a/ietf/templates/meeting/interim_request.html b/ietf/templates/meeting/interim_request.html
index 7edbac95b..69bab0294 100644
--- a/ietf/templates/meeting/interim_request.html
+++ b/ietf/templates/meeting/interim_request.html
@@ -33,10 +33,6 @@
         {% for form in formset %}
             <div class="fieldset{% if forloop.last %} template visually-hidden{% endif %}">
                 <hr class="my-4">
-                <input id="id_session_set-{{ forloop.counter0 }}-id"
-                       name="session_set-{{ forloop.counter0 }}-id"
-                       type="hidden"
-                       value="{{ form.instance.pk|default_if_none:"" }}">
                 {% bootstrap_form form layout='horizontal' %}
                 <button name="id_session_set-{{ forloop.counter0 }}-delete-button"
                         type="button"
@@ -47,7 +43,7 @@
         {% endfor %}
         <div class="my-3">
             <button id="add_session" type="button" class="btn btn-primary offset-md-2">
-                <span class="bi bi-plus" aria-hidden="true"></span>Add session
+                <i class="bi bi-plus" aria-hidden="true"></i>Add session
             </button>
         </div>
         <div class="my-3">
@@ -61,4 +57,4 @@
     <script src="{% static 'ietf/js/datepicker.js' %}"></script>
     <script src="{% static 'ietf/js/select2.js' %}"></script>
     <script src="{% static 'ietf/js/meeting-interim-request.js' %}"></script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/interim_request_details.html b/ietf/templates/meeting/interim_request_details.html
index ad43c8efc..e5c81bfbc 100644
--- a/ietf/templates/meeting/interim_request_details.html
+++ b/ietf/templates/meeting/interim_request_details.html
@@ -112,11 +112,11 @@
                    href="{% url 'ietf.meeting.views.interim_request_edit' number=meeting.number %}">Edit</a>
             {% endif %}
             {% if can_approve and status_slug == 'apprw' %}
-                <input class="btn btn-primary" type="submit" value="Approve" name='approve' />
+                <input class="btn btn-primary" type="submit" value="Approve" name='approve'>
                 <input class="btn btn-primary"
                        type="submit"
                        value="Disapprove"
-                       name='disapprove'/>
+                       name='disapprove'>
             {% endif %}
             {% if user|has_role:"Secretariat" and status_slug == 'scheda' %}
                 <a class="btn btn-primary"
diff --git a/ietf/templates/meeting/interim_request_edit.html b/ietf/templates/meeting/interim_request_edit.html
index c532c6f09..500e38b3e 100644
--- a/ietf/templates/meeting/interim_request_edit.html
+++ b/ietf/templates/meeting/interim_request_edit.html
@@ -31,10 +31,6 @@
         {% for form in formset %}
             <div class="fieldset{% if forloop.last %} template visually-hidden{% endif %}">
                 <hr class="my-4">
-                <input id="id_session_set-{{ forloop.counter0 }}-id"
-                       name="session_set-{{ forloop.counter0 }}-id"
-                       type="hidden"
-                       value="{{ form.instance.pk|default_if_none:"" }}">
                 {% bootstrap_form form layout='horizontal' %}
                 <button name="id_session_set-{{ forloop.counter0 }}-delete-button"
                         type="button"
@@ -45,7 +41,7 @@
         {% endfor %}
         <div class="my-3">
             <button id="add_session" type="button" class="btn btn-primary offset-md-2">
-                <span class="bi bi-plus" aria-hidden="true"></span>Add session
+                <i class="bi bi-plus" aria-hidden="true"></i>Add session
             </button>
         </div>
         <div class="my-3">
@@ -61,4 +57,4 @@
     <script src="{% static 'ietf/js/datepicker.js' %}"></script>
     <script src="{% static 'ietf/js/select2.js' %}"></script>
     <script src="{% static 'ietf/js/meeting-interim-request.js' %}"></script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/interim_send_announcement.html b/ietf/templates/meeting/interim_send_announcement.html
index 27a2d9f54..fefe9db07 100644
--- a/ietf/templates/meeting/interim_send_announcement.html
+++ b/ietf/templates/meeting/interim_send_announcement.html
@@ -32,7 +32,7 @@
             <label for="id_body" class="col-md-2 fw-bold col-form-label">Body</label>
             <div class="col-md-10">{% render_field form.body class="form-control" %}</div>
         </div>
-        <input class="btn btn-primary" type="submit" value="Send" name='send' />
+        <input class="btn btn-primary" type="submit" value="Send" name='send'>
         <a class="btn btn-secondary float-end"
            href="{% url 'ietf.meeting.views.interim_request_details' number=meeting.number %}">
             Back
diff --git a/ietf/templates/meeting/interim_session_buttons.html b/ietf/templates/meeting/interim_session_buttons.html
index 3b4606f07..8e7b3299a 100644
--- a/ietf/templates/meeting/interim_session_buttons.html
+++ b/ietf/templates/meeting/interim_session_buttons.html
@@ -14,19 +14,19 @@
                data-bs-toggle="modal"
                data-bs-target="#modal-{{ item.slug }}"
                title="Show meeting materials">
-                <span class="bi bi-arrows-fullscreen"></span>
+                <i class="bi bi-arrows-fullscreen"></i>
             </a>
             {# materials tar file #}
             <a class="btn btn-outline-primary"
                href="/meeting/{{ meeting.number }}/agenda/{{ acronym }}-drafts.tgz"
                title="Download meeting materials as .tar archive">
-                <span class="bi bi-file-zip"></span>
+                <i class="bi bi-file-zip"></i>
             </a>
             {# materials PDF file #}
             <a class="btn btn-outline-primary"
                href="/meeting/{{ meeting.number }}/agenda/{{ acronym }}-drafts.pdf"
                title="Download meeting materials as PDF file">
-                <span class="bi bi-file-pdf"></span>
+                <i class="bi bi-file-pdf"></i>
             </a>
         {% endif %}
         {# etherpad #}
@@ -35,13 +35,13 @@
                 <a class="btn btn-outline-primary"
                    href="https://notes.ietf.org/notes-ietf-{{ meeting.number }}-plenary"
                    title="Notepad for note-takers">
-                    <span class="bi bi-journal-text"></span>
+                    <i class="bi bi-journal-text"></i>
                 </a>
             {% else %}
                 <a class="btn btn-outline-primary"
                    href="https://notes.ietf.org/notes-ietf-{{ meeting.number }}-{{ acronym }}"
                    title="Notepad for note-takers">
-                    <span class="bi bi-journal-text"></span>
+                    <i class="bi bi-journal-text"></i>
                 </a>
             {% endif %}
         {% endif %}
@@ -51,46 +51,46 @@
             <a class="btn btn-outline-primary"
                href="xmpp:{{ session.jabber_room_name }}@jabber.ietf.org?join"
                title="Jabber room for {{ session.jabber_room_name }}">
-                <span class="bi bi-lightbulb"></span>
+                <i class="bi bi-lightbulb"></i>
             </a>
             {# Remote call-in #}
             {% if session.agenda_note|first_url|conference_url %}
                 <a class="btn btn-outline-primary"
                    href="{{ session.agenda_note|first_url }}"
                    title="Online conference">
-                    <span class="bi bi-people"></span>
+                    <i class="bi bi-people"></i>
                 </a>
             {% elif session.remote_instructions|first_url|conference_url %}
                 <a class="btn btn-outline-primary"
                    href="{{ session.remote_instructions|first_url }}"
                    title="Online conference">
-                    <span class="bi bi-people"></span>
+                    <i class="bi bi-people"></i>
                 </a>
             {% elif item.timeslot.location.webex_url %}
                 <a class="btn btn-outline-primary"
                    href="{{ item.timeslot.location.webex_url|format:session }}"
                    title="Webex session">
-                    <span class="bi bi-people"></span>
+                    <i class="bi bi-people"></i>
                 </a>
                 {# Video stream (meetecho) #}
             {% elif item.timeslot.location.video_stream_url %}
                 <a class="btn btn-outline-primary"
                    href="{{ item.timeslot.location.video_stream_url|format:session }}"
                    title="Meetecho video stream">
-                    <span class="bi bi-camera-video"></span>
+                    <i class="bi bi-camera-video"></i>
                 </a>
             {% else %}
                 <a class="btn btn-outline-primary text-secondary disabled"
                    href="#"
                    title="No online conference info found in remote instructions or agenda note">
-                    <span class="bi bi-people"></span>
+                    <i class="bi bi-people"></i>
                 </a>
             {% endif %}
             {# iCalendar item #}
             <a class="btn btn-outline-primary"
                href="{% url 'ietf.meeting.views.agenda_ical' num=meeting.number session_id=session.id %}"
                title="icalendar entry for {{ acronym }} session on {{ item.timeslot.utc_start_time|date:'Y-m-d H:i' }} UTC">
-                <span class="bi bi-calendar"></span>
+                <i class="bi bi-calendar"></i>
             </a>
         {% else %}
             {# Jabber #}
@@ -109,7 +109,7 @@
                                 <a class="btn btn-outline-primary"
                                    href="{{ href }}"
                                    title="{{ r.title }}">
-                                    <span class="bi bi-file-play"></span>
+                                    <i class="bi bi-file-play"></i>
                                 </a>
                             {% endif %}
                         {% endwith %}
@@ -121,7 +121,7 @@
                                 <a class="btn btn-outline-primary"
                                    href="{{ href }}"
                                    title="{{ r.title }}">
-                                    <span class="bi bi-file-slides"></span>
+                                    <i class="bi bi-file-slides"></i>
                                 </a>
                             {% endif %}
                         {% endwith %}
@@ -133,7 +133,7 @@
                                 <a class="btn btn-outline-primary"
                                    href="{{ href }}"
                                    title="{{ r.title }}">
-                                    <span class="bi bi-file-play"></span>
+                                    <i class="bi bi-file-play"></i>
                                 </a>
                             {% endif %}
                         {% endwith %}
@@ -142,10 +142,10 @@
                     <a class="btn btn-outline-primary"
                        href="http://www.meetecho.com/ietf{{ meeting.number }}/recordings#{{ acronym.upper }}"
                        title="Meetecho session recording">
-                        <span class="bi bi-file-slides"></span>
+                        <i class="bi bi-file-slides"></i>
                     </a>
                 {% elif show_empty  %}
-                    {# <span class="bi"></span> #}
+                    {# <i class="bi"></i> #}
                 {% endif %}
             {% endwith %}
         {% endif %}
diff --git a/ietf/templates/meeting/materials_upload_closed.html b/ietf/templates/meeting/materials_upload_closed.html
index 352fd870f..07ceb1f40 100644
--- a/ietf/templates/meeting/materials_upload_closed.html
+++ b/ietf/templates/meeting/materials_upload_closed.html
@@ -8,9 +8,9 @@
     <h1>IETF {{ meeting_num }} Preliminary &amp; Interim Materials</h1>
     <p>
         Submission began {{ begin_date|date:"F j, Y" }}
-        <br />
+        <br>
         Submission cutoff date: {{ cut_off_date|date:"F j, Y" }}
-        <br />
+        <br>
         Corrections to submissions cutoff date: {{ cor_cut_off_date|date:"F j, Y" }}
     </p>
     <p>
diff --git a/ietf/templates/meeting/proceedings.html b/ietf/templates/meeting/proceedings.html
index 125ccd591..97c44d1f3 100644
--- a/ietf/templates/meeting/proceedings.html
+++ b/ietf/templates/meeting/proceedings.html
@@ -75,8 +75,7 @@
                     {{ area.name }} groups not meeting:
                     {% for session in not_meeting_sessions %}
                         {% ifchanged session.group.acronym %}
-                            <a href="{% url 'ietf.group.views.group_home' acronym=session.group.acronym %}">{{ session.group.acronym }}</a>
-                            {% if not forloop.last %},{% endif %}
+                            <a href="{% url 'ietf.group.views.group_home' acronym=session.group.acronym %}">{{ session.group.acronym }}</a>{% if not forloop.last %},{% endif %}
                         {% endifchanged %}
                     {% endfor %}
                 </p>
diff --git a/ietf/templates/meeting/proceedings/edit_meetinghosts.html b/ietf/templates/meeting/proceedings/edit_meetinghosts.html
index ca4689eee..9b132d117 100644
--- a/ietf/templates/meeting/proceedings/edit_meetinghosts.html
+++ b/ietf/templates/meeting/proceedings/edit_meetinghosts.html
@@ -29,7 +29,8 @@
                     <td class="col-md-3">
                         {% if form.instance.pk and form.instance.logo %}
                             <img class="logo w-100 img-fluid img-thumbnail"
-                                 src="{% url 'ietf.meeting.views_proceedings.meetinghost_logo' num=meeting.number host_id=form.instance.pk %} ">
+                                 alt="Meeting Host Logo"
+                                 src="{% url 'ietf.meeting.views_proceedings.meetinghost_logo' num=meeting.number host_id=form.instance.pk %}">
                         {% else %}
                             (No logo)
                         {% endif %}
diff --git a/ietf/templates/meeting/proceedings/material_details.html b/ietf/templates/meeting/proceedings/material_details.html
index 2be30fc2e..ebab71a3a 100644
--- a/ietf/templates/meeting/proceedings/material_details.html
+++ b/ietf/templates/meeting/proceedings/material_details.html
@@ -91,9 +91,9 @@
       };
 
       function onAdd(event) {
-        var old_session = event.from.getAttribute('session');
-        var new_session = event.to.getAttribute('session');
-        $.post(event.to.getAttribute('addToSession'), {
+        var old_session = event.from.getAttribute(data-'session');
+        var new_session = event.to.getAttribute('data-session');
+        $.post(event.to.getAttribute('data-addToSession'), {
           'order': event.newIndex + 1,
           'name': event.item.getAttribute('name')
         });
@@ -103,8 +103,8 @@
       }
 
       function onRemove(event) {
-        var old_session = event.from.getAttribute('session');
-        $.post(event.from.getAttribute('removeFromSession'), {
+        var old_session = event.from.getAttribute('data-session');
+        $.post(event.from.getAttribute('data-removeFromSession'), {
           'oldIndex': event.oldIndex + 1,
           'name': event.item.getAttribute('name')
         });
@@ -112,7 +112,7 @@
 
       function onEnd(event) {
         if (event.to == event.from) {
-          $.post(event.from.getAttribute('reorderInSession'), {
+          $.post(event.from.getAttribute('data-reorderInSession'), {
             'oldIndex': event.oldIndex + 1,
             'newIndex': event.newIndex + 1
           });
diff --git a/ietf/templates/meeting/proceedings/title.html b/ietf/templates/meeting/proceedings/title.html
index a240eecb2..9be2dbf14 100644
--- a/ietf/templates/meeting/proceedings/title.html
+++ b/ietf/templates/meeting/proceedings/title.html
@@ -14,8 +14,7 @@ This renders the title block for the meeting proceedings page.
     {% if attendance is not None %}
         <div class="proceedings-info lead">
             {% if attendance.onsite > 0 %}
-                {{ attendance.onsite }} onsite participant{{ attendance.onsite|pluralize }}
-                {% if attendance.online > 0 %},{% endif %}
+                {{ attendance.onsite }} onsite participant{{ attendance.onsite|pluralize }}{% if attendance.online > 0 %},{% endif %}
             {% endif %}
             {% if attendance.online > 0 %}{{ attendance.online }} online participant{{ attendance.online|pluralize }}{% endif %}
         </div>
@@ -37,6 +36,7 @@ This renders the title block for the meeting proceedings page.
                                  src="{% url 'ietf.meeting.views_proceedings.meetinghost_logo' num=meeting.number host_id=host.pk %}"
                                  height="{{ host.logo_height }}"
                                  width="{{ host.logo_width }}"
+                                 alt="{{ host.name }}"
                                  title="{{ host.name }}">
                         </div>
                     {% endfor %}
diff --git a/ietf/templates/meeting/proceedings_progress_report.html b/ietf/templates/meeting/proceedings_progress_report.html
index 6f9484302..c34a3ecd1 100644
--- a/ietf/templates/meeting/proceedings_progress_report.html
+++ b/ietf/templates/meeting/proceedings_progress_report.html
@@ -50,20 +50,22 @@
                 <th data-sort="title">Title</th>
             </tr>
         </thead>
-        <tbody>
-            {% for rfc in rfcs %}
-                <tr>
-                    <td class="text-nowrap">
-                        <a href="{{ rfc.doc.get_absolute_url }}">{{ rfc.doc.canonical_name|rfcspace|upper }}</a>
-                    </td>
-                    <td class="text-nowrap">{{ rfc.doc.intended_std_level.name }}</td>
-                    <td>
-                        <a href="{{ rfc.doc.group.about_url }}">{{ rfc.doc.group.acronym }}</a>
-                    </td>
-                    <td class="text-nowrap">{{ rfc.time|date:"F Y" }}</td>
-                    <td>{{ rfc.doc.title }}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
+        {% if rfcs %}
+            <tbody>
+                {% for rfc in rfcs %}
+                    <tr>
+                        <td class="text-nowrap">
+                            <a href="{{ rfc.doc.get_absolute_url }}">{{ rfc.doc.canonical_name|rfcspace|upper }}</a>
+                        </td>
+                        <td class="text-nowrap">{{ rfc.doc.intended_std_level.name }}</td>
+                        <td>
+                            <a href="{{ rfc.doc.group.about_url }}">{{ rfc.doc.group.acronym }}</a>
+                        </td>
+                        <td class="text-nowrap">{{ rfc.time|date:"F Y" }}</td>
+                        <td>{{ rfc.doc.title }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        {% endif %}
     </table>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/properties_edit.html b/ietf/templates/meeting/properties_edit.html
index 9dfe8587a..634784cf2 100644
--- a/ietf/templates/meeting/properties_edit.html
+++ b/ietf/templates/meeting/properties_edit.html
@@ -9,7 +9,7 @@
 {% block content %}
     {% origin %}
     <h1>IETF {{ meeting.number }} Schedule<br><small class="text-muted">
-    {{ schedule.owner }}/{{ schedule.name }} ({{ schedule.official_token }})</small></h2>
+    {{ schedule.owner }}/{{ schedule.name }} ({{ schedule.official_token }})</small></h1>
     <div class="my-3">
         {% if not schedule.is_official %}
             <a class="btn btn-primary"
diff --git a/ietf/templates/meeting/requests.html b/ietf/templates/meeting/requests.html
index d20d148db..cda03a3b2 100644
--- a/ietf/templates/meeting/requests.html
+++ b/ietf/templates/meeting/requests.html
@@ -88,8 +88,7 @@
                                                             {% endwith %}
                                                             {{ constraint.brief_display }}
                                                         </span>
-                                                    {% endif %}
-                                                    {% if not forloop.last %},{% endif %}
+                                                    {% endif %}{% if not forloop.last %},{% endif %}
                                                     {% if constraint_target_parent_id == constraint_source_parent_id and not constraint_person %}</b>{% endif %}
                                                 {% endwith %}
                                             {% endwith %}
diff --git a/ietf/templates/meeting/room-view.html b/ietf/templates/meeting/room-view.html
index 7726d4da2..c319e3013 100644
--- a/ietf/templates/meeting/room-view.html
+++ b/ietf/templates/meeting/room-view.html
@@ -23,7 +23,7 @@
                        role="tab"
                        class="nav-link {% if forloop.first %}active{% endif %}"
                        data-bs-toggle="tab"
-                       area-controls="day{{ forloop.counter0 }}">
+                       aria-controls="day{{ forloop.counter0 }}">
                         {{ day|date:"D, M d" }}
                     </a>
                 </li>
diff --git a/ietf/templates/meeting/schedule_list.html b/ietf/templates/meeting/schedule_list.html
index cda8c5fb5..7b9c8b7bf 100644
--- a/ietf/templates/meeting/schedule_list.html
+++ b/ietf/templates/meeting/schedule_list.html
@@ -39,67 +39,69 @@
                     <td></td>
                 </tr>
             </thead>
-            <tbody>
-                {% for schedule in schedules %}
-                    <tr>
-                        <td>
-                            <a href="{% url "ietf.meeting.views.edit_meeting_schedule" meeting.number schedule.owner_email schedule.name %}"
-                               title="Show regular sessions in agenda">
-                                {{ schedule.name }}
-                            </a>
-                        </td>
-                        <td>{% person_link schedule.owner %}</td>
-                        <td>
-                            {% if schedule.origin %}
-                                <a href="{% url "ietf.meeting.views.edit_meeting_schedule" meeting.number schedule.origin.owner_email schedule.origin.name %}">
-                                    {{ schedule.origin.name }}
+            {% if schedules %}
+                <tbody>
+                    {% for schedule in schedules %}
+                        <tr>
+                            <td>
+                                <a href="{% url "ietf.meeting.views.edit_meeting_schedule" meeting.number schedule.owner_email schedule.name %}"
+                                   title="Show regular sessions in agenda">
+                                    {{ schedule.name }}
                                 </a>
-                                <a href="{% url "ietf.meeting.views.diff_schedules" meeting.number %}?from_schedule={{ schedule.origin.name|urlencode }}&to_schedule={{ schedule.name|urlencode }}"
-                                   title="{{ schedule.changes_from_origin }} change{{ schedule.changes_from_origin|pluralize }} from {{ schedule.origin.name }}">
-                                    +{{ schedule.changes_from_origin }}
-                                </a>
-                            {% endif %}
-                        </td>
-                        <td>
-                            {% if schedule.base %}
-                                <a href="{% url "ietf.meeting.views.edit_meeting_timeslots_and_misc_sessions" meeting.number schedule.base.owner_email schedule.base.name %}">
-                                    {{ schedule.base.name }}
-                                </a>
-                            {% endif %}
-                        </td>
-                        <td>{{ schedule.notes|linebreaksbr }}</td>
-                        <td>
-                            {% if schedule.visible %}
-                                <div class="badge bg-success">visible</div>
-                            {% else %}
-                                <div class="badge bg-warning">hidden</div>
-                            {% endif %}
-                        </td>
-                        <td>
-                            {% if schedule.public %}
-                                <div class="badge bg-success">public</div>
-                            {% else %}
-                                <div class="badge bg-warning">private</div>
-                            {% endif %}
-                        </td>
-                        <td>
-                            <div class="btn-group btn-group-sm float-end" role="group">
-                                {% if schedule.can_edit_properties %}
-                                    <a class="btn btn-outline-primary edit-schedule-properties"
-                                       href="{% url "ietf.meeting.views.edit_schedule_properties" meeting.number schedule.owner_email schedule.name %}?next={{ request.get_full_path|urlencode }}">
-                                        <i title="Edit agenda properties" class="bi bi-pencil"></i>
+                            </td>
+                            <td>{% person_link schedule.owner %}</td>
+                            <td>
+                                {% if schedule.origin %}
+                                    <a href="{% url "ietf.meeting.views.edit_meeting_schedule" meeting.number schedule.origin.owner_email schedule.origin.name %}">
+                                        {{ schedule.origin.name }}
+                                    </a>
+                                    <a href="{% url "ietf.meeting.views.diff_schedules" meeting.number %}?from_schedule={{ schedule.origin.name|urlencode }}&to_schedule={{ schedule.name|urlencode }}"
+                                       title="{{ schedule.changes_from_origin }} change{{ schedule.changes_from_origin|pluralize }} from {{ schedule.origin.name }}">
+                                        +{{ schedule.changes_from_origin }}
                                     </a>
                                 {% endif %}
-                                <a class="btn btn-outline-primary"
-                                   href="{% url "ietf.meeting.views.edit_meeting_timeslots_and_misc_sessions" meeting.number schedule.owner_email schedule.name %}">
-                                    <i title="Show timeslots and misc. sessions for agenda"
-                                       class="bi bi-calendar"></i>
-                                </a>
-                            </div>
-                        </td>
-                    </tr>
-                {% endfor %}
-            </tbody>
+                            </td>
+                            <td>
+                                {% if schedule.base %}
+                                    <a href="{% url "ietf.meeting.views.edit_meeting_timeslots_and_misc_sessions" meeting.number schedule.base.owner_email schedule.base.name %}">
+                                        {{ schedule.base.name }}
+                                    </a>
+                                {% endif %}
+                            </td>
+                            <td>{{ schedule.notes|linebreaksbr }}</td>
+                            <td>
+                                {% if schedule.visible %}
+                                    <div class="badge bg-success">visible</div>
+                                {% else %}
+                                    <div class="badge bg-warning">hidden</div>
+                                {% endif %}
+                            </td>
+                            <td>
+                                {% if schedule.public %}
+                                    <div class="badge bg-success">public</div>
+                                {% else %}
+                                    <div class="badge bg-warning">private</div>
+                                {% endif %}
+                            </td>
+                            <td>
+                                <div class="btn-group btn-group-sm float-end" role="group">
+                                    {% if schedule.can_edit_properties %}
+                                        <a class="btn btn-outline-primary edit-schedule-properties"
+                                           href="{% url "ietf.meeting.views.edit_schedule_properties" meeting.number schedule.owner_email schedule.name %}?next={{ request.get_full_path|urlencode }}">
+                                            <i title="Edit agenda properties" class="bi bi-pencil"></i>
+                                        </a>
+                                    {% endif %}
+                                    <a class="btn btn-outline-primary"
+                                       href="{% url "ietf.meeting.views.edit_meeting_timeslots_and_misc_sessions" meeting.number schedule.owner_email schedule.name %}">
+                                        <i title="Show timeslots and misc. sessions for agenda"
+                                           class="bi bi-calendar"></i>
+                                    </a>
+                                </div>
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            {% endif %}
         </table>
     {% endfor %}
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/session_buttons_include.html b/ietf/templates/meeting/session_buttons_include.html
index 68d641ede..3bd84b1fe 100644
--- a/ietf/templates/meeting/session_buttons_include.html
+++ b/ietf/templates/meeting/session_buttons_include.html
@@ -25,21 +25,21 @@
                                         data-bs-toggle="modal"
                                         data-bs-target="#modal-{{ slug }}"
                                         title="Show meeting materials">
-                                    <span class="bi bi-arrows-fullscreen"></span>
+                                    <i class="bi bi-arrows-fullscreen"></i>
                                 </button>
                                 {# materials tar file #}
                                 <a class="btn btn-outline-primary"
                                    role="button"
                                    href="/meeting/{{ meeting.number }}/agenda/{{ acronym }}-drafts.tgz"
                                    title="Download meeting materials as .tar archive">
-                                    <span class="bi bi-file-zip"></span>
+                                    <i class="bi bi-file-zip"></i>
                                 </a>
                                 {# materials PDF file #}
                                 <a class="btn btn-outline-primary"
                                    role="button"
                                    href="/meeting/{{ meeting.number }}/agenda/{{ acronym }}-drafts.pdf"
                                    title="Download meeting materials as PDF file">
-                                    <span class="bi bi-file-pdf"></span>
+                                    <i class="bi bi-file-pdf"></i>
                                 </a>
                             {% endif %}
                             {# HedgeDoc #}
@@ -49,14 +49,14 @@
                                        role="button"
                                        href="https://notes.ietf.org/notes-ietf-{{ meeting.number }}-plenary"
                                        title="Notepad for note-takers">
-                                        <span class="bi bi-journal-text"></span>
+                                        <i class="bi bi-journal-text"></i>
                                     </a>
                                 {% else %}
                                     <a class="btn btn-outline-primary"
                                        role="button"
                                        href="https://notes.ietf.org/notes-ietf-{{ meeting.number }}-{{ acronym }}"
                                        title="Notepad for note-takers">
-                                        <span class="bi bi-journal-text"></span>
+                                        <i class="bi bi-journal-text"></i>
                                     </a>
                                 {% endif %}
                             {% endif %}
@@ -67,7 +67,7 @@
                                    role="button"
                                    href="xmpp:{{ session.jabber_room_name }}@jabber.ietf.org?join"
                                    title="Chat room for {{ session.jabber_room_name }}">
-                                    <span class="bi bi-lightbulb"></span>
+                                    <i class="bi bi-lightbulb"></i>
                                 </a>
                                 {# Video stream (meetecho) #}
                                 {% if timeslot.location.video_stream_url %}
@@ -75,7 +75,7 @@
                                        role="button"
                                        href="{{ timeslot.location.video_stream_url|format:session }}"
                                        title="Video stream">
-                                        <span class="bi bi-camera-video"></span>
+                                        <i class="bi bi-camera-video"></i>
                                     </a>
                                 {% endif %}
                                 {# Audio stream #}
@@ -84,7 +84,7 @@
                                        role="button"
                                        href="{{ timeslot.location.audio_stream_url|format:session }}"
                                        title="Audio stream">
-                                        <span class="bi bi-headphones"></span>
+                                        <i class="bi bi-headphones"></i>
                                     </a>
                                 {% endif %}
                                 {# Remote call-in #}
@@ -93,21 +93,21 @@
                                        role="button"
                                        href="{{ session.agenda_note|first_url }}"
                                        title="Online conference">
-                                        <span class="bi bi-people"></span>
+                                        <i class="bi bi-people"></i>
                                     </a>
                                 {% elif session.remote_instructions|first_url|conference_url %}
                                     <a class="btn btn-outline-primary"
                                        role="button"
                                        href="{{ session.remote_instructions|first_url }}"
                                        title="Online conference">
-                                        <span class="bi bi-people"></span>
+                                        <i class="bi bi-people"></i>
                                     </a>
                                 {% elif timeslot.location.webex_url %}
                                     <a class="btn btn-outline-primary"
                                        role="button"
                                        href="{{ timeslot.location.webex_url|format:session }}"
                                        title="Webex session">
-                                        <span class="bi bi-people"></span>
+                                        <i class="bi bi-people"></i>
                                     </a>
                                 {% endif %}
                                 {# iCalendar item #}
@@ -115,7 +115,7 @@
                                    role="button"
                                    href="{% url 'ietf.meeting.views.agenda_ical' num=meeting.number session_id=session.id %}"
                                    title="icalendar entry for {{ acronym }} session on {{ timeslot.utc_start_time|date:'Y-m-d H:i' }} UTC">
-                                    <span class="bi bi-calendar"></span>
+                                    <i class="bi bi-calendar"></i>
                                 </a>
                             {% else %}
                                 {# Jabber logs #}
@@ -139,7 +139,7 @@
                                                        role="button"
                                                        href="{{ r.get_href }}"
                                                        title="{{ r.title }}">
-                                                        <span class="bi bi-file-play"></span>
+                                                        <i class="bi bi-file-play"></i>
                                                     </a>
                                                 {% endif %}
                                             {% endfor %}
@@ -150,7 +150,7 @@
                                                        role="button"
                                                        href="{{ r.get_href }}"
                                                        title="{{ r.title }}">
-                                                        <span class="bi bi-file-slides"></span>
+                                                        <i class="bi bi-file-slides"></i>
                                                     </a>
                                                 {% endif %}
                                             {% endfor %}
@@ -161,7 +161,7 @@
                                                        role="button"
                                                        href="{{ r.get_href }}"
                                                        title="{{ r.title }}">
-                                                        <span class="bi bi-file-play"></span>
+                                                        <i class="bi bi-file-play"></i>
                                                     </a>
                                                 {% endif %}
                                             {% endfor %}
@@ -172,7 +172,7 @@
                                            role="button"
                                            href="http://www.meetecho.com/ietf{{ meeting.number }}/recordings#{{ acronym.upper }}"
                                            title="Session recording">
-                                            <span class="bi bi-file-slides"></span>
+                                            <i class="bi bi-file-slides"></i>
                                         </a>
                                     {% endif %}
                                 {% endif %}
diff --git a/ietf/templates/meeting/session_details.html b/ietf/templates/meeting/session_details.html
index 70c5a7f0e..f6214820f 100644
--- a/ietf/templates/meeting/session_details.html
+++ b/ietf/templates/meeting/session_details.html
@@ -19,7 +19,7 @@
         <a class="regular float-end"
            title="icalendar entry for {{ acronym }}@{{ meeting.number }}"
            href="{% url 'ietf.meeting.views.agenda_ical' num=meeting.number acronym=acronym %}">
-            <span class="bi bi-calendar"></span>
+            <i class="bi bi-calendar"></i>
         </a>
     {% endif %}
     {% if is_materials_manager and not can_manage_materials %}
@@ -39,7 +39,7 @@
                 Your proposed slides awaiting chair approval
             {% endif %}
         </h2>
-        <div id="proposedslidelist">
+        <div class="proposedslidelist">
             {% for s in pending_suggestions %}
                 {% if can_manage_materials %}
                     <p>
@@ -58,7 +58,7 @@
 {% endblock %}
 {% block js %}
     {% if can_manage_materials %}
-        <script src={% static 'ietf/js/sortable.js' %}></script>
+        <script src="{% static 'ietf/js/sortable.js' %}"></script>
         <script>
             var sortables=[];
             var options = {
@@ -70,9 +70,9 @@
             };
 
             function onAdd(event) {
-                var old_session = event.from.getAttribute("session");
-                var new_session = event.to.getAttribute("session");
-                $.post(event.to.getAttribute("addToSession"), {
+                var old_session = event.from.getAttribute("data-session");
+                var new_session = event.to.getAttribute("data-session");
+                $.post(event.to.getAttribute("data-addToSession"), {
                     'order': event.newIndex + 1,
                     'name': event.item.getAttribute("name")
                 });
@@ -82,8 +82,8 @@
             }
 
             function onRemove(event) {
-                var old_session = event.from.getAttribute("session");
-                $.post(event.from.getAttribute("removeFromSession"),{
+                var old_session = event.from.getAttribute("data-session");
+                $.post(event.from.getAttribute("data-removeFromSession"),{
                     'oldIndex': event.oldIndex + 1,
                     'name': event.item.getAttribute("name")
                 });
@@ -91,7 +91,7 @@
 
             function onEnd(event) {
                 if (event.to == event.from) {
-                    $.post(event.from.getAttribute("reorderInSession"),{
+                    $.post(event.from.getAttribute("data-reorderInSession"),{
                         'oldIndex': event.oldIndex + 1,
                         'newIndex': event.newIndex + 1
                     });
diff --git a/ietf/templates/meeting/session_details_form.html b/ietf/templates/meeting/session_details_form.html
index 80ee0b35a..6acfc610e 100644
--- a/ietf/templates/meeting/session_details_form.html
+++ b/ietf/templates/meeting/session_details_form.html
@@ -1,6 +1,6 @@
 {# bs5ok #}
 {# Copyright The IETF Trust 2007-2020, All Rights Reserved #}
-<div class="session-details-form" data-prefix="{{ form.prefix }}">
+<div class="session-details-form my-3" data-prefix="{{ form.prefix }}">
     {% if hidden %}
         {{ form.name.as_hidden }}{{ form.purpose.as_hidden }}{{ form.type.as_hidden }}{{ form.requested_duration.as_hidden }}
     {% else %}
diff --git a/ietf/templates/meeting/session_details_panel.html b/ietf/templates/meeting/session_details_panel.html
index 1762b3bc1..3e7efc0cd 100644
--- a/ietf/templates/meeting/session_details_panel.html
+++ b/ietf/templates/meeting/session_details_panel.html
@@ -18,7 +18,7 @@
             {% if session.name %}: {{ session.name }}{% endif %}
         </h3>
         {% if not session.cancelled %}
-            <span class="regular float-end">
+            <div class="regular float-end">
                 {# see note in the included templates re: show_agenda parameter and required JS import #}
                 {% if meeting.type.slug == 'interim' %}
                     {% include "meeting/interim_session_buttons.html" with show_agenda=False show_empty=False %}
@@ -27,7 +27,7 @@
                         {% include "meeting/session_buttons_include.html" with show_agenda=False %}
                     {% endwith %}
                 {% endif %}
-            </span>
+            </div>
         {% endif %}
         {% if session.agenda_note %}<h3 class="mt-4">{{ session.agenda_note }}</h3>{% endif %}
         {% if can_manage_materials %}
@@ -50,12 +50,12 @@
                 <b>Remote instructions:</b>
                 {% if session.agenda_note|first_url|conference_url %}
                     <a href="{{ session.agenda_note|first_url }}" title="Online conference">
-                        <span class="bi bi-beople"></span>
+                        <i class="bi bi-beople"></i>
                     </a>
                 {% elif session.remote_instructions|first_url|conference_url %}
                     <a href="{{ session.remote_instructions|first_url }}"
                        title="Online conference">
-                        <span class="bi bi-people"></span>
+                        <i class="bi bi-people"></i>
                     </a>
                 {% endif %}
                 {{ session.remote_instructions|linkify }}
@@ -63,33 +63,33 @@
         {% endif %}
         <h3 class="mt-4">Agenda, Minutes, and Bluesheets</h3>
         <table class="table table-sm table-striped">
-            <thead>
-            </thead>
-            <tbody>
-                {% for pres in session.filtered_artifacts %}
-                    <tr>
-                        {% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
-                        <td>
-                            <a href="{{ pres.document.get_href }}">{{ pres.document.title }}</a>
-                            <a href="{{ url }}">({{ pres.document.name }})</a>
-                        </td>
-                        <td class="text-end">
-                            {% if user|has_role:"Secretariat" or can_manage_materials %}
-                                {% if pres.document.type.slug == 'minutes' %}
-                                    {% url 'ietf.meeting.views.upload_session_minutes' session_id=session.pk num=session.meeting.number as upload_url %}
-                                {% elif pres.document.type.slug == 'agenda' %}
-                                    {% url 'ietf.meeting.views.upload_session_agenda' session_id=session.pk num=session.meeting.number as upload_url %}
-                                {% else %}
-                                    {% url 'ietf.meeting.views.upload_session_bluesheets' session_id=session.pk num=session.meeting.number as upload_url %}
+            {% if session.filtered_artifacts %}
+                <tbody>
+                    {% for pres in session.filtered_artifacts %}
+                        <tr>
+                            {% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
+                            <td>
+                                <a href="{{ pres.document.get_href }}">{{ pres.document.title }}</a>
+                                <a href="{{ url }}">({{ pres.document.name }})</a>
+                            </td>
+                            <td class="text-end">
+                                {% if user|has_role:"Secretariat" or can_manage_materials %}
+                                    {% if pres.document.type.slug == 'minutes' %}
+                                        {% url 'ietf.meeting.views.upload_session_minutes' session_id=session.pk num=session.meeting.number as upload_url %}
+                                    {% elif pres.document.type.slug == 'agenda' %}
+                                        {% url 'ietf.meeting.views.upload_session_agenda' session_id=session.pk num=session.meeting.number as upload_url %}
+                                    {% else %}
+                                        {% url 'ietf.meeting.views.upload_session_bluesheets' session_id=session.pk num=session.meeting.number as upload_url %}
+                                    {% endif %}
+                                    {% if ag.document.type.slug != 'bluesheets' or user|has_role:"Secretariat" or meeting.type.slug == 'interim' and can_manage_materials %}
+                                        <a class="btn btn-primary btn-sm" href="{{ upload_url }}">Upload revision</a>
+                                    {% endif %}
                                 {% endif %}
-                                {% if ag.document.type.slug != 'bluesheets' or user|has_role:"Secretariat" or meeting.type.slug == 'interim' and can_manage_materials %}
-                                    <a class="btn btn-primary btn-sm" href="{{ upload_url }}">Upload revision</a>
-                                {% endif %}
-                            {% endif %}
-                        </td>
-                    </tr>
-                {% endfor %}
-            </tbody>
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            {% endif %}
         </table>
         {% if can_manage_materials %}
             {% if not session.type_counter.agenda %}
@@ -114,26 +114,64 @@
         <h3 class="mt-4">Slides</h3>
         <table class="table table-sm table-striped slides"
                id="slides_{{ session.pk }}">
-            <thead>
-            </thead>
-            <tbody session="{{ session.pk }}"
-                   addToSession="{% url 'ietf.meeting.views.ajax_add_slides_to_session' session_id=session.pk num=session.meeting.number %}"
-                   removeFromSession="{% url 'ietf.meeting.views.ajax_remove_slides_from_session' session_id=session.pk num=session.meeting.number %}"
-                   reorderInSession="{% url 'ietf.meeting.views.ajax_reorder_slides_in_session' session_id=session.pk num=session.meeting.number %}">
-                {% for pres in session.filtered_slides %}
-                    <tr name="{{ pres.document.name }}" title="Drag to reorder.">
-                        {% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
+            {% if session.filtered_slides %}
+                <tbody data-session="{{ session.pk }}"
+                       data-addToSession="{% url 'ietf.meeting.views.ajax_add_slides_to_session' session_id=session.pk num=session.meeting.number %}"
+                       data-removeFromSession="{% url 'ietf.meeting.views.ajax_remove_slides_from_session' session_id=session.pk num=session.meeting.number %}"
+                       data-reorderInSession="{% url 'ietf.meeting.views.ajax_reorder_slides_in_session' session_id=session.pk num=session.meeting.number %}">
+                    {% for pres in session.filtered_slides %}
+                        <tr data-name="{{ pres.document.name }}" title="Drag to reorder.">
+                            {% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
+                            <td>
+                                <a href="{{ pres.document.get_href }}">{{ pres.document.title }}</a>
+                                <a href="{{ url }}">({{ pres.document.name }})</a>
+                            </td>
+                            <td class="text-end">
+                                {% if can_manage_materials %}
+                                    <a class="btn btn-primary btn-sm"
+                                       href="{% url 'ietf.meeting.views.upload_session_slides' session_id=session.pk num=session.meeting.number name=pres.document.name %}">
+                                        Upload revision
+                                    </a>
+                                    <a class="btn btn-danger btn-sm"
+                                       href="{% url 'ietf.meeting.views.remove_sessionpresentation' session_id=session.pk num=session.meeting.number name=pres.document.name %}">
+                                        Remove
+                                    </a>
+                                {% endif %}
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            {% endif %}
+        </table>
+        {% if can_manage_materials %}
+            <a class="btn btn-primary uploadslides"
+               href="{% url 'ietf.meeting.views.upload_session_slides' session_id=session.pk num=session.meeting.number %}">
+                Upload new slides
+            </a>
+        {% elif request.user.is_authenticated and not session.is_material_submission_cutoff %}
+            <a class="btn btn-primary proposeslides"
+               href="{% url 'ietf.meeting.views.propose_session_slides' session_id=session.pk num=session.meeting.number %}">
+                Propose slides
+            </a>
+        {% endif %}
+
+    {% if can_manage_materials %}<div class="small">Drag-and-drop to reorder slides</div>{% endif %}
+    <h3 class="mt-4">Drafts</h3>
+    <table class="table table-sm table-striped">
+        {% if session.filtered_drafts %}
+            <tbody>
+                {% for pres in session.filtered_drafts %}
+                    <tr>
                         <td>
-                            <a href="{{ pres.document.get_href }}">{{ pres.document.title }}</a>
-                            <a href="{{ url }}">({{ pres.document.name }})</a>
+                            {% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
+                            <a href="{{ url }}">
+                                {{ pres.document.title }} ({{ pres.document.name }})
+                                {% if pres.rev %}Version {{ pres.rev }}{% endif %}
+                            </a>
                         </td>
-                        <td class="text-end">
+                        <td>
                             {% if can_manage_materials %}
                                 <a class="btn btn-primary btn-sm"
-                                   href="{% url 'ietf.meeting.views.upload_session_slides' session_id=session.pk num=session.meeting.number name=pres.document.name %}">
-                                    Upload revision
-                                </a>
-                                <a class="btn btn-danger btn-sm"
                                    href="{% url 'ietf.meeting.views.remove_sessionpresentation' session_id=session.pk num=session.meeting.number name=pres.document.name %}">
                                     Remove
                                 </a>
@@ -142,47 +180,7 @@
                     </tr>
                 {% endfor %}
             </tbody>
-        </table>
-        {% if can_manage_materials %}
-            <a id="uploadslides"
-               class="btn btn-primary"
-               href="{% url 'ietf.meeting.views.upload_session_slides' session_id=session.pk num=session.meeting.number %}">
-                Upload new slides
-            </a>
-        {% elif request.user.is_authenticated and not session.is_material_submission_cutoff %}
-            <a id="proposeslides"
-               class="btn btn-primary"
-               href="{% url 'ietf.meeting.views.propose_session_slides' session_id=session.pk num=session.meeting.number %}">
-                Propose slides
-            </a>
         {% endif %}
-    </div>
-    {% if can_manage_materials %}<div class="small">Drag-and-drop to reorder slides</div>{% endif %}
-    <h3 class="mt-4">Drafts</h3>
-    <table class="table table-sm table-striped">
-        <thead>
-        </thead>
-        <tbody>
-            {% for pres in session.filtered_drafts %}
-                <tr>
-                    <td>
-                        {% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
-                        <a href="{{ url }}">
-                            {{ pres.document.title }} ({{ pres.document.name }})
-                            {% if pres.rev %}Version {{ pres.rev }}{% endif %}
-                        </a>
-                    </td>
-                    <td>
-                        {% if can_manage_materials %}
-                            <a class="btn btn-primary btn-sm"
-                               href="{% url 'ietf.meeting.views.remove_sessionpresentation' session_id=session.pk num=session.meeting.number name=pres.document.name %}">
-                                Remove
-                            </a>
-                        {% endif %}
-                    </td>
-                </tr>
-            {% endfor %}
-        </tbody>
     </table>
     {% if can_manage_materials %}
         <a class="btn btn-primary"
diff --git a/ietf/templates/meeting/session_materials.html b/ietf/templates/meeting/session_materials.html
index bbf125488..e68cf8f76 100644
--- a/ietf/templates/meeting/session_materials.html
+++ b/ietf/templates/meeting/session_materials.html
@@ -5,6 +5,14 @@
 {% load static %}
 {% load textfilters %}
 {% load ietf_filters %}
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <title>Session Materials</title>
+    </head>
+    <body>
+
 {% with item.session.agenda as agenda %}
     {% if agenda %}
         {% if agenda.file_extension == "txt" or agenda.file_extension == "md" or agenda.file_extension == "html" or agenda.file_extension == "htm" %}
@@ -22,7 +30,7 @@
     <ul class="list-unstyled">
         {% for slide in item.session.slides %}
             <li>
-                <span class="bi bi-file-{{ slide.file_extension|lower }}-o"></span>
+                <i class="bi bi-file-{{ slide.file_extension|lower }}"></i>
                 <a href="{{ slide.get_versionless_href }}">{{ slide.title|clean_whitespace }}</a>
             </li>
         {% endfor %}
@@ -39,4 +47,6 @@
     {% else %}
         <span class="badge bg-warning">No minutes submitted</span>
     {% endif %}
-{% endwith %}
\ No newline at end of file
+{% endwith %}
+    </body>
+</html>
\ No newline at end of file
diff --git a/ietf/templates/meeting/timeslot_edit.html b/ietf/templates/meeting/timeslot_edit.html
index c697856b2..b3cb98af9 100644
--- a/ietf/templates/meeting/timeslot_edit.html
+++ b/ietf/templates/meeting/timeslot_edit.html
@@ -77,11 +77,11 @@ a.new-timeslot-link { color: lightgray; font-size: large;}
                                 {% for day in time_slices %}
                                     <th class="day-label" colspan="{{ date_slices|colWidth:day }}">
                                         {{ day|date:'D' }} ({{ day }})
-                                        <span class="bi bi-trash delete-button"
+                                        <i class="bi bi-trash delete-button"
                                               title="Delete all on this day"
                                               data-delete-scope="day"
                                               data-date-id="{{ day.isoformat }}">
-                                        </span>
+                                        </i>
                                     </th>
                                 {% endfor %}
                             {% endif %}
@@ -96,12 +96,12 @@ a.new-timeslot-link { color: lightgray; font-size: large;}
                                     {% for slot in slot_slices|lookup:day %}
                                         <th class="time-label">
                                             {{ slot.time|date:'H:i' }}-{{ slot.end_time|date:'H:i' }}
-                                            <span class="bi bi-trash delete-button"
+                                            <i class="bi bi-trash delete-button"
                                                   data-delete-scope="column"
                                                   data-date-id="{{ day.isoformat }}"
                                                   data-col-id="{{ day.isoformat }}T{{ slot.time|date:'H:i' }}-{{ slot.end_time|date:'H:i' }}"
                                                   title="Delete all in this column">
-                                            </span>
+                                            </i>
                                         </th>
                                     {% endfor %}
                                 {% endfor %}
@@ -135,8 +135,8 @@ a.new-timeslot-link { color: lightgray; font-size: large;}
                                                             {% endfor %}
                                                         {% endif %}
                                                         <a class="new-timeslot-link text-reset text-decoration-none {% if cell_ts %}hidden{% endif %}"
-                                                           href="{% url 'ietf.meeting.views.create_timeslot' num=meeting.number %}?day={{ day.toordinal }}&date={{ day|date:'Y-m-d' }}&location={{ room.pk }}&time={{ slot.time|date:'H:i' }}&duration={{ slot.duration }}">
-                                                            <span class="bi bi-plus-square"></span>
+                                                           href="{% url 'ietf.meeting.views.create_timeslot' num=meeting.number %}?day={{ day.toordinal }}&amp;date={{ day|date:'Y-m-d' }}&amp;location={{ room.pk }}&amp;time={{ slot.time|date:'H:i' }}&amp;duration={{ slot.duration }}">
+                                                            <i class="bi bi-plus-square"></i>
                                                         </a>
                                                     {% endwith %}
                                                 {% endfor %}
diff --git a/ietf/templates/meeting/timeslot_edit_timeslot.html b/ietf/templates/meeting/timeslot_edit_timeslot.html
index c462592dc..94d72e8d3 100644
--- a/ietf/templates/meeting/timeslot_edit_timeslot.html
+++ b/ietf/templates/meeting/timeslot_edit_timeslot.html
@@ -18,9 +18,9 @@ data-official-use="{% if ts in in_official_use %}true{% else %}false{% endif %}"
 </div>
 <div class="timeslot-buttons">
 <a class="text-reset text-decoration-none" href="{% url 'ietf.meeting.views.edit_timeslot' num=ts.meeting.number slot_id=ts.id %}">
-<span class="bi bi-pencil"></span>
+<i class="bi bi-pencil"></i>
 </a>
-<span class="bi bi-trash delete-button" data-delete-scope="timeslot" title="Delete this timeslot"></span>
+<i class="bi bi-trash delete-button" data-delete-scope="timeslot" title="Delete this timeslot"></i>
 </div>
 <div class="ts-type">{{ ts.type }}</div>
 </div>
\ No newline at end of file
diff --git a/ietf/templates/meeting/tz-display.html b/ietf/templates/meeting/tz-display.html
index d9f0ee7f8..5ddc9eed3 100644
--- a/ietf/templates/meeting/tz-display.html
+++ b/ietf/templates/meeting/tz-display.html
@@ -9,7 +9,7 @@
            name="tzradio"
            class="btn-check"
            id="meeting-timezone{{ id_suffix }}"
-           onclick="ietf_timezone.use('{{ timezone }}')"/>
+           onclick="ietf_timezone.use('{{ timezone }}')">
     <label class="btn btn-outline-primary" for="meeting-timezone{{ id_suffix }}">Meeting</label>
     <input type="radio"
            autocomplete="off"
@@ -17,7 +17,7 @@
            name="tzradio"
            class="btn-check"
            id="local-timezone{{ id_suffix }}"
-           onclick="ietf_timezone.use('local')"/>
+           onclick="ietf_timezone.use('local')">
     <label class="btn btn-outline-primary" for="local-timezone{{ id_suffix }}">Local</label>
     <input type="radio"
            autocomplete="off"
@@ -25,7 +25,7 @@
            name="tzradio"
            class="btn-check"
            id="utc-timezone{{ id_suffix }}"
-           onclick="ietf_timezone.use('UTC')"/>
+           onclick="ietf_timezone.use('UTC')">
     <label class="btn btn-outline-primary" for="utc-timezone{{ id_suffix }}">UTC</label>
     <select id="timezone-select{{ id_suffix }}"
             class="tz-select form-select border-primary text-primary">
diff --git a/ietf/templates/meeting/week-view.html b/ietf/templates/meeting/week-view.html
index df6596fc2..21020ef68 100644
--- a/ietf/templates/meeting/week-view.html
+++ b/ietf/templates/meeting/week-view.html
@@ -3,12 +3,14 @@
 {% load origin %}
 {% origin %}
 {% load static %}
-{# FIXME: the weekview only renders correctly in quirks mode, i.e., not in HTML5 with "<!doctype html>" in the next line #}
-<html>
+{# FIXME-LARS: the weekview only renders correctly in quirks mode, i.e., not in HTML5 with "<!doctype html>" in the next line #}
+<!doctype html>
+<html lang="en">
     <head>
-        <meta charset="utf-8"/>
-        <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+        <title>Weekview</title>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
         <script src="{% static 'ietf/js/agenda_filter.js' %}"></script>
         <script src="{% static 'ietf/js/moment.js' %}"></script>
         <script src="{% static 'ietf/js/moment-timezone-with-data-10-year-range.js' %}"></script>
diff --git a/ietf/templates/nomcom/chair_help.html b/ietf/templates/nomcom/chair_help.html
index 0c49b7b8c..38d71f0f2 100644
--- a/ietf/templates/nomcom/chair_help.html
+++ b/ietf/templates/nomcom/chair_help.html
@@ -21,10 +21,11 @@
         </p>
         <p>
             To generate the keypair:
-            <ol>
-                <li>
-                    Create a config file for openssl, named <code>nomcom-config.cnf</code>, with the following contents:
-                    <pre class="border p-3 my-3">[ req ]
+        </p>
+        <ol>
+            <li>
+                Create a config file for openssl, named <code>nomcom-config.cnf</code>, with the following contents:
+                <pre class="border p-3 my-3">[ req ]
 distinguished_name = req_distinguished_name
 string_mask        = utf8only
 x509_extensions    = ss_v3_ca
@@ -40,15 +41,14 @@ keyUsage = critical, digitalSignature, keyEncipherment, dataEncipherment
 basicConstraints = critical, CA:true
 subjectAltName = email:nomcom{{year}}@ietf.org
 extendedKeyUsage= emailProtection</pre>
-                </li>
-                <li>
-                    Generate a private key and corresponding certificate:<br>
-                    <code>openssl req -config nomcom-config.cnf -x509 -new -newkey rsa:2048 -sha256 -days 730 -nodes -keyout privateKey-nomcom{{year}}.pem -out nomcom{{year}}.cert</code>
-                    <br>
-                    (Just press <kbd>Enter</kbd> when presented with <code>Common Name (e.g. NomComYY) [NomCom15]:</code>)
-                </li>
-            </ol>
-        </p>
+            </li>
+            <li>
+                Generate a private key and corresponding certificate:<br>
+                <code>openssl req -config nomcom-config.cnf -x509 -new -newkey rsa:2048 -sha256 -days 730 -nodes -keyout privateKey-nomcom{{year}}.pem -out nomcom{{year}}.cert</code>
+                <br>
+                (Just press <kbd>Enter</kbd> when presented with <code>Common Name (e.g. NomComYY) [NomCom15]:</code>)
+            </li>
+        </ol>
         <p>
             You will upload the certificate to the datatracker (and make it available to people wishing to send mail) in the steps below.
         </p>
diff --git a/ietf/templates/nomcom/edit_nomcom.html b/ietf/templates/nomcom/edit_nomcom.html
index 530e1c47f..f3ebf695a 100644
--- a/ietf/templates/nomcom/edit_nomcom.html
+++ b/ietf/templates/nomcom/edit_nomcom.html
@@ -32,6 +32,6 @@
             format: "yyyy-mm-dd",
             todayBtn: "linked",
             todayHighlight: true
-        }).wrap('<div class="input-group mb-3"></div>').parent().prepend('<span class="input-group-text"><span class="bi bi-calendar"></span></span>');
+        }).wrap('<div class="input-group mb-3"></div>').parent().prepend('<span class="input-group-text"><i class="bi bi-calendar"></i></span>');
     </script>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/nomcom/eligible.html b/ietf/templates/nomcom/eligible.html
index 57e9bf9f1..e4f9958de 100644
--- a/ietf/templates/nomcom/eligible.html
+++ b/ietf/templates/nomcom/eligible.html
@@ -13,32 +13,36 @@
     <h2>Eligible People for {{ nomcom.group }}</h2>
     <table class="table table-sm table-striped tablesorter">
         <thead>
-            <th></th>
-            <th data-sort="last">Last name</th>
-            <th data-sort="first">First name</th>
-            <th data-sort="plain">Plain name</th>
-            <th data-sort="page">Profile page</th>
-            <th data-sort="email">Email addresses</th>
+            <tr>
+                <th></th>
+                <th data-sort="last">Last name</th>
+                <th data-sort="first">First name</th>
+                <th data-sort="plain">Plain name</th>
+                <th data-sort="page">Profile page</th>
+                <th data-sort="email">Email addresses</th>
+            </tr>
         </thead>
-        <tbody>
-            {% for p in eligible_persons %}
-                <tr>
-                    <td>{{ forloop.counter }}</td>
-                    <td>{{ p.last_name }}</td>
-                    <td>{{ p.first_name }}</td>
-                    <td>{{ p.ascii_name }}</td>
-                    <td>{% person_link p %}</td>
-                    <td>
-                        {% for e in p.email_set.all %}
-                            {{ e.address|linkify }}
-                            {% if not forloop.last %},{% endif %}
-                        {% endfor %}
-                    </td>
-                </tr>
-            {% endfor %}
-        </tbody>
+        {% if eligible_persons %}
+            <tbody>
+                {% for p in eligible_persons %}
+                    <tr>
+                        <td>{{ forloop.counter }}</td>
+                        <td>{{ p.last_name }}</td>
+                        <td>{{ p.first_name }}</td>
+                        <td>{{ p.ascii_name }}</td>
+                        <td>{% person_link p %}</td>
+                        <td>
+                            {% for e in p.email_set.all %}
+                                {{ e.address|linkify }}{% if not forloop.last %},{% endif %}
+                            {% endfor %}
+                        </td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        {% endif %}
     </table>
+}
 {% endblock %}
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/nomcom/email_list_panel.html b/ietf/templates/nomcom/email_list_panel.html
index 0dda3b557..e6cf6ef41 100644
--- a/ietf/templates/nomcom/email_list_panel.html
+++ b/ietf/templates/nomcom/email_list_panel.html
@@ -1,8 +1,10 @@
 {# bs5ok #}
 {% load person_filters textfilters %}
 <{{ heading }} class="mt-3">{{ title }}</{{ heading }}>
-<ul>
-    {% for n in list %}
-        <li>{% person_link n.person with_email=False %} ({{ n.email.address|linkify }})</li>
-    {% endfor %}
-</ul>
\ No newline at end of file
+{% if list %}
+    <ul>
+        {% for n in list %}
+            <li>{% person_link n.person with_email=False %} ({{ n.email.address|linkify }})</li>
+        {% endfor %}
+    </ul>
+{% endif %}
\ No newline at end of file
diff --git a/ietf/templates/nomcom/feedback.html b/ietf/templates/nomcom/feedback.html
index d123b5255..97d9cc9c4 100644
--- a/ietf/templates/nomcom/feedback.html
+++ b/ietf/templates/nomcom/feedback.html
@@ -31,7 +31,7 @@
                         <div class="d-grid gap-3">
                             {% for np in p.nomineeposition_set.accepted.not_duplicated %}
                                 <a class="btn btn-primary position-relative"
-                                   {% if nomcom.group.state_id != 'conclude' %}href="?nominee={{ np.nominee.id }}&position={{ np.position.id }}"{% endif %}
+                                   {% if nomcom.group.state_id != 'conclude' %}href="?nominee={{ np.nominee.id }}&amp;position={{ np.position.id }}"{% endif %}
                                    title="{% if count %}{{ count }} earlier comment{{ count|pluralize }} from you {% else %}You have not yet provided feedback {% endif %} on {{ np.nominee.email.address }} as {{ np.position }}">
                                     {{ np.nominee.name }}
                                     {% with count=counts|lookup:np.position.id|lookup:np.nominee.id %}
diff --git a/ietf/templates/nomcom/history.html b/ietf/templates/nomcom/history.html
index 67bb240e0..acd3df1f7 100644
--- a/ietf/templates/nomcom/history.html
+++ b/ietf/templates/nomcom/history.html
@@ -15,13 +15,12 @@
         <h3 class="mt-5" id="y{{ regime.year }}">{{ regime.label }}</h3>
         <dl class="row">
             {% for slug, label, roles in regime.nomcom.personnel %}
-                <th></th>
                 <dt class="col-sm-2">
                     {{ label }}
                 </dt>
                 <dd class="col-sm-10">
                     {% for r in roles %}
-                        {% role_person_link r %}{% if not forloop.last %},{% endif %}
+                        {% role_person_link r %}{% if not forloop.last %}, {% endif %}
                     {% endfor %}
                 </dd>
             {% endfor %}
diff --git a/ietf/templates/nomcom/private_index.html b/ietf/templates/nomcom/private_index.html
index 47db22f7e..8df43b64d 100644
--- a/ietf/templates/nomcom/private_index.html
+++ b/ietf/templates/nomcom/private_index.html
@@ -25,23 +25,25 @@
                 <th data-sort="num">Comments</th>
             </tr>
         </thead>
-        <tbody>
-            {% for item in stats %}
-                <tr>
-                    <th>{{ item.position__name }}</th>
-                    <td>{{ item.position.is_open|yesno:"Yes,No,No" }}</td>
-                    <td>{{ item.position.accepting_nominations|yesno:"Yes,No,No" }}</td>
-                    <td>{{ item.position.accepting_feedback|yesno:"Yes,No,No" }}</td>
-                    <td>{{ item.nominations }}</td>
-                    <td>{{ item.nominees }}</td>
-                    <td>{{ item.accepted }}</td>
-                    <td>{{ item.declined }}</td>
-                    <td>{{ item.pending }}</td>
-                    <td>{{ item.questionnaire }}</td>
-                    <td>{{ item.comments }}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
+        {% if stats %}
+            <tbody>
+                {% for item in stats %}
+                    <tr>
+                        <th>{{ item.position__name }}</th>
+                        <td>{{ item.position.is_open|yesno:"Yes,No,No" }}</td>
+                        <td>{{ item.position.accepting_nominations|yesno:"Yes,No,No" }}</td>
+                        <td>{{ item.position.accepting_feedback|yesno:"Yes,No,No" }}</td>
+                        <td>{{ item.nominations }}</td>
+                        <td>{{ item.nominees }}</td>
+                        <td>{{ item.accepted }}</td>
+                        <td>{{ item.declined }}</td>
+                        <td>{{ item.pending }}</td>
+                        <td>{{ item.questionnaire }}</td>
+                        <td>{{ item.comments }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        {% endif %}
         <tfoot>
             <tr>
                 <th>Totals</th>
@@ -151,7 +153,7 @@
                 <tr>
                     {% if is_chair and nomcom.group.state_id == 'active' %}
                         <th colspan="2">
-                            <span class="bi bi-check"></span>
+                            <i class="bi bi-check"></i>
                         </th>
                     {% endif %}
                     <th data-sort="nominee" colspan="2">
@@ -168,46 +170,48 @@
                     </th>
                 </tr>
             </thead>
-            <tbody>
-                {% for np in nominee_positions %}
-                    <tr>
-                        {% if is_chair and nomcom.group.state_id == 'active' %}
+            {% if nominee_positions %}
+                <tbody>
+                    {% for np in nominee_positions %}
+                        <tr>
+                            {% if is_chair and nomcom.group.state_id == 'active' %}
+                                <td>
+                                    <input class="batch-select form-check-input"
+                                           type="checkbox"
+                                           value="{{ np.id }}"
+                                           name="selected">
+                                </td>
+                                <td class="edit">
+                                    <a class="btn btn-primary btn-sm"
+                                       href="{% url 'ietf.nomcom.views.edit_nominee' year np.nominee.id %}">
+                                        Edit
+                                    </a>
+                                </td>
+                            {% endif %}
                             <td>
-                                <input class="batch-select form-check-input"
-                                       type="checkbox"
-                                       value="{{ np.id }}"
-                                       name="selected">
-                            </td>
-                            <td class="edit">
-                                <a class="btn btn-primary btn-sm"
-                                   href="{% url 'ietf.nomcom.views.edit_nominee' year np.nominee.id %}">
-                                    Edit
+                                <a href="{% url 'ietf.person.views.profile' email_or_name=np.nominee.name %}">
+                                    {{ np.nominee }}
                                 </a>
                             </td>
-                        {% endif %}
-                        <td>
-                            <a href="{% url 'ietf.person.views.profile' email_or_name=np.nominee.name %}">
-                                {{ np.nominee }}
-                            </a>
-                        </td>
-                        <td>
-                            <a class="btn btn-primary btn-sm"
-                               href="{% url 'ietf.nomcom.views.view_feedback_nominee' year=year nominee_id=np.nominee.id %}#comment">
-                                View feedback
-                            </a>
-                        </td>
-                        <td>
-                            {{ np.position.name }}
-                        </td>
-                        <td>
-                            {{ np.state }}
-                        </td>
-                        <td>
-                            {{ np.questionnaires|yesno:"Yes,No,No" }}
-                        </td>
-                    </tr>
-                {% endfor %}
-            </tbody>
+                            <td>
+                                <a class="btn btn-primary btn-sm"
+                                   href="{% url 'ietf.nomcom.views.view_feedback_nominee' year=year nominee_id=np.nominee.id %}#comment">
+                                    View feedback
+                                </a>
+                            </td>
+                            <td>
+                                {{ np.position.name }}
+                            </td>
+                            <td>
+                                {{ np.state }}
+                            </td>
+                            <td>
+                                {{ np.questionnaires|yesno:"Yes,No,No" }}
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            {% endif %}
         </table>
         {% if is_chair %}
             {% if nomcom.group.state_id == 'active' %}
@@ -239,4 +243,4 @@
 {% endblock %}
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/nomcom/send_reminder_mail.html b/ietf/templates/nomcom/send_reminder_mail.html
index 820b4c2df..e26e97241 100644
--- a/ietf/templates/nomcom/send_reminder_mail.html
+++ b/ietf/templates/nomcom/send_reminder_mail.html
@@ -33,7 +33,7 @@
                 <thead>
                     <tr>
                         <th>
-                            <span class="bi bi-check"></span>
+                            <i class="bi bi-check"></i>
                         </th>
                         <th data-sort="nominee">Nominee</th>
                         <th data-sort="positions">Positions</th>
@@ -43,9 +43,8 @@
                     {% for nominee in nominees %}
                         <tr>
                             <td>
-                                <input class="batch-select"
-                                       type="checkbox"
-                                       class="form-check-input"
+                                <input type="checkbox"
+                                       class="batch-select form-check-input"
                                        value="{{ nominee.id }}"
                                        name="selected"
                                        checked="checked">
diff --git a/ietf/templates/nomcom/show_template.html b/ietf/templates/nomcom/show_template.html
index f8babf202..6b31d859d 100644
--- a/ietf/templates/nomcom/show_template.html
+++ b/ietf/templates/nomcom/show_template.html
@@ -13,7 +13,7 @@
         </dt>
         <dd class="col-sm-10">
             {{ template.title }}
-        </dt>
+        </dd>
         <dt class="col-sm-2">
             Group
         </dt>
diff --git a/ietf/templates/nomcom/view_feedback_pending.html b/ietf/templates/nomcom/view_feedback_pending.html
index eed5424af..b26e8e982 100644
--- a/ietf/templates/nomcom/view_feedback_pending.html
+++ b/ietf/templates/nomcom/view_feedback_pending.html
@@ -106,8 +106,7 @@
                                 </tr>
                             {% endif %}
                             <tr>
-                                <td>{{ form.instance.time|date:"r" }}</td>
-                                {{ form.id }}
+                                <td>{{ form.instance.time|date:"r" }}{{ form.id }}</td>
                                 {% for choice in form.type.field.choices %}
                                     <td class="text-center">
                                         <input type="radio"
@@ -127,33 +126,32 @@
                                             data-bs-target="#modal{{ form.instance.id }}">
                                         View
                                     </button>
-                                </td>
-                            </tr>
-                            <div class="modal fade"
-                                 id="modal{{ form.instance.id }}"
-                                 tabindex="-1"
-                                 role="dialog"
-                                 aria-labelledby="label{{ form.instance.id }}"
-                                 aria-hidden="true">
-                                <div class="modal-dialog modal-dialog-scrollable modal-xl">
-                                    <div class="modal-content">
-                                        <div class="modal-header">
-                                            <h5 class="modal-title" id="label{{ form.instance.id }}">{{ form.instance.subject }}</h5>
-                                            <button type="button"
-                                                    class="btn-close"
-                                                    data-bs-dismiss="modal"
-                                                    aria-label="Close"></button>
-                                        </div>
-                                        <div class="modal-body">
-                                            <pre>{% decrypt form.instance.comments request year 1 %}</pre>
-                                        </div>
-                                        <div class="modal-footer">
-                                            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                                    <div class="modal fade"
+                                         id="modal{{ form.instance.id }}"
+                                         tabindex="-1"
+                                         role="dialog"
+                                         aria-labelledby="label{{ form.instance.id }}"
+                                         aria-hidden="true">
+                                        <div class="modal-dialog modal-dialog-scrollable modal-xl">
+                                            <div class="modal-content">
+                                                <div class="modal-header">
+                                                    <h5 class="modal-title" id="label{{ form.instance.id }}">{{ form.instance.subject }}</h5>
+                                                    <button type="button"
+                                                            class="btn-close"
+                                                            data-bs-dismiss="modal"
+                                                            aria-label="Close"></button>
+                                                </div>
+                                                <div class="modal-body">
+                                                    <pre>{% decrypt form.instance.comments request year 1 %}</pre>
+                                                </div>
+                                                <div class="modal-footer">
+                                                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-                            </div>
-                        </tr>
+                                </td>
+                            </tr>
                     {% endfor %}
                 </tbody>
             </table>
diff --git a/ietf/templates/nomcom/view_feedback_unrelated.html b/ietf/templates/nomcom/view_feedback_unrelated.html
index f15d2b4c2..86dc1e8e3 100644
--- a/ietf/templates/nomcom/view_feedback_unrelated.html
+++ b/ietf/templates/nomcom/view_feedback_unrelated.html
@@ -24,10 +24,7 @@
             <div class="tab-pane {% if forloop.first %}active{% endif %}"
                  id="{{ ft.ft.slug }}">
                 {% for feedback in ft.feedback %}
-                    {% if forloop.first %}
-                        <p>
-                        </p>
-                    {% else %}
+                    {% if not forloop.first %}
                         <hr>
                     {% endif %}
                     <dl class="row">
diff --git a/ietf/templates/nomcom/volunteer.html b/ietf/templates/nomcom/volunteer.html
index af9069ad9..901304c9c 100644
--- a/ietf/templates/nomcom/volunteer.html
+++ b/ietf/templates/nomcom/volunteer.html
@@ -18,8 +18,7 @@
         <div class="alert alert-warning my-3" id="already-volunteered">
             You have already volunteered for the
             {% for nc in already_volunteered %}
-                {{ nc.year }}/{{ nc.year|add:1 }}
-                {% if not forloop.last %},{% endif %}
+                {{ nc.year }}/{{ nc.year|add:1 }}{% if not forloop.last %},{% endif %}
             {% endfor %}
             Nominating Committee{{ already_volunteered|pluralize }}.
             To modify your volunteer status, contact the NomCom chair.
diff --git a/ietf/templates/nomcom/volunteers.html b/ietf/templates/nomcom/volunteers.html
index c8b322c12..e7f41787d 100644
--- a/ietf/templates/nomcom/volunteers.html
+++ b/ietf/templates/nomcom/volunteers.html
@@ -16,14 +16,16 @@
         <h3 class="mt-3">{{ eligibility_group.grouper|yesno:"Eligible, Not Eligible" }}</h3>
         <table class="table table-sm table-striped tablesorter">
             <thead>
-                <th></th>
-                <th data-sort="last">Last name</th>
-                <th data-sort="first">First name</th>
-                <th data-sort="plain">Plain name</th>
-                <th data-sort="page">Profile page</th>
-                <th data-sort="affiliation">Affiliation</th>
-                <th data-sort="primary">Primary email</th>
-                <th data-sort="qualifications">Qualifications</th>
+                <tr>
+                    <th></th>
+                    <th data-sort="last">Last name</th>
+                    <th data-sort="first">First name</th>
+                    <th data-sort="plain">Plain name</th>
+                    <th data-sort="page">Profile page</th>
+                    <th data-sort="affiliation">Affiliation</th>
+                    <th data-sort="primary">Primary email</th>
+                    <th data-sort="qualifications">Qualifications</th>
+                </tr>
             </thead>
             <tbody>
                 {% for v in eligibility_group.list %}
diff --git a/ietf/templates/oidc_provider/authorize.html b/ietf/templates/oidc_provider/authorize.html
index 6475b3593..7254b76f3 100644
--- a/ietf/templates/oidc_provider/authorize.html
+++ b/ietf/templates/oidc_provider/authorize.html
@@ -21,7 +21,7 @@
                 </li>
             {% endfor %}
         </ul>
-        <input class="btn btn-primary" name="allow" type="submit" value="Authorize" />
-        <input class="btn btn-secondary float-end "type="submit" value="Decline" />
+        <input class="btn btn-primary" name="allow" type="submit" value="Authorize">
+        <input class="btn btn-secondary float-end "type="submit" value="Decline">
     </form>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/person/merge.html b/ietf/templates/person/merge.html
index a0c225ffb..36e0fbb96 100644
--- a/ietf/templates/person/merge.html
+++ b/ietf/templates/person/merge.html
@@ -37,7 +37,7 @@
         {% endif %}
         {% if method == 'post' %}
             <a class="btn btn-primary"
-               href="{% url 'ietf.person.views.merge' %}?source={{ target.pk }}&target={{ source.pk }}"
+               href="{% url 'ietf.person.views.merge' %}?source={{ target.pk }}&amp;target={{ source.pk }}"
                role="button">
                 Swap
             </a>
diff --git a/ietf/templates/person/person_info.html b/ietf/templates/person/person_info.html
index 3f372e925..f27913ffc 100644
--- a/ietf/templates/person/person_info.html
+++ b/ietf/templates/person/person_info.html
@@ -42,4 +42,4 @@
         <br>
     {% endfor %}
 </dd>
-</l>
\ No newline at end of file
+</dl>
\ No newline at end of file
diff --git a/ietf/templates/person/person_link.html b/ietf/templates/person/person_link.html
index 6afdcb49c..6bb958c68 100644
--- a/ietf/templates/person/person_link.html
+++ b/ietf/templates/person/person_link.html
@@ -1,12 +1,19 @@
 {# bs5ok #}
 {# Copyright The IETF Trust 2020, All Rights Reserved #}
-<span {% if class or nowrap %}class="{% if nowrap %}text-nowrap{% endif %} {{ class }}"{% endif %}>
+<span {% if class or nowrap %}class="{% if nowrap %}text-nowrap{% endif %}
+      {{ class }}"
+      {% endif %}>
     {% if email or name %}
         <a {% if class %}class="text-reset"{% endif %}
            title="{% if title %}{{ title }}{% else %}Datatracker profile of {{ name }}.{% 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 and with_email %}
+           {% 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 and with_email %}
             <a {% if class %}class="text-reset"{% endif %}
                href="mailto:{{ email|urlencode }}"
                title="Compose email to {{ email }}.">
-                <span class="bi bi-envelope"></span></a>
-        {% endif %}{% else %}{{ name }}{% endif %}</span>
\ No newline at end of file
+                <i class="bi bi-envelope"></i></a>
+        {% endif %}
+    {% else %}
+        <span class="text-muted">(None)</span>
+    {% endif %}
+</span>
\ No newline at end of file
diff --git a/ietf/templates/person/photo.html b/ietf/templates/person/photo.html
index c95ea2388..c0a2ff91a 100644
--- a/ietf/templates/person/photo.html
+++ b/ietf/templates/person/photo.html
@@ -11,7 +11,7 @@
              style="object-fit: cover;
                     height: 15em;"
              src="{{ person.photo_thumb.url }}"
-             alt="Photo of {{ person.name }}"/>
+             alt="Photo of {{ person.name }}">
     {% else %}
         <div style="height: 15em;">
             <i class="bi bi-person text-muted" style="font-size: 12em;"></i>
diff --git a/ietf/templates/registration/change_password.html b/ietf/templates/registration/change_password.html
index d136bb317..0d3ba4653 100644
--- a/ietf/templates/registration/change_password.html
+++ b/ietf/templates/registration/change_password.html
@@ -56,6 +56,5 @@
                 take <em class="password_strength_time"></em> to crack.
             </span>
         </div>
-    </div>
 {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/registration/edit_profile.html b/ietf/templates/registration/edit_profile.html
index b2595cabb..000013b3b 100644
--- a/ietf/templates/registration/edit_profile.html
+++ b/ietf/templates/registration/edit_profile.html
@@ -102,20 +102,20 @@
                 </a>
             </label>
             <div class="col-sm-10">
-                <div class="form-control-plaintext">
-                    <dl class="row mb-0">
-                        {% for extres in person.personextresource_set.all %}
-                            <dt class="col-sm-3">
-                                {% firstof extres.display_name extres.name.name %}
-                            </dt>
-                            <dd class="col-sm-9">
-                                {{ extres.value|linkify }}
-                            </dd>
-                        {% empty %}
-                            None
-                        {% endfor %}
-                    </dl>
-                </div>
+                {% if person.personextresource_set.all %}
+                    <div class="form-control-plaintext">
+                        <dl class="row mb-0">
+                            {% for extres in person.personextresource_set.all %}
+                                <dt class="col-sm-3">
+                                    {% firstof extres.display_name extres.name.name %}
+                                </dt>
+                                <dd class="col-sm-9">
+                                    {{ extres.value|linkify }}
+                                </dd>
+                            {% endfor %}
+                        </dl>
+                    </div>
+                {% endif %}
                 <a class="btn btn-primary"
                    href="{% url 'ietf.ietfauth.views.edit_person_externalresources' %}">Edit</a>
             </div>
@@ -137,14 +137,14 @@
                                        type="radio"
                                        name="primary_email"
                                        value="{{ email.pk }}"
-                                       {% if email.primary %}checked{% endif %}/>
+                                       {% if email.primary %}checked{% endif %}>
                             </td>
                             <td class="text-center">
                                 <input class="form-check-input"
                                        type="checkbox"
                                        name="active_emails"
                                        value="{{ email.pk }}"
-                                       {% if email.active %}checked{% endif %}/>
+                                       {% if email.active %}checked{% endif %}>
                             </td>
                             <td>
                                 {% if email.origin == person.user.username or email.origin == '' %}
diff --git a/ietf/templates/release/release.html b/ietf/templates/release/release.html
index f260622fb..678475645 100644
--- a/ietf/templates/release/release.html
+++ b/ietf/templates/release/release.html
@@ -17,7 +17,7 @@
         </h1>
         <div class="col-1 text-end">
             <a href="{% url "ietf.release.views.stats" %}" class="icon-link">
-                <span class="bi bi-bar-chart-line"></span>
+                <i class="bi bi-bar-chart-line"></i>
             </a>
         </div>
     </div>
@@ -25,13 +25,13 @@
         <li class="me-auto page-item {% if not entry.prev %}disabled{% endif %}">
             <a class="page-link"
                href="{% if entry.prev %}/release/{{ entry.prev.version }}/{% else %}#{% endif %}">
-                <span class="bi bi-arrow-left"></span> Previous release
+                <i class="bi bi-arrow-left"></i> Previous release
             </a>
         </li>
         <li class="page-item {% if not entry.next %}disabled{% endif %}">
             <a class="page-link"
                href="{% if entry.next %}/release/{{ entry.next.version }}/{% else %}#{% endif %}">
-                Next release <span class="bi bi-arrow-right"></span>
+                Next release <i class="bi bi-arrow-right"></i>
             </a>
         </li>
     </ul>
diff --git a/ietf/templates/stats/document_stats_author_affiliation.html b/ietf/templates/stats/document_stats_author_affiliation.html
index 01913b207..624f85b9f 100644
--- a/ietf/templates/stats/document_stats_author_affiliation.html
+++ b/ietf/templates/stats/document_stats_author_affiliation.html
@@ -31,7 +31,7 @@
                 var s = '<b>' + this.points[0].key + '</b>';
 
                 $.each(this.points, function () {
-                    s += '<br />' + chartConf.yAxis.title.text + ': ' + this.y;
+                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y;
                 });
 
                 return s;
@@ -50,15 +50,17 @@
             <th data-sort="num">Authors</th>
         </tr>
     </thead>
-    <tbody>
-        {% for affiliation, percentage, count, names in table_data %}
-            <tr>
-                <td>{{ affiliation|default:"(unknown)" }}</td>
-                <td>{{ percentage|floatformat:2 }}%</td>
-                <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
-            </tr>
-        {% endfor %}
-    </tbody>
+    {% if table_data %}
+        <tbody>
+            {% for affiliation, percentage, count, names in table_data %}
+                <tr>
+                    <td>{{ affiliation|default:"(unknown)" }}</td>
+                    <td>{{ percentage|floatformat:2 }}%</td>
+                    <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    {% endif %}
 </table>
 <p>
     The statistics are based entirely on the author affiliation
@@ -93,12 +95,16 @@
                     <th data-sort="alias">Alias</th>
                 </tr>
             </thead>
-            {% for name, alias in alias_data %}
-                <tr>
-                    <td>{{ name|default:"(unknown)" }}</td>
-                    <td>{{ alias }}</td>
-                </tr>
-            {% endfor %}
+            {% if alias_data %}
+                <tbody>
+                    {% for name, alias in alias_data %}
+                        <tr>
+                            <td>{{ name|default:"(unknown)" }}</td>
+                            <td>{{ alias }}</td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            {% endif %}
         </table>
     {% endif %}
 {% else %}
diff --git a/ietf/templates/stats/document_stats_author_citations.html b/ietf/templates/stats/document_stats_author_citations.html
index fd07fc2bc..edf5be9cc 100644
--- a/ietf/templates/stats/document_stats_author_citations.html
+++ b/ietf/templates/stats/document_stats_author_citations.html
@@ -36,7 +36,7 @@
                 var s = '<b>' + this.x + ' ' + (this.x == 1 ? "citation" : 'citations') + '</b>';
 
                 $.each(this.points, function () {
-                    s += '<br/>' + chartConf.yAxis.title.text + ': ' + this.y.toFixed(1) + '%';
+                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y.toFixed(1) + '%';
                 });
 
                 return s;
@@ -57,15 +57,17 @@
             <th data-sort="authors">Authors</th>
         </tr>
     </thead>
-    <tbody>
-        {% for citations, percentage, count, names in table_data %}
-            <tr>
-                <td>{{ citations }}</td>
-                <td>{{ percentage|floatformat:2 }}%</td>
-                <td>{% include "stats/includes/number_with_details_cell.html" with content_limit=10 %}</td>
-            </tr>
-        {% endfor %}
-    </tbody>
+    {% if table_data %}
+        <tbody>
+            {% for citations, percentage, count, names in table_data %}
+                <tr>
+                    <td>{{ citations }}</td>
+                    <td>{{ percentage|floatformat:2 }}%</td>
+                    <td>{% include "stats/includes/number_with_details_cell.html" with content_limit=10 %}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    {% endif %}
 </table>
 
 <p>Note that the citation counts do not exclude self-references.</p>
\ No newline at end of file
diff --git a/ietf/templates/stats/document_stats_author_continent.html b/ietf/templates/stats/document_stats_author_continent.html
index adac028d9..99941bb5d 100644
--- a/ietf/templates/stats/document_stats_author_continent.html
+++ b/ietf/templates/stats/document_stats_author_continent.html
@@ -31,7 +31,7 @@
                 var s = '<b>' + this.points[0].key + '</b>';
 
                 $.each(this.points, function () {
-                    s += '<br />' + chartConf.yAxis.title.text + ': ' + this.y;
+                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y;
                 });
 
                 return s;
@@ -50,15 +50,17 @@
             <th data-sort="num">Authors</th>
         </tr>
     </thead>
-    <tbody>
-        {% for continent, percentage, count, names in table_data %}
-            <tr>
-                <td>{{ continent|default:"(unknown)" }}</td>
-                <td>{{ percentage|floatformat:2 }}%</td>
-                <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
-            </tr>
-        {% endfor %}
-    </tbody>
+    {% if table_data %}
+        <tbody>
+            {% for continent, percentage, count, names in table_data %}
+                <tr>
+                    <td>{{ continent|default:"(unknown)" }}</td>
+                    <td>{{ percentage|floatformat:2 }}%</td>
+                    <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    {% endif %}
 </table>
 <p>
     The statistics are based entirely on the author addresses provided
diff --git a/ietf/templates/stats/document_stats_author_country.html b/ietf/templates/stats/document_stats_author_country.html
index 109aa4cd5..24604097c 100644
--- a/ietf/templates/stats/document_stats_author_country.html
+++ b/ietf/templates/stats/document_stats_author_country.html
@@ -31,7 +31,7 @@
                 var s = '<b>' + this.points[0].key + '</b>';
 
                 $.each(this.points, function () {
-                    s += '<br />' + chartConf.yAxis.title.text + ': ' + this.y;
+                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y;
                 });
 
                 return s;
@@ -50,15 +50,17 @@
             <th class="text-end" data-sort="authors">Authors</th>
         </tr>
     </thead>
-    <tbody>
-        {% for country, percentage, count, names in table_data %}
-            <tr>
-                <td>{{ country|default:"(unknown)" }}</td>
-                <td class="text-end">{{ percentage|floatformat:2 }}%</td>
-                <td class="text-end">{% include "stats/includes/number_with_details_cell.html" %}</td>
-            </tr>
-        {% endfor %}
-    </tbody>
+    {% if table_data %}
+        <tbody>
+            {% for country, percentage, count, names in table_data %}
+                <tr>
+                    <td>{{ country|default:"(unknown)" }}</td>
+                    <td class="text-end">{{ percentage|floatformat:2 }}%</td>
+                    <td class="text-end">{% include "stats/includes/number_with_details_cell.html" %}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    {% endif %}
 </table>
 <p>
     The statistics are based entirely on the author addresses provided
@@ -74,8 +76,7 @@
     EU (European Union) is not a country, but has been added for reference, as the sum of
     all current EU member countries:
     {% for c in eu_countries %}
-        {{ c.name }}
-        {% if not forloop.last %},{% endif %}
+        {{ c.name }}{% if not forloop.last %},{% endif %}
     {% endfor %}
     .
 </p>
@@ -103,26 +104,30 @@
                 <th data-sort="country">Country</th>
                 <th data-sort="alias">Alias</th>
             </thead>
-            {% for name, alias, country in alias_data %}
-                <tr>
-                    <td>
-                        {% if country and request.user.is_staff %}
-                            <a href="{% url "admin:name_countryname_change" country.pk %}">{{ name|default:"(unknown)" }}</a>
-                        {% else %}
-                            {{ name|default:"(unknown)" }}
-                        {% endif %}
-                    </td>
-                    <td>
-                        {{ alias }}
-                        {% if request.user.is_staff and name != "EU" %}
-                            <a class="float-end btn btn-primary btn-sm"
-                               href="{% url "admin:doc_documentauthor_changelist" %}?country={{ alias|urlencode }}">
-                                Matching authors
-                            </a>
-                        {% endif %}
-                    </td>
-                </tr>
-            {% endfor %}
+            {% if alias_data %}
+                <tbody>
+                {% for name, alias, country in alias_data %}
+                    <tr>
+                        <td>
+                            {% if country and request.user.is_staff %}
+                                <a href="{% url "admin:name_countryname_change" country.pk %}">{{ name|default:"(unknown)" }}</a>
+                            {% else %}
+                                {{ name|default:"(unknown)" }}
+                            {% endif %}
+                        </td>
+                        <td>
+                            {{ alias }}
+                            {% if request.user.is_staff and name != "EU" %}
+                                <a class="float-end btn btn-primary btn-sm"
+                                   href="{% url "admin:doc_documentauthor_changelist" %}?country={{ alias|urlencode }}">
+                                    Matching authors
+                                </a>
+                            {% endif %}
+                        </td>
+                    </tr>
+                {% endfor %}
+                </tbody>
+            {% endif %}
         </table>
     {% endif %}
 {% else %}
diff --git a/ietf/templates/stats/document_stats_author_documents.html b/ietf/templates/stats/document_stats_author_documents.html
index a6b8b5a02..31c488f05 100644
--- a/ietf/templates/stats/document_stats_author_documents.html
+++ b/ietf/templates/stats/document_stats_author_documents.html
@@ -37,7 +37,7 @@
                 var s = '<b>' + this.x + ' ' + (this.x == 1 ? "{{ doc_label }}" : '{{ doc_label }}s') + '</b>';
 
                 $.each(this.points, function () {
-                    s += '<br />' + chartConf.yAxis.title.text + ': ' + this.y.toFixed(1) + '%';
+                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y.toFixed(1) + '%';
                 });
 
                 return s;
@@ -56,13 +56,15 @@
             <th data-sort="num">Authors</th>
         </tr>
     </thead>
-    <tbody>
-        {% for document_count, percentage, count, names in table_data %}
-            <tr>
-                <td>{{ document_count }}</td>
-                <td>{{ percentage|floatformat:2 }}%</td>
-                <td>{% include "stats/includes/number_with_details_cell.html" with content_limit=10 %}</td>
-            </tr>
-        {% endfor %}
-    </tbody>
-</table>
+    {% if table_data %}
+        <tbody>
+            {% for document_count, percentage, count, names in table_data %}
+                <tr>
+                    <td>{{ document_count }}</td>
+                    <td>{{ percentage|floatformat:2 }}%</td>
+                    <td>{% include "stats/includes/number_with_details_cell.html" with content_limit=10 %}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    {% endif %}
+</table>
\ No newline at end of file
diff --git a/ietf/templates/stats/document_stats_author_hindex.html b/ietf/templates/stats/document_stats_author_hindex.html
index 51b5f97ad..e35521e39 100644
--- a/ietf/templates/stats/document_stats_author_hindex.html
+++ b/ietf/templates/stats/document_stats_author_hindex.html
@@ -36,7 +36,7 @@
                 var s = '<b>' + ' h-index ' + this.x + '</b>';
 
                 $.each(this.points, function () {
-                    s += '<br />' + chartConf.yAxis.title.text + ': ' + this.y.toFixed(1) + '%';
+                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y.toFixed(1) + '%';
                 });
 
                 return s;
@@ -55,15 +55,17 @@
             <th data-sort="Authors">Authors</th>
         </tr>
     </thead>
-    <tbody>
-        {% for h_index, percentage, count, names in table_data %}
-            <tr>
-                <td>{{ h_index }}</td>
-                <td>{{ percentage|floatformat:2 }}%</td>
-                <td>{% include "stats/includes/number_with_details_cell.html" with content_limit=25 %}</td>
-            </tr>
-        {% endfor %}
-    </tbody>
+    {% if table_data %}
+        <tbody>
+            {% for h_index, percentage, count, names in table_data %}
+                <tr>
+                    <td>{{ h_index }}</td>
+                    <td>{{ percentage|floatformat:2 }}%</td>
+                    <td>{% include "stats/includes/number_with_details_cell.html" with content_limit=25 %}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    {% endif %}
 </table>
 <p>
     Hirsch index or h-index is a
diff --git a/ietf/templates/stats/document_stats_authors.html b/ietf/templates/stats/document_stats_authors.html
index 529151ffb..64b76d823 100644
--- a/ietf/templates/stats/document_stats_authors.html
+++ b/ietf/templates/stats/document_stats_authors.html
@@ -36,7 +36,7 @@
                 var s = '<b>' + this.x + ' ' + (this.x == 1 ? "author" : 'authors') + '</b>';
 
                 $.each(this.points, function () {
-                    s += '<br />' + chartConf.yAxis.title.text + ': ' + this.y.toFixed(1) + '%';
+                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y.toFixed(1) + '%';
                 });
 
                 return s;
@@ -55,13 +55,15 @@
             <th data-sort="num">{{ doc_label|capfirst }}s</th>
         </tr>
     </thead>
-    <tbody>
-        {% for author_count, percentage, count, names in table_data %}
-            <tr>
-                <td>{{ author_count }}</td>
-                <td>{{ percentage|floatformat:2 }}%</td>
-                <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
-            </tr>
-        {% endfor %}
-    </tbody>
-</table>
+    {% if table_data %}
+        <tbody>
+            {% for author_count, percentage, count, names in table_data %}
+                <tr>
+                    <td>{{ author_count }}</td>
+                    <td>{{ percentage|floatformat:2 }}%</td>
+                    <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    {% endif %}
+</table>
\ No newline at end of file
diff --git a/ietf/templates/stats/document_stats_format.html b/ietf/templates/stats/document_stats_format.html
index 711e5b316..2ddea3abb 100644
--- a/ietf/templates/stats/document_stats_format.html
+++ b/ietf/templates/stats/document_stats_format.html
@@ -32,7 +32,7 @@
                 var s = '<b>' + this.points[0].key + '</b>';
 
                 $.each(this.points, function () {
-                    s += '<br />' + chartConf.yAxis.title.text + ': ' + this.y;
+                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y;
                 });
 
                 return s;
@@ -51,13 +51,15 @@
             <th data-sort="label">{{ doc_label|capfirst }}s</th>
         </tr>
     </thead>
-    <tbody>
-        {% for pages, percentage, count, names in table_data %}
-            <tr>
-                <td>{{ pages }}</td>
-                <td>{{ percentage|floatformat:2 }}%</td>
-                <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
-            </tr>
-        {% endfor %}
-    </tbody>
+    {% if table_data %}
+        <tbody>
+            {% for pages, percentage, count, names in table_data %}
+                <tr>
+                    <td>{{ pages }}</td>
+                    <td>{{ percentage|floatformat:2 }}%</td>
+                    <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    {% endif %}
 </table>
\ No newline at end of file
diff --git a/ietf/templates/stats/document_stats_formlang.html b/ietf/templates/stats/document_stats_formlang.html
index 041aae872..1755c965e 100644
--- a/ietf/templates/stats/document_stats_formlang.html
+++ b/ietf/templates/stats/document_stats_formlang.html
@@ -32,7 +32,7 @@
                 var s = '<b>' + this.points[0].key + '</b>';
 
                 $.each(this.points, function () {
-                    s += '<br />' + chartConf.yAxis.title.text + ': ' + this.y;
+                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y;
                 });
 
                 return s;
@@ -51,13 +51,15 @@
             <th data-sort="num">{{ doc_label|capfirst }}s</th>
         </tr>
     </thead>
-    <tbody>
-        {% for formal_language, percentage, count, names in table_data %}
-            <tr>
-                <td>{{ formal_language }}</td>
-                <td>{{ percentage|floatformat:2 }}%</td>
-                <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
-            </tr>
-        {% endfor %}
-    </tbody>
+    {% if table_data %}
+        <tbody>
+            {% for formal_language, percentage, count, names in table_data %}
+                <tr>
+                    <td>{{ formal_language }}</td>
+                    <td>{{ percentage|floatformat:2 }}%</td>
+                    <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    {% endif %}
 </table>
\ No newline at end of file
diff --git a/ietf/templates/stats/document_stats_pages.html b/ietf/templates/stats/document_stats_pages.html
index ffa417d65..11cb6361d 100644
--- a/ietf/templates/stats/document_stats_pages.html
+++ b/ietf/templates/stats/document_stats_pages.html
@@ -30,7 +30,7 @@
                 var s = '<b>' + this.x + ' ' + (this.x == 1 ? "page" : 'pages') + '</b>';
 
                 $.each(this.points, function () {
-                    s += '<br />' + chartConf.yAxis.title.text + ': ' + this.y;
+                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y;
                 });
 
                 return s;
@@ -49,13 +49,15 @@
             <th data-sort="num">{{ doc_label|capfirst }}s</th>
         </tr>
     </thead>
-    <tbody>
-        {% for pages, percentage, count, names in table_data %}
-            <tr>
-                <td>{{ pages }}</td>
-                <td>{{ percentage|floatformat:2 }}%</td>
-                <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
-            </tr>
-        {% endfor %}
-    </tbody>
+    {% if table_data %}
+        <tbody>
+            {% for pages, percentage, count, names in table_data %}
+                <tr>
+                    <td>{{ pages }}</td>
+                    <td>{{ percentage|floatformat:2 }}%</td>
+                    <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    {% endif %}
 </table>
\ No newline at end of file
diff --git a/ietf/templates/stats/document_stats_words.html b/ietf/templates/stats/document_stats_words.html
index e1ba5adcc..aa9962ab4 100644
--- a/ietf/templates/stats/document_stats_words.html
+++ b/ietf/templates/stats/document_stats_words.html
@@ -30,7 +30,7 @@
                 var s = '<b>' + this.x + ' - ' + (this.x + {{ bin_size }} - 1) + ' ' + (this.x == 1 ? "word" : 'words') + '</b>';
 
                 $.each(this.points, function () {
-                    s += '<br />' + chartConf.yAxis.title.text + ': ' + this.y;
+                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y;
                 });
 
                 return s;
@@ -49,13 +49,15 @@
             <th data-sort="num">{{ doc_label|capfirst }}s</th>
         </tr>
     </thead>
-    <tbody>
-        {% for pages, percentage, count, names in table_data %}
-            <tr>
-                <td>{{ pages }}</td>
-                <td>{{ percentage|floatformat:2 }}%</td>
-                <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
-            </tr>
-        {% endfor %}
-    </tbody>
+    {% if table_data %}
+        <tbody>
+            {% for pages, percentage, count, names in table_data %}
+                <tr>
+                    <td>{{ pages }}</td>
+                    <td>{{ percentage|floatformat:2 }}%</td>
+                    <td>{% include "stats/includes/number_with_details_cell.html" %}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    {% endif %}
 </table>
\ No newline at end of file
diff --git a/ietf/templates/stats/document_stats_yearly.html b/ietf/templates/stats/document_stats_yearly.html
index b5c832e52..510ba5350 100644
--- a/ietf/templates/stats/document_stats_yearly.html
+++ b/ietf/templates/stats/document_stats_yearly.html
@@ -41,7 +41,7 @@
                 var s = '<b>' + this.x + '</b>';
 
                 $.each(this.points, function () {
-                    s += '<br />' + this.series.name + ': ' + this.y;
+                    s += '<br>' + this.series.name + ': ' + this.y;
                 });
 
                 return s;
diff --git a/ietf/templates/stats/known_countries_list.html b/ietf/templates/stats/known_countries_list.html
index 0a2f464fe..7517cd48a 100644
--- a/ietf/templates/stats/known_countries_list.html
+++ b/ietf/templates/stats/known_countries_list.html
@@ -38,8 +38,7 @@
                         </td>
                         <td>
                             {% for a in c.aliases %}
-                                {{ a.alias }}
-                                {% if not forloop.last %},{% endif %}
+                                {{ a.alias }}{% if not forloop.last %},{% endif %}
                             {% endfor %}
                         </td>
                     </tr>
diff --git a/ietf/templates/stats/meeting_stats_continent.html b/ietf/templates/stats/meeting_stats_continent.html
index 4cd5ecb33..ef74c78ba 100644
--- a/ietf/templates/stats/meeting_stats_continent.html
+++ b/ietf/templates/stats/meeting_stats_continent.html
@@ -31,7 +31,7 @@
                 var s = '<b>' + this.points[0].key + '</b>';
 
                 $.each(this.points, function () {
-                    s += '<br />' + chartConf.yAxis.title.text + ': ' + this.y;
+                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y;
                 });
 
                 return s;
diff --git a/ietf/templates/stats/meeting_stats_country.html b/ietf/templates/stats/meeting_stats_country.html
index 0756dc19b..acbe00d13 100644
--- a/ietf/templates/stats/meeting_stats_country.html
+++ b/ietf/templates/stats/meeting_stats_country.html
@@ -31,7 +31,7 @@
                 var s = '<b>' + this.points[0].key + '</b>';
 
                 $.each(this.points, function () {
-                    s += '<br />' + chartConf.yAxis.title.text + ': ' + this.y;
+                    s += '<br>' + chartConf.yAxis.title.text + ': ' + this.y;
                 });
 
                 return s;
@@ -92,8 +92,7 @@
     EU (European Union) is not a country, but has been added for reference, as the sum of
     all current EU member countries:
     {% for c in eu_countries %}
-        {{ c.name }}
-        {% if not forloop.last %},{% endif %}
+        {{ c.name }}{% if not forloop.last %},{% endif %}
     {% endfor %}
     .
 </p>
\ No newline at end of file
diff --git a/ietf/templates/stats/meeting_stats_overview.html b/ietf/templates/stats/meeting_stats_overview.html
index a5bdc0a53..fbb3a5275 100644
--- a/ietf/templates/stats/meeting_stats_overview.html
+++ b/ietf/templates/stats/meeting_stats_overview.html
@@ -33,8 +33,8 @@
             tooltip: {
                 formatter: function () {
                     var s = '<b>' + this.point.name + '</b>';
-                    s += '<br />' + this.point.date;
-                    s += '<br />' + this.series.name + '<br /> Attendees: ' + this.y;
+                    s += '<br>' + this.point.date;
+                    s += '<br>' + this.series.name + '<br> Attendees: ' + this.y;
                     return s;
                 },
                 shared: false
@@ -69,7 +69,7 @@
                     var s = '<b>' + "IETF " + this.x + '</b>';
 
                     $.each(this.points, function () {
-                        s += '<br />' + this.series.name + ': ' + this.y;
+                        s += '<br>' + this.series.name + ': ' + this.y;
                     });
 
                     return s;
diff --git a/ietf/templates/stats/review_stats.html b/ietf/templates/stats/review_stats.html
index b1f93b0e8..da0956713 100644
--- a/ietf/templates/stats/review_stats.html
+++ b/ietf/templates/stats/review_stats.html
@@ -171,9 +171,9 @@
                 </tr>
             </thead>
             {% for row in data %}
-                    <tbody>
+                    {% if forloop.revcounter != 1 %}<tbody>{% endif %}
                     {% if forloop.last %}
-                        </tbody>
+                        {% if forloop.revcounter != 1 %}</tbody>{% endif %}
                         <tfoot>
                     {% endif %}
                     <tr>
@@ -218,9 +218,9 @@
                     </tr>
                 </thead>
                 {% for row in data %}
-                        <tbody>
+                        {% if forloop.revcounter != 1 %}<tbody>{% endif %}
                         {% if forloop.last %}
-                            </tbody>
+                            {% if forloop.revcounter != 1 %}</tbody>{% endif %}
                             <tfoot>
                         {% endif %}
                         <tr>
@@ -258,9 +258,9 @@
                     </tr>
                 </thead>
                 {% for row in data %}
-                    <tbody>
+                    {% if forloop.revcounter != 1 %}<tbody>{% endif %}
                         {% if forloop.last %}
-                            </tbody>
+                            {% if forloop.revcounter != 1 %}</tbody>{% endif %}
                             <tfoot>
                         {% endif %}
                         <tr>
diff --git a/ietf/templates/submit/submission_email.html b/ietf/templates/submit/submission_email.html
index ad0fd985a..2e409b6f9 100644
--- a/ietf/templates/submit/submission_email.html
+++ b/ietf/templates/submit/submission_email.html
@@ -56,7 +56,7 @@
            class="btn btn-primary"
            href="{% url "ietf.submit.views.send_submission_email" submission_id=submission.pk message_id=message.pk %}"
            title="Reply">
-            <span class="bi bi-envelope" aria-hidden="true"></span> Reply
+            <i class="bi bi-envelope" aria-hidden="true"></i> Reply
         </a>
     {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/submit/submission_files.html b/ietf/templates/submit/submission_files.html
index 306426922..dfd08bc22 100644
--- a/ietf/templates/submit/submission_files.html
+++ b/ietf/templates/submit/submission_files.html
@@ -5,7 +5,7 @@
 {% for file in files %}
     {% if file.exists %}
         <a class="btn btn-primary btn-sm float-end ms-1" href="{{ file.url }}" target="_blank">
-            <span class="bi bi-file-{% if file.ext == 'txt' %}text{% elif file.ext == 'xml' %}code{% elif file.ext == 'pdf' %}pdf{% else %}code{% endif %}"></span>
+            <i class="bi bi-file-{% if file.ext == 'txt' %}text{% elif file.ext == 'xml' %}code{% elif file.ext == 'pdf' %}pdf{% else %}code{% endif %}"></i>
             {{ file.ext }}
         </a>
     {% endif %}
diff --git a/ietf/templates/submit/submission_status.html b/ietf/templates/submit/submission_status.html
index 872b7f1f7..ce9855b4f 100644
--- a/ietf/templates/submit/submission_status.html
+++ b/ietf/templates/submit/submission_status.html
@@ -325,8 +325,7 @@
             </th>
             <td>
                 {% for l in submission.formal_languages.all %}
-                    {{ l.name }}
-                    {% if not forloop.last %},{% endif %}
+                    {{ l.name }}{% if not forloop.last %},{% endif %}
                 {% empty %}None recognized
                 {% endfor %}
                 {% if errors.formal_languages %}
@@ -488,7 +487,7 @@
            class="btn btn-primary mt-3"
            href="{% url "ietf.submit.views.send_submission_email" submission_id=submission.pk %}"
            title="Email submitter">
-            <span class="bi bi-envelope" aria-hidden="true"></span> Send Email
+            <i class="bi bi-envelope" aria-hidden="true"></i> Send Email
         </a>
     {% endif %}
     {% if show_send_full_url %}
@@ -534,54 +533,56 @@
                 </th>
             </tr>
         </thead>
-        <tbody>
-            {% for e in submission.submissionevent_set.all %}
-                <tr>
-                    <td class="text-nowrap">
-                        {{ e.time|date:"Y-m-d" }}
-                    </td>
-                    <td>
-                        {% if e.by %}
-                            {% person_link e.by %}
-                        {% endif %}
-
-                    </td>
-                    {%  if e.desc|startswith:"Received message" or e.desc|startswith:"Sent message" %}
-                        {%  with m=e.submissionemailevent.message %}
-                            {% if user.is_authenticated %}
-                                <td>
-                                    {% if  e.desc|startswith:"Received message" and user|has_role:"Secretariat" %}
-                                        <a id="reply{{ submission.pk }}"
-                                           class="btn btn-primary btn-sm"
-                                           href="{% url "ietf.submit.views.send_submission_email" submission_id=submission.pk message_id=e.submissionemailevent.pk %}"
-                                           title="Reply">
-                                            <span class="bi bi-envelope" aria-hidden="true"></span> Reply
-                                        </a>
-                                    {% endif %}
-                                    Email:
-                                    <a id="aw{{ submission.pk }}-{{ m.pk }}"
-                                       href="{% url "ietf.submit.views.show_submission_email_message" submission_id=submission.pk message_id=e.submissionemailevent.pk access_token=submission.access_token %}">
-                                        {{ e.desc }}
-                                    </a>
-                                </td>
-                            {% else %}
-                                <td>
-                                    Email:
-                                    <a id="aw{{ submission.pk }}-{{ m.pk }}"
-                                       href="{% url "ietf.submit.views.show_submission_email_message" submission_id=submission.pk message_id=e.submissionemailevent.pk %}">
-                                        {{ e.desc }}
-                                    </a>
-                                </td>
-                            {% endif %}
-                        {% endwith %}
-                    {%  else %}
-                        <td>
-                            {{ e.desc|urlize_ietf_docs|linkify }}
+        {% if submission.submissionevent_set.all %}
+            <tbody>
+                {% for e in submission.submissionevent_set.all %}
+                    <tr>
+                        <td class="text-nowrap">
+                            {{ e.time|date:"Y-m-d" }}
                         </td>
-                    {%  endif %}
-                </tr>
-            {% endfor %}
-        </tbody>
+                        <td>
+                            {% if e.by %}
+                                {% person_link e.by %}
+                            {% endif %}
+
+                        </td>
+                        {%  if e.desc|startswith:"Received message" or e.desc|startswith:"Sent message" %}
+                            {%  with m=e.submissionemailevent.message %}
+                                {% if user.is_authenticated %}
+                                    <td>
+                                        {% if  e.desc|startswith:"Received message" and user|has_role:"Secretariat" %}
+                                            <a id="reply{{ submission.pk }}"
+                                               class="btn btn-primary btn-sm"
+                                               href="{% url "ietf.submit.views.send_submission_email" submission_id=submission.pk message_id=e.submissionemailevent.pk %}"
+                                               title="Reply">
+                                                <i class="bi bi-envelope" aria-hidden="true"></i> Reply
+                                            </a>
+                                        {% endif %}
+                                        Email:
+                                        <a id="aw{{ submission.pk }}-{{ m.pk }}"
+                                           href="{% url "ietf.submit.views.show_submission_email_message" submission_id=submission.pk message_id=e.submissionemailevent.pk access_token=submission.access_token %}">
+                                            {{ e.desc }}
+                                        </a>
+                                    </td>
+                                {% else %}
+                                    <td>
+                                        Email:
+                                        <a id="aw{{ submission.pk }}-{{ m.pk }}"
+                                           href="{% url "ietf.submit.views.show_submission_email_message" submission_id=submission.pk message_id=e.submissionemailevent.pk %}">
+                                            {{ e.desc }}
+                                        </a>
+                                    </td>
+                                {% endif %}
+                            {% endwith %}
+                        {%  else %}
+                            <td>
+                                {{ e.desc|urlize_ietf_docs|linkify }}
+                            </td>
+                        {%  endif %}
+                    </tr>
+                {% endfor %}
+            </tbody>
+        {% endif %}
     </table>
     {% include "submit/problem-reports-footer.html" %}
 {% endblock %}
diff --git a/ietf/templates/submit/upload_submission.html b/ietf/templates/submit/upload_submission.html
index a641abfca..68a633833 100644
--- a/ietf/templates/submit/upload_submission.html
+++ b/ietf/templates/submit/upload_submission.html
@@ -49,7 +49,7 @@
                        aria-controls="other-formats">
                     <input class="form-check-input"
                            id="checkbox"
-                           type="checkbox"/>
+                           type="checkbox">
                     Submit other formats
                 </label>
             </div>
diff --git a/ietf/templates/sync/notify.html b/ietf/templates/sync/notify.html
index 788a8ef75..5775282e5 100644
--- a/ietf/templates/sync/notify.html
+++ b/ietf/templates/sync/notify.html
@@ -13,6 +13,6 @@
         {% csrf_token %}
         <input class="btn btn-primary"
                type="submit"
-               value="Trigger {{ notification }} sync"/>
+               value="Trigger {{ notification }} sync">
     </form>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/utils/markup_txt.py b/ietf/utils/markup_txt.py
index cb4f23820..0c8d25ca2 100644
--- a/ietf/utils/markup_txt.py
+++ b/ietf/utils/markup_txt.py
@@ -66,4 +66,4 @@ def markup(content, width=None):
 
     content = re.sub(r"\n\n([0-9]+\\.|[A-Z]\\.[0-9]|Appendix|Status of|Abstract|Table of|Full Copyright|Copyright|Intellectual Property|Acknowled|Author|Index)(.*)(?=\n\n)", r"""\n\n<span class="m_h">\g<1>\g<2></span>""", content)
 
-    return "<pre>" + content + "</pre>\n"
+    return content
\ No newline at end of file
diff --git a/ietf/utils/response.py b/ietf/utils/response.py
index 3321e99fe..122b81b7f 100644
--- a/ietf/utils/response.py
+++ b/ietf/utils/response.py
@@ -7,5 +7,5 @@ from django.utils.safestring import mark_safe
 def permission_denied(request, msg):
     "A wrapper around the PermissionDenied exception"
     if not request.user.is_authenticated:
-        msg += "  <br/>You may want to <a href='/accounts/login?next=%s'><u>Log in</u></a> if you have a datatracker role that lets you access this page." % request.path
-    raise PermissionDenied(mark_safe(msg))
+        msg += "  <br>You may want to <a href='/accounts/login?next=%s'><u>Log in</u></a> if you have a datatracker role that lets you access this page." % request.path
+    raise PermissionDenied(mark_safe(msg))
\ No newline at end of file
diff --git a/ietf/utils/test_utils.py b/ietf/utils/test_utils.py
index 0b3789b93..57d57e90a 100644
--- a/ietf/utils/test_utils.py
+++ b/ietf/utils/test_utils.py
@@ -165,7 +165,11 @@ class VerifyingClient(Client):
             "text/html"
         ):
             document, errors = tidy_document(
-                r.content, options={"drop-empty-elements": False}
+                r.content,
+                options={
+                    # FIXME-LARS: this is causing way too many generic warnings:
+                    # "accessibility-check": 1,
+                },
             )
 
             errors = "\n".join(
@@ -173,10 +177,16 @@ class VerifyingClient(Client):
                     e
                     for e in errors.splitlines()
                     # FIXME-LARS: django-bootstrap5 incorrectly sets a "required"
-                    # proprietray attribute on some DIVs; remove those errors
+                    # proprietray attribute on some <div>s; remove those errors
                     if not re.match(r'.*proprietary attribute "required"', e)
                     # FIXME-LARS: some secretariat templates have this issue, ignore
-                    and not re.match(r".*id and name attribute value mismatch", e)
+                    and not re.match(
+                        r".*id and name attribute value mismatch", e
+                    )
+                    # FIXME-LARS: bootstrap-icons and close buttons render as empty, remove those errors.
+                    # Also, django seems to generate some empty tags, so remove those, too.
+                    and not re.match(
+                        r".*trimming empty <(i|em|button|span|optgroup)>", e)
                 ]
             )
 
diff --git a/package-lock.json b/package-lock.json
index cb0965a31..a600f927a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,6 +32,19 @@
         "parcel": "^2.0.0"
       }
     },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.0.2.tgz",
+      "integrity": "sha512-sE8Gx+qSDMLoJvb3QarJJlDQK7SSY4rK3hxp4XsiANeFOmjU46ZI7Y9adAQRJrmbz8zbtZkp3mJTT+rGxtF0XA==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.2.2",
+        "sourcemap-codec": "1.4.8"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.16.7",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
@@ -45,35 +58,35 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.8.tgz",
-      "integrity": "sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.0.tgz",
+      "integrity": "sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.16.12",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.12.tgz",
-      "integrity": "sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.0.tgz",
+      "integrity": "sha512-x/5Ea+RO5MvF9ize5DeVICJoVrNv0Mi2RnIABrZEKYvPEpldXwauPkgvYA17cKa6WpU3LoYvYbuEMFtSNFsarA==",
       "dev": true,
       "dependencies": {
+        "@ampproject/remapping": "^2.0.0",
         "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.16.8",
+        "@babel/generator": "^7.17.0",
         "@babel/helper-compilation-targets": "^7.16.7",
         "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helpers": "^7.16.7",
-        "@babel/parser": "^7.16.12",
+        "@babel/helpers": "^7.17.0",
+        "@babel/parser": "^7.17.0",
         "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.10",
-        "@babel/types": "^7.16.8",
+        "@babel/traverse": "^7.17.0",
+        "@babel/types": "^7.17.0",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
         "json5": "^2.1.2",
-        "semver": "^6.3.0",
-        "source-map": "^0.5.0"
+        "semver": "^6.3.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -93,12 +106,12 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz",
-      "integrity": "sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.0.tgz",
+      "integrity": "sha512-I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.8",
+        "@babel/types": "^7.17.0",
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
       },
@@ -266,14 +279,14 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz",
-      "integrity": "sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.0.tgz",
+      "integrity": "sha512-Xe/9NFxjPwELUvW2dsukcMZIp6XwPSbI4ojFBJuX5ramHuVE22SVcZIwqzdWo5uCgeTXW8qV97lMvSOjq+1+nQ==",
       "dev": true,
       "dependencies": {
         "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/traverse": "^7.17.0",
+        "@babel/types": "^7.17.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -365,9 +378,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.16.12",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.12.tgz",
-      "integrity": "sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.0.tgz",
+      "integrity": "sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -422,19 +435,19 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.16.10",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz",
-      "integrity": "sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.0.tgz",
+      "integrity": "sha512-fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.16.8",
+        "@babel/generator": "^7.17.0",
         "@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.10",
-        "@babel/types": "^7.16.8",
+        "@babel/parser": "^7.17.0",
+        "@babel/types": "^7.17.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -452,9 +465,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz",
-      "integrity": "sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz",
+      "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.16.7",
@@ -546,6 +559,25 @@
       "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==",
       "dev": true
     },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz",
+      "integrity": "sha512-cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.2.3.tgz",
+      "integrity": "sha512-X8ybLjwxY8VNxEddYmlQQI14wVM+VSSTFnOuHTS3eplDSGAXKZuNuedBxgXGlcKdPjJOrgeygu8/dtVkA1YslQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "sourcemap-codec": "1.4.8"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -2431,9 +2463,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001304",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001304.tgz",
-      "integrity": "sha512-bdsfZd6K6ap87AGqSHJP/s1V+U6Z5lyrcbBu3ovbCCf8cSYpwTtGrCBObMpJqwxfTbLW6YTIdbb1jEeTelcpYQ==",
+      "version": "1.0.30001305",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001305.tgz",
+      "integrity": "sha512-p7d9YQMji8haf0f+5rbcv9WlQ+N5jMPfRAnUmZRlNxsNeBO3Yr7RYG6M2uTY1h9tCVdlkJg6YNNc4kiAiBLdWA==",
       "dev": true,
       "funding": {
         "type": "opencollective",
@@ -2659,9 +2691,9 @@
       "dev": true
     },
     "node_modules/core-js": {
-      "version": "3.20.3",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz",
-      "integrity": "sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag==",
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.21.0.tgz",
+      "integrity": "sha512-YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ==",
       "dev": true,
       "hasInstallScript": true,
       "funding": {
@@ -3159,9 +3191,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.59",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.59.tgz",
-      "integrity": "sha512-AOJ3cAE0TWxz4fQ9zkND5hWrQg16nsZKVz9INOot1oV//u4wWu5xrj9CQMmPTYskkZRunSRc9sAnr4EkexXokg==",
+      "version": "1.4.63",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.63.tgz",
+      "integrity": "sha512-e0PX/LRJPFRU4kzJKLvTobxyFdnANCvcoDCe8XcyTqP58nTWIwdsHvXLIl1RkB39X5yaosLaroMASWB0oIsgCA==",
       "dev": true
     },
     "node_modules/elliptic": {
@@ -3900,9 +3932,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
-      "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
+      "version": "13.12.1",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz",
+      "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -4846,17 +4878,17 @@
       }
     },
     "node_modules/lmdb": {
-      "version": "2.1.7",
-      "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-2.1.7.tgz",
-      "integrity": "sha512-i6EFEBBlQ130J4BfJUbYgZFKQDz83xhpM47vzs0BMpXiJ7D4NjecO1Y3X54D341dwkLmTphlIyro5nTkKFXoMQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-2.2.0.tgz",
+      "integrity": "sha512-t89t1RQ5bpMXgPKC9HrPj798a11V2we2th6RrX7H2PNGuSmH+6DAlQzHAnA74sn39JtWq9Q1nvqp7dYpvpbyGA==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "msgpackr": "^1.5.2",
+        "msgpackr": "^1.5.4",
         "nan": "^2.14.2",
         "node-gyp-build": "^4.2.3",
-        "ordered-binary": "^1.2.3",
-        "weak-lru-cache": "^1.2.1"
+        "ordered-binary": "^1.2.4",
+        "weak-lru-cache": "^1.2.2"
       }
     },
     "node_modules/loader-utils": {
@@ -5096,9 +5128,9 @@
       "dev": true
     },
     "node_modules/msgpackr": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.5.2.tgz",
-      "integrity": "sha512-OCguCkbG34x1ddO4vAzEm/4J1GTo512k9SoxV8K+EGfI/onFdpemRf0HpsVRFpxadXr4JBFgHsQUitgTlw7ZYQ==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.5.4.tgz",
+      "integrity": "sha512-Z7w5Jg+2Q9z9gJxeM68d7tSuWZZGnFIRhZnyqcZCa/1dKkhOCNvR1TUV3zzJ3+vj78vlwKRzUgVDlW4jiSOeDA==",
       "dev": true,
       "optionalDependencies": {
         "msgpackr-extract": "^1.0.14"
@@ -5371,9 +5403,9 @@
       }
     },
     "node_modules/ordered-binary": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.2.3.tgz",
-      "integrity": "sha512-fEwMk8TNUtzQDjXKYS2ANW3fNZ/gMReCPOAsLHaqw+UDnq/8ddXAcX4lGRpTK7kAghAjkmJs1EXXbcrDbg+ruw==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.2.4.tgz",
+      "integrity": "sha512-A/csN0d3n+igxBPfUrjbV5GC69LWj2pjZzAAeeHXLukQ4+fytfP4T1Lg0ju7MSPSwq7KtHkGaiwO8URZN5IpLg==",
       "dev": true
     },
     "node_modules/os-browserify": {
@@ -6415,9 +6447,9 @@
       "dev": true
     },
     "node_modules/sass": {
-      "version": "1.49.4",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.4.tgz",
-      "integrity": "sha512-xUU5ZlppOjgfEyIIcHpnmY+f+3/ieaadp25S/OqZ5+jBPeTAMJJblkhM6UD9jb4j/lzglz7VOL5kglYt+CvNdQ==",
+      "version": "1.49.7",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.7.tgz",
+      "integrity": "sha512-13dml55EMIR2rS4d/RDHHP0sXMY3+30e1TKsyXaSz3iLWVoDWEoboY8WzJd5JMnxrRHffKO3wq2mpJ0jxRJiEQ==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -6588,6 +6620,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/sourcemap-codec": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+      "dev": true
+    },
     "node_modules/split2": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
@@ -7088,9 +7126,9 @@
       }
     },
     "node_modules/weak-lru-cache": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.1.tgz",
-      "integrity": "sha512-O5ag1F0Xk6ui+Fg5LlosTcVAyHs6DeyiDDbOapNtFCx/KjZ82B3U9stM9hvzbVclKWn9ABPjaINX/nQkGkJkKg==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz",
+      "integrity": "sha512-DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw==",
       "dev": true
     },
     "node_modules/which": {
@@ -7231,6 +7269,16 @@
     }
   },
   "dependencies": {
+    "@ampproject/remapping": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.0.2.tgz",
+      "integrity": "sha512-sE8Gx+qSDMLoJvb3QarJJlDQK7SSY4rK3hxp4XsiANeFOmjU46ZI7Y9adAQRJrmbz8zbtZkp3mJTT+rGxtF0XA==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/trace-mapping": "^0.2.2",
+        "sourcemap-codec": "1.4.8"
+      }
+    },
     "@babel/code-frame": {
       "version": "7.16.7",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
@@ -7241,32 +7289,32 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.8.tgz",
-      "integrity": "sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.0.tgz",
+      "integrity": "sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==",
       "dev": true
     },
     "@babel/core": {
-      "version": "7.16.12",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.12.tgz",
-      "integrity": "sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.0.tgz",
+      "integrity": "sha512-x/5Ea+RO5MvF9ize5DeVICJoVrNv0Mi2RnIABrZEKYvPEpldXwauPkgvYA17cKa6WpU3LoYvYbuEMFtSNFsarA==",
       "dev": true,
       "requires": {
+        "@ampproject/remapping": "^2.0.0",
         "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.16.8",
+        "@babel/generator": "^7.17.0",
         "@babel/helper-compilation-targets": "^7.16.7",
         "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helpers": "^7.16.7",
-        "@babel/parser": "^7.16.12",
+        "@babel/helpers": "^7.17.0",
+        "@babel/parser": "^7.17.0",
         "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.10",
-        "@babel/types": "^7.16.8",
+        "@babel/traverse": "^7.17.0",
+        "@babel/types": "^7.17.0",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
         "json5": "^2.1.2",
-        "semver": "^6.3.0",
-        "source-map": "^0.5.0"
+        "semver": "^6.3.0"
       },
       "dependencies": {
         "semver": {
@@ -7278,12 +7326,12 @@
       }
     },
     "@babel/generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz",
-      "integrity": "sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.0.tgz",
+      "integrity": "sha512-I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.16.8",
+        "@babel/types": "^7.17.0",
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
       }
@@ -7408,14 +7456,14 @@
       "dev": true
     },
     "@babel/helpers": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz",
-      "integrity": "sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.0.tgz",
+      "integrity": "sha512-Xe/9NFxjPwELUvW2dsukcMZIp6XwPSbI4ojFBJuX5ramHuVE22SVcZIwqzdWo5uCgeTXW8qV97lMvSOjq+1+nQ==",
       "dev": true,
       "requires": {
         "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/traverse": "^7.17.0",
+        "@babel/types": "^7.17.0"
       }
     },
     "@babel/highlight": {
@@ -7488,9 +7536,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.16.12",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.12.tgz",
-      "integrity": "sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.0.tgz",
+      "integrity": "sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==",
       "dev": true
     },
     "@babel/plugin-syntax-flow": {
@@ -7524,19 +7572,19 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.16.10",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz",
-      "integrity": "sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.0.tgz",
+      "integrity": "sha512-fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.16.8",
+        "@babel/generator": "^7.17.0",
         "@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.10",
-        "@babel/types": "^7.16.8",
+        "@babel/parser": "^7.17.0",
+        "@babel/types": "^7.17.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -7550,9 +7598,9 @@
       }
     },
     "@babel/types": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz",
-      "integrity": "sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz",
+      "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
       "dev": true,
       "requires": {
         "@babel/helper-validator-identifier": "^7.16.7",
@@ -7634,6 +7682,22 @@
       "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==",
       "dev": true
     },
+    "@jridgewell/resolve-uri": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz",
+      "integrity": "sha512-cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg==",
+      "dev": true
+    },
+    "@jridgewell/trace-mapping": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.2.3.tgz",
+      "integrity": "sha512-X8ybLjwxY8VNxEddYmlQQI14wVM+VSSTFnOuHTS3eplDSGAXKZuNuedBxgXGlcKdPjJOrgeygu8/dtVkA1YslQ==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "sourcemap-codec": "1.4.8"
+      }
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -8970,9 +9034,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001304",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001304.tgz",
-      "integrity": "sha512-bdsfZd6K6ap87AGqSHJP/s1V+U6Z5lyrcbBu3ovbCCf8cSYpwTtGrCBObMpJqwxfTbLW6YTIdbb1jEeTelcpYQ==",
+      "version": "1.0.30001305",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001305.tgz",
+      "integrity": "sha512-p7d9YQMji8haf0f+5rbcv9WlQ+N5jMPfRAnUmZRlNxsNeBO3Yr7RYG6M2uTY1h9tCVdlkJg6YNNc4kiAiBLdWA==",
       "dev": true
     },
     "chalk": {
@@ -9153,9 +9217,9 @@
       }
     },
     "core-js": {
-      "version": "3.20.3",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz",
-      "integrity": "sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag==",
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.21.0.tgz",
+      "integrity": "sha512-YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ==",
       "dev": true
     },
     "core-util-is": {
@@ -9539,9 +9603,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.4.59",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.59.tgz",
-      "integrity": "sha512-AOJ3cAE0TWxz4fQ9zkND5hWrQg16nsZKVz9INOot1oV//u4wWu5xrj9CQMmPTYskkZRunSRc9sAnr4EkexXokg==",
+      "version": "1.4.63",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.63.tgz",
+      "integrity": "sha512-e0PX/LRJPFRU4kzJKLvTobxyFdnANCvcoDCe8XcyTqP58nTWIwdsHvXLIl1RkB39X5yaosLaroMASWB0oIsgCA==",
       "dev": true
     },
     "elliptic": {
@@ -10120,9 +10184,9 @@
       }
     },
     "globals": {
-      "version": "13.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz",
-      "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==",
+      "version": "13.12.1",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz",
+      "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
       "dev": true,
       "requires": {
         "type-fest": "^0.20.2"
@@ -10772,16 +10836,16 @@
       }
     },
     "lmdb": {
-      "version": "2.1.7",
-      "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-2.1.7.tgz",
-      "integrity": "sha512-i6EFEBBlQ130J4BfJUbYgZFKQDz83xhpM47vzs0BMpXiJ7D4NjecO1Y3X54D341dwkLmTphlIyro5nTkKFXoMQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-2.2.0.tgz",
+      "integrity": "sha512-t89t1RQ5bpMXgPKC9HrPj798a11V2we2th6RrX7H2PNGuSmH+6DAlQzHAnA74sn39JtWq9Q1nvqp7dYpvpbyGA==",
       "dev": true,
       "requires": {
-        "msgpackr": "^1.5.2",
+        "msgpackr": "^1.5.4",
         "nan": "^2.14.2",
         "node-gyp-build": "^4.2.3",
-        "ordered-binary": "^1.2.3",
-        "weak-lru-cache": "^1.2.1"
+        "ordered-binary": "^1.2.4",
+        "weak-lru-cache": "^1.2.2"
       }
     },
     "loader-utils": {
@@ -10977,9 +11041,9 @@
       "dev": true
     },
     "msgpackr": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.5.2.tgz",
-      "integrity": "sha512-OCguCkbG34x1ddO4vAzEm/4J1GTo512k9SoxV8K+EGfI/onFdpemRf0HpsVRFpxadXr4JBFgHsQUitgTlw7ZYQ==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.5.4.tgz",
+      "integrity": "sha512-Z7w5Jg+2Q9z9gJxeM68d7tSuWZZGnFIRhZnyqcZCa/1dKkhOCNvR1TUV3zzJ3+vj78vlwKRzUgVDlW4jiSOeDA==",
       "dev": true,
       "requires": {
         "msgpackr-extract": "^1.0.14"
@@ -11180,9 +11244,9 @@
       }
     },
     "ordered-binary": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.2.3.tgz",
-      "integrity": "sha512-fEwMk8TNUtzQDjXKYS2ANW3fNZ/gMReCPOAsLHaqw+UDnq/8ddXAcX4lGRpTK7kAghAjkmJs1EXXbcrDbg+ruw==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.2.4.tgz",
+      "integrity": "sha512-A/csN0d3n+igxBPfUrjbV5GC69LWj2pjZzAAeeHXLukQ4+fytfP4T1Lg0ju7MSPSwq7KtHkGaiwO8URZN5IpLg==",
       "dev": true
     },
     "os-browserify": {
@@ -11899,9 +11963,9 @@
       "dev": true
     },
     "sass": {
-      "version": "1.49.4",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.4.tgz",
-      "integrity": "sha512-xUU5ZlppOjgfEyIIcHpnmY+f+3/ieaadp25S/OqZ5+jBPeTAMJJblkhM6UD9jb4j/lzglz7VOL5kglYt+CvNdQ==",
+      "version": "1.49.7",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.7.tgz",
+      "integrity": "sha512-13dml55EMIR2rS4d/RDHHP0sXMY3+30e1TKsyXaSz3iLWVoDWEoboY8WzJd5JMnxrRHffKO3wq2mpJ0jxRJiEQ==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -12038,6 +12102,12 @@
         }
       }
     },
+    "sourcemap-codec": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+      "dev": true
+    },
     "split2": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
@@ -12440,9 +12510,9 @@
       }
     },
     "weak-lru-cache": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.1.tgz",
-      "integrity": "sha512-O5ag1F0Xk6ui+Fg5LlosTcVAyHs6DeyiDDbOapNtFCx/KjZ82B3U9stM9hvzbVclKWn9ABPjaINX/nQkGkJkKg==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz",
+      "integrity": "sha512-DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw==",
       "dev": true
     },
     "which": {