diff --git a/frontend/templates/base.html.jinja b/frontend/templates/base.html.jinja
index 1f0851f111abbe47df1db9a70357e1f29b401026..ac46838ba264214ef59bb310dba2e24f5288b012 100644
--- a/frontend/templates/base.html.jinja
+++ b/frontend/templates/base.html.jinja
@@ -16,50 +16,51 @@
   {% block extraheader %}{% endblock %}
 </head>
 {% block body %}
+  <div class="d-flex flex-column min-vh-100">
     <!--BIG TITLE WITH LOGO-->
     <div class="jumbotron text-center" style="margin-bottom:0">
       <h1>eFlows4HPC Data Catalog</h1>
     </div>
       
     <!--NAVBAR-->
-   <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
-  <a class="navbar-brand" href="#"></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 mr-auto">
-      <li class="nav-item {% if home is true %}active{% endif %}"><a class="nav-link" href="./index.html">Home</a></li>
-      <li class="nav-item {% if storage is true %}active{% endif %}"><a class="nav-link" href="./storage.html?type=dataset">Storage</a></li>
-      <li class="nav-item {% if login is true %}active{% endif %}"><a class="nav-link" href="./login.html" id="loginOutText">Log In</a></li> <!--If token is found in local storage, replace with logged in username and log-out option (i.e. delete local token)-->
-    </ul>
-  </div>
-</nav>
+    <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
+      <a class="navbar-brand" href="#"></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 mr-auto">
+          <li class="nav-item {% if home is true %}active{% endif %}"><a class="nav-link" href="./index.html">Home</a></li>
+          <li class="nav-item {% if storage is true %}active{% endif %}"><a class="nav-link" href="./storage.html?type=dataset">Storage</a></li>
+          <li class="nav-item {% if login is true %}active{% endif %}"><a class="nav-link" href="./login.html" id="loginOutText">Log In</a></li> <!--If token is found in local storage, replace with logged in username and log-out option (i.e. delete local token)-->
+        </ul>
+      </div>
+    </nav>
     
-          <ul class="nav navbar-nav">
-          </ul>
+    <ul class="nav navbar-nav">
+    </ul>
 
     <!--SPECIFIC PAGE CONTENT-->
-    <div class="d-flex flex-column min-vh-75">
-      {% block content%}
-      {% endblock %}
-    </div>
+    {% block content%}
+    {% endblock %}
+
+    <div class="flex-grow-1"></div>
 
     <!--FOOTER-->
     {% block footer %}
       {% include 'footer.html.jinja' %}
     {% endblock %}
+  </div>
 
-    <!--SHARED JAVASCRIPT--> 
-    <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx" crossorigin="anonymous"></script>
+  <!--SHARED JAVASCRIPT--> 
+  <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx" crossorigin="anonymous"></script>
 
-    <script src="js/auth.js"></script>
-    <script src="js/apicalls.js"></script>
+  <script src="js/auth.js"></script>
+  <script src="js/apicalls.js"></script>
 
-    <!--EXTRA JAVASCRIPT-->
-    {% block scripts %}
-    {% endblock %}
+  <!--EXTRA JAVASCRIPT-->
+  {% block scripts %}
+  {% endblock %}
 {% endblock %}
\ No newline at end of file
diff --git a/frontend/templates/footer.html.jinja b/frontend/templates/footer.html.jinja
index 1d1e24d1a7f668ef7b046aad0946e4484a4de449..5e34e895dee0fa9fd2c00f6237a8ee2a058d1373 100644
--- a/frontend/templates/footer.html.jinja
+++ b/frontend/templates/footer.html.jinja
@@ -3,7 +3,7 @@
 {% endblock %}
 
 {% block footer %}
-<footer class="footer d-inlign-flex">
+<footer class="footer mt-auto flex-shrink-0 d-inlign-flex">
     <div class="container-fluid p-0">
       <div class="eflows-line"></div>
       <div class="row mt-2 px-3">