diff --git a/_layouts/assignment.html b/_layouts/assignment.html
index 28efdfaace4ea9663f28a1ac5d2ac5586cfddaf8..3812ff7c745086451528d1c5b536349654a2a509 100644
--- a/_layouts/assignment.html
+++ b/_layouts/assignment.html
@@ -22,33 +22,30 @@
         <span>Last revised: {{ page.revised }}</span>
       </div>
 
-<div class="learning-goals">
-<div id="android-goals">
-<strong>Assigned</strong>:
-<ul>
-{% for day in  page.assigned %}
-  <li>{{day}}</li>
-{% endfor %}
-</ul>
-</div>
 
-<div id="hci-goals">    <strong>Due</strong>:
-<ul>
-{% for day in  page.due %}
-  <li>{{day}}</li>
-{% endfor %}
-</ul>
-</div>
-</div>
+      <div id="due dates">
+  {% if page.assigned.size > 1 %}
+<strong>Assigned</strong>
+    <ul>
+    {% for day in  page.assigned %}
+       <li>{{day}}</li>
+    {% endfor %}
+    </ul>
+  {% else %}
+<strong>Assigned</strong>: {{page.assigned}}
+  {% endif %}
 
-<br>
-<div class="learning-goals">
-          <ul>
-            {% for goal in page.hci_goals %}
-              <li>{{goal}}</li>
-            {% endfor %}
-          </ul>
-      </div>
+{% if page.due.size > 1 %}
+    &emsp; <strong>Due</strong>
+    <ul>
+    {% for day in  page.due %}
+       <li>{{day}}</li>
+    {% endfor %}
+    </ul>
+  {% else %}
+    <strong>Due</strong>: {{page.assigned}}
+  {% endif %}
+</div>
 
       {{ content }}