diff --git a/SciPost_v1/settings/base.py b/SciPost_v1/settings/base.py
index 05df150ab0683d6a9aa9999c7ec7d6f716d1fff5..d4d3509138ded063f4c1dcf5b06de07e6f5e449c 100644
--- a/SciPost_v1/settings/base.py
+++ b/SciPost_v1/settings/base.py
@@ -225,7 +225,7 @@ TIME_ZONE = 'CET'
 USE_I18N = True
 
 USE_L10N = False
-DATE_FORMAT = 'Y-m-d'
+SHORT_DATE_FORMAT = DATE_FORMAT = 'Y-m-d'
 DATETIME_FORMAT = 'Y-m-d H:i'
 
 USE_TZ = True
diff --git a/comments/templates/partials/comments/comments_list.html b/comments/templates/partials/comments/comments_list.html
new file mode 100644
index 0000000000000000000000000000000000000000..169158b74a83ba6cc6039057fbc73bc444fcaa6f
--- /dev/null
+++ b/comments/templates/partials/comments/comments_list.html
@@ -0,0 +1,8 @@
+{% if comments %}
+    <ul class="{{ css_class|default:'' }}">
+        {% for comment in comments %}
+            <li><a href="{{ comment.get_absolute_url }}">{% if comment.is_author_reply %}Author Reply{% else %}Comment{% endif %} by {{ comment.author.get_title_display }} {{ comment.author.user.last_name }} on {{ comment.date_submitted|date:'DATE_FORMAT' }}</a></li>
+            {% include 'partials/comments/comments_list.html' with comments=comment.nested_comments.vetted css_class='m-0 pl-4' %}
+        {% endfor %}
+    </ul>
+{% endif %}
diff --git a/scipost/templates/partials/scipost/personal_page/submissions.html b/scipost/templates/partials/scipost/personal_page/submissions.html
index 0e9c098facb4ad2ada8762c20f92b591de04c308..2af5125f616fa08dae91440a3704a180b2b6e801 100644
--- a/scipost/templates/partials/scipost/personal_page/submissions.html
+++ b/scipost/templates/partials/scipost/personal_page/submissions.html
@@ -21,7 +21,7 @@
     </div>
     <div class="col-12">
         <ul class="list-group list-group-flush">
-            {% for sub in own_submissions %},
+            {% for sub in own_submissions %}
                 <li class="list-group-item">
                     <div class="card-body px-0">
                         {% include 'partials/submissions/submission_card_content.html' with submission=sub %}
diff --git a/submissions/templates/partials/submissions/table_of_contents.html b/submissions/templates/partials/submissions/table_of_contents.html
index 143d3d5f07a10c5c935efe18496fd2b052510703..bb13dd40a81405c2ca4e822158e8410067c08e1f 100644
--- a/submissions/templates/partials/submissions/table_of_contents.html
+++ b/submissions/templates/partials/submissions/table_of_contents.html
@@ -4,27 +4,17 @@
     <div class="card-body">
         <h3 class="card-title">Table of Contents</h3>
         {% for sibling in submission.thread %}
-            <div class="mt-1">
-                <b><a href="{{ sibling.get_absolute_url }}" class="pubtitleli">Version {{ sibling.arxiv_vn_nr }}</a></b>
-                <span class="version-suffix">
-                    {% if sibling.is_current %}
-                        (current version)
-                    {% else %}
-                        (deprecated version)
-                    {% endif %}
-                </span>
+            <div class="my-2">
+                {% if forloop.last %}Submission{% else %}Resubmission{% endif %} <a href="{{ sibling.get_absolute_url }}" class="pubtitleli">{{ sibling.arxiv_identifier_w_vn_nr }}</a> <em>submitted on {{ sibling.submission_date|date:'j F Y' }}</em>
             </div>
-            <div class="p-1">
-                Submitted on {{ sibling.submission_date|date:'j F Y' }}
-                <br>
+            <ul class="m-0 pl-4">
+                {% for report in sibling.reports.accepted %}
+                    <li><a href="{{ report.get_absolute_url }}">Report {{ report.report_nr }} submitted on {{ report.date_submitted }} by {% if report.anonymous %}<em>Anonymous</em>{% else %}{{ report.author.get_title_display }} {{ report.author.user.last_name }}{% endif %}</a></li>
+                    {% include 'partials/comments/comments_list.html' with comments=report.comments.vetted css_class='my-1 pl-4' %}
+                {% endfor %}
+            </ul>
 
-                <ul class="m-0">
-                    {% for report in sibling.reports.accepted %}
-
-                        <li><a href="{{ report.get_absolute_url }}">Report {{ report.report_nr }} submitted on {{ report.date_submitted }} by {% if report.anonymous %}<em>Anonymous</em>{% else %}{{ report.author.get_title_display }} {{ report.author.user.last_name }}{% endif %}</a></li>
-                    {% endfor %}
-                </ul>
-            </div>
+            {% include 'partials/comments/comments_list.html' with comments=sibling.comments.vetted css_class='my-1 pl-4' %}
         {% endfor %}
     </div>
 </div>