diff --git a/netbox/dcim/tables/template_code.py b/netbox/dcim/tables/template_code.py
index ffc867e78..eeb0504d6 100644
--- a/netbox/dcim/tables/template_code.py
+++ b/netbox/dcim/tables/template_code.py
@@ -4,7 +4,7 @@ LINKTERMINATION = """
{{ termination.parent_object }}
{% endif %}
- {{ termination }}{% if not forloop.last %},{% endif %}
+ {{ termination }}{% if not forloop.last %}
{% endif %}
{% empty %}
{{ ''|placeholder }}
{% endfor %}
diff --git a/netbox/templates/dcim/cable_edit.html b/netbox/templates/dcim/cable_edit.html
index e2cef7601..29bb60d70 100644
--- a/netbox/templates/dcim/cable_edit.html
+++ b/netbox/templates/dcim/cable_edit.html
@@ -1,18 +1,8 @@
-{% extends 'base/layout.html' %}
+{% extends 'generic/object_edit.html' %}
{% load static %}
{% load helpers %}
{% load form_helpers %}
-{% block title %}Connect Cable{% endblock %}
-
-{% block tabs %}
-