diff --git a/app/labs/completed/labs-completed-list-item/component.js b/app/labs/completed/labs-completed-list-item/component.js
new file mode 100644
index 0000000000..1def2a49a4
--- /dev/null
+++ b/app/labs/completed/labs-completed-list-item/component.js
@@ -0,0 +1,6 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+  tagName: 'tr',
+  classNames: ['completed-labs-row']
+});
diff --git a/app/labs/completed/labs-completed-list-item/template.hbs b/app/labs/completed/labs-completed-list-item/template.hbs
new file mode 100644
index 0000000000..525e461794
--- /dev/null
+++ b/app/labs/completed/labs-completed-list-item/template.hbs
@@ -0,0 +1,7 @@
+<td class="requested-date">{{date-format lab.requestedDate}}</td>
+<td class="lab-date">{{date-format lab.labDate}}</td>
+<td class="patient">{{lab.patient.displayName}}</td>
+<td class="requested-by">{{lab.requestedBy}}</td>
+<td class="lab-type">{{lab.labType.name}}</td>
+<td class="result">{{lab.result}}</td>
+<td class="notes">{{lab.notes}}</td>
diff --git a/app/labs/completed/template.hbs b/app/labs/completed/template.hbs
index fe59777530..8c65fce917 100644
--- a/app/labs/completed/template.hbs
+++ b/app/labs/completed/template.hbs
@@ -5,19 +5,13 @@
         <th>{{t 'labels.date_requested'}}</th>
         <th>{{t 'labels.date_completed'}}</th>
         <th>{{t 'labels.patient'}}</th>
+        <th>{{t 'labels.requested_by'}}</th>
         <th>{{t 'labs.labels.lab_type'}}</th>
         <th>{{t 'labels.results'}}</th>
         <th>{{t 'labels.notes'}}</th>
       </tr>
       {{#each model as |lab|}}
-        <tr>
-          <td>{{date-format lab.requestedDate}}</td>
-          <td>{{date-format lab.labDate}}</td>
-          <td>{{lab.patient.displayName}}</td>
-          <td>{{lab.labType.name}}</td>
-          <td>{{lab.result}}</td>
-          <td>{{lab.notes}}</td>
-        </tr>
+        {{labs/completed/labs-completed-list-item lab=lab}}
       {{/each}}
     </table>
   {{else}}
diff --git a/app/labs/edit/template.hbs b/app/labs/edit/template.hbs
index 9d5236acfe..0de4e46f6f 100644
--- a/app/labs/edit/template.hbs
+++ b/app/labs/edit/template.hbs
@@ -33,6 +33,10 @@
           <label>{{t 'labs.labels.lab_type'}}</label>
           <p class="form-control-static">{{model.labType.name}}</p>
         </div>
+        <div class="form-group col-xs-9">
+          <label>{{t 'labels.requested_by'}}</label>
+          <p class="form-control-static">{{model.requestedBy}}</p>
+        </div>
       </div>
     {{/if}}
     {{#if canComplete}}
diff --git a/app/labs/index/labs-edit-button/component.js b/app/labs/index/labs-edit-button/component.js
new file mode 100644
index 0000000000..f4f9589c8a
--- /dev/null
+++ b/app/labs/index/labs-edit-button/component.js
@@ -0,0 +1,6 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+  tagName: 'button',
+  classNames: ['btn', 'btn-default', 'neutral']
+});
diff --git a/app/labs/index/labs-edit-button/template.hbs b/app/labs/index/labs-edit-button/template.hbs
new file mode 100644
index 0000000000..5be97d62f0
--- /dev/null
+++ b/app/labs/index/labs-edit-button/template.hbs
@@ -0,0 +1 @@
+{{#link-to 'labs.edit' lab}}{{t 'labels.edit'}}{{/link-to}}
diff --git a/app/labs/index/labs-list-item/component.js b/app/labs/index/labs-list-item/component.js
new file mode 100644
index 0000000000..85b7b4773b
--- /dev/null
+++ b/app/labs/index/labs-list-item/component.js
@@ -0,0 +1,10 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+  tagName: 'tr',
+  classNames: ['clickable', 'labs-row'],
+
+  click() {
+    this.sendAction('action', this.lab);
+  }
+});
diff --git a/app/labs/index/labs-list-item/template.hbs b/app/labs/index/labs-list-item/template.hbs
new file mode 100644
index 0000000000..cb5ab5642a
--- /dev/null
+++ b/app/labs/index/labs-list-item/template.hbs
@@ -0,0 +1,12 @@
+<td class="requested-date">{{date-format lab.requestedDate}}</td>
+<td class="patient">{{lab.patient.displayName}}</td>
+<td class="requested-by">{{lab.requestedBy}}</td>
+<td class="lab-type">{{lab.labType.name}}</td>
+<td class="notes">{{lab.notes}}</td>
+ {{#if showActions}}
+  <td>
+    {{#if canEdit}}
+      {{labs/index/labs-edit-button lab=lab}}
+    {{/if}}
+  </td>
+{{/if}}
diff --git a/app/labs/index/template.hbs b/app/labs/index/template.hbs
index 48ca962590..919fd8decf 100644
--- a/app/labs/index/template.hbs
+++ b/app/labs/index/template.hbs
@@ -4,6 +4,7 @@
       <tr class="table-header">
         <th>{{t 'labels.date_requested'}}</th>
         <th>{{t 'labels.patient'}}</th>
+        <th>{{t 'labels.requested_by'}}</th>
         <th>{{t 'labs.labels.lab_type'}}</th>
         <th>{{t 'labels.notes'}}</th>
         {{#if showActions}}
@@ -11,19 +12,11 @@
         {{/if}}
       </tr>
       {{#each model as |lab|}}
-        <tr {{action 'editItem' lab}} class="clickable">
-          <td>{{date-format lab.requestedDate}}</td>
-          <td>{{lab.patient.displayName}}</td>
-          <td>{{lab.labType.name}}</td>
-          <td>{{lab.notes}}</td>
-           {{#if showActions}}
-            <td>
-              {{#if canEdit}}
-                <button class="btn btn-default neutral" {{action 'editItem' lab  bubbles=false }}>{{t 'labels.edit'}}</button>
-              {{/if}}
-            </td>
-          {{/if}}
-        </tr>
+        {{labs/index/labs-list-item
+          lab=lab
+          action='editItem'
+          showActions=showActions
+          canEdit=canEdit}}
       {{/each}}
     </table>
   {{else}}
diff --git a/app/styles/app.scss b/app/styles/app.scss
index e08a4a9aa8..d4c2f80dbc 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -18,6 +18,7 @@
 @import 'components/tab_content';
 @import 'components/patient_summary';
 @import 'components/patient_history';
+@import 'components/labs';
 
 // NOTE: do not place styles in this file
 // If you have styles to add, put them in
diff --git a/app/styles/components/_labs.scss b/app/styles/components/_labs.scss
new file mode 100644
index 0000000000..095fcdb041
--- /dev/null
+++ b/app/styles/components/_labs.scss
@@ -0,0 +1,2 @@
+.labs-row .notes { max-width: 300px; }
+.completed-labs-row .notes { max-width: 300px; }