diff --git a/styles/elements/_accordions.scss b/styles/elements/_accordions.scss
index 560d246c..db005d0a 100644
--- a/styles/elements/_accordions.scss
+++ b/styles/elements/_accordions.scss
@@ -1,5 +1,8 @@
 .accordion {
   @include shadow-panel;
+  margin-top: $gap;
+  margin-bottom: $gap;
+  max-width: $max-panel-width;
 
   &__header {
     margin: 0;
@@ -7,5 +10,28 @@
 
   &__content {
     padding: 0 ($gap * 3) $gap;
+
+    &--list-item {
+      border-bottom: 1px solid $color-gray-lightest;
+
+      &:last-child {
+        border-bottom: none;
+        padding-bottom: $gap;
+      }
+
+      .col {
+        padding-right: $gap * 2;
+      }
+
+      h4 {
+        margin: $gap * 2 0 $gap;
+      }
+
+      h5 {
+        font-size: 1rem;
+        color: $color-gray;
+        margin: 0;
+      }
+    }
   }
 }
diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss
index 3ef5c6e4..4307333a 100644
--- a/styles/sections/_task_order.scss
+++ b/styles/sections/_task_order.scss
@@ -185,32 +185,3 @@
     padding-bottom: $gap * 2.5;
   }
 }
-
-.task-order__list {
-  margin-top: $gap;
-  margin-bottom: $gap;
-  max-width: $max-panel-width;
-
-  &--item {
-    border-bottom: 1px solid $color-gray-lightest;
-
-    &:last-child {
-      border-bottom: none;
-      padding-bottom: $gap;
-    }
-
-    .col {
-      padding-right: $gap * 2;
-    }
-
-    h4 {
-      margin: $gap * 2 0 $gap;
-    }
-
-    h5 {
-      font-size: 1rem;
-      color: $color-gray;
-      margin: 0;
-    }
-  }
-}
diff --git a/templates/task_orders/index.html b/templates/task_orders/index.html
index 1480f26a..cfcc7220 100644
--- a/templates/task_orders/index.html
+++ b/templates/task_orders/index.html
@@ -14,39 +14,37 @@
 
 {% macro TaskOrderList(task_orders, status) %}
   {% set status = "All Task Orders" %}
-  <section class="task-order__list">
-    {% call Accordion(title=status, id=status, heading_tag="h4") %}
-      {% for task_order in task_orders %}
-        <div class="task-order__list--item">
-          <h4><a href="{{ url_for('task_orders.review_task_order', task_order_id=task_order.id) }}">Task Order #{{ task_order.number }} {{ Icon("caret_right", classes="icon--tiny icon--blue" ) }}</a></h4>
-          <div class="row">
-            <div class="col col--grow">
-              <h5>
-                Current Period of Performance
-              </h5>
-              <p>
-                {{ task_order.start_date | formattedDate(formatter="%b %d, %Y") }}
-                -
-                {{ task_order.end_date | formattedDate(formatter="%b %d, %Y") }}
-              </p>
-            </div>
-            <div class="col col--grow">
-              <h5>Total Value</h5>
-              <p>{{ task_order.total_contract_amount | dollars }}</p>
-            </div>
-            <div class="col col--grow">
-              <h5>Total Obligated</h5>
-              <p>{{ task_order.total_obligated_funds | dollars }}</p>
-            </div>
-            <div class="col col--grow">
-              <h5>Total Expended</h5>
-              <p>$0</p>
-            </div>
+  {% call Accordion(title=status, id=status, heading_tag="h4") %}
+    {% for task_order in task_orders %}
+      <div class="accordion__content--list-item">
+        <h4><a href="{{ url_for('task_orders.review_task_order', task_order_id=task_order.id) }}">Task Order #{{ task_order.number }} {{ Icon("caret_right", classes="icon--tiny icon--blue" ) }}</a></h4>
+        <div class="row">
+          <div class="col col--grow">
+            <h5>
+              Current Period of Performance
+            </h5>
+            <p>
+              {{ task_order.start_date | formattedDate(formatter="%b %d, %Y") }}
+              -
+              {{ task_order.end_date | formattedDate(formatter="%b %d, %Y") }}
+            </p>
+          </div>
+          <div class="col col--grow">
+            <h5>Total Value</h5>
+            <p>{{ task_order.total_contract_amount | dollars }}</p>
+          </div>
+          <div class="col col--grow">
+            <h5>Total Obligated</h5>
+            <p>{{ task_order.total_obligated_funds | dollars }}</p>
+          </div>
+          <div class="col col--grow">
+            <h5>Total Expended</h5>
+            <p>$0</p>
           </div>
         </div>
-      {% endfor %}
-    {% endcall %}
-  </section>
+      </div>
+    {% endfor %}
+  {% endcall %}
 {% endmacro %}