diff --git a/netbox/templates/users/api_tokens.html b/netbox/templates/users/api_tokens.html
index b775af73e..690a966b0 100644
--- a/netbox/templates/users/api_tokens.html
+++ b/netbox/templates/users/api_tokens.html
@@ -1,4 +1,4 @@
-{% extends 'users/_user.html' %}
+{% extends 'users/base.html' %}
 {% load helpers %}
 
 {% block title %}API Tokens{% endblock %}
@@ -19,7 +19,7 @@
                             {% endif %}
                         </div>
                         <i class="fa fa-key"></i>
-                        <span id="token_{{ token.pk }}">{{ token.key }}</span>
+                        <samp><span id="token_{{ token.pk }}">{{ token.key }}</span></samp>
                         {% if token.is_expired %}
                             <span class="label label-danger">Expired</span>
                         {% endif %}
@@ -27,24 +27,24 @@
                     <div class="panel-body">
                         <div class="row">
                             <div class="col-md-4">
-                                <span title="{{ token.created }}">{{ token.created|date }}</span><br />
-                                <small class="text-muted">Created</small>
+                                <small class="text-muted">Created</small><br />
+                                <span title="{{ token.created }}">{{ token.created|date }}</span>
                             </div>
                             <div class="col-md-4">
+                                <small class="text-muted">Expires</small><br />
                                 {% if token.expires %}
-                                    <span title="{{ token.expires }}">{{ token.expires|date }}</span><br />
+                                    <span title="{{ token.expires }}">{{ token.expires|date }}</span>
                                 {% else %}
-                                    <span>Never</span><br />
+                                    <span>Never</span>
                                 {% endif %}
-                                <small class="text-muted">Expires</small>
                             </div>
                             <div class="col-md-4">
+                                <small class="text-muted">Create/edit/delete operations</small><br />
                                 {% if token.write_enabled %}
                                     <span class="label label-success">Enabled</span>
                                 {% else %}
                                     <span class="label label-danger">Disabled</span>
-                                {% endif %}<br />
-                                <small class="text-muted">Create/edit/delete operations</small>
+                                {% endif %}
                             </div>
                         </div>
                         {% if token.description %}
diff --git a/netbox/templates/users/_user.html b/netbox/templates/users/base.html
similarity index 89%
rename from netbox/templates/users/_user.html
rename to netbox/templates/users/base.html
index d03d44fa6..15d81ae0f 100644
--- a/netbox/templates/users/_user.html
+++ b/netbox/templates/users/base.html
@@ -2,12 +2,12 @@
 
 {% block content %}
 <div class="row">
-    <div class="col-sm-12 col-md-8 col-md-offset-2">
+    <div class="col-sm-12 col-md-10 col-md-offset-1">
         <h1>{% block title %}{% endblock %}</h1>
     </div>
 </div>
 <div class="row">
-    <div class="col-sm-3 col-md-2 col-md-offset-2">
+    <div class="col-sm-3 col-md-2 col-md-offset-1">
         <ul class="nav nav-pills nav-stacked">
             <li{% ifequal active_tab "profile" %} class="active"{% endifequal %}>
                 <a href="{% url 'user:profile' %}">Profile</a>
@@ -28,7 +28,7 @@
             </li>
         </ul>
     </div>
-	<div class="col-sm-9 col-md-6">
+	<div class="col-sm-9 col-md-8">
         {% block usercontent %}{% endblock %}
 	</div>
 </div>
diff --git a/netbox/templates/users/change_password.html b/netbox/templates/users/change_password.html
index 700bf682d..20c6d048b 100644
--- a/netbox/templates/users/change_password.html
+++ b/netbox/templates/users/change_password.html
@@ -1,10 +1,10 @@
-{% extends 'users/_user.html' %}
+{% extends 'users/base.html' %}
 {% load form_helpers %}
 
 {% block title %}Change Password{% endblock %}
 
 {% block usercontent %}
-    <form action="." method="post" class="form form-horizontal">
+    <form action="." method="post" class="form form-horizontal col-md-10 col-md-offset-1">
         {% csrf_token %}
         {% if form.non_field_errors %}
             <div class="panel panel-danger">
diff --git a/netbox/templates/users/preferences.html b/netbox/templates/users/preferences.html
index 0884c7f17..8b3c4bcc4 100644
--- a/netbox/templates/users/preferences.html
+++ b/netbox/templates/users/preferences.html
@@ -1,4 +1,4 @@
-{% extends 'users/_user.html' %}
+{% extends 'users/base.html' %}
 {% load helpers %}
 
 {% block title %}User Preferences{% endblock %}
@@ -19,8 +19,8 @@
                     {% for key, value in preferences.items %}
                         <tr>
                             <td class="min-width"><input type="checkbox" name="pk" value="{{ key }}"></td>
-                            <td>{{ key }}</td>
-                            <td>{{ value }}</td>
+                            <td><samp>{{ key }}</samp></td>
+                            <td><samp>{{ value }}</samp></td>
                         </tr>
                     {% endfor %}
                 </tbody>
diff --git a/netbox/templates/users/profile.html b/netbox/templates/users/profile.html
index 7e7697991..35a94ac6f 100644
--- a/netbox/templates/users/profile.html
+++ b/netbox/templates/users/profile.html
@@ -1,4 +1,4 @@
-{% extends 'users/_user.html' %}
+{% extends 'users/base.html' %}
 {% load helpers %}
 
 {% block title %}User Profile{% endblock %}
diff --git a/netbox/templates/users/userkey.html b/netbox/templates/users/userkey.html
index e98ec4030..2861d187e 100644
--- a/netbox/templates/users/userkey.html
+++ b/netbox/templates/users/userkey.html
@@ -1,4 +1,4 @@
-{% extends 'users/_user.html' %}
+{% extends 'users/base.html' %}
 
 {% block title %}User Key{% endblock %}
 
diff --git a/netbox/templates/users/userkey_edit.html b/netbox/templates/users/userkey_edit.html
index 40c3715b0..0715f9038 100644
--- a/netbox/templates/users/userkey_edit.html
+++ b/netbox/templates/users/userkey_edit.html
@@ -1,4 +1,4 @@
-{% extends 'users/_user.html' %}
+{% extends 'users/base.html' %}
 {% load static %}
 {% load form_helpers %}