diff --git a/templates/base.djhtml b/templates/base.djhtml
index c3955c3..42c257e 100644
--- a/templates/base.djhtml
+++ b/templates/base.djhtml
@@ -5,27 +5,29 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
     <!-- Bootstrap CSS -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-+0n0xVW2eSR5OomGNYDnhzAbDsOXxcvSN1TPprVMTNDbiYZCxYbOOl7+AMvyTG2x" crossorigin="anonymous">
 
     <title>{% block title %}{% endblock %}</title>
   </head>
   <body>
     <nav class="navbar navbar-expand-lg navbar-light bg-light">
-      <a class="navbar-brand" href="/">RecMaint</a>
+      <div class="container-fluid">
+        <a class="navbar-brand" href="/">RecMaint</a>
 
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#user-nav" aria-controls="user-nav" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div id="user-nav" class="collapse navbar-collapse">
-        <div class="navbar-nav ml-auto">
-          {% if user.is_staff %}
-            <a class="nav-item nav-link" href="/admin"> Admin </a>
-          {% endif %}
-          {% if user.is_authenticated %}
-            <a class="nav-item nav-link" href="/auth/logout"> Logout: {{ user }} </a>
-          {% else %}
-            <a class="nav-item nav-link" href="/auth/login?next={{ request.get_full_path }}"> Login </a>
-          {% endif %}
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#user-nav" aria-controls="user-nav" aria-expanded="false" aria-label="Toggle navigation">
+          <span class="navbar-toggler-icon"></span>
+        </button>
+        <div id="user-nav" class="collapse navbar-collapse justify-content-end">
+          <div class="navbar-nav">
+            {% if user.is_staff %}
+              <a class="nav-item nav-link" href="/admin"> Admin </a>
+            {% endif %}
+            {% if user.is_authenticated %}
+              <a class="nav-item nav-link" href="/auth/logout"> Logout: {{ user }} </a>
+            {% else %}
+              <a class="nav-item nav-link" href="/auth/login?next={{ request.get_full_path }}"> Login </a>
+            {% endif %}
+          </div>
         </div>
       </div>
     </nav>
@@ -34,8 +36,7 @@
       {% block content %}{% endblock %}
     </div>
 
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
-    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
+    <!-- Bootstrap JS -->
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-gtEjrD/SeCtmISkJkNUaaKMoLD0//ElJ19smozuHV6z3Iehds+3Ulb9Bn9Plx0x4" crossorigin="anonymous"></script>
   </body>
 </html>
