diff --git a/static/app.css b/static/app.css
index 38b9f06..e33194b 100644
--- a/static/app.css
+++ b/static/app.css
@@ -24,7 +24,6 @@ body {
     display: flex;
     align-items: center;
     padding: 10px 20px;
-    /* width: 100%; */
   }
   .site-header img.logo {
       height: 50px;
@@ -34,9 +33,7 @@ body {
       font-size: 1.5em;
       margin: 0;
   }
-  .container {
-      padding: 20px;
-  }
+
 .wrapper {
   display: grid;
   grid-template-rows: auto 1fr auto;
@@ -44,9 +41,10 @@ body {
   padding-bottom: 200px;
 }
 .container {
+  max-width: 1200px;
   width: 90%;
-  max-width: 900px;
   margin: 0 auto;
+  padding: 20px 0;
 }
 
 .container a {
@@ -54,9 +52,7 @@ body {
 }
 
 .container-fluid {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
+  padding: 20px;
 }
 
 /* Breadcrumb Styles */
diff --git a/templates/dashboard.html b/templates/dashboard.html
index d6bda7a..4449dd7 100644
--- a/templates/dashboard.html
+++ b/templates/dashboard.html
@@ -8,7 +8,7 @@
 {% block content %}
 
     <!-- Main Container -->
-    <div class="container-fluid px-4">
+    <div class="container">
       <h2>Auswertung-Downloads</h2>
       <!-- Dropdown Controls -->
       <div class="mb-4 d-flex flex-wrap gap-2">
diff --git a/templates/folder_secret_config_editor.html b/templates/folder_secret_config_editor.html
index 468517c..451edb6 100644
--- a/templates/folder_secret_config_editor.html
+++ b/templates/folder_secret_config_editor.html
@@ -178,11 +178,11 @@
         const actions = document.createElement('div');
 
         if (!isEdit) {
-          const openLink = document.createElement('a');
-          openLink.className = 'btn btn-secondary btn-sm me-2';
-          openLink.href = `/?secret=${rec.secret}`;
-          openLink.textContent = 'Link öffnen';
-          actions.appendChild(openLink);
+          const openButton = document.createElement('button');
+          openButton.className = 'btn btn-secondary btn-sm me-2';
+          openButton.onclick = () => window.open(`/?secret=${rec.secret}`, '_self');
+          openButton.textContent = 'Link öffnen';
+          actions.appendChild(openButton);
         }
 
         const delBtn = document.createElement('button');
diff --git a/templates/mylinks.html b/templates/mylinks.html
index 6372e25..65c18de 100644
--- a/templates/mylinks.html
+++ b/templates/mylinks.html
@@ -6,7 +6,7 @@
 
 {# page‐specific content #}
 {% block content %}
-<div class="container-fluid">
+<div class="container">
   <h2>Übersicht deiner gültigen Links</h2>
   <div class="row">
     {% if valid_secrets %}
@@ -21,11 +21,8 @@
               <p class="card-text">
                 <small class="text-muted">Gültig bis: {{ secret_valid_to[secret] }}</small>
               </p>
-              <a href="{{ secret_url[secret] }}" class="btn btn-secondary btn-sm" style="text-decoration: none;">Link öffnen</a>
-              <button class="btn btn-secondary btn-sm"
-                      onclick="toClipboard('{{ secret_url[secret] }}')">
-                Link kopieren
-              </button>
+              <button class="btn btn-secondary btn-sm" onclick="window.open('{{ secret_url[secret] }}', '_self')">Link öffnen</button>
+              <button class="btn btn-secondary btn-sm" onclick="toClipboard('{{ secret_url[secret] }}')">Link kopieren</button>
               <br>
               <form method="post" action="{{ url_for('remove_secret') }}" class="mt-3">
                 <input type="hidden" name="secret" value="{{ secret }}">
@@ -61,11 +58,8 @@
               <p class="card-text">
                 <small class="text-muted">Gültig bis: {{ token_valid_to[token] }}</small>
               </p>
-              <a href="{{ token_url[token] }}" class="btn btn-secondary btn-sm">Link öffnen</a>
-              <button class="btn btn-secondary btn-sm"
-                      onclick="toClipboard('{{ token_url[token] }}')">
-                Link kopieren
-              </button>
+              <button class="btn btn-secondary btn-sm" onclick="window.open('{{ token_url[token] }}', '_self')">Link öffnen</button>
+              <button class="btn btn-secondary btn-sm" onclick="toClipboard('{{ token_url[token] }}')">Link kopieren</button>
               <br>
               <form method="post" action="{{ url_for('remove_token') }}" class="mt-3">
                 <input type="hidden" name="token" value="{{ token }}">