diff --git a/data/config.db b/data/config.db
index 4538828..f4453c4 100644
--- a/data/config.db
+++ b/data/config.db
Binary files differ
diff --git a/internal/api_handlers.go b/internal/api_handlers.go
index 263ef90..1c730cb 100644
--- a/internal/api_handlers.go
+++ b/internal/api_handlers.go
@@ -510,6 +510,11 @@
 			http.Error(w, fmt.Sprintf("failed to update SDS Secret in cache: %v", err), http.StatusInternalServerError)
 			return
 		}
+	} else {
+		if err := api.Manager.AddSDSSecretWithCert(r.Context(), cert); err != nil {
+			http.Error(w, fmt.Sprintf("failed to add SDS Secret in cache: %v", err), http.StatusInternalServerError)
+			return
+		}
 	}
 	w.Header().Set("Content-Type", "application/json")
 	json.NewEncoder(w).Encode(cert)
diff --git a/internal/pkg/snapshot/resource_crud.go b/internal/pkg/snapshot/resource_crud.go
index fa879ca..088a54c 100644
--- a/internal/pkg/snapshot/resource_crud.go
+++ b/internal/pkg/snapshot/resource_crud.go
@@ -4,6 +4,7 @@
 	"context"
 	"fmt"
 	"sort"
+	"strings"
 	"time"
 
 	corev3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
@@ -456,99 +457,6 @@
 	return resources
 }
 
-// UpdateSDSSecretByDomain updates an existing Secret resource in the cache with a refreshed
-// certificate and private key.
-func (sm *SnapshotManager) UpdateSDSSecretByDomain(ctx context.Context, domain string, newCert *storage.CertStorage) error {
-	log := internallog.LogFromContext(ctx)
-
-	// 1. Determine the Secret name. We assume a convention: "tls-secret-<domain>"
-	secretName := fmt.Sprintf("tls-secret-%s", domain)
-	secretType := resourcev3.SecretType
-
-	// 2. Get the current Secret from the cache
-	resource, err := sm.GetResourceFromCache(secretName, secretType)
-	if err != nil {
-		return fmt.Errorf("failed to get Secret '%s' from cache: %w", secretName, err)
-	}
-
-	secret, ok := resource.(*secretv3.Secret)
-	if !ok {
-		return fmt.Errorf("resource '%s' is not a Secret type", secretName)
-	}
-
-	// 3. Validate and update the Secret data
-	if secret.GetType() == nil || secret.GetTlsCertificate() == nil {
-		return fmt.Errorf("secret '%s' is not a TlsCertificate secret or is malformed", secretName)
-	}
-
-	// Update the certificate chain and private key fields
-	tlsCert := secret.GetTlsCertificate()
-	tlsCert.CertificateChain = &corev3.DataSource{
-		Specifier: &corev3.DataSource_InlineBytes{
-			InlineBytes: newCert.CertPEM,
-		},
-	}
-	tlsCert.PrivateKey = &corev3.DataSource{
-		Specifier: &corev3.DataSource_InlineBytes{
-			InlineBytes: newCert.KeyPEM,
-		},
-	}
-
-	log.Debugf("Updated TlsCertificate data for secret '%s' (Domain: %s)", secretName, domain)
-
-	// 4. Get current snapshot to extract all resources for the new snapshot
-	snap, err := sm.Cache.GetSnapshot(sm.NodeID)
-	if err != nil {
-		return fmt.Errorf("failed to get snapshot for modification: %w", err)
-	}
-
-	// Get all current resources
-	resources := sm.getAllResourcesFromSnapshot(snap)
-
-	// Replace the old secret with the modified one in the resource list
-	secretList, ok := resources[secretType]
-	if !ok {
-		return fmt.Errorf("secret resource type not present in snapshot with name %s", secretName)
-	}
-
-	foundAndReplaced := false
-	for i, res := range secretList {
-		if namer, ok := res.(interface{ GetName() string }); ok && namer.GetName() == secretName {
-			// The `secret` variable already holds the modified secret
-			secretList[i] = secret
-			foundAndReplaced = true
-			break
-		}
-	}
-
-	if !foundAndReplaced {
-		// Should not happen if GetResourceFromCache succeeded.
-		return fmt.Errorf("failed to locate Secret '%s' in current resource list for replacement", secretName)
-	}
-
-	// 5. Create and set the new snapshot
-	version := fmt.Sprintf("secret-update-%s-%d", secretName, time.Now().UnixNano())
-	newSnap, err := cachev3.NewSnapshot(version, resources)
-	if err != nil {
-		return fmt.Errorf("failed to create new snapshot: %w", err)
-	}
-
-	if err := sm.Cache.SetSnapshot(ctx, sm.NodeID, newSnap); err != nil {
-		return fmt.Errorf("failed to set new snapshot: %w", err)
-	}
-
-	// 6. Flush the updated secret to the persistent database.
-	// We pass DeleteNone as strategy because we only updated one resource; we don't want to affect others.
-	// NOTE: We assume sm.DB.SaveSecret is called elsewhere, or we call it here directly if needed for persistence.
-	// For now, we only flush the *snapshot* metadata if sm.FlushCacheToDB does that.
-	// If `FlushCacheToDB` serializes the entire snapshot back to the DB, it implicitly saves the updated secret.
-	sm.FlushCacheToDB(ctx, storage.DeleteLogical)
-
-	log.Infof("Successfully updated Secret '%s' in cache with refreshed certificate for domain '%s'.", secretName, domain)
-
-	return nil
-}
-
 // UpdateSDSSecretByName updates an existing Secret resource in the cache with a refreshed
 // certificate and private key, using the Secret's exact name. This is useful when the
 // Secret name convention is not based directly on the domain.
@@ -646,6 +554,56 @@
 	return nil
 }
 
+// AddSDSSecretWithCert creates a new Secret resource for SDS with the provided certificate
+// and adds it to the snapshot. The secret name is derived from the domain:
+// e.g., "abc.com" -> "abc_com".
+func (sm *SnapshotManager) AddSDSSecretWithCert(ctx context.Context, internalcert *internalcertapi.Certificate) error {
+	log := internallog.LogFromContext(ctx)
+
+	if internalcert == nil {
+		return fmt.Errorf("certificate data is nil")
+	}
+
+	// 1. Determine the Secret Name (e.g., "abc.com" -> "abc_com")
+	// NOTE: This logic assumes the 'Domain' field of the certificate is what should be used for naming.
+	secretName := strings.ReplaceAll(internalcert.Domain, ".", "_")
+
+	// 2. Create the Secret resource (envoy/config/secret/v3.Secret)
+	tlsCert := &secretv3.TlsCertificate{
+		// The certificate content (CertPEM) is stored as an InlineString.
+		CertificateChain: &corev3.DataSource{
+			Specifier: &corev3.DataSource_InlineString{
+				InlineString: string(internalcert.CertPEM),
+			},
+		},
+		// The private key content (KeyPEM) is stored as an InlineString.
+		PrivateKey: &corev3.DataSource{
+			Specifier: &corev3.DataSource_InlineString{
+				InlineString: string(internalcert.KeyPEM),
+			},
+		},
+	}
+
+	newSecret := &secretv3.Secret{
+		Name: secretName,
+		Type: &secretv3.Secret_TlsCertificate{
+			TlsCertificate: tlsCert,
+		},
+	}
+
+	// 3. Add the resource to the snapshot using the generic function
+	if err := sm.AddResourceToSnapshot(newSecret, resourcev3.SecretType); err != nil {
+		return fmt.Errorf("failed to add SDS Secret '%s' to snapshot: %w", secretName, err)
+	}
+
+	// 4. Flush the updated snapshot metadata to persistent storage.
+	sm.FlushCacheToDB(ctx, storage.DeleteLogical)
+
+	log.Infof("Successfully added new SDS Secret '%s' for domain '%s' to cache.", secretName, internalcert.Domain)
+
+	return nil
+}
+
 // mapToSlice converts a map of named resources to a slice of resources.
 func mapToSlice(m map[string]types.Resource) []types.Resource {
 	out := make([]types.Resource, 0, len(m))
diff --git a/static/index.html b/static/index.html
index 6167ce8..222baf6 100644
--- a/static/index.html
+++ b/static/index.html
@@ -6,8 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Envoy Configuration Dashboard</title>
     <link rel="stylesheet" href="style.css">
-    <script
-        src="https://cdn.jsdelivr.net/npm/js-yaml@4.1.0/dist/js-yaml.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/js-yaml@4.1.0/dist/js-yaml.min.js"></script>
 </head>
 
 <body>
@@ -16,8 +15,7 @@
         <h1>Envoy Configuration Dashboard ⚙️</h1>
 
         <div id="consistency-status-container">
-            <button id="consistency-button" class="status-indicator-button"
-                title="System Consistency Status"
+            <button id="consistency-button" class="status-indicator-button" title="System Consistency Status"
                 onclick="showConsistencyModal()" disabled>
                 Loading...
             </button>
@@ -40,14 +38,7 @@
                     Listener</button>
             </div>
         </div>
-        <div class="utility-links">
-            <h2>Utility Tools</h2>
-            <p>
-                Need to manually issue a certificate? Use the
-                <a href="/tools/cert_issuer.html"
-                    class="link-button">Certificate Issuer Tool 🛡️</a>.
-            </p>
-        </div>
+
         <h2>Existing Clusters (Click a row for full JSON/YAML details)</h2>
         <table id="clusterTable" class="config-table">
             <thead>
@@ -67,7 +58,14 @@
             </tbody>
         </table>
 
-        <h2>Existing Secrets (Click a row for full JSON/YAML details)</h2>
+        <div style="display: flex; align-items: center; justify-content: space-between;">
+            <h2>Existing Secrets (Click a row for full JSON/YAML details)</h2>
+            <a href="/tools/cert_issuer.html" class="cert-issuer-button"
+                title="Certificate Issuer Tool: Issue New Certificate 🛡️">
+                <span class="cert-issuer-button-text">Issue New Certificate</span>
+                <span class="cert-issuer-button-icon">➕</span>
+            </a>
+        </div>
         <table id="secretTable" class="config-table">
             <thead>
                 <tr>
@@ -84,7 +82,7 @@
                 </tr>
             </tbody>
         </table>
-        
+
         <h2>Existing Listeners (Click a domain/filter for details)</h2>
         <table id="listenerTable" class="config-table">
             <thead>
@@ -113,16 +111,14 @@
             <div class="tab-controls">
                 <button class="tab-button active" data-tab="json">JSON</button>
                 <button class="tab-button" data-tab="yaml">YAML</button>
-                <button id="download-yaml-btn"
-                    class="tab-button download-button" onclick="downloadYaml()">
+                <button id="download-yaml-btn" class="tab-button download-button" onclick="downloadYaml()">
                     ⬇️ Download YAML
                 </button>
             </div>
 
             <div class="tab-content">
                 <pre id="modal-json-content" class="code-block"></pre>
-                <pre id="modal-yaml-content" class="code-block"
-                    style="display: none;"></pre>
+                <pre id="modal-yaml-content" class="code-block" style="display: none;"></pre>
             </div>
         </div>
     </div>
@@ -131,8 +127,7 @@
         <div class="modal-content" onclick="event.stopPropagation()">
             <div class="modal-header">
                 <h3>⚠️ Consistency Conflict Detected</h3>
-                <span class="close-btn"
-                    onclick="hideConsistencyModal()">&times;</span>
+                <span class="close-btn" onclick="hideConsistencyModal()">&times;</span>
             </div>
 
             <p>The in-memory cache and the persistent database are out of sync.
@@ -140,24 +135,20 @@
 
             <h4>Inconsistency Details:</h4>
             <div id="inconsistency-details-content">
-                <p><strong>Cache-Only Resources (DB Missing):</strong> <span
-                        id="cache-only-count">0</span></p>
+                <p><strong>Cache-Only Resources (DB Missing):</strong> <span id="cache-only-count">0</span></p>
                 <pre id="cache-only-data" class="conflict-list"></pre>
 
-                <p><strong>DB-Only Resources (Cache Missing):</strong> <span
-                        id="db-only-count">0</span></p>
+                <p><strong>DB-Only Resources (Cache Missing):</strong> <span id="db-only-count">0</span></p>
                 <pre id="db-only-data" class="conflict-list"></pre>
             </div>
 
             <div class="modal-actions">
-                <button class="action-button enable"
-                    onclick="resolveConsistency('flush')">
+                <button class="action-button enable" onclick="resolveConsistency('flush')">
                     Flush (Cache &rarr; DB)
                     <br> <small>Override DB with Cache (Risk of DB data
                         loss)</small>
                 </button>
-                <button class="action-button disable"
-                    onclick="resolveConsistency('rollback')">
+                <button class="action-button disable" onclick="resolveConsistency('rollback')">
                     Rollback (DB &rarr; Cache)
                     <br> <small>Override Cache with DB (Risk of in-memory data
                         loss)</small>
@@ -170,8 +161,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h3 id="add-fc-modal-title">Add New Filter Chain</h3>
-                <span class="close-btn"
-                    onclick="hideAddFilterChainModal()">&times;</span>
+                <span class="close-btn" onclick="hideAddFilterChainModal()">&times;</span>
             </div>
 
             <p>Paste the <b>YAML configuration</b> for the new filter chain
@@ -179,8 +169,7 @@
             </p>
             <p>
                 Need help composing a valid configuration? Use the external:
-                <a href="tools/filter_chain.html" target="_blank"
-                    class="text-blue-600 hover:text-blue-800 font-medium">
+                <a href="tools/filter_chain.html" target="_blank" class="text-blue-600 hover:text-blue-800 font-medium">
                     Envoy Filter Chain Composer ↗
                 </a>
             </p>
@@ -189,16 +178,13 @@
                 <input type="hidden" id="add-fc-listener-name" value="">
 
                 <label for="add-fc-yaml-input">Filter Chain YAML:</label>
-                <textarea id="add-fc-yaml-input" rows="15"
-                    placeholder="Paste YAML here..."></textarea>
+                <textarea id="add-fc-yaml-input" rows="15" placeholder="Paste YAML here..."></textarea>
 
                 <div class="modal-actions">
-                    <button type="button" class="action-button add"
-                        onclick="submitNewFilterChain()">
+                    <button type="button" class="action-button add" onclick="submitNewFilterChain()">
                         Submit Filter Chain
                     </button>
-                    <button type="button" class="action-button disable"
-                        onclick="hideAddFilterChainModal()">
+                    <button type="button" class="action-button disable" onclick="hideAddFilterChainModal()">
                         Cancel
                     </button>
                 </div>
@@ -210,8 +196,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h3>Add/Update Listener</h3>
-                <span class="close-btn"
-                    onclick="hideAddListenerModal()">&times;</span>
+                <span class="close-btn" onclick="hideAddListenerModal()">&times;</span>
             </div>
 
             <p>Paste the full <b>YAML configuration</b> for the new listener(s)
@@ -231,12 +216,10 @@
                     placeholder="Paste full listener YAML here..."></textarea>
 
                 <div class="modal-actions">
-                    <button type="button" class="action-button add"
-                        onclick="submitNewListener()">
+                    <button type="button" class="action-button add" onclick="submitNewListener()">
                         Submit Listener
                     </button>
-                    <button type="button" class="action-button disable"
-                        onclick="hideAddListenerModal()">
+                    <button type="button" class="action-button disable" onclick="hideAddListenerModal()">
                         Cancel
                     </button>
                 </div>
@@ -248,8 +231,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h3>Add/Update Cluster</h3>
-                <span class="close-btn"
-                    onclick="hideAddClusterModal()">&times;</span>
+                <span class="close-btn" onclick="hideAddClusterModal()">&times;</span>
             </div>
 
             <p>Paste the full <b>YAML configuration</b> for the new cluster(s)
@@ -271,25 +253,22 @@
                     placeholder="Paste full cluster YAML here..."></textarea>
 
                 <div class="modal-actions">
-                    <button type="button" class="action-button add"
-                        onclick="submitNewCluster()">
+                    <button type="button" class="action-button add" onclick="submitNewCluster()">
                         Submit Cluster
                     </button>
-                    <button type="button" class="action-button disable"
-                        onclick="hideAddClusterModal()">
+                    <button type="button" class="action-button disable" onclick="hideAddClusterModal()">
                         Cancel
                     </button>
                 </div>
             </form>
         </div>
     </div>
-    
+
     <div id="addSecretModal" class="modal">
         <div class="modal-content">
             <div class="modal-header">
                 <h3>Add/Update Secret</h3>
-                <span class="close-btn"
-                    onclick="hideAddSecretModal()">&times;</span>
+                <span class="close-btn" onclick="hideAddSecretModal()">&times;</span>
             </div>
 
             <p>Paste the full <b>YAML configuration</b> for the new secret(s)
@@ -305,16 +284,13 @@
             </p>
             <form id="add-secret-form">
                 <label for="add-secret-yaml-input">Secret YAML:</label>
-                <textarea id="add-secret-yaml-input" rows="20"
-                    placeholder="Paste full secret YAML here..."></textarea>
+                <textarea id="add-secret-yaml-input" rows="20" placeholder="Paste full secret YAML here..."></textarea>
 
                 <div class="modal-actions">
-                    <button type="button" class="action-button add"
-                        onclick="submitNewSecret()">
+                    <button type="button" class="action-button add" onclick="submitNewSecret()">
                         Submit Secret
                     </button>
-                    <button type="button" class="action-button disable"
-                        onclick="hideAddSecretModal()">
+                    <button type="button" class="action-button disable" onclick="hideAddSecretModal()">
                         Cancel
                     </button>
                 </div>
@@ -326,13 +302,14 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h3 id="cert-modal-title">TLS Certificate Details</h3>
-                <span class="close-btn" onclick="document.getElementById('certificateDetailsModal').style.display='none'">&times;</span>
+                <span class="close-btn"
+                    onclick="document.getElementById('certificateDetailsModal').style.display='none'">&times;</span>
             </div>
 
             <div id="certificate-details-content">
                 <p style="text-align: center;">Loading certificate data...</p>
             </div>
-            
+
             <div class="modal-actions">
                 <button type="button" class="action-button disable"
                     onclick="document.getElementById('certificateDetailsModal').style.display='none'">
@@ -345,7 +322,7 @@
     <script type="module" src="modals.js"></script>
     <script type="module" src="data_fetchers.js"></script>
     <script type="module" src="clusters.js"></script>
-    <script type="module" src="secrets.js"></script> 
+    <script type="module" src="secrets.js"></script>
     <script type="module" src="listeners.js"></script>
     <script type="module" src="consistency.js"></script>
     <script type="module" src="data_loader.js"></script>
diff --git a/static/secrets.js b/static/secrets.js
index 4a808ac..51aa87b 100644
--- a/static/secrets.js
+++ b/static/secrets.js
@@ -168,10 +168,14 @@
  * @param {string} secretName - The name of the secret/certificate.
  */
 async function manualRenewCertificate(secretName) {
-    // 1. Get user confirmation and input for the domain name
+    // 1. **NEW FEATURE LOGIC:** Generate suggested domain name
+    const suggestedDomain = secretName.replace(/_/g, '.');
+
+    // 2. Get user confirmation and input for the domain name
     const domainName = prompt(
         `Please enter the domain name associated with secret '${secretName}' to renew its certificate. 
-        \n(Example: test.jerxie.com)`
+        \n(Example: ${suggestedDomain})`,
+        suggestedDomain // <-- ADDED: Use the suggested domain as the default input value
     );
 
     if (!domainName) {
@@ -183,7 +187,7 @@
         return;
     }
     
-    // 2. Prepare API payload
+    // 3. Prepare API payload
     const renewSecretName = secretName; // Use the secret name itself for the 'secret_name' API param
     const url = `${API_BASE_URL}/renew-certificate`;
     const payload = { 
@@ -193,7 +197,7 @@
 
     console.log(`Attempting to renew certificate for domain: ${domainName.trim()} with secret: ${renewSecretName}`);
     
-    // 3. Execute API call with robust error handling
+    // 4. Execute API call with robust error handling
     try {
         const response = await fetch(url, {
             method: 'POST',
diff --git a/static/style.css b/static/style.css
index 2a1cc14..e782956 100644
--- a/static/style.css
+++ b/static/style.css
@@ -727,4 +727,57 @@
 
 .status-label.valid {
     background-color: var(--success-color, #52c41a); /* Green color for Valid */
+}
+
+/* Custom styles for the Certificate Issuer link/button (Issue New Certificate) */
+
+/* Container to ensure the heading and the button are on the same line and spaced correctly */
+.secrets-header-container {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: 30px; /* Use the same top margin as H2 for proper spacing */
+    margin-bottom: 10px; /* Use the same bottom margin as H2 for proper spacing */
+}
+
+.cert-issuer-button {
+    /* Style to match existing header buttons (e.g., Add/Update Cluster) */
+    display: inline-flex;
+    align-items: center;
+    
+    /* Using toolbar button styling for consistency */
+    background-color: var(--primary-color);
+    color: white;
+    border: 1px solid var(--primary-color);
+    border-radius: 5px;
+    padding: 8px 14px; 
+    font-size: 0.9rem;
+    font-weight: 500;
+    cursor: pointer;
+    text-decoration: none; /* Remove underline from the anchor tag */
+    transition: all 0.2s ease;
+    
+    /* Ensure height is consistent with existing toolbar buttons */
+    height: 42; /* Based on 8px padding + 0.9rem font size in .toolbar button */
+    
+    /* Add a subtle shadow consistent with primary toolbar buttons */
+    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
+}
+
+.cert-issuer-button:hover {
+    background-color: #0b5ed7; /* Darker primary color on hover (same as toolbar) */
+    border-color: #0b5ed7;
+    color: white;
+}
+
+/* Style for the text label within the button */
+.cert-issuer-button-text {
+    margin-right: 8px; /* Space between text and icon */
+    font-size: 0.9rem; /* Match button text size */
+}
+
+/* Style for the plus icon within the button */
+.cert-issuer-button-icon {
+    font-size: 1.1rem; /* Slightly larger plus sign for emphasis */
+    line-height: 1; 
 }
\ No newline at end of file