diff --git a/app/templates/nopaque.html.j2 b/app/templates/nopaque.html.j2
index 24c0c47af626d6472e017479a8e8d14a6c460c9d..c73265441f89485aadd13e519f56d973a81fdd66 100644
--- a/app/templates/nopaque.html.j2
+++ b/app/templates/nopaque.html.j2
@@ -5,11 +5,12 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- {% if title %}
- <title>nopaque – {{ title }}</title>
- {% else %}
- <title>nopaque</title>
- {% endif %}
+ <title>
+ nopaque
+ {% if title and not url_for(request.endpoint) == url_for('main.index') %}
+ – {{ title }}
+ {% endif %}
+ </title>
<link rel="icon" href="{{ url_for('static', filename='images/nopaque_logo.png') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='fonts/Material_design_icons/material-icons.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='css/Materialize/materialize.min.css') }}">
@@ -105,7 +106,15 @@
{% endif %}
<div class="row">
<div class="col s12">
- <h2>{% if title %}{{ title }}{% else %}Unnamed page{% endif %}</h2>
+ <h2>
+ {% if headline %}
+ {{ headline }}
+ {% elif title %}
+ {{ title }}
+ {% else %}
+ Unnamed page
+ {% endif %}
+ </h2>
</div>
{{ insert_page_content() }}
</div>
diff --git a/app/templates/services/corpus_analysis.html.j2 b/app/templates/services/corpus_analysis.html.j2
index 551b0a42db0efd89c71c6fdaf0e61e02bd4b82f4..68a12ec2ec28469ee787be71f2be007956cbe07c 100644
--- a/app/templates/services/corpus_analysis.html.j2
+++ b/app/templates/services/corpus_analysis.html.j2
@@ -1,6 +1,6 @@
{% extends "nopaque.html.j2" %}
-{% set title = '<i class="material-icons left service" data-service="corpus_analysis" style="font-size: inherit;"></i>Corpus analysis' %}
+{% set headline = '<i class="material-icons left service" data-service="corpus_analysis" style="font-size: inherit;"></i>Corpus analysis' %}
{% block page_content %}
<div class="col s12 m9 l10">
diff --git a/app/templates/services/nlp.html.j2 b/app/templates/services/nlp.html.j2
index a7463b42cbd2d9fc3b5b46d140a222213b02f41e..e53ad862e710c312600e89b89f8013f4dc31b86f 100644
--- a/app/templates/services/nlp.html.j2
+++ b/app/templates/services/nlp.html.j2
@@ -1,6 +1,6 @@
{% extends "nopaque.html.j2" %}
-{% set title = '<i class="material-icons left service" data-service="nlp" style="font-size: inherit;"></i>Natural Language Processing' %}
+{% set headline = '<i class="material-icons left service" data-service="nlp" style="font-size: inherit;"></i>Natural Language Processing' %}
{% block page_content %}
<div class="col s12 m9 l10">
diff --git a/app/templates/services/ocr.html.j2 b/app/templates/services/ocr.html.j2
index a968b1e2ddf3aac785d56b3daf2294c78772797b..8ae0834c98a79892602bea153deef50b36b3eef5 100644
--- a/app/templates/services/ocr.html.j2
+++ b/app/templates/services/ocr.html.j2
@@ -1,6 +1,6 @@
{% extends "nopaque.html.j2" %}
-{% set title = '<i class="material-icons left service" data-service="ocr" style="font-size: inherit;"></i>Optical Character Recognition' %}
+{% set headline = '<i class="material-icons left service" data-service="ocr" style="font-size: inherit;"></i>Optical Character Recognition' %}
{% block page_content %}
<div class="col s12 m9 l10">
diff --git a/app/templates/services/setup_files.html.j2 b/app/templates/services/setup_files.html.j2
index 8611a0e21925054f13d8b5fb0a78e020f170e5fe..f8c0afcb22a827c3240a2113ddf07f7c4cbb6807 100644
--- a/app/templates/services/setup_files.html.j2
+++ b/app/templates/services/setup_files.html.j2
@@ -1,6 +1,6 @@
{% extends "nopaque.html.j2" %}
-{% set title = '<i class="material-icons left service" data-service="setup_files" style="font-size: inherit;"></i>File setup' %}
+{% set headline = '<i class="material-icons left service" data-service="setup_files" style="font-size: inherit;"></i>File setup' %}
{% block page_content %}
<div class="col s12 m9 l10">