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 bd6a575..066c1af 100644
--- a/src/servala/frontend/templates/frontend/organizations/service_offering_detail.html
+++ b/src/servala/frontend/templates/frontend/organizations/service_offering_detail.html
@@ -9,13 +9,18 @@
 {% endblock html_title %}
 {% partialdef service-form %}
 {% if service_form %}
-    {% if form_error %}
-        <div class="alert alert-danger">
-            {% translate "Oops! Something went wrong with the service form generation. Please try again later." %}
+    <div class="card">
+        <div class="card-header d-flex align-items-center"></div>
+        <div class="card-body">
+            {% if form_error %}
+                <div class="alert alert-danger">
+                    {% translate "Oops! Something went wrong with the service form generation. Please try again later." %}
+                </div>
+            {% else %}
+                {% include "includes/form.html" with form=service_form %}
+            {% endif %}
         </div>
-    {% else %}
-        {% include "includes/form.html" with form=service_form %}
-    {% endif %}
+    </div>
 {% endif %}
 {% endpartialdef %}
 {% block content %}
@@ -35,7 +40,7 @@
                 </div>
             </div>
             <div class="card-body">
-                {% if offering.control_planes.all.count == 0 %}
+                {% if not has_control_planes %}
                     <p>{% translate "We currently cannot offer this service, sorry!" %}</p>
                 {% else %}
                     <form hx-trigger="change"
@@ -43,9 +48,9 @@
                           hx-target="#service-form">
                         {{ select_form }}
                     </form>
-                    <div id="service-form">{% partial service-form %}</div>
                 {% endif %}
             </div>
         </div>
+        <div id="service-form">{% partial service-form %}</div>
     </section>
 {% endblock content %}
diff --git a/src/servala/frontend/views/service.py b/src/servala/frontend/views/service.py
index 427f6be..00b7edd 100644
--- a/src/servala/frontend/views/service.py
+++ b/src/servala/frontend/views/service.py
@@ -73,8 +73,12 @@ class ServiceOfferingDetailView(OrganizationViewMixin, HtmxViewMixin, DetailView
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["select_form"] = self.select_form
+        context["has_control_planes"] = self.planes.exists()
         if "control_plane" in self.request.GET:
             if self.select_form.is_valid():
+                context["selected_plane"] = self.select_form.cleaned_data[
+                    "control_plane"
+                ]
                 try:
                     so_cp = ServiceOfferingControlPlane.objects.filter(
                         control_plane=self.select_form.cleaned_data["control_plane"],