diff --git a/ietf/templates/doc/document_top.html b/ietf/templates/doc/document_top.html
index 9be668f5e..b0e37e2d0 100644
--- a/ietf/templates/doc/document_top.html
+++ b/ietf/templates/doc/document_top.html
@@ -2,10 +2,10 @@
 {% load ietf_filters %}
 <h2>{{ doc.title }}<br><small>{{ name }}</small></h2>
 
-<ul class="nav nav-tabs" role="tablist">
+<ul class="nav nav-tabs">
   {% for name, t, url, active, tooltip in tabs %}
-    <li {% if tooltip %}title="{{tooltip}}"{% endif %} class="{% if t == selected %}active {% endif %}{% if not active %}disabled {% endif %}">
-      <a {% if active %}href="{{ url }}"{% endif %}>{{ name|capfirst_allcaps }}</a>
+    <li {% if tooltip %}title="{{tooltip}}"{% endif %} class="nav-item">
+      <a class="nav-link {% if t == selected %}active {% endif %}{% if not active %}disabled {% endif %}" {% if active %}href="{{ url }}"{% endif %}>{{ name|capfirst_allcaps }}</a>
     </li>
   {% endfor %}
-</ul>
+</ul>
\ No newline at end of file
diff --git a/ietf/templates/group/group_base.html b/ietf/templates/group/group_base.html
index b3e5e9a5f..97da3043f 100644
--- a/ietf/templates/group/group_base.html
+++ b/ietf/templates/group/group_base.html
@@ -25,10 +25,10 @@
     {% endif %}
   </h1>
 
-  <ul class="nav nav-tabs" role="tablist">
+  <ul class="nav nav-tabs">
     {% for name, url in menu_entries %}
-      <li {% if selected_menu_entry == name.lower %}class="active"{% endif %}>
-        <a href="{{ url }}">{{ name }}</a>
+      <li class="nav-item">
+        <a class="nav-link {% if selected_menu_entry == name.lower %}active{% endif %}" href="{{ url }}">{{ name }}</a>
       </li>
     {% endfor %}
   </ul>
@@ -50,4 +50,4 @@
 
 {% block js %}
 <script src="{% static "ietf/js/datatables.js" %}"></script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/iesg/agenda.html b/ietf/templates/iesg/agenda.html
index 3421d02b4..67237a9b3 100644
--- a/ietf/templates/iesg/agenda.html
+++ b/ietf/templates/iesg/agenda.html
@@ -24,12 +24,12 @@
     <div class="col-md-10">
       <h1>IESG agenda: {{ date }} </h1>
 
-      <ul class="nav nav-tabs" role="tablist">
-	 <li class="active"><a href="{% url 'ietf.iesg.views.agenda' %}">IESG Agenda</a></li>
-	 <li class="      "><a href="{% url 'ietf.iesg.views.agenda_documents' %}">Documents on future agendas</a></li>
-	 <li class="      "><a href="{% url 'ietf.iesg.views.discusses' %}">DISCUSS positions</a></li>
-	 <li class="      "><a href="{% url 'ietf.iesg.views.past_documents' %}">Documents on recent agendas</a></li>
-	 <li class="      "><a href="{% url 'ietf.iesg.views.photos' %}">IESG Photos</a></li>
+      <ul class="nav nav-tabs">
+	 <li class="nav-item ><a class="nav-link active" href="{% url 'ietf.iesg.views.agenda' %}">IESG Agenda</a></li>
+	 <li class="nav-item       "><a class="nav-link" href="{% url 'ietf.iesg.views.agenda_documents' %}">Documents on future agendas</a></li>
+	 <li class="nav-item       "><a class="nav-link" href="{% url 'ietf.iesg.views.discusses' %}">DISCUSS positions</a></li>
+	 <li class="nav-item       "><a class="nav-link" href="{% url 'ietf.iesg.views.past_documents' %}">Documents on recent agendas</a></li>
+	 <li class="nav-item       "><a class="nav-link" href="{% url 'ietf.iesg.views.photos' %}">IESG Photos</a></li>
       </ul>
 
       {% for num, section in sections %}
@@ -135,4 +135,4 @@
     </div>
 
   </div>
-{% endblock content %}
+{% endblock content %}
\ No newline at end of file
diff --git a/ietf/templates/iesg/agenda_documents.html b/ietf/templates/iesg/agenda_documents.html
index c9f84fe6a..6717ad10b 100644
--- a/ietf/templates/iesg/agenda_documents.html
+++ b/ietf/templates/iesg/agenda_documents.html
@@ -16,12 +16,12 @@
   {% origin %}
   <h1>Documents on future IESG telechat agendas</h1>
 
-  <ul class="nav nav-tabs" role="tablist">
-    <li class="      "><a href="{% url 'ietf.iesg.views.agenda' %}">IESG Agenda</a></li>
-    <li class="active"><a href="{% url 'ietf.iesg.views.agenda_documents' %}">Documents on future agendas</a></li>
-    <li class="      "><a href="{% url 'ietf.iesg.views.discusses' %}">DISCUSS positions</a></li>
-    <li class="      "><a href="{% url 'ietf.iesg.views.past_documents' %}">Documents on recent agendas</a></li>
-    <li class="      "><a href="{% url 'ietf.iesg.views.photos' %}">IESG Photos</a></li>
+  <ul class="nav nav-tabs">
+    <li class="nav-item       "><a class="nav-link" href="{% url 'ietf.iesg.views.agenda' %}">IESG Agenda</a></li>
+    <li class="nav-item"><a class="nav-link active" href="{% url 'ietf.iesg.views.agenda_documents' %}">Documents on future agendas</a></li>
+    <li class="nav-item       "><a class="nav-link" href="{% url 'ietf.iesg.views.discusses' %}">DISCUSS positions</a></li>
+    <li class="nav-item       "><a class="nav-link" href="{% url 'ietf.iesg.views.past_documents' %}">Documents on recent agendas</a></li>
+    <li class="nav-item       "><a class="nav-link" href="{% url 'ietf.iesg.views.photos' %}">IESG Photos</a></li>
   </ul>
 
 
diff --git a/ietf/templates/iesg/discusses.html b/ietf/templates/iesg/discusses.html
index ad6239d8e..fca7ca13b 100644
--- a/ietf/templates/iesg/discusses.html
+++ b/ietf/templates/iesg/discusses.html
@@ -15,12 +15,12 @@
   {% origin %}
   <h1>IESG discuss positions</h1>
 
-  <ul class="nav nav-tabs" role="tablist">
-    <li class="      "><a href="{% url 'ietf.iesg.views.agenda' %}">IESG Agenda</a></li>
-    <li class="      "><a href="{% url 'ietf.iesg.views.agenda_documents' %}">Documents on future agendas</a></li>
-    <li class="active"><a href="{% url 'ietf.iesg.views.discusses' %}">DISCUSS positions</a></li>
-    <li class="      "><a href="{% url 'ietf.iesg.views.past_documents' %}">Documents on recent agendas</a></li>
-    <li class="      "><a href="{% url 'ietf.iesg.views.photos' %}">IESG Photos</a></li>
+  <ul class="nav nav-tabs">
+    <li class="nav-item       "><a class="nav-link" href="{% url 'ietf.iesg.views.agenda' %}">IESG Agenda</a></li>
+    <li class="nav-item       "><a class="nav-link" href="{% url 'ietf.iesg.views.agenda_documents' %}">Documents on future agendas</a></li>
+    <li class="nav-item"><a class="nav-link active" href="{% url 'ietf.iesg.views.discusses' %}">DISCUSS positions</a></li>
+    <li class="nav-item       "><a class="nav-link" href="{% url 'ietf.iesg.views.past_documents' %}">Documents on recent agendas</a></li>
+    <li class="nav-item       "><a class="nav-link" href="{% url 'ietf.iesg.views.photos' %}">IESG Photos</a></li>
   </ul>
 
 
@@ -90,5 +90,4 @@
         }
     });
   </script>
-{% endblock %}
-
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/iesg/past_documents.html b/ietf/templates/iesg/past_documents.html
index 80f5be459..b9f7ce248 100644
--- a/ietf/templates/iesg/past_documents.html
+++ b/ietf/templates/iesg/past_documents.html
@@ -15,12 +15,12 @@
   {% origin %}
   <h1>Documents on recent agendas <small>in states {% for state in states %}{{state.name}}{% if not forloop.last %}, {% endif %} {% endfor %}</small></h1>
 
-  <ul class="nav nav-tabs" role="tablist">
-    <li class="      "><a href="{% url 'ietf.iesg.views.agenda' %}">IESG Agenda</a></li>
-    <li class="      "><a href="{% url 'ietf.iesg.views.agenda_documents' %}">Documents on future agendas</a></li>
-    <li class="      "><a href="{% url 'ietf.iesg.views.discusses' %}">DISCUSS positions</a></li>
-    <li class="active"><a href="{% url 'ietf.iesg.views.past_documents' %}">Documents on recent agendas</a></li>
-    <li class="      "><a href="{% url 'ietf.iesg.views.photos' %}">IESG Photos</a></li>
+  <ul class="nav nav-tabs">
+    <li class="nav-item      "><a class="nav-link" href="{% url 'ietf.iesg.views.agenda' %}">IESG Agenda</a></li>
+    <li class="nav-item      "><a class="nav-link" href="{% url 'ietf.iesg.views.agenda_documents' %}">Documents on future agendas</a></li>
+    <li class="nav-item      "><a class="nav-link" href="{% url 'ietf.iesg.views.discusses' %}">DISCUSS positions</a></li>
+    <li class="nav-item"><a class="nav-link active" href="{% url 'ietf.iesg.views.past_documents' %}">Documents on recent agendas</a></li>
+    <li class="nav-item      "><a class="nav-link" href="{% url 'ietf.iesg.views.photos' %}">IESG Photos</a></li>
   </ul>
 
 
@@ -97,5 +97,4 @@
         }
     });
   </script>
-{% endblock %}
-
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/iesg/photos.html b/ietf/templates/iesg/photos.html
index 4e8994446..a565717d4 100644
--- a/ietf/templates/iesg/photos.html
+++ b/ietf/templates/iesg/photos.html
@@ -18,12 +18,12 @@
 
       <h1>{{ group_type | upper }} {{ role }} Photos</h1>
 
-      <ul class="nav nav-tabs" role="tablist">
-	 <li class="      "><a href="{% url 'ietf.iesg.views.agenda' %}">IESG Agenda</a></li>
-	 <li class="      "><a href="{% url 'ietf.iesg.views.agenda_documents' %}">Documents on future agendas</a></li>
-	 <li class="      "><a href="{% url 'ietf.iesg.views.discusses' %}">DISCUSS positions</a></li>
-	 <li class="      "><a href="{% url 'ietf.iesg.views.past_documents' %}">Documents on recent agendas</a></li>
-	 <li class="active"><a href="{% url 'ietf.iesg.views.photos' %}">IESG Photos</a></li>
+      <ul class="nav nav-tabs">
+	 <li class="nav-item       "><a class="nav-link" href="{% url 'ietf.iesg.views.agenda' %}">IESG Agenda</a></li>
+	 <li class="nav-item       "><a class="nav-link" href="{% url 'ietf.iesg.views.agenda_documents' %}">Documents on future agendas</a></li>
+	 <li class="nav-item       "><a class="nav-link" href="{% url 'ietf.iesg.views.discusses' %}">DISCUSS positions</a></li>
+	 <li class="nav-item       "><a class="nav-link" href="{% url 'ietf.iesg.views.past_documents' %}">Documents on recent agendas</a></li>
+	 <li class="nav-item"><a class="nav-link active" href="{% url 'ietf.iesg.views.photos' %}">IESG Photos</a></li>
       </ul>
 
       {% regroup roles by group.acronym as alphabet_blocks %}
@@ -71,4 +71,4 @@
 	  {% endfor %}
 	</ul>
       </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/ipr/admin_list.html b/ietf/templates/ipr/admin_list.html
index 33dd53a06..8ea96bbad 100644
--- a/ietf/templates/ipr/admin_list.html
+++ b/ietf/templates/ipr/admin_list.html
@@ -14,12 +14,14 @@
     <a class="btn btn-default" href="{% url "ietf.ipr.views.showlist" %}">Back to IPR Disclosure Page</a>
   </p>
 
-  <ul class="nav nav-tabs" role="tablist">
+  <ul class="nav nav-tabs">
     {% for name, link, selected in tabs %}
-      <li {% if selected %}class="active"{% endif %}><a href="{{ link }}">{{ name }}</a></li>
+      <li class="nav-item">
+        <a class="nav-link {% if selected %}active{% endif %}" href="{{ link }}">{{ name }}</a>
+    </li>
     {% endfor %}
   </ul>
 
   {% include "ipr/ipr_table.html" %}
 
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/ipr/details_tabs.html b/ietf/templates/ipr/details_tabs.html
index 18b75f47c..6bf473ef4 100644
--- a/ietf/templates/ipr/details_tabs.html
+++ b/ietf/templates/ipr/details_tabs.html
@@ -1,7 +1,9 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}{% origin %}
-<ul class="nav nav-tabs" role="tablist">
+<ul class="nav nav-tabs">
   {% for name, link, selected in tabs %}
-    <li {% if selected %}class="active"{% endif %}><a href="{{ link }}">{{ name }}</a></li>
+    <li class="nav-item">
+        <a class=nav-item {% if selected %}active{% endif %}" href="{{ link }}">{{ name }}</a>
+    </li>
   {% endfor %}
-</ul>
+</ul>
\ No newline at end of file
diff --git a/ietf/templates/liaisons/detail_tabs.html b/ietf/templates/liaisons/detail_tabs.html
index 56779b248..46cadb9ad 100644
--- a/ietf/templates/liaisons/detail_tabs.html
+++ b/ietf/templates/liaisons/detail_tabs.html
@@ -1,5 +1,7 @@
-<ul class="nav nav-tabs" role="tablist">
+<ul class="nav nav-tabs">
   {% for name, link, selected in tabs %}
-    <li {% if selected %}class="active"{% endif %}><a href="{{ link }}">{{ name }}</a></li>
+    <li class="nav-item">
+        <a class="nav-link {% if selected %}active{% endif %}" href="{{ link }}">{{ name }}</a>
+    </li>
   {% endfor %}
-</ul>
+</ul>
\ No newline at end of file
diff --git a/ietf/templates/liaisons/liaison_base.html b/ietf/templates/liaisons/liaison_base.html
index dad9ac465..3d3c21409 100644
--- a/ietf/templates/liaisons/liaison_base.html
+++ b/ietf/templates/liaisons/liaison_base.html
@@ -22,10 +22,10 @@
     </div>
   {% endif %}
 
-  <ul class="nav nav-tabs" role="tablist">
+  <ul class="nav nav-tabs">
     {% for name, url in menu_entries %}
-      <li {% if selected_menu_entry == name.lower %}class="active"{% endif %}>
-        <a href="{{ url }}">{{ name }}</a>
+      <li class="nav-item">
+        <a class="nav-link {% if selected_menu_entry == name.lower %}active{% endif %}" href="{{ url }}">{{ name }}</a>
       </li>
     {% endfor %}
   </ul>
@@ -56,4 +56,4 @@
   <script src="{% static "ietf/js/datatables.js" %}"></script>
   <script src="{% static 'bootstrap-datepicker/js/bootstrap-datepicker.min.js' %}"></script>
   <script src="{% static 'ietf/js/liaisons.js' %}"></script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/interim_announce.html b/ietf/templates/meeting/interim_announce.html
index 29e58b1a8..04a89712a 100644
--- a/ietf/templates/meeting/interim_announce.html
+++ b/ietf/templates/meeting/interim_announce.html
@@ -15,10 +15,10 @@
   <h1>Interim Meetings to be Announced</h1>
 
     {% if menu_entries %}
-      <ul class="nav nav-tabs" role="tablist">
+      <ul class="nav nav-tabs">
         {% for name, url in menu_entries %}
-          <li {% if selected_menu_entry == name.lower %}class="active"{% endif %}>
-            <a href="{{ url }}">{{ name }}</a>
+          <li class="nav-item">
+            <a class="nav-link {% if selected_menu_entry == name.lower %}active{% endif %}" href="{{ url }}">{{ name }}</a>
           </li>
         {% endfor %}
       </ul>
@@ -54,4 +54,4 @@
 {% block js %}
   <script src="{% static 'select2/select2.min.js' %}"></script>
   <script src="{% static 'ietf/js/meeting-interim-request.js' %}"></script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/interim_pending.html b/ietf/templates/meeting/interim_pending.html
index 88c9e8b79..42117b422 100644
--- a/ietf/templates/meeting/interim_pending.html
+++ b/ietf/templates/meeting/interim_pending.html
@@ -15,10 +15,10 @@
   <h1>Pending Interim Meetings</h1>
 
   {% if menu_entries %}
-    <ul class="nav nav-tabs" role="tablist">
+    <ul class="nav nav-tabs">
       {% for name, url in menu_entries %}
-        <li {% if selected_menu_entry == name.lower %}class="active"{% endif %}>
-          <a href="{{ url }}">{{ name }}</a>
+        <li class="nav-item">
+          <a class="nav-link {% if selected_menu_entry == name.lower %}active{% endif %}" href="{{ url }}">{{ name }}</a>
         </li>
       {% endfor %}
     </ul>
@@ -56,4 +56,4 @@
 {% block js %}
   <script src="{% static 'select2/select2.min.js' %}"></script>
   <script src="{% static 'ietf/js/meeting-interim-request.js' %}"></script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/meeting/meeting_heading.html b/ietf/templates/meeting/meeting_heading.html
index 16c6fa7e8..8ad4fc0aa 100644
--- a/ietf/templates/meeting/meeting_heading.html
+++ b/ietf/templates/meeting/meeting_heading.html
@@ -29,53 +29,53 @@
       </h1>
 
       {# <a> tags with the agenda-link filterable classes will be updated with show/hide parameters  #}
-      <ul class="nav nav-tabs" role="tablist">
-        <li {% if selected == "agenda" %}class="active"{% endif %}>
-          <a href="{% url 'ietf.meeting.views.agenda' num=meeting.number %}"
+      <ul class="nav nav-tabs">
+        <li class="nav-item">
+          <a class="nav-link {% if selected == "agenda" %}active{% endif %}" href="{% url 'ietf.meeting.views.agenda' num=meeting.number %}"
              class="agenda-link filterable">
             Agenda
           </a>
         </li>
-        <li {% if selected == "agenda-utc" %}class="active"{% endif %}>
-          <a href="{% url 'ietf.meeting.views.agenda' num=meeting.number utc='-utc' %}"
+        <li class="nav-item">
+          <a class="nav-link {% if selected == "agenda-utc" %}active{% endif %}" href="{% url 'ietf.meeting.views.agenda' num=meeting.number utc='-utc' %}"
              class="agenda-link filterable">
             UTC Agenda
           </a>
         </li>
         {% if user|has_role:"Secretariat,Area Director,IAB" %}
           {% if schedule != meeting.schedule %}
-            <li {% if selected == "by-room" %}class="active"{% endif %}>
-              <a
+            <li class="nav-item">
+              <a class="nav-link {% if selected == "by-room" %}active{% endif %}"
                 href="{% url 'ietf.meeting.views.agenda_by_room' num=meeting.number name=schedule.name owner=schedule.owner.email %}">by
                 Room</a></li>
-            <li {% if selected == "by-type" %}class="active"{% endif %}>
-              <a
+            <li class="nav-item">
+              <a class="nav-link {% if selected == "by-type" %}active{% endif %}"
                 href="{% url 'ietf.meeting.views.agenda_by_type' num=meeting.number name=schedule.name owner=schedule.owner.email %}">by
                 Type</a></li>
-            <li {% if selected == "room-view" %}class="active"{% endif %}>
-              <a
+            <li class="nav-item">
+              <a class="nav-link {% if selected == "room-view" %}active{% endif %}"
                 href="{% url 'ietf.meeting.views.room_view'      num=meeting.number name=schedule.name owner=schedule.owner.email %}">Room
                 grid</a></li>
           {% else %}
-            <li {% if selected == "by-room" %}class="active"{% endif %}>
-              <a href="{% url 'ietf.meeting.views.agenda_by_room' num=meeting.number %}">by Room</a></li>
-            <li {% if selected == "by-type" %}class="active"{% endif %}>
-              <a href="{% url 'ietf.meeting.views.agenda_by_type' num=meeting.number %}">by Type</a></li>
-            <li {% if selected == "room-view" %}class="active"{% endif %}>
-              <a href="{% url 'ietf.meeting.views.room_view'      num=meeting.number %}">Room grid</a></li>
+            <li class="nav-item">
+              <a class="nav-link {% if selected == "by-room" %}active{% endif %}" href="{% url 'ietf.meeting.views.agenda_by_room' num=meeting.number %}">by Room</a></li>
+            <li class="nav-item">
+              <a class="nav-link {% if selected == "by-type" %}active{% endif %}" href="{% url 'ietf.meeting.views.agenda_by_type' num=meeting.number %}">by Type</a></li>
+            <li class="nav-item">
+              <a class="nav-link {% if selected == "room-view" %}active{% endif %}" href="{% url 'ietf.meeting.views.room_view'      num=meeting.number %}">Room grid</a></li>
           {% endif %}
         {% endif %}
-        <li {% if selected == "floor-plan" %}class="active"{% endif %}>
-          <a href="{% url 'ietf.meeting.views.floor_plan' num=meeting.number %}">Floor plan</a></li>
-        <li>
-          <a href="{% url 'ietf.meeting.views.agenda' num=meeting.number ext='.txt' %}">
+        <li class="nav-item">
+          <a class="nav-link {% if selected == "floor-plan" %}active{% endif %}" href="{% url 'ietf.meeting.views.floor_plan' num=meeting.number %}">Floor plan</a></li>
+        <li class="nav-item">
+          <a class="nav-link" href="{% url 'ietf.meeting.views.agenda' num=meeting.number ext='.txt' %}">
             Plaintext
           </a>
         </li>
-        <li {% if selected == "select-sessions" %}class="active"{% endif %}>
-          <a href="{% url 'ietf.meeting.views.agenda_personalize' num=meeting.number %}"
+        <li class="nav-item">
+          <a class="nav-link {% if selected == "select-sessions" %}active{% endif %}" href="{% url 'ietf.meeting.views.agenda_personalize' num=meeting.number %}"
              class="agenda-link filterable">
             Select Sessions
           </a>
         </li>
-      </ul>
+      </ul>
\ No newline at end of file
diff --git a/ietf/templates/meeting/room-view.html b/ietf/templates/meeting/room-view.html
index 74244e944..c0c258096 100644
--- a/ietf/templates/meeting/room-view.html
+++ b/ietf/templates/meeting/room-view.html
@@ -587,9 +587,9 @@
 <body onload="draw_calendar()" onresize="draw_calendar()" id="body">
   <div id="mtgheader" style="overflow:auto">{% include "meeting/meeting_heading.html" with updated=schedule.meeting.updated selected="room-view" title_extra="Room Grid" %}</div>
   <div id="daycontainer" role="tabpanel">
-    <ul id="daytabs" class="nav nav-tabs" role="tablist">
+    <ul id="daytabs" class="nav nav-tabs">
     {% for day in days %}
-      <li {% if forloop.first %}class="active"{% endif %} role="presentation"><a href="#day{{forloop.counter0}}" id="day{{forloop.counter0}}-tab" role="tab" data-toggle="tab" area-controls="day{{forloop.counter0}}">{{day|date:"D M d"}}</a></li>
+      <li class="nav-item" role="presentation"><a class="nav-link {% if forloop.first %}active{% endif %}" href="#day{{forloop.counter0}}" id="day{{forloop.counter0}}-tab" role="tab" data-toggle="tab" area-controls="day{{forloop.counter0}}">{{day|date:"D M d"}}</a></li>
     {% endfor %}
     </ul>
     <div class="tab-content">
@@ -609,4 +609,4 @@
 	window.location.hash = e.target.hash;
     })
   </script>
-</body></html>
+</body></html>
\ No newline at end of file
diff --git a/ietf/templates/meeting/upcoming.html b/ietf/templates/meeting/upcoming.html
index 1cd4fe596..494a6dbfd 100644
--- a/ietf/templates/meeting/upcoming.html
+++ b/ietf/templates/meeting/upcoming.html
@@ -71,10 +71,10 @@
         {% include 'meeting/agenda_filter.html' with filter_categories=filter_categories customize_button_text="Customize the meeting list..." only%}
 
         {% if menu_entries %}
-      <ul class="nav nav-tabs" role="tablist">
+      <ul class="nav nav-tabs">
         {% for name, url in menu_entries %}
-          <li {% if selected_menu_entry == name.lower %}class="active"{% endif %}>
-            <a href="{{ url }}">{{ name }}</a>
+          <li class="nav-item">
+            <a class="nav-link {% if selected_menu_entry == name.lower %}active{% endif %}" href="{{ url }}">{{ name }}</a>
           </li>
         {% endfor %}
       </ul>
@@ -355,4 +355,4 @@
     ietf_timezone.set_tz_change_callback(timezone_changed);
     ietf_timezone.initialize('local');
     </script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/nomcom/nomcom_private_base.html b/ietf/templates/nomcom/nomcom_private_base.html
index 2e1fe6e2f..d017b804b 100644
--- a/ietf/templates/nomcom/nomcom_private_base.html
+++ b/ietf/templates/nomcom/nomcom_private_base.html
@@ -12,46 +12,90 @@
 
   <h1>NomCom {{ year }} {% if nomcom.group.state_id == 'conclude' %}(Concluded){% endif %} <small>Private area {% if is_chair_task %}- Chair/Advisors only{% endif %}</small></h1>
 
-  <ul class="nav nav-tabs" role="tablist">
-    <li {% if selected == "index" %}class="active"{% endif %}><a href="{% url "ietf.nomcom.views.private_index" year %}">Nominees</a></li>
+  <ul class="nav nav-tabs">
+    <li class="nav-item">
+        <a class="nav-link {% if selected == "index" %}active{% endif %}" href="{% url "ietf.nomcom.views.private_index" year %}">Nominees</a>
+    </li>
 
     {% if nomcom|has_publickey %}
-      <li {% if selected == "nominate" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.private_nominate' year %}">Nominate</a></li>
-      <li {% if selected == "feedback" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.private_feedback' year %}">Enter feedback</a></li>
+      <li class="nav-item">
+        <a class="nav-link {% if selected == "nominate" %}active{% endif %}" href="{% url 'ietf.nomcom.views.private_nominate' year %}">Nominate</a>
+    </li>
+      <li class="nav-item">
+        <a class="nav-link {% if selected == "feedback" %}active{% endif %}" href="{% url 'ietf.nomcom.views.private_feedback' year %}">Enter feedback</a>
+    </li>
     {% endif %}
 
-    <li {% if selected == "view_feedback" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.view_feedback' year %}">View feedback</a></li>
-    <li {% if selected == "private_key" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.private_key' year %}">Private key</a></li>
+    <li class="nav-item">
+        <a class="nav-link {% if selected == "view_feedback" %}active{% endif %}" href="{% url 'ietf.nomcom.views.view_feedback' year %}">View feedback</a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link {% if selected == "private_key" %}active{% endif %}" href="{% url 'ietf.nomcom.views.private_key' year %}">Private key</a>
+    </li>
 
     {% if user|is_chair_or_advisor:year %}
-      <li {% if selected == "feedback_pending" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.view_feedback_pending' year %}">Pending emails&ensp;<span class="badge">{{nomcom.pending_email_count}}</span></a></li>
+      <li class="nav-item">
+        <a class="nav-link {% if selected == "feedback_pending" %}active{% endif %}" href="{% url 'ietf.nomcom.views.view_feedback_pending' year %}">Pending emails&ensp;<span class="badge">{{nomcom.pending_email_count}}</span></a>
+    </li>
 
       <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">Chair/Advisor Tasks <span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
           {% if nomcom.group.state_id == 'active' %}
           <li role = "presentation" class = "dropdown-header">Feedback Management</li>
-            <li {% if selected == "feedback_email" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.private_feedback_email' year %}">Enter email feedback</a></li>
-            <li {% if selected == "questionnaire" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.private_questionnaire' year %}">Enter questionnaire response</a></li>
-            <li {% if selected == "extract_email_lists" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.extract_email_lists' year %}">Extract email lists</a></li>
-            <li {% if selected == "send_accept_reminder" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.send_reminder_mail' year "accept" %}">Send accept reminder</a></li>
-            <li {% if selected == "send_questionnaire_reminder" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.send_reminder_mail' year "questionnaire" %}">Send questionnaire reminder</a></li>
-            <li {% if selected == "merge_person" %}class="active"{% endif %}><a href="{% url "ietf.nomcom.views.private_merge_person" year %}">Request Person Record Merge</a></li>
-            <li {% if selected == "merge_nominee" %}class="active"{% endif %}><a href="{% url "ietf.nomcom.views.private_merge_nominee" year %}">Merge Nominee Records</a></li>
+            <li class="nav-item">
+                <a class="nav-link {% if selected == "feedback_email" %}active{% endif %}" href="{% url 'ietf.nomcom.views.private_feedback_email' year %}">Enter email feedback</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {% if selected == "questionnaire" %}active{% endif %}" href="{% url 'ietf.nomcom.views.private_questionnaire' year %}">Enter questionnaire response</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {% if selected == "extract_email_lists" %}active{% endif %}" href="{% url 'ietf.nomcom.views.extract_email_lists' year %}">Extract email lists</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {% if selected == "send_accept_reminder" %}active{% endif %}" href="{% url 'ietf.nomcom.views.send_reminder_mail' year "accept" %}">Send accept reminder</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {% if selected == "send_questionnaire_reminder" %}active{% endif %}" href="{% url 'ietf.nomcom.views.send_reminder_mail' year "questionnaire" %}">Send questionnaire reminder</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {% if selected == "merge_person" %}active{% endif %}" href="{% url "ietf.nomcom.views.private_merge_person" year %}">Request Person Record Merge</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {% if selected == "merge_nominee" %}active{% endif %}" href="{% url "ietf.nomcom.views.private_merge_nominee" year %}">Merge Nominee Records</a>
+            </li>
           {% endif %}
           <li role = "presentation" class = "dropdown-header">Nomcom Configuration</li>
-            <li {% if selected == "edit_nomcom" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.edit_nomcom' year %}">Edit Settings</a></li>
-            <li {% if selected == "edit_templates" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.list_templates' year %}">Edit Pages</a></li>
-            <li {% if selected == "edit_positions" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.list_positions' year %}">Edit Positions</a></li>
-            <li {% if selected == "edit_topics" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.list_topics' year %}">Edit Topics</a></li>
+            <li class="nav-item">
+                <a class="nav-link {% if selected == "edit_nomcom" %}active{% endif %}" href="{% url 'ietf.nomcom.views.edit_nomcom' year %}">Edit Settings</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {% if selected == "edit_templates" %}active{% endif %}" href="{% url 'ietf.nomcom.views.list_templates' year %}">Edit Pages</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {% if selected == "edit_positions" %}active{% endif %}" href="{% url 'ietf.nomcom.views.list_positions' year %}">Edit Positions</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {% if selected == "edit_topics" %}active{% endif %}" href="{% url 'ietf.nomcom.views.list_topics' year %}">Edit Topics</a>
+            </li>
             {% if nomcom.group.state_id == 'active' %}
-            <li {% if selected == "edit_members" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.edit_members' year %}">Edit Members</a></li>
+            <li class="nav-item">
+                <a class="nav-link {% if selected == "edit_members" %}active{% endif %}" href="{% url 'ietf.nomcom.views.edit_members' year %}">Edit Members</a>
+            </li>
             {% endif %}
-            <li {% if selected == "help" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.configuration_help' year %}">Configuration Help</a></li>
+            <li class="nav-item">
+                <a class="nav-link {% if selected == "help" %}active{% endif %}" href="{% url 'ietf.nomcom.views.configuration_help' year %}">Configuration Help</a>
+            </li>
           <li role="presentation" class="dropdown-header">Other Tools</li>
-            <li {% if selected == "announce" %}class="active"{% endif %}><a href="{% url 'ietf.secr.announcement.views.main'%}">Announcement Tool</a></li>
-            <li {% if selected == "secr_verify" %}class="active"{% endif %}><a href="https://www.ietf.org/registration/nomcom_chair/nomcomstaff.py">Secretariat Private Eligibility Checker</a></li>
-            <li {% if selected == "secr_pub_verify" %}class="active"{% endif %}><a href="https://www.ietf.org/registration/nomcom.py">Secretariat Public Eligibility Checker</a></li>
+            <li class="nav-item">
+                <a class="nav-link {% if selected == "announce" %}active{% endif %}" href="{% url 'ietf.secr.announcement.views.main'%}">Announcement Tool</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {% if selected == "secr_verify" %}active{% endif %}" href="https://www.ietf.org/registration/nomcom_chair/nomcomstaff.py">Secretariat Private Eligibility Checker</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {% if selected == "secr_pub_verify" %}active{% endif %}" href="https://www.ietf.org/registration/nomcom.py">Secretariat Public Eligibility Checker</a>
+            </li>
         </ul>
       </li>
     {% endif %}
@@ -59,8 +103,12 @@
       <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">Volunteers<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
-            <li {% if selected == "view_eligible" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.private_eligible' year %}">View Eligible</a></li>
-            <li {% if selected == "view_volunteers" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.private_volunteers' year %}">View Volunteers</a></li>
+            <li class="nav-item">
+                <a class="nav-link {% if selected == "view_eligible" %}active{% endif %}" href="{% url 'ietf.nomcom.views.private_eligible' year %}">View Eligible</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {% if selected == "view_volunteers" %}active{% endif %}" href="{% url 'ietf.nomcom.views.private_volunteers' year %}">View Volunteers</a>
+            </li>
         </ul>
       </li>
     {% endif %}
@@ -83,4 +131,4 @@
 	window.location.hash = e.target.hash;
     })
   </script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/nomcom/nomcom_public_base.html b/ietf/templates/nomcom/nomcom_public_base.html
index 9f85268bf..1cbacbb94 100644
--- a/ietf/templates/nomcom/nomcom_public_base.html
+++ b/ietf/templates/nomcom/nomcom_public_base.html
@@ -12,20 +12,27 @@
 
   <h1>NomCom {{ year }} {% if nomcom.group.state_id == 'conclude' %}(Concluded){% endif %}</h1>
 
-  <ul class="nav nav-tabs" role="tablist">
-    <li {% if selected == "index" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.year_index' year %}">Home</a></li>
+  <ul class="nav nav-tabs">
+    <li class="nav-item">
+        <a class="nav-link {% if selected == "index" %}active{% endif %}" href="{% url 'ietf.nomcom.views.year_index' year %}">Home</a></li>
     {% if nomcom|has_publickey %}
-      <li {% if selected == "nominate" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.public_nominate' year %}">Nominate</a></li>
-      <li {% if selected == "feedback" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.public_feedback' year %}">Provide feedback</a></li>
+      <li class="nav-item">
+        <a class="nav-link {% if selected == "nominate" %}active{% endif %}" href="{% url 'ietf.nomcom.views.public_nominate' year %}">Nominate</a></li>
+      <li class="nav-item">
+        <a class="nav-link {% if selected == "feedback" %}active{% endif %}" href="{% url 'ietf.nomcom.views.public_feedback' year %}">Provide feedback</a></li>
     {% endif %}
-    <li {% if selected == "requirements" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.requirements' year %}">Desired expertise</a></li>
-    <li {% if selected == "questionnaires" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.questionnaires' year %}">Questionnaires</a></li>
+    <li class="nav-item">
+        <a class="nav-link {% if selected == "requirements" %}active{% endif %}" href="{% url 'ietf.nomcom.views.requirements' year %}">Desired expertise</a></li>
+    <li class="nav-item">
+        <a class="nav-link {% if selected == "questionnaires" %}active{% endif %}" href="{% url 'ietf.nomcom.views.questionnaires' year %}">Questionnaires</a></li>
     {% if user|is_chair_or_advisor:year or user|has_role:"Secretariat" %}
       <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">Volunteers<span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
-            <li {% if selected == "view_eligible" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.public_eligible' year %}">View Eligible</a></li>
-            <li {% if selected == "view_volunteers" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.public_volunteers' year %}">View Volunteers</a></li>
+            <li class="nav-item">
+                <a class="nav-link {% if selected == "view_eligible" %}active{% endif %}" href="{% url 'ietf.nomcom.views.public_eligible' year %}">View Eligible</a></li>
+            <li class="nav-item">
+                <a class="nav-link {% if selected == "view_volunteers" %}active{% endif %}" href="{% url 'ietf.nomcom.views.public_volunteers' year %}">View Volunteers</a></li>
         </ul>
       </li>
     {% endif %}
@@ -48,4 +55,4 @@
 	window.location.hash = e.target.hash;
     })
   </script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/nomcom/questionnaires.html b/ietf/templates/nomcom/questionnaires.html
index 931d331c8..01f0f78b8 100644
--- a/ietf/templates/nomcom/questionnaires.html
+++ b/ietf/templates/nomcom/questionnaires.html
@@ -8,10 +8,10 @@
   {% origin %}
   <h2>Questionnaires</h2>
 
-  <ul class="nav nav-tabs" role="tablist">
+  <ul class="nav nav-tabs">
     {% for position in positions %}
-      <li {% if forloop.first %}class="active"{% endif %}>
-        <a data-toggle="tab" role="tab" href="#{{ position.name|slugify }}">{{ position.name }}</a>
+      <li class="nav-item">
+        <a class="nav-link {% if forloop.first %}active{% endif %}" data-toggle="tab" role="tab" href="#{{ position.name|slugify }}">{{ position.name }}</a>
       </li>
     {% endfor %}
   </ul>
@@ -23,4 +23,4 @@
       </div>
     {% endfor %}
   </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/nomcom/requirements.html b/ietf/templates/nomcom/requirements.html
index 819b4edd5..19d5d5919 100644
--- a/ietf/templates/nomcom/requirements.html
+++ b/ietf/templates/nomcom/requirements.html
@@ -15,10 +15,10 @@
     all of this information. These pages may be updated periodically.
   </p>
 
-  <ul class="nav nav-tabs" role="tablist">
+  <ul class="nav nav-tabs">
     {% for position in positions %}
-      <li {% if forloop.first %}class="active"{% endif %}>
-        <a data-toggle="tab" role="tab" href="#pos-{{ position.name|slugify }}">{{ position.name }}</a>
+      <li class="nav-item">
+        <a class="nav-link {% if forloop.first %}active{% endif %}" data-toggle="tab" role="tab" href="#pos-{{ position.name|slugify }}">{{ position.name }}</a>
       </li>
     {% endfor %}
   </ul>
@@ -42,5 +42,4 @@
       this.text = ' '+this.text+' (click to expand)'
   })
 </script>
-{% endblock %}
-
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/nomcom/view_feedback_nominee.html b/ietf/templates/nomcom/view_feedback_nominee.html
index 823f7f42d..20236ee4e 100644
--- a/ietf/templates/nomcom/view_feedback_nominee.html
+++ b/ietf/templates/nomcom/view_feedback_nominee.html
@@ -10,9 +10,11 @@
   {% origin %}
   <h2>Feedback about {{ nominee }} </h2>
 
-  <ul class="nav nav-tabs" role="tablist">
+  <ul class="nav nav-tabs">
     {% for ft in feedback_types %}
-      <li {% if forloop.first %}class="active"{% endif %}><a href="#{{ ft.slug }}" role="tab" data-toggle="tab">{{ ft.name }}</a></li>
+      <li class="nav-item">
+        <a class="nav-link {% if forloop.first %}active{% endif %}" href="#{{ ft.slug }}" role="tab" data-toggle="tab">{{ ft.name }}</a>
+    </li>
     {% endfor %}
   </ul>
 
@@ -62,4 +64,4 @@
 
   <a class="btn btn-default" href="{% url 'ietf.nomcom.views.view_feedback' year %}">Back</a>
 
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/nomcom/view_feedback_topic.html b/ietf/templates/nomcom/view_feedback_topic.html
index a38ef9a51..09a4d2a77 100644
--- a/ietf/templates/nomcom/view_feedback_topic.html
+++ b/ietf/templates/nomcom/view_feedback_topic.html
@@ -10,9 +10,10 @@
   {% origin %}
   <h2>Feedback about {{ topic.subject }} </h2>
 
-  <ul class="nav nav-tabs" role="tablist">
+  <ul class="nav nav-tabs">
     {% for ft in feedback_types %}
-      <li {% if forloop.first %}class="active"{% endif %}><a href="#{{ ft.slug }}" role="tab" data-toggle="tab">{{ ft.name }}</a></li>
+      <li class="nav-item">
+        <a class="nav-link {% if forloop.first %}active{% endif %}" href="#{{ ft.slug }}" role="tab" data-toggle="tab">{{ ft.name }}</a></li>
     {% endfor %}
   </ul>
 
@@ -39,4 +40,4 @@
 
   <a class="btn btn-default" href="{% url 'ietf.nomcom.views.view_feedback' year %}">Back</a>
 
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/nomcom/view_feedback_unrelated.html b/ietf/templates/nomcom/view_feedback_unrelated.html
index acbf1e310..181f418e6 100644
--- a/ietf/templates/nomcom/view_feedback_unrelated.html
+++ b/ietf/templates/nomcom/view_feedback_unrelated.html
@@ -10,9 +10,10 @@
   {% origin %}
   <h2>Feedback not related to nominees</h2>
 
-  <ul class="nav nav-tabs" role="tablist">
+  <ul class="nav nav-tabs">
     {% for ft in feedback_types %}
-      <li {% if forloop.first %}class="active"{% endif %}><a href="#{{ ft.ft.slug }}" role="tab" data-toggle="tab">{{ ft.ft.name }}</a></li>
+      <li class="nav-item">
+        <a class="nav-link {% if forloop.first %}active{% endif %}" href="#{{ ft.ft.slug }}" role="tab" data-toggle="tab">{{ ft.ft.name }}</a></li>
     {% endfor %}
   </ul>
 
@@ -37,4 +38,4 @@
   <p>
     <a class="btn btn-default" href="{% url 'ietf.nomcom.views.view_feedback' year %}">Back</a>
   </p>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ietf/templates/submit/submit_base.html b/ietf/templates/submit/submit_base.html
index 28225d1e8..d3ec22e04 100644
--- a/ietf/templates/submit/submit_base.html
+++ b/ietf/templates/submit/submit_base.html
@@ -10,21 +10,21 @@
   {% origin %}
   <h1>Internet-Draft submission </h1>
 
-  <ul class="nav nav-tabs" role="tablist">
-    <li {% if selected == "index" %}class="active"{% endif %}>
-      <a href="{% url "ietf.submit.views.upload_submission" %}">Upload</a>
+  <ul class="nav nav-tabs">
+    <li class="nav-item">
+      <a class="nav-link {% if selected == "index" %}active{% endif %}" href="{% url "ietf.submit.views.upload_submission" %}">Upload</a>
     </li>
-    <li {% if selected == "status" %}class="active"{% endif %}>
-      <a href="{% url "ietf.submit.views.search_submission" %}">Status</a>
+    <li class="nav-item">
+      <a class="nav-link {% if selected == "status" %}active{% endif %}" href="{% url "ietf.submit.views.search_submission" %}">Status</a>
     </li>
-    <li {% if selected == "instructions" %}class="active"{% endif %}>
-      <a href="{% url "ietf.submit.views.tool_instructions" %}">Instructions</a>
+    <li class="nav-item">
+      <a class="nav-link {% if selected == "instructions" %}active{% endif %}" href="{% url "ietf.submit.views.tool_instructions" %}">Instructions</a>
     </li>
-    <li {% if selected == "approvals" %}class="active"{% endif %}>
-      <a href="{% url "ietf.submit.views.approvals" %}">Approvals</a>
+    <li class="nav-item">
+      <a class="nav-link {% if selected == "approvals" %}active{% endif %}" href="{% url "ietf.submit.views.approvals" %}">Approvals</a>
     </li>
-    <li {% if selected == "manual_posts" %}class="active"{% endif %}>
-      <a href="{% url "ietf.submit.views.manualpost" %}">Manual Post Requests</a>
+    <li class="nav-item">
+      <a class="nav-link {% if selected == "manual_posts" %}active{% endif %}" href="{% url "ietf.submit.views.manualpost" %}">Manual Post Requests</a>
     </li>
   </ul>