From eb5423d08403e24ef3bc00d47f116fa1be1a68c8 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Mon, 21 Mar 2022 18:50:23 +0100
Subject: [PATCH] ci: Also check generated HTML with the "vnu" validator
 (#3682)

* ci: Also check generated HTML with the "vnu" validator

Because HTML Tidy apparently misses a bunch of errors.

* thead -> tbody

* More fixes

* More fixes

* Start checker in test runner
---
 docker/app.Dockerfile                         |   6 +
 ietf/api/templates/api/base.html              |   2 +-
 .../templates/dbtemplate/template_edit.html   |   2 +-
 ietf/doc/templatetags/ietf_filters.py         |   1 +
 ietf/group/tests_review.py                    |   5 +-
 ietf/ipr/tests.py                             |   4 +-
 ietf/liaisons/widgets.py                      |  10 +-
 ietf/release/tests.py                         |   3 +-
 ietf/secr/templates/announcement/main.html    |   2 +-
 ietf/secr/templates/areas/people.html         |   2 +-
 ietf/secr/templates/areas/view.html           |   2 +-
 ietf/secr/templates/base_secr.html            |  16 +-
 ietf/secr/templates/base_secr_bootstrap.html  |  14 +-
 ietf/secr/templates/base_site.html            |   8 +-
 ietf/secr/templates/base_site_bootstrap.html  |   8 +-
 ietf/secr/templates/confirm_cancel.html       |   2 +-
 ietf/secr/templates/confirm_delete.html       |   2 +-
 ietf/secr/templates/groups/people.html        |   4 +-
 ietf/secr/templates/groups/search.html        |   2 +-
 ietf/secr/templates/groups/view.html          |   2 +-
 .../includes/sessions_request_form.html       |  20 +--
 .../includes/sessions_request_view.html       |   2 +-
 ietf/secr/templates/main.html                 |  12 +-
 ietf/secr/templates/meetings/add.html         |   2 +-
 .../templates/meetings/base_rooms_times.html  |   2 +-
 ietf/secr/templates/meetings/main.html        |   2 +-
 .../templates/meetings/misc_sessions.html     |   6 +-
 .../meetings/regular_session_edit.html        |   4 +-
 ietf/secr/templates/meetings/rooms.html       |   4 +-
 ietf/secr/templates/meetings/times.html       |   2 +-
 ietf/secr/templates/meetings/view.html        |  25 +--
 .../proceedings/interim_directory.html        |  10 +-
 .../secr/templates/proceedings/recording.html |   2 +-
 .../templates/proceedings/recording_edit.html |   2 +-
 ietf/secr/templates/proceedings/view.html     |  31 +---
 ietf/secr/templates/roles/main.html           |   4 +-
 ietf/secr/templates/rolodex/add.html          |   4 +-
 ietf/secr/templates/rolodex/add_proceed.html  |   2 +-
 ietf/secr/templates/rolodex/delete.html       |   2 +-
 ietf/secr/templates/rolodex/edit.html         |   2 +-
 ietf/secr/templates/rolodex/search.html       |   2 +-
 ietf/secr/templates/rolodex/view.html         |   2 +-
 ietf/secr/templates/sreq/main.html            |   4 +-
 ietf/secr/templates/sreq/tool_status.html     |   2 +-
 .../templates/telechat/base_telechat.html     |   2 +-
 ietf/secr/templates/telechat/doc.html         |   8 +-
 ietf/secr/templates/telechat/group.html       |   2 +-
 ietf/secr/templates/telechat/main.html        |   2 +-
 ietf/secr/templates/telechat/roll_call.html   |   2 +-
 ietf/static/js/liaisons.js                    |   3 +-
 ietf/submit/forms.py                          |   4 +-
 ietf/templates/base.html                      |   2 +-
 .../doc/ballot/approve_downrefs.html          |   2 +-
 .../doc/charter/action_announcement_text.html |   3 +-
 ietf/templates/doc/document_bofreq.html       |   2 +-
 ietf/templates/doc/document_draft.html        |   2 -
 ietf/templates/doc/document_history.html      |   8 +-
 .../doc/draft/review_possibly_replaces.html   |   2 +-
 .../templates/doc/drafts_in_iesg_process.html |   4 +-
 ietf/templates/doc/edit_action_holders.html   |   2 +-
 ietf/templates/doc/revisions_list.html        |   4 +-
 ietf/templates/doc/search/search_results.html |   4 +-
 .../doc/status_change/edit_related_rows.html  |   4 +-
 .../doc/status_change/status_changes.html     |   4 +-
 ietf/templates/googlea30ad1dacffb5e5b.html    |   2 +-
 ietf/templates/group/active_adm.html          |   4 +-
 ietf/templates/group/active_iabgroups.html    |   4 +-
 .../group/group_about_rendertest.html         |   2 +-
 .../group/reset_charter_milestones.html       |   2 +-
 ietf/templates/group/reset_next_reviewer.html |   2 +-
 ietf/templates/group/review_requests.html     |  16 +-
 ietf/templates/iesg/agenda_documents.html     |   1 +
 ietf/templates/iesg/moderator_package.html    |   2 +-
 ietf/templates/ietfauth/review_overview.html  |   2 +-
 ietf/templates/ietfauth/testemail.html        |   2 +-
 ietf/templates/ietfauth/whitelist_form.html   |   2 +-
 ietf/templates/ipr/details_history.html       |   2 +-
 ietf/templates/ipr/search_doc_result.html     |   4 +-
 .../templates/ipr/search_doctitle_result.html |   4 +-
 ietf/templates/ipr/search_result.html         |   8 +-
 ietf/templates/ipr/search_wg_result.html      |   4 +-
 ietf/templates/liaisons/edit.html             |   2 +-
 ietf/templates/meeting/agenda.html            |   2 +-
 .../meeting/edit_meeting_schedule.html        |   4 +-
 ietf/templates/meeting/group_materials.html   |  12 +-
 ietf/templates/meeting/import_minutes.html    |   1 -
 ietf/templates/meeting/interim_request.html   |   2 +-
 .../meeting/interim_request_cancel.html       |   2 +-
 .../meeting/interim_request_edit.html         |   2 +-
 .../meeting/interim_send_announcement.html    |   2 +-
 .../meeting/interim_skip_announce.html        |   2 +-
 .../meeting/materials_editable_groups.html    |   4 +-
 ietf/templates/meeting/requests.html          |   4 +-
 .../meeting/session_buttons_include.html      |   1 -
 ietf/templates/meeting/timeslot_edit.html     |   4 +-
 ietf/templates/meeting/tz-display.html        |   3 -
 ietf/templates/meeting/week-view.html         |   2 +-
 .../nomcom/iesg_position_requirements.html    |   2 +
 ietf/templates/nomcom/private_index.html      |  76 ++++-----
 ietf/templates/nomcom/send_reminder_mail.html |   2 +-
 ietf/templates/oidc_provider/authorize.html   |   2 +-
 ietf/templates/person/merge.html              |   2 +-
 .../registration/change_password.html         |   2 +-
 .../registration/confirm_account.html         |   2 +-
 ietf/templates/registration/index.html        |  10 +-
 ietf/templates/submit/manual_post.html        |   3 +-
 ietf/templates/submit/tool_instructions.html  |  20 +--
 ietf/templates/submit/upload_submission.html  |   1 -
 ietf/utils/test_runner.py                     |  22 ++-
 ietf/utils/test_utils.py                      | 144 +++++++++++++-----
 110 files changed, 381 insertions(+), 332 deletions(-)

diff --git a/docker/app.Dockerfile b/docker/app.Dockerfile
index b4d78f3cc..7911e8169 100644
--- a/docker/app.Dockerfile
+++ b/docker/app.Dockerfile
@@ -124,6 +124,12 @@ RUN sed -i '/imklog/s/^/#/' /etc/rsyslog.conf
 # Colorize the bash shell
 RUN sed -i 's/#force_color_prompt=/force_color_prompt=/' /root/.bashrc
 
+# Install the Nu Html Checker (v.Nu)
+ADD https://github.com/validator/validator/releases/download/latest/vnu.linux.zip /
+RUN unzip -d / /vnu.linux.zip
+RUN cp -r /vnu-runtime-image/* /usr/local
+RUN rm -rf /vnu.linux.zip /vnu-runtime-image
+
 ADD https://raw.githubusercontent.com/eficode/wait-for/v2.1.3/wait-for /usr/local/bin/
 RUN chmod +rx /usr/local/bin/wait-for
 
diff --git a/ietf/api/templates/api/base.html b/ietf/api/templates/api/base.html
index dbfc1fdfe..4185da8bf 100644
--- a/ietf/api/templates/api/base.html
+++ b/ietf/api/templates/api/base.html
@@ -1,6 +1,6 @@
 <html>
     <head>
-        <style type="text/css">
+        <style>
             p.comment {
                 background-color: #cfc;
                 border: solid black 1px;
diff --git a/ietf/dbtemplate/templates/dbtemplate/template_edit.html b/ietf/dbtemplate/templates/dbtemplate/template_edit.html
index 31625b111..f27ab9c83 100644
--- a/ietf/dbtemplate/templates/dbtemplate/template_edit.html
+++ b/ietf/dbtemplate/templates/dbtemplate/template_edit.html
@@ -32,7 +32,7 @@
     </dl>
 
     <h2>Edit template content</h2>
-    <form id="dbtemplate-edit" role="form" method="post">
+    <form id="dbtemplate-edit" method="post">
         {% csrf_token %}
 
         {% bootstrap_form form %}
diff --git a/ietf/doc/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py
index a9f090795..21cd383cb 100644
--- a/ietf/doc/templatetags/ietf_filters.py
+++ b/ietf/doc/templatetags/ietf_filters.py
@@ -197,6 +197,7 @@ def urlize_ietf_docs(string, autoescape=None):
     string = re.sub(r"(STD\s*?)0{0,3}(\d+)", "<a href=\"/doc/std\\2/\">\\1\\2</a>", string, flags=re.IGNORECASE)
     string = re.sub(r"(FYI\s*?)0{0,3}(\d+)", "<a href=\"/doc/fyi\\2/\">\\1\\2</a>", string, flags=re.IGNORECASE)
     string = re.sub(r"(draft-[-0-9a-zA-Z._+]+)", "<a href=\"/doc/\\1/\">\\1</a>", string, flags=re.IGNORECASE)
+    string = re.sub(r"(bofreq-[-0-9a-zA-Z._+]+)", "<a href=\"/doc/\\1/\">\\1</a>", string, flags=re.IGNORECASE)
     string = re.sub(r"(conflict-review-[-0-9a-zA-Z._+]+)", "<a href=\"/doc/\\1/\">\\1</a>", string, flags=re.IGNORECASE)
     string = re.sub(r"(status-change-[-0-9a-zA-Z._+]+)", "<a href=\"/doc/\\1/\">\\1</a>", string, flags=re.IGNORECASE)
     string = re.sub(r"(charter-[-0-9a-zA-Z._+]+)", "<a href=\"/doc/\\1/\">\\1</a>", string, flags=re.IGNORECASE)
diff --git a/ietf/group/tests_review.py b/ietf/group/tests_review.py
index 7dd1b64b6..ee4ae96fe 100644
--- a/ietf/group/tests_review.py
+++ b/ietf/group/tests_review.py
@@ -25,6 +25,7 @@ from ietf.person.factories import PersonFactory, EmailFactory
 from ietf.doc.factories import DocumentFactory
 from ietf.group.factories import RoleFactory, ReviewTeamFactory, GroupFactory
 from ietf.review.factories import ReviewRequestFactory, ReviewerSettingsFactory, ReviewAssignmentFactory
+from django.utils.html import escape
 
 class ReviewTests(TestCase):
     def test_review_requests(self):
@@ -375,8 +376,8 @@ class ReviewTests(TestCase):
         # get
         r = self.client.get(unassigned_url)
         self.assertEqual(r.status_code, 200)
-        self.assertContains(r, review_req1.doc.name)
-        self.assertContains(r, doc_author.name)
+        self.assertContains(r, escape(review_req1.doc.name))
+        self.assertContains(r, escape(doc_author.name))
 
         # Test that conflicts are detected
         r = self.client.post(unassigned_url, {
diff --git a/ietf/ipr/tests.py b/ietf/ipr/tests.py
index 002bf05c1..5b3896832 100644
--- a/ietf/ipr/tests.py
+++ b/ietf/ipr/tests.py
@@ -162,8 +162,8 @@ class IprTests(TestCase):
         r = self.client.get(url + "?submit=holder&holder=%s" % ipr.holder_legal_name)
         self.assertContains(r, ipr.title)
         
-        # find by patent infoj
-        r = self.client.get(url + "?submit=patent&patent=%s" % quote(ipr.patent_info))
+        # find by patent info
+        r = self.client.get(url + "?submit=patent&patent=%s" % quote(ipr.patent_info.partition("\n")[0]))
         self.assertContains(r, ipr.title)
 
         r = self.client.get(url + "?submit=patent&patent=US12345")
diff --git a/ietf/liaisons/widgets.py b/ietf/liaisons/widgets.py
index db27c3780..1630f9574 100644
--- a/ietf/liaisons/widgets.py
+++ b/ietf/liaisons/widgets.py
@@ -18,13 +18,13 @@ class ButtonWidget(Widget):
         super(ButtonWidget, self).__init__(*args, **kwargs)
 
     def render(self, name, value, **kwargs):
-        html = '<span style="display: none" class="showAttachsOn">%s</span>' % conditional_escape(self.show_on)
-        html += '<span style="display: none" class="attachEnabledLabel">%s</span>' % conditional_escape(self.label)
+        html = '<span style="display: none;" class="showAttachsOn">%s</span>' % conditional_escape(self.show_on)
+        html += '<span style="display: none;" class="attachEnabledLabel">%s</span>' % conditional_escape(self.label)
         if self.require:
             for i in self.require:
-                html += '<span style="display: none" class="attachRequiredField">%s</span>' % conditional_escape(i)
+                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 += '<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)
         return mark_safe(html)
 
@@ -32,7 +32,7 @@ class ButtonWidget(Widget):
 class ShowAttachmentsWidget(Widget):
     def render(self, name, value, **kwargs):
         html = '<div id="id_%s">' % name
-        html += '<span style="display: none" class="showAttachmentsEmpty form-control widget">No files attached</span>'
+        html += '<span style="display: none;" class="showAttachmentsEmpty form-control widget">No files attached</span>'
         html += '<div class="attachedFiles form-control widget">'
         if value and isinstance(value, QuerySet):
             for attachment in value:
diff --git a/ietf/release/tests.py b/ietf/release/tests.py
index d2e90ab43..710d2b356 100644
--- a/ietf/release/tests.py
+++ b/ietf/release/tests.py
@@ -42,5 +42,4 @@ class ReleasePagesTest(TestCase):
 
         s = q('#frequency-data').text()
         self.assertIn("type: 'column',", s)
-        self.assertIn('"data": [[2007, 7], ', s)
-
+        self.assertIn('"data": [[2007, 7], ', s)
\ No newline at end of file
diff --git a/ietf/secr/templates/announcement/main.html b/ietf/secr/templates/announcement/main.html
index 5402f676d..7ff77aa24 100644
--- a/ietf/secr/templates/announcement/main.html
+++ b/ietf/secr/templates/announcement/main.html
@@ -11,7 +11,7 @@
     <div class="module">
         <h2>Announcement</h2>
 
-        <form action="" method="post">{% csrf_token %}
+        <form method="post">{% csrf_token %}
             <table class="new-style full-width amstable" id="announce-table">
                 {% if form.non_field_errors %}{{ form.non_field_errors }}{% endif %}
                 {% for field in form.visible_fields %}
diff --git a/ietf/secr/templates/areas/people.html b/ietf/secr/templates/areas/people.html
index 1973c147b..ba30c36c3 100644
--- a/ietf/secr/templates/areas/people.html
+++ b/ietf/secr/templates/areas/people.html
@@ -3,7 +3,7 @@
 {% block title %}Areas - People{% endblock %}
 
 {% block extrahead %}{{ block.super }}
-    <link rel="stylesheet" type="text/css" href="{% static 'ietf/css/jquery-ui.css' %}" />
+    <link rel="stylesheet" href="{% static 'ietf/css/jquery-ui.css' %}" />
     <script src="{% static 'ietf/js/jquery-ui.js' %}"></script>
     <script src="{% static 'secr/js/utils.js' %}"></script>
 {% endblock %}
diff --git a/ietf/secr/templates/areas/view.html b/ietf/secr/templates/areas/view.html
index 9fc8ee626..559bc5574 100644
--- a/ietf/secr/templates/areas/view.html
+++ b/ietf/secr/templates/areas/view.html
@@ -16,7 +16,7 @@
     <div class="module">
         <h2>Area - View</h2>
         <table class="full-width">
-            <col width="150">
+            
             <tr><td>Area Acronym:</td><td>{{ area.acronym }}</td></tr>
             <tr><td>Area Name:</td><td>{{ area.name }}</td></tr>
             <tr><td>Status:</td><td>{{ area.state }}</td></tr>
diff --git a/ietf/secr/templates/base_secr.html b/ietf/secr/templates/base_secr.html
index d4ba1fa5d..e840f50e6 100644
--- a/ietf/secr/templates/base_secr.html
+++ b/ietf/secr/templates/base_secr.html
@@ -6,11 +6,13 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
         <meta name="viewport" content="width=device-width, initial-scale=1"/>
         <title>{% block title %}{% endblock %}</title>
-        <link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% static 'secr/css/base.css' %}{% endblock %}" />
-        <link rel="stylesheet" type="text/css" href="{% static 'secr/css/forms.css' %}" />
-        <link rel="stylesheet" type="text/css" href="{% static 'secr/css/custom.css' %}" />
+        <link rel="stylesheet" href="{% block stylesheet %}{% static 'secr/css/base.css' %}{% endblock %}" />
+        <link rel="stylesheet" href="{% static 'secr/css/forms.css' %}" />
+        <link rel="stylesheet" href="{% static 'secr/css/custom.css' %}" />
+        <link rel="stylesheet" href="{% static 'ietf/css/ietf.css' %}">
+
         {% if not server_mode == "production" %}
-            <link rel="stylesheet" type="text/css" href="{% static 'secr/css/test.css' %}" />
+            <link rel="stylesheet" href="{% static 'secr/css/test.css' %}" />
         {% endif %}
         {% block extrastyle %}{% endblock %}
 
@@ -38,12 +40,12 @@
 
                 <!-- Breadcrumbs -->
                 <div class="breadcrumbs">
-                    <table width="100%">
+                    <table>
                         <tr>
-                            <td align="left">
+                            <td class="text-start">
                                 {% block breadcrumbs %}<a href="/secr/">Home</a>{% endblock %}
                             </td>
-                            <td align="right">
+                            <td class="text-end">
                                 {% block instructions %}{% endblock %}
                             </td>
                         </tr>
diff --git a/ietf/secr/templates/base_secr_bootstrap.html b/ietf/secr/templates/base_secr_bootstrap.html
index 35f9b9dbb..c6ee26c71 100644
--- a/ietf/secr/templates/base_secr_bootstrap.html
+++ b/ietf/secr/templates/base_secr_bootstrap.html
@@ -7,11 +7,11 @@
         <meta name="viewport" content="width=device-width, initial-scale=1"/>
         <title>{% block title %}{% endblock %}</title>
         <link rel="stylesheet" href="{% static 'ietf/css/ietf.css' %}"/>
-        <link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% static 'secr/css/base.css' %}{% endblock %}" />
-        <link rel="stylesheet" type="text/css" href="{% static 'secr/css/forms.css' %}" />
-        <link rel="stylesheet" type="text/css" href="{% static 'secr/css/custom.css' %}" />
+        <link rel="stylesheet" href="{% block stylesheet %}{% static 'secr/css/base.css' %}{% endblock %}" />
+        <link rel="stylesheet" href="{% static 'secr/css/forms.css' %}" />
+        <link rel="stylesheet" href="{% static 'secr/css/custom.css' %}" />
         {% if not server_mode == "production" %}
-            <link rel="stylesheet" type="text/css" href="{% static 'secr/css/test.css' %}" />
+            <link rel="stylesheet" href="{% static 'secr/css/test.css' %}" />
         {% endif %}
         {% block extrastyle %}{% endblock %}
 
@@ -39,12 +39,12 @@
 
                 <!-- Breadcrumbs -->
                 <div class="breadcrumbs">
-                    <table width="100%">
+                    <table>
                         <tr>
-                            <td align="left">
+                            <td class="text-start">
                                 {% block breadcrumbs %}<a href="/secr/">Home</a>{% endblock %}
                             </td>
-                            <td align="right">
+                            <td class="text-end">
                                 {% block instructions %}{% endblock %}
                             </td>
                         </tr>
diff --git a/ietf/secr/templates/base_site.html b/ietf/secr/templates/base_site.html
index f75b41d06..3408bb34f 100644
--- a/ietf/secr/templates/base_site.html
+++ b/ietf/secr/templates/base_site.html
@@ -6,12 +6,12 @@
 {% block title %}{{ title }}{% if user|has_role:"Secretariat" %} Secretariat Dashboard {% else %} IETF Dashboard {% endif %}{% endblock %}
 
 {% block branding %}
-    <table width="100%">
+    <table>
         <tr>
-            <td align="left">
+            <td class="text-start">
                 <h1 id="site-name">{% if user|has_role:"Secretariat" %} Secretariat Dashboard {% else %} IETF Dashboard {% endif %}</h1>
             </td>
-            <td align="right">
+            <td class="text-end">
                 <br>
                 <span class="login">{% if user|has_role:"Secretariat" %}Secretariat {% endif %}Logged in: <a href="/accounts/profile/">{{ user }}</a>  | <a rel="nofollow" href="/accounts/logout/">Log out</a></span>
             </td>
@@ -31,7 +31,7 @@
 
         </div>
         <div id="footer-logo">
-            <a href="https://www.amsl.com/"><img src="{% static 'secr/images/ams_logo.png' %}" alt="AMS" align="right" border="0" hspace="5" /></a>
+            <a href="https://www.amsl.com/"><img src="{% static 'secr/images/ams_logo.png' %}" alt="AMS" class="text-end p-3"  /></a>
         </div>
     </div>
 {% 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 d1ab1dfde..b8445d25d 100644
--- a/ietf/secr/templates/base_site_bootstrap.html
+++ b/ietf/secr/templates/base_site_bootstrap.html
@@ -6,12 +6,12 @@
 {% block title %}{{ title }}{% if user|has_role:"Secretariat" %} Secretariat Dashboard {% else %} WG Chair Dashboard {% endif %}{% endblock %}
 
 {% block branding %}
-    <table width="100%">
+    <table>
         <tr>
-            <td align="left">
+            <td class="text-start">
                 <h1 id="site-name">{% if user|has_role:"Secretariat" %} Secretariat Dashboard {% else %} WG Chair Dashboard {% endif %}</h1>
             </td>
-            <td align="right">
+            <td class="text-end">
                 <br>
                 <span class="login">{% if user|has_role:"Secretariat" %}Secretariat {% endif %}Logged in: <a href="/accounts/profile/">{{ user }}</a>  | <a rel="nofollow" href="/accounts/logout/">Log out</a></span>
             </td>
@@ -31,7 +31,7 @@
 
         </div>
         <div id="footer-logo">
-            <a href="https://www.amsl.com/"><img src="{% static 'secr/images/ams_logo.png' %}" alt="AMS" align="right" border="0" hspace="5" /></a>
+            <a href="https://www.amsl.com/"><img src="{% static 'secr/images/ams_logo.png' %}" alt="AMS" class="text-end p-3"  /></a>
         </div>
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/confirm_cancel.html b/ietf/secr/templates/confirm_cancel.html
index 45ed21998..c84671239 100644
--- a/ietf/secr/templates/confirm_cancel.html
+++ b/ietf/secr/templates/confirm_cancel.html
@@ -12,7 +12,7 @@
         <p>You are about to cancel: {{ object }}</p>
         {% if extra %}<p>{{ extra }}</p>{% endif %}
 
-        <form action="" method="post">{% csrf_token %}
+        <form method="post">{% csrf_token %}
             <div>
                 <p>
                     <input type="hidden" name="post" value="yes">
diff --git a/ietf/secr/templates/confirm_delete.html b/ietf/secr/templates/confirm_delete.html
index 2ee3afc4b..be89ef75a 100644
--- a/ietf/secr/templates/confirm_delete.html
+++ b/ietf/secr/templates/confirm_delete.html
@@ -12,7 +12,7 @@
         <p>You are about to delete: {{ object }}</p>
         {% if extra %}<p>{{ extra }}</p>{% endif %}
 
-        <form action="" method="post">{% csrf_token %}
+        <form method="post">{% csrf_token %}
             <div>
                 <p>
                     <input type="hidden" name="post" value="yes">
diff --git a/ietf/secr/templates/groups/people.html b/ietf/secr/templates/groups/people.html
index ebcc1aeeb..113f89c07 100644
--- a/ietf/secr/templates/groups/people.html
+++ b/ietf/secr/templates/groups/people.html
@@ -4,7 +4,7 @@
 {% block title %}Groups - People{% endblock %}
 
 {% block extrahead %}{{ block.super }}
-    <link rel="stylesheet" type="text/css" href="{% static 'ietf/css/jquery-ui.css' %}" />
+    <link rel="stylesheet" href="{% static 'ietf/css/jquery-ui.css' %}" />
     <script src="{% static 'ietf/js/jquery-ui.js' %}"></script>
     <script src="{% static 'secr/js/utils.js' %}"></script>
 {% endblock %}
@@ -45,7 +45,7 @@
         <div class="inline-related">
             <!-- <hr><br> -->
             <h3>Add Role</h3>
-            <form id="groups-people" action="" method="post">{% csrf_token %}
+            <form id="groups-people" method="post">{% csrf_token %}
                 {{ form.non_field_errors }}
                 {{ form.group_acronym }}
                 <table class="full-width">
diff --git a/ietf/secr/templates/groups/search.html b/ietf/secr/templates/groups/search.html
index a60455302..ce70ad50b 100644
--- a/ietf/secr/templates/groups/search.html
+++ b/ietf/secr/templates/groups/search.html
@@ -17,7 +17,7 @@
 
     <div class="module group-container">
         <h2>Groups - Search</h2>
-        <form enctype="multipart/form-data" action="" method="post">{% csrf_token %}
+        <form enctype="multipart/form-data" method="post">{% csrf_token %}
             <table class="full-width amstable">
                 {{ form.as_table }}
             </table>
diff --git a/ietf/secr/templates/groups/view.html b/ietf/secr/templates/groups/view.html
index a1c2e9ae3..6ec9be502 100644
--- a/ietf/secr/templates/groups/view.html
+++ b/ietf/secr/templates/groups/view.html
@@ -18,7 +18,7 @@
         <div id="groups-view-col1">
             <h2>Groups - View</h2>
             <table >
-                <col width="150">
+                
                 <tr><td>Group Acronym:</td><td>{{ group.acronym }}</td></tr>
                 <tr><td>Group Name:</td><td>{{ group.name }}</td></tr>
                 <tr><td>Status:</td><td>{{ group.state }}</td></tr>
diff --git a/ietf/secr/templates/includes/sessions_request_form.html b/ietf/secr/templates/includes/sessions_request_form.html
index b12412ad1..1e596104e 100755
--- a/ietf/secr/templates/includes/sessions_request_form.html
+++ b/ietf/secr/templates/includes/sessions_request_form.html
@@ -4,8 +4,8 @@
     {% if form.non_field_errors %}
         {{ form.non_field_errors }}
     {% endif %}
-    <table id="sessions-new-table" cellspacing="1" cellpadding="1" border="0">
-        <col width="150">
+    <table id="sessions-new-table">
+        
         <tr class="bg1"><td>Working Group Name:</td><td>{{ group.name }} ({{ group.acronym }})</td></tr>
         <tr class="bg2"><td>Area Name:</td><td>{% if group.parent %}{{ group.parent.name }} ({{ group.parent.acronym }}){% endif %}</td></tr>
         <tr class="bg1"><td>Number of Sessions:<span class="required">*</span></td><td>{{ form.num_session.errors }}{{ form.num_session }}</td></tr>
@@ -37,25 +37,25 @@
                     </tr>
                     {% for cname, cfield, cselector  in form.wg_constraint_fields %}
                         <tr class="bg1">
-                            {% if forloop.first %}<td rowspan="{{ form.wg_constraint_count }}" valign="top" width="220">WG Sessions:<br>You may select multiple WGs within each category</td>{% endif %}
-                            <td width="320">{{ cname|title }}</td>
+                            {% if forloop.first %}<td rowspan="{{ form.wg_constraint_count }}" >WG Sessions:<br>You may select multiple WGs within each category</td>{% endif %}
+                            <td>{{ cname|title }}</td>
                             <td>{{ cselector }}
                                 <input type="button" id="wg_delete_{{ cname.slug }}" value="Delete the last entry" onClick="ietf_sessions.delete_wg_constraint_clicked('{{ cname.slug }}')"><br>
                                 {{ cfield.errors }}{{ cfield }}
                             </td>
                         </tr>
                     {% empty %}{# shown if there are no constraint fields #}
-                        <tr class="bg1"><td width="220"></td><td colspan="2">No constraints are enabled for this meeting.</td></tr>
+                        <tr class="bg1"><td ></td><td colspan="2">No constraints are enabled for this meeting.</td></tr>
                     {% endfor %}
                     {% if form.inactive_wg_constraints %}
                         {% for cname, value, field in form.inactive_wg_constraints %}
                             <tr class="bg1">
                                 {% if forloop.first %}
-                                    <td rowspan="{{ form.inactive_wg_constraint_count }}" valign="top" width="220">
+                                    <td rowspan="{{ form.inactive_wg_constraint_count }}" >
                                         Disabled for this meeting
                                     </td>
                                 {% endif %}
-                                <td width="320">{{ cname|title }}</td>
+                                <td>{{ cname|title }}</td>
                                 <td><input type="text" value="{{ value }}" maxlength="255" class="wg_constraint" disabled><br>{{ field }} {{ field.label }}</td>
                         </tr>
                         {% endfor %}
@@ -76,11 +76,11 @@
                 </td>
             </tr>
             <tr class="bg1">
-                <td valign="top">Times during which this WG can <strong>not</strong> meet:</td>
+                <td>Times during which this WG can <strong>not</strong> meet:</td>
                 <td>{{ form.timeranges.errors }}{{ form.timeranges }}</td>
             </tr>
             <tr class="bg2">
-                <td valign="top">
+                <td>
                     Plan session adjacent with another WG:<br />
                     (Immediately before or after another WG, no break in between, in the same room.)
                 </td>
@@ -106,7 +106,7 @@
         {% endif %}
 
         <tr class="bg2">
-            <td valign="top">Special Requests:<br />&nbsp;<br />i.e. restrictions on meeting times / days, etc.<br />  (limit 200 characters)</td>
+            <td>Special Requests:<br />&nbsp;<br />i.e. restrictions on meeting times / days, etc.<br />  (limit 200 characters)</td>
             <td>{{ form.comments.errors }}{{ form.comments }}</td>
         </tr>
     </table>
diff --git a/ietf/secr/templates/includes/sessions_request_view.html b/ietf/secr/templates/includes/sessions_request_view.html
index 6d2070697..5d30e4d64 100644
--- a/ietf/secr/templates/includes/sessions_request_view.html
+++ b/ietf/secr/templates/includes/sessions_request_view.html
@@ -1,6 +1,6 @@
 {% load ams_filters %}
 <table class="full-width">
-    <col width="200">
+    
     <tr class="row1"><td>Working Group Name:</td><td>{{ group.name }} ({{ group.acronym }})</td></tr>
     <tr class="row2"><td>Area Name:</td><td>{{ group.parent }}</td></tr>
     <tr class="row1"><td>Number of Sessions Requested:</td><td>{% if session.third_session %}3{% else %}{{ session.num_session }}{% endif %}</td></tr>
diff --git a/ietf/secr/templates/main.html b/ietf/secr/templates/main.html
index 3e6b04ea6..1419579e2 100644
--- a/ietf/secr/templates/main.html
+++ b/ietf/secr/templates/main.html
@@ -6,8 +6,8 @@
 
         {% if user|has_role:"Secretariat" %}
 
-            <table class="menu" width="100%" cellpadding="5" cellspacing="5" border="0">
-                <tr valign="top">
+            <table class="menu">
+                <tr>
                     <td>
                         <h3>IESG</h3>
                         <ul>
@@ -26,7 +26,7 @@
                         </ul>
                     </td>
                 </tr>
-                <tr valign="top">
+                <tr>
                     <td>
                         <h3>Meetings and Proceedings</h3>
                         <ul>
@@ -47,8 +47,8 @@
 
         {% else %}
 
-            <table class="menu" width="100%" cellpadding="5" cellspacing="5" border="0">
-                <tr valign="top">
+            <table class="menu">
+                <tr>
                     <td>
                         <h3>Section 1</h3>
                         <ul>
@@ -61,7 +61,7 @@
                         <h3>Section 2</h3>
                     </td>
                 </tr>
-                <tr valign="top">
+                <tr>
                     <td>
                         <h3>Section 3</h3>
                     </td>
diff --git a/ietf/secr/templates/meetings/add.html b/ietf/secr/templates/meetings/add.html
index fe2981875..64259bb97 100644
--- a/ietf/secr/templates/meetings/add.html
+++ b/ietf/secr/templates/meetings/add.html
@@ -16,7 +16,7 @@
 {% block content %}
     <div  class="module">
         <h2>Proceedings - Add</h2>
-        <form id="proceedings-add-form" enctype="multipart/form-data" action="" method="post">{% csrf_token %}
+        <form id="proceedings-add-form" enctype="multipart/form-data" method="post">{% csrf_token %}
             <table id="proceedings-add-table">
                 {{ form.as_table }}
             </table>
diff --git a/ietf/secr/templates/meetings/base_rooms_times.html b/ietf/secr/templates/meetings/base_rooms_times.html
index 2102c21b0..f03eaafaa 100644
--- a/ietf/secr/templates/meetings/base_rooms_times.html
+++ b/ietf/secr/templates/meetings/base_rooms_times.html
@@ -4,7 +4,7 @@
 {% block title %}Meetings{% endblock %}
 
 {% block extrahead %}{{ block.super }}
-    <link rel="stylesheet" type="text/css" href="{% static 'ietf/css/jquery-ui.css' %}" />
+    <link rel="stylesheet" href="{% static 'ietf/css/jquery-ui.css' %}" />
     <script src="{% static 'ietf/js/jquery-ui.js' %}"></script>
     <script src="{% static 'secr/js/utils.js' %}"></script>
     <script src="{% static 'secr/js/dynamic_inlines.js' %}"></script>
diff --git a/ietf/secr/templates/meetings/main.html b/ietf/secr/templates/meetings/main.html
index b8dd84a18..404603dc0 100755
--- a/ietf/secr/templates/meetings/main.html
+++ b/ietf/secr/templates/meetings/main.html
@@ -27,7 +27,7 @@
             </p>
 
             <br>
-            <form action="" method="post">{% csrf_token %}
+            <form method="post">{% csrf_token %}
                 <table>
                     {{ form }}
                 </table>
diff --git a/ietf/secr/templates/meetings/misc_sessions.html b/ietf/secr/templates/meetings/misc_sessions.html
index 039e011dd..16c3a86c2 100644
--- a/ietf/secr/templates/meetings/misc_sessions.html
+++ b/ietf/secr/templates/meetings/misc_sessions.html
@@ -54,11 +54,11 @@
         <br /><hr />
 
         <div>
-            <form id="timeslot-form" action="" method="post">{% csrf_token %}
+            <form id="timeslot-form" method="post">{% csrf_token %}
                 <table class="full-width amstable">
-                    <col width="150">
+                    
                     {{ form.as_table }}
-                    <tr><td colspan="2" align="center"><input type="submit" name="submit" value="Add" /></td></tr>
+                    <tr><td colspan="2" class="text-center"><input type="submit" name="submit" value="Add" /></td></tr>
                 </table>
             </form>
         </div>
diff --git a/ietf/secr/templates/meetings/regular_session_edit.html b/ietf/secr/templates/meetings/regular_session_edit.html
index ccdf23719..89531c235 100644
--- a/ietf/secr/templates/meetings/regular_session_edit.html
+++ b/ietf/secr/templates/meetings/regular_session_edit.html
@@ -17,10 +17,10 @@
     <div class="module">
         <h2>Edit Session</h2>
 
-        <form id="meetings-schedule-form" method="post" action="">{% csrf_token %}
+        <form id="meetings-schedule-form" method="post">{% csrf_token %}
             <div class="inline-related{% if forloop.last %} last-related{% endif %}">
                 <table class="full-width amstable">
-                    <col width="200">
+                    
                     <tr>
                         <th>Day:</th>
                         <td>{% if timeslot %}{{ timeslot.time|date:"l" }}{% endif %}</td>
diff --git a/ietf/secr/templates/meetings/rooms.html b/ietf/secr/templates/meetings/rooms.html
index 139634ec0..d707f5ee9 100644
--- a/ietf/secr/templates/meetings/rooms.html
+++ b/ietf/secr/templates/meetings/rooms.html
@@ -8,7 +8,7 @@
 
         <div class="inline-group">
             <div class="tabular inline-related">
-                <form id="meetings-meta-rooms" action="" method="post">{% csrf_token %}
+                <form id="meetings-meta-rooms" method="post">{% csrf_token %}
                     {{ formset.management_form }}
                     {{ formset.non_form_errors }}
                     {% if options_form %}{{ options_form.errors }}{% endif %}
@@ -41,7 +41,7 @@
                                     {% endfor %}
                                 </tr>
                             {% endfor %}
-            {% if options_form %}{{ options_form }}{% endif %}
+            {% if options_form %}<tr><td colspan="11">{{ options_form.as_p }}</td></tr>{% endif %}
                         </tbody>
                     </table>
                 </form>
diff --git a/ietf/secr/templates/meetings/times.html b/ietf/secr/templates/meetings/times.html
index 2c450d725..7ca6744bf 100644
--- a/ietf/secr/templates/meetings/times.html
+++ b/ietf/secr/templates/meetings/times.html
@@ -33,7 +33,7 @@
         {% endif %}
         <br /><hr />
 
-        <form action="" method="post">{% csrf_token %}
+        <form method="post">{% csrf_token %}
             {{ form.non_field_errors }}
             <table id="timeslot-form" class="full-width">
                 <tr>
diff --git a/ietf/secr/templates/meetings/view.html b/ietf/secr/templates/meetings/view.html
index ce907994d..b883ca006 100644
--- a/ietf/secr/templates/meetings/view.html
+++ b/ietf/secr/templates/meetings/view.html
@@ -19,8 +19,7 @@
         {% if meeting.frozen == 1 %}
             <ul class="errorlist"><li> THIS IS A FROZEN PROCEEDING</li></ul>
         {% endif %}
-        <table class="full-width">
-            <col id="proceedings-view-first-col" />
+        <table class="full-width" id="proceedings-view-first-col">
             <tr><td>Start Date:</td><td> {{ meeting.date }}</td></tr>
             <tr><td>City:</td><td> {{ meeting.city }} </td></tr>
             <tr><td>Country:</td><td> {{ meeting.country }} </td></tr>
@@ -56,24 +55,4 @@
 
     </div> <!-- module -->
 
-{% endblock %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/secr/templates/proceedings/interim_directory.html b/ietf/secr/templates/proceedings/interim_directory.html
index 96449fd5f..e38662539 100644
--- a/ietf/secr/templates/proceedings/interim_directory.html
+++ b/ietf/secr/templates/proceedings/interim_directory.html
@@ -12,17 +12,17 @@
         </tr>
         {% for meeting in meetings %}
             <tr class="{% cycle 'row1' 'row2' %}">
-                <td align="left" style="white-space: nowrap">{{ meeting.date }}</td>
+                <td class="text-start" style="white-space: nowrap">{{ meeting.date }}</td>
                 <td><a href="https://datatracker.ietf.org/wg/{{ meeting.group.acronym }}">{{ meeting.group.acronym }}</a></td>
                 {% if meeting.schedule %}
-                    <td width="70" align="center"><a href="{{ meeting.schedule.get_absolute_url }}">Agenda</a></td>
+                    <td class="text-center"><a href="{{ meeting.schedule.get_absolute_url }}">Agenda</a></td>
                 {% else %}
-                    <td width="70" align="center">Agenda</td>
+                    <td class="text-center">Agenda</td>
                 {% endif %}
                 {% if meeting.minutes %}
-                    <td width="70" align="center"><a href="{{ meeting.minutes.get_absolute_url }}">Minutes</a></td>
+                    <td class="text-center"><a href="{{ meeting.minutes.get_absolute_url }}">Minutes</a></td>
                 {% else %}
-                    <td width="70" align="center">Minutes</td>
+                    <td class="text-center">Minutes</td>
                 {% endif %}
                 {% if meeting.get_proceedings_url %}
                     <td><a href="{{ meeting.get_proceedings_url }}">Proceedings</a></td>
diff --git a/ietf/secr/templates/proceedings/recording.html b/ietf/secr/templates/proceedings/recording.html
index 943239710..4cb55e037 100755
--- a/ietf/secr/templates/proceedings/recording.html
+++ b/ietf/secr/templates/proceedings/recording.html
@@ -4,7 +4,7 @@
 {% block title %}Proceedings{% endblock %}
 
 {% block extrastyle %}{{ block.super }}
-    <link rel="stylesheet" type="text/css" href="{% static 'ietf/css/jquery-ui.css' %}" />
+    <link rel="stylesheet" href="{% static 'ietf/css/jquery-ui.css' %}" />
     <link rel="stylesheet" href="{% static 'ietf/css/select2.css' %}">
 {% endblock %}
 
diff --git a/ietf/secr/templates/proceedings/recording_edit.html b/ietf/secr/templates/proceedings/recording_edit.html
index f4ebc93f1..78e8b116e 100755
--- a/ietf/secr/templates/proceedings/recording_edit.html
+++ b/ietf/secr/templates/proceedings/recording_edit.html
@@ -25,7 +25,7 @@
     <div class="module interim-container">
         <h2>Recording Metadata for Group: {{ form.instance.group.acronym }} | Session: {{ form.instance.session_set.first.official_scheduledsession.timeslot.time }}</h2>
         <p><h3>Edit Recording Metadata:</h3></p>
-        <form id="recording-form" action="" method="post">{% csrf_token %}
+        <form id="recording-form" method="post">{% csrf_token %}
             <table>
                 {{ form.as_table }}
             </table>
diff --git a/ietf/secr/templates/proceedings/view.html b/ietf/secr/templates/proceedings/view.html
index 8d4068333..d4b44549e 100644
--- a/ietf/secr/templates/proceedings/view.html
+++ b/ietf/secr/templates/proceedings/view.html
@@ -18,8 +18,7 @@
         {% if meeting.frozen == 1 %}
             <ul class="errorlist"><li> THIS IS A FROZEN PROCEEDING</li></ul>
         {% endif %}
-        <table class="full-width">
-            <col id="proceedings-view-first-col" />
+        <table class="full-width" id="proceedings-view-first-col">
             <tr><td>Meeting Start Date:</td><td> {{ meeting.date }}</td></tr>
             <tr><td>Meeting End Date:</td><td> {{ meeting.end_date }} </td></tr>
             <tr><td>Meeting City:</td><td> {{ meeting.city }} </td></tr>
@@ -28,8 +27,7 @@
 
         <div class="inline-related">
             <h2>Dates</h2>
-            <table class="full-width">
-                <col id="proceedings-view-first-col" />
+            <table class="full-width" id="proceedings-view-first-col">
                 <tr><td>Submission Start Date:</td><td> {{ meeting.get_submission_start_date }} </td></tr>
                 <tr><td>Submission Cut Off Date:</td><td> {{ meeting.get_submission_cut_off_date }} </td></tr>
                 <tr><td>Submission Correction Cut Off Date:</td><td> {{ meeting.get_submission_correction_date }} </td></tr>
@@ -54,27 +52,4 @@
         </div> <!-- button-group -->
     </div> <!-- module -->
 
-{% 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 8033709e0..c5fd48730 100755
--- a/ietf/secr/templates/roles/main.html
+++ b/ietf/secr/templates/roles/main.html
@@ -4,7 +4,7 @@
 {% block title %}Roles{% endblock %}
 
 {% block extrahead %}{{ block.super }}
-    <link rel="stylesheet" type="text/css" href="{% static 'ietf/css/jquery-ui.css' %}" />
+    <link rel="stylesheet" href="{% static 'ietf/css/jquery-ui.css' %}" />
     <script src="{% static 'ietf/js/jquery-ui.js' %}"></script>
     <script src="{% static 'secr/js/utils.js' %}"></script>
 
@@ -40,7 +40,7 @@
 {% block content %}
 
     <div class="module interim-container">
-        <form id="roles-form" action="" method="post">{% csrf_token %}
+        <form id="roles-form" method="post">{% csrf_token %}
         <h2>Role Tool</h2>
         <div class="inline-related">
             <h3><b>Select Group</b></h3>
diff --git a/ietf/secr/templates/rolodex/add.html b/ietf/secr/templates/rolodex/add.html
index 6ca90a28c..7e83cf313 100644
--- a/ietf/secr/templates/rolodex/add.html
+++ b/ietf/secr/templates/rolodex/add.html
@@ -38,9 +38,9 @@
 
         <div class="module">
             <h2>Name</h2>
-            <form id="rolodex-add-form" enctype="multipart/form-data" action="" method="post">{% csrf_token %}
+            <form id="rolodex-add-form" enctype="multipart/form-data" method="post">{% csrf_token %}
                 <table class="full-width amstable">
-                    <col width="200">
+                    
                     {{ form.as_table }}
                 </table>
 
diff --git a/ietf/secr/templates/rolodex/add_proceed.html b/ietf/secr/templates/rolodex/add_proceed.html
index 62309c77a..bbdcbe704 100644
--- a/ietf/secr/templates/rolodex/add_proceed.html
+++ b/ietf/secr/templates/rolodex/add_proceed.html
@@ -10,7 +10,7 @@
 {% block content %}
     <h1>Adding {{ name }}</h1>
 
-    <form action="" method="post" id="rolodex-add-form">{% csrf_token %}
+    <form method="post" id="rolodex-add-form">{% csrf_token %}
         <div class="module">
             <h2>Rolodex - Add</h2>
             <table class="full-width amstable">
diff --git a/ietf/secr/templates/rolodex/delete.html b/ietf/secr/templates/rolodex/delete.html
index e4fd99a85..4049bae56 100644
--- a/ietf/secr/templates/rolodex/delete.html
+++ b/ietf/secr/templates/rolodex/delete.html
@@ -22,7 +22,7 @@
             {% endfor %}
         </ul>
     </li></ul>
-    <form action="" method="post">{% csrf_token %}
+    <form method="post">{% csrf_token %}
         <input type="hidden" name="post" value="yes" />
         <input type="submit" value="Yes, I'm sure" />
     </form>
diff --git a/ietf/secr/templates/rolodex/edit.html b/ietf/secr/templates/rolodex/edit.html
index 9d25c5a02..90d716dcb 100644
--- a/ietf/secr/templates/rolodex/edit.html
+++ b/ietf/secr/templates/rolodex/edit.html
@@ -14,7 +14,7 @@
 {% endblock %}
 
 {% block content %}
-    <form enctype="multipart/form-data" action="" method="post" id="rolodex-edit-form">{% csrf_token %}
+    <form enctype="multipart/form-data" method="post" id="rolodex-edit-form">{% csrf_token %}
         <div class="module">
             <h2>Rolodex - Edit</h2>
             <table id="rolodex-edit-table" class="full-width amstable">
diff --git a/ietf/secr/templates/rolodex/search.html b/ietf/secr/templates/rolodex/search.html
index 31e38871e..f2e5d90b0 100644
--- a/ietf/secr/templates/rolodex/search.html
+++ b/ietf/secr/templates/rolodex/search.html
@@ -16,7 +16,7 @@
         <h2>Rolodex - Search <span class="unlocked"><a href="add/" class="addlink">Add</a></span></h2>
         <form id="rolodex-search-form" action="." method="post">{% csrf_token %}
             <table class="full-width amstable">
-                <col width="200">
+                
                 {{ form.as_table }}
             </table>
 
diff --git a/ietf/secr/templates/rolodex/view.html b/ietf/secr/templates/rolodex/view.html
index 5f1854560..b6e953a20 100644
--- a/ietf/secr/templates/rolodex/view.html
+++ b/ietf/secr/templates/rolodex/view.html
@@ -13,7 +13,7 @@
 
 
         <table id="rolodex-view-table" class="full-width">
-            <col width="150">
+            
             <tr><td>Name:</td><td>{{ person.name }}</td></tr>
             <tr><td>Ascii Name:</td><td>{{ person.ascii }}</td></tr>
             <tr><td>Short Name:</td><td>{{ person.ascii_short }}</td></tr>
diff --git a/ietf/secr/templates/sreq/main.html b/ietf/secr/templates/sreq/main.html
index b62a751db..726c09671 100755
--- a/ietf/secr/templates/sreq/main.html
+++ b/ietf/secr/templates/sreq/main.html
@@ -40,7 +40,7 @@
                         {% endif %}
                     </li>
                 {% empty %}
-                    <i>NONE</i>
+                    <li><i>NONE</i></li>
                 {% endfor %}
             </ul>
         </div> <!-- inline-related -->
@@ -52,7 +52,7 @@
                 {% for group in scheduled_groups %}
                     <li><a href="{% url "ietf.secr.sreq.views.view" acronym=group.acronym %}">{{ group.acronym }} - {{ group.status_message }}</a></li>
                 {% empty %}
-                    <i>NONE</i>
+                    <li><i>NONE</i></li>
                 {% endfor %}
             </ul>
         </div> <!-- inline-related -->
diff --git a/ietf/secr/templates/sreq/tool_status.html b/ietf/secr/templates/sreq/tool_status.html
index 9660f6819..a657b21d1 100755
--- a/ietf/secr/templates/sreq/tool_status.html
+++ b/ietf/secr/templates/sreq/tool_status.html
@@ -17,7 +17,7 @@
     <div class="module interim-container">
         <h2>Sessions - Status</h2>
         <p>Enter the message that you would like displayed to the WG Chair when this tool is locked.</p>
-        <form action="" method="post">{% csrf_token %}
+        <form method="post">{% csrf_token %}
             <table>
                 {{ form.as_table }}
             </table>
diff --git a/ietf/secr/templates/telechat/base_telechat.html b/ietf/secr/templates/telechat/base_telechat.html
index 74abf8fd5..bb74bcd42 100644
--- a/ietf/secr/templates/telechat/base_telechat.html
+++ b/ietf/secr/templates/telechat/base_telechat.html
@@ -5,7 +5,7 @@
 
 {% block extrahead %}{{ block.super }}
     <script src="{% static 'secr/js/utils.js' %}"></script>
-    <link rel="stylesheet" type="text/css" href="{% static 'secr/css/telechat.css' %}" />
+    <link rel="stylesheet" href="{% static 'secr/css/telechat.css' %}" />
 {% endblock %}
 
 {% block breadcrumbs %}{{ block.super }}
diff --git a/ietf/secr/templates/telechat/doc.html b/ietf/secr/templates/telechat/doc.html
index 3623b3049..fd7fb9717 100644
--- a/ietf/secr/templates/telechat/doc.html
+++ b/ietf/secr/templates/telechat/doc.html
@@ -28,7 +28,7 @@
             Number of Open Positions: {{ open_positions }}<br />
             <br />
             <div>
-                <form action="" method="post">{% csrf_token %}
+                <form method="post">{% csrf_token %}
                     {{ formset.management_form }}
                     <table id="telechat-positions-table">
                         <tr>
@@ -56,7 +56,7 @@
 
             <hr /><br />
 
-            <form action="" method="post">{% csrf_token %}
+            <form method="post">{% csrf_token %}
                 <table>
                     {{ state_form.as_table }}
                 </table>
@@ -72,13 +72,13 @@
                 <br /><hr /><br />
             {% endif %}
 
-            <a name="writeup"><h2>Ballot Writeup</h2></a>
+            <h2 id="writeup">Ballot Writeup</h2>
             <pre>
 {{ writeup }}
     </pre>
 
             {% if downrefs %}
-                <a name="downrefs"><h2>Downward References</h2></a>
+                <h2 id="downrefs">Downward References</h2>
                 {% for ref in downrefs %}
                     <p>Add {{ref.target.document.canonical_name}}
                         ({{ref.target.document.std_level}} - {{ref.target.document.stream.desc}})
diff --git a/ietf/secr/templates/telechat/group.html b/ietf/secr/templates/telechat/group.html
index 32c277f22..288316e90 100644
--- a/ietf/secr/templates/telechat/group.html
+++ b/ietf/secr/templates/telechat/group.html
@@ -1,4 +1,4 @@
-<form id="dummy" action="" method="post">{% csrf_token %}
+<form id="dummy" method="post">{% csrf_token %}
     {% if header.2 == "4.1.1 Proposed for IETF Review" %}
         <b>Does anyone have an objection to the creation of this working group being sent for EXTERNAL REVIEW?</b><br><br>
         <input type="radio" name="wg_action_status" value="1"> External Review APPROVED; "The Secretariat will send a Working Group Review announcement with a copy to new-work and place it back on the agenda for the next telechat."<br><br>
diff --git a/ietf/secr/templates/telechat/main.html b/ietf/secr/templates/telechat/main.html
index 9cd8e6ab4..b828c6657 100644
--- a/ietf/secr/templates/telechat/main.html
+++ b/ietf/secr/templates/telechat/main.html
@@ -3,7 +3,7 @@
 {% block subsection %}
     <div id="telechat-main-DUPLICATE">
         <h3>Select a Telechat</h3>
-        <form action="" method="post">{% csrf_token %}
+        <form method="post">{% csrf_token %}
             {{ form.date.label_tag }} {{ form.date }}&nbsp;&nbsp;<button type="submit" name="submit" value="Select">Select</button>
         </form>
         <br>
diff --git a/ietf/secr/templates/telechat/roll_call.html b/ietf/secr/templates/telechat/roll_call.html
index 145685fe2..dc9cc9232 100644
--- a/ietf/secr/templates/telechat/roll_call.html
+++ b/ietf/secr/templates/telechat/roll_call.html
@@ -10,7 +10,7 @@
         <span class="telechat-warn"><h3>This feature is pending</h3></span>
         <h3>Roll Call</h3>
         <br />
-        <form action="" method="post">{% csrf_token %}
+        <form method="post">{% csrf_token %}
             {% for person in people %}
                 <input type="checkbox" name="attendee" value="{{ person.id }}" checked="checked" /> {{ person.name }}<br />
             {% endfor %}
diff --git a/ietf/static/js/liaisons.js b/ietf/static/js/liaisons.js
index 8567c1b32..dc2908a7e 100644
--- a/ietf/static/js/liaisons.js
+++ b/ietf/static/js/liaisons.js
@@ -69,8 +69,7 @@ var attachmentWidget = {
             html += '</span>';
             container.hide();
         });
-        //html += ' <a href="#" class="removeAttach glyphicon glyphicon-remove text-danger"></a>';
-        html += ' <a href="#" class="removeAttach btn btn-default btn-xs">Delete</a>';
+        html += ' <a href="#" class="removeAttach btn btn-danger btn-sm">Delete</a>';
         html += '</div>';
         attachmentWidget.config.showOnDisplay.html(html);
         attachmentWidget.count += 1;
diff --git a/ietf/submit/forms.py b/ietf/submit/forms.py
index 1daf341f8..876e32564 100644
--- a/ietf/submit/forms.py
+++ b/ietf/submit/forms.py
@@ -667,5 +667,5 @@ class MessageModelForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super(MessageModelForm, self).__init__(*args, **kwargs)
         self.fields['frm'].label='From'
-        self.fields['frm'].widget.attrs['readonly'] = 'True'
-        self.fields['reply_to'].widget.attrs['readonly'] = 'True'
\ No newline at end of file
+        self.fields['frm'].widget.attrs['readonly'] = True
+        self.fields['reply_to'].widget.attrs['readonly'] = True
\ No newline at end of file
diff --git a/ietf/templates/base.html b/ietf/templates/base.html
index 762b67e88..704d82949 100644
--- a/ietf/templates/base.html
+++ b/ietf/templates/base.html
@@ -13,7 +13,7 @@
         </title>
         <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'>
         {% endcomment %}
         <link rel="stylesheet" href="{% static 'ietf/css/ietf.css' %}">
         <link rel="stylesheet" href="{% static 'ietf/css/select2.css' %}">
diff --git a/ietf/templates/doc/ballot/approve_downrefs.html b/ietf/templates/doc/ballot/approve_downrefs.html
index 21a90d900..67caf992c 100644
--- a/ietf/templates/doc/ballot/approve_downrefs.html
+++ b/ietf/templates/doc/ballot/approve_downrefs.html
@@ -37,7 +37,7 @@
                 <br>
             Which downward references, if any, are to be added to the DOWNREF registry?</b>
         </p>
-        <form action="" method="post">
+        <form method="post">
             {% csrf_token %}
             {% bootstrap_form approve_downrefs_form %}
             <a class="btn btn-primary"
diff --git a/ietf/templates/doc/charter/action_announcement_text.html b/ietf/templates/doc/charter/action_announcement_text.html
index 27b2aaf88..5722b342a 100644
--- a/ietf/templates/doc/charter/action_announcement_text.html
+++ b/ietf/templates/doc/charter/action_announcement_text.html
@@ -20,8 +20,7 @@
         <button type="submit" class="btn btn-warning" name="regenerate_text" value="Regenerate">Regenerate
         </button>
         {% if user|has_role:"Secretariat" %}
-            <a type="submit"
-               class="btn btn-primary"
+            <a class="btn btn-primary"
                href="{% url 'ietf.doc.views_charter.approve' name=charter.canonical_name %}">
                 Charter approval page
             </a>
diff --git a/ietf/templates/doc/document_bofreq.html b/ietf/templates/doc/document_bofreq.html
index 58cb88429..7dfdbd005 100644
--- a/ietf/templates/doc/document_bofreq.html
+++ b/ietf/templates/doc/document_bofreq.html
@@ -155,7 +155,7 @@
             {{ doc.name }}-{{ doc.rev }}
         </div>
         <div class="card-body">
-            {{ content|linkify|urlize_ietf_docs }}
+            {{ content|urlize_ietf_docs|linkify }}
         </div>
     </div>
 {% endblock %}
diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index bac40d7c5..b179c8492 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -989,8 +989,6 @@
                                 </div>
                             {% endif %}
                         </td>
-                        <td>
-                        </td>
                     </tr>
                 </tbody>
             {% endif %}
diff --git a/ietf/templates/doc/document_history.html b/ietf/templates/doc/document_history.html
index c22dfe647..b371a83cc 100644
--- a/ietf/templates/doc/document_history.html
+++ b/ietf/templates/doc/document_history.html
@@ -73,25 +73,25 @@
                                name="difftype"
                                value="--html"
                                id="html">
-                        <label for="html"class="btn btn-outline-primary">Side-by-side</label>
+                        <label for="html" class="btn btn-outline-primary">Side-by-side</label>
                         <input type="radio"
                                class="btn-check"
                                name="difftype"
                                value="--abdiff"
                                id="abdiff">
-                        <label for="abdiff"class="btn btn-outline-primary">Before-after</label>
+                        <label for="abdiff" class="btn btn-outline-primary">Before-after</label>
                         <input type="radio"
                                class="btn-check"
                                name="difftype"
                                value="--chbars"
                                id="chbars">
-                        <label for="chbars"class="btn btn-outline-primary">Change bars</label>
+                        <label for="chbars" class="btn btn-outline-primary">Change bars</label>
                         <input type="radio"
                                class="btn-check"
                                name="difftype"
                                value="--hwdiff"
                                id="hwdiff">
-                        <label for="hwdiff"class="btn btn-outline-primary">Wdiff</label>
+                        <label for="hwdiff" class="btn btn-outline-primary">Wdiff</label>
                     </div>
                 </div>
             </div>
diff --git a/ietf/templates/doc/draft/review_possibly_replaces.html b/ietf/templates/doc/draft/review_possibly_replaces.html
index 3243dff26..7374f727d 100644
--- a/ietf/templates/doc/draft/review_possibly_replaces.html
+++ b/ietf/templates/doc/draft/review_possibly_replaces.html
@@ -6,7 +6,7 @@
 {% block content %}
     {% origin %}
     <h1>Review suggestions for documents that {{ doc }} replaces</h1>
-    <form name="review-suggested-replaces" role="form" method="post">
+    <form name="review-suggested-replaces" method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
         <a class="btn btn-secondary float-end" href="{{ doc.get_absolute_url }}">Back</a>
diff --git a/ietf/templates/doc/drafts_in_iesg_process.html b/ietf/templates/doc/drafts_in_iesg_process.html
index 09e5af637..4b04b3a7a 100644
--- a/ietf/templates/doc/drafts_in_iesg_process.html
+++ b/ietf/templates/doc/drafts_in_iesg_process.html
@@ -27,11 +27,11 @@
             </tr>
         </thead>
         {% for state, docs in grouped_docs %}
-            <thead>
+            <tbody>
                 <tr class="table-info">
                     <th colspan="5">{{ state.name }}</th>
                 </tr>
-            </thead>
+            </tbody>
             <tbody>
                 {% for doc in docs %}
                     <tr>
diff --git a/ietf/templates/doc/edit_action_holders.html b/ietf/templates/doc/edit_action_holders.html
index 517486122..24ba4032d 100644
--- a/ietf/templates/doc/edit_action_holders.html
+++ b/ietf/templates/doc/edit_action_holders.html
@@ -16,7 +16,7 @@
         {% csrf_token %}
         {% bootstrap_form form %}
         <div class="mb-3">
-            <label class="form-label" for="role-toolbar">Related people</label>
+            <label class="form-label">Related people</label>
             <div class="btn-toolbar"
                  role="toolbar"
                  id="role-toolbar-{{ role_type_label|slugify }}">
diff --git a/ietf/templates/doc/revisions_list.html b/ietf/templates/doc/revisions_list.html
index d343bb9e6..af895169f 100644
--- a/ietf/templates/doc/revisions_list.html
+++ b/ietf/templates/doc/revisions_list.html
@@ -1,8 +1,8 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% origin %}
-<label class="my-1 fw-bold" for="docrev">Versions:</label>
-<nav id="docrev" class="mb-3">
+<label class="my-1 fw-bold">Versions:</label>
+<nav class="mb-3">
     <ul class="pagination pagination-sm">
         {% for rev in revisions %}
             <li class="page-item {% if rev == doc.rev %}{% if snapshot or doc.get_state_slug != 'rfc' %}active{% endif %}{% endif %}">
diff --git a/ietf/templates/doc/search/search_results.html b/ietf/templates/doc/search/search_results.html
index 189d71851..25862dbae 100644
--- a/ietf/templates/doc/search/search_results.html
+++ b/ietf/templates/doc/search/search_results.html
@@ -40,7 +40,7 @@
 {% endif %}
 {% regroup docs by search_heading as grouped_docs %}
 {% for doc_group in grouped_docs %}
-    <thead>
+    <tbody>
         <tr class="table-info">
             <th></th>
             {% if color_ad_position %}
@@ -51,7 +51,7 @@
             {{ doc_group.grouper|plural:doc_group.list }} ({{ doc_group.list|length }} {{"hit"|plural:doc_group.list }})
             </th>
         </tr>
-    </thead>
+    </tbody>
     <tbody>
         {% for doc in doc_group.list %}
             {% include "doc/search/search_result_row.html" %}
diff --git a/ietf/templates/doc/status_change/edit_related_rows.html b/ietf/templates/doc/status_change/edit_related_rows.html
index cd763eb6c..9e6b4737f 100644
--- a/ietf/templates/doc/status_change/edit_related_rows.html
+++ b/ietf/templates/doc/status_change/edit_related_rows.html
@@ -15,7 +15,7 @@
             </option>
         </select>
         <select class="form-select" name="statchg_relation_row_{{ rfc }}">
-            <option value="" {% if choice_slug == "" %}selected{% endif %}>
+            <option {% if choice_slug == "" %}selected{% endif %}>
                 (None)
             </option>
             {% for rel in relation_slugs %}
@@ -38,7 +38,7 @@
             data-placeholder="Enter new affected RFC.">
     </select>
     <select class="form-select" name="statchg_relation_row_">
-        <option value="" {% if choice_slug == "" %}selected{% endif %}>
+        <option {% if choice_slug == "" %}selected{% endif %}>
             (Select proposed new status.)
         </option>
         {% for rel in relation_slugs %}
diff --git a/ietf/templates/doc/status_change/status_changes.html b/ietf/templates/doc/status_change/status_changes.html
index e7866deaa..6779de720 100644
--- a/ietf/templates/doc/status_change/status_changes.html
+++ b/ietf/templates/doc/status_change/status_changes.html
@@ -26,11 +26,11 @@
             </tr>
         </thead>
         {% for state in state_groups %}
-            <thead>
+            <tbody>
                 <tr class="table-info">
                     <th colspan="2">{{ state.grouper }}</th>
                 </tr>
-            </thead>
+            </tbody>
             <tbody>
                 {% for doc in state.list %}
                     <tr>
diff --git a/ietf/templates/googlea30ad1dacffb5e5b.html b/ietf/templates/googlea30ad1dacffb5e5b.html
index ec8a0596e..2497da4bb 100644
--- a/ietf/templates/googlea30ad1dacffb5e5b.html
+++ b/ietf/templates/googlea30ad1dacffb5e5b.html
@@ -2,7 +2,7 @@
 {% load origin %}
 {% origin %}
 <!doctype html>
-<html>
+<html lang="en">
     <head>
         <title>
             Google Webmaster Tools Verification
diff --git a/ietf/templates/group/active_adm.html b/ietf/templates/group/active_adm.html
index 812bb5980..5930805a3 100644
--- a/ietf/templates/group/active_adm.html
+++ b/ietf/templates/group/active_adm.html
@@ -17,13 +17,13 @@
         </thead>
         {% regroup adm by parent as grouped_groups %}
         {% for grouptype in grouped_groups %}
-            <thead>
+            <tbody>
                 <tr>
                     <th colspan="2" class="table-info">
                         Active {% firstof grouptype.grouper.verbose_name grouptype.grouper.name 'Top-level Administration' %}
                     </th>
                 </tr>
-            </thead>
+            </tbody>
             <tbody>
                 {% for group in grouptype.list %}
                     <tr>
diff --git a/ietf/templates/group/active_iabgroups.html b/ietf/templates/group/active_iabgroups.html
index 12dc2fb14..04e6f511b 100644
--- a/ietf/templates/group/active_iabgroups.html
+++ b/ietf/templates/group/active_iabgroups.html
@@ -19,11 +19,11 @@
 
     {% regroup iabgroups by type as grouped_groups %}
     {% for grouptype in grouped_groups %}
-        <thead>
+        <tbody>
         <tr class="table-info"><th colspan="3">
             {% firstof grouptype.grouper.verbose_name grouptype.grouper.name %}{{ grouptype.list|pluralize }}
         </th></tr>
-        </thead>
+        </tbody>
             <tbody>
                 {% for group in grouptype.list %}
                     <tr>
diff --git a/ietf/templates/group/group_about_rendertest.html b/ietf/templates/group/group_about_rendertest.html
index 3701e1b91..dfc9f2689 100644
--- a/ietf/templates/group/group_about_rendertest.html
+++ b/ietf/templates/group/group_about_rendertest.html
@@ -27,7 +27,7 @@
             <div class="col-md-6 rightpanel">
                 <div class="h2 text-center bg-info">Markdown rendering</div>
                 <div class="border-bottom text-center">
-                    <label for="exampleFormControlInput1" class="form-label">Constrain width</label>
+                    <label class="form-label">Constrain width</label>
                     <input type="checkbox" class="form-check-input" name="widthconstraint">
             </div>
             <div class="rightcontent">{{ rendered|sanitize|safe }}</div>
diff --git a/ietf/templates/group/reset_charter_milestones.html b/ietf/templates/group/reset_charter_milestones.html
index f2b6665e0..0b6ec1d8d 100644
--- a/ietf/templates/group/reset_charter_milestones.html
+++ b/ietf/templates/group/reset_charter_milestones.html
@@ -26,7 +26,7 @@
                            name="milestone"
                            value="{{ milestone.id }}"
                            {% if not milestone.resolved %}checked{% endif %}>
-                    <label class="form-check-label" for="{{ milestone.id }}">
+                    <label class="form-check-label">
                         {{ milestone.desc }}
                         <span class="badge {% if milestone.resolved %}bg-success{% else %}bg-info{% endif %}">
                             {% if milestone.resolved %}
diff --git a/ietf/templates/group/reset_next_reviewer.html b/ietf/templates/group/reset_next_reviewer.html
index 7f346f65f..e54390789 100644
--- a/ietf/templates/group/reset_next_reviewer.html
+++ b/ietf/templates/group/reset_next_reviewer.html
@@ -5,7 +5,7 @@
 {% load ietf_filters static django_bootstrap5 %}
 {% block content %}
     <h1>Set next reviewer in queue<br><small class="text-muted">{{ group.acronym }}</small></h1>
-    <form class="my-3" role="form" method="post">
+    <form class="my-3" method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
         <button class="btn btn-primary" type="submit">Save</button>
diff --git a/ietf/templates/group/review_requests.html b/ietf/templates/group/review_requests.html
index ab5af8296..d54ec29ba 100644
--- a/ietf/templates/group/review_requests.html
+++ b/ietf/templates/group/review_requests.html
@@ -30,11 +30,11 @@
             </tr>
         </thead>
         {% if unassigned_review_requests %}
-            <thead>
+            <tbody>
                 <tr class="table-info" id="unassigned-review-requests">
                     <th colspan="7">Unassigned review requests</th>
                 </tr>
-            </thead>
+            </tbody>
             <tbody>
                 {% for r in unassigned_review_requests %}
                     <tr>
@@ -76,11 +76,11 @@
                 </tbody>
             {% endif %}
             {% if open_review_assignments %}
-                <thead>
+                <tbody>
                     <tr class="table-info" id="open_review_assignments">
                         <th colspan="7">Open review requests</th>
                     </tr>
-                </thead>
+                </tbody>
                 <tbody>
                     {% for a in open_review_assignments %}
                         <tr>
@@ -153,13 +153,13 @@
                 </tr>
             </thead>
             {% if closed_review_requests %}
-                <thead>
+                <tbody>
                     <tr class="table-info">
                         <th colspan="8">
                             Closed review requests
                         </th>
                     </tr>
-                </thead>
+                </tbody>
                 <tbody>
                     {% for r in closed_review_requests %}
                         <tr>
@@ -192,13 +192,13 @@
                 </tbody>
             {% endif %}
             {% if closed_review_assignments %}
-                <thead>
+                <tbody>
                     <tr class="table-info">
                         <th colspan="8">
                             Closed review assignments
                         </th>
                     </tr>
-                </thead>
+                </tbody>
                 <tbody>
                     {% for a in closed_review_assignments %}
                         <tr>
diff --git a/ietf/templates/iesg/agenda_documents.html b/ietf/templates/iesg/agenda_documents.html
index b73b7b162..ac82ab6eb 100644
--- a/ietf/templates/iesg/agenda_documents.html
+++ b/ietf/templates/iesg/agenda_documents.html
@@ -51,6 +51,7 @@
                                 <th data-sort="status">Status</th>
                                 <th data-sort="ipr">IPR</th>
                                 <th data-sort="ad">AD/Shepherd</th>
+                                <th></th>
                             </tr>
                         </thead>
                         <tbody>
diff --git a/ietf/templates/iesg/moderator_package.html b/ietf/templates/iesg/moderator_package.html
index 64c6be860..63461d292 100644
--- a/ietf/templates/iesg/moderator_package.html
+++ b/ietf/templates/iesg/moderator_package.html
@@ -42,7 +42,7 @@ Some parts Copyright (c) 2009 The IETF Trust, all rights reserved.
         <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' %}">
-        <style type="text/css">
+        <style>
             h3 { page-break-before:always; }
             @media print {
                 html { margin: 0; }
diff --git a/ietf/templates/ietfauth/review_overview.html b/ietf/templates/ietfauth/review_overview.html
index 4b9e8d7f3..9ed77aa6b 100644
--- a/ietf/templates/ietfauth/review_overview.html
+++ b/ietf/templates/ietfauth/review_overview.html
@@ -171,7 +171,7 @@
         <p>
             Add a draft that you would like to review when it becomes available for review:
         </p>
-        <form role="form" method="post" class="form-inline">
+        <form method="post" class="form-inline">
             {% csrf_token %}
             {% bootstrap_form review_wish_form %}
             <button class="btn btn-primary" type="submit" name="action" value="add_wish">
diff --git a/ietf/templates/ietfauth/testemail.html b/ietf/templates/ietfauth/testemail.html
index 807c478ba..97e0523ed 100644
--- a/ietf/templates/ietfauth/testemail.html
+++ b/ietf/templates/ietfauth/testemail.html
@@ -18,7 +18,7 @@
     <p>
         Current value of <code>testmailcc</code> cookie: <code>{{ cookie|default:"(Unset)" }}</code>
     </p>
-    <form role="form" method="post">
+    <form method="post">
         {% csrf_token %}
         {% bootstrap_form form %}
         <button class="btn btn-primary" type="submit">Set cookie</button>
diff --git a/ietf/templates/ietfauth/whitelist_form.html b/ietf/templates/ietfauth/whitelist_form.html
index 63c9c16d5..8b5670931 100644
--- a/ietf/templates/ietfauth/whitelist_form.html
+++ b/ietf/templates/ietfauth/whitelist_form.html
@@ -69,7 +69,7 @@
                 </p>
             </li>
         </ol>
-        <form role="form" method="post">
+        <form method="post">
             {% csrf_token %}
             {% bootstrap_form form %}
             <button class="btn btn-primary" type="submit">Add address to account creation whitelist</button>
diff --git a/ietf/templates/ipr/details_history.html b/ietf/templates/ipr/details_history.html
index 1f0c3f3fc..0cb318d4e 100644
--- a/ietf/templates/ipr/details_history.html
+++ b/ietf/templates/ipr/details_history.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load ietf_filters ipr_filters static person_filters textfilters %}
-{% block morecss %}
+{% block pagehead %}
     <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
 {% endblock %}
 {% block title %}History for IPR - {{ ipr.title }}{% endblock %}
diff --git a/ietf/templates/ipr/search_doc_result.html b/ietf/templates/ipr/search_doc_result.html
index d711a1cf3..c753bb080 100644
--- a/ietf/templates/ipr/search_doc_result.html
+++ b/ietf/templates/ipr/search_doc_result.html
@@ -55,13 +55,13 @@
         </thead>
 
         {% for doc in docs %}
-            <thead>
+            <tbody>
                 <tr>
                     <th class="table-info" colspan="3">
                         Results for {{ doc.name|rfcspace|lstrip:"0"|urlize_ietf_docs }} ("{{ doc.document.title }}"){% if not forloop.first %}{% if doc.related %}, which was {{ doc.relation|lower }} {{ doc.related.source|rfcspace|lstrip:"0"|urlize_ietf_docs  }} ("{{ doc.related.source.title }}"){% endif %}{% endif %}
                     </th>
                 </tr>
-            </thead>
+            </tbody>
             <tbody>
                 {% with doc.iprdocrel_set.all as doc_iprs %}
                     {% if doc_iprs %}
diff --git a/ietf/templates/ipr/search_doctitle_result.html b/ietf/templates/ipr/search_doctitle_result.html
index 4d731407a..9e5b989e4 100644
--- a/ietf/templates/ipr/search_doctitle_result.html
+++ b/ietf/templates/ipr/search_doctitle_result.html
@@ -25,7 +25,7 @@
                 </tr>
             </thead>
             {% for alias in docs %}
-                <thead>
+                <tbody>
                     <tr>
                         <th class="table-info" colspan="3">
                             IPR that is related to {{ alias.name|lstrip:"0"|rfcnospace|urlize_ietf_docs }} ("{{ alias.document.title }}")
@@ -34,7 +34,7 @@
                             {% endif %}
                         </th>
                     </tr>
-                </thead>
+                </tbody>
                 <tbody>
                     {% if alias.document.ipr %}
                         {% for ipr in alias.document.ipr %}
diff --git a/ietf/templates/ipr/search_result.html b/ietf/templates/ipr/search_result.html
index 52526bc7c..3f3c6d5ea 100644
--- a/ietf/templates/ipr/search_result.html
+++ b/ietf/templates/ipr/search_result.html
@@ -35,14 +35,14 @@
                     {% for ipr in iprs %}
                         {% if user|has_role:"Secretariat" %}
                             {% ifchanged %}
-                                <thead>
+                                <tbody>
                                     <tr class="table-warning">
                                         <th colspan="3">{{ ipr.state.name }}</th>
                                     </tr>
-                                </thead>
+                                </tbody>
                             {% endifchanged %}
                         {% endif %}
-                        <thead>
+                        <tbody>
                             <tr class="table-info">
                                 <th colspan="3">
                                     {% block intro_prefix %}IPR that was submitted by "{{ q }}" and{% endblock %}
@@ -62,7 +62,7 @@
                                     {% block intro_suffix %}{% endblock %}
                                 </th>
                             </tr>
-                        </thead>
+                        </tbody>
                         <tbody>
                             <tr>
                                 <td>{{ ipr.time|date:"Y-m-d" }}</td>
diff --git a/ietf/templates/ipr/search_wg_result.html b/ietf/templates/ipr/search_wg_result.html
index d29457d19..6d71c1adb 100644
--- a/ietf/templates/ipr/search_wg_result.html
+++ b/ietf/templates/ipr/search_wg_result.html
@@ -21,7 +21,7 @@
                 </tr>
             </thead>
             {% for alias in docs %}
-                <thead>
+                <tbody>
                     <tr class="table-info">
                         <th colspan="3">
                             IPR related to {{ alias.name|rfcspace|lstrip:"0"|urlize_ietf_docs }} ("{{ alias.document.title }}")
@@ -32,7 +32,7 @@
                             :
                         </th>
                     </tr>
-                </thead>
+                </tbody>
                 <tbody>
                     {% if alias.document.ipr %}
                         {% for ipr in alias.document.ipr %}
diff --git a/ietf/templates/liaisons/edit.html b/ietf/templates/liaisons/edit.html
index 246ba60aa..58dd800c6 100644
--- a/ietf/templates/liaisons/edit.html
+++ b/ietf/templates/liaisons/edit.html
@@ -42,7 +42,7 @@
             <a href="{% url 'liaison-help-fields' %}">field help</a>.
         </p>
     {% endif %}
-    <form role="form"
+    <form
           class="liaisons-form form-horizontal show-required"
           method="post"
           enctype="multipart/form-data"
diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index 3af62f6fa..5d39d047d 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -83,7 +83,7 @@
                 </span>
             {% endif %}
         </h2>
-        <iframe class="w-100 overflow-hidden border border-dark" scrolling="no"></iframe>
+        <iframe class="w-100 overflow-hidden border border-dark"></iframe>
     </div>
     <h2 class="mt-3">
         {% if personalize %}Personalize{% endif %}
diff --git a/ietf/templates/meeting/edit_meeting_schedule.html b/ietf/templates/meeting/edit_meeting_schedule.html
index f073a6606..a2c2dbb12 100644
--- a/ietf/templates/meeting/edit_meeting_schedule.html
+++ b/ietf/templates/meeting/edit_meeting_schedule.html
@@ -18,8 +18,8 @@
         {# style off-agenda sessions to indicate this #}
 .edit-meeting-schedule .session.off-agenda { filter: brightness(0.9); }
         {# type and purpose styling #}
-.edit-meeting-schedule .edit-grid .timeslot.wrong-timeslot-type { background-color: transparent; ); }
-.edit-meeting-schedule .edit-grid .timeslot.wrong-timeslot-type .time-label { color: transparent; ); }
+.edit-meeting-schedule .edit-grid .timeslot.wrong-timeslot-type { background-color: transparent; }
+.edit-meeting-schedule .edit-grid .timeslot.wrong-timeslot-type .time-label { color: transparent; }
 .edit-meeting-schedule .session.hidden-purpose { filter: blur(3px); }
 {% endblock %}
 {% block title %}{{ schedule.name }}: IETF {{ meeting.number }} meeting agenda{% endblock %}
diff --git a/ietf/templates/meeting/group_materials.html b/ietf/templates/meeting/group_materials.html
index e46a6e975..c657a62fd 100644
--- a/ietf/templates/meeting/group_materials.html
+++ b/ietf/templates/meeting/group_materials.html
@@ -113,10 +113,12 @@
                 <small class="text-muted">{{ session.last_update|utc|date:"H:i:s" }}&nbsp;UTC</small>
             {% endif %}
         </td>
-        <td>
-            {% if user|has_role:"Secretariat" or session.group in user_groups %}
-                <div class="float-end">{% include "meeting/edit_materials_button.html" %}</div>
-            {% endif %}
-        </td>
+        {% if user|has_role:"Secretariat" or user_groups %}
+            <td>
+                {% if session.group in user_groups %}
+                    <div class="float-end">{% include "meeting/edit_materials_button.html" %}</div>
+                {% endif %}
+            </td>
+        {% endif %}
     {% endif %}
 </tr>
\ No newline at end of file
diff --git a/ietf/templates/meeting/import_minutes.html b/ietf/templates/meeting/import_minutes.html
index ccf75f3de..3ab1f0031 100644
--- a/ietf/templates/meeting/import_minutes.html
+++ b/ietf/templates/meeting/import_minutes.html
@@ -17,7 +17,6 @@
       <p class="pull-left">Last updated: {% firstof note.get_update_time "unknown" %}</p>
       <p class="pull-right"><a href="{{ note.url }}">View on notes.ietf.org</a></p>
       <iframe id="preview" srcdoc="{{ note.get_preview|force_escape }}" sandbox>
-        <p>Your browser does not support iframes, so preview cannot be shown.</p>
       </iframe>
     </div>
   </div>
diff --git a/ietf/templates/meeting/interim_request.html b/ietf/templates/meeting/interim_request.html
index ab7d3cfd3..a215f0546 100644
--- a/ietf/templates/meeting/interim_request.html
+++ b/ietf/templates/meeting/interim_request.html
@@ -11,7 +11,7 @@
     {% origin %}
     <h1>Interim Meeting Request</h1>
     {% if form.non_field_errors %}<div class="my-3 alert alert-danger">{{ form.non_field_errors }}</div>{% endif %}
-    <form id="interim-request-form" role="form" method="post" class="my-3">
+    <form id="interim-request-form" method="post" class="my-3">
         {% csrf_token %}
         {% bootstrap_field form.group layout='horizontal' %}
         {% bootstrap_field form.in_person layout='horizontal' %}
diff --git a/ietf/templates/meeting/interim_request_cancel.html b/ietf/templates/meeting/interim_request_cancel.html
index 4bef4594e..1fc6d9075 100644
--- a/ietf/templates/meeting/interim_request_cancel.html
+++ b/ietf/templates/meeting/interim_request_cancel.html
@@ -20,7 +20,7 @@
         {% endblock %}
     </h1>
     <form id="interim-request-cancel-form"
-          role="form"
+         
           method="post"
           class="my-3">
         {% csrf_token %}
diff --git a/ietf/templates/meeting/interim_request_edit.html b/ietf/templates/meeting/interim_request_edit.html
index 906d77b09..d98237640 100644
--- a/ietf/templates/meeting/interim_request_edit.html
+++ b/ietf/templates/meeting/interim_request_edit.html
@@ -11,7 +11,7 @@
     {% origin %}
     <h1>Edit Interim Meeting Request</h1>
     {% if form.non_field_errors %}<div class="my-3 alert alert-danger">{{ form.non_field_errors }}</div>{% endif %}
-    <form id="interim-request-form" role="form" method="post" class="my-3">
+    <form id="interim-request-form" method="post" class="my-3">
         {% csrf_token %}
         {% bootstrap_field form.group layout='horizontal' %}
         <input type="hidden" name="group" value="{{ form.group.value }}">
diff --git a/ietf/templates/meeting/interim_send_announcement.html b/ietf/templates/meeting/interim_send_announcement.html
index f2e3d6a3f..c2097ba83 100644
--- a/ietf/templates/meeting/interim_send_announcement.html
+++ b/ietf/templates/meeting/interim_send_announcement.html
@@ -9,7 +9,7 @@
 {% block content %}
     {% origin %}
     <h1>Announce Interim Meeting</h1>
-    <form method="post" role="form" class="my-3">
+    <form method="post" class="my-3">
         {% csrf_token %}
         <div class="row mb-3">
             <label for="id_to" class="col-md-2 fw-bold col-form-label">To</label>
diff --git a/ietf/templates/meeting/interim_skip_announce.html b/ietf/templates/meeting/interim_skip_announce.html
index 330690bce..b3dc7ddb5 100644
--- a/ietf/templates/meeting/interim_skip_announce.html
+++ b/ietf/templates/meeting/interim_skip_announce.html
@@ -9,7 +9,7 @@
     <p class="alert alert-info my-3">
         You are requesting to complete scheduling of the interim meeting for <b>{{ meeting.session_set.first.group.acronym|upper }}</b> on <b>{{ meeting.date }}</b> without sending an announcement.
     </p>
-    <form action="" method="post">
+    <form method="post">
         {% csrf_token %}
         <input class="btn btn btn-danger" type="submit" value="Continue">
         <a class="btn btn-secondary float-end"
diff --git a/ietf/templates/meeting/materials_editable_groups.html b/ietf/templates/meeting/materials_editable_groups.html
index 62a6ff8ef..a6f07a701 100644
--- a/ietf/templates/meeting/materials_editable_groups.html
+++ b/ietf/templates/meeting/materials_editable_groups.html
@@ -19,9 +19,9 @@
                         </li>
                     {% endfor %}
                 {% else %}
-                    <p>
+                    <li>
                         You cannot manage the meeting materials for any groups.
-                    </p>
+                    </li>
                 {% endif %}
             {% endwith %}
         </ul>
diff --git a/ietf/templates/meeting/requests.html b/ietf/templates/meeting/requests.html
index 539082a51..e29f32f57 100644
--- a/ietf/templates/meeting/requests.html
+++ b/ietf/templates/meeting/requests.html
@@ -40,11 +40,11 @@
             </thead>
             {% for session in area.list %}
                 {% ifchanged %}
-                    <thead>
+                    <tbody>
                         <tr>
                             <th class="table-warning" colspan="7">{{ session.current_status_name|capfirst }}</th>
                         </tr>
-                    </thead>
+                    </tbody>
                 {% endifchanged %}
                 <tbody>
                     <tr>
diff --git a/ietf/templates/meeting/session_buttons_include.html b/ietf/templates/meeting/session_buttons_include.html
index d795aefd1..23e8be366 100644
--- a/ietf/templates/meeting/session_buttons_include.html
+++ b/ietf/templates/meeting/session_buttons_include.html
@@ -20,7 +20,6 @@
                             {% if session.agenda and show_agenda %}
                                 {# agenda pop-up button #}
                                 <button class="btn btn-outline-primary"
-                                        role="button"
                                         data-bs-toggle="modal"
                                         data-bs-target="#modal-{{ slug }}"
                                         title="Show meeting materials">
diff --git a/ietf/templates/meeting/timeslot_edit.html b/ietf/templates/meeting/timeslot_edit.html
index c5b88e373..7e596e76b 100644
--- a/ietf/templates/meeting/timeslot_edit.html
+++ b/ietf/templates/meeting/timeslot_edit.html
@@ -11,12 +11,12 @@
     {% endcomment %}
     .timeslot-edit { overflow: auto; height: max(30rem, calc(100vh - 25rem));}
     .tstable { width: 100%; border-collapse: separate; } {# "separate" to ensure sticky cells keep their borders #}
-.tstable thead  { position: sticky; top: 0; z-index: 2; background-color: white;}
+.tstable thead  { position: sticky; top: 0; z-index: 3; background-color: white;}
 .tstable th:first-child, .tstable td:first-child {
     background-color: white; {# needs to match the lighter of the striped-table colors! #}
 position: sticky;
 left: 0;
-    z-index: 1.5; {# render above other cells / borders but below thead (z-index 2, above) #}
+    z-index: 2; {# render above other cells / borders but below thead (z-index 3, above) #}
 }
 .tstable tbody > tr:nth-of-type(odd) > th:first-child {
     background-color: rgb(249, 249, 249); {# needs to match the darker of the striped-table colors! #}
diff --git a/ietf/templates/meeting/tz-display.html b/ietf/templates/meeting/tz-display.html
index 2d08eb420..d246b7594 100644
--- a/ietf/templates/meeting/tz-display.html
+++ b/ietf/templates/meeting/tz-display.html
@@ -3,7 +3,6 @@
 <div class="tz-display input-group my-3">
     <label class="input-group-text border-primary bg-white fw-bold">Time zone:</label>
     <input type="radio"
-           autocomplete="off"
            {% if timezone == "meeting" %}checked{% endif %}
            name="tzradio"
            class="btn-check"
@@ -11,7 +10,6 @@
            onclick="ietf_timezone.use('{{ timezone }}')">
     <label class="btn btn-outline-primary" for="meeting-timezone{{ id_suffix }}">Meeting</label>
     <input type="radio"
-           autocomplete="off"
            {% if timezone == "local" %}checked{% endif %}
            name="tzradio"
            class="btn-check"
@@ -19,7 +17,6 @@
            onclick="ietf_timezone.use('local')">
     <label class="btn btn-outline-primary" for="local-timezone{{ id_suffix }}">Local</label>
     <input type="radio"
-           autocomplete="off"
            {% if timezone == "UTC" %}checked{% endif %}
            name="tzradio"
            class="btn-check"
diff --git a/ietf/templates/meeting/week-view.html b/ietf/templates/meeting/week-view.html
index 933fa794a..833401bdf 100644
--- a/ietf/templates/meeting/week-view.html
+++ b/ietf/templates/meeting/week-view.html
@@ -1,10 +1,10 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% 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; it should be rewritten with fullcalendar #}
 {# <!doctype html> #}
 <html lang="en">
+    {% origin %}
     <head>
         <title>Weekview</title>
         <meta charset="utf-8">
diff --git a/ietf/templates/nomcom/iesg_position_requirements.html b/ietf/templates/nomcom/iesg_position_requirements.html
index 2fad66a09..774f44df4 100644
--- a/ietf/templates/nomcom/iesg_position_requirements.html
+++ b/ietf/templates/nomcom/iesg_position_requirements.html
@@ -8,6 +8,7 @@
             </button>
         </h2>
         <div id="generic_iesg_reqs_{{ position.name|slugify }}"
+             role="region"
              class="accordion-collapse collapse">
             <div class="accordion-body">{{ generic_iesg_reqs|safe }}</div>
         </div>
@@ -21,6 +22,7 @@
             </button>
         </h2>
         <div id="iesg_reqs_{{ position.name|slugify }}"
+             role="region"
              class="accordion-collapse collapse show"
              aria-expanded="true">
             <div class="accordion-body">{{ specific_reqs|safe }}</div>
diff --git a/ietf/templates/nomcom/private_index.html b/ietf/templates/nomcom/private_index.html
index 889869d8b..8df5e1d97 100644
--- a/ietf/templates/nomcom/private_index.html
+++ b/ietf/templates/nomcom/private_index.html
@@ -146,6 +146,7 @@
         <form class="form-inline" id="batch-action-form" method="post">
             {% csrf_token %}
         {% endif %}
+        {% if nominee_positions %}
         <table class="table table-sm table-striped table-hover tablesorter"
                id="nominee-position-table">
             <thead>
@@ -169,49 +170,50 @@
                     </th>
                 </tr>
             </thead>
-            {% 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 %}
+            <tbody>
+                {% for np in nominee_positions %}
+                    <tr>
+                        {% if is_chair and nomcom.group.state_id == 'active' %}
                             <td>
-                                <a href="{% url 'ietf.person.views.profile' email_or_name=np.nominee.name %}">
-                                    {{ np.nominee }}
-                                </a>
+                                <input class="batch-select form-check-input"
+                                       type="checkbox"
+                                       value="{{ np.id }}"
+                                       name="selected">
                             </td>
-                            <td>
+                            <td class="edit">
                                 <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
+                                   href="{% url 'ietf.nomcom.views.edit_nominee' year np.nominee.id %}">
+                                    Edit
                                 </a>
                             </td>
-                            <td>
-                                {{ np.position.name }}
-                            </td>
-                            <td>
-                                {{ np.state }}
-                            </td>
-                            <td>
-                                {{ np.questionnaires|yesno:"Yes,No,No" }}
-                            </td>
-                        </tr>
-                    {% endfor %}
-                </tbody>
-            {% endif %}
+                        {% 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>
         </table>
+        {% else %}
+            <p>No nominees.</p>
+        {% endif %}
         {% if is_chair %}
             {% if nomcom.group.state_id == 'active' %}
                 <div class="mb-3">
diff --git a/ietf/templates/nomcom/send_reminder_mail.html b/ietf/templates/nomcom/send_reminder_mail.html
index 2071f222a..90dac28ba 100644
--- a/ietf/templates/nomcom/send_reminder_mail.html
+++ b/ietf/templates/nomcom/send_reminder_mail.html
@@ -26,7 +26,7 @@
         </p>
     {% endif %}
     {% if nomcom.group.state_id == 'active' %}
-        <form id="reminderform " method="post">
+        <form id="reminderform" method="post">
             {% csrf_token %}
             <table class="table table-sm table-striped">
                 <thead>
diff --git a/ietf/templates/oidc_provider/authorize.html b/ietf/templates/oidc_provider/authorize.html
index 5a8df7f9d..be35bae13 100644
--- a/ietf/templates/oidc_provider/authorize.html
+++ b/ietf/templates/oidc_provider/authorize.html
@@ -21,6 +21,6 @@
             {% 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-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 c8ac387b5..36499ecdb 100644
--- a/ietf/templates/person/merge.html
+++ b/ietf/templates/person/merge.html
@@ -8,7 +8,7 @@
     <p class="alert alert-info my-3">
         This tool will merge two Person records into one.  If both records have logins and you want to retain the one on the left, use the Swap button to swap source and target records.
     </p>
-    <form action="" method="{{ method }}">
+    <form method="{{ method }}">
         {% if method == 'post' %}
             {% csrf_token %}
         {% endif %}
diff --git a/ietf/templates/registration/change_password.html b/ietf/templates/registration/change_password.html
index a7d2d4057..b97593a9c 100644
--- a/ietf/templates/registration/change_password.html
+++ b/ietf/templates/registration/change_password.html
@@ -16,7 +16,7 @@
             Your password was successfully changed.
         </p>
         {% if not user.is_authenticated %}
-            <a type="a"
+            <a
                class="btn btn-primary"
                href="/accounts/login/"
                rel="nofollow">Sign in</a>
diff --git a/ietf/templates/registration/confirm_account.html b/ietf/templates/registration/confirm_account.html
index 3e085b9c0..0692069b0 100644
--- a/ietf/templates/registration/confirm_account.html
+++ b/ietf/templates/registration/confirm_account.html
@@ -16,7 +16,7 @@
         <p class="alert alert-success my-3">
             Your account with login {{ email|linkify }} has been created, using the password you have selected.
         </p>
-        <a type="a"
+        <a
            class="btn btn-primary"
            href="{% url "ietf.ietfauth.views.login" %}"
            rel="nofollow">Sign in</a>
diff --git a/ietf/templates/registration/index.html b/ietf/templates/registration/index.html
index 7403dc1a5..0cf3222fd 100644
--- a/ietf/templates/registration/index.html
+++ b/ietf/templates/registration/index.html
@@ -7,15 +7,15 @@
     <h1>Account management</h1>
     <div class="buttonlist">
         {% if user.username %}
-            <a type="a" class="btn btn-primary" href="/accounts/profile/">View/edit profile</a>
+            <a class="btn btn-primary" href="/accounts/profile/">View/edit profile</a>
         {% else %}
-            <a type="a"
+            <a
                class="btn btn-primary"
                href="/accounts/login/"
                rel="nofollow">Sign in</a>
         {% endif %}
-        <a type="a" class="btn btn-info" href="/accounts/create/">New account</a>
-        <a type="a" class="btn btn-warning" href="/accounts/reset/">Reset password</a>
-        <a type="a" class="btn btn-primary" href="/accounts/settings/">Change browser preferences</a>
+        <a class="btn btn-info" href="/accounts/create/">New account</a>
+        <a class="btn btn-warning" href="/accounts/reset/">Reset password</a>
+        <a class="btn btn-primary" href="/accounts/settings/">Change browser preferences</a>
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/submit/manual_post.html b/ietf/templates/submit/manual_post.html
index a93812909..1f0a0a9c7 100644
--- a/ietf/templates/submit/manual_post.html
+++ b/ietf/templates/submit/manual_post.html
@@ -71,6 +71,7 @@
                     <th data-sort="name">Name</th>
                     <th data-sort="rev">Rev</th>
                     <th data-sort="date">Submitted</th>
+                    <th></th>
                 </tr>
             </thead>
             <tbody>
@@ -130,4 +131,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/submit/tool_instructions.html b/ietf/templates/submit/tool_instructions.html
index 3897752e8..54a7b0341 100644
--- a/ietf/templates/submit/tool_instructions.html
+++ b/ietf/templates/submit/tool_instructions.html
@@ -54,11 +54,11 @@
         <a href="{{ settings.IDNITS_BASE_URL }}">idnits tool</a>.
     </p>
     <table class="table table-sm table-striped">
-        <thead>
+        <tbody>
             <tr class="table-info">
                 <th colspan="2">Form buttons and resulting actions:</th>
             </tr>
-        </thead>
+        </tbody>
         <tbody>
             <tr>
                 <th class="text-nowrap">.txt format</th>
@@ -95,11 +95,11 @@
         A user must carefully examine the meta-data that are displayed on this screen, and make sure that these data were extracted correctly.  If the data were not extracted correctly, then the user can correct the errors via the Adjust page. In such a case, the user will pass the draft to the Secretariat for manual posting.
     </p>
     <table class="table table-sm table-striped">
-        <thead>
+        <tbody>
             <tr class="table-info">
                 <th colspan="2">Form buttons and resulting actions:</th>
             </tr>
-        </thead>
+        </tbody>
         <tbody>
             <tr>
                 <th>Adjust meta-data</th>
@@ -114,13 +114,13 @@
                 </td>
             </tr>
         </tbody>
-        <thead>
+        <tbody>
             <tr class="table-info">
                 <th colspan="2">
                     When no meta-data error is detected:
                 </th>
             </tr>
-        </thead>
+        </tbody>
         <tbody>
             <tr>
                 <th>
@@ -155,13 +155,13 @@
         This is the screen where a user can adjust any meta-data that could have been incorrectly parsed from the submitted document. The document with adjusted meta-data will be submitted to the Secretariat for manual posting.
     </p>
     <table class="table table-sm table-striped">
-        <thead>
+        <tbody>
             <tr class="table-info">
                 <th colspan="2">
                     Form buttons and resulting actions:
                 </th>
             </tr>
-        </thead>
+        </tbody>
         <tbody>
             <tr>
                 <th>
@@ -197,13 +197,13 @@
         The Status screen is the screen where a user can view the current status of a document that has just been submitted by the user, or a document that was submitted previously via the tool. If a link 'Status' is clicked from the tool's first page, then a form field will be provided for a user to look up a document by name.
     </p>
     <table class="table table-sm table-striped">
-        <thead>
+        <tbody>
             <tr class="table-info">
                 <th colspan="2">
                     Form buttons and resulting actions:
                 </th>
             </tr>
-        </thead>
+        </tbody>
         <tbody>
             <tr>
                 <th>
diff --git a/ietf/templates/submit/upload_submission.html b/ietf/templates/submit/upload_submission.html
index 9e45c9bb4..6648a5e04 100644
--- a/ietf/templates/submit/upload_submission.html
+++ b/ietf/templates/submit/upload_submission.html
@@ -44,7 +44,6 @@
                 <label class="form-check-label"
                        data-bs-toggle="collapse"
                        data-bs-target="#other-formats"
-                       aria-expanded="false"
                        aria-controls="other-formats">
                     <input class="form-check-input"
                            id="checkbox"
diff --git a/ietf/utils/test_runner.py b/ietf/utils/test_runner.py
index a2c0ade9b..ec2fbb8e1 100644
--- a/ietf/utils/test_runner.py
+++ b/ietf/utils/test_runner.py
@@ -46,6 +46,7 @@ import socket
 import datetime
 import gzip
 import unittest
+import subprocess
 import factory.random
 from fnmatch import fnmatch
 
@@ -629,6 +630,23 @@ class IetfTestRunner(DiscoverRunner):
             except socket.error:
                 pass
 
+        try:
+            settings.VNU = subprocess.Popen(
+                [
+                    "java",
+                    "-Dnu.validator.servlet.bind-address=127.0.0.1",
+                    "nu.validator.servlet.Main",
+                    "8888",
+                ],
+                stdout=subprocess.DEVNULL,
+            )
+            print("     Starting Nu Html Checker (v.Nu) for HTML5 validation")
+        except OSError:
+            print(
+                "     Could not start Nu Html Checker (v.Nu), skipping most HTML5 validation"
+            )
+            settings.VNU = None
+
         if os.path.exists(settings.UTILS_TEST_RANDOM_STATE_FILE):
             print("     Loading factory-boy random state from %s" % settings.UTILS_TEST_RANDOM_STATE_FILE)
         else:
@@ -645,6 +663,8 @@ class IetfTestRunner(DiscoverRunner):
 
     def teardown_test_environment(self, **kwargs):
         self.smtpd_driver.stop()
+        if settings.VNU:
+            settings.VNU.terminate()
         if self.check_coverage:
             latest_coverage_file = os.path.join(self.root_dir, settings.TEST_COVERAGE_LATEST_FILE)
             coverage_latest = {}
@@ -813,4 +833,4 @@ class IetfLiveServerTestCase(StaticLiveServerTestCase):
     def tearDown(self):
         for k, v in self.replaced_settings.items():
             setattr(settings, k, v)
-        super().tearDown()
+        super().tearDown()
\ No newline at end of file
diff --git a/ietf/utils/test_utils.py b/ietf/utils/test_utils.py
index d5c0f566d..b46cd870d 100644
--- a/ietf/utils/test_utils.py
+++ b/ietf/utils/test_utils.py
@@ -41,6 +41,7 @@ import html5lib
 import requests_mock
 import shutil
 import sys
+import subprocess
 
 from urllib.parse import unquote
 from unittest.util import strclass
@@ -160,55 +161,122 @@ class VerifyingClient(Client):
         super(VerifyingClient, self).__init__()
         self.test = test
 
+    def handle_error(self, path, source, errors):
+        file_name = "error" + re.sub("/", "-", path)
+        if not file_name.endswith("-"):
+            file_name += "-"
+        file_name += "source.html"
+        with open(file_name, "w") as src:
+            src.write(source)
+            print("\nHTML validation error for URL path", path)
+            print("HTML source saved to", file_name)
+            print("See AssertionError below for error location in HTML source.")
+        self.test.maxDiff = None
+        self.test.assertEqual("", errors)
+
     def get(self, path, *args, skip_verify=False, **extra):
         """GET request
 
         Performs verification of HTML responses unless skip_verify is True.
         """
         r = super(VerifyingClient, self).get(path, *args, **extra)
-        # print(path, r.status_code, r["content-type"].lower())
-        if r.status_code < 300 and r["content-type"].lower().startswith(
-            "text/html"
-        ) and not skip_verify:
-            document, errors = tidy_document(
-                r.content,
-                options={
-                    # this is causing way too many generic warnings:
-                    # "accessibility-check": 1,
-                },
-            )
 
-            errors = "\n".join(
-                [
-                    e
-                    for e in errors.splitlines()
-                    # FIXME: django-bootstrap5 incorrectly sets a "required"
-                    # proprietary attribute on some <div>s; remove those errors
-                    if not re.match(r'.*proprietary attribute "required"', e)
-                    # FIXME: some secretariat templates have this issue, ignore
-                    and not re.match(
-                        r".*id and name attribute value mismatch", e
-                    )
-                    # FIXME: 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)
-                    # FIXME: some old pages only work correctly in quirks mode :-(
-                    and not re.match(
-                        r".*missing <!DOCTYPE> declaration", e)
-                ]
+        if (
+            skip_verify
+            or r.status_code >= 300
+            or not r["content-type"].lower().startswith("text/html")
+        ):
+            return r
+        source = r.content.decode()
+
+        if settings.VNU:
+            # First, run through https://validator.github.io/validator/
+            result = subprocess.run(
+                ["java", "nu.validator.client.HttpClient", "-"],
+                input=r.content,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.DEVNULL,
             )
+            errors = result.stdout.decode()
 
             if errors:
-                file_name = "error" + re.sub("/", "-", path) + "source.html"
-                with open(file_name, "w") as src:
-                    src.write(r.content.decode())
-                    print("\nHTML validation error for URL path", path)
-                    print("HTML source saved to", file_name)
-                    print("See AssertionError below for error location in HTML source.")
+                msg = ""
+                for err in errors.splitlines():
+                    # TODO: check if some can be removed after validating database templates
+                    if (
+                        re.match(r'.*Attribute "required" not allowed', err)
+                        or re.match(
+                            r'.*The "type" attribute is unnecessary for JavaScript', err
+                        )
+                        or re.match(
+                            r'.*Element "option" without attribute "label" must not be empty',
+                            err,
+                        )
+                        or re.match(r".*The character encoding was not declared", err)
+                        or re.match(r".*Consider avoiding viewport values", err)
+                        or re.match(
+                            r'.*The value of the "for" attribute of the "label" element must be the ID of a non-hidden form control',
+                            err,
+                        )
+                        or re.match(r".*is not in Unicode Normalization Form C", err)
+                    ):
+                        continue
+                    # ignore some errors about obsolete HTML coming from the database
+                    if re.match(
+                        r"/meeting/\d+/proceedings/overview/", path
+                    ) and re.match(
+                        r'.*The "\w+" attribute on the "\w+" element is obsolete', err
+                    ):
+                        continue
+                    # ignore some errors coming from outdated but still-needed iframes
+                    if re.match(r"/meeting/\d+/week-view", path) and re.match(
+                        r".*Start tag seen without seeing a doctype first", err
+                    ):
+                        continue
+                    pos = re.match(r'".*":((\d+)\.(\d+)-(\d+)\.(\d+):.*)', err)
+                    if not pos:
+                        self.handle_error(path, source, err)
+                        return r
+                    msg += pos.group(1).strip(" .") + ":\n"
+                    for line in source.splitlines()[
+                        int(pos.group(2)) - 1 : int(pos.group(4))
+                    ]:
+                        msg += line.strip() + "\n"
+
+                if msg:
+                    self.handle_error(path, source, msg)
+                    return r
+
+        # Next, run through https://www.html-tidy.org/
+        document, errors = tidy_document(
+            r.content,
+            options={
+                # this is causing way too many generic warnings:
+                # "accessibility-check": 1,
+            },
+        )
+
+        errors = "\n".join(
+            [
+                e
+                # TODO: check if some can be removed after validating database templates
+                for e in errors.splitlines()
+                # FIXME: django-bootstrap5 incorrectly sets a "required"
+                # proprietary attribute on some <div>s; remove those errors
+                if not re.match(r'.*proprietary attribute "required"', e)
+                # FIXME: some secretariat templates have this issue, ignore
+                and not re.match(r".*id and name attribute value mismatch", e)
+                # FIXME: 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)
+                # FIXME: some old pages only work correctly in quirks mode :-(
+                and not re.match(r".*missing <!DOCTYPE> declaration", e)
+            ]
+        )
+
+        if errors:
+            self.handle_error(path, source, errors)
 
-            self.test.maxDiff = None
-            self.test.assertEqual("", errors)
         return r