diff --git a/netbox_tunnels2/templates/netbox_tunnels2/tunnel_edit.html b/netbox_tunnels2/templates/netbox_tunnels2/tunnel_edit.html
index 68b8147..f787c39 100644
--- a/netbox_tunnels2/templates/netbox_tunnels2/tunnel_edit.html
+++ b/netbox_tunnels2/templates/netbox_tunnels2/tunnel_edit.html
@@ -2,8 +2,6 @@
 {% load static %}
 {% load form_helpers %}
 
-{% block title %}{% if obj.pk %}Editing {{ obj }}{% else %}Add a tunnel{% endif %}{% endblock %}
-
 {% block form %}
 {% render_errors form %}
 <div class="field-group">
@@ -38,17 +36,15 @@ <h4>Side B Interface Assignment</h4>
     </div>
 </div>
 
+{% if form.custom_fields %}
+    <div class="field-group">
+        <h4>Custom Fields</h4>
+            {% render_custom_fields form %}
+    </div>
+{% endif %}
 
 <div class="field-group">
     <h4>Comments</h4>
     {% render_field form.comments %}
 </div>
-{% if form.custom_fields %}
-    <div class="card">
-        <h5 class="card-header">Custom Fields</h5>
-        <div class="card-body">
-            {% render_custom_fields form %}
-        </div>
-    </div>
-{% endif %}
 {% endblock %}
\ No newline at end of file