diff --git a/src/families.php b/src/families.php
index 06495a0..dd86a3d 100644
--- a/src/families.php
+++ b/src/families.php
@@ -19,6 +19,7 @@ $smarty = new MySmarty();
 $opt = $smarty->opt();
 
 session_start();
+$haserror = false;
 if (!isset($_SESSION["userid"])) {
 	header("Location: " . getFullPath("login.php"));
 	exit;
diff --git a/src/templates/categories.tpl b/src/templates/categories.tpl
index 2307b9f..077988b 100644
--- a/src/templates/categories.tpl
+++ b/src/templates/categories.tpl
@@ -20,8 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 	<title>Test Gift Registry - Manage Categories</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-	<script src="bootstrap/js/bootstrap.min.js"></script>
+	<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
 	<script src="js/jquery.validate.min.js"></script>
 	<script src="js/giftreg.js"></script>
 
@@ -132,5 +131,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 			</div>
 		</div>
 	</div>
+	<script src="bootstrap/js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
diff --git a/src/templates/event.tpl b/src/templates/event.tpl
index 2ea9d27..60c93e7 100644
--- a/src/templates/event.tpl
+++ b/src/templates/event.tpl
@@ -20,8 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 	<title>Test Gift Registry - Manage Events</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-	<script src="bootstrap/js/bootstrap.min.js"></script>
+	<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
 	<link href="datepicker/css/datepicker.css" rel="stylesheet">
 	<script src="datepicker/js/bootstrap-datepicker.js"></script>
 	<script src="js/jquery.validate.min.js"></script>
@@ -177,5 +176,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 		</div>
 	</div>
 </div>
+	<script src="bootstrap/js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
diff --git a/src/templates/families.tpl b/src/templates/families.tpl
index f9eb297..aa03f82 100644
--- a/src/templates/families.tpl
+++ b/src/templates/families.tpl
@@ -20,8 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 	<title>Test Gift Registry - Manage Families</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-	<script src="bootstrap/js/bootstrap.min.js"></script>
+	<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
 	<script src="js/jquery.validate.min.js"></script>
 	<script src="js/giftreg.js"></script>
 
@@ -157,5 +156,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 		</div>
 	</div>
+	<script src="bootstrap/js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
diff --git a/src/templates/forgot.tpl b/src/templates/forgot.tpl
index c4235cb..123fcab 100644
--- a/src/templates/forgot.tpl
+++ b/src/templates/forgot.tpl
@@ -20,8 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 	<title>Test Gift Registry - Forgot Password</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-	<script src="bootstrap/js/bootstrap.min.js"></script>
+	<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
 	<script src="js/jquery.validate.min.js"></script>
 	<script src="js/giftreg.js"></script>
 
@@ -86,5 +85,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 		</div>
 	{/if}
 	</div>
+	<script src="bootstrap/js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
diff --git a/src/templates/help.tpl b/src/templates/help.tpl
index b841df6..192b6c4 100644
--- a/src/templates/help.tpl
+++ b/src/templates/help.tpl
@@ -109,7 +109,7 @@ window.open(appURL);
 -->
 	</div>
 
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-	<script src="bootstrap/js/bootstrap.min.js"></script>
+	<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
+	<script src="bootstrap/js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
diff --git a/src/templates/home.tpl b/src/templates/home.tpl
index ea9d0af..3cf73eb 100644
--- a/src/templates/home.tpl
+++ b/src/templates/home.tpl
@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
 	<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
-	<script src="bootstrap/js/bootstrap.min.js"></script>
 	<link href="lightbox/css/lightbox.css" rel="stylesheet">
 	
 	<script language="JavaScript" type="text/javascript">
@@ -344,6 +343,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 			{/if}
 		</section>
 	</div>
+	<script src="bootstrap/js/bootstrap.bundle.min.js"></script>
 	<script src="lightbox/js/lightbox.min.js"></script>
+	<script src="bootstrap/js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
diff --git a/src/templates/item.tpl b/src/templates/item.tpl
index 5924270..fc2e386 100644
--- a/src/templates/item.tpl
+++ b/src/templates/item.tpl
@@ -20,8 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 	<title>Test Gift Registry - Edit Item</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-	<script src="bootstrap/js/bootstrap.min.js"></script>
+	<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
 	<script src="js/jquery.validate.min.js"></script>
 	<script src="js/giftreg.js"></script>
 
@@ -254,5 +253,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 		</div>
 	</div>
 	</div>
+	<script src="bootstrap/js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
diff --git a/src/templates/login.tpl b/src/templates/login.tpl
index 96558d2..c556f1b 100644
--- a/src/templates/login.tpl
+++ b/src/templates/login.tpl
@@ -20,8 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 	<title>Test Gift Registry - Login</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-	<script src="bootstrap/js/bootstrap.min.js"></script>
+	<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
 	<script src="js/jquery.validate.min.js"></script>
 	<script src="js/giftreg.js"></script>
 
@@ -97,5 +96,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 			</div>
 		</div>
 	</div>
+	<script src="bootstrap/js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
diff --git a/src/templates/message.tpl b/src/templates/message.tpl
index 7e5a200..aaa8fa9 100644
--- a/src/templates/message.tpl
+++ b/src/templates/message.tpl
@@ -56,7 +56,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 			</div>
 		</div>
 	</div>
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-	<script src="bootstrap/js/bootstrap.min.js"></script>
+	<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
+	<script src="bootstrap/js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
diff --git a/src/templates/mylist.tpl b/src/templates/mylist.tpl
index 377d393..9511fb0 100644
--- a/src/templates/mylist.tpl
+++ b/src/templates/mylist.tpl
@@ -86,7 +86,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 		</div>
 	</div>
 
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-	<script src="bootstrap/js/bootstrap.min.js"></script>
+	<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
+	<script src="bootstrap/js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
diff --git a/src/templates/navbar.tpl b/src/templates/navbar.tpl
index 457f972..6343003 100644
--- a/src/templates/navbar.tpl
+++ b/src/templates/navbar.tpl
@@ -13,43 +13,55 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *}
+{*
+Inspired from https://getbootstrap.com/docs/4.0/components/navbar/#supported-content
+*}
 
-<div class="navbar navbar-fixed-top">
-	<div class="navbar-inner">
-		<div class="container">
-			<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-				<span class="icon-bar"></span>
-				<span class="icon-bar"></span>
-				<span class="icon-bar"></span>
-			</a>
-			<a class="brand" href="index.php">
-                        <img src="images/wishlist.png" height=25px width=25px /> Test Gift Registry</a>
-			<div id="main-menu" class="nav-collapse">
-				<ul id="main-menu-left" class="nav">
-					<li><a href="shoplist.php">My Shopping List</a></li>
-					<li><a href="mylist.php">My Items (printable)</a></li>
-				</ul>
-				<ul id="main-menu-right" class="nav pull-right">
-					<li><a href="profile.php">Update Profile</a></li>
-					<li><a href="event.php">Manage Events</a></li>
-					{if $isadmin}
-						<li class="dropdown">
-							<a class="dropdown-toggle" href="#" data-toggle="dropdown">
-								Admin
-								<b class="caret"></b>
-							</a>
-							<ul class="dropdown-menu">
-								<li><a href="users.php">Manage Users</a></li>
-								<li><a href="families.php">Manage Families</a></li>
-								<li><a href="categories.php">Manage Categories</a></li>
-								<li><a href="ranks.php">Manage Ranks</a></li>
-							</ul>
-						</li>
-					{/if}
-					<li><a href="login.php?action=logout">Logout</a></li>
-					<li><a href="help.php">Help</a></li>
-				</ul>
-			</div>
-		</div>
-	</div>
-</div>
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+<div class="container">
+  <a class="navbar-brand" href="index.php"><img src="images/wishlist.png" height=25px width=25px /> Test Gift Registry</a>
+  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+    <span class="navbar-toggler-icon"></span>
+  </button>
+
+  <div class="collapse navbar-collapse" id="navbarSupportedContent">
+    <ul class="navbar-nav">
+      <li class="nav-item active">
+        <a class="nav-link" href="shoplist.php">My Shopping List</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" href="mylist.php">My Items (printable)</a>
+      </li>
+    </ul>
+  </div>
+  <div class="collapse navbar-collapse" id="navbarSupportedContent">
+    <ul class="navbar-nav ms-auto">
+      {if $isadmin}
+      <li class="nav-item dropdown" data-bs-theme="dark">
+        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          Admin
+        </a>
+        <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+          <a class="dropdown-item" href="users.php">Manage Users</a>
+          <a class="dropdown-item" href="families.php">Manage Families</a>
+          <a class="dropdown-item" href="categories.php">Manage Categories</a>
+          <a class="dropdown-item" href="ranks.php">Manage Ranks</a>
+        </div>
+      </li>
+      {/if}
+      <li class="nav-item">
+        <a class="nav-link" href="profile.php">Update Profile</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" href="event.php">Manage Events</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" href="login.php?action=logout">Logout</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" href="help.php">Help</a>
+      </li>
+    </ul>
+  </div>
+  </div>
+</nav>
diff --git a/src/templates/profile.tpl b/src/templates/profile.tpl
index 8b48428..ef768b4 100644
--- a/src/templates/profile.tpl
+++ b/src/templates/profile.tpl
@@ -21,8 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 	<title>Test Gift Registry - Update Profile</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-	<script src="bootstrap/js/bootstrap.min.js"></script>
+	<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
 	<script src="js/jquery.validate.min.js"></script>
 	<script src="js/giftreg.js"></script>
 
@@ -160,5 +159,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 		</div>
 	</div>
 </div>
+	<script src="bootstrap/js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
diff --git a/src/templates/ranks.tpl b/src/templates/ranks.tpl
index b96ce13..fb68419 100644
--- a/src/templates/ranks.tpl
+++ b/src/templates/ranks.tpl
@@ -20,8 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 	<title>Test Gift Registry - Manage Ranks</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-	<script src="bootstrap/js/bootstrap.min.js"></script>
+	<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
 	<script src="js/jquery.validate.min.js"></script>
 	<script src="js/giftreg.js"></script>
 
@@ -139,5 +138,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 			</div>
 		</div>
 	</div>
+	<script src="bootstrap/js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
diff --git a/src/templates/receive.tpl b/src/templates/receive.tpl
index 6f629ba..f030392 100644
--- a/src/templates/receive.tpl
+++ b/src/templates/receive.tpl
@@ -20,8 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 	<title>Test Gift Registry - Receive an Item</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-	<script src="bootstrap/js/bootstrap.min.js"></script>
+	<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
 	<script src="js/jquery.validate.min.js"></script>
 	<script src="js/giftreg.js"></script>
 	
@@ -94,5 +93,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 			</div>
 		</div>
 	</div>
+	<script src="bootstrap/js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
diff --git a/src/templates/shop.tpl b/src/templates/shop.tpl
index 7402db1..6c78237 100644
--- a/src/templates/shop.tpl
+++ b/src/templates/shop.tpl
@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
 	<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
-	<script src="bootstrap/js/bootstrap.min.js"></script>
 	<link href="lightbox/css/lightbox.css" rel="stylesheet">
 
     <script language="JavaScript" type="text/javascript">
@@ -215,5 +214,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 	</div>
 	</div>
 	<script src="lightbox/js/lightbox.min.js"></script>
+	<script src="bootstrap/js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
diff --git a/src/templates/shoplist.tpl b/src/templates/shoplist.tpl
index dab8c99..d75eb00 100644
--- a/src/templates/shoplist.tpl
+++ b/src/templates/shoplist.tpl
@@ -81,7 +81,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 		</div>
 	</div>
 
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-	<script src="bootstrap/js/bootstrap.min.js"></script>
+	<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
+	<script src="bootstrap/js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
diff --git a/src/templates/signup.tpl b/src/templates/signup.tpl
index ed005ad..db2d6ed 100644
--- a/src/templates/signup.tpl
+++ b/src/templates/signup.tpl
@@ -20,8 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 	<title>Test Gift Registry - Sign Up</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-	<script src="bootstrap/js/bootstrap.min.js"></script>
+	<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
 	<script src="js/jquery.validate.min.js"></script>
 	<script src="js/giftreg.js"></script>
 
@@ -152,5 +151,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 			</div>
 		{/if}
 	</div>
+	<script src="bootstrap/js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
diff --git a/src/templates/users.tpl b/src/templates/users.tpl
index 3d786de..7c66707 100644
--- a/src/templates/users.tpl
+++ b/src/templates/users.tpl
@@ -20,8 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 	<title>Test Gift Registry - Manage Users</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-	<script src="bootstrap/js/bootstrap.min.js"></script>
+	<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
 	<script src="js/jquery.validate.min.js"></script>
 	<script src="js/giftreg.js"></script>
 	
@@ -185,5 +184,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 			</div>
 		</div>
 	</div>
+	<script src="bootstrap/js/bootstrap.bundle.min.js"></script>
 </body>
 </html>