diff --git a/netbox/templates/circuits/circuittermination_edit.html b/netbox/templates/circuits/circuittermination_edit.html
index 4034695d5..297e46798 100644
--- a/netbox/templates/circuits/circuittermination_edit.html
+++ b/netbox/templates/circuits/circuittermination_edit.html
@@ -26,6 +26,7 @@
                   <p class="form-control-static">{{ form.term_side.value }}</p>
               </div>
           </div>
+          {% render_field form.mark_connected %}
           {% with providernetwork_tab_active=form.initial.provider_network %}
               <ul class="nav nav-tabs" role="tablist">
                   <li role="presentation"{% if not providernetwork_tab_active %} class="active"{% endif %}><a href="#site" role="tab" data-toggle="tab">Site</a></li>
@@ -42,7 +43,6 @@
                   </div>
               </div>
           {% endwith %}
-          {% render_field form.mark_connected %}
       </div>
   </div>
   <div class="panel panel-default">
diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html
index 85cd4352c..718d7f65e 100644
--- a/netbox/templates/circuits/provider.html
+++ b/netbox/templates/circuits/provider.html
@@ -10,7 +10,7 @@
 
 {% block content %}
 <div class="row">
-	<div class="col-md-4">
+	  <div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading">
                 <strong>Provider</strong>
@@ -50,6 +50,9 @@
                 </tr>
             </table>
         </div>
+        {% plugin_left_page object %}
+    </div>
+    <div class="col-md-6">
         {% include 'inc/custom_fields_panel.html' %}
         {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='circuits:provider_list' %}
         <div class="panel panel-default">
@@ -64,9 +67,11 @@
                 {% endif %}
             </div>
         </div>
-        {% plugin_left_page object %}
-	</div>
-	<div class="col-md-8">
+        {% plugin_right_page object %}
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-12">
         <div class="panel panel-default">
             <div class="panel-heading">
                 <strong>Circuits</strong>
@@ -80,8 +85,7 @@
                 </div>
             {% endif %}
         </div>
-    {% include 'inc/paginator.html' with paginator=circuits_table.paginator page=circuits_table.page %}
-    {% plugin_right_page object %}
+        {% include 'inc/paginator.html' with paginator=circuits_table.paginator page=circuits_table.page %}
     </div>
 </div>
 <div class="row">
diff --git a/netbox/templates/circuits/providernetwork.html b/netbox/templates/circuits/providernetwork.html
index 5bc3ef271..22ab3a7c0 100644
--- a/netbox/templates/circuits/providernetwork.html
+++ b/netbox/templates/circuits/providernetwork.html
@@ -11,7 +11,7 @@
 
 {% block content %}
 <div class="row">
-	<div class="col-md-4">
+	  <div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading">
                 <strong>Provider Network</strong>
@@ -33,6 +33,9 @@
                 </tr>
             </table>
         </div>
+        {% plugin_left_page object %}
+    </div>
+    <div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading">
                 <strong>Comments</strong>
@@ -47,18 +50,19 @@
         </div>
         {% include 'inc/custom_fields_panel.html' %}
         {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='circuits:providernetwork_list' %}
-        {% plugin_left_page object %}
-	</div>
-	<div class="col-md-8">
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Circuits</strong>
-        </div>
-        {% include 'inc/table.html' with table=circuits_table %}
+        {% plugin_right_page object %}
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-12">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>Circuits</strong>
+            </div>
+            {% include 'inc/table.html' with table=circuits_table %}
+        </div>
+        {% include 'inc/paginator.html' with paginator=circuits_table.paginator page=circuits_table.page %}
     </div>
-    {% include 'inc/paginator.html' with paginator=circuits_table.paginator page=circuits_table.page %}
-    {% plugin_right_page object %}
-  </div>
 </div>
 <div class="row">
     <div class="col-md-12">