diff --git a/src/views/survey.lisp b/src/views/survey.lisp
index 5f99129..011e872 100644
--- a/src/views/survey.lisp
+++ b/src/views/survey.lisp
@@ -8,12 +8,17 @@
       (ml-survey/partials:navbar-en)
       (:section :class "container"
                 (:h2 id)
-                (:ul :class "list-group"
-                     (loop for property in properties
-                           for key = (car property)
-                           for value = (cdr property) do
-                             (:li :class "list-group-item"
-                                  (if (string= key "questionnaire")
-                                      (:a :href (concatenate 'string "/survey/" id value)
-                                          value)
-                                      (format nil "~a: ~a" key value)))))))))
+                (:table :class "table"
+                  (:thead :class "thead-dark"
+                          (:tr (:th :scope "col"
+                                    "Key")
+                               (:th :scope "col"
+                                    "Value")))
+                  (:tbody (loop for property in properties
+                                for key = (car property)
+                                for value = (cdr property) do
+                                  (:tr (:td key)
+                                       (:td (if (string= key "questionnaire")
+                                                (:a :href (concatenate 'string "/survey/" id value)
+                                                    value)
+                                                value))))))))))