diff --git a/web/app/templates/corpora/add_corpus.html.j2 b/web/app/templates/corpora/add_corpus.html.j2
index 9200da09..a1970f0b 100644
--- a/web/app/templates/corpora/add_corpus.html.j2
+++ b/web/app/templates/corpora/add_corpus.html.j2
@@ -5,21 +5,12 @@
 {% set scheme_primary_color = colors.corpus_analysis_darken %}
 {% set scheme_secondary_color = colors.corpus_analysis %}
 
-{% block nav_content %}
-<ul class="tabs tabs-transparent">
-  <li class="tab"><a href="{{ url_for('main.dashboard', _anchor='corpora') }}" target="_self">My Corpora</a></li>
-  <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-  <li class="tab"><a class="active" href="{{ url_for('corpora.add_corpus') }}" target="_self">Add</a></li>
-</ul>
-{% endblock nav_content %}
-
 {% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %}
 
 {% block page_content %}
 <div class="container">
   <div class="row">
     <div class="col s12">
-      <p class="hide-on-small-only">&nbsp;</p>
       <h1 id="title">{{ title }}</h1>
     </div>
 
diff --git a/web/app/templates/corpora/add_corpus_file.html.j2 b/web/app/templates/corpora/add_corpus_file.html.j2
index 193c4ce1..5f8f25b3 100644
--- a/web/app/templates/corpora/add_corpus_file.html.j2
+++ b/web/app/templates/corpora/add_corpus_file.html.j2
@@ -7,23 +7,10 @@
 
 {% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %}
 
-{% block nav_content %}
-<ul class="tabs tabs-transparent">
-  <li class="tab"><a href="{{ url_for('main.dashboard', _anchor='corpora') }}" target="_self">My Corpora</a></li>
-  <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-  <li class="tab"><a href="{{ url_for('corpora.corpus', corpus_id=corpus.id) }}" target="_self">{{ corpus.title }}</a></li>
-  <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-  <li class="tab"><a href="{{ url_for('corpora.corpus', corpus_id=corpus.id, _anchor='corpus-files') }}" target="_self">Corpus files</a></li>
-  <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-  <li class="tab"><a class="active" href="{{ url_for('corpora.add_corpus_file', corpus_id=corpus.id) }}" target="_self">Add</a></li>
-</ul>
-{% endblock nav_content %}
-
 {% block page_content %}
 <div class="container">
   <div class="row">
     <div class="col s12">
-      <p>&nbsp;</p>
       <h1 id="title">{{ title }}</h1>
     </div>
 
diff --git a/web/app/templates/corpora/analyse_corpus.html.j2 b/web/app/templates/corpora/analyse_corpus.html.j2
index ae0d0d06..f4177a3f 100644
--- a/web/app/templates/corpora/analyse_corpus.html.j2
+++ b/web/app/templates/corpora/analyse_corpus.html.j2
@@ -5,22 +5,11 @@
 {% set scheme_primary_color = colors.corpus_analysis_darken %}
 {% set scheme_secondary_color = colors.corpus_analysis %}
 
-{% block nav_content %}
-<ul class="tabs tabs-transparent">
-  <li class="tab"><a href="{{ url_for('main.dashboard', _anchor='corpora') }}" target="_self">My Corpora</a></li>
-  <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-  <li class="tab"><a href="{{ url_for('corpora.corpus', corpus_id=corpus.id) }}" target="_self">{{ corpus.title }}</a></li>
-  <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-  <li class="tab"><a href="{{ url_for('corpora.analyse_corpus', corpus_id=corpus.id) }}" target="_self">Corpus Analysis</a></li>
-</ul>
-{% endblock nav_content %}
-
 {% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %}
 
 {% block page_content %}
 <div class="row">
   <div class="col s12">
-    <p class="hide-on-small-only">&nbsp;</p>
     <div class="card">
       <div class="card-content" style="padding-top: 5px;
                                padding-bottom: 0px;">
diff --git a/web/app/templates/corpora/corpus.html.j2 b/web/app/templates/corpora/corpus.html.j2
index 4d803f20..d2e7fd07 100644
--- a/web/app/templates/corpora/corpus.html.j2
+++ b/web/app/templates/corpora/corpus.html.j2
@@ -4,21 +4,12 @@
 {% set scheme_primary_color = colors.corpus_analysis_darken %}
 {% set scheme_secondary_color = colors.corpus_analysis %}
 
-{% block nav_content %}
-<ul class="tabs tabs-transparent">
-  <li class="tab"><a href="{{ url_for('main.dashboard', _anchor='corpora') }}" target="_self">My Corpora</a></li>
-  <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-  <li class="tab"><a class="active" href="{{ url_for('corpora.corpus', corpus_id=corpus.id) }}" target="_self">{{ corpus.title }}</a></li>
-</ul>
-{% endblock nav_content %}
-
 {% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %}
 
 {% block page_content %}
 <div class="container">
   <div class="row">
     <div class="col s12">
-      <p class="hide-on-small-only">&nbsp;</p>
       <h1 id="title">{{ corpus.title }}</h1>
       <p id="description">{{ corpus.description }}</p>
     </div>
diff --git a/web/app/templates/corpora/corpus_file.html.j2 b/web/app/templates/corpora/corpus_file.html.j2
index 9ebb4f93..810816fe 100644
--- a/web/app/templates/corpora/corpus_file.html.j2
+++ b/web/app/templates/corpora/corpus_file.html.j2
@@ -5,25 +5,12 @@
 {% set scheme_primary_color = colors.corpus_analysis_darken %}
 {% set scheme_secondary_color = colors.corpus_analysis %}
 
-{% block nav_content %}
-<ul class="tabs tabs-transparent">
-  <li class="tab"><a href="{{ url_for('main.dashboard', _anchor='corpora') }}" target="_self">My Corpora</a></li>
-  <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-  <li class="tab"><a href="{{ url_for('corpora.corpus', corpus_id=corpus_file.corpus.id) }}" target="_self">{{ corpus_file.corpus.title }}</a></li>
-  <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-  <li class="tab"><a href="{{ url_for('corpora.corpus', corpus_id=corpus_file.corpus.id, _anchor='corpus-files') }}" target="_self">Corpus files</a></li>
-  <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-  <li class="tab"><a class="active" href="{{ url_for('corpora.corpus_file', corpus_id=corpus_file.corpus.id, corpus_file_id=corpus_file.id) }}" target="_self">{{ corpus_file.author }}: {{ corpus_file.title }}</a></li>
-</ul>
-{% endblock nav_content %}
-
 {% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %}
 
 {% block page_content %}
 <div class="container">
   <div class="row">
     <div class="col s12">
-      <p class="hide-on-small-only">&nbsp;</p>
       <h1 id="title">{{ corpus_file.author }}: {{ corpus_file.title }}</h1>
     </div>
 
diff --git a/web/app/templates/nopaque.html.j2 b/web/app/templates/nopaque.html.j2
index 8b49e1a8..b2e85dbe 100644
--- a/web/app/templates/nopaque.html.j2
+++ b/web/app/templates/nopaque.html.j2
@@ -85,8 +85,8 @@
       {% if current_user.is_authenticated %}
       <a href="#" data-target="sidenav" class="sidenav-trigger"><i class="material-icons">menu</i></a>
       {% endif %}
-      <a href="{{ url_for('main.index') }}" class="brand-logo hide-on-med-and-down" style="height: 100%; overflow: hidden;"><img src="{{ url_for('static', filename='images/nopaque_-_logo_name_slogan.svg') }}" style="height: 128px; margin-top: -32px;"></a>
-      <a href="{{ url_for('main.index') }}" class="brand-logo hide-on-large-only" style="height: 100%; overflow: hidden;"><img src="{{ url_for('static', filename='images/nopaque_-_logo.svg') }}" style="height: 128px; margin-top: -32px;"></a>
+      <a href="{{ url_for('main.index') }}" class="brand-logo hide-on-med-and-down" style="height: 100%; overflow: hidden;"><img src="{{ url_for('static', filename='images/nopaque_-_logo_name_slogan.svg') }}" style="height: 128px; margin-top: -32px; margin-left: -32px;"></a>
+      <a href="{{ url_for('main.index') }}" class="brand-logo hide-on-large-only" style="height: 100%; overflow: hidden;"><img src="{{ url_for('static', filename='images/nopaque_-_logo.svg') }}" style="height: 128px; margin-top: -32px; margin-left: -32px;"></a>
       <ul class="right">
         <li class="hide-on-med-and-down{% if request.path == url_for('main.news') %} active{% endif %}"><a href="{{ url_for('main.news') }}"><i class="material-icons left">notifications</i>News</a></li>
         {% if current_user.is_authenticated %}
@@ -99,7 +99,36 @@
       </ul>
     </div>
     <div class="nav-content secondary-color">
-      {% block nav_content %}{% endblock nav_content %}
+      {% block nav_content %}
+      {% if current_user.is_authenticated %}
+      <ul class="tabs tabs-transparent">
+        <li class="tab disabled"><a><i class="material-icons left">explore</i>Roadmap</a></li>
+        <li class="tab"><a{%if request.path == url_for('services.service', service='file-setup') %} class="active"{% endif %} href="{{ url_for('services.service', service='file-setup') }}" target="_self">File setup</a></li>
+        <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
+        <li class="tab"><a{%if request.path == url_for('services.service', service='ocr') %} class="active"{% endif %} href="{{ url_for('services.service', service='ocr') }}" target="_self">OCR</a></li>
+        <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
+        <li class="tab"><a{%if request.path == url_for('services.service', service='nlp') %} class="active"{% endif %} href="{{ url_for('services.service', service='nlp') }}" target="_self">NLP</a></li>
+        <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
+        <li class="tab"><a{%if request.path == url_for('corpora.add_corpus') %} class="active"{% endif %} href="{{ url_for('corpora.add_corpus') }}" target="_self">Add corpus</a></li>
+        <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
+        {% if corpus %}
+        <li class="tab"><a{%if request.path == url_for('corpora.add_corpus_file', corpus_id=corpus.id) %} class="active"{% endif %} href="{{ url_for('corpora.add_corpus_file', corpus_id=corpus.id) }}" target="_self">Add corpus file(s)</a></li>
+        {% else %}
+        <li class="tab disabled tooltipped" data-tooltip="Select a corpus first"><a>Add corpus file(s)</a></li>
+        {% endif %}
+        <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
+        {% if corpus %}
+        {% if corpus.files.all() %}
+        <li class="tab"><a{%if request.path == url_for('corpora.analyse_corpus', corpus_id=corpus.id) %} class="active"{% endif %} href="{{ url_for('corpora.analyse_corpus', corpus_id=corpus.id) }}" target="_self">Corpus analysis</a></li>
+        {% else %}
+        <li class="tab disabled tooltipped" data-tooltip="Add at least one corpus file first"><a>Corpus analysis</a></li>
+        {% endif %}
+        {% else %}
+        <li class="tab disabled tooltipped" data-tooltip="Select a corpus first"><a>Corpus analysis</a></li>
+        {% endif %}
+      </ul>
+      {% endif %}
+      {% endblock nav_content %}
     </div>
   </nav>
 </div>
diff --git a/web/app/templates/services/_roadmap.html.j2 b/web/app/templates/services/_roadmap.html.j2
deleted file mode 100644
index ec528339..00000000
--- a/web/app/templates/services/_roadmap.html.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-<ul class="tabs tabs-transparent">
-  <li class="tab disabled"><a><i class="material-icons left">explore</i>Roadmap</a></li>
-  <li class="tab"><a{%if request.path == url_for('services.service', service='file-setup') %} class="active"{% endif %} href="{{ url_for('services.service', service='file-setup') }}" target="_self">File setup</a></li>
-  <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-  <li class="tab"><a{%if request.path == url_for('services.service', service='ocr') %} class="active"{% endif %} href="{{ url_for('services.service', service='ocr') }}" target="_self">OCR</a></li>
-  <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-  <li class="tab"><a{%if request.path == url_for('services.service', service='nlp') %} class="active"{% endif %} href="{{ url_for('services.service', service='nlp') }}" target="_self">NLP</a></li>
-  <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
-  <li class="tab"><a{%if request.path == url_for('services.service', service='corpus_analysis') %} class="active"{% endif %} href="{{ url_for('services.service', service='corpus_analysis') }}" target="_self">Corpus Analysis</a></li>
-</ul>
diff --git a/web/app/templates/services/corpus_analysis.html.j2 b/web/app/templates/services/corpus_analysis.html.j2
index 49623f55..906e2586 100644
--- a/web/app/templates/services/corpus_analysis.html.j2
+++ b/web/app/templates/services/corpus_analysis.html.j2
@@ -4,17 +4,12 @@
 {% set scheme_primary_color = colors.corpus_analysis_darken %}
 {% set scheme_secondary_color = colors.corpus_analysis %}
 
-{% block nav_content %}
-{% include 'services/_roadmap.html.j2' %}
-{% endblock nav_content %}
-
 {% block main_attribs %} class="corpus-analysis-color lighten"{% endblock main_attribs %}
 
 {% block page_content %}
 <div class="container">
   <div class="row">
     <div class="col s12">
-      <p class="hide-on-small-only">&nbsp;</p>
       <h1 id="title">{{ title }}</h1>
     </div>
 
diff --git a/web/app/templates/services/file-setup.html.j2 b/web/app/templates/services/file-setup.html.j2
index 7bf9da58..48ac3817 100644
--- a/web/app/templates/services/file-setup.html.j2
+++ b/web/app/templates/services/file-setup.html.j2
@@ -5,17 +5,12 @@
 {% set scheme_primary_color = colors.file_setup_darken %}
 {% set scheme_secondary_color = colors.file_setup %}
 
-{% block nav_content %}
-{% include 'services/_roadmap.html.j2' %}
-{% endblock nav_content %}
-
 {% block main_attribs %} class="file-setup-color lighten"{% endblock main_attribs %}
 
 {% block page_content %}
 <div class="container">
   <div class="row">
     <div class="col s12">
-      <p class="hide-on-small-only">&nbsp;</p>
       <h1 id="title">{{ title }}</h1>
     </div>
 
diff --git a/web/app/templates/services/nlp.html.j2 b/web/app/templates/services/nlp.html.j2
index 48034561..8cb70d28 100644
--- a/web/app/templates/services/nlp.html.j2
+++ b/web/app/templates/services/nlp.html.j2
@@ -5,17 +5,12 @@
 {% set scheme_primary_color = colors.nlp_darken %}
 {% set scheme_secondary_color = colors.nlp %}
 
-{% block nav_content %}
-{% include 'services/_roadmap.html.j2' %}
-{% endblock nav_content %}
-
 {% block main_attribs %} class="nlp-color lighten"{% endblock main_attribs %}
 
 {% block page_content %}
 <div class="container">
   <div class="row">
     <div class="col s12">
-      <p class="hide-on-small-only">&nbsp;</p>
       <h1 id="title">{{ title }}</h1>
     </div>
 
diff --git a/web/app/templates/services/ocr.html.j2 b/web/app/templates/services/ocr.html.j2
index 6e894707..150778c3 100644
--- a/web/app/templates/services/ocr.html.j2
+++ b/web/app/templates/services/ocr.html.j2
@@ -5,17 +5,12 @@
 {% set scheme_primary_color = colors.ocr_darken %}
 {% set scheme_secondary_color = colors.ocr %}
 
-{% block nav_content %}
-{% include 'services/_roadmap.html.j2' %}
-{% endblock nav_content %}
-
 {% block main_attribs %} class="ocr-color lighten"{% endblock main_attribs %}
 
 {% block page_content %}
 <div class="container">
   <div class="row">
     <div class="col s12">
-      <p class="hide-on-small-only">&nbsp;</p>
       <h1 id="title">{{ title }}</h1>
     </div>