diff --git a/Makefile b/Makefile
index 6636d90..067a193 100644
--- a/Makefile
+++ b/Makefile
@@ -27,10 +27,12 @@ static/fonts/Quicksand_Book.otf:
 	rm quicksand.zip
 
 start_s3_storage:
-	test ! -f teststore/pid
+	test -f teststore/pid && ${MAKE} stop_s3_storage
 	mkdir -p teststore
 	MINIO_ACCESS_KEY=polyphonic_test_key MINIO_SECRET_KEY=polyphonic_secret minio server teststore & echo "$$!" > teststore/pid
 	cat teststore/pid
 
 stop_s3_storage:
-	kill `cat teststore/pid` && rm teststore/pid
\ No newline at end of file
+	kill `cat teststore/pid` | true
+	rm teststore/pid
+
diff --git a/interface/templates/interface/submission_list.html b/interface/templates/interface/submission_list.html
index 5089fe4..c4aa730 100644
--- a/interface/templates/interface/submission_list.html
+++ b/interface/templates/interface/submission_list.html
@@ -15,8 +15,13 @@
             <td>{{ submission.name }}</td>
             <td>{{ submission.instrument }}</td>
             <td>
-                <a href="{% url 'submission_detail' project=project.pk pk=submission.pk %}"><i class="fas fa-info-circle"></i></a>
-                <a href="{{ submission.download_url }}" target="_blank" rel="noopener noreferrer"><i class="fas fa-download"></i></a>
+                <a href="{% url 'submission_detail' project=project.pk pk=submission.pk %}"><i class="fas fa-info-circle" title="Info"></i></a>
+                {% if submission.private %}
+                <i style="color: #999" class="fas fa-video" title="No preview available"></i>
+                {% else %}
+                <a href="{% url 'submission_preview' project=project.pk pk=submission.pk %}"><i class="fas fa-video" title="Preview"></i></a>
+                {% endif %}
+                <a href="{{ submission.download_url }}" target="_blank" rel="noopener noreferrer"><i class="fas fa-save" title="Download"></i></a>
             </td>
         </tr>
         {% endfor %}
diff --git a/interface/templates/interface/submission_preview.html b/interface/templates/interface/submission_preview.html
new file mode 100644
index 0000000..4e574e3
--- /dev/null
+++ b/interface/templates/interface/submission_preview.html
@@ -0,0 +1,17 @@
+{% extends "interface/project_base.html" %}
+
+{% block page %}
+<div class="text-center">
+    <div style="text-align: right">
+        <a href="{% url 'submission_list' project=project.pk %}"><i class="fas fa-arrow-left"></i> Back</a>
+    </div>
+    {% with object.download_url as url %}
+    <video class="resource-player" src="{{ url }}" controls></video>
+    <p style="text-align: right">
+        <b>{{ object.name }}</b> ({{ object.instrument }})
+        <small>{{ object.date }}</small>
+        <a href="{{ url }}" target="_blank" rel="noopener noreferrer" download><i class="fas fa-save"></i> Download</a>
+    </p>
+    {% endwith %}
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/interface/urls.py b/interface/urls.py
index 046bdff..88bc0ba 100644
--- a/interface/urls.py
+++ b/interface/urls.py
@@ -18,6 +18,7 @@ urlpatterns = [
 
     path('projects/<int:project>/submission', views.SubmissionCreateView.as_view(), name="submission_create"),
     path('projects/<int:project>/submission/<int:pk>', views.SubmissionDetailView.as_view(), name="submission_detail"),
+    path('projects/<int:project>/submission/<int:pk>/preview', views.SubmissionPreview.as_view(), name="submission_preview"),
     path('projects/<int:project>/submission/<int:pk>/link', views.SubmissionLinkView.as_view(), name="submission_link"),
     path('projects/<int:project>/submission/<int:pk>/upload', views.SubmissionUploadView.as_view(), name="submission_upload"),
     path('projects/<int:project>/submission/<int:pk>/cancel', views.SubmissionCancelView.as_view(), name="submission_cancel"),
diff --git a/interface/views.py b/interface/views.py
index b4e8f22..7db74af 100644
--- a/interface/views.py
+++ b/interface/views.py
@@ -253,6 +253,11 @@ class SubmissionDetailView(ProjectMixin, DetailView):
         context['can_download'] = self.request.is_admin
         return context
 
+class SubmissionPreview(ProjectMixin, DetailView):
+    model = models.Submission
+    template_name = 'interface/submission_preview.html'
+    admin_required = True
+
 class SubmissionUploadView(S3UploadMixin, DetailView):
     template_name = 'interface/s3_upload.html'
     model = models.Submission