diff --git a/HISTORY.rst b/HISTORY.rst
index 3282232228..2e325badbe 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -31,6 +31,8 @@
 - Remove code statistics from the documentation.
 - Remove the pending work chapter. This is now available in the Wiki: 
   wiki.mayan-edms.com
+- Unify template title rendering.
+- Add support for template subtitles.
 
 3.0.1 (2018-07-08)
 =================
diff --git a/mayan/apps/appearance/templates/appearance/about.html b/mayan/apps/appearance/templates/appearance/about.html
index bfab90fcfa..cdbbe04919 100644
--- a/mayan/apps/appearance/templates/appearance/about.html
+++ b/mayan/apps/appearance/templates/appearance/about.html
@@ -54,9 +54,6 @@
 {% endblock stylesheets %}
 
 {% block content %}
-    <h3>{% trans 'About' %}</h3>
-    <hr>
-
     {% build as build_number %}
     <div class="well">
         <h3 class="text-center">{% project_information '__title__' %} ({% trans 'Version' %} {% project_information '__version__' %})</h3>
diff --git a/mayan/apps/appearance/templates/appearance/base.html b/mayan/apps/appearance/templates/appearance/base.html
index 677f8c7758..7d9b43915f 100644
--- a/mayan/apps/appearance/templates/appearance/base.html
+++ b/mayan/apps/appearance/templates/appearance/base.html
@@ -45,6 +45,7 @@
             {% else %}
                 <div class="col-xs-12">
             {% endif %}
+                {% include 'appearance/calculate_form_title.html' %}
                 {% block content %}{% endblock %}
                 {% block footer %}{% endblock %}
             </div>
diff --git a/mayan/apps/appearance/templates/appearance/calculate_form_title.html b/mayan/apps/appearance/templates/appearance/calculate_form_title.html
index 907b90511e..47f7a93419 100644
--- a/mayan/apps/appearance/templates/appearance/calculate_form_title.html
+++ b/mayan/apps/appearance/templates/appearance/calculate_form_title.html
@@ -4,25 +4,37 @@
 
 {% smart_setting 'APPEARANCE_MAXIMUM_TITLE_LENGTH' as maximum_title_length %}
 
-{# Avoid horizontal scroll on small displays #}
-{% if not html_title %}
-    <span style="word-break: break-all;">
+{% if not non_html_title %}
+    <h3>
 {% endif %}
 
     {% if title %}
         {{ title|truncatechars:maximum_title_length }}
     {% else %}
-        {% if read_only %}
-            {% blocktrans %}Details for: {{ object }}{% endblocktrans %}
+        {% if delete_view %}
+            {% trans 'Confirm delete' %}
         {% else %}
-            {% if object %}
-                {% blocktrans with object as object %}Edit: {{ object }}{% endblocktrans %}
+            {% if form %}
+                {% trans 'Confirm' %}
             {% else %}
-                {% trans 'Create' %}
+                {% if read_only %}
+                    {% blocktrans %}Details for: {{ object }}{% endblocktrans %}
+                {% else %}
+                    {% if object %}
+                        {% blocktrans with object as object %}Edit: {{ object }}{% endblocktrans %}
+                    {% else %}
+                        {% trans 'Create' %}
+                    {% endif %}
+                {% endif %}
             {% endif %}
         {% endif %}
     {% endif %}
 
-{% if not html_title %}
-    </span>
+{% if not non_html_title %}
+    </h3>
+
+    {% if subtitle %}
+        <small>{{ subtitle }}</small>
+    {% endif %}
+    <hr/>
 {% endif %}
diff --git a/mayan/apps/appearance/templates/appearance/generic_confirm.html b/mayan/apps/appearance/templates/appearance/generic_confirm.html
index 18aa5c6faf..3227c3d9f2 100644
--- a/mayan/apps/appearance/templates/appearance/generic_confirm.html
+++ b/mayan/apps/appearance/templates/appearance/generic_confirm.html
@@ -3,30 +3,15 @@
 {% load i18n %}
 {% load static %}
 
-{% block title %}{% trans 'Confirm' %} {{ title }}{% endblock %}
+{% block title %}{% include 'appearance/calculate_form_title.html' with non_html_title=True %}{% endblock %}
 
 {% block content %}
-    <h3>
-        {% if delete_view %}
-            {% trans 'Confirm delete' %}
-        {% else %}
-            {% trans 'Confirm' %}
-        {% endif %}
-    </h3>
-    <hr>
-
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
                 <h4 class="modal-title">
-                    {% if title %}
-                        <h3>{{ title }}</h3>
-                    {% else %}
-                        {% if delete_view %}
-                            <h3>{% blocktrans %}Delete: {{ object }}?{% endblocktrans %}</h3>
-                        {% endif %}
-                    {% endif %}
+                    <h3>{% trans 'Are you sure?' %}</h3>
                 </h4>
             </div>
             {% if message %}
diff --git a/mayan/apps/appearance/templates/appearance/generic_form.html b/mayan/apps/appearance/templates/appearance/generic_form.html
index 6f486381fd..66086009ee 100644
--- a/mayan/apps/appearance/templates/appearance/generic_form.html
+++ b/mayan/apps/appearance/templates/appearance/generic_form.html
@@ -2,12 +2,8 @@
 
 {% load common_tags %}
 
-{% block title %}{% include 'appearance/calculate_form_title.html' with html_title=True %}{% endblock %}
-
+{% block title %}{% include 'appearance/calculate_form_title.html' with non_html_title=True %}{% endblock %}
 {% block content %}
-    <h3>{% include 'appearance/calculate_form_title.html' %}</h3>
-    <hr>
-
     {% if form %}
         {% with '' as title %}
             {% include "appearance/generic_form_subtemplate.html" %}
diff --git a/mayan/apps/appearance/templates/appearance/generic_list.html b/mayan/apps/appearance/templates/appearance/generic_list.html
index 3ad3138c75..2f4ef7b036 100644
--- a/mayan/apps/appearance/templates/appearance/generic_list.html
+++ b/mayan/apps/appearance/templates/appearance/generic_list.html
@@ -4,14 +4,9 @@
 
 {% load navigation_tags %}
 
-{% block title %}{% include 'appearance/calculate_form_title.html' with html_title=True %}{% endblock %}
+{% block title %}{% include 'appearance/calculate_form_title.html' with non_html_title=True %}{% endblock %}
 
 {% block content %}
-    {% if title %}
-        <h3>{% include 'appearance/calculate_form_title.html' %}</h3>
-        <hr>
-    {% endif %}
-
     {% if list_as_items %}
         {% include 'appearance/generic_list_items_subtemplate.html' %}
     {% else %}
diff --git a/mayan/apps/appearance/templates/appearance/generic_list_horizontal.html b/mayan/apps/appearance/templates/appearance/generic_list_horizontal.html
index 332bd4ba98..91a99cf10b 100644
--- a/mayan/apps/appearance/templates/appearance/generic_list_horizontal.html
+++ b/mayan/apps/appearance/templates/appearance/generic_list_horizontal.html
@@ -8,10 +8,6 @@
 {% block title %}{{ title }}{% endblock %}
 
 {% block content %}
-    <h3>
-        {{ title }}
-    </h3>
-    <hr>
     <div class="well center-block">
         <div class="row">
             {% with 'navigation/large_button_link.html' as link_template %}
diff --git a/mayan/apps/appearance/templates/appearance/generic_multi_subtemplates.html b/mayan/apps/appearance/templates/appearance/generic_multi_subtemplates.html
index bbc3a53c1e..542bd6ec63 100644
--- a/mayan/apps/appearance/templates/appearance/generic_multi_subtemplates.html
+++ b/mayan/apps/appearance/templates/appearance/generic_multi_subtemplates.html
@@ -2,14 +2,9 @@
 
 {% load common_tags %}
 
-{% block title %}{% include 'appearance/calculate_form_title.html' with html_title=True %}{% endblock %}
+{% block title %}{% include 'appearance/calculate_form_title.html' with non_html_title=True %}{% endblock %}
 
 {% block content %}
-    {% if main_title %}
-        <h3>{{ main_title }}</h3>
-        <hr>
-    {% endif %}
-
     <div class="row">
         {% for subtemplate in subtemplates_list %}
             {% if subtemplate.column_class %}
diff --git a/mayan/apps/appearance/templates/appearance/generic_multiform_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_multiform_subtemplate.html
index e7ffcf627b..eb695f0775 100644
--- a/mayan/apps/appearance/templates/appearance/generic_multiform_subtemplate.html
+++ b/mayan/apps/appearance/templates/appearance/generic_multiform_subtemplate.html
@@ -1,9 +1,5 @@
 {% load i18n %}
 {% load static %}
-    <h4>
-        {% include 'appearance/calculate_form_title.html' %}
-    </h4>
-    <hr>
     <div class="well">
         {% if is_multipart %}
             <form action="{{ form_action }}" class="{{ form_class|default:'' }}" enctype="multipart/form-data" id="{{ form_id|default:'' }}" method="{{ submit_method|default:'post' }}">
diff --git a/mayan/apps/appearance/templates/appearance/generic_template.html b/mayan/apps/appearance/templates/appearance/generic_template.html
index 5fb185d01a..e703e0fb61 100644
--- a/mayan/apps/appearance/templates/appearance/generic_template.html
+++ b/mayan/apps/appearance/templates/appearance/generic_template.html
@@ -3,7 +3,5 @@
 {% block title %}{{ title }}{% endblock %}
 
 {% block content %}
-    <h3>{{ title }}</h3>
-    <hr>
     {% include 'appearance/generic_subtemplate.html' %}
 {% endblock %}
diff --git a/mayan/apps/appearance/templates/appearance/generic_wizard.html b/mayan/apps/appearance/templates/appearance/generic_wizard.html
index dce48af1c8..63846679fd 100644
--- a/mayan/apps/appearance/templates/appearance/generic_wizard.html
+++ b/mayan/apps/appearance/templates/appearance/generic_wizard.html
@@ -2,12 +2,9 @@
 
 {% load i18n %}
 
-{% block title %}{% include 'appearance/calculate_form_title.html' with html_title=True %}{% endblock %}
+{% block title %}{% include 'appearance/calculate_form_title.html' with non_html_title=True %}{% endblock %}
 
 {% block content %}
-    <h3>{% include 'appearance/calculate_form_title.html' %}</h3>
-    <hr>
-
     {{ wizard.management_form }}
     {% with step_title as title %}
 
diff --git a/mayan/apps/appearance/templates/appearance/home.html b/mayan/apps/appearance/templates/appearance/home.html
index 37af0c3f40..b62d1c427b 100644
--- a/mayan/apps/appearance/templates/appearance/home.html
+++ b/mayan/apps/appearance/templates/appearance/home.html
@@ -17,11 +17,6 @@
 {% endblock javascript %}
 
 {% block content %}
-    <h3>
-        {% trans 'Dashboard' %}
-    </h3>
-    <hr>
-
     <div class="row">
         <div class="col-xs-12">
             {% if missing_list %}
diff --git a/mayan/apps/cabinets/templates/cabinets/cabinet_details.html b/mayan/apps/cabinets/templates/cabinets/cabinet_details.html
index e790e597d0..d04f7ba414 100644
--- a/mayan/apps/cabinets/templates/cabinets/cabinet_details.html
+++ b/mayan/apps/cabinets/templates/cabinets/cabinet_details.html
@@ -5,17 +5,13 @@
 
 {% load navigation_tags %}
 
-{% block title %}{% include 'appearance/calculate_form_title.html' with html_title=True %}{% endblock %}
+{% block title %}{% include 'appearance/calculate_form_title.html' with non_html_title=True %}{% endblock %}
 
 {% block stylesheets %}
     <link rel="stylesheet" href="{% static 'cabinets/packages/jstree/dist/themes/default/style.min.css' %}" />
 {% endblock %}
 
 {% block content %}
-    {% if title %}
-        <h3>{{ title }}</h3>
-        <hr>
-    {% endif %}
     <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-2">
             <h4>{% trans 'Navigation:' %}</h4>
diff --git a/mayan/apps/common/views.py b/mayan/apps/common/views.py
index 05b1bef0bb..4db08c68c5 100644
--- a/mayan/apps/common/views.py
+++ b/mayan/apps/common/views.py
@@ -34,7 +34,8 @@ from .permissions_runtime import permission_error_log_view
 from .utils import check_version
 
 
-class AboutView(TemplateView):
+class AboutView(SimpleView):
+    extra_context = {'title': _('About')}
     template_name = 'appearance/about.html'
 
 
diff --git a/mayan/apps/document_indexing/templates/document_indexing/node_details.html b/mayan/apps/document_indexing/templates/document_indexing/node_details.html
index aff1e25cff..a1ac26b6bf 100644
--- a/mayan/apps/document_indexing/templates/document_indexing/node_details.html
+++ b/mayan/apps/document_indexing/templates/document_indexing/node_details.html
@@ -4,14 +4,9 @@
 
 {% load navigation_tags %}
 
-{% block title %}{% include 'appearance/calculate_form_title.html' with html_title=True %}{% endblock %}
+{% block title %}{% include 'appearance/calculate_form_title.html' with non_html_title=True %}{% endblock %}
 
 {% block content %}
-    {% if title %}
-        <h3>{{ title }}</h3>
-        <hr>
-    {% endif %}
-
     <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-3">
             {{ navigation }}
diff --git a/mayan/apps/document_states/views.py b/mayan/apps/document_states/views.py
index 3258b9b27a..6b2de36d68 100644
--- a/mayan/apps/document_states/views.py
+++ b/mayan/apps/document_states/views.py
@@ -177,23 +177,17 @@ class SetupWorkflowDocumentTypesView(AssignRemoveView):
         # TODO: add task launching this workflow for all the document types
         # of item
 
-    def dispatch(self, request, *args, **kwargs):
-        messages.warning(
-            self.request, _(
+    def get_extra_context(self):
+        return {
+            'object': self.get_object(),
+            'subtitle': _(
                 'Removing a document type from a workflow will also '
                 'remove all running instances of that workflow for '
                 'documents of the document type just removed.'
-            )
-        )
-
-        return super(SetupWorkflowDocumentTypesView, self).dispatch(request, *args, **kwargs)
-
-    def get_extra_context(self):
-        return {
+            ),
             'title': _(
                 'Document types assigned the workflow: %s'
             ) % self.get_object(),
-            'object': self.get_object(),
         }
 
     def get_object(self):