diff --git a/opentech/apply/activity/templates/activity/include/action_list.html b/opentech/apply/activity/templates/activity/include/action_list.html
index 98b106ed54f39d55b28a5431f54102c192e2a451..ebd8bbaa11232a7312f180a2ec98681b9ec50958 100644
--- a/opentech/apply/activity/templates/activity/include/action_list.html
+++ b/opentech/apply/activity/templates/activity/include/action_list.html
@@ -1,7 +1,3 @@
 {% for action in actions %}
-<div>
-    <p>{{ action.timestamp }}</p>
-    <p>{{ action.user }}</p>
-    <p>{{ action.message }}</p>
-</div>
+    {% include "activity/include/listing_base.html" with activity=action %}
 {% endfor %}
diff --git a/opentech/apply/activity/templates/activity/include/all_activity_list.html b/opentech/apply/activity/templates/activity/include/all_activity_list.html
new file mode 100644
index 0000000000000000000000000000000000000000..312a0b3294fa6438dbb81bb3da4973e7151f152f
--- /dev/null
+++ b/opentech/apply/activity/templates/activity/include/all_activity_list.html
@@ -0,0 +1,3 @@
+{% for activity in all_activity %}
+    {% include "activity/include/listing_base.html" with activity=activity %}
+{% endfor %}
diff --git a/opentech/apply/activity/templates/activity/include/comment_list.html b/opentech/apply/activity/templates/activity/include/comment_list.html
index 9217e30137f2b12b4fc33ddc9fccac8d5a409260..cfd58fa44049d4fd9544e96d4aa58ddb506e2de1 100644
--- a/opentech/apply/activity/templates/activity/include/comment_list.html
+++ b/opentech/apply/activity/templates/activity/include/comment_list.html
@@ -1,7 +1,3 @@
 {% for comment in comments %}
-<div>
-    <p>{{ comment.timestamp }}</p>
-    <p>{{ comment.user }}</p>
-    <p>{{ comment.message }}</p>
-</div>
+    {% include "activity/include/listing_base.html" with activity=comment %}
 {% endfor %}
diff --git a/opentech/apply/activity/templates/activity/include/listing_base.html b/opentech/apply/activity/templates/activity/include/listing_base.html
new file mode 100644
index 0000000000000000000000000000000000000000..8d44760d741a3ec26f32fc3f51b9dc0ba634d1dc
--- /dev/null
+++ b/opentech/apply/activity/templates/activity/include/listing_base.html
@@ -0,0 +1,5 @@
+<div>
+    <p>{{ activity.timestamp }}</p>
+    <p>{{ activity.user }}</p>
+    <p>{{ activity.message }}</p>
+</div>
diff --git a/opentech/apply/activity/views.py b/opentech/apply/activity/views.py
index 881b1f1b84a7415d9cd96d22a7d400422a5f5a1b..716bcce1bbd00becbb5d9ee33a9ba3c46adacb13 100644
--- a/opentech/apply/activity/views.py
+++ b/opentech/apply/activity/views.py
@@ -4,6 +4,16 @@ from .forms import CommentForm
 from .models import Activity, COMMENT
 
 
+class AllActivityContextMixin:
+    def get_context_data(self, **kwargs):
+        extra = {
+            'actions': Activity.actions.filter(submission__in=self.object_list),
+            'comments': Activity.comments.filter(submission__in=self.object_list),
+            'all_activity': Activity.objects.filter(submission__in=self.object_list),
+        }
+        return super().get_context_data(**extra, **kwargs)
+
+
 class ActivityContextMixin:
     def get_context_data(self, **kwargs):
         extra = {
diff --git a/opentech/apply/funds/templates/funds/submissions.html b/opentech/apply/funds/templates/funds/submissions.html
index 3428cc9a7d1cc291ff9c14e714f62d167a7d14c8..f039d269e2cac92256acb8b8ece3c1a753a740aa 100644
--- a/opentech/apply/funds/templates/funds/submissions.html
+++ b/opentech/apply/funds/templates/funds/submissions.html
@@ -39,6 +39,10 @@
     {% render_table table %}
 </div>
 
+{% include "activity/include/comment_list.html" %}
+{% include "activity/include/action_list.html" %}
+{% include "activity/include/all_activity_list.html" %}
+
 {% endblock %}
 
 {% block extra_js %}
diff --git a/opentech/apply/funds/views.py b/opentech/apply/funds/views.py
index 2867c82a47672e9c65627113b76b11553191691a..fa5103e367ef28f135788479cf8c91447c1a2220 100644
--- a/opentech/apply/funds/views.py
+++ b/opentech/apply/funds/views.py
@@ -5,7 +5,12 @@ from django.views.generic import DetailView, UpdateView, View
 from django_filters.views import FilterView
 from django_tables2.views import SingleTableMixin
 
-from opentech.apply.activity.views import ActivityContextMixin, CommentFormView, DelegatedViewMixin
+from opentech.apply.activity.views import (
+    AllActivityContextMixin,
+    ActivityContextMixin,
+    CommentFormView,
+    DelegatedViewMixin,
+)
 from opentech.apply.activity.models import Activity
 
 from .forms import ProgressSubmissionForm
@@ -14,7 +19,7 @@ from .tables import SubmissionsTable, SubmissionFilter, SubmissionFilterAndSearc
 from .workflow import SingleStage, DoubleStage
 
 
-class SubmissionListView(SingleTableMixin, FilterView):
+class SubmissionListView(AllActivityContextMixin, SingleTableMixin, FilterView):
     template_name = 'funds/submissions.html'
     table_class = SubmissionsTable