diff --git a/my-workspace/projects/sae-lib/src/styles/_conversations.scss b/my-workspace/projects/sae-lib/src/styles/_conversations.scss
index f445cac..04afdb9 100644
--- a/my-workspace/projects/sae-lib/src/styles/_conversations.scss
+++ b/my-workspace/projects/sae-lib/src/styles/_conversations.scss
@@ -17,7 +17,7 @@
   width: 300px;
   position: relative;
   left: -16px;
-  top: -42px;
+  top: -32px;
 
   .time-ago {
     color: #1E1F22;
@@ -99,6 +99,7 @@
 
       .button {
         background: transparent;
+        padding: 10px 0;
 
         &.edit {
           color: #9B9DA6;
diff --git a/my-workspace/projects/sae-lib/src/styles/_layout_demo.scss b/my-workspace/projects/sae-lib/src/styles/_layout_demo.scss
index 869f220..8cece6b 100644
--- a/my-workspace/projects/sae-lib/src/styles/_layout_demo.scss
+++ b/my-workspace/projects/sae-lib/src/styles/_layout_demo.scss
@@ -19,9 +19,26 @@
   .navbar {
     background: #1b1d27;
     color: white;
+    height: 60px;
 
     .navbar-item {
+      padding-left: 24px;
+      padding-right: 24px;
+
+      &:last-of-type {
+
+        padding-right: 32px;
+      }
+
+
       &.user-account-item {
+
+        background: #525668;
+        color: white;
+      }
+
+      &.is-active {
+        border-bottom: 2px solid #7FB8E7;
         color: #7FB8E7;
       }
     }
@@ -39,10 +56,7 @@
           font-size: 24px;
         }
 
-        &.is-active {
-          background: #7FB8E7 !important;
-          border-bottom: 2px solid #7FB8E7;
-        }
+
       }
     }
 
@@ -203,7 +217,7 @@
 
     .conversation-container {
       padding-left: 12px;
-      max-height: 80vh;
+      min-height: 90vh;
     }
 
     input {
@@ -292,7 +306,7 @@
 
   .chat-column {
 
-    min-width: 1000px;
+    min-width: 900px;
 
   }
 
@@ -350,7 +364,7 @@
       min-height: 600px;
       max-height: 90vh;
       margin: 0 auto;
-      padding-top: 10px;
+      padding-top: 50px;
       padding-left: 60px;
       padding-right: 60px;
       overflow: auto;
@@ -471,6 +485,7 @@
 
 .conversation-bottom {
   padding: 10px 200px;
+  margin-top: -100px;
 }
 
 .bottom-warning-container {
diff --git a/old-sae-airwatch/src/app/chatbot/chatbot.html b/old-sae-airwatch/src/app/chatbot/chatbot.html
index 709d5ba..7dcc3c2 100644
--- a/old-sae-airwatch/src/app/chatbot/chatbot.html
+++ b/old-sae-airwatch/src/app/chatbot/chatbot.html
@@ -60,31 +60,43 @@
             </a>
 
             <a class="navbar-item is-active">
+              <i class="ri-layout-right-line"></i>
               Ask question
-            </a><a class="navbar-item">
-            Documentation
-          </a>
-            <div class="navbar-item has-dropdown is-hoverable">
-              <a class="navbar-link">
-                <i class="ri-notification-2-line"></i>
-              </a>
+            </a>
+            <a class="navbar-item">
+              <i class="ri-layout-right-line"></i>
+              Knowledge base
+            </a>
+            <a class="navbar-item">
+              <i class="ri-layout-right-line"></i>
+              Quick start
+            </a>
+            <div class="navbar-item ">
+              <!--            <div class="navbar-item has-dropdown is-hoverable">-->
+              <!--              <a aria-expanded="false" aria-haspopup="true" class="navbar-linking">-->
+              <i class="ri-notification-2-line"></i>
+              <!--              </a>-->
 
-              <div class="navbar-dropdown">
-                <a class="navbar-item">
-                  About
-                </a>
-                <a class="navbar-item is-selected">
-                  Jobs
-                </a>
-                <a class="navbar-item">
-                  Contact
-                </a>
-                <hr class="navbar-divider">
-                <a class="navbar-item">
-                  Report an issue
-                </a>
-              </div>
+              <!--              <div class="navbar-dropdown">-->
+              <!--                <a class="navbar-item">-->
+              <!--                  About-->
+              <!--                </a>-->
+              <!--                <a class="navbar-item is-selected">-->
+              <!--                  Jobs-->
+              <!--                </a>-->
+              <!--                <a class="navbar-item">-->
+              <!--                  Contact-->
+              <!--                </a>-->
+              <!--                <hr class="navbar-divider">-->
+              <!--                <a class="navbar-item">-->
+              <!--                  Report an issue-->
+              <!--                </a>-->
+              <!--              </div>-->
             </div>
+            <a class="navbar-item user-account-item">
+              <i class="ri-layout-right-line"></i>
+              Borhène
+            </a>
           </div>
         </div>
       </nav>
@@ -157,8 +169,9 @@
                     </div>
                   </div>
                 }
-                <app-version-infos [versionInfo]="appVersion"></app-version-infos>
+
               </div>
+              <app-version-infos [versionInfo]="appVersion"></app-version-infos>
               <!--              <div class="admin-actions debug">-->
                 <!--                                <app-theme-selector></app-theme-selector>-->
                 <!--                <app-language-selector></app-language-selector>-->
diff --git a/old-sae-airwatch/src/app/chatbot/feedback-button/feedback-button.scss b/old-sae-airwatch/src/app/chatbot/feedback-button/feedback-button.scss
index 17320bb..5f9b8ba 100644
--- a/old-sae-airwatch/src/app/chatbot/feedback-button/feedback-button.scss
+++ b/old-sae-airwatch/src/app/chatbot/feedback-button/feedback-button.scss
@@ -14,7 +14,7 @@
   margin-right: -35px;
   position: fixed;
   right: 0;
-  top: 240px;
+  top: 197px;
   z-index: 100;
 
   &:hover {
diff --git a/old-sae-airwatch/src/app/chatbot/version-infos/version-infos.html b/old-sae-airwatch/src/app/chatbot/version-infos/version-infos.html
index f1bd2ca..d5fefa4 100644
--- a/old-sae-airwatch/src/app/chatbot/version-infos/version-infos.html
+++ b/old-sae-airwatch/src/app/chatbot/version-infos/version-infos.html
@@ -1 +1 @@
-<p class="version">version {{ versionInfo }}</p>
+<p class="version">Version as of {{ versionInfo }}</p>
diff --git a/old-sae-airwatch/src/app/ds-navbar/ds-navbar.html b/old-sae-airwatch/src/app/ds-navbar/ds-navbar.html
index e92ab28..3d598b1 100644
--- a/old-sae-airwatch/src/app/ds-navbar/ds-navbar.html
+++ b/old-sae-airwatch/src/app/ds-navbar/ds-navbar.html
@@ -1,13 +1,13 @@
 <header class="container">
 
-  <nav class="navbar" role="navigation" aria-label="main navigation">
+  <nav aria-label="main navigation" class="navbar" role="navigation">
     <div class="navbar-brand">
       <a class="navbar-item" href="https://cipherbliss.com">
         <app-logo></app-logo>
       </a>
 
-      <a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false"
-         data-target="navbarBasicExample">
+      <a aria-expanded="false" aria-label="menu" class="navbar-burger" data-target="navbarBasicExample"
+         role="button">
         <span aria-hidden="true"></span>
         <span aria-hidden="true"></span>
         <span aria-hidden="true"></span>
@@ -15,7 +15,7 @@
       </a>
     </div>
 
-    <div id="navbarBasicExample" class="navbar-menu">
+    <div class="navbar-menu" id="navbarBasicExample">
       <div class="navbar-start">
         <a class="navbar-item">
           Home
@@ -48,7 +48,7 @@
         </a>
 
         <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link">
+          <a class="navbar-linking">
             <i class="ri-notification-2-line"></i>
           </a>