diff --git a/app/pods/components/display-errors/template.hbs b/app/pods/components/display-errors/template.hbs
index 8d95c0d..6a74209 100644
--- a/app/pods/components/display-errors/template.hbs
+++ b/app/pods/components/display-errors/template.hbs
@@ -1,3 +1,3 @@
-{{#each error in a}}
+{{#each a as |error|}}
   <div class="flakes-message error">{{error.message}}</div>
 {{/each}}
diff --git a/app/pods/components/sortable-table/template.hbs b/app/pods/components/sortable-table/template.hbs
index 0874743..1e48be3 100644
--- a/app/pods/components/sortable-table/template.hbs
+++ b/app/pods/components/sortable-table/template.hbs
@@ -1,13 +1,13 @@
 <thead>
   <tr>
-    {{#each a in tableAttrs}}
+    {{#each tableAttrs as |a|}}
       {{sortable-table-header title=a.name sortProperty=a.attr action="sortBy"}}
     {{/each}}
   </tr>
 </thead>
 
 <tbody>
-  {{#each item in arrangedContent}}
+  {{#each arrangedContent as |item|}}
     {{component row data=item}}
   {{/each}}
 </tbody>
diff --git a/app/pods/components/strain-details/template.hbs b/app/pods/components/strain-details/template.hbs
index 9d6e9ca..4f98ea7 100644
--- a/app/pods/components/strain-details/template.hbs
+++ b/app/pods/components/strain-details/template.hbs
@@ -11,17 +11,16 @@
     </legend>
 
     {{! ROW 1 }}
-    <div class="grid-4">
+    <div class="grid-4 gutter-50">
       <dl class="span-2">
         <dt>Species</dt>
         <dd>
           {{#if isEditing}}
             {{
-              view "select"
+              select-2
               content=species
-              optionValuePath="content.id"
-              optionLabelPath="content.speciesName"
-              selection=strain.species
+              optionLabelPath="speciesName"
+              value=strain.species
             }}
           {{else}}
             {{#link-to 'species.show' strain.species}}
diff --git a/app/pods/species/index/template.hbs b/app/pods/species/index/template.hbs
index b73fee7..13fa4b7 100644
--- a/app/pods/species/index/template.hbs
+++ b/app/pods/species/index/template.hbs
@@ -1,5 +1,5 @@
 <h2>{{genus-name}} Species</h2>
-<h3>Total species: {{controller.length}}</h3>
+<h3>Total species: {{model.length}}</h3>
 
 {{add-button label="Add Species" link="species.new"}}
 
diff --git a/app/pods/users/template.hbs b/app/pods/users/template.hbs
index 005836e..f3239cb 100644
--- a/app/pods/users/template.hbs
+++ b/app/pods/users/template.hbs
@@ -1,3 +1,3 @@
-{{#each user in model}}
+{{#each model as |user|}}
   {{user.email}}<br>
 {{/each}}