diff --git a/src/handlers/questionnaire.lisp b/src/handlers/questionnaire.lisp
index 198f01c..00baa7b 100644
--- a/src/handlers/questionnaire.lisp
+++ b/src/handlers/questionnaire.lisp
@@ -21,7 +21,7 @@
         (questionnaire-id (generate-uuid)))
     (store-response (ensure-data-file-exist (ml-survey:survey-id survey)
                                             questionnaire-id)
-                    post-params)
+                    (push (format nil "~aT~a" (today) (now)) post-params))
     (ml-survey/views:questionnaire-submit)))
 
 (define-easy-handler (questionnaire :uri #'questionnaire-uri) (lang)
diff --git a/src/handlers/survey.lisp b/src/handlers/survey.lisp
index dd1ec47..30b4df7 100644
--- a/src/handlers/survey.lisp
+++ b/src/handlers/survey.lisp
@@ -27,7 +27,7 @@ Returns a list of integers."
   (loop for f in files
         for resp = (load-response f)
         collect
-	(sus-calc-score-per-row (extract-numbers resp))))
+	(cons (car resp) (sus-calc-score-per-row (extract-numbers (cdr resp))))))
 
 (defun survey-uri-p (uri)
   (let ((parts (split-uri uri)))
diff --git a/src/views/survey.lisp b/src/views/survey.lisp
index 233f465..0573632 100644
--- a/src/views/survey.lisp
+++ b/src/views/survey.lisp
@@ -12,16 +12,15 @@
 	       (ml-survey:survey-html survey)
 	       (when results
              (:h2 "Questionnaire Results")
-	         (let ((count-answers (length (car results))))
+	         (let ((count-answers (length (cdr (car results)))))
                (:table :class "table table-hover"
                  (:caption "Questionnaire results table")
 		         (:thead
 		          (:tr
-		           (loop for i from 1 below count-answers do
-			         (:th :scope "col" (format nil "Q ~a" i)))
+	               (:th :scope "col" "Time")
+	               (loop for i from 1 below count-answers
+                         do (:th :scope "col" (format nil "Q ~a" i)))
                    (:th :scope "col" "SUS Score")))
 		         (:tbody
-		          (loop for result in results do
-		            (:tr
-		             (loop for answer in result do
-			           (:td answer)))))))))))
+		          (loop for result in results
+                        do (:tr (mapcar (lambda (x) (:td x)) result))))))))))