diff --git a/helpdesk/templates/helpdesk/followup_edit.html b/helpdesk/templates/helpdesk/followup_edit.html
index d25d73c7..f7ba1eb0 100644
--- a/helpdesk/templates/helpdesk/followup_edit.html
+++ b/helpdesk/templates/helpdesk/followup_edit.html
@@ -15,16 +15,15 @@
             <dd>{{ form.ticket }}</dd>
             <dt><label for="id_title">{% trans "Title:" %}</label></dt>
             <dd>{{ form.title }}</dd>
-            </dt>
             <dt><label for="id_comment">{% trans "Comment:" %}</label></dt>
             <dd>{{ form.comment }}</dd>
-            </dt>
             <dt><label for="id_public">Public:</label></dt>
             <dd>{{ form.public }}</dd>
                 <p>Public tickets are viewable by the submitter and all staff, but non-public tickets can only be seen by staff.</p>
             <dt><label for="id_new_status">New Status:</label></dt>
             <dd>{{ form.new_status }}</dd>
                 <p>If the status was changed, what was it changed to?</p>
+        </dl>
         </fieldset>
         <p><input type="submit" value="Submit"></p>{% csrf_token %}
     </form>
diff --git a/helpdesk/templates/helpdesk/public_homepage.html b/helpdesk/templates/helpdesk/public_homepage.html
index 1b295adc..c281826f 100644
--- a/helpdesk/templates/helpdesk/public_homepage.html
+++ b/helpdesk/templates/helpdesk/public_homepage.html
@@ -50,7 +50,7 @@
                 <dt><label for='id_{{ field.name }}'>{{ field.label }}</label>{% if not field.field.required %} <span class='form_optional'>{% trans "(Optional)" %}</span>{% endif %}</dt>
                 <dd>{{ field }}</dd>
                 {% if field.errors %}<dd class='error'>{{ field.errors }}</dd>{% endif %}
-                {% if field.help_text %}<dd class='form_help_text'>{{ field.help_text }}</dd>{% endif %}</label>
+                {% if field.help_text %}<dd class='form_help_text'>{{ field.help_text }}</dd>{% endif %}
             {% endif %}
         {% endfor %}
     </dl>
diff --git a/helpdesk/templates/helpdesk/public_view_ticket.html b/helpdesk/templates/helpdesk/public_view_ticket.html
index f6c5983e..bbb21a89 100644
--- a/helpdesk/templates/helpdesk/public_view_ticket.html
+++ b/helpdesk/templates/helpdesk/public_view_ticket.html
@@ -66,7 +66,7 @@
 <li><a href='{{ attachment.file.url }}'>{{ attachment.filename }}</a> ({{ attachment.mime_type }}, {{ attachment.size|filesizeformat }})</li>
 {% if forloop.last %}</ul></div>{% endif %}
 {% endfor %}
-</div></ul>{% endif %}
+</ul></div>{% endif %}
 </div>
 {% endfor %}
 {% endif %}
diff --git a/helpdesk/templates/helpdesk/ticket.html b/helpdesk/templates/helpdesk/ticket.html
index 8ef343de..b4c30e6a 100644
--- a/helpdesk/templates/helpdesk/ticket.html
+++ b/helpdesk/templates/helpdesk/ticket.html
@@ -90,7 +90,7 @@ function googleTranslateElementInit() {
 {% for change in followup.ticketchange_set.all %}
 {% if forloop.first %}<div class='changes'><ul>{% endif %}
 <li>{% blocktrans with change.field as field and change.old_value as old_value and change.new_value as new_value %}Changed {{ field }} from {{ old_value }} to {{ new_value }}.{% endblocktrans %}</li>
-{% if forloop.last %}</div></ul>{% endif %}
+{% if forloop.last %}</ul></div>{% endif %}
 {% endfor %}
 {% for attachment in followup.attachment_set.all %}{% if forloop.first %}<div class='attachments'><ul>{% endif %}
 <li><a href='{{ attachment.file.url }}'>{{ attachment.filename }}</a> ({{ attachment.mime_type }}, {{ attachment.size|filesizeformat }})