diff --git a/app/corpora/views.py b/app/corpora/views.py
index e6c82d77..20c18e5f 100644
--- a/app/corpora/views.py
+++ b/app/corpora/views.py
@@ -74,7 +74,8 @@ def corpus_analysis(corpus_id):
         return redirect(url_for('corpora.corpus_analysis', corpus_id=corpus_id,
                                 query=query, hits_per_page=hits_per_page,
                                 context=context))
-    return render_template('corpora/corpus_analysis.html.j2', corpus=corpus,
+    return render_template('corpora/corpus_analysis.html.j2',
+                           corpus_id=corpus_id,
                            form=form, dl_form=dl_form,
                            title='Corpus: {}'.format(corpus.title))
 
diff --git a/app/static/js/CorpusList.js b/app/static/js/CorpusList.js
index dc8fdfa4..5c52edf3 100644
--- a/app/static/js/CorpusList.js
+++ b/app/static/js/CorpusList.js
@@ -79,3 +79,8 @@ class CorpusList extends List {
     );
   }
 }
+CorpusList.STATUS_COLORS = {"unprepared": "grey",
+                            "preparable": "orange",
+                            "preparing": "yellow",
+                            "prepared": "green",
+                            "default": "red"};
diff --git a/app/static/js/JobList.js b/app/static/js/JobList.js
index fdcaddb7..a398c23b 100644
--- a/app/static/js/JobList.js
+++ b/app/static/js/JobList.js
@@ -113,7 +113,11 @@ JobList.SERVICE_COLORS = {"nlp": "blue",
 JobList.SERVICE_ICONS = {"nlp": "format_textdirection_l_to_r",
                          "ocr": "find_in_page",
                          "default": "help"};
-JobList.STATUS_COLORS = {"pending": "amber",
-                         "running": "indigo",
-                         "complete": "teal",
+JobList.STATUS_COLORS = {"submitted": "blue",
+                         "preparing": "light-blue",
+                         "pending": "orange",
+                         "running": "amber",
+                         "complete": "green",
+                         "stopping": "orange",
+                         "removing": "deep-orange",
                          "default": "red"};
diff --git a/app/templates/corpora/corpus_analysis.html.j2 b/app/templates/corpora/corpus_analysis.html.j2
index 6a88bc71..bd2eb46e 100644
--- a/app/templates/corpora/corpus_analysis.html.j2
+++ b/app/templates/corpora/corpus_analysis.html.j2
@@ -1,7 +1,9 @@
 {% extends "full_width.html.j2" %}
 
 {% block page_content %}
+
 <div class="col s12 m3 l3 sticky">
+  <a class="waves-effect waves-light btn" href="{{ url_for('corpora.corpus', corpus_id=corpus_id) }}"><i class="material-icons left">arrow_back</i>Back to corpus overview</a>
   <div class="card">
     <form id="query_form" method="POST">
     <div class="card-content">
diff --git a/docker-compose.yml b/docker-compose.yml
index 974c0dff..35a95b66 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       - storage:/mnt/opaque
       - ./logs:/home/opaque_daemon/logs
       - ../opaque_daemon/opaque_daemon.py:/home/opaque_daemon/opaque_daemon.py
-      - ../opaque_daemon/merge_corpus_files.py:/home/merge_corpus_files.py
+      - ../opaque_daemon/merge_corpus_files.py:/home/opaque_daemon/merge_corpus_files.py
       - ../opaque_daemon/config.ini:/home/opaque_daemon/config.ini
       - ../opaque_daemon/docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh
       - $HOME/.docker/config.json:/home/opaque_daemon/.docker/config.json