diff --git a/app/static/js/modal.js b/app/static/js/modal.js
index 29073fa..196db37 100644
--- a/app/static/js/modal.js
+++ b/app/static/js/modal.js
@@ -3,7 +3,7 @@ function openDynamicPopup(subitem) {
   closeAllModals();
 
   // Setze den Titel
-  document.getElementById('dynamicModalLabel').innerText = subitem.description;
+  document.getElementById('dynamicModalLabel').innerText = subitem.name;
 
   // Setze den Identifier, falls vorhanden
   const identifierBox = document.getElementById('dynamicIdentifierBox');
@@ -34,12 +34,13 @@ function openDynamicPopup(subitem) {
       infoBox.classList.add('d-none');
   }
 
-  // Konfiguriere den Link
+  // Konfiguriere den Link oder die Beschreibung
   const linkBox = document.getElementById('dynamicModalLink');
   const linkHref = document.getElementById('dynamicModalLinkHref');
   if (subitem.url) {
       linkBox.classList.remove('d-none');
       linkHref.href = subitem.url;
+      linkHref.innerText = subitem.description || "Open Link";
   } else {
       linkBox.classList.add('d-none');
       linkHref.href = '#';
diff --git a/app/templates/moduls/modal.html.j2 b/app/templates/moduls/modal.html.j2
index b76b61f..adecdfe 100644
--- a/app/templates/moduls/modal.html.j2
+++ b/app/templates/moduls/modal.html.j2
@@ -21,7 +21,7 @@
         </div>
         <!-- Link, falls vorhanden -->
         <div id="dynamicModalLink" class="mt-3 d-none">
-          <a href="#" target="_blank" class="btn btn-primary w-100" id="dynamicModalLinkHref">Open Link</a>
+          <a href="#" target="_blank" class="btn btn-primary w-100" id="dynamicModalLinkHref"></a>
         </div>
         <!-- Alternativen, falls vorhanden -->
         <div id="dynamicAlternatives" class="mt-4">