diff --git a/app/pods/protected/characteristics/index/editable-row/component.js b/app/pods/protected/characteristics/index/editable-row/component.js
deleted file mode 100644
index 384d254..0000000
--- a/app/pods/protected/characteristics/index/editable-row/component.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Component.extend({
-  tagName: 'tr',
-
-  actions: {
-    edit: function() {
-      this.set('characteristicName', this.get('row.characteristicName'));
-      this.set('characteristicTypeName', this.get('row.characteristicTypeName'));
-      this.set('sortOrder', this.get('row.sortOrder'));
-      this.toggleProperty('isEditing');
-    },
-
-    save: function() {
-      if (this.get('characteristicName') !== this.get('row.characteristicName') ||
-          this.get('characteristicTypeName') !== this.get('row.characteristicTypeName') ||
-          this.get('sortOrder') !== this.get('row.sortOrder')) {
-        this.set('row.characteristicName', this.get('characteristicName'));
-        this.set('row.characteristicTypeName', this.get('characteristicTypeName'));
-        this.set('row.sortOrder', this.get('sortOrder'));
-        this.get('row').save();
-      }
-      this.toggleProperty('isEditing');
-    },
-
-  }
-
-});
diff --git a/app/pods/protected/characteristics/index/editable-row/template.hbs b/app/pods/protected/characteristics/index/editable-row/template.hbs
deleted file mode 100644
index 8230297..0000000
--- a/app/pods/protected/characteristics/index/editable-row/template.hbs
+++ /dev/null
@@ -1,15 +0,0 @@
-{{#if isEditing}}
-  <td>{{input value=characteristicName}}</td>
-  <td>{{input value=characteristicTypeName}}</td>
-  <td>{{input value=sortOrder}}</td>
-  <td {{action 'save'}}>Save</td>
-{{else}}
-  <td>{{row.characteristicName}}</td>
-  <td>{{row.characteristicTypeName}}</td>
-  <td>{{row.sortOrder}}</td>
-  {{#if row.canEdit}}
-    <td {{action 'edit'}}>Edit</td>
-  {{else}}
-    <td></td>
-  {{/if}}
-{{/if}}
diff --git a/app/pods/protected/characteristics/loading/template.hbs b/app/pods/protected/characteristics/loading/template.hbs
new file mode 100644
index 0000000..e5a3e05
--- /dev/null
+++ b/app/pods/protected/characteristics/loading/template.hbs
@@ -0,0 +1 @@
+{{loading-panel}}
diff --git a/app/pods/protected/characteristics/show/measurements-table/component.js b/app/pods/protected/characteristics/show/measurements-table/component.js
new file mode 100644
index 0000000..03ff60b
--- /dev/null
+++ b/app/pods/protected/characteristics/show/measurements-table/component.js
@@ -0,0 +1,16 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+  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(),
+
+});
diff --git a/app/pods/protected/characteristics/show/measurements-table/template.hbs b/app/pods/protected/characteristics/show/measurements-table/template.hbs
new file mode 100644
index 0000000..2e838ec
--- /dev/null
+++ b/app/pods/protected/characteristics/show/measurements-table/template.hbs
@@ -0,0 +1,26 @@
+<table class="flakes-table">
+  <thead>
+    <tr>
+      <th>Strain</th>
+      <th>Value</th>
+      <th>Notes</th>
+    </tr>
+  </thead>
+  <tbody>
+    {{#each measurementsTable as |row|}}
+      <tr>
+        <td>
+          {{#link-to 'protected.strains.show' row.strain.id}}
+            {{{row.strain.strainNameMU}}}
+          {{/link-to}}
+        </td>
+        <td>
+          {{row.measurement.value}}
+        </td>
+        <td>
+          {{row.measurement.notes}}
+        </td>
+      </tr>
+    {{/each}}
+  </tbody>
+</table>
diff --git a/app/pods/protected/characteristics/show/template.hbs b/app/pods/protected/characteristics/show/template.hbs
index faf6596..1097ace 100644
--- a/app/pods/protected/characteristics/show/template.hbs
+++ b/app/pods/protected/characteristics/show/template.hbs
@@ -18,17 +18,9 @@
       {{! ROW 2 }}
       <div class="grid-2 gutter-20">
         <dl class="span-2">
-          <dt>Strains</dt>
+          <dt>Measurements</dt>
           <dd>
-            <ul>
-              {{#each model.strains as |strain index|}}
-                <li>
-                  {{#link-to 'protected.strains.show' strain.id}}
-                    {{{strain.strainNameMU}}}
-                  {{/link-to}}
-                </li>
-              {{/each}}
-            </ul>
+            {{protected/characteristics/show/measurements-table model=model}}
           </dd>
         </dl>
       </div>
diff --git a/app/pods/protected/compare/loading/template.hbs b/app/pods/protected/compare/loading/template.hbs
new file mode 100644
index 0000000..e5a3e05
--- /dev/null
+++ b/app/pods/protected/compare/loading/template.hbs
@@ -0,0 +1 @@
+{{loading-panel}}
diff --git a/app/pods/protected/species/loading/template.hbs b/app/pods/protected/species/loading/template.hbs
new file mode 100644
index 0000000..e5a3e05
--- /dev/null
+++ b/app/pods/protected/species/loading/template.hbs
@@ -0,0 +1 @@
+{{loading-panel}}
diff --git a/app/pods/protected/strains/loading/template.hbs b/app/pods/protected/strains/loading/template.hbs
new file mode 100644
index 0000000..e5a3e05
--- /dev/null
+++ b/app/pods/protected/strains/loading/template.hbs
@@ -0,0 +1 @@
+{{loading-panel}}