diff --git a/README.md b/README.md
index 64cfca1..594c22b 100644
--- a/README.md
+++ b/README.md
@@ -44,8 +44,6 @@ Don't try to go into http://localhost:8000/admin, you won't have the rights and
 
 ## TODO
 
-- Update course
-
 - Publish a message
 
 - Register to a course
diff --git a/redis_app/templates/courses.html b/redis_app/templates/courses.html
index 36a9b68..d6aacad 100644
--- a/redis_app/templates/courses.html
+++ b/redis_app/templates/courses.html
@@ -1,5 +1,15 @@
 <html>
     <body>
+        <nav>
+            <a href="{% url 'home' %}">Home</a>
+            {% if person == '' %}
+                <a href="{% url 'login_form' %}">Login</a>
+                <a href="{% url 'register_form' %}">Register</a>
+            {% else %}
+                <a href="{% url 'courses' %}">Courses</a>
+                <a href="{% url 'profile' %}">Profile</a>
+            {% endif %}
+        </nav>
         <h1>Courses for {{ person.name }}</h1>
         {% if courses %}
             {% for course in courses %}
diff --git a/redis_app/templates/create.html b/redis_app/templates/create.html
index 67fce04..cce26d8 100644
--- a/redis_app/templates/create.html
+++ b/redis_app/templates/create.html
@@ -1,5 +1,15 @@
 <html>
     <body>
+        <nav>
+            <a href="{% url 'home' %}">Home</a>
+            {% if person == '' %}
+                <a href="{% url 'login_form' %}">Login</a>
+                <a href="{% url 'register_form' %}">Register</a>
+            {% else %}
+                <a href="{% url 'courses' %}">Courses</a>
+                <a href="{% url 'profile' %}">Profile</a>
+            {% endif %}
+        </nav>
         <form action="{% url 'create_course_form' %}" method="POST">
             {% csrf_token %}
             <fieldset>
diff --git a/redis_app/templates/details.html b/redis_app/templates/details.html
index 6924bb6..8dd870d 100644
--- a/redis_app/templates/details.html
+++ b/redis_app/templates/details.html
@@ -1,5 +1,15 @@
 <html>
     <body>
+        <nav>
+            <a href="{% url 'home' %}">Home</a>
+            {% if person == '' %}
+                <a href="{% url 'login_form' %}">Login</a>
+                <a href="{% url 'register_form' %}">Register</a>
+            {% else %}
+                <a href="{% url 'courses' %}">Courses</a>
+                <a href="{% url 'profile' %}">Profile</a>
+            {% endif %}
+        </nav>
         {% if error_message %}
             {{ error_message }}
         {% endif %}
diff --git a/redis_app/templates/home.html b/redis_app/templates/home.html
index 83b08c4..6a70f27 100644
--- a/redis_app/templates/home.html
+++ b/redis_app/templates/home.html
@@ -1,13 +1,19 @@
 <html>
     <body>
+        <nav>
+            <a href="{% url 'home' %}">Home</a>
+            {% if person == '' %}
+                <a href="{% url 'login_form' %}">Login</a>
+                <a href="{% url 'register_form' %}">Register</a>
+            {% else %}
+                <a href="{% url 'courses' %}">Courses</a>
+                <a href="{% url 'profile' %}">Profile</a>
+            {% endif %}
+        </nav>
         {% if person != '' %}
             <h1>Welcome {{ person.name }}!</h1>
         {% else %}
             <h1>Welcome young padawan!</h1>
         {% endif %}
-        <a href="{% url 'login_form' %}">Login</a>
-        <a href="{% url 'register_form' %}">Register</a>
-        <a href="{% url 'courses' %}">Courses</a>
-        <a href="{% url 'profile' %}">Profile</a>
     </body>
 </html>
\ No newline at end of file
diff --git a/redis_app/templates/login.html b/redis_app/templates/login.html
index 5c406fc..9ca8983 100644
--- a/redis_app/templates/login.html
+++ b/redis_app/templates/login.html
@@ -1,5 +1,15 @@
 <html>
     <body>
+        <nav>
+            <a href="{% url 'home' %}">Home</a>
+            {% if person.name == '' %}
+                <a href="{% url 'login_form' %}">Login</a>
+                <a href="{% url 'register_form' %}">Register</a>
+            {% else %}
+                <a href="{% url 'courses' %}">Courses</a>
+                <a href="{% url 'profile' %}">Profile</a>
+            {% endif %}
+        </nav>
         <form action="{% url 'login' %}" method="POST">
             {% csrf_token %}
             <fieldset>
@@ -14,7 +24,6 @@
                 </select>
             </fieldset>
             <input type="submit" value="Login">
-            <a href="{% url 'register_form' %}">Register</a>
         </form>
     </body>
 </html>
\ No newline at end of file
diff --git a/redis_app/templates/profile.html b/redis_app/templates/profile.html
index 6de4c27..6919847 100644
--- a/redis_app/templates/profile.html
+++ b/redis_app/templates/profile.html
@@ -1,5 +1,15 @@
 <html>
     <body>
+        <nav>
+            <a href="{% url 'home' %}">Home</a>
+            {% if person == '' %}
+                <a href="{% url 'login_form' %}">Login</a>
+                <a href="{% url 'register_form' %}">Register</a>
+            {% else %}
+                <a href="{% url 'courses' %}">Courses</a>
+                <a href="{% url 'profile' %}">Profile</a>
+            {% endif %}
+        </nav>
         <form action="{% url 'change_profile' %}" method="POST">
             {% csrf_token %}
             <fieldset>
@@ -15,6 +25,5 @@
             </fieldset>
             <input type="submit" value="Update">
         </form>
-        <a href="{% url 'home' %}">Home</a>
     </body>
 </html>
\ No newline at end of file
diff --git a/redis_app/templates/register.html b/redis_app/templates/register.html
index 94ee63a..c254296 100644
--- a/redis_app/templates/register.html
+++ b/redis_app/templates/register.html
@@ -1,5 +1,15 @@
 <html>
     <body>
+        <nav>
+            <a href="{% url 'home' %}">Home</a>
+            {% if person.name == '' %}
+                <a href="{% url 'login_form' %}">Login</a>
+                <a href="{% url 'register_form' %}">Register</a>
+            {% else %}
+                <a href="{% url 'courses' %}">Courses</a>
+                <a href="{% url 'profile' %}">Profile</a>
+            {% endif %}
+        </nav>
         <form action="{% url 'register' %}" method="POST">
             {% csrf_token %}
             <fieldset>
diff --git a/redis_app/templates/test.html b/redis_app/templates/test.html
deleted file mode 100644
index d343734..0000000
--- a/redis_app/templates/test.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-    <body>
-        {% for user in users %}
-            {{ user }}
-        {% endfor %}
-    </body>
-</html>
\ No newline at end of file
diff --git a/redis_app/templates/update.html b/redis_app/templates/update.html
index a346203..a02d6e9 100644
--- a/redis_app/templates/update.html
+++ b/redis_app/templates/update.html
@@ -1,5 +1,15 @@
 <html>
     <body>
+        <nav>
+            <a href="{% url 'home' %}">Home</a>
+            {% if person == '' %}
+                <a href="{% url 'login_form' %}">Login</a>
+                <a href="{% url 'register_form' %}">Register</a>
+            {% else %}
+                <a href="{% url 'courses' %}">Courses</a>
+                <a href="{% url 'profile' %}">Profile</a>
+            {% endif %}
+        </nav>
         <form action="{% url 'update_course_form' course.id %}" method="POST">
             {% csrf_token %}
             <fieldset>
