diff --git a/RIGS/templates/event_detail.html b/RIGS/templates/event_detail.html
index d9536ede..1eb13133 100644
--- a/RIGS/templates/event_detail.html
+++ b/RIGS/templates/event_detail.html
@@ -20,7 +20,7 @@
     {% endif %}
     {% if object.is_rig and perms.RIGS.view_event %}
         {# only need contact details for a rig #}
-        <div class="col-sm">
+        <div class="col-md-6">
             {% if event.person %}
             <div class="card card-default mb-3">
                 <div class="card-header">Contact Details</div>
@@ -67,18 +67,18 @@
             {% endif %}
         </div>
     {% endif %}
-    <div class="col-sm">
+    <div class="col-md-6">
         {% include 'partials/event_details.html' %}
     </div>
     {% if event.is_rig and not event.dry_hire %}
-    <div class="col-sm-12 py-3">
+    <div class="col-md-4 py-3">
         {% include 'partials/hs_details.html' %}
-    <div>
+    </div>
     {% endif %}
     {% if event.is_rig and event.internal and perms.RIGS.view_event %}
-    <div class="col-sm-12 py-3">
+    <div class="col-md-8 py-3">
         {% include 'partials/auth_details.html' %}
-    <div>
+    </div>
     {% endif %}
     {% if not request.is_ajax and perms.RIGS.view_event %}
     <div class="col-sm-12 text-right">
diff --git a/RIGS/templates/partials/auth_details.html b/RIGS/templates/partials/auth_details.html
index fbc07d11..b788ba48 100644
--- a/RIGS/templates/partials/auth_details.html
+++ b/RIGS/templates/partials/auth_details.html
@@ -8,8 +8,8 @@
     {% endif %}
     ">
     <div class="card-header">Client Authorisation</div>
-    <div class="card-body">
-        <dl class="col-sm-6">
+    <div class="card-body row">
+        <dl class="col-md-6">
             <dt>Authorisation Request</dt>
             <dd>{{ object.auth_request_to|yesno:"Yes,No" }}</dd>
 
@@ -22,8 +22,8 @@
             <dt>To</dt>
             <dd>{{ object.auth_request_to }}</dd>
         </dl>
-        <dd class="visible-xs">&nbsp;</dd>
-        <dl class="col-sm-6">
+        <dd class="d-block d-sm-none">&nbsp;</dd>
+        <dl class="col-md-6">
             <dt>Authorised</dt>
             <dd>{{ object.authorised|yesno:"Yes,No" }}</dd>
 
diff --git a/users/templates/profile_form.html b/users/templates/profile_form.html
index b8426875..e92aa573 100644
--- a/users/templates/profile_form.html
+++ b/users/templates/profile_form.html
@@ -5,67 +5,48 @@
 
 {% block content %}
 <div class="row">
-	<div class="col-sm-10 col-sm-offset-1">
+	<div class="col">
 		{% include 'form_errors.html' %}
-		<h3>Update Profile</h3>
-		<div class="col-sm-6">
-			<form action="{{form.action|default:request.path}}" method="post" class="form-horizontal">{% csrf_token %}
-				<div class="form-group">
-					<label for="{{form.first_name.id_for_label}}" class="col-sm-4 control-label">{{form.first_name.label}}</label>
+		<h3>Update Profile {{object.name}}</h3>
+        <div class="row">
+		    <div class="col-md-6">
+			    <form action="{{form.action|default:request.path}}" method="post">{% csrf_token %}
+				    <div class="form-group">
+					    {% include 'partials/form_field.html' with field=form.first_name %}
+				    </div>
+                    <div class="form-group">
+					    {% include 'partials/form_field.html' with field=form.last_name %}
+				    </div>
 
-					<div class="col-sm-8">
-						{% render_field form.first_name class+="form-control" placeholder=form.first_name.label %}
-					</div>
-				</div>
+				    <div class="form-group">
+					    <label for="{{form.email.id_for_label}}" class="control-label">{{form.email.label}}</label>
+					    {% render_field form.email type="email" class+="form-control" placeholder=form.email.label %}
+				    </div>
 
-				<div class="form-group">
-					<label for="{{form.last_name.id_for_label}}" class="col-sm-4 control-label">{{form.last_name.label}}</label>
+                    <div class="form-group">
+					    {% include 'partials/form_field.html' with field=form.initials %}
+				    </div>
 
-					<div class="col-sm-8">
-						{% render_field form.last_name class+="form-control" placeholder=form.last_name.label %}
-					</div>
-				</div>
+				    <div class="form-group">
+					    <label for="{{form.phone.id_for_label}}" class="control-label">{{form.phone.label}}</label>
+				        {% render_field form.phone type="tel" class+="form-control" placeholder=form.phone.label %}
+				    </div>
 
-				<div class="form-group">
-					<label for="{{form.email.id_for_label}}" class="col-sm-4 control-label">{{form.email.label}}</label>
+				    <div class="form-group">
+	                    <input class="btn btn-primary float-right" type="submit"/>
+	                </div>
+			    </form>
+		    </div>
 
-					<div class="col-sm-8">
-						{% render_field form.email type="email" class+="form-control" placeholder=form.email.label %}
-					</div>
-				</div>
-
-				<div class="form-group">
-					<label for="{{form.initials.id_for_label}}" class="col-sm-4 control-label">{{form.initials.label}}</label>
-
-					<div class="col-sm-8">
-						{% render_field form.initials class+="form-control" placeholder=form.initials.label %}
-					</div>
-				</div>
-
-				<div class="form-group">
-					<label for="{{form.phone.id_for_label}}" class="col-sm-4 control-label">{{form.phone.label}}</label>
-
-					<div class="col-sm-8">
-						{% render_field form.phone type="tel" class+="form-control" placeholder=form.phone.label %}
-					</div>
-				</div>
-
-				<div class="form-group">
-	                <input class="btn btn-primary pull-right" type="submit"/>
-	            </div>
-			</form>
-		</div>
-
-		<div class="col-sm-3 col-sm-offset-2">
-			<div class="center-block">
-				<a href="https://gravatar.com/">
-					<img src="{{object.profile_picture}}" class="img-responsive img-rounded" />
-					<div class="text-center">
-						Images hosted by Gravatar
-					</div>
-				</a>
-			</div>
-		</div>
+		    <div class="col">
+			    <a href="https://gravatar.com/">
+				    <img src="{{object.profile_picture}}" class="img-responsive img-rounded" />
+				    <div class="text-center">
+					    Images hosted by Gravatar
+				    </div>
+			    </a>
+		    </div>
+        </div>
 	</div>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}