diff --git a/hub/services/static/css/price-calculator.css b/hub/services/static/css/price-calculator.css
index a65d8cc..5c1ef53 100644
--- a/hub/services/static/css/price-calculator.css
+++ b/hub/services/static/css/price-calculator.css
@@ -66,4 +66,13 @@
 .btn-success.shadow:hover {
     transform: translateY(-1px);
     box-shadow: 0 0.25rem 0.75rem rgba(25, 135, 84, 0.2) !important;
+}
+
+/* Ensure collapse starts properly hidden */
+#managedServiceIncludes {
+    transition: all 0.35s ease;
+}
+
+#managedServiceIncludes:not(.show) {
+    display: none;
 }
\ No newline at end of file
diff --git a/hub/services/static/js/price-calculator/ui-manager.js b/hub/services/static/js/price-calculator/ui-manager.js
index f37b44b..9b6a500 100644
--- a/hub/services/static/js/price-calculator/ui-manager.js
+++ b/hub/services/static/js/price-calculator/ui-manager.js
@@ -87,20 +87,16 @@ class UIManager {
     updateAddonPricingDisplay(domManager, mandatoryAddons, selectedOptionalAddons) {
         // Get references to the managed service includes elements
         const managedServiceIncludesContainer = domManager.get('managedServiceIncludesContainer');
-        const managedServiceIncludes = domManager.get('managedServiceIncludes');
         const managedServiceToggleButton = domManager.get('managedServiceToggleButton');
 
         if (managedServiceIncludesContainer) {
             // Clear existing content
             managedServiceIncludesContainer.innerHTML = '';
 
-            // Show/hide the entire managed service includes section based on mandatory addons
+            // Show/hide the toggle button based on mandatory addons
             const hasMandatoryAddons = mandatoryAddons && mandatoryAddons.length > 0;
 
-            if (managedServiceIncludes) {
-                managedServiceIncludes.style.display = hasMandatoryAddons ? 'block' : 'none';
-            }
-
+            // Only control button visibility - let Bootstrap handle collapse behavior completely
             if (managedServiceToggleButton) {
                 managedServiceToggleButton.style.display = hasMandatoryAddons ? 'inline-block' : 'none';
             }
@@ -111,7 +107,7 @@ class UIManager {
                     const addonRow = document.createElement('div');
                     addonRow.className = 'd-flex justify-content-between small text-muted mb-1';
                     addonRow.innerHTML = `
-                        <span><i class="bi bi-check-circle text-success me-1"></i>${addon.name}</span>
+                        <span>Add-on: ${addon.name}</span>
                         <span>CHF ${addon.price}</span>
                     `;
                     managedServiceIncludesContainer.appendChild(addonRow);
diff --git a/hub/services/templates/services/offering_detail.html b/hub/services/templates/services/offering_detail.html
index 6e995b5..c0020dc 100644
--- a/hub/services/templates/services/offering_detail.html
+++ b/hub/services/templates/services/offering_detail.html
@@ -9,7 +9,6 @@
 {% block extra_js %}
 {% if debug %}
 <!-- Development: Load individual modules for easier debugging -->
-{% compress js inline %}
 <script src="{% static 'js/price-calculator/dom-manager.js' %}"></script>
 <script src="{% static 'js/price-calculator/pricing-data-manager.js' %}"></script>
 <script src="{% static 'js/price-calculator/plan-manager.js' %}"></script>
@@ -51,7 +50,6 @@ function selectPlan(element) {
     }
 }
 </script>
-{% endcompress %}
 {% else %}
 <!-- Production: Load compressed bundle -->
 {% compress js %}
@@ -444,7 +442,7 @@ function selectPlan(element) {
                                                             <div class="d-flex justify-content-between align-items-center mb-2">
                                                                 <div class="d-flex align-items-center">
                                                                     <span>Managed Service (incl. Compute)</span>
-                                                                    <button class="btn btn-link btn-sm p-0 ms-2 text-muted" type="button" data-bs-toggle="collapse" data-bs-target="#managedServiceIncludes" aria-expanded="false" aria-controls="managedServiceIncludes" title="Show what's included" style="display: none;">
+                                                                    <button class="btn btn-link btn-sm p-0 ms-2 text-muted" type="button" data-bs-toggle="collapse" data-bs-target="#managedServiceIncludes" aria-expanded="false" aria-controls="managedServiceIncludes" title="Show included mandatory add-ons" style="display: none;">
                                                                         <i class="bi bi-info-circle" id="managedServiceToggleIcon"></i>
                                                                     </button>
                                                                 </div>
@@ -452,12 +450,8 @@ function selectPlan(element) {
                                                             </div>
                                                             
                                                             <!-- What's included in managed service (collapsible) -->
-                                                            <div class="collapse" id="managedServiceIncludes" style="display: none;">
-                                                                <div class="ps-3 border-start border-2 border-success-subtle">
-                                                                    <div class="small text-muted mb-2">
-                                                                        <i class="bi bi-check-circle-fill text-success me-1"></i>
-                                                                        <em>Included in managed service price:</em>
-                                                                    </div>
+                                                            <div class="collapse" id="managedServiceIncludes">
+                                                                <div class="ps-3 border-start border-2 border-subtle">
                                                                     <div id="managedServiceIncludesContainer">
                                                                         <!-- Required add-ons will be dynamically added here -->
                                                                     </div>