diff --git a/PDMI/templates/base/base.html b/PDMI/templates/base/base.html
index 01b8f72..19b8c3e 100644
--- a/PDMI/templates/base/base.html
+++ b/PDMI/templates/base/base.html
@@ -38,6 +38,29 @@
                 </li>
             </ul>
             {% block 'navbar-right' %}
+            {% if user.is_authenticated %}
+            <ul class="nav navbar-nav ml-auto">
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        <span class="fas fa-user"></span> {{ request.user.username }}
+                    </a>
+                    <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink">
+                        <a class="dropdown-item" href="#">Profile</a>
+                        <a class="dropdown-item" href="{% url 'upload' %}">Upload module</a>
+                        <a class="dropdown-item" href="{% url 'logout' %}">Logout</a>
+                    </div>
+                </li>
+            </ul>
+            {% else %}
+            <ul class="nav navbar-nav ml-auto">
+                <li class="nav-item">
+                    <a class="nav-link" data-toggle="modal" id="registerLink" href="#"><span class="fa fa-user"></span> Register</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" data-toggle="modal" id="loginLink" href="#"><span class="fa fa-sign-in-alt"></span> Login</a>
+                </li>
+            </ul>
+            {% endif %}
             {% endblock 'navbar-right' %}
         </div>
     </nav>