diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html
index c331c978a..9434d99ec 100644
--- a/netbox/templates/circuits/provider.html
+++ b/netbox/templates/circuits/provider.html
@@ -5,7 +5,7 @@
 
 {% block content %}
 <div class="row">
-	<div class="col col-md-4">
+	  <div class="col col-md-6">
         <div class="card">
             <h5 class="card-header">
                 Provider
@@ -14,7 +14,7 @@
                 <table class="table table-hover attr-table">
                     <tr>
                         <th scope="row">ASN</th>
-                        <td><code>{{ object.asn|placeholder }}</code></td>
+                        <td>{{ object.asn|placeholder }}</td>
                     </tr>
                     <tr>
                         <th scope="row">Account</th>
@@ -65,8 +65,8 @@
             </div>
         </div>
         {% plugin_right_page object %}
-	</div>
-	<div class="col col-md-8">
+    </div>
+    <div class="col col-md-12">
         <div class="card">
             <h5 class="card-header">
                 Circuits
diff --git a/netbox/templates/circuits/providernetwork.html b/netbox/templates/circuits/providernetwork.html
index e54eae227..49f34e922 100644
--- a/netbox/templates/circuits/providernetwork.html
+++ b/netbox/templates/circuits/providernetwork.html
@@ -29,7 +29,7 @@
                     </tr>
                     <tr>
                         <th scope="row">Description</th>
-                        <td>{{ object.description }}</td>
+                        <td>{{ object.description|placeholder }}</td>
                     </tr>
                 </table>
             </div>
diff --git a/netbox/templates/dcim/platform.html b/netbox/templates/dcim/platform.html
index 8e3640009..c19790b1e 100644
--- a/netbox/templates/dcim/platform.html
+++ b/netbox/templates/dcim/platform.html
@@ -40,10 +40,6 @@
             <th scope="row">NAPALM Driver</th>
             <td>{{ object.napalm_driver|placeholder }}</td>
           </tr>
-          <tr>
-            <th scope="row">NAPALM Arguments</th>
-            <td><pre>{{ object.napalm_args }}</pre></td>
-          </tr>
           <tr>
             <th scope="row">Devices</th>
             <td>
@@ -56,6 +52,14 @@
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">
+    <div class="card">
+      <h5 class="card-header">
+        NAPALM Arguments
+      </h5>
+      <div class="card-body">
+        <pre>{{ object.napalm_args }}</pre>
+      </div>
+    </div>
     {% include 'inc/custom_fields_panel.html' %}
     {% plugin_right_page object %}
   </div>
diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html
index 08270f760..e112ee82c 100644
--- a/netbox/templates/ipam/prefix.html
+++ b/netbox/templates/ipam/prefix.html
@@ -11,16 +11,6 @@
             </h5>
             <div class="card-body">
               <table class="table table-hover attr-table">
-                <tr>
-                    <td colspan="2">
-                    <span class="badge bg-{{ object.get_status_class }}">{{ object.get_status_display }}</span>
-                    {% if object.is_pool %}
-                        <span class="badge bg-success">Is a Pool</span>
-                    {% else %}
-                        <span class="badge bg-info">Not a Pool</span>
-                    {% endif %}
-                    </td>
-                </tr>
                 <tr>
                     <th scope="row">Family</th>
                     <td>IPv{{ object.family }}</td>
@@ -94,6 +84,22 @@
                         {% endif %}
                     </td>
                 </tr>
+                <tr>
+                    <th scope="row">Status</th>
+                    <td>
+                      <span class="label label-{{ object.get_status_class }}">{{ object.get_status_display }}</span>
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row">Is a pool</th>
+                    <td>
+                        {% if object.is_pool %}
+                            <i class="mdi mdi-check-bold text-success" title="Yes"></i>
+                        {% else %}
+                            <i class="mdi mdi-close-thick text-danger" title="No"></i>
+                        {% endif %}
+                    </td>
+                </tr>
                 <tr>
                     <th scope="row">Description</th>
                     <td>{{ object.description|placeholder }}</td>
diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html
index 37fb5a531..d39b1999d 100644
--- a/netbox/templates/ipam/vrf.html
+++ b/netbox/templates/ipam/vrf.html
@@ -14,15 +14,6 @@
             </h5>
             <div class="card-body">
                 <table class="table table-hover attr-table">
-                    <tr>
-                        <td colspan="2">
-                        {% if object.enforce_unique %}
-                            <span class="badge bg-info">Unique IP Space</span>
-                        {% else %}
-                            <span class="badge bg-warning text-body">Non-Unique IP Space</span>
-                        {% endif %}
-                        </td>
-                    </tr>
                     <tr>
                         <th scope="row">Route Distinguisher</th>
                         <td><code>{{ object.rd }}</code></td>
@@ -37,6 +28,16 @@
                             {% endif %}
                         </td>
                     </tr>
+                    <tr>
+                        <th scope="row">Unique IP Space</th>
+                        <td>
+                            {% if object.enforce_unique %}
+                                <i class="mdi mdi-check-bold text-success" title="Yes"></i>
+                            {% else %}
+                                <i class="mdi mdi-close-thick text-danger" title="No"></i>
+                            {% endif %}
+                        </td>
+                    </tr>
                     <tr>
                         <th scope="row">Description</th>
                         <td>{{ object.description|placeholder }}</td>