diff --git a/app/authenticators/jwt-resolved.js b/app/authenticators/jwt-resolved.js
index a6884ec..1417236 100644
--- a/app/authenticators/jwt-resolved.js
+++ b/app/authenticators/jwt-resolved.js
@@ -1,3 +1,4 @@
+// Note: this is here for user lockout authentication
 import Ember from 'ember';
 import JwtTokenAuthenticator from 'simple-auth-token/authenticators/jwt';
 
diff --git a/app/initializers/custom-session.js b/app/initializers/custom-session.js
index 08d48b8..011cd90 100644
--- a/app/initializers/custom-session.js
+++ b/app/initializers/custom-session.js
@@ -1,5 +1,3 @@
-import Ember from 'ember';
-
 export function initialize(container, application) {
   application.inject('session:custom', '_store', 'service:store');
 }
diff --git a/app/pods/protected/characteristics/show/controller.js b/app/pods/protected/characteristics/show/controller.js
index cc45d06..2ed7872 100644
--- a/app/pods/protected/characteristics/show/controller.js
+++ b/app/pods/protected/characteristics/show/controller.js
@@ -3,7 +3,7 @@ import Ember from 'ember';
 export default Ember.Controller.extend({
   actions: {
     delete: function() {
-      this.get('model').destroyRecord()
+      this.get('model').destroyRecord();
       this.transitionToRoute('protected.characteristics.index');
     },
   },
diff --git a/app/pods/protected/characteristics/show/measurements-table/component.js b/app/pods/protected/characteristics/show/measurements-table/component.js
index 00d5dd4..1ca9d17 100644
--- a/app/pods/protected/characteristics/show/measurements-table/component.js
+++ b/app/pods/protected/characteristics/show/measurements-table/component.js
@@ -5,17 +5,27 @@ export default Ember.Component.extend({
     return this.get('model.measurements.length') > 0;
   }.property('model.measurements'),
 
-  // TODO: this is way more complicated than it should be
-  measurementsTable: function() {
-    let measurements = this.get('model.measurements');
-    let table = [];
-    measurements.forEach((measurement) => {
-      let row = {};
-      row['measurement'] = measurement;
-      row['strain'] = this.store.peekRecord('strain', measurement.get('strain.id'));
-      table.push(row);
-    });
-    return table;
-  }.property(),
+  sortParams: ['characteristic.characteristicTypeName', 'characteristic.sortOrder', 'characteristic.characteristicName'],
+  sortAsc: true,
+  paramsChanged: false,
+  sortedMeasurements: Ember.computed.sort('model.measurements', 'sortParams'),
+
+  actions: {
+    changeSortParam: function(col) {
+      let sort = this.get('sortAsc') ? 'asc' : 'desc';
+      let sortCol = `${col}:${sort}`;
+      this.set('sortParams', [sortCol]);
+      this.set('paramsChanged', true);
+      this.toggleProperty('sortAsc');
+      return false;
+    },
+
+    resetSortParam: function() {
+      this.set('sortParams', ['characteristic.characteristicTypeName', 'characteristic.sortOrder', 'characteristic.characteristicName']);
+      this.set('paramsChanged', false);
+      this.set('sortAsc', true);
+      return false;
+    },
+  },
 
 });
diff --git a/app/pods/protected/characteristics/show/measurements-table/template.hbs b/app/pods/protected/characteristics/show/measurements-table/template.hbs
index 1813ed8..8ee1a86 100644
--- a/app/pods/protected/characteristics/show/measurements-table/template.hbs
+++ b/app/pods/protected/characteristics/show/measurements-table/template.hbs
@@ -1,14 +1,19 @@
 {{#if measurementsPresent}}
+{{#if paramsChanged}}
+  <button class="button-gray smaller" {{action 'resetSortParam'}}>
+    Reset sort
+  </button>
+{{/if}}
 <table class="flakes-table">
   <thead>
     <tr>
-      <th>Strain</th>
-      <th>Value</th>
-      <th>Notes</th>
+      <th {{action "changeSortParam" "strain.strainName"}} class="click">Strain</th>
+      <th {{action "changeSortParam" "value"}} class="click">Value</th>
+      <th {{action "changeSortParam" "notes"}} class="click">Notes</th>
     </tr>
   </thead>
   <tbody>
-    {{#each measurementsTable as |row|}}
+    {{#each sortedMeasurements as |row|}}
       <tr>
         <td>
           {{#link-to 'protected.strains.show' row.strain.id}}
@@ -16,10 +21,10 @@
           {{/link-to}}
         </td>
         <td>
-          {{row.measurement.value}}
+          {{row.value}}
         </td>
         <td>
-          {{row.measurement.notes}}
+          {{row.notes}}
         </td>
       </tr>
     {{/each}}
diff --git a/app/pods/protected/strains/show/measurements-table-row/component.js b/app/pods/protected/strains/show/measurements-table-row/component.js
index d17a831..9c151fb 100644
--- a/app/pods/protected/strains/show/measurements-table-row/component.js
+++ b/app/pods/protected/strains/show/measurements-table-row/component.js
@@ -36,6 +36,10 @@ export default Ember.Component.extend({
     },
 
     delete: function() {
+      let char = this.get('row.characteristic');
+      if (char.get('isNew')) {
+        char.destroyRecord();
+      }
       this.get('row').destroyRecord();
     }
 
diff --git a/app/pods/protected/strains/show/measurements-table-row/template.hbs b/app/pods/protected/strains/show/measurements-table-row/template.hbs
index 1c6cc07..a26fef4 100644
--- a/app/pods/protected/strains/show/measurements-table-row/template.hbs
+++ b/app/pods/protected/strains/show/measurements-table-row/template.hbs
@@ -1,4 +1,5 @@
 {{#if isEditing}}
+  <td></td>
   <td>
     {{
       select-2
@@ -28,6 +29,9 @@
     </td>
   {{/if}}
 {{else}}
+  <td>
+    {{{row.characteristic.characteristicTypeName}}}
+  </td>
   <td>
     {{#link-to 'protected.characteristics.show' row.characteristic.id}}
       {{{row.characteristic.characteristicName}}}
diff --git a/app/pods/protected/strains/show/measurements-table/component.js b/app/pods/protected/strains/show/measurements-table/component.js
index 8d8e31d..07d94c6 100644
--- a/app/pods/protected/strains/show/measurements-table/component.js
+++ b/app/pods/protected/strains/show/measurements-table/component.js
@@ -12,6 +12,8 @@ export default Ember.Component.extend({
   }.on('didInsertElement'),
 
   sortParams: ['characteristic.characteristicTypeName', 'characteristic.sortOrder', 'characteristic.characteristicName'],
+  sortAsc: true,
+  paramsChanged: false,
   sortedMeasurements: Ember.computed.sort('model.measurements', 'sortParams'),
 
   actions: {
@@ -24,6 +26,22 @@ export default Ember.Component.extend({
       });
       this.get('model.measurements').addObject(m);
     },
+
+    changeSortParam: function(col) {
+      let sort = this.get('sortAsc') ? 'asc' : 'desc';
+      let sortCol = `${col}:${sort}`;
+      this.set('sortParams', [sortCol]);
+      this.set('paramsChanged', true);
+      this.toggleProperty('sortAsc');
+      return false;
+    },
+
+    resetSortParam: function() {
+      this.set('sortParams', ['characteristic.characteristicTypeName', 'characteristic.sortOrder', 'characteristic.characteristicName']);
+      this.set('paramsChanged', false);
+      this.set('sortAsc', true);
+      return false;
+    },
   },
 
 });
diff --git a/app/pods/protected/strains/show/measurements-table/template.hbs b/app/pods/protected/strains/show/measurements-table/template.hbs
index 2f30a9e..a9a45dd 100644
--- a/app/pods/protected/strains/show/measurements-table/template.hbs
+++ b/app/pods/protected/strains/show/measurements-table/template.hbs
@@ -7,24 +7,32 @@
 {{/if}}
 
 {{#if measurementsPresent}}
+{{#if paramsChanged}}
+  <button class="button-gray smaller" {{action 'resetSortParam'}}>
+    Reset sort
+  </button>
+{{/if}}
 <table class="flakes-table">
   <colgroup>
     {{#if canEdit}}
-      <col span="1" style="width:40%">
+      <col span="1" style="width:10%">
+      <col span="1" style="width:30%">
       <col span="1" style="width:20%">
       <col span="1" style="width:20%">
       <col span="1" style="width:20%">
     {{else}}
-      <col span="1" style="width:40%">
+      <col span="1" style="width:10%">
+      <col span="1" style="width:30%">
       <col span="1" style="width:30%">
       <col span="1" style="width:30%">
     {{/if}}
   </colgroup>
   <thead>
     <tr>
-      <th>Characteristic</th>
-      <th>Value</th>
-      <th>Notes</th>
+      <th {{action "changeSortParam" "characteristic.characteristicTypeName"}} class="click">Type</th>
+      <th {{action "changeSortParam" "characteristic.characteristicName"}} class="click">Characteristic</th>
+      <th {{action "changeSortParam" "value"}} class="click">Value</th>
+      <th {{action "changeSortParam" "notes"}} class="click">Notes</th>
       {{#if canEdit}}
       <th>Edit</th>
       {{/if}}
diff --git a/app/pods/protected/users/edit/route.js b/app/pods/protected/users/edit/route.js
index e11116f..3a943b8 100644
--- a/app/pods/protected/users/edit/route.js
+++ b/app/pods/protected/users/edit/route.js
@@ -7,7 +7,7 @@ export default Ember.Route.extend({
     let user_id = transition.params['protected.users.edit'].user_id;
 
     this.get('session.currentUser').then((user) => {
-      if (user.get('id') !== user_id || user.get('isAdmin')) {
+      if (user.get('id') !== user_id && !user.get('isAdmin')) {
         this.transitionTo('protected.users.index');
       }
     });
diff --git a/app/pods/protected/users/show/route.js b/app/pods/protected/users/show/route.js
index e812128..33eeba7 100644
--- a/app/pods/protected/users/show/route.js
+++ b/app/pods/protected/users/show/route.js
@@ -9,7 +9,7 @@ export default Ember.Route.extend({
       if (!currentUser.get('isAdmin') && currentUser.get('id') !== user_id) {
         this.transitionTo('protected.users.index');
       }
-    })
+    });
   },
 
   model: function(params) {
diff --git a/app/pods/protected/users/user-form/component.js b/app/pods/protected/users/user-form/component.js
index d5ce463..0a706f3 100644
--- a/app/pods/protected/users/user-form/component.js
+++ b/app/pods/protected/users/user-form/component.js
@@ -1,10 +1,6 @@
 import Ember from 'ember';
 
 export default Ember.Component.extend({
-  isAdmin: Ember.computed('currentUser', function() {
-    return this.get('currentUser.role') == 'A';
-  }),
-
   roles: Ember.String.w('A R W'),
 
   actions: {
diff --git a/app/pods/protected/users/user-form/template.hbs b/app/pods/protected/users/user-form/template.hbs
index a872aae..c6209a9 100644
--- a/app/pods/protected/users/user-form/template.hbs
+++ b/app/pods/protected/users/user-form/template.hbs
@@ -16,7 +16,7 @@
     <div data-row-span="1">
       <div data-field-span="1">
         <label>Role</label>
-        {{#if isAdmin}}
+        {{#if session.currentUser.isAdmin}}
           <select onchange={{action (mut user.role) value="target.value"}}>
             {{#each roles as |roleChoice|}}
               <option value={{roleChoice}} selected={{equal user.role roleChoice}}>{{roleChoice}}</option>
diff --git a/app/styles/app.css b/app/styles/app.css
index 4116537..5aded39 100644
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -18,7 +18,7 @@ input[type="text"] {
   width: 100%;
 }
 
-.flakes-table thead tr th span {
+.click {
   cursor: pointer;
 }
 
diff --git a/config/environment.js b/config/environment.js
index 38b6e25..09c5283 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -28,8 +28,8 @@ module.exports = function(environment) {
       authorizationPrefix: 'Bearer ',
       authorizationHeaderName: 'Authorization',
       refreshAccessTokens: true,
-      timeFactor: 1000,
-      refreshLeeway: 300,
+      timeFactor: 1000, // 1000 ms/s; JWT returned in unix time seconds
+      refreshLeeway: 1800, // (60 s/min) * (30 min) = 1800 s
     },
     contentSecurityPolicy: {
       'default-src': "'none'",