diff --git a/navbar.html b/navbar.html
index 9e5379ca2463f3ccb047b504a0020cd1b7591d78..ce0295d7866170a0485799f37db882d1530b9871 100644
--- a/navbar.html
+++ b/navbar.html
@@ -1,9 +1,42 @@
 <nav class="navbar navbar-expand-lg navbar-dark bg-primary mb-4">
     <div class="container">
-        <a class="navbar-brand" href="{% url 'home' %}">Uni Hub</a>
-        <div class="navbar-nav">
-            <a class="nav-link" href="{% url 'communities' %}">Communities</a>
-            <a class="nav-link" href="{% url 'events' %}">Events</a>
+        <a class="navbar-brand" href="{% url 'home' %}">
+            <i class="fas fa-university me-2"></i> Uni Hub
+        </a>
+
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarContent">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+
+        <div class="collapse navbar-collapse" id="navbarContent">
+            <ul class="navbar-nav me-auto">
+                <li class="nav-item">
+                    <a class="nav-link {% if request.resolver_match.url_name == 'communities' %}active{% endif %}" href="{% url 'communities' %}">
+                        <i class="fas fa-users me-1"></i> Communities
+                    </a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link {% if request.resolver_match.url_name == 'events' %}active{% endif %}" href="{% url 'events' %}">
+                        <i class="fas fa-calendar-alt me-1"></i> Events
+                    </a>
+                </li>
+            </ul>
+
+            <ul class="navbar-nav">
+                {% if user.is_authenticated %}
+                <li class="nav-item">
+                    <a class="nav-link" href="{% url 'logout' %}">
+                        <i class="fas fa-sign-out-alt me-1"></i> Logout
+                    </a>
+                </li>
+                {% else %}
+                <li class="nav-item">
+                    <a class="nav-link" href="{% url 'login' %}">
+                        <i class="fas fa-sign-in-alt me-1"></i> Login
+                    </a>
+                </li>
+                {% endif %}
+            </ul>
         </div>
     </div>
-</nav>
\ No newline at end of file
+</nav>