diff --git a/application/templates/base.html b/application/templates/base.html
index d33c9d7..7323c8f 100644
--- a/application/templates/base.html
+++ b/application/templates/base.html
@@ -18,32 +18,37 @@
                 aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
                 <span class="navbar-toggler-icon"></span>
             </button>
-            <div class="collapse navbar-collapse" id="navbarNav">
-                <ul class="navbar-nav">
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ url_for('user.daily_log') }}">Daily Log</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ url_for('user.dashboard') }}">Dashboard</a>
-                    </li>
-                </ul>
-                <ul class="navbar-nav ms-auto">
-                    {% if current_user.is_authenticated %}
 
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ url_for('logout') }}">Logout</a>
-                    </li>
-                    {% else %}
-                    <li class="nav-item">
-                        <a class="nav-link" href="{{ url_for('login') }}">Login</a>
-                    </li>
-                    {% endif %}
-                </ul>
+            <div class="collapse navbar-collapse" id="navbarNav">
+                <div class="d-flex w-100">
+                    <ul class="navbar-nav flex-grow-1">
+                        <li class="nav-item">
+                            <a class="nav-link" href="{{ url_for('user.daily_log') }}">Daily Log</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" href="{{ url_for('user.dashboard') }}">Dashboard</a>
+                        </li>
+                    </ul>
+                    <ul class="navbar-nav">
+                        {% if current_user.is_authenticated %}
+                        <li class="nav-item">
+                            <a class="nav-link" href="{{ url_for('logout') }}">Logout</a>
+                        </li>
+                        {% else %}
+                        <li class="nav-item">
+                            <a class="nav-link" href="{{ url_for('login') }}">Login</a>
+                        </li>
+                        {% endif %}
+                        <li class="nav-item">
+                            <button id="toggleTheme" class="btn btn-outline-light">Toggle Theme</button>
+                        </li>
+                    </ul>
+                </div>
             </div>
-            <button id="toggleTheme" class="btn btn-outline-light ms-3">Toggle Theme</button>
         </div>
     </nav>
 
+
     <div class="container">
         {% with messages = get_flashed_messages() %}
         {% if messages %}