diff --git a/templates/includes/footer.html b/templates/includes/footer.html
index 7408d29d..a8cd8611 100644
--- a/templates/includes/footer.html
+++ b/templates/includes/footer.html
@@ -1,19 +1,22 @@
 {% load static %}
-<div class="lg:max-w-5xl mt-10 mx-auto bg-base-300 text-base-content">
-
-    <footer class="footer sm:footer-horizontal p-10">
-        {% if not public_mode %}
-        <nav>
-            <h6 class="footer-title">Services</h6>
-            <a class="link link-hover" href="/">Predict</a>
-            <a class="link link-hover" href="/search">Search</a>
-            <a class="link link-hover" href="/package">Browse</a>
-            {% if user.is_authenticated %}
-            <a class="link link-hover" href="/model">Your Collections</a>
-            {% endif %}
-            <a href="https://wiki.envipath.org/" target="_blank" class="link link-hover">Documentation</a>
-    </nav>
+<div class="bg-base-300 text-base-content mx-auto mt-10 lg:max-w-5xl">
+  <footer class="footer sm:footer-horizontal p-10">
+    {% if not public_mode %}
+      <nav>
+        <h6 class="footer-title">Services</h6>
+        <a class="link link-hover" href="/predict">Predict</a>
+        <a class="link link-hover" href="/package">Packages</a>
+        {% if user.is_authenticated %}
+          <a class="link link-hover" href="/model">Your Collections</a>
         {% endif %}
+        <a
+          href="https://wiki.envipath.org/"
+          target="_blank"
+          class="link link-hover"
+          >Documentation</a
+        >
+      </nav>
+    {% endif %}
     <nav>
       <h6 class="footer-title">Company</h6>
       <a class="link link-hover" href="/about">About us</a>
@@ -29,39 +32,61 @@
       <a class="link link-hover" href="/cite">Cite enviPath</a>
     </nav>
   </footer>
-  <footer class="footer border-neutral-300 border-t-2 px-10 py-4">
-    <div class="flex flex-row justify-between w-full items-start">
+  <footer class="footer border-t-2 border-neutral-300 px-10 py-4">
+    <div class="flex w-full flex-row items-start justify-between">
       <aside class="grid-flow-col items-center">
-          <svg class="fill-neutral-content flex-shrink-0 h-14 m-2" viewbox="0 0 65 65" >
-              <use
-                href="{% static "/images/logo-square.svg" %}#ep-logo-square"
-              >
-              </use>
-            </svg>
+        <svg
+          class="fill-neutral-content m-2 h-14 flex-shrink-0"
+          viewbox="0 0 65 65"
+        >
+          <use
+            href="{% static "/images/logo-square.svg" %}#ep-logo-square"
+          ></use>
+        </svg>
 
-          enviPath Ltd.
-          <br />
-          Biodegredation prediction since 2015.
-        </p>
+        enviPath Ltd.
+        <br />
+        Biodegredation prediction since 2015.
+      </aside>
+      <aside class="text-base-200 mt-2 text-sm">
+        <span class="text-xs tracking-tight">Version</span>
+        <span class="text-base font-bold">{{ meta.version }}</span>
       </aside>
-      <aside class="text-sm text-base-200 mt-2"><span class="text-xs tracking-tight">Version</span> <span class="text-base font-bold">{{ meta.version }}</span></aside>
     </div>
     <nav class="md:place-self-center md:justify-self-end">
       <div class="grid grid-flow-col gap-4">
         <a href="https://www.youtube.com/@envipath7231" target="_blank">
-            <svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 fill-current">
-                <title>YouTube</title>
-                <path d="M23.498 6.186a3.016 3.016 0 0 0-2.122-2.136C19.505 3.545 12 3.545 12 3.545s-7.505 0-9.377.505A3.017 3.017 0 0 0 .502 6.186C0 8.07 0 12 0 12s0 3.93.502 5.814a3.016 3.016 0 0 0 2.122 2.136c1.871.505 9.376.505 9.376.505s7.505 0 9.377-.505a3.015 3.015 0 0 0 2.122-2.136C24 15.93 24 12 24 12s0-3.93-.502-5.814zM9.545 15.568V8.432L15.818 12l-6.273 3.568z"/>
-            </svg>
+          <svg
+            role="img"
+            viewBox="0 0 24 24"
+            xmlns="http://www.w3.org/2000/svg"
+            class="h-6 w-6 fill-current"
+          >
+            <title>YouTube</title>
+            <path
+              d="M23.498 6.186a3.016 3.016 0 0 0-2.122-2.136C19.505 3.545 12 3.545 12 3.545s-7.505 0-9.377.505A3.017 3.017 0 0 0 .502 6.186C0 8.07 0 12 0 12s0 3.93.502 5.814a3.016 3.016 0 0 0 2.122 2.136c1.871.505 9.376.505 9.376.505s7.505 0 9.377-.505a3.015 3.015 0 0 0 2.122-2.136C24 15.93 24 12 24 12s0-3.93-.502-5.814zM9.545 15.568V8.432L15.818 12l-6.273 3.568z"
+            />
+          </svg>
         </a>
         <a href="https://community.envipath.org/" target="_blank">
-            <svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 fill-current">
-                <title>Discourse</title>
-                <path d="M12.103 0C18.666 0 24 5.485 24 11.997c0 6.51-5.33 11.99-11.9 11.99L0 24V11.79C0 5.28 5.532 0 12.103 0zm.116 4.563c-2.593-.003-4.996 1.352-6.337 3.57-1.33 2.208-1.387 4.957-.148 7.22L4.4 19.61l4.794-1.074c2.745 1.225 5.965.676 8.136-1.39 2.17-2.054 2.86-5.228 1.737-7.997-1.135-2.778-3.84-4.59-6.84-4.585h-.008z"/>
-            </svg>
+          <svg
+            role="img"
+            viewBox="0 0 24 24"
+            xmlns="http://www.w3.org/2000/svg"
+            class="h-6 w-6 fill-current"
+          >
+            <title>Discourse</title>
+            <path
+              d="M12.103 0C18.666 0 24 5.485 24 11.997c0 6.51-5.33 11.99-11.9 11.99L0 24V11.79C0 5.28 5.532 0 12.103 0zm.116 4.563c-2.593-.003-4.996 1.352-6.337 3.57-1.33 2.208-1.387 4.957-.148 7.22L4.4 19.61l4.794-1.074c2.745 1.225 5.965.676 8.136-1.39 2.17-2.054 2.86-5.228 1.737-7.997-1.135-2.778-3.84-4.59-6.84-4.585h-.008z"
+            />
+          </svg>
         </a>
         <a href="https://www.linkedin.com/company/envipath/" target="_blank">
-            <img src="{% static "/images/linkedin.png" %}" alt="LinkedIn" class="w-6 h-6">
+          <img
+            src="{% static "/images/linkedin.png" %}"
+            alt="LinkedIn"
+            class="h-6 w-6"
+          />
         </a>
       </div>
     </nav>
diff --git a/templates/includes/navbar.html b/templates/includes/navbar.html
index ff5fef67..451a1961 100644
--- a/templates/includes/navbar.html
+++ b/templates/includes/navbar.html
@@ -1,9 +1,9 @@
 {% load static %}
 {# Modern DaisyUI Navbar #}
-<div class="navbar bg-neutral-50 text-neutral-950 shadow-lg x-50">
+<div class="navbar x-50 bg-neutral-50 text-neutral-950 shadow-lg">
   <div class="navbar-start">
-    <a href="{{ meta.server_url }}" class="btn btn-ghost normal-case text-xl">
-      <svg class="h-8 fill-base-content" viewBox="0 0 104 26" role="img">
+    <a href="{{ meta.server_url }}" class="btn btn-ghost text-xl normal-case">
+      <svg class="fill-base-content h-8" viewBox="0 0 104 26" role="img">
         <use href="{% static "/images/logo-name.svg" %}#ep-logo-name" />
       </svg>
     </a>
@@ -26,6 +26,9 @@
           tabindex="-1"
           class="dropdown-content menu bg-base-100 rounded-box z-1 w-52 p-2 shadow-sm"
         >
+          <li>
+            <a href="{{ meta.server_url }}/Package" id="packageLink">Package</a>
+          </li>
           <li>
             <a href="{{ meta.server_url }}/pathway" id="pathwayLink">Pathway</a>
           </li>
@@ -59,7 +62,7 @@
     {% if not public_mode %}
       <a id="search-trigger" role="button" class="cursor-pointer">
         <div
-          class="flex items-center badge badge-dash space-x-1 bg-base-200 text-base-content/50 p-2 m-1"
+          class="badge badge-dash bg-base-200 text-base-content/50 m-1 flex items-center space-x-1 p-2"
         >
           <svg
             xmlns="http://www.w3.org/2000/svg"
@@ -87,7 +90,7 @@
         <div
           tabindex="0"
           role="button"
-          class="btn btn-ghost m-1 btn-circle"
+          class="btn btn-ghost btn-circle m-1"
           id="loggedInButton"
         >
           <svg