diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html
index bb4b6e61d..989d8001c 100644
--- a/netbox/templates/circuits/inc/circuit_termination.html
+++ b/netbox/templates/circuits/inc/circuit_termination.html
@@ -25,69 +25,68 @@
         <strong>Termination - {{ side }} Side</strong>
     </div>
     <div class="card-body">
-    {% if termination %}
+      {% if termination %}
         <table class="table table-hover attr-table">
+          {% if termination.site %}
             <tr>
-                <td>Site</td>
-                <td>
-                    {% if termination.site.region %}
-                    <a href="{{ termination.site.region.get_absolute_url }}">{{ termination.site.region }}</a> /
-                    {% endif %}
-                    <a href="{{ termination.site.get_absolute_url }}">{{ termination.site }}</a>
-                </td>
+              <td>Site</td>
+              <td>
+                {% if termination.site.region %}
+                  <a href="{{ termination.site.region.get_absolute_url }}">{{ termination.site.region }}</a> /
+                {% endif %}
+                <a href="{{ termination.site.get_absolute_url }}">{{ termination.site }}</a>
+              </td>
             </tr>
             <tr>
-                <td>Termination</td>
-                <td>
-                    {% if termination.mark_connected %}
-                      <span class="text-success"><i class="mdi mdi-check-bold"></i></span>
-                      <span class="text-muted">Marked as connected</span>
-                    {% elif termination.cable %}
-                        <div class="float-end">
-                          <a href="{% url 'circuits:circuittermination_trace' pk=termination.pk %}" class="btn btn-primary btn-sm lh-1" title="Trace">
-                            <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
-                          </a>
-                          {% if perms.dcim.delete_cable %}
-                            <a href="{% url 'dcim:cable_delete' pk=termination.cable.pk %}?return_url={{ termination.circuit.get_absolute_url }}" title="Remove cable" class="btn btn-danger btn-sm lh-1">
-                                <i class="mdi mdi-ethernet-cable-off" aria-hidden="true"></i> Disconnect
-                            </a>
-                          {% endif %}
-                        </div>
-
-                        <a href="{{ termination.cable.get_absolute_url }}">{{ termination.cable }}</a>
-                        {% with peer=termination.get_cable_peer %}
-                            to
-                            {% if peer.device %}
-                                <a href="{{ peer.device.get_absolute_url }}">{{ peer.device }}</a><br/>
-                            {% elif peer.circuit %}
-                                <a href="{{ peer.circuit.get_absolute_url }}">{{ peer.circuit }}</a><br/>
-                            {% endif %}
-                            <a href="{{ peer.get_absolute_url }}">{{ peer }}</a>
-                        {% endwith %}
-                    {% else %}
-                        {% if perms.dcim.add_cable %}
-                            <div class="dropdown">
-                                <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                    <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> Connect
-                                </button>
-                                <ul class="dropdown-menu">
-                                    <li><a class="dropdown-item" href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='interface' %}?termination_b_site={{ termination.site.pk }}&return_url={{ object.get_absolute_url }}">Interface</a></li>
-                                    <li><a class="dropdown-item" href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='front-port' %}?termination_b_site={{ termination.site.pk }}&return_url={{ object.get_absolute_url }}">Front Port</a></li>
-                                    <li><a class="dropdown-item" href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='rear-port' %}?termination_b_site={{ termination.site.pk }}&return_url={{ object.get_absolute_url }}">Rear Port</a></li>
-                                    <li><a class="dropdown-item" href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='circuit-termination' %}?termination_b_site={{ termination.site.pk }}&return_url={{ object.get_absolute_url }}">Circuit Termination</a></li>
-                                </ul>
-                            </div>
-                        {% endif %}
-                    </td>
-                </tr>
-            {% comment %} {% else %} {% endcomment %}
-                <tr>
-                    <td>Provider Network</td>
-                    <td>
-                        <a href="{{ termination.provider_network.get_absolute_url }}">{{ termination.provider_network }}</a>
-                    </td>
-                </tr>
-            {% endif %}
+              <td>Termination</td>
+              <td>
+                {% if termination.mark_connected %}
+                  <span class="text-success"><i class="mdi mdi-check-bold"></i></span>
+                  <span class="text-muted">Marked as connected</span>
+                {% elif termination.cable %}
+                  <div class="float-end">
+                    <a href="{% url 'circuits:circuittermination_trace' pk=termination.pk %}" class="btn btn-primary btn-sm lh-1" title="Trace">
+                      <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
+                    </a>
+                    {% if perms.dcim.delete_cable %}
+                      <a href="{% url 'dcim:cable_delete' pk=termination.cable.pk %}?return_url={{ termination.circuit.get_absolute_url }}" title="Remove cable" class="btn btn-danger btn-sm lh-1">
+                        <i class="mdi mdi-ethernet-cable-off" aria-hidden="true"></i> Disconnect
+                      </a>
+                    {% endif %}
+                  </div>
+                  <a href="{{ termination.cable.get_absolute_url }}">{{ termination.cable }}</a>
+                  {% with peer=termination.get_cable_peer %}
+                    to
+                    {% if peer.device %}
+                      <a href="{{ peer.device.get_absolute_url }}">{{ peer.device }}</a><br/>
+                    {% elif peer.circuit %}
+                      <a href="{{ peer.circuit.get_absolute_url }}">{{ peer.circuit }}</a><br/>
+                    {% endif %}
+                    <a href="{{ peer.get_absolute_url }}">{{ peer }}</a>
+                  {% endwith %}
+                {% elif perms.dcim.add_cable %}
+                  <div class="dropdown">
+                    <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                      <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> Connect
+                    </button>
+                    <ul class="dropdown-menu">
+                      <li><a class="dropdown-item" href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='interface' %}?termination_b_site={{ termination.site.pk }}&return_url={{ object.get_absolute_url }}">Interface</a></li>
+                      <li><a class="dropdown-item" href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='front-port' %}?termination_b_site={{ termination.site.pk }}&return_url={{ object.get_absolute_url }}">Front Port</a></li>
+                      <li><a class="dropdown-item" href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='rear-port' %}?termination_b_site={{ termination.site.pk }}&return_url={{ object.get_absolute_url }}">Rear Port</a></li>
+                      <li><a class="dropdown-item" href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='circuit-termination' %}?termination_b_site={{ termination.site.pk }}&return_url={{ object.get_absolute_url }}">Circuit Termination</a></li>
+                    </ul>
+                  </div>
+                {% endif %}
+              </td>
+            </tr>
+          {% else %}
+            <tr>
+              <td>Provider Network</td>
+              <td>
+                <a href="{{ termination.provider_network.get_absolute_url }}">{{ termination.provider_network }}</a>
+              </td>
+            </tr>
+          {% endif %}
             <tr>
                 <td>Speed</td>
                 <td>