diff --git a/RIGS/templates/event_checklist_form.html b/RIGS/templates/event_checklist_form.html
index 063ef8cd..98661e24 100644
--- a/RIGS/templates/event_checklist_form.html
+++ b/RIGS/templates/event_checklist_form.html
@@ -117,7 +117,7 @@
                             </dl>
                             <div class="form-group form-row">
                                 <label for="{{ form.date.id_for_label }}"
-                                       class="col-4 control-label">{{ form.date.label }}</label>
+                                       class="col-4 col-form-label">{{ form.date.label }}</label>
                                 {% if not form.date.value %}
                                 {% render_field form.date class+="form-control col-8" value=event.start_date %}
                                 {% else %}
@@ -126,7 +126,7 @@
                             </div>
                             <div class="form-group form-row" id="{{ form.venue.id_for_label }}-group">
                                 <label for="{{ form.venue.id_for_label }}"
-                                class="col-4 control-label">{{ form.venue.label }}</label>
+                                class="col-4 col-form-label">{{ form.venue.label }}</label>
                                 <select id="{{ form.venue.id_for_label }}" name="{{ form.venue.name }}" class="form-control selectpicker col-8" data-live-search="true" data-sourceurl="{% url 'api_secure' model='venue' %}">
                                 {% if venue %}
                                     <option value="{{venue.pk}}" selected="selected">{{ venue.name }}</option>
@@ -137,7 +137,7 @@
                             </div>
                             <div class="form-group form-row" id="{{ form.power_mic.id_for_label }}-group">
                             <label for="{{ form.power_mic.id_for_label }}"
-                                class="col-4 control-label">{{ form.power_mic.help_text }}</label>
+                                class="col-4 col-form-label">{{ form.power_mic.help_text }}</label>
                                 <select id="{{ form.power_mic.id_for_label }}" name="{{ form.power_mic.name }}" class="form-control selectpicker col-8" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" required="true">
                                     {% if power_mic %}
                                         <option value="{{power_mic.pk}}" selected="selected">{{ power_mic.name }}</option>
diff --git a/RIGS/templates/event_detail_buttons.html b/RIGS/templates/event_detail_buttons.html
index f60a258a..7e9ead8c 100644
--- a/RIGS/templates/event_detail_buttons.html
+++ b/RIGS/templates/event_detail_buttons.html
@@ -20,7 +20,7 @@
                     "
                href="{% url 'event_authorise_request' object.pk %}">
                 <i class="fas fa-paper-plane"></i>
-                <span class="hidden-xs">
+                <span class="d-none d-sm-inline">
                     {% if event.authorised %}
                         Authorised
                     {% elif event.authorisation and event.authorisation.amount != event.total and event.authorisation.last_edited_at > event.auth_request_at %}
@@ -45,7 +45,7 @@
                         {% endif %}
                         " title="Invoice Rig"><span
                     class="fas fa-pound-sign"></span>
-                <span class="hidden-xs">Invoice</span></a>
+                <span class="d-none d-sm-inline">Invoice</span></a>
         {% endif %}
     {% endif %}
 </div>
diff --git a/RIGS/templates/event_form.html b/RIGS/templates/event_form.html
index 26673ef0..a68685ea 100644
--- a/RIGS/templates/event_form.html
+++ b/RIGS/templates/event_form.html
@@ -92,7 +92,7 @@
 
 {% block content %}
 {% include 'item_modal.html' %}
-<form class="form-horizontal itemised_form" role="form" method="POST">
+<form class=" itemised_form" role="form" method="POST">
     {% csrf_token %}
     <div class="row">
         <div class="col-12">
@@ -127,7 +127,7 @@
                 <div class="card-body">
                     <div class="form-group" data-toggle="tooltip" title="The main contact for the event, can be left blank if purely an organisation">
                         <label for="{{ form.person.id_for_label }}"
-                               class="col-sm-4 control-label">{{ form.person.label }}</label>
+                               class="col-sm-4 col-form-label">{{ form.person.label }}</label>
                         <div class="col-sm-8">
                             <div class="row">
                                 <div class="col-sm-9 col-md-7 col-lg-8">
@@ -153,7 +153,7 @@
                     </div>
                     <div class="form-group" data-toggle="tooltip" title="The client organisation, leave blank if client is an individual">
                         <label for="{{ form.organisation.id_for_label }}"
-                               class="col-sm-4 control-label">{{ form.organisation.label }}</label>
+                               class="col-sm-4 col-form-label">{{ form.organisation.label }}</label>
 
                         <div class="col-sm-8">
                             <div class="row">
@@ -185,7 +185,7 @@
                 <div class="card-body">
                     <div class="form-group" data-toggle="tooltip" title="A short description of the event, shown on rigboard and on paperwork">
                         <label for="{{ form.description.id_for_label }}"
-                               class="col-sm-4 control-label">{{ form.description.label }}</label>
+                               class="col-sm-4 col-form-label">{{ form.description.label }}</label>
 
                         <div class="col-sm-8">
                             {% render_field form.description class+="form-control" %}
@@ -203,7 +203,7 @@
                     <div id="form-hws">
                         <div class="form-group" data-toggle="tooltip" title="Name of the event, displays on rigboard and on paperwork">
                             <label for="{{ form.name.id_for_label }}"
-                                   class="col-sm-4 control-label">{{ form.name.label }}</label>
+                                   class="col-sm-4 col-form-label">{{ form.name.label }}</label>
 
                             <div class="col-sm-8">
                                 {% render_field form.name class+="form-control" %}
@@ -211,7 +211,7 @@
                         </div>
                         <div class="form-group" data-toggle="tooltip" title="The venue for the rig, leave blank if unknown (e.g. for a dry hire)">
                             <label for="{{ form.venue.id_for_label }}"
-                                   class="col-sm-4 control-label">{{ form.venue.label }}</label>
+                                   class="col-sm-4 col-form-label">{{ form.venue.label }}</label>
 
                             <div class="col-sm-8">
                                 <div class="row">
@@ -238,7 +238,7 @@
                         </div>
                         <div class="form-group">
                             <label for="{{ form.start_date.id_for_label }}"
-                                   class="col-sm-4 control-label">{{ form.start_date.label }}</label>
+                                   class="col-sm-4 col-form-label">{{ form.start_date.label }}</label>
 
                             <div class="col-sm-8">
                                 <div class="row">
@@ -253,7 +253,7 @@
                         </div>
                         <div class="form-group">
                             <label for="{{ form.end_date.id_for_label }}"
-                                   class="col-sm-4 control-label">{{ form.end_date.label }}</label>
+                                   class="col-sm-4 col-form-label">{{ form.end_date.label }}</label>
 
                             <div class="col-sm-8">
                                 <div class="row">
@@ -271,14 +271,14 @@
                         <div class="form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %}">
                             <div class="form-group" data-toggle="tooltip" title="The date/time at which TEC have access to the venue">
                                 <label for="{{ form.access_at.id_for_label }}"
-                                       class="col-sm-4 control-label">{{ form.access_at.label }}</label>
+                                       class="col-sm-4 col-form-label">{{ form.access_at.label }}</label>
                                 <div class="col-sm-8">
                                     {% render_field form.access_at class+="form-control" step="60" %}
                                 </div>
                             </div>
                             <div class="form-group" data-toggle="tooltip" title="The date/time at which crew should meet for this event">
                                 <label for="{{ form.meet_at.id_for_label }}"
-                                       class="col-sm-4 control-label">{{ form.meet_at.label }}</label>
+                                       class="col-sm-4 col-form-label">{{ form.meet_at.label }}</label>
 
                                 <div class="col-sm-8">
                                     {% render_field form.meet_at class+="form-control" step="60" %}
@@ -298,7 +298,7 @@
                         {# Status is needed on all events types and it looks good here in the form #}
                         <div class="form-group" data-toggle="tooltip" title="The current status of the event. Only mark as booked once paperwork is received">
                             <label for="{{ form.status.id_for_label }}"
-                                   class="col-sm-4 control-label">{{ form.status.label }}</label>
+                                   class="col-sm-4 col-form-label">{{ form.status.label }}</label>
 
                             <div class="col-sm-8">
                                 {% render_field form.status class+="form-control" %}
@@ -308,7 +308,7 @@
                         <div class="form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %}">
                             <div class="form-group" data-toggle="tooltip" title="The Member in Charge of this event">
                                 <label for="{{ form.mic.id_for_label }}"
-                                       class="col-sm-4 control-label">{{ form.mic.label }}</label>
+                                       class="col-sm-4 col-form-label">{{ form.mic.label }}</label>
 
                                 <div class="col-sm-8">
                                     <select id="{{ form.mic.id_for_label }}" name="{{ form.mic.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
@@ -322,7 +322,7 @@
                             {% if object.dry_hire %}
                                 <div class="form-group" data-toggle="tooltip" title="The person who checked-in this dry hire">
                                     <label for="{{ form.checked_in_by.id_for_label }}"
-                                           class="col-sm-4 control-label">{{ form.checked_in_by.label }}</label>
+                                           class="col-sm-4 col-form-label">{{ form.checked_in_by.label }}</label>
 
                                     <div class="col-sm-8">
                                          <select id="{{ form.checked_in_by.id_for_label }}" name="{{ form.checked_in_by.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
@@ -336,7 +336,7 @@
 
                             <div class="form-group" data-toggle="tooltip" title="The student ID of the client who collected the dry-hire">
                                 <label for="{{ form.collector.id_for_label }}"
-                                       class="col-sm-4 control-label">{{ form.collector.label }}</label>
+                                       class="col-sm-4 col-form-label">{{ form.collector.label }}</label>
 
                                 <div class="col-sm-8">
                                     {% render_field form.collector class+="form-control" %}
@@ -345,7 +345,7 @@
 
                             <div class="form-group" data-toggle="tooltip" title="The purchase order number (for external clients)">
                                 <label for="{{ form.purchase_order.id_for_label }}"
-                                       class="col-sm-4 control-label">{{ form.purchase_order.label }}</label>
+                                       class="col-sm-4 col-form-label">{{ form.purchase_order.label }}</label>
 
                                 <div class="col-sm-8">
                                     {% render_field form.purchase_order class+="form-control" %}
diff --git a/RIGS/templates/eventauthorisation_form.html b/RIGS/templates/eventauthorisation_form.html
index 3a3bbfd5..479777c6 100644
--- a/RIGS/templates/eventauthorisation_form.html
+++ b/RIGS/templates/eventauthorisation_form.html
@@ -11,7 +11,7 @@
             <div class="card-header" id="eventauth">Event Authorisation</div>
 
             <div class="card-body">
-                <form class="form-horizontal itemised_form" role="form" method="POST" action="#eventauth">
+                <form class=" itemised_form" role="form" method="POST" action="#eventauth">
                     {% csrf_token %}
                     {% include 'form_errors.html' %}
                     <div class="row">
@@ -29,7 +29,7 @@
                             <div class="col-sm-12 form-group" data-toggle="tooltip"
                                  title="Your name as the person authorising the event.">
                                 <label for="{{ form.name.id_for_label }}"
-                                       class="col-sm-4 control-label">{{ form.name.label }}</label>
+                                       class="col-sm-4 col-form-label">{{ form.name.label }}</label>
 
                                 <div class="col-sm-8">
                                     {% render_field form.name class+="form-control" %}
@@ -39,7 +39,7 @@
                             <div class="col-sm-12 form-group" data-toggle="tooltip"
                                  title="Your Student ID or Staff username as the person authorising the event.">
                                 <label for="{{ form.uni_id.id_for_label }}"
-                                       class="col-sm-4 control-label">{{ form.uni_id.label }}</label>
+                                       class="col-sm-4 col-form-label">{{ form.uni_id.label }}</label>
                                 <div class="col-sm-8">
                                     {% render_field form.uni_id class+="form-control" %}
                                 </div>
@@ -50,7 +50,7 @@
                             <div class="col-sm-12 form-group" data-toggle="tooltip"
                                  title="The Students' Union account code you wish this event to be charged to.">
                                 <label for="{{ form.account_code.id_for_label }}"
-                                       class="col-sm-4 control-label">{{ form.account_code.label }}</label>
+                                       class="col-sm-4 col-form-label">{{ form.account_code.label }}</label>
                                 <div class="col-sm-8">
                                     {% render_field form.account_code class+="form-control" %}
                                 </div>
@@ -59,7 +59,7 @@
                             <div class="col-sm-12 form-group" data-toggle="tooltip"
                                  title="The full amount chargable for this event as displayed above, including VAT.">
                                 <label for="{{ form.amount.id_for_label }}"
-                                       class="col-sm-4 control-label">{{ form.amount.label }}</label>
+                                       class="col-sm-4 col-form-label">{{ form.amount.label }}</label>
                                 <div class="col-sm-8">
                                     {% render_field form.amount class+="form-control" %}
                                 </div>
diff --git a/RIGS/templates/hs_list.html b/RIGS/templates/hs_list.html
index 74c3b517..0a11b99b 100644
--- a/RIGS/templates/hs_list.html
+++ b/RIGS/templates/hs_list.html
@@ -31,7 +31,7 @@
             <br>
             {% endfor %}
             <a href="{% url 'event_ec' event.pk %}" class="btn btn-info"><span class="fas fa-paperclip"></span> <span
-            class="hidden-xs">Create</span></a>
+            class="d-none d-sm-inline">Create</span></a>
             </td>
         </tr>
         {% empty %}
diff --git a/RIGS/templates/invoice_detail.html b/RIGS/templates/invoice_detail.html
index 5074c989..c2cb3f8f 100644
--- a/RIGS/templates/invoice_detail.html
+++ b/RIGS/templates/invoice_detail.html
@@ -8,11 +8,11 @@
                 <div class="btn-group btn-page">
                     <a href="{% url 'invoice_delete' object.pk %}" class="btn btn-danger" title="Delete Invoice">
                         <span class="fas fa-times"></span> <span
-                                class="hidden-xs">Delete</span>
+                                class="d-none d-sm-inline">Delete</span>
                     </a>
                     <a href="{% url 'invoice_void' object.pk %}" class="btn btn-warning" title="Void Invoice">
                         <span class="fas fa-ban"></span> <span
-                                class="hidden-xs">Void</span>
+                                class="d-none d-sm-inline">Void</span>
                     </a>
                     {% button 'print' url='invoice_print' pk=object.pk %}
                 </div>
diff --git a/RIGS/templates/item_modal.html b/RIGS/templates/item_modal.html
index 2c07e039..f8ce7390 100644
--- a/RIGS/templates/item_modal.html
+++ b/RIGS/templates/item_modal.html
@@ -10,14 +10,14 @@
             <form id="item-form">
                 <div class="modal-body">
                     <div class="form-group form-row">
-                        <label for="item_name" class="col-sm-2 control-label">Item Name</label>
+                        <label for="item_name" class="col-sm-2 col-form-label">Item Name</label>
                         <div class="col-sm-10">
                             <input type="text" placeholder="Item Name" class="form-control" required maxlength="255"
                                    id="item_name"/>
                         </div>
                     </div>
                     <div class="form-group form-row">
-                        <label for="item_description" class="col-sm-2 control-label">Description</label>
+                        <label for="item_description" class="col-sm-2 col-form-label">Description</label>
                         <div class="col-sm-10">
                             <textarea type="text" placeholder="Description" class="form-control"
                                       id="item_description" rows="8"></textarea>
@@ -26,7 +26,7 @@
                     <div class="form-row">
                         <div class="col-sm-6">
                             <div class="form-group form-row">
-                                <label for="item_quantity" class="col-sm-4 control-label">Quantity</label>
+                                <label for="item_quantity" class="col-sm-4 col-form-label">Quantity</label>
                                 <div class="col-sm-8">
                                     <input type="number" placeholder="Quantity" class="form-control" required
                                            min="1" id="item_quantity"/>
@@ -35,7 +35,7 @@
                         </div>
                         <div class="col-sm-6">
                             <div class="form-group form-row">
-                                <label for="item_cost" class="col-sm-4 control-label">Cost</label>
+                                <label for="item_cost" class="col-sm-4 col-form-label">Cost</label>
 
                                 <div class="col-sm-8">
                                     <div class="input-group">
diff --git a/RIGS/templates/item_row.html b/RIGS/templates/item_row.html
index 2a88ed1e..fa4cf7ca 100644
--- a/RIGS/templates/item_row.html
+++ b/RIGS/templates/item_row.html
@@ -15,12 +15,12 @@
 	{% if edit %}
     <td class="vert-align text-right">
         <div class="btn-group" role="group" aria-label="Action buttons">
-	        <button type="button" class="item-edit btn btn-xs btn-warning"
+	        <button type="button" class="item-edit btn btn-sm btn-warning"
 			        data-pk="{{item.pk}}"
 			        data-toggle="modal" data-target="#itemModal">
 		        <span class="fas fa-edit"></span>
 	        </button>
-	        <button type="button" class="item-delete btn btn-xs btn-danger"
+	        <button type="button" class="item-delete btn btn-sm btn-danger"
 			        data-pk="{{item.pk}}">
 		        <span class="fas fa-times-circle"></span>
 	        </button>
diff --git a/RIGS/templates/item_table.html b/RIGS/templates/item_table.html
index 334f0835..305ca335 100644
--- a/RIGS/templates/item_table.html
+++ b/RIGS/templates/item_table.html
@@ -12,7 +12,7 @@
                 {% endif %}
 				{% if edit %}
 				<th scope="col" class="text-right align-self-start">
-					<button type="button" class="btn btn-success btn-xs item-add"
+					<button type="button" class="btn btn-success btn-sm item-add"
 						data-toggle="modal"
 						data-target="#itemModal">
 						<i class="fas fa-plus"></i> Add Item
@@ -65,12 +65,12 @@
         {% if edit %}
         <td class="vert-align text-right">
             <div class="btn-group" role="group" aria-label="Action buttons">
-	            <button type="button" class="item-edit btn btn-xs btn-warning"
+	            <button type="button" class="item-edit btn btn-sm btn-warning"
 			            data-pk="{{item.pk}}"
 			            data-toggle="modal" data-target="#itemModal">
 		            <span class="fas fa-edit"></span>
 	            </button>
-	            <button type="button" class="item-delete btn btn-xs btn-danger"
+	            <button type="button" class="item-delete btn btn-sm btn-danger"
 			            data-pk="{{item.pk}}">
 		            <span class="fas fa-times-circle"></span>
 	            </button>
diff --git a/RIGS/templates/payment_form.html b/RIGS/templates/payment_form.html
index 3efe74e4..f699e619 100644
--- a/RIGS/templates/payment_form.html
+++ b/RIGS/templates/payment_form.html
@@ -9,14 +9,14 @@
     <input type="hidden" name="{{ form.invoice.name }}" value="{{ form.invoice.value }}"/>
     {% include 'form_errors.html' %}
     <div class="row pt-3">
-        <label class="col-sm-4 control-label"
+        <label class="col-sm-4 col-form-label"
                for="{{ form.date.id_for_label }}">{{ form.date.label }}</label>
         <div class="col-sm-8">
             {% render_field form.date class+="form-control" %}
         </div>
     </div>
     <div class="row pt-3">
-        <label class="col-sm-4 control-label"
+        <label class="col-sm-4 col-form-label"
                for="{{ form.amount.id_for_label }}">{{ form.amount.label }}</label>
         <div class="col-sm-8">
             <div class="input-group">
@@ -28,7 +28,7 @@
         </div>
     </div>
     <div class="row pt-3">
-        <label class="col-sm-4 control-label"
+        <label class="col-sm-4 col-form-label"
                for="{{ form.method.id_for_label }}">{{ form.method.label }}</label>
         <div class="col-sm-8">
             {% render_field form.method class+="form-control" %}
diff --git a/RIGS/templates/risk_assessment_detail.html b/RIGS/templates/risk_assessment_detail.html
index 58397e75..c622e7d3 100644
--- a/RIGS/templates/risk_assessment_detail.html
+++ b/RIGS/templates/risk_assessment_detail.html
@@ -142,7 +142,7 @@
     </div>
     <div class="col-12 text-right">
         <a href="{% url 'ra_edit' object.pk %}" class="btn btn-warning my-3"><span class="fas fa-edit"></span> <span
-            class="hidden-xs">Edit</span></a>
+            class="d-none d-sm-inline">Edit</span></a>
         <a href="{% url 'event_detail' object.event.pk %}" class="btn btn-primary"><span class="fas fa-eye"></span> View Event</a>
         {{ object.review_string|safe }}
         {% include 'partials/last_edited.html' with target="riskassessment_history" %}
diff --git a/RIGS/templates/risk_assessment_form.html b/RIGS/templates/risk_assessment_form.html
index 8a807ac4..d7f163b1 100644
--- a/RIGS/templates/risk_assessment_form.html
+++ b/RIGS/templates/risk_assessment_form.html
@@ -84,7 +84,7 @@
                         <div class="card-body">
                             {% include 'partials/yes_no_radio.html' with formitem=form.big_power %}
                             <label for="{{ form.power_mic.id_for_label }}"
-                                class="col-sm-8 control-label">{{ form.power_mic.help_text }}</label>
+                                class="col-sm-8 col-form-label">{{ form.power_mic.help_text }}</label>
                             <div class="col-sm-8">
                                 <select id="{{ form.power_mic.id_for_label }}" name="{{ form.power_mic.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
                                     {% if object.power_mic %}
diff --git a/assets/templates/asset_audit.html b/assets/templates/asset_audit.html
index eccb5410..b4d6f293 100644
--- a/assets/templates/asset_audit.html
+++ b/assets/templates/asset_audit.html
@@ -23,7 +23,7 @@
   }
   checkIfCableHidden();
 </script>
-<form class="form-horizontal" method="POST" id="asset_audit_form" action="{{ form.action|default:request.path }}">
+<form class="" method="POST" id="asset_audit_form" action="{{ form.action|default:request.path }}">
   {% include 'form_errors.html' %}
   {% csrf_token %}
   <input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
diff --git a/assets/templates/asset_audit_list.html b/assets/templates/asset_audit_list.html
index d077358d..25ffd853 100644
--- a/assets/templates/asset_audit_list.html
+++ b/assets/templates/asset_audit_list.html
@@ -50,7 +50,7 @@
 </div>
 
 <h3>Audit Asset:</h3>
-<form id="asset-search-form" class="form-horizontal mb-3" method="POST">
+<form id="asset-search-form" class=" mb-3" method="POST">
   <div class="input-group input-group-lg" style="width=auto;">
     {% render_field form.q|add_class:'form-control' placeholder='Enter Asset ID' autofocus="true" %}
     <div class="input-group-append">
diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html
index bae74452..240fb1a1 100644
--- a/templates/registration/password_change_form.html
+++ b/templates/registration/password_change_form.html
@@ -18,10 +18,10 @@
 	<p>Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly.</p>
 
 	<div class="col-sm-8 col-sm-offset-2">
-        <form action="" method="post" class="form-horizontal" role="form">{% csrf_token %}
+        <form action="" method="post" class="" role="form">{% csrf_token %}
             	{% for field in form %}
             	<div class="form-group">
-            		<label for="{{ field.id_for_label }}" class="control-label col-sm-4">{{ field.label }}</label>
+            		<label for="{{ field.id_for_label }}" class="col-form-label col-sm-4">{{ field.label }}</label>
             		<div class="controls col-sm-8">
             			{% render_field field class+="form-control" placeholder=field.label %}
             		</div>
diff --git a/templates/registration/password_reset_confirm.html b/templates/registration/password_reset_confirm.html
index 16b43cb0..8b8a8112 100644
--- a/templates/registration/password_reset_confirm.html
+++ b/templates/registration/password_reset_confirm.html
@@ -22,18 +22,18 @@
 	<p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
 	
 	<div class="col-sm-8 col-sm-offset-2 well">
-		<form action="" method="post" role="form" class="form-horizontal">{% csrf_token %}
+		<form action="" method="post" role="form" class="">{% csrf_token %}
 			{% if form.errors %}
 				{% include 'form_errors.html' %}
 			{% endif %}
 			<div class="form-group">
-				<label for="{{form.new_password1.id_for_label}}" class="col-sm-4 control-label">{{form.new_password1.label}}</label>
+				<label for="{{form.new_password1.id_for_label}}" class="col-sm-4 col-form-label">{{form.new_password1.label}}</label>
 				<div class="col-sm-8">
 					{% render_field form.new_password1 class+="form-control" %}
 				</div>
 			</div>
 			<div class="form-group">
-				<label for="{{form.new_password2.id_for_label}}" class="col-sm-4 control-label">{{form.new_password2.label}}</label>
+				<label for="{{form.new_password2.id_for_label}}" class="col-sm-4 col-form-label">{{form.new_password2.label}}</label>
 				<div class="col-sm-8">
 					{% render_field form.new_password2 class+="form-control" %}
 				</div>
diff --git a/templates/registration/password_reset_form.html b/templates/registration/password_reset_form.html
index 6fb3fb8a..5e71546d 100644
--- a/templates/registration/password_reset_form.html
+++ b/templates/registration/password_reset_form.html
@@ -11,12 +11,12 @@
 	<p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one." %}</p>
 	
 	<div class="col-sm-8 col-sm-offset-2 well">
-		<form action="" method="POST" role="form" class="form-horizontal">{% csrf_token %}
+		<form action="" method="POST" role="form" class="">{% csrf_token %}
 			{% if form.errors %}
 				{% include 'form_errors.html' %}
 			{% endif %}
 			<div class="form-group">
-				<label for="{{form.email.id_for_label}}" class="col-sm-2 control-label">{{form.email.label}}</label>
+				<label for="{{form.email.id_for_label}}" class="col-sm-2 col-form-label">{{form.email.label}}</label>
 				<div class="col-sm-10">
 					{% render_field form.email type="email" class+="form-control" %}
 				</div>
diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html
index 5022a161..3e0ce894 100644
--- a/templates/registration/registration_form.html
+++ b/templates/registration/registration_form.html
@@ -13,10 +13,10 @@
     {% endif %}
 
     <div class="col-sm-8 col-sm-offset-2">
-        <form action="" method="post" class="form-horizontal" role="form">{% csrf_token %}
+        <form action="" method="post" class="" role="form">{% csrf_token %}
             {% for field in form %}
             	<div class="form-group">
-            		<label for="{{ field.id_for_label }}" class="control-label col-sm-4">{{ field.label }}</label>
+            		<label for="{{ field.id_for_label }}" class="col-form-label col-sm-4">{{ field.label }}</label>
             		<div class="controls col-sm-8">
             			{% render_field field class+="form-control" placeholder=field.label %}
             		</div>
diff --git a/users/templates/profile_button.html b/users/templates/profile_button.html
deleted file mode 100644
index 7a0c7a21..00000000
--- a/users/templates/profile_button.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{# pass in variable "profile" to this template #}
-
-<button title="{{profile.name}}" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover focus' data-toggle="popover" data-content='
-<img src="{{profile.profile_picture}}" class="img-fluid rounded center-block" style="max-width:4em" />
-        <dl class="dl-vertical">
-			<dt>Email</dt>
-			<dd>{{profile.email}}</dd>
-
-			<dt>Phone</dt>
-			<dd>{{profile.phone}}</dd>
-		</dl>
-        '>{{profile.first_name}}</button>
\ No newline at end of file
diff --git a/users/templates/profile_form.html b/users/templates/profile_form.html
index 76b2f6cb..d94fcda1 100644
--- a/users/templates/profile_form.html
+++ b/users/templates/profile_form.html
@@ -19,7 +19,7 @@
 				    </div>
 
 				    <div class="form-group">
-					    <label for="{{form.email.id_for_label}}" class="control-label">{{form.email.label}}</label>
+					    <label for="{{form.email.id_for_label}}" class="col-form-label">{{form.email.label}}</label>
 					    {% render_field form.email type="email" class+="form-control" placeholder=form.email.label %}
 				    </div>
 
@@ -28,7 +28,7 @@
 				    </div>
 
 				    <div class="form-group">
-					    <label for="{{form.phone.id_for_label}}" class="control-label">{{form.phone.label}}</label>
+					    <label for="{{form.phone.id_for_label}}" class="col-form-label">{{form.phone.label}}</label>
 				        {% render_field form.phone type="tel" class+="form-control" placeholder=form.phone.label %}
 				    </div>