diff --git a/templates/edit_giveaway.html b/templates/edit_giveaway.html
index 3419e8c..d8b8f94 100644
--- a/templates/edit_giveaway.html
+++ b/templates/edit_giveaway.html
@@ -14,7 +14,7 @@
         <div class="collapse navbar-collapse" id="navbarNav">
             <ul class="navbar-nav ml-auto">
                 <li class="nav-item">
-                    <a class="nav-link" href="{{ url_for('admin_giveaways') }}">Back to Giveaways</a>
+                    <a class="nav-link" href="{{ url_for('server_giveaways', guild_id=guild_id) }}">Back to Giveaways</a>
                 </li>
                 <li class="nav-item">
                     <a class="nav-link" href="{{ url_for('logout') }}">Logout</a>
diff --git a/templates/server_admin_dashboard.html b/templates/server_admin_dashboard.html
index e9089e1..90387e1 100644
--- a/templates/server_admin_dashboard.html
+++ b/templates/server_admin_dashboard.html
@@ -10,7 +10,7 @@
     {% include 'navigation.html' %}
     <div class="container mt-5">
         <h1 class="text-center">Server Admin Dashboard for {{ g.guild_name }}</h1>
-        <p class="text-center">Manage server-specific settings for server <strong>{{ g.guild_name }}</strong>.</p>
+        <p class="text-center">Manage server-specific settings for server <strong>{{ g.guild_id }}</strong>.</p>
 
         <!-- Giveaway Management -->
         <div class="card mt-4">
@@ -41,7 +41,6 @@
                                 {% endif %}
                             </td>
                             <td>
-                                <!-- Corrected link to the edit_giveaway endpoint -->
                                 <a href="{{ url_for('edit_giveaway', guild_id=g.guild_id, uuid=giveaway['uuid']) }}" class="btn btn-primary btn-sm">Edit</a>
                             </td>
                         </tr>