diff --git a/netbox/templates/dcim/inc/consoleport.html b/netbox/templates/dcim/inc/consoleport.html
index 6e115ad0d..184d596dd 100644
--- a/netbox/templates/dcim/inc/consoleport.html
+++ b/netbox/templates/dcim/inc/consoleport.html
@@ -9,7 +9,10 @@
     <td>
         {% with cable=cp.get_connected_cable %}
             {% if cable %}
-                via <a href="{{ cable.get_absolute_url }}">{{ cable }}</a>
+                Cable <a href="{{ cable.get_absolute_url }}">{{ cable }}</a>
+                {% if cable.far_end != cp.connected_endpoint %}
+                    to <a href="{{ cable.far_end.device.get_absolute_url }}">{{ cable.far_end.device }}</a> {{ cable.far_end }}
+                {% endif %}
             {% endif %}
         {% endwith %}
     </td>
diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html
index 30eced3e0..bbb37f517 100644
--- a/netbox/templates/dcim/inc/interface.html
+++ b/netbox/templates/dcim/inc/interface.html
@@ -33,7 +33,7 @@
         {% with cable=iface.get_connected_cable %}
             {% if cable %}
                 <a href="{{ cable.get_absolute_url }}">{{ cable }}</a>
-                {% if cable.far_end != csp.connected_endpoint %}
+                {% if cable.far_end != iface.connected_endpoint %}
                     to <a href="{{ cable.far_end.device.get_absolute_url }}">{{ cable.far_end.device }}</a> {{ cable.far_end }}
                 {% endif %}
             {% endif %}
@@ -150,7 +150,7 @@
             {% endif %}
 
             {# IP addresses table #}
-            <td colspan="7" style="padding: 0">
+            <td colspan="8" style="padding: 0">
                 <table class="table table-condensed interface-ips">
                     <thead>
                         <tr class="text-muted">
diff --git a/netbox/templates/dcim/inc/poweroutlet.html b/netbox/templates/dcim/inc/poweroutlet.html
index 3cc9ca242..4a949ccd2 100644
--- a/netbox/templates/dcim/inc/poweroutlet.html
+++ b/netbox/templates/dcim/inc/poweroutlet.html
@@ -17,6 +17,9 @@
         {% with cable=po.get_connected_cable %}
             {% if cable %}
                 <a href="{{ cable.get_absolute_url }}">{{ cable }}</a>
+                {% if cable.far_end != po.connected_endpoint %}
+                    to <a href="{{ cable.far_end.device.get_absolute_url }}">{{ cable.far_end.device }}</a> {{ cable.far_end }}
+                {% endif %}
             {% endif %}
         {% endwith %}
     </td>
diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html
index 44a10b2fd..8bffef2ae 100644
--- a/netbox/templates/dcim/inc/powerport.html
+++ b/netbox/templates/dcim/inc/powerport.html
@@ -9,7 +9,10 @@
     <td>
         {% with cable=pp.get_connected_cable %}
             {% if cable %}
-                via <a href="{{ cable.get_absolute_url }}">{{ cable }}</a>
+                Cable <a href="{{ cable.get_absolute_url }}">{{ cable }}</a>
+                {% if cable.far_end != pp.connected_endpoint %}
+                    to <a href="{{ cable.far_end.device.get_absolute_url }}">{{ cable.far_end.device }}</a> {{ cable.far_end }}
+                {% endif %}
             {% endif %}
         {% endwith %}
     </td>