diff --git a/app/templates/base.html b/app/templates/base.html
index ba71787..3c17a12 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -17,7 +17,7 @@
             <span class="navbar-toggler-icon"></span>
         </button>
         <div class="collapse navbar-collapse" id="navbarNav">
-            <ul class="navbar-nav">
+            <ul class="navbar-nav mr-auto mt-3 mt-lg-0">
             <li class="nav-item">
                 <a class="nav-link" href="/events">Events</a>
             </li>
@@ -27,14 +27,17 @@
             <li class="nav-item">
                 <a class="nav-link" href="/periods">Periods</a>
             </li>
-            </ul>
-        </div>
-        <div class="float-right">
             {% if current_user.is_authenticated %}
-                <a href="{{ url_for('logout') }}" class="nav-link"> Logout {{current_user.userName}} </a>
+                <li class="nav-item">
+                    <a class="nav-link" href="/settings">Settings</a>
+                </li>
+            {% endif %}
+            </ul>
+            {% if current_user.is_authenticated %}
+            <a href="{{ url_for('logout') }}"> Logout {{current_user.userName}} </a>
             {% endif %}
             {% if not current_user.is_authenticated %}
-                <a href="{{ url_for('login') }}" class="nav-link"> Login </a>
+            <a href="{{ url_for('login') }}"> Login </a>
             {% endif %}
         </div>
     </nav>