diff --git a/smdb/smdb/templates/base.html b/smdb/smdb/templates/base.html
index e7e2bfbd..21dfbcf8 100644
--- a/smdb/smdb/templates/base.html
+++ b/smdb/smdb/templates/base.html
@@ -21,10 +21,9 @@
   <link rel="icon" type="image/png" href="{% static 'images/favicons/smdb_favicon_ship.ico' %}">
 
   {% block css %}
-  {# Other Django packages depend on Bootstrap 4 #}
-  <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet"
-    integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
-
+  {#  Latest compiled and minified Bootstrap CSS  #}
+  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet"
+    integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
   {#  Add leaflet CSS #}
   <link rel="stylesheet" type="text/css" href="https://unpkg.com/leaflet@1.8.0/dist/leaflet.css">
   <link rel="stylesheet" href="https://unpkg.com/@geoman-io/leaflet-geoman-free@latest/dist/leaflet-geoman.css">
@@ -50,8 +49,8 @@
     integrity="sha384-7+zCNj/IqJ95wo16oMtfsKbZ9ccEh31eOz1HGyDuCQ6wgnyJNSYdrPa03rtR1zdB"
     crossorigin="anonymous"></script>
 
-  <script defer src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
-    integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.min.js"
+    integrity="sha384-QJHtvGhmr9XOIpI6YVutG+2QOK9T+ZnN4kzFN1RtK3zEFEIsxhlmWl5/YESvpZ13"
     crossorigin="anonymous"></script>
 
   {#  Your stuff: Third-party javascript libraries go here  #}
@@ -72,6 +71,7 @@
   {#  Left Menu Items  #}
   <div class="navbar navbar-expand-md navbar-light navbar-fixed-top navbar-left"
     style="background-color: #e9e9e9; width: 100%" id="navbar" role="navigation">
+
     <a class="navbar-brand" href="{% url 'home' %}" id="smdb_navbrand">
       <img src="{% static 'images/SMDB_logo.jpg' %}" class="img" id="smdbLogo"
         aria-label="SeaFloor Mapping Database (SMDB)">
@@ -123,9 +123,9 @@
     </ul>
     {#  Right Menu Items  #}
     <ul class="navbar-nav nav-pills mx-auto justify-content-right flex-column flex-md-row pull-right"
-      style="padding-left: 650px" width="50%" id="menuLinksRight">
+      style="flex-flow: row nowrap" width="50%" id="menuLinksRight">
       {% if request.user.is_authenticated %}
-      <li class="nav-item mx-auto pull-right" style="padding-right: 15px">
+      <li class="nav-item mx-auto pull-right" style="padding-right: 1px">
         {# URL provided by smdbango-allauth/account/urls.py #}
         <a class="nav-link pull-right float-right" id="navAccount"
           href="{% url 'users:detail' request.user.username  %}" data-bs-toggle="tooltip" data-bs-placement="top"
@@ -166,6 +166,7 @@
       </li>
 
     </ul>
+    
   </div>
 
   <div class="row" id="separator" style="color:darkgray">
@@ -190,8 +191,8 @@
   {# Script tags with only code, no src (defer by default) #}
   {% endblock inline_javascript %}
   <footer id="footer">
-    <br><br><br>Page contents are for MBARI internal use only.
-  </footer><br><br><br>
+    Page contents are for MBARI internal use only.
+  </footer>
 </body>
 
 </html>