diff --git a/index.php b/index.php
index 23c99f3..13390e7 100644
--- a/index.php
+++ b/index.php
@@ -23,7 +23,6 @@
 
   </head>
 
-
   <body>
     <!-- PARTICLES JS -->
         <!-- particles.js container -->
@@ -46,9 +45,6 @@
 
     <?php #include('segments/_indexTestLoginVals.php'); ?><!-- For forms testing -->
 
-
-
-
     <!-- Welche seite soll geladen werden-->
     <?php
       $page = '_404.html';
@@ -82,16 +78,12 @@
       require('segments/'.$page);
 
     ?>
-<div id="footer">
-    <div id="content">
-      <?php
-        if(isset($_SESSION['username'])){
-          echo("<br><span> Herzlich Willkomen " . $_SESSION['username'] . "</span>");
-        }
-      ?>
-      <br>
+    <div id="footer">
+        <div id="content">
+          
+          <br>
+        </div>
     </div>
-</div>
     <!-- Include the footer-->
     <?php include('segments/_footer.html'); ?>
 
diff --git a/js/contentloader.js b/js/contentloader.js
index 67d32d3..1a50d85 100644
--- a/js/contentloader.js
+++ b/js/contentloader.js
@@ -2,7 +2,9 @@ window.addEventListener('load', async () => {
   console.log("Seite geladen");
 
   //getNewUniqueLink();
+  setActiveNav();
   document.getElementById('btnCreateTan').addEventListener('click' , async (event) => getNewUniqueLink());
+
 })
 
 async function getNewUniqueLink() {
@@ -45,3 +47,19 @@ function getCookieValue(a) {
     var b = document.cookie.match('(^|;)\\s*' + a + '\\s*=\\s*([^;]+)');
     return b ? b.pop() : '';
 }
+
+function setActiveNav(){
+  if(window.location.href.indexOf("?") >= 0){
+    if(window.location.href.indexOf("page=home") >= 0){
+      $("#navItemHome").addClass('active');
+    } else if (window.location.href.indexOf("page=newEntry") >= 0){
+      $("#navItemEntry").addClass('active');
+    } else if (window.location.href.indexOf("page=myFriendsBook") >= 0){
+      $("#navItemDashboard").addClass('active');
+    } else if (window.location.href.indexOf("page=newEntry") >= 0){
+      $("#navItemEntry").addClass('active');
+    }
+  } else {
+    $("#navItemHome").addClass('active');
+  }
+}
diff --git a/segments/_footer.html b/segments/_footer.html
index 6b6e538..29513f5 100644
--- a/segments/_footer.html
+++ b/segments/_footer.html
@@ -1,4 +1,4 @@
-<div id="footer">
-  <h1>This is our Footer it foots you :D</h1>
-  <p>This is a paragraph... ya don´t say</p>
-</div>
+<footer id="footer" class="footer">
+    <h1>This is our Footer it foots you :D</h1>
+    <p>This is a paragraph... ya don´t say</p>
+</footer>
diff --git a/segments/_header.php b/segments/_header.php
index cae5874..1b48cda 100644
--- a/segments/_header.php
+++ b/segments/_header.php
@@ -23,10 +23,10 @@
 
   <div class="collapse navbar-collapse" id="navbarSupportedContent">
     <ul class="navbar-nav mr-auto">
-      <li class="nav-item active">
+      <li id="navItemHome" class="nav-item">
         <a class="nav-link" href="index.php?page=home">Home <span class="sr-only">(current)</span></a>
       </li>
-      <li class="nav-item">
+      <li id="navItemEntry" class="nav-item">
         <a class="nav-link" href="index.php?page=newEntry">New Entry</a>
       </li>
     </ul>
diff --git a/segments/_headerSession.php b/segments/_headerSession.php
index 0bf375b..05a5796 100644
--- a/segments/_headerSession.php
+++ b/segments/_headerSession.php
@@ -25,13 +25,13 @@
 
   <div class="collapse navbar-collapse" id="navbarSupportedContent">
     <ul class="navbar-nav mr-auto">
-      <li class="nav-item active">
+      <li id="navItemHome" class="nav-item">
         <a class="nav-link" href="index.php?page=home">Home <span class="sr-only">(current)</span></a>
       </li>
-      <li class="nav-item">
+      <li id="navItemEntry" class="nav-item">
         <a class="nav-link" href="index.php?page=newEntry">New Entry</a>
       </li>
-      <li class="nav-item">
+      <li id="navItemDashboard" class="nav-item">
         <a class="nav-link" href="index.php?page=myFriendsBook">My FriendsBook</a>
       </li>
     </ul>
@@ -40,8 +40,15 @@
         <!-- Button Logout -->
         <!-- <button id="btnLogout" onclick=window.location.href = 'http://www.google.com' type="button" class="btn btn-secondary">Logout</button> -->
 
+
         <form action="" method="post">
+          <?php
+            if(isset($_SESSION['username'])){
+              echo('<input class="btn btn-primary" type="button" value="Herzlich Willkommen ' . $_SESSION['username'] . '"></input>');
+            }
+          ?>
           <input class="btn btn-secondary" onClick="window.location.href = 'php/logout.php'" type="button" value="Logout"></input>
+
         </form>
       </div>
     </form>
