diff --git a/templates/base.html b/templates/base.html
index 81101bc..9c3240b 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -42,17 +42,18 @@
                     <a href="/" class="text-xl font-bold flex items-center lg:ml-2.5">
                         <img src="{{ url_for('static', filename='img/logo.png') }}" class="h-8 mr-2"
                             alt="Workout Tracker Logo">
-                        <span class="self-center whitespace-nowrap">Workout Tracker</span>
+                        <span class="self-center whitespace-nowrap hidden sm:block">Workout Tracker</span>
                     </a>
                 </div>
-                <div class="flex items-center gap-4">
+                <div class="flex items-center gap-2 sm:gap-4">
                     {% if current_user.is_authenticated %}
-                    <!-- Show logged-in user's name and Logout link -->
-                    <span class="text-slate-700">
-                        {{ current_user.name }}
-                    </span>
+                    <!-- Show logged-in user's name as a link to logout on mobile -->
                     <a href="{{ url_for('auth.logout') }}"
-                        class="text-slate-400 hover:text-slate-500 flex items-center gap-1">
+                        class="text-slate-700 hover:text-slate-900 transition-colors">
+                        {{ current_user.name }}
+                    </a>
+                    <a href="{{ url_for('auth.logout') }}"
+                        class="text-slate-400 hover:text-slate-500 hidden sm:flex items-center gap-1 transition-colors">
                         <!-- Heroicon: Arrow Left On Rectangle (Logout) -->
                         <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5" fill="none" viewBox="0 0 24 24"
                             stroke-width="1.5" stroke="currentColor">
@@ -92,9 +93,9 @@
                     </a>
                     {% endif %}
                     <a href="https://github.com/GabePope/WorkoutTracker"
-                        class="ml-6 block text-slate-400 hover:text-slate-500 dark:hover:text-slate-300"><span
-                            class="sr-only">Workout Tracker on GitHub</span><svg viewBox="0 0 16 16" class="w-6 h-6"
-                            fill="black" aria-hidden="true">
+                        class="ml-2 sm:ml-6 hidden sm:block text-slate-400 hover:text-slate-500 dark:hover:text-slate-300">
+                        <span class="sr-only">Workout Tracker on GitHub</span>
+                        <svg viewBox="0 0 16 16" class="w-6 h-6" fill="black" aria-hidden="true">
                             <path
                                 d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z">
                             </path>