diff --git a/app/admin/custom-forms/edit/template.hbs b/app/admin/custom-forms/edit/template.hbs
index 82506bb8b3..9c219024e6 100644
--- a/app/admin/custom-forms/edit/template.hbs
+++ b/app/admin/custom-forms/edit/template.hbs
@@ -10,7 +10,7 @@
     </div>
     <h4>
       {{t 'admin.customForms.titles.fields'}}
-      <button class="btn btn-default align-right" {{action 'addField'}}>
+      <button class="btn btn-primary align-right" {{action 'addField'}}>
         {{t 'admin.customForms.buttons.addField'}}
       </button>
     </h4>
@@ -56,7 +56,7 @@
     {{t 'admin.customForms.buttons.preview'}}
   </button>
   {{#if preview}}
-    <div class="panel panel-primary form-preview">
+    <div class="panel panel-default form-preview">
       <div class="panel-heading">
         <h3 class="panel-title">{{formName}}</h3>
       </div>
diff --git a/app/admin/loaddb/template.hbs b/app/admin/loaddb/template.hbs
index e3b8badc63..b0b1da62d0 100644
--- a/app/admin/loaddb/template.hbs
+++ b/app/admin/loaddb/template.hbs
@@ -2,7 +2,7 @@
   <div class="panel-body">
     {{#em-form model=model submitButton=false }}
       {{file-upload label=(t 'labels.fileToLoad') property="importFileName" selectedFile=importFile }}
-      <button class="btn btn-default" {{action 'loadFile'}}>{{t 'buttons.loadFile'}}</button>
+      <button class="btn btn-primary" {{action 'loadFile'}}>{{t 'buttons.loadFile'}}</button>
     {{/em-form}}
     {{#if syncResults}}
       <h4>{{t 'labels.fileLoadSuccessful'}}</h4>
diff --git a/app/admin/lookup/template.hbs b/app/admin/lookup/template.hbs
index f12a53d346..387b8c9b9e 100644
--- a/app/admin/lookup/template.hbs
+++ b/app/admin/lookup/template.hbs
@@ -48,14 +48,14 @@
       <div class="row">
         <div class="col-sm-4">
           {{em-checkbox label=(t 'labels.userCanAddNewValue') property="userCanAdd"}}
-          <button class="btn btn-default" {{action 'updateList'}}>{{t 'buttons.update'}}</button>
+          <button class="btn btn-primary" {{action 'updateList'}}>{{t 'buttons.update'}}</button>
         </div>
         {{#if showOrganizeByType}}
           {{em-checkbox label="Organize Pricing By Type" property="organizeByType" class="col-sm-4"}}
         {{/if}}
         <div class="col-sm-4">
           {{file-upload label=(t 'labels.importFile') property="importFileName" selectedFile=importFile }}
-          <button class="btn btn-default" {{action 'importList'}}>{{t 'buttons.import'}}</button>
+          <button class="btn btn-primary" {{action 'importList'}}>{{t 'buttons.import'}}</button>
         </div>
       </div>
     {{/em-form}}
diff --git a/app/appointments/calendar/template.hbs b/app/appointments/calendar/template.hbs
index 57e7182e3c..cd2777aa7b 100644
--- a/app/appointments/calendar/template.hbs
+++ b/app/appointments/calendar/template.hbs
@@ -26,7 +26,7 @@
         {{/em-form}}
         <div class="panel-footer">
           <button class="btn btn-default warning" {{action 'clearFilteringCriteria'}}>{{t 'buttons.clear'}}</button>
-          <button class="btn btn-default" {{action 'filter'}}>{{t 'buttons.filter'}}</button>
+          <button class="btn btn-primary" {{action 'filter'}}>{{t 'buttons.filter'}}</button>
         </div>
         {{calendar-control events=model.events
           defaultDate=calendarDate
diff --git a/app/appointments/item/template.hbs b/app/appointments/item/template.hbs
index 75f630fdba..c4dd09d46e 100644
--- a/app/appointments/item/template.hbs
+++ b/app/appointments/item/template.hbs
@@ -13,7 +13,7 @@
     {{/if}}
     {{#if canAddVisit}}
       {{#if (eq appointment.displayStatus 'Scheduled')}}
-        <button class="btn btn-default" {{action 'checkIn' appointment bubbles=false }}>
+        <button class="btn btn-primary" {{action 'checkIn' appointment bubbles=false }}>
           <span class="glyphicon glyphicon-log-in"></span>
           {{t 'visits.buttons.checkIn'}}
         </button>
diff --git a/app/appointments/search/template.hbs b/app/appointments/search/template.hbs
index aab4aa0090..731355bda2 100644
--- a/app/appointments/search/template.hbs
+++ b/app/appointments/search/template.hbs
@@ -17,7 +17,7 @@
       {{/em-form}}
     </div>
     <div class="panel-footer">
-      <button class="btn btn-default" {{action 'search'}}>{{t 'buttons.search'}}</button>
+      <button class="btn btn-primary" {{action 'search'}}>{{t 'buttons.search'}}</button>
     </div>
   </div>
   <table class="table">
diff --git a/app/appointments/theater/template.hbs b/app/appointments/theater/template.hbs
index bf8d755263..269dffb121 100644
--- a/app/appointments/theater/template.hbs
+++ b/app/appointments/theater/template.hbs
@@ -21,7 +21,7 @@
         {{/em-form}}
         <div class="panel-footer">
           <button class="btn btn-default warning" {{action 'clearFilteringCriteria'}}>{{t 'buttons.clear'}}</button>
-          <button class="btn btn-default" {{action 'filter'}}>{{t 'buttons.filter'}}</button>
+          <button class="btn btn-primary" {{action 'filter'}}>{{t 'buttons.filter'}}</button>
         </div>
         {{calendar-control events=model.events
           defaultDate=calendarDate
diff --git a/app/inventory/edit/template.hbs b/app/inventory/edit/template.hbs
index 004969134d..56454f04f9 100644
--- a/app/inventory/edit/template.hbs
+++ b/app/inventory/edit/template.hbs
@@ -76,7 +76,7 @@
               {{#if canAdjustLocation}}
                 <td>
                   <button class="btn btn-primary neutral" {{action "showAdjustment" location}}>{{t 'inventory.labels.adjust'}}</button>
-                  <button class="btn btn-primary neutral" {{action "showTransfer" location}}>{{t 'inventory.labels.transfer'}}</button>
+                  <button class="btn btn-primary btn-extra" {{action "showTransfer" location}}>{{t 'inventory.labels.transfer'}}</button>
                 </td>
               {{/if}}
             </tr>
diff --git a/app/inventory/listing/template.hbs b/app/inventory/listing/template.hbs
index 14dbb9fda6..f8d6d711a2 100644
--- a/app/inventory/listing/template.hbs
+++ b/app/inventory/listing/template.hbs
@@ -21,7 +21,7 @@
             <td>{{inventory.crossReference}}</td>
             <td>
               {{#if canAddPurchase}}
-                <button class="btn btn-default" {{action 'showAddPurchase' inventory bubbles=false }}>{{t 'buttons.add'}}</button>
+                <button class="btn btn-primary" {{action 'showAddPurchase' inventory bubbles=false }}>{{t 'buttons.add'}}</button>
               {{/if}}
               {{#if canAddItem}}
                 <button class="btn btn-default neutral" {{action 'editItem' inventory bubbles=false }}>{{t 'labels.edit'}}</button>
diff --git a/app/inventory/purchase/template.hbs b/app/inventory/purchase/template.hbs
new file mode 100644
index 0000000000..1341fc14bf
--- /dev/null
+++ b/app/inventory/purchase/template.hbs
@@ -0,0 +1,43 @@
+{{#item-listing paginationProps=paginationProps }}
+  {{#if hasRecords}}
+    <table class="table">
+      <tr class="table-header">
+        {{#sortable-column sortBy='friendlyId' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.id'}}{{/sortable-column}}
+        {{#sortable-column sortBy='name' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.name'}}{{/sortable-column}}
+        {{#sortable-column sortBy='inventoryType' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.type'}}{{/sortable-column}}
+        {{#sortable-column sortBy='quantity' sortDesc=sortDesc sortKey=sortKey }}{{t 'labels.quantity'}}{{/sortable-column}}
+        <th>{{t 'inventory.labels.location'}}</th>
+        {{#sortable-column sortBy='crossReference' sortDesc=sortDesc sortKey=sortKey }}{{t 'inventory.labels.xref'}}{{/sortable-column}}
+        <th>{{t 'labels.actions'}}</th>
+      </tr>
+      {{#each model as |inventory|}}
+        {{#unless inventory.isNew}}
+          <tr {{action 'editItem' inventory}} class="clickable">
+            <td>{{inventory.friendlyId}}</td>
+            <td>{{inventory.name}}</td>
+            <td>{{inventory.inventoryType}}</td>
+            <td>{{inventory.quantity}} {{inventory.distributionUnit}}</td>
+            <td>{{inventory.displayLocations}}</td>
+            <td>{{inventory.crossReference}}</td>
+            <td>
+              {{#if canAddPurchase}}
+                <button class="btn btn-primary" {{action 'showAddPurchase' inventory bubbles=false }}>{{t 'buttons.add'}}</button>
+              {{/if}}
+              {{#if canAddItem}}
+                <button class="btn btn-default neutral" {{action 'editItem' inventory bubbles=false }}>{{t 'labels.edit'}}</button>
+              {{/if}}
+              {{#if canDeleteItem}}
+                <button class="btn btn-default warning" {{action 'deleteItem' inventory bubbles=false }}><span class="octicon octicon-x"></span> {{t 'buttons.delete'}}</button>
+              {{/if}}
+              {{#link-to 'inventory.barcode' inventory class="btn btn-extra" bubbles=false }}{{t 'buttons.barcode'}}{{/link-to}}
+            </td>
+          </tr>
+        {{/unless}}
+      {{/each}}
+    </table>
+  {{else}}
+    <div class="alert alert-info">
+      <p>{{t 'messages.noItemsFound'}} {{#if canAddItem}} <a href="#" {{action 'newItem'}}>{{t 'messages.createNewRecord'}}</a>{{/if}}</p>
+    </div>
+  {{/if}}
+{{/item-listing}}
diff --git a/app/inventory/reports/template.hbs b/app/inventory/reports/template.hbs
index e8dc8b5762..92c94bdad8 100644
--- a/app/inventory/reports/template.hbs
+++ b/app/inventory/reports/template.hbs
@@ -79,7 +79,7 @@
     {{/em-form}}
   </div>
   <div class="panel-footer">
-    <button class="btn btn-default" {{action 'generateReport'}}>{{t 'inventory.reports.generate'}}</button>
+    <button class="btn btn-primary" {{action 'generateReport'}}>{{t 'inventory.reports.generate'}}</button>
   </div>
 </div>
 {{#if showReportResults}}
@@ -100,7 +100,7 @@
       </table>
     </div>
     <div class="panel-footer">
-      <a href={{csvExport}} target="_blank" download="{{reportTitle}}.csv" class="btn btn-default">{{t 'inventory.reports.export'}}</a>
+      <a href={{csvExport}} target="_blank" download="{{reportTitle}}.csv" class="btn btn-primary">{{t 'inventory.reports.export'}}</a>
 
     </div>
   </div>
diff --git a/app/invoices/index/template.hbs b/app/invoices/index/template.hbs
index d946016f4e..9e2714c8a2 100644
--- a/app/invoices/index/template.hbs
+++ b/app/invoices/index/template.hbs
@@ -24,7 +24,7 @@
             {{#unless invoice.paidFlag}}
               {{#if showActions}}
                 {{#if canAddPayment}}
-                  <button class="btn btn-default neutral" {{action 'showAddPayment' invoice bubbles=false }}>
+                  <button class="btn btn-primary btn-extra" {{action 'showAddPayment' invoice bubbles=false }}>
                     <span class="octicon octicon-plus"></span> {{t 'admin.roles.capability.addPayment'}}
                   </button>
                 {{/if}}
diff --git a/app/medication/index/template.hbs b/app/medication/index/template.hbs
index 744bae99aa..2c04bbdbc9 100644
--- a/app/medication/index/template.hbs
+++ b/app/medication/index/template.hbs
@@ -22,7 +22,7 @@
           <td>{{medicationRequest.status}}</td>
           {{#if showActions}}
             <td>
-              <button class="btn btn-default" {{action 'editItem' medicationRequest bubbles=false }}>{{t 'labels.fulfill'}}</button>
+              <button class="btn btn-primary" {{action 'editItem' medicationRequest bubbles=false }}>{{t 'labels.fulfill'}}</button>
             </td>
           {{/if}}
         </tr>
diff --git a/app/patients/index/template.hbs b/app/patients/index/template.hbs
index d612c4f27e..2b74f3a58b 100644
--- a/app/patients/index/template.hbs
+++ b/app/patients/index/template.hbs
@@ -30,16 +30,16 @@
                 {{/if}}
                 {{#if patient.admitted}}
                   {{#if canDischargePatient}}
-                    <button class="btn btn-default info" {{action 'dischargePatient' patient  bubbles=false }}><span class="glyphicon glyphicon-log-out"></span> {{t 'visits.buttons.discharge'}}</button>
+                    <button class="btn btn-primary info" {{action 'dischargePatient' patient  bubbles=false }}><span class="glyphicon glyphicon-log-out"></span> {{t 'visits.buttons.discharge'}}</button>
                   {{/if}}
                 {{else}}
                   {{#if patient.checkedIn}}
                     {{#if canDischargePatient}}
-                      <button class="btn btn-default info" {{action 'checkoutPatient' patient  bubbles=false }}><span class="glyphicon glyphicon-log-out"></span> {{t 'visits.buttons.checkOut'}}</button>
+                      <button class="btn btn-primary info" {{action 'checkoutPatient' patient  bubbles=false }}><span class="glyphicon glyphicon-log-out"></span> {{t 'visits.buttons.checkOut'}}</button>
                     {{/if}}
                   {{else}}
                     {{#if canAdmitPatient}}
-                      <button class="btn btn-default success admit" {{action 'checkInPatient' patient  bubbles=false }}><span class="glyphicon glyphicon-log-in"></span> {{t 'visits.buttons.checkIn'}}</button>
+                      <button class="btn btn-primary success admit" {{action 'checkInPatient' patient  bubbles=false }}><span class="glyphicon glyphicon-log-in"></span> {{t 'visits.buttons.checkIn'}}</button>
                     {{/if}}
                   {{/if}}
                 {{/if}}
diff --git a/app/patients/outpatient/template.hbs b/app/patients/outpatient/template.hbs
index 8c53ac1133..6ce07f7f67 100644
--- a/app/patients/outpatient/template.hbs
+++ b/app/patients/outpatient/template.hbs
@@ -10,7 +10,7 @@
           <div class="form-group col-sm-3">
             <label class="control-label"></label>
             <div>
-              <button class="btn btn-default" {{action 'search'}}>{{t 'buttons.search'}}</button>
+              <button class="btn btn-primary" {{action 'search'}}>{{t 'buttons.search'}}</button>
             </div>
           </div>
         </div>
diff --git a/app/patients/reports/template.hbs b/app/patients/reports/template.hbs
index 804dc9d849..ef518e1e34 100644
--- a/app/patients/reports/template.hbs
+++ b/app/patients/reports/template.hbs
@@ -88,7 +88,7 @@
     {{/em-form}}
   </div>
   <div class="panel-footer">
-    <button class="btn btn-default" {{action 'generateReport'}}>{{t 'inventory.reports.generate'}}</button>
+    <button class="btn btn-primary" {{action 'generateReport'}}>{{t 'inventory.reports.generate'}}</button>
   </div>
 </div>
 {{#if showReportResults}}
diff --git a/app/styles/components/_buttons.scss b/app/styles/components/_buttons.scss
index 27d137fa3e..f27dfb133f 100644
--- a/app/styles/components/_buttons.scss
+++ b/app/styles/components/_buttons.scss
@@ -20,11 +20,17 @@
     color: $gray;
 
     &:hover,
-    &:focus { opacity: .8; }
+    &:focus {
+      opacity: .8;
+    }
   }
 
   &.admit {
-    width: 103px;
+    width: 110px;
+  }
+
+  &.info {
+    width: 110px;
   }
 
   .octicon {
diff --git a/app/users/index/template.hbs b/app/users/index/template.hbs
index 48a0442557..d483466880 100644
--- a/app/users/index/template.hbs
+++ b/app/users/index/template.hbs
@@ -20,7 +20,7 @@
             {{#if showActions}}
               <td>
                 {{#if canAdd}}
-                  <button class="btn btn-default" {{action 'editItem' user bubbles=false }}>{{t 'labels.edit'}}</button>
+                  <button class="btn btn-primary" {{action 'editItem' user bubbles=false }}>{{t 'labels.edit'}}</button>
                 {{/if}}
                 {{#if canDelete}}
                   <button class="btn btn-default warning" {{action 'deleteItem' user bubbles=false }}><span class="octicon octicon-x"></span>{{t 'labels.delete'}}</button>