diff --git a/templates/global_admin_dashboard.html b/templates/global_admin_dashboard.html
index 1d5f75d..5e32895 100644
--- a/templates/global_admin_dashboard.html
+++ b/templates/global_admin_dashboard.html
@@ -9,22 +9,9 @@
 </head>
 
 <body>
-    <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
-        <a class="navbar-brand" href="#">Multus Bot - Global Admin Dashboard</a>
-        <div class="collapse navbar-collapse" id="navbarNav">
-            <ul class="navbar-nav ml-auto">
-                <li class="nav-item">
-                    <a href="{{ url_for('user_server_data', guild_id=guild_id) }}">Switch to Server Selection</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="{{ url_for('logout') }}">Logout</a>
-                </li>
-            </ul>
-        </div>
-    </nav>
-
+    {% include 'navigation.html' %}
     <div class="container mt-5">
-        <h1 class="text-center">Welcome, {{ user_info.username }} (Global Admin)</h1>
+        <h1 class="text-center">Welcome, {{ g.user_info['username'] }} (Global Admin)</h1>
         <p class="text-center">Manage global bot settings and controls.</p>
 
         <div class="card mt-4">
@@ -35,12 +22,15 @@
                         {{ "Running" if bot_running else "Stopped" }}
                     </span>
                 </p>
-                <a href="{{ url_for('start') }}"
-                    class="btn btn-primary btn-block {{ 'disabled' if bot_running else '' }}">Start Bot</a>
-                <a href="{{ url_for('stop') }}"
-                    class="btn btn-danger btn-block {{ 'disabled' if not bot_running else '' }}">Stop Bot</a>
-                <a href="{{ url_for('settings') }}" class="btn btn-secondary btn-block">Global Settings</a>
-                <a href="{{ url_for('view_logs') }}" class="btn btn-warning btn-block">View Logs</a>
+                <a href="{{ url_for('start') }}" class="btn btn-primary btn-block {{ 'disabled' if bot_running else '' }}">Start Bot</a>
+                <a href="{{ url_for('stop') }}" class="btn btn-danger btn-block {{ 'disabled' if not bot_running else '' }}">Stop Bot</a>
+            </div>
+        </div>
+
+        <div class="card mt-4">
+            <div class="card-body">
+                <h5 class="card-title">View Logs</h5>
+                <a href="{{ url_for('view_logs') }}" class="btn btn-warning btn-block">Logs</a>
             </div>
         </div>
     </div>
diff --git a/templates/server_admin_dashboard.html b/templates/server_admin_dashboard.html
index 28bdf57..b612a1f 100644
--- a/templates/server_admin_dashboard.html
+++ b/templates/server_admin_dashboard.html
@@ -9,28 +9,15 @@
 </head>
 
 <body>
-    <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
-        <a class="navbar-brand" href="#">Multus Bot - Server Admin Dashboard (Server {{ guild_id }})</a>
-        <div class="collapse navbar-collapse" id="navbarNav">
-            <ul class="navbar-nav ml-auto">
-                <li class="nav-item">
-                    <a class="nav-link" href="{{ url_for('server_selection') }}">Switch to Server Selection</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="{{ url_for('logout') }}">Logout</a>
-                </li>
-            </ul>
-        </div>
-    </nav>
-
+    {% include 'navigation.html' %}
     <div class="container mt-5">
         <h1 class="text-center">Server Admin Dashboard for {{ guild_name }}</h1>
-        <p class="text-center">Manage server-specific settings and controls.</p>
+        <p class="text-center">Manage server-specific settings and controls for this guild.</p>
 
         <div class="card mt-4">
             <div class="card-body">
                 <h5 class="card-title">Giveaway Management</h5>
-                <p class="card-text">Manage and view all active giveaways for this server.</p>
+                <p class="card-text">Manage active giveaways for this server.</p>
                 <a href="{{ url_for('server_giveaways', guild_id=guild_id) }}" class="btn btn-info btn-block">View Giveaways</a>
             </div>
         </div>
diff --git a/templates/server_giveaways.html b/templates/server_giveaways.html
index 4c31693..b5bcc4e 100644
--- a/templates/server_giveaways.html
+++ b/templates/server_giveaways.html
@@ -1,29 +1,43 @@
-{% include 'navigation.html' %}
-<div class="container mt-5">
-    <h1>Giveaways for Server {{ guild_id }}</h1>
-    <a href="{{ url_for('add_giveaway', guild_id=guild_id) }}" class="btn btn-primary">Add Giveaway</a>
-    
-    <table class="table mt-4">
-        <thead>
-            <tr>
-                <th>Name</th>
-                <th>Platform</th>
-                <th>Winner</th>
-                <th>Actions</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for giveaway in giveaways %}
-            <tr>
-                <td>{{ giveaway.name }}</td>
-                <td>{{ giveaway.platform }}</td>
-                <td>{{ giveaway.winner_dc_id }}</td>
-                <td>
-                    <a href="{{ url_for('edit_giveaway', giveaway_id=giveaway.id, guild_id=guild_id) }}" class="btn btn-warning">Edit</a>
-                    <a href="{{ url_for('delete_giveaway', giveaway_id=giveaway.id, guild_id=guild_id) }}" class="btn btn-danger">Delete</a>
-                </td>
-            </tr>
-            {% endfor %}
-        </tbody>
-    </table>
-</div>
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Server Giveaways</title>
+    <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet">
+</head>
+
+<body>
+    {% include 'navigation.html' %}
+    <div class="container mt-5">
+        <h1 class="text-center">Giveaways for Server {{ guild_id }}</h1>
+        <a href="{{ url_for('add_giveaway', guild_id=guild_id) }}" class="btn btn-primary mb-4">Add Giveaway</a>
+
+        <table class="table">
+            <thead>
+                <tr>
+                    <th>Name</th>
+                    <th>Platform</th>
+                    <th>Winner</th>
+                    <th>Actions</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for giveaway in giveaways %}
+                <tr>
+                    <td>{{ giveaway.name }}</td>
+                    <td>{{ giveaway.platform }}</td>
+                    <td>{{ giveaway.winner_dc_id }}</td>
+                    <td>
+                        <a href="{{ url_for('edit_giveaway', giveaway_id=giveaway.id, guild_id=guild_id) }}" class="btn btn-warning">Edit</a>
+                        <a href="{{ url_for('delete_giveaway', giveaway_id=giveaway.id, guild_id=guild_id) }}" class="btn btn-danger">Delete</a>
+                    </td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+</body>
+
+</html>
diff --git a/templates/user_dashboard.html b/templates/user_dashboard.html
index c4e9685..d2bbb4c 100644
--- a/templates/user_dashboard.html
+++ b/templates/user_dashboard.html
@@ -6,149 +6,25 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>User Dashboard</title>
     <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet">
-    <style>
-        body {
-            background-color: #f7f7f7;
-        }
-        .card {
-            margin-top: 20px;
-        }
-        .card-header {
-            background-color: #343a40;
-            color: white;
-        }
-        .user-info {
-            margin-top: 20px;
-        }
-        .points {
-            font-size: 2em;
-            color: #28a745;
-        }
-        .badge-rank {
-            font-size: 1.2em;
-            padding: 10px;
-        }
-        .footer {
-            background-color: #343a40;
-            color: white;
-            padding: 20px;
-            text-align: center;
-            margin-top: 50px;
-        }
-    </style>
 </head>
 
 <body>
-    <!-- Navbar -->
-    <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
-        <a class="navbar-brand" href="#">Multus Bot - User Dashboard</a>
-        <div class="collapse navbar-collapse" id="navbarNav">
-            <ul class="navbar-nav ml-auto">
-                <li class="nav-item">
-                    <a class="nav-link" href="{{ url_for('global_admin_dashboard') }}">Switch to Admin View (Admin only)</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="{{ url_for('logout') }}">Logout</a>
-                </li>
-            </ul>
-        </div>
-    </nav>
+    {% include 'navigation.html' %}
+    <div class="container mt-5">
+        <h1 class="text-center">{{ g.user_info['username'] }}'s Dashboard for Server {{ guild_id }}</h1>
+        <p class="text-center">Your server-specific data.</p>
 
-    <!-- User Info -->
-    <div class="container user-info">
-        <div class="row">
-            <div class="col-md-12 text-center">
-                <h1>Welcome, {{ user_info.username }}</h1>
-                <p>Your Discord ID: {{ user_info.id }}</p>
+        <div class="card mt-4">
+            <div class="card-body">
+                <h5 class="card-title">User Data</h5>
+                <ul class="list-group">
+                    <li class="list-group-item">Points: {{ user_data['points'] }}</li>
+                    <li class="list-group-item">XP: {{ user_data['xp'] }}</li>
+                    <li class="list-group-item">Level: {{ user_data['level'] }}</li>
+                </ul>
             </div>
         </div>
     </div>
-
-    <!-- Dashboard Cards -->
-    <div class="container">
-        <div class="row">
-            <!-- Points Card -->
-            <div class="col-md-4">
-                <div class="card">
-                    <div class="card-header">
-                        Points
-                    </div>
-                    <div class="card-body text-center">
-                        <p class="points">{{ user_data.points }}</p>
-                        <p>Points available</p>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Rank Card -->
-            <div class="col-md-4">
-                <div class="card">
-                    <div class="card-header">
-                        Rank
-                    </div>
-                    <div class="card-body text-center">
-                        <span class="badge badge-rank badge-{{ 'primary' if user_data.permission == 10 else 'secondary' }}">
-                            {{ 'Owner' if user_data.permission == 10 else 'Admin' if user_data.permission == 8 else 'Mod' if user_data.permission == 5 else 'User' }}
-                        </span>
-                        <p>Your current rank</p>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Bot Status Card -->
-            <div class="col-md-4">
-                <div class="card">
-                    <div class="card-header">
-                        Bot Status
-                    </div>
-                    <div class="card-body text-center">
-                        <span class="badge badge-{{ 'success' if bot_running else 'danger' }}">
-                            {{ "Running" if bot_running else "Stopped" }}
-                        </span>
-                        <p>Current Bot Status</p>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="col-md-4">
-            <div class="card">
-                <div class="card-header">
-                    Giveaways
-                </div>
-                <div class="card-body text-center">
-                    <h5 class="card-title">Giveaways</h5>
-                    <p class="card-text">Check out the giveaways you've won!</p>
-                    <a href="{{ url_for('user_giveaways') }}" class="btn btn-primary">View Giveaways</a>
-                </div>
-            </div>
-        </div>
-
-        <!-- Helpful Links -->
-        <div class="row">
-            <div class="col-md-12">
-                <div class="card">
-                    <div class="card-header">
-                        Useful Links
-                    </div>
-                    <div class="card-body text-center">
-                        <a href="/help" class="btn btn-info btn-lg">Help</a>
-                        <a href="https://discordapp.com/users/@simolzimol" class="btn btn-outline-primary btn-lg">Contact SimolZimol</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- Footer -->
-    <footer class="footer">
-        <div class="container">
-            <p>&copy; 2024 Multus Bot | Built by SimolZimol | Exclusively on Ludi et Historia</p>
-        </div>
-    </footer>
-
-    <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.2/dist/js/bootstrap.bundle.min.js"></script>
 </body>
 
 </html>
diff --git a/templates/user_landing_page.html b/templates/user_landing_page.html
index 530fa49..fdd80d9 100644
--- a/templates/user_landing_page.html
+++ b/templates/user_landing_page.html
@@ -1,42 +1,33 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>User Landing Page</title>
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
+    <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet">
 </head>
-<body>
-    <div class="container mt-5">
-        <div class="text-center">
-            <img src="https://cdn.discordapp.com/avatars/{{ user_info['id'] }}/{{ user_info['avatar'] }}.png" class="rounded-circle" alt="Profile Picture" width="100">
-            <h2>Welcome, {{ user_info['username'] }}#{{ user_info['discriminator'] }}</h2>
-            <p>User ID: {{ user_info['id'] }}</p>
-        </div>
 
-        <h3 class="mt-5">Your Servers</h3>
-        <div class="row">
+<body>
+    {% include 'navigation.html' %}
+    <div class="container mt-5">
+        <h1 class="text-center">Welcome, {{ g.user_info['username'] }}</h1>
+        <p class="text-center">Select a server to view your server-specific data.</p>
+
+        <div class="row mt-4">
             {% for guild in guilds %}
             <div class="col-md-4 mt-3">
                 <div class="card">
                     <img src="https://cdn.discordapp.com/icons/{{ guild['id'] }}/{{ guild['icon'] }}.png" class="card-img-top" alt="Server Icon">
                     <div class="card-body">
                         <h5 class="card-title">{{ guild['name'] }}</h5>
-                        <p class="card-text">Select this server to view your server-specific data.</p>
-                        <a href="{{ url_for('user_server_data', guild_id=guild['id']) }}" class="btn btn-primary">View Server</a>
+                        <a href="{{ url_for('user_server_data', guild_id=guild['id']) }}" class="btn btn-primary btn-block">View Server</a>
                     </div>
                 </div>
             </div>
             {% endfor %}
         </div>
-
-        <!-- Admin-Funktionen anzeigen, falls der Benutzer Admin ist -->
-        {% if session['is_admin'] %}
-        <div class="mt-5">
-            <h3>Admin Controls</h3>
-            <a href="{{ url_for('global_admin_dashboard') }}" class="btn btn-danger">Go to Admin Dashboard</a>
-        </div>
-        {% endif %}
     </div>
 </body>
+
 </html>
