diff --git a/src/scripts/tutti/10_tasks.js b/src/scripts/tutti/10_tasks.js
index 8e00531..12114d9 100644
--- a/src/scripts/tutti/10_tasks.js
+++ b/src/scripts/tutti/10_tasks.js
@@ -153,7 +153,7 @@ function task_add(shot_id, task_id, task_type)
                 id="task-' + task_id + '">\
                 <span class="status-indicator"></span>\
                 <span class="name">-save your task first-</span>\
-                <span class="type">-</span>\
+                <span class="due_date">-</span>\
             </a>\
             ');
     } else if (context == 'shot') {
@@ -275,7 +275,7 @@ function task_save(task_id, task_url) {
             // NOTE: this is tightly linked to the HTML of the task list in for_project.jade.
             $('.task-name-' + saved_task._id).text(saved_task.name).flashOnce();
             $task.find('span.name').text(saved_task.name);
-            $task.find('span.type').text(saved_task.properties.task_type);
+            $task.find('span.due_date').text(moment().to(saved_task.properties.due_date));
             $task.find('span.status').text(saved_task.properties.status.replace('_', ' '));
 
             $task
diff --git a/src/styles/_tasks.sass b/src/styles/_tasks.sass
index 0930db1..fc307ba 100644
--- a/src/styles/_tasks.sass
+++ b/src/styles/_tasks.sass
@@ -127,7 +127,7 @@
 		.status-indicator
 			transform: scale(1.2)
 
-	.status, .type
+	.status, .type, .due_date
 		display: inline-block
 		margin-right: 10px
 		text-transform: uppercase
@@ -139,6 +139,15 @@
 		color: $color-text-dark-secondary
 		+text-overflow-ellipsis
 
+	.due_date
+		margin-left: auto
+		color: $color-text-dark-primary
+		+text-overflow-ellipsis
+
+		&.late
+			color: $color-danger
+
+
 	.name
 		padding: 10px
 		+text-overflow-ellipsis
diff --git a/src/templates/attract/layout.jade b/src/templates/attract/layout.jade
index 59b9564..37a2bb9 100644
--- a/src/templates/attract/layout.jade
+++ b/src/templates/attract/layout.jade
@@ -190,8 +190,8 @@ html(lang="en")
 					.modal-body
 
 		script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.select2.min.js') }}", async=true)
-		script(src="{{ url_for('static_attract', filename='assets/js/vendor/moment-2.15.2.min.js') }}", async=true)
-		script(src="{{ url_for('static_attract', filename='assets/js/vendor/pikaday.js') }}", async=true)
+		script(src="{{ url_for('static_attract', filename='assets/js/vendor/moment-2.15.2.min.js') }}")
+		script(src="{{ url_for('static_attract', filename='assets/js/vendor/pikaday.js') }}")
 
 		script.
 			{% if project %}
diff --git a/src/templates/attract/tasks/for_project.jade b/src/templates/attract/tasks/for_project.jade
index 4f04bee..b10c615 100644
--- a/src/templates/attract/tasks/for_project.jade
+++ b/src/templates/attract/tasks/for_project.jade
@@ -23,7 +23,7 @@
 			span.shotname(title="Shot {{ task._parent_info.name }}") {{ task._parent_info.name }}
 			| {% endif %}
 			span.name {{ task.name }}
-			span.type {{ task.properties.task_type }}
+			span.due_date {{ task.properties.due_date | hide_none }}
 		| {% endfor %}
 
 .col-splitter
diff --git a/src/templates/attract/tasks/task_list_for_user.jade b/src/templates/attract/tasks/task_list_for_user.jade
index ecfbb9f..2805166 100644
--- a/src/templates/attract/tasks/task_list_for_user.jade
+++ b/src/templates/attract/tasks/task_list_for_user.jade
@@ -14,7 +14,7 @@
 		span.shotname {{ task._parent_info.name }}
 		| {% endif %}
 		span.name {{ task.name }}
-		span.type {{ task.properties.task_type }}
+		span.due_date {{ task.properties.due_date }}
 	| {% else %}
 	.col-list-item.empty
 		span.no-tasks