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..3f3c469 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"}}>Type</th>
+      <th {{action "changeSortParam" "characteristic.characteristicName"}}>Characteristic</th>
+      <th {{action "changeSortParam" "value"}}>Value</th>
+      <th {{action "changeSortParam" "notes"}}>Notes</th>
       {{#if canEdit}}
       <th>Edit</th>
       {{/if}}