diff --git a/oauth/urls.py b/oauth/urls.py
index 383cc5b..11afb10 100644
--- a/oauth/urls.py
+++ b/oauth/urls.py
@@ -3,7 +3,8 @@ from django.urls import path
 
 from . import views
 
+app_name = "oauth"
 urlpatterns = [
-    path('register', views.register),
+    path('register', views.register, name='login'),
     path('authorized', views.register_callback),
 ]
diff --git a/templates/base.html b/templates/base.html
index a818a26..3102a8d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -28,9 +28,9 @@
 		nav li {
 			list-style-type: none;
 			display: inline-block;
-			margin: 0 2vw;
+			margin: 0 1.5vw;
 			/* 3% of the height of the viewport */
-			font-size: 3vh;
+			font-size: 2vh;
 		}
 
 		nav a {
@@ -90,13 +90,24 @@
 			margin: 8px 0;
 			box-sizing: border-box;
 		}
+
+		.alignLeft {
+			float: left;
+		}
+
+		.alignRight {
+			float: right;
+		}
+		.accentuated {
+			color: #66351d;
+		}
 	</style>
 </head>
 <body>
 
 <nav>
 	<button id="nav-button">✖</button>
-	<ul>
+	<ul class="alignLeft">
 		<li>
 			<a href="{% url 'events:index' %}">
 				Home</a>
@@ -107,10 +118,30 @@
 			</a>
 		</li>
 	</ul>
+	<ul class="alignRight">
+		{% if user.is_authenticated %}
+			<li class="accentuated">
+				Hello, {{ user.username }}
+			</li>
+			<li>
+				<a href="{% url 'users:logout' %}">
+					Logout
+				</a>
+			</li>
+		{% else %}
+			<li>
+				<a href="{% url 'oauth:login' %}">
+					Login
+				</a>
+			</li>
+		{% endif %}
+
+	</ul>
+	<div style="clear: both;"></div>
 </nav>
 <h1>Zeus WPI Kelderregistratiesysteem™</h1>
 <main>
-{% block content %}{% endblock %}
+	{% block content %}{% endblock %}
 </main>
 <script>
 	document.addEventListener("DOMContentLoaded", function () {
diff --git a/users/templates/profile.html b/users/templates/profile.html
index b83aed3..7e8284c 100644
--- a/users/templates/profile.html
+++ b/users/templates/profile.html
@@ -11,10 +11,8 @@
 		<label>Real name</label>
 		<input type="text" value="{{ user.real_name }}">
 		<input type="submit" value="Save"/>
-		<a href="/user/logout">Logout</a>
 	{% else %}
 		<p>Not logged in</p>
-		<a href="/login/zeus/register">Login</a>
 	{% endif %}
 {% endblock %}
 
diff --git a/users/urls.py b/users/urls.py
index 396231c..c285f96 100644
--- a/users/urls.py
+++ b/users/urls.py
@@ -6,5 +6,5 @@ app_name = "users"
 
 urlpatterns = [
     path('profile', views.profile, name="profile"),
-    path('logout', views.logout_view)
+    path('logout', views.logout_view, name="logout")
 ]
