diff --git a/app/appointments/edit/template.hbs b/app/appointments/edit/template.hbs
index 4954f3aa81..99cd20baa4 100644
--- a/app/appointments/edit/template.hbs
+++ b/app/appointments/edit/template.hbs
@@ -19,7 +19,7 @@
                         {{view Ember.Select viewName="select" content=minuteList optionLabelPath="content" optionValuePath="content" value=startMinute class="form-control"}}
                     </div>
                 </div>
-                <div {{bind-attr class=":form-group :col-sm-3 :required :has-feedback endTimeHasError:has-error"}}>            
+                <div class="form-group col-sm-3 required has-feedback {{if endTimeHasError 'has-error'}}">
                     <label class="control-label" for="endTime">End Time</label>
                     <div class="input-group">
                         {{view Ember.Select viewName="select" content=hourList optionLabelPath="content.name" optionValuePath="content.value" value=endHour id="endTime" class="form-control"}}
diff --git a/app/dialog/template.hbs b/app/dialog/template.hbs
index 21dd8383ab..b7ed0ef714 100644
--- a/app/dialog/template.hbs
+++ b/app/dialog/template.hbs
@@ -1,9 +1,9 @@
 {{#if showProgress}}
     <div class="progress">
-        <div class="progress-bar progress-bar-striped active" role="progressbar" {{bind-attr aria-valuenow="progressBarValue"}}
-             aria-valuemin="0" aria-valuemax="100" {{bind-attr style="progressBarStyle"}}>
+        <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow={{progressBarValue}}
+             aria-valuemin="0" aria-valuemax="100" style={{progressBarStyle}}>
             <span class="sr-only">{{progressBarValue}}% Complete</span>
         </div>
     </div>
 {{/if}}
-{{message}}
\ No newline at end of file
+{{message}}
diff --git a/app/inventory/barcode/template.hbs b/app/inventory/barcode/template.hbs
index bf3f03f018..ae960cdca8 100644
--- a/app/inventory/barcode/template.hbs
+++ b/app/inventory/barcode/template.hbs
@@ -1,6 +1,6 @@
 <div class="panel panel-default">
   <div class="panel-body">
-    <img {{bind-attr src=barcodeUri}}/>
+    <img src={{barcodeUri}}>
   </div>
 </div>
 
diff --git a/app/inventory/reports/template.hbs b/app/inventory/reports/template.hbs
index bd33477ee5..c26ef89391 100644
--- a/app/inventory/reports/template.hbs
+++ b/app/inventory/reports/template.hbs
@@ -2,13 +2,13 @@
     <div class="panel-body">
         {{#em-form model=this submit_button=false }}
             <div class="row">
-                {{em-select class="col-xs-6" label="Report Type" 
+                {{em-select class="col-xs-6" label="Report Type"
                     property="reportType" content=reportTypes
                     optionValuePath="content.value" optionLabelPath="content.name"
                     selected=reportType
                 }}
                 {{#unless hideLocationFilter}}
-                    {{em-select class="col-xs-6" label="Location" 
+                    {{em-select class="col-xs-6" label="Location"
                         property="filterLocation" content=warehouseList.value
                         optionValuePath="content" optionLabelPath="content"
                         prompt=" "
@@ -22,7 +22,7 @@
                     {{date-picker property="startDate" label="Start Date" class="col-sm-4"}}
                     {{date-picker property="endDate" label="End Date" class="col-sm-4"}}
                 {{/if}}
-            </div>        
+            </div>
             {{#if useFieldPicker}}
                 <h3>Fields to Include</h3>
                 <div class="row">
@@ -33,19 +33,19 @@
                     {{em-checkbox label=reportColumns.id.label property="reportColumns.id.include" class="col-xs-2"}}
                     {{em-checkbox label=reportColumns.name.label property="reportColumns.name.include" class="col-xs-2"}}
                     {{em-checkbox label=reportColumns.description.label property="reportColumns.description.include" class="col-xs-2"}}
-                    {{em-checkbox label=reportColumns.type.label property="reportColumns.type.include" class="col-xs-2"}}                        
+                    {{em-checkbox label=reportColumns.type.label property="reportColumns.type.include" class="col-xs-2"}}
                 </div>
                 <div class="row">
-                    <div class="col-xs-1"></div>                
+                    <div class="col-xs-1"></div>
                     {{em-checkbox label=reportColumns.quantity.label property="reportColumns.quantity.include" class="col-xs-2"}}
                     {{em-checkbox label=reportColumns.unit.label property="reportColumns.unit.include" class="col-xs-2"}}
-                    {{#if includeCostFields}}                    
+                    {{#if includeCostFields}}
                         {{em-checkbox label=reportColumns.total.label property="reportColumns.total.include" class="col-xs-2"}}
                         {{em-checkbox label=reportColumns.unitcost.label property="reportColumns.unitcost.include" class="col-xs-2"}}
                     {{/if}}
                     {{#if includeDaysLeft}}
                         {{em-checkbox label=reportColumns.consumedPerDay.label property="reportColumns.consumedPerDay.include" class="col-xs-2"}}
-                        {{em-checkbox label=reportColumns.daysLeft.label property="reportColumns.daysLeft.include" class="col-xs-2"}}                    
+                        {{em-checkbox label=reportColumns.daysLeft.label property="reportColumns.daysLeft.include" class="col-xs-2"}}
                     {{/if}}
                     {{em-checkbox label=reportColumns.price.label property="reportColumns.price.include" class="col-xs-2"}}
                 </div>
@@ -56,21 +56,21 @@
                     {{em-checkbox label=reportColumns.locations.label property="reportColumns.locations.include" class="col-xs-2"}}
                     {{em-checkbox label=reportColumns.aisle.label property="reportColumns.aisle.include" class="col-xs-2"}}
                     {{em-checkbox label=reportColumns.xref.label property="reportColumns.xref.include" class="col-xs-2"}}
-                    
+
                 </div>
                 <div class="row">
-                    <div class="col-xs-1"></div>        
+                    <div class="col-xs-1"></div>
                     {{em-checkbox label=reportColumns.vendor.label property="reportColumns.vendor.include" class="col-xs-2"}}
                     {{#if includeExpenseAccount}}
                         {{em-checkbox label=reportColumns.expenseAccount.label property="reportColumns.expenseAccount.include" class="col-xs-2"}}
                     {{/if}}
-                    
+
                     {{#if includeTransactionType}}
                         {{em-checkbox label=reportColumns.transactionType.label property="reportColumns.transactionType.include" class="col-xs-2"}}
                     {{/if}}
                 </div>
             {{/if}}
-        
+
         {{/em-form}}
     </div>
     <div class="panel-footer">
@@ -95,8 +95,8 @@
             </table>
         </div>
         <div class="panel-footer">
-            <a {{bind-attr href="csvExport"}} target="_blank" download="report.csv" class="btn btn-default">Export Report</a>
+            <a href={{csvExport}} target="_blank" download="report.csv" class="btn btn-default">Export Report</a>
 
-        </div>    
+        </div>
     </div>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/app/invoices/edit/template.hbs b/app/invoices/edit/template.hbs
index b75f272e58..73f5e57ef0 100644
--- a/app/invoices/edit/template.hbs
+++ b/app/invoices/edit/template.hbs
@@ -7,22 +7,22 @@
             <div class="form-group col-xs-2">
                 <label>Invoice Id</label>
                 <p class="form-control-static">{{id}}</p>
-            </div>        
+            </div>
         {{/unless}}
         {{date-picker property="billDate" label="Bill Date" class="col-xs-2"}}
         {{#if isNew}}
             {{patient-typeahead property="patientTypeAhead" label="Patient" content=patientList selection=selectedPatient class="col-xs-4 required"}}
-            {{em-select class="col-xs-4 required" label="Visit" 
+            {{em-select class="col-xs-4 required" label="Visit"
                 property="visit" content=patientVisits
-                optionValuePath="content" optionLabelPath="content.visitDescription"            
+                optionValuePath="content" optionLabelPath="content.visitDescription"
                 selected=visit
                 prompt='Please select a visit'
-            }}                
+            }}
         {{else}}
             <div class="form-group col-xs-3">
                 <label>Visit</label>
                 <p class="form-control-static">{{visit.visitDescription}}</p>
-            </div>        
+            </div>
         {{/if}}
     </div>
     <div class="row">
@@ -59,8 +59,8 @@
                     <th class="text-right">Excess</th>
                     <th class="text-right">Action</th>
                 </tr>
-                
-                {{#each lineItemsByCategory as |categoryGroup|}} 
+
+                {{#each lineItemsByCategory as |categoryGroup|}}
                     <tr>
                         <td class="col-xs-12">
                             <strong>{{categoryGroup.category}}</strong>
@@ -71,11 +71,11 @@
                             <td class="col-xs-5">
                                 <div class="form-group">
                                     <div class="input-group">
-                                        <span {{bind-attr class=":input-group-addon :glyphicon showDetails:glyphicon-minus:glyphicon-plus"}} 
+                                        <span class="input-group-addon glyphicon {{unless showDetails 'glyphicon-minus' 'glyphicon-plus'}}"
                                             {{action "toggleDetails" item bubbles=false }}> </span>
                                         <strong>{{input class="form-control" value=item.name }}</strong>
                                     </div>
-                                </div>                                
+                                </div>
                             </td>
                             <td class="col-xs-1 text-right">
                                 {{number-format item.total}}
@@ -97,7 +97,7 @@
                             </td>
                             <td class="col-xs-1 text-right">{{number-format item.amountOwed}}</td>
                             <td class="col-xs-2">
-                                {{#if canAddCharge}}     
+                                {{#if canAddCharge}}
                                     <button class="btn btn-default warning" {{action "showDeleteLineItem" item bubbles=false }}>
                                         <span class="octicon octicon-x"></span>Delete
                                     </button>
@@ -127,7 +127,7 @@
                                                 {{input class="form-control" value=detail.name }}
                                             </div>
                                         </div>
-                                    </td>                                
+                                    </td>
                                     <td class="col-xs-1">
                                         <div class="form-group">
                                             {{input class="form-control" value=detail.quantity }}
@@ -151,7 +151,7 @@
                                         {{number-format detail.amountOwed}}
                                     </td>
                                     <td class="col-xs-2">
-                                        {{#if canAddCharge}}                            
+                                        {{#if canAddCharge}}
                                             <button class="btn btn-default warning" {{action "showDeleteItem" detail item.details bubbles=false }}>
                                                 <span class="octicon octicon-x"></span>Delete
                                             </button>
@@ -169,7 +169,7 @@
                         <td class="text-right">{{number-format categoryGroup.discount}}</td>
                         <td class="text-right">{{number-format categoryGroup.nationalInsurance}}</td>
                         <td class="text-right">{{number-format categoryGroup.privateInsurance}}</td>
-                        <td class="text-right">{{number-format categoryGroup.amountOwed }}</td>                            
+                        <td class="text-right">{{number-format categoryGroup.amountOwed }}</td>
                         <td></td>
                     </tr>
                 {{/each}}
@@ -181,7 +181,7 @@
                     <td class="text-right">{{number-format model.discount}}</td>
                     <td class="text-right">{{number-format model.nationalInsurance}}</td>
                     <td class="text-right">{{number-format model.privateInsurance}}</td>
-                    <td class="text-right">{{number-format model.patientResponsibility}}</td>                            
+                    <td class="text-right">{{number-format model.patientResponsibility}}</td>
                     <td></td>
                 </tr>
                 <tr>
@@ -189,7 +189,7 @@
                         <strong>Payments/Deposits</strong>
                     </td>
                     <td colspan="4"></td>
-                    <td class="text-right">-{{number-format paidTotal}}</td>                            
+                    <td class="text-right">-{{number-format paidTotal}}</td>
                     <td></td>
                 </tr>
                 <tr>
@@ -197,7 +197,7 @@
                         <strong>Grand Total</strong>
                     </td>
                     <td colspan="4"></td>
-                    <td class="text-right">{{number-format remainingBalance}}</td>                            
+                    <td class="text-right">{{number-format remainingBalance}}</td>
                     <td></td>
                 </tr>
             </table>
@@ -207,7 +207,7 @@
 <div class="panel detail-section">
     <div class="panel-heading">
         <h3 class="panel-title">
-            Remarks            
+            Remarks
         </h3>
     </div>
     <div class="panel-body detail-section-content">
@@ -252,4 +252,4 @@
             {{/each}}
         </table>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/medication/edit/template.hbs b/app/medication/edit/template.hbs
index e4ad81cf43..204eb2143a 100644
--- a/app/medication/edit/template.hbs
+++ b/app/medication/edit/template.hbs
@@ -7,12 +7,12 @@
             {{patient-typeahead property="patientTypeAhead" label="Patient" content=patientList selection=selectedPatient class="col-xs-6 required"}}
         {{/if}}
         {{#if isNew}}
-            {{em-select class="col-xs-4 required" label="Visit" 
+            {{em-select class="col-xs-4 required" label="Visit"
                 property="visit" content=patientVisits
                 optionValuePath="content" optionLabelPath="content.visitDescription"
                 prompt="--Add New Outpatient Visit--"
                 selected=visit
-            }}        
+            }}
         {{else}}
             <div class="form-group col-xs-3">
                 <label>Visit</label>
@@ -23,7 +23,7 @@
     {{#if isFulfilledOrRequested}}
         <div class="form-group">
             <label class="control-label">Medication</label>
-            <p class="form-control-static">{{inventoryItem.name}}</p>        
+            <p class="form-control-static">{{inventoryItem.name}}</p>
         </div>
     {{else}}
         {{inventory-typeahead property="inventoryItemTypeAhead" label="Medication" content=medicationList selection=selectedInventoryItem class="required"}}
@@ -43,13 +43,13 @@
             {{date-picker property="prescriptionDate" label="Prescription Date" class="col-sm-4"}}
         </div>
         <div class="row">
-            {{em-input property="quantity" label=quantityLabel class=quantityClass }}          
+            {{em-input property="quantity" label=quantityLabel class=quantityClass }}
             {{em-input property="refills" label="Refills" class="col-xs-3"}}
         </div>
         {{#unless hideFulfillRequest}}
             {{#if isNew}}
                 {{#if canFulfill}}
-                    <div class="form-group">            
+                    <div class="form-group">
                         <label class="control-label">Fulfill Request</label>
                      </div>
                     {{em-checkbox label="Fulfill Request Now" property="shouldFulfillRequest"}}
@@ -64,4 +64,4 @@
             }}
         {{/if}}
     {{/if}}
-{{/em-form}}
\ No newline at end of file
+{{/em-form}}
diff --git a/app/medication/route.js b/app/medication/route.js
index 08a113d30f..e863d1a666 100644
--- a/app/medication/route.js
+++ b/app/medication/route.js
@@ -1,11 +1,11 @@
 import AbstractModuleRoute from 'hospitalrun/routes/abstract-module-route';
 import Ember from 'ember';
 export default AbstractModuleRoute.extend({
-    addCapability: 'add_medication',    
+    addCapability: 'add_medication',
     moduleName: 'medication',
     newButtonText: '+ new request',
     sectionTitle: 'Medication',
-    
+
     additionalButtons: function() {
         var additionalButtons = [];
         if (this.currentUserCan('fulfill_medication')) {
@@ -15,7 +15,7 @@ export default AbstractModuleRoute.extend({
                 buttonText: 'dispense medication',
                 class: 'btn btn-primary'
             });
-        }        
+        }
         if (this.currentUserCan(this.get('addCapability'))) {
             additionalButtons.push({
                 buttonIcon: 'octicon octicon-mail-reply',
@@ -29,7 +29,7 @@ export default AbstractModuleRoute.extend({
         }
     }.property(),
 
-    additionalModels: [{ 
+    additionalModels: [{
         name: 'aisleLocationList',
         findArgs: ['lookup','aisle_location_list']
     }, {
@@ -39,7 +39,7 @@ export default AbstractModuleRoute.extend({
         name: 'warehouseList',
         findArgs: ['lookup','warehouse_list']
     }],
-    
+
     subActions: [{
         text: 'Requests',
         linkTo: 'medication.index'
@@ -47,14 +47,14 @@ export default AbstractModuleRoute.extend({
         text: 'Completed',
         linkTo: 'medication.completed'
     }],
-    
+
     actions: {
         dispenseMedication: function() {
             if (this.currentUserCan('fulfill_medication')) {
                 this.transitionTo('medication.edit', 'dispense');
             }
         },
-        
+
         returnMedication: function(){
             if (this.currentUserCan(this.get('addCapability'))) {
                 this.transitionTo('medication.return', 'new');
@@ -62,4 +62,3 @@ export default AbstractModuleRoute.extend({
         }
     }
 });
-
diff --git a/app/patients/photo/template.hbs b/app/patients/photo/template.hbs
index fbd91a56d8..15f4b846af 100644
--- a/app/patients/photo/template.hbs
+++ b/app/patients/photo/template.hbs
@@ -3,10 +3,10 @@
         {{take-photo photoFile=photoFile }}
     {{else}}
         <div class="thumbnail">
-            <img {{bind-attr alt="caption" src="url"}} class="img-responsive" >
+            <img alt={{caption}} src={{url}} class="img-responsive" >
         </div>
     {{/if}}
-    <div class="row">        
+    <div class="row">
         {{em-input property="caption" label="Caption"}}
     </div>
-{{/em-form}}
\ No newline at end of file
+{{/em-form}}
diff --git a/app/patients/reports/template.hbs b/app/patients/reports/template.hbs
index 8242f9b483..e467f60b97 100644
--- a/app/patients/reports/template.hbs
+++ b/app/patients/reports/template.hbs
@@ -2,69 +2,69 @@
     <div class="panel-body">
         {{#em-form model=this submit_button=false }}
             <div class="row">
-                {{em-select class="col-xs-6" label="Report Type" 
+                {{em-select class="col-xs-6" label="Report Type"
                     property="reportType" content=reportTypes
                     optionValuePath="content.value" optionLabelPath="content.name"
                     selected=reportType
                 }}
             </div>
             {{#if isStatusReport}}
-                {{em-select property="status" label="Patient Status" 
-                    content=statusList.value 
-                    optionValuePath="content" 
-                    optionLabelPath="content" 
+                {{em-select property="status" label="Patient Status"
+                    content=statusList.value
+                    optionValuePath="content"
+                    optionLabelPath="content"
                     prompt=" "
                 }}
             {{else}}
                 <div class="row">
                     {{date-picker property="startDate" label="Start Date" class="col-sm-4"}}
                     {{date-picker property="endDate" label="End Date" class="col-sm-4"}}
-                </div>        
+                </div>
             {{/if}}
             {{#if isVisitReport}}
                 <div class="row">
-                    {{em-select class="col-sm-6" label="Visit Type" 
+                    {{em-select class="col-sm-6" label="Visit Type"
                         property="visitType" content=visitTypes
                         optionValuePath="content" optionLabelPath="content"
                         prompt=" "
                     }}
-                    {{em-select class="col-sm-6" label="Examiner" 
+                    {{em-select class="col-sm-6" label="Examiner"
                         property="examiner" content=physicianList.value
                         optionValuePath="content" optionLabelPath="content"
                         prompt=" "
-                    }}                
+                    }}
                 </div>
                 <div class="row">
-                    {{em-select class="col-sm-6" label="Location" 
+                    {{em-select class="col-sm-6" label="Location"
                         property="location" content=locationList.value
                         optionValuePath="content" optionLabelPath="content"
                         prompt=" "
                     }}
-                    {{em-select class="col-sm-6" label="Clinic" 
+                    {{em-select class="col-sm-6" label="Clinic"
                         property="clinic" content=clinicList.value
                         optionValuePath="content" optionLabelPath="content"
                         prompt=" "
                     }}
                 </div>
                 <div class="row">
-                    <div class="form-group col-xs-12">                        
-                        {{select-or-typeahead property="diagnosis" 
-                            label="Diagnosis" list=diagnosisList 
-                        }} 
+                    <div class="form-group col-xs-12">
+                        {{select-or-typeahead property="diagnosis"
+                            label="Diagnosis" list=diagnosisList
+                        }}
                     </div>
-                </div>        
+                </div>
 
                 <h3>Fields to Include</h3>
                 <div class="row">
                     <div class="col-xs-1"></div>
                     {{em-checkbox label=reportColumns.id.label property="reportColumns.id.include" class="col-xs-2"}}
-                    {{em-checkbox label=reportColumns.name.label property="reportColumns.name.include" class="col-xs-2"}}                
+                    {{em-checkbox label=reportColumns.name.label property="reportColumns.name.include" class="col-xs-2"}}
                     {{em-checkbox label=reportColumns.age.label property="reportColumns.age.include" class="col-xs-2"}}
                     {{em-checkbox label=reportColumns.contacts.label property="reportColumns.contacts.include" class="col-xs-2"}}
                     {{em-checkbox label=reportColumns.dateOfBirth.label property="reportColumns.dateOfBirth.include" class="col-xs-2"}}
                 </div>
                 <div class="row">
-                    <div class="col-xs-1"></div>        
+                    <div class="col-xs-1"></div>
                     {{em-checkbox label=reportColumns.examiner.label property="reportColumns.examiner.include" class="col-xs-2"}}
                     {{em-checkbox label=reportColumns.gender.label property="reportColumns.gender.include" class="col-xs-2"}}
                     {{em-checkbox label=reportColumns.primaryDiagnosis.label property="reportColumns.primaryDiagnosis.include" class="col-xs-2"}}
@@ -88,7 +88,7 @@
 </div>
 {{#if showReportResults}}
     <div class="panel panel-primary">
-        <div class="panel-heading">            
+        <div class="panel-heading">
             <h3 class="panel-title">{{reportTitle}}{{partial 'paging'}}</h3>
         </div>
         <div class="panel-body">
@@ -100,12 +100,12 @@
                         </th>
                     {{/each}}
                 </tr>
-                {{partial "report-rows"}}                
+                {{partial "report-rows"}}
             </table>
         </div>
         <div class="panel-footer">
-            <a {{bind-attr href="csvExport"}} target="_blank" download="report.csv" class="btn btn-default">Export Report</a>
+            <a href={{csvExport}} target="_blank" download="report.csv" class="btn btn-default">Export Report</a>
 
-        </div>    
+        </div>
     </div>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/app/templates/components/charges-by-type-tab.hbs b/app/templates/components/charges-by-type-tab.hbs
index 6f7a51131d..d967681af8 100644
--- a/app/templates/components/charges-by-type-tab.hbs
+++ b/app/templates/components/charges-by-type-tab.hbs
@@ -1 +1 @@
-<a {{href=tabHref}} role="tab" data-toggle="pill">{{pricingType}} charges</a>
\ No newline at end of file
+<a href={{tabHref}} role="tab" data-toggle="pill">{{pricingType}} charges</a>
diff --git a/app/templates/components/checkbox-or-typeahead.hbs b/app/templates/components/checkbox-or-typeahead.hbs
index f712314196..7f189020be 100644
--- a/app/templates/components/checkbox-or-typeahead.hbs
+++ b/app/templates/components/checkbox-or-typeahead.hbs
@@ -1,16 +1,16 @@
 {{#if userCanAdd}}
     {{partial 'components/render-typeahead'}}
 {{else}}
-    <div {{bind-attr class=":required errors:has-error"}}>
+    <div class="required {{if errors 'has-error'}}">
         <label class="control-label">{{label}}</label>
     </div>
     {{#each checkboxRow in checkboxRows}}
         <div class="row">
-            <div class="col-xs-1"></div>        
+            <div class="col-xs-1"></div>
             {{#each checkbox in checkboxRow}}
                 <div class="checkbox col-xs-2">
                 <label>
-                    {{action-checkbox value=checkbox.value action="checkboxChanged"}}{{checkbox.label}}                    
+                    {{action-checkbox value=checkbox.value action="checkboxChanged"}}{{checkbox.label}}
                 </label>
                 </div>
             {{/each}}
@@ -21,4 +21,4 @@
             <span class="help-block">{{errors}}</span>
         </div>
     {{/if}}
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/app/templates/components/modal-dialog.hbs b/app/templates/components/modal-dialog.hbs
index 77213e48f4..050cf30b41 100644
--- a/app/templates/components/modal-dialog.hbs
+++ b/app/templates/components/modal-dialog.hbs
@@ -10,7 +10,7 @@
             </div>
             <div class="modal-footer">
                 {{#unless hideUpdateButton}}
-                    <button class="btn btn-primary on-white" {{action "updateAction" }} {{bind-attr disabled=isUpdateDisabled }}>{{ updateButtonText }}</button>
+                    <button class="btn btn-primary on-white" {{action "updateAction" }} disabled={{isUpdateDisabled}}>{{ updateButtonText }}</button>
                 {{/unless}}
                 {{#unless hideCancelButton}}
                     <button class="btn btn-default warning" {{action "cancelAction"}}>Cancel</button>
@@ -18,4 +18,4 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/templates/components/nav-menu.hbs b/app/templates/components/nav-menu.hbs
index cd03acf603..24007e32c0 100644
--- a/app/templates/components/nav-menu.hbs
+++ b/app/templates/components/nav-menu.hbs
@@ -1,7 +1,7 @@
 {{#if show}}
   <div class="category-title" {{action 'toggleContent'}}>
     {{#link-to nav.route class="primary-section-link nav-link"}}
-      <span {{bind-attr class=":mega-octicon nav.iconClass"}}></span>{{nav.title}}
+      <span class="mega-octicon {{nav.iconClass}}"></span>{{nav.title}}
     {{/link-to}}
   </div>
   {{#if isShowing }}
@@ -11,11 +11,11 @@
           <div {{action 'resetNav'}}>
           {{#if subroute}}
             {{#link-to route subroute class="category-sub-item nav-link"}}
-            <span {{bind-attr class=":octicon iconClass"}}></span>{{title}}
+            <span class="octicon {{iconClass}}"></span>{{title}}
             {{/link-to}}
           {{else}}
             {{#link-to route class="category-sub-item nav-link"}}
-            <span {{bind-attr class=":octicon iconClass"}}></span>{{title}}
+            <span class="octicon {{iconClass}}"></span>{{title}}
             {{/link-to}}
           {{/if}}
           </div>
@@ -23,4 +23,4 @@
       {{/each}}
   </div>
   {{/if}}
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/app/templates/components/quantity-conv.hbs b/app/templates/components/quantity-conv.hbs
index 9e03bb07cf..4ed34e5eea 100644
--- a/app/templates/components/quantity-conv.hbs
+++ b/app/templates/components/quantity-conv.hbs
@@ -1,7 +1,7 @@
 {{#unless firstQuantity}}
     <div class="row">
         <div class="col-xs-5">
-            <div {{bind-attr class=":form-group :required quantityClass"}}>
+            <div class="form-group required {{quantityClass}}">
                 <label class="control-label">What does 1 {{unitName}} contain?</label>
             </div>
         </div>
@@ -9,7 +9,7 @@
 {{/unless}}
 <div class="row">
     <div class="col-xs-3">
-        <div {{bind-attr class=":form-group :required quantityClass"}}>
+        <div class="form-group required {{quantityClass}}">
             {{#if firstQuantity}}
                 <label class="control-label">Quantity</label>
             {{/if}}
@@ -17,13 +17,13 @@
             <span class="help-block">{{quantityHelp}}</span>
         </div>
     </div>
-    
-    
+
+
     <div class="col-xs-3">
-        <div {{bind-attr class=":form-group  :required unitClass"}}>
+        <div class="form-group required {{unitClass}}">
             {{#if firstQuantity}}
                 <label class="control-label">Unit</label>
-            {{/if}}            
+            {{/if}}
             {{view Ember.Select viewName="select" class="form-control" content=unitList optionLabelPath="content"
                 optionValuePath="content"
                 value=unit
@@ -32,4 +32,4 @@
              <span class="help-block">{{unitHelp}}</span>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/templates/components/sortable-column.hbs b/app/templates/components/sortable-column.hbs
index a11fb59d27..0c57ec6e42 100644
--- a/app/templates/components/sortable-column.hbs
+++ b/app/templates/components/sortable-column.hbs
@@ -1,5 +1,5 @@
 {{#if sorted}}
-    <span {{bind-attr class=":glyphicon sortDesc:glyphicon-arrow-down:glyphicon-arrow-up"}}></span>
+    <span class="glyphicon {{if sortDesc 'glyphicon-arrow-down' 'glyphicon-arrow-up'}}"></span>
 {{/if}}
 
-{{yield}}
\ No newline at end of file
+{{yield}}
diff --git a/app/templates/components/static-text.hbs b/app/templates/components/static-text.hbs
index 3e5b6be726..9ed1c203b3 100644
--- a/app/templates/components/static-text.hbs
+++ b/app/templates/components/static-text.hbs
@@ -1,10 +1,10 @@
-<div {{bind-attr class=":form-group class"}}>
+<div class="form-group {{class}}">
     <label class="control-label">{{label}}</label>
     <p class="form-control-static">
-        {{#if value}} 
+        {{#if value}}
             {{value}}
         {{else}}
             {{yield}}
         {{/if}}
-    </p>        
-</div>
\ No newline at end of file
+    </p>
+</div>
diff --git a/app/templates/paging.hbs b/app/templates/paging.hbs
index bcec692515..62a1f5699a 100644
--- a/app/templates/paging.hbs
+++ b/app/templates/paging.hbs
@@ -1,21 +1,21 @@
 {{#if showPagination}}
     <div class="btn-group pull-right">
         {{#if showFirstPageButton}}
-            <button class="btn btn-default on-white" {{action 'firstPage'}}{{bind-attr disabled=disablePreviousPage }}>
+            <button class="btn btn-default on-white" {{action 'firstPage'}} disabled={{disablePreviousPage}}>
                 <span class="glyphicon glyphicon-step-backward"></span>
             </button>
         {{/if}}
-        <button class="btn btn-default on-white" {{action 'previousPage'}}{{bind-attr disabled=disablePreviousPage }}>
+        <button class="btn btn-default on-white" {{action 'previousPage'}} disabled={{disablePreviousPage}}>
             <span class="glyphicon glyphicon-chevron-left"></span>
         </button>
-        <button class="btn btn-default on-white" {{action 'nextPage'}}{{bind-attr disabled=disableNextPage }}>
+        <button class="btn btn-default on-white" {{action 'nextPage'}} disabled={{disableNextPage}}>
             <span class="glyphicon glyphicon-chevron-right"></span>
         </button>
         {{#if showLastPageButton}}
-            <button class="btn btn-default on-white" {{action 'lastPage'}}{{bind-attr disabled=disableNextPage }}>
+            <button class="btn btn-default on-white" {{action 'lastPage'}} disabled={{disableNextPage}}>
                 <span class="glyphicon glyphicon-step-forward"></span>
             </button>
         {{/if}}
-        
+
     </div>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/app/templates/panel.hbs b/app/templates/panel.hbs
index c240f34649..8b5a2e3e04 100644
--- a/app/templates/panel.hbs
+++ b/app/templates/panel.hbs
@@ -7,7 +7,7 @@
             {{#if disabledAction}}
                 <button class="btn btn-primary on-white disabled-btn" {{action disabledAction}}>{{updateButtonText}}</button>
             {{else}}
-                <button class="btn btn-primary on-white" {{action updateButtonAction}} {{bind-attr disabled=isUpdateDisabled }}>{{updateButtonText}}</button>
+                <button class="btn btn-primary on-white" {{action updateButtonAction}} disabled="{{isUpdateDisabled}}">{{updateButtonText}}</button>
             {{/if}}
         {{/if}}
         {{#unless hideCancelButton}}
@@ -17,13 +17,13 @@
                 <button class="btn btn-default warning" {{action "cancel"}}>Cancel</button>
             {{/if}}
         {{/unless}}
-        {{#each additionalButtons}}
-            <button {{bind-attr class="class"}} {{action buttonAction}}>
-                {{#if buttonIcon}}
-                    <span {{bind-attr class="buttonIcon"}}></span> 
+        {{#each button in additionalButtons}}
+            <button class="{{button.class}}" {{action button.buttonAction}}>
+                {{#if buttonbuttonIcon}}
+                    <span class="{{button.buttonIcon}}"></span>
                 {{/if}}
-                {{buttonText}}
+                {{button.buttonText}}
             </button>
         {{/each}}
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/templates/section.hbs b/app/templates/section.hbs
index b9ac930f33..22666a4834 100644
--- a/app/templates/section.hbs
+++ b/app/templates/section.hbs
@@ -14,8 +14,8 @@
                 {{/if}}
                 {{#if additionalButtons}}
                     {{#each additionalButtons}}
-                    <button {{bind-attr class="class"}} {{action buttonAction}}>
-                        {{#if buttonIcon}}<span {{bind-attr class="buttonIcon"}}></span>{{/if}}
+                    <button class={{class}} {{action buttonAction}}>
+                        {{#if buttonIcon}}<span class={{buttonIcon}}></span>{{/if}}
                         {{buttonText}}</button>
                     {{/each}}
                 {{/if}}
@@ -37,4 +37,4 @@
     <div class="panel-body">
         {{outlet}}
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/templates/sidebar_nav/header.hbs b/app/templates/sidebar_nav/header.hbs
index d312c9efd9..536c2c5eda 100644
--- a/app/templates/sidebar_nav/header.hbs
+++ b/app/templates/sidebar_nav/header.hbs
@@ -2,7 +2,7 @@
     <a class="sidebar-nav-logo" href="#">
       {{partial "components/logo-svg"}}
     </a>
-    <a href="#" {{bind-attr class=":settings-trigger isShowingSettings:active"}} {{action 'toggleSettings'}}>
+    <a href="#" class="settings-trigger {{if isShowingSettings 'active'}}" {{action 'toggleSettings'}}>
         <span class="mega-octicon octicon-gear"></span>
     </a>
 
@@ -16,4 +16,4 @@
         </nav>
     {{/if}}
 
-</header>
\ No newline at end of file
+</header>