diff --git a/Software/ChainLube/data/index.htm b/Software/ChainLube/data/index.htm
index 08802fd..d039231 100644
--- a/Software/ChainLube/data/index.htm
+++ b/Software/ChainLube/data/index.htm
@@ -7,26 +7,45 @@
   <meta http-equiv="content-type" content="text/html;charset=UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="stylesheet" href="/static/css/bootstrap.min.css">
-  <link rel="stylesheet" href="/static/css/carbon.min.css">
+  <link rel="stylesheet" href="/static/css/custom.css">
   <script src="/static/js/jquery.min.js"></script>
   <script src="/static/js/bootstrap.min.js"></script>
-  <title>KTM CAN ChainLube</title>
+  <link rel="apple-touch-icon" sizes="180x180" href="/static/img/apple-touch-icon.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="/static/img/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="/static/img/favicon-16x16.png">
+  <link rel="manifest" href="/static/img/site.webmanifest">
 </head>
 
 <body>
   <div class="container">
-    <h1>KTM CAN ChainLube</h1>
 
-    <!-- Tabs navs -->
-    <ul class="nav nav-tabs">
-      <li class="active"><a data-toggle="tab" href="#tab_home">Home</a></li>
-      <li><a data-toggle="tab" href="#tab_source">Wegstrecke</a></li>
-      <li><a data-toggle="tab" href="#tab_lube">Schmierung</a></li>
-      <li><a data-toggle="tab" href="#tab_tank">Öltank</a></li>
-      <li><a data-toggle="tab" href="#tab_maintenance">Wartung</a></li>
-      <li><a data-toggle="tab" href="#tab_sysinfo">Systeminfo</a></li>
-    </ul>
-    <!-- Tabs navs -->
+    <nav class="navbar navbar-default">
+      <!-- Brand and toggle get grouped for better mobile display -->
+      <div class="navbar-header">
+        <button type="button" data-target="#navbarCollapse" data-toggle="collapse" class="navbar-toggle">
+          <span class="sr-only">Toggle navigation</span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+        <a class="navbar-brand" href="#">
+          <img src="/static/img/logo.png" width="30" height="30" class="d-inline-block align-top" alt="">
+          KTM CAN ChainLube
+        </a>
+      </div>
+      <!-- Collection of nav links, forms, and other content for toggling -->
+      <div id="navbarCollapse" class="collapse navbar-collapse">
+        <ul class="nav navbar-nav">
+          <li class="active"><a data-toggle="tab" href="#tab_home">Home</a></li>
+          <li><a data-toggle="tab" href="#tab_source">Wegstrecke</a></li>
+          <li><a data-toggle="tab" href="#tab_lube">Schmierung</a></li>
+          <li><a data-toggle="tab" href="#tab_tank">Öltank</a></li>
+          <li><a data-toggle="tab" href="#tab_maintenance">Wartung</a></li>
+          <li><a data-toggle="tab" href="#tab_sysinfo">Systeminfo</a></li>
+        </ul>
+
+      </div>
+    </nav>
 
     <!-- Tabs Content -->
     <div class="tab-content">
@@ -50,15 +69,15 @@
         <p>
         <form action="source-settings" method="POST" class="form-horizontal">
           <div class="form-group">
-            <label for="sourceselect" class="control-label col-xs-2">Wegstrecke Quelle</label>
-            <div class="col-xs-10">
+            <label for="sourceselect" class="control-label col-xs-5">Wegstrecke Quelle</label>
+            <div class="col-xs-7">
               <select id="sourceselect" name="sourceselect" class="select form-control">
                 %SOURCE_SELECT_OPTIONS%
               </select>
             </div>
           </div>
           <div class="form-group row">
-            <div class="col-xs-offset-2 col-xs-10">
+            <div class="col-xs-offset-5 col-xs-7">
               <button name="submit" type="submit" class="btn btn-primary">Submit</button>
             </div>
           </div>
@@ -70,8 +89,8 @@
           <p>
           <form class="form-horizontal">
             <div class="form-group">
-              <label for="tirewidth" class="control-label col-xs-2">Reifenbreite</label>
-              <div class="col-xs-10">
+              <label for="tirewidth" class="control-label col-xs-5">Reifenbreite</label>
+              <div class="col-xs-7">
                 <div class="input-group">
                   <input id="tirewidth" name="tirewidth" type="text" required="required" class="form-control">
                   <div class="input-group-addon">mm</div>
@@ -79,8 +98,8 @@
               </div>
             </div>
             <div class="form-group">
-              <label for="tireratio" class="control-label col-xs-2">Höhe/Breite-Verhältniss</label>
-              <div class="col-xs-10">
+              <label for="tireratio" class="control-label col-xs-5">Höhe/Breite-Verhältniss</label>
+              <div class="col-xs-7">
                 <div class="input-group">
                   <input id="tireratio" name="tireratio" type="text" required="required" class="form-control">
                   <div class="input-group-addon"></div>
@@ -88,8 +107,8 @@
               </div>
             </div>
             <div class="form-group">
-              <label for="tiredia" class="control-label col-xs-2">Felgendurchmesser</label>
-              <div class="col-xs-10">
+              <label for="tiredia" class="control-label col-xs-5">Felgendurchmesser</label>
+              <div class="col-xs-7">
                 <div class="input-group">
                   <input id="tiredia" name="tiredia" type="text" required="required" class="form-control">
                   <div class="input-group-addon">"</div>
@@ -97,8 +116,8 @@
               </div>
             </div>
             <div class="form-group">
-              <label for="pulserev" class="control-label col-xs-2">Pulse pro Umdrehung</label>
-              <div class="col-xs-10">
+              <label for="pulserev" class="control-label col-xs-5">Pulse pro Umdrehung</label>
+              <div class="col-xs-7">
                 <div class="input-group">
                   <input id="pulserev" name="pulserev" type="text" required="required" class="form-control">
                   <div class="input-group-addon"></div>
@@ -106,7 +125,7 @@
               </div>
             </div>
             <div class="form-group row">
-              <div class="col-xs-offset-2 col-xs-10">
+              <div class="col-xs-offset-5 col-xs-7">
                 <button name="submit" type="submit" class="btn btn-primary">Submit</button>
               </div>
             </div>
@@ -120,15 +139,15 @@
           <p>
           <form class="form-horizontal">
             <div class="form-group">
-              <label for="cansource" class="control-label col-xs-2">Model</label>
-              <div class="col-xs-10">
+              <label for="cansource" class="control-label col-xs-5">Model</label>
+              <div class="col-xs-7">
                 <select id="cansource" name="cansource" class="select form-control">
                   %CANSOURCE_SELECT_OPTIONS%
                 </select>
               </div>
             </div>
             <div class="form-group row">
-              <div class="col-xs-offset-2 col-xs-10">
+              <div class="col-xs-offset-5 col-xs-7">
                 <button name="submit" type="submit" class="btn btn-primary">Submit</button>
               </div>
             </div>
@@ -142,15 +161,15 @@
           <p>
           <form class="form-horizontal">
             <div class="form-group">
-              <label for="gpsbaud" class="control-label col-xs-2">Model</label>
-              <div class="col-xs-10">
+              <label for="gpsbaud" class="control-label col-xs-5">Baudrate</label>
+              <div class="col-xs-7">
                 <select id="gpsbaud" name="gpsbaud" class="select form-control">
                   %GPSBAUD_SELECT_OPTIONS%
                 </select>
               </div>
             </div>
             <div class="form-group row">
-              <div class="col-xs-offset-2 col-xs-10">
+              <div class="col-xs-offset-5 col-xs-7">
                 <button name="submit" type="submit" class="btn btn-primary">Submit</button>
               </div>
             </div>
@@ -174,8 +193,8 @@
         <p>
         <form class="form-horizontal">
           <div class="form-group">
-            <label for="purgepulse" class="control-label col-xs-2">Impulse</label>
-            <div class="col-xs-10">
+            <label for="purgepulse" class="control-label col-xs-5">Impulse</label>
+            <div class="col-xs-7">
               <div class="input-group">
                 <input id="purgepulse" name="purgepulse" placeholder="25" type="text" class="form-control">
                 <div class="input-group-addon"></div>
@@ -183,7 +202,7 @@
             </div>
           </div>
           <div class="form-group row">
-            <div class="col-xs-offset-2 col-xs-10">
+            <div class="col-xs-offset-5 col-xs-7">
               <button name="submit" type="submit" class="btn btn-primary">Submit</button>
             </div>
           </div>
@@ -197,8 +216,8 @@
         <p>
         <form class="form-horizontal">
           <div class="form-group">
-            <label for="tankcap" class="control-label col-xs-2">Tankkapazität</label>
-            <div class="col-xs-10">
+            <label for="tankcap" class="control-label col-xs-5">Tankkapazität</label>
+            <div class="col-xs-7">
               <div class="input-group">
                 <input id="tankcap" name="tankcap" type="text" class="form-control" required="required">
                 <div class="input-group-addon">ml</div>
@@ -206,8 +225,8 @@
             </div>
           </div>
           <div class="form-group">
-            <label for="tankwarn" class="control-label col-xs-2">Leer-Warnung</label>
-            <div class="col-xs-10">
+            <label for="tankwarn" class="control-label col-xs-5">Leer-Warnung</label>
+            <div class="col-xs-7">
               <div class="input-group">
                 <input id="tankwarn" name="tankwarn" type="text" class="form-control" required="required">
                 <div class="input-group-addon">%</div>
@@ -215,8 +234,8 @@
             </div>
           </div>
           <div class="form-group">
-            <label for="pumppulse" class="control-label col-xs-2">Menge pro Puls</label>
-            <div class="col-xs-10">
+            <label for="pumppulse" class="control-label col-xs-5">Menge pro Puls</label>
+            <div class="col-xs-7">
               <div class="input-group">
                 <input id="pumppulse" name="pumppulse" type="text" class="form-control" required="required">
                 <div class="input-group-addon">µl</div>
@@ -224,7 +243,7 @@
             </div>
           </div>
           <div class="form-group row">
-            <div class="col-xs-offset-2 col-xs-10">
+            <div class="col-xs-offset-5 col-xs-7">
               <button name="submit" type="submit" class="btn btn-primary">Submit</button>
             </div>
           </div>
@@ -239,8 +258,8 @@
         <table class="table">
           <tbody>
             <tr>
-              <th scope="col">Parameter</td>
-              <th scope="col">Value</td>
+              <th class="col-md-8" scope="col">Parameter</td>
+              <th class="col-md-4" scope="col">Value</td>
             </tr>
             <tr>
               <td>DistancePerLube_Default</td>
@@ -310,8 +329,8 @@
         <table class="table">
           <tbody>
             <tr>
-              <th scope="col">Parameter</td>
-              <th scope="col">Value</td>
+              <th class="col-md-8" scope="col">Parameter</td>
+              <th class="col-md-4" scope="col">Value</td>
             </tr>
             <tr>
               <td>writeCycleCounter</td>
@@ -335,9 +354,19 @@
       <!-- Div Tab SystemInfo -->
     </div>
     <!-- Tabs Content -->
-
-    <p>Copyright (C) 2022 Marcel Peterkau</p>
   </div>
+
+  <!-- Footer -->
+  <footer class="navbar-default navbar-fixed-bottom">
+    <div class="container-fluid">
+      <!-- Copyright -->
+      © 2022 Copyright:
+      <a class="text-reset fw-bold" href="https://eventronics.de/">Marcel Peterkau</a>
+    </div>
+    <!-- Copyright -->
+  </footer>
+  <!-- Footer -->
+
 </body>
 
 </html>
\ No newline at end of file
