diff --git a/helpdesk/templates/helpdesk/kb_category_base.html b/helpdesk/templates/helpdesk/kb_category_base.html
index 5b449b7f..8ca89bd7 100644
--- a/helpdesk/templates/helpdesk/kb_category_base.html
+++ b/helpdesk/templates/helpdesk/kb_category_base.html
@@ -1,6 +1,8 @@
 {% load i18n %}
-<h2>{% trans 'Knowledgebase Category' %}:{% blocktrans with category.title as kbcat %}{{ kbcat }}{% endblocktrans %}</h2>
-<p>{{ category.description }}</p>
+{% block header %}
+<h2>{% blocktrans with category.title as kbcat %}{{ kbcat }}{% endblocktrans %}</h2>
+<p>{{ category.description|linebreaks }}</p>
+{% endblock %}
 <div id="accordion">
 {% for item in items %}
 <div class="card mb-3">
@@ -29,7 +31,7 @@
 
                 {% endif %}
                 <a href='{% if iframe %}{% url 'helpdesk:submit_iframe' %}{% else %}{% url 'helpdesk:submit' %}{%endif%}?{% if category.queue %}queue={{category.queue.pk}};_readonly_fields_=queue;{%endif%}kbitem={{item.id}};{{query_param_string}}' class="col-sm">
-                    <button type="button" class="btn btn-success btn-circle btn-xl float-right"><i class="fa fa-envelope fa-lg"></i> {% trans 'Contact a human' %}</button>
+                    <button type="button" class="btn btn-success btn-circle btn-xl float-right"><i  class="fa fa-envelope fa-lg"></i> {% trans 'Contact a human' %}</button>
                 </a>
             </div>
             <div>
@@ -43,8 +45,12 @@
 </div>
 {% endfor %}
 </div>
+{% block footer %}
+{% endblock %}
 {% if category.queue %}
 <a href='{% if iframe %}{% url 'helpdesk:submit_iframe' %}{% else %}{% url 'helpdesk:submit' %}{%endif%}?queue={{category.queue.pk}};_readonly_fields_=queue;{{query_param_string}}'>
+    {% block submit_button %}
     <button type="button" class="btn btn-danger btn-circle btn-xl float-right"><i class="fa fa-envelope fa-lg"></i> {% trans 'Contact a human' %}</button>
+    {% endblock %}
 </a>
 {% endif %}
diff --git a/helpdesk/templates/helpdesk/public_create_ticket_base.html b/helpdesk/templates/helpdesk/public_create_ticket_base.html
index 82cf375b..45325642 100644
--- a/helpdesk/templates/helpdesk/public_create_ticket_base.html
+++ b/helpdesk/templates/helpdesk/public_create_ticket_base.html
@@ -3,7 +3,9 @@
 {% with request|load_helpdesk_settings as helpdesk_settings %}
 
 {% if helpdesk_settings.HELPDESK_SUBMIT_A_TICKET_PUBLIC %}
+{% block form_header %}
 <p>{% trans "Unless otherwise stated, all fields are required." %} {% trans "Please provide as descriptive a title and description as possible." %}</p>
+{% endblock %}
 <form method='post' enctype='multipart/form-data'>
     {{ form|bootstrap4form }}
     <button type="submit" class="btn btn-primary btn-lg btn-block"><i class="fa fa-send"></i>&nbsp;{% trans "Submit Ticket" %}</button>