diff --git a/src/servala/frontend/templates/frontend/organizations/service_instance_detail.html b/src/servala/frontend/templates/frontend/organizations/service_instance_detail.html
index d375344..4f0f00e 100644
--- a/src/servala/frontend/templates/frontend/organizations/service_instance_detail.html
+++ b/src/servala/frontend/templates/frontend/organizations/service_instance_detail.html
@@ -102,7 +102,16 @@
                         </div>
                     </div>
                 {% endif %}
-                {% include "includes/control_plane_user_info.html" with control_plane=instance.context.control_plane %}
+                {% if control_plane.user_info %}
+                    <div class="card">
+                        <div class="card-header">
+                            <h4 class="card-title">{% translate "Service Provider Zone Information" %}</h4>
+                        </div>
+                        <div class="card-content">
+                            {% include "includes/control_plane_user_info.html" with control_plane=instance.context.control_plane %}
+                        </div>
+                    </div>
+                {% endif %}
             </div>
             {% if instance.spec and spec_fieldsets %}
                 <div class="col-12">
diff --git a/src/servala/frontend/templates/frontend/organizations/service_offering_detail.html b/src/servala/frontend/templates/frontend/organizations/service_offering_detail.html
index 842e610..df57811 100644
--- a/src/servala/frontend/templates/frontend/organizations/service_offering_detail.html
+++ b/src/servala/frontend/templates/frontend/organizations/service_offering_detail.html
@@ -7,9 +7,14 @@
         {{ offering }}
     {% endblock page_title %}
 {% endblock html_title %}
-{% partialdef control-plane-info %}
-{% if selected_plane %}
-    {% include "includes/control_plane_user_info.html" with control_plane=selected_plane %}
+{% partialdef control-plane-info inline=True %}
+{% if selected_plane and selected_plane.user_info %}
+    <div class="row mt-3">
+        <div class="col-12">
+            <h6 class="mb-3">{% translate "Service Provider Zone Information" %}</h6>
+            {% include "includes/control_plane_user_info.html" with control_plane=selected_plane %}
+        </div>
+    </div>
 {% endif %}
 {% endpartialdef %}
 {% partialdef service-form %}
@@ -31,7 +36,7 @@
 {% block content %}
     <section class="section">
         <div class="row">
-            <div class="col-12 col-lg-8">
+            <div class="col-12">
                 <div class="card">
                     <div class="card-header d-flex align-items-center">
                         {% if service.logo %}
@@ -64,6 +69,13 @@
                                 {{ select_form }}
                             </form>
                         {% endif %}
+                        {% if has_control_planes %}
+                            <div id="control-plane-info"
+                                 hx-trigger="load, change from:form"
+                                 hx-get="{{ request.path }}?fragment=control-plane-info">
+                                {% partial control-plane-info %}
+                            </div>
+                        {% endif %}
                         {% if service.external_links or offering.external_links %}
                             <div class="row mt-3">
                                 <div class="col-12">
@@ -83,13 +95,6 @@
                 </div>
                 <div id="service-form">{% partial service-form %}</div>
             </div>
-            <div class="col-12 col-lg-4">
-                {% if has_control_planes %}
-                    <div id="control-plane-info"
-                         hx-trigger="load, change from:form"
-                         hx-get="{{ request.path }}?fragment=control-plane-info">{% partial control-plane-info %}</div>
-                {% endif %}
-            </div>
         </div>
     </section>
 {% endblock content %}
diff --git a/src/servala/frontend/templates/includes/control_plane_user_info.html b/src/servala/frontend/templates/includes/control_plane_user_info.html
index b9ffe99..e8fcee8 100644
--- a/src/servala/frontend/templates/includes/control_plane_user_info.html
+++ b/src/servala/frontend/templates/includes/control_plane_user_info.html
@@ -1,26 +1,15 @@
 {% load i18n %}
-{% comment %}
-Reusable snippet for displaying ControlPlane user_info
-Usage: {% include "includes/control_plane_user_info.html" with control_plane=control_plane_object %}
-{% endcomment %}
 {% if control_plane.user_info %}
-    <div class="card">
-        <div class="card-header">
-            <h4 class="card-title">{% translate "Service Provider Zone Information" %}</h4>
-        </div>
-        <div class="card-content">
-            <div class="table-responsive">
-                <table class="table mb-0 table-lg">
-                    <tbody>
-                        {% for key, value in control_plane.user_info.items %}
-                            <tr>
-                                <th>{{ key }}</th>
-                                <td>{{ value }}</td>
-                            </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-        </div>
+    <div class="table-responsive">
+        <table class="table mb-0 table-lg">
+            <tbody>
+                {% for key, value in control_plane.user_info.items %}
+                    <tr>
+                        <th>{{ key }}</th>
+                        <td>{{ value }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
     </div>
 {% endif %}