diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
index 83ff4d39f..b694a2e95 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
@@ -142,12 +142,15 @@ public class EndpointConfiguration {
         if (disabledGroups.add(group)) {
             log.debug("Disabling group: {}", group);
         }
-        Set<String> endpoints = endpointGroups.get(group);
-        if (endpoints != null) {
-            endpoints.forEach(this::disableEndpoint);
+        // Only cascade to endpoints for *functional* groups
+        if (!isToolGroup(group)) {
+            Set<String> endpoints = endpointGroups.get(group);
+            if (endpoints != null) {
+                endpoints.forEach(this::disableEndpoint);
+            }
         }
     }
-
+    
     public void enableGroup(String group) {
         if (disabledGroups.remove(group)) {
             log.debug("Enabling group: {}", group);
@@ -327,6 +330,7 @@ public class EndpointConfiguration {
         addEndpointToGroup("Java", "remove-image-pdf");
         addEndpointToGroup("Java", "pdf-to-markdown");
         addEndpointToGroup("Java", "add-attachments");
+        addEndpointToGroup("Java", "compress-pdf");
 
         // Javascript
         addEndpointToGroup("Javascript", "pdf-organizer");
@@ -353,8 +357,10 @@ public class EndpointConfiguration {
         addEndpointAlternative("repair", "Ghostscript");
         addEndpointAlternative("compress-pdf", "qpdf");
         addEndpointAlternative("compress-pdf", "Ghostscript");
+        addEndpointAlternative("compress-pdf", "Java");
         addEndpointAlternative("ocr-pdf", "tesseract");
         addEndpointAlternative("ocr-pdf", "OCRmyPDF");
+        
 
         // Weasyprint dependent endpoints
         addEndpointToGroup("Weasyprint", "html-to-pdf");
diff --git a/stirling-pdf/src/main/resources/templates/home.html b/stirling-pdf/src/main/resources/templates/home.html
index d7bf1227f..2a5d51af7 100644
--- a/stirling-pdf/src/main/resources/templates/home.html
+++ b/stirling-pdf/src/main/resources/templates/home.html
@@ -37,10 +37,10 @@
                     </div>
                     <div class="recent-features">
                       <div class="newfeature"
-                        th:insert="~{fragments/navbarEntryCustom :: navbarEntry('redact', '/images/redact-manual.svg#icon-redact-manual', 'home.redact.title', 'home.redact.desc', 'redact.tags', 'security')}">
+                        th:insert="~{fragments/navbarEntry :: navbarEntry('add-attachments', 'attachment', 'home.attachments.title', 'home.attachments.desc', 'attachments.tags', 'other')}">
                       </div>
                       <div class="newfeature"
-                        th:insert="~{fragments/navbarEntry :: navbarEntry ('multi-tool', 'construction', 'home.multiTool.title', 'home.multiTool.desc', 'multiTool.tags', 'organize')}">
+                        th:insert="~{fragments/navbarEntry :: navbarEntry('fake-scan', 'scanner', 'fakeScan.title', 'fakeScan.description', 'fakeScan.tags', 'advance')}">
                       </div>
                       <div class="newfeature"
                         th:insert="~{fragments/navbarEntry :: navbarEntry('compress-pdf', 'zoom_in_map', 'home.compressPdfs.title', 'home.compressPdfs.desc', 'compressPDFs.tags', 'advance')}">