diff --git a/angular-frontend/src/app/Admin/Individu/all-individus/all-individus.component.html b/angular-frontend/src/app/Admin/Individu/all-individus/all-individus.component.html
index bc4fca7..074db8c 100644
--- a/angular-frontend/src/app/Admin/Individu/all-individus/all-individus.component.html
+++ b/angular-frontend/src/app/Admin/Individu/all-individus/all-individus.component.html
@@ -1,48 +1,56 @@
-<div class="main-content">
-  <div class="container-fluid">
-    <div class="row">
-      <div class="col-md-12">
-        <div class="card" style="height: 460px;">
-          <div class="card-header card-header-danger sticky-top fixed">
-            <h4 class="card-title">List Des Individus</h4>
-          </div>
-          <div class="card-body">
-            <div class="table-responsive" style="max-height: 350px; overflow-y: auto;">
-              <table class="table">
-                <thead class="text-primary text-center fixed">
-                  <th>ID</th>
-                  <th>Nom</th>
-                  <th>Prenom</th>
-                  <th>E-mail</th>
-                  <th>Telephone</th>
-                  <th>Ville</th>
-                  <th>Date De Naissance</th>
-                  <th>Action</th>
-                </thead>
-                <tbody class="text-center">
-                  <tr *ngFor="let individu of individus">
-                    <td>{{ individu.id }}</td>
-                    <td>{{ individu.nom }}</td>
-                    <td>{{ individu.prenom }}</td>
-                    <td>{{ individu.email }}</td>
-                    <td>{{ individu.tele }}</td>
-                    <td>{{ individu.ville }}</td>
-                    <td>{{ individu.dateNaissance }}</td>
-                    <td class="text-center">
-                      <a [routerLink]="['/admin/individu', individu.id, 'update']"
-                        class="btn btn-outline-success mx-1">Edit</a>
-                      <button *ngIf="permission" (click)="deleteIndividu(individu.id)"
-                        class="btn btn-outline-danger mx-1">
-                        Delete
-                      </button>
-                    </td>
-                  </tr>
-                </tbody>
-              </table>
+<div class="container">
+  <div class="main-content">
+    <div class="container-fluid">
+      <div class="row">
+        <div class="col-md-12">
+          <div class="card">
+            <div class="card-header card-header-danger">
+              <h4 class="card-title">List Des Individus</h4>
+            </div>
+            <div class="card-body">
+              <div class="table-responsive">
+                <table class="table">
+                  <thead class="text-primary text-center">
+                    <th>Id</th>
+                    <th>Nom</th>
+                    <th>Prenom</th>
+                    <th>E-mail</th>
+                    <th>Telephone</th>
+                    <th>Ville</th>
+                    <th>Date De Naissance</th>
+                    <th>Action</th>
+                  </thead>
+                  <tbody class="text-center">
+                    <tr *ngFor="let individu of individus">
+                      <td>{{ increment() }}</td>
+                      <td>{{ individu.nom }}</td>
+                      <td>{{ individu.prenom }}</td>
+                      <td>{{ individu.email }}</td>
+                      <td>{{ individu.tele }}</td>
+                      <td>{{ individu.ville }}</td>
+                      <td>{{ individu.dateNaissance }}</td>
+                      <td class="text-center">
+                        <a
+                          [routerLink]="['/admin/individu', individu.id, 'update']"
+                          class="btn btn-outline-success mx-1"
+                          >Edit</a
+                        >
+                        <button
+                          *ngIf="permission"
+                          (click)="deleteIndividu(individu.id)"
+                          class="btn btn-outline-danger mx-1"
+                        >
+                          Delete
+                        </button>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
             </div>
           </div>
         </div>
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/angular-frontend/src/app/Admin/Individu/all-individus/all-individus.component.ts b/angular-frontend/src/app/Admin/Individu/all-individus/all-individus.component.ts
index 83722ac..d4c3e7e 100644
--- a/angular-frontend/src/app/Admin/Individu/all-individus/all-individus.component.ts
+++ b/angular-frontend/src/app/Admin/Individu/all-individus/all-individus.component.ts
@@ -12,6 +12,7 @@ import Swal from 'sweetalert2';
 export class AllIndividusComponent implements OnInit {
   individus: Individu[] = [];
   permission: boolean;
+  index: number = 0;
 
   constructor(
     private individuService: IndividuService,
@@ -24,9 +25,9 @@ export class AllIndividusComponent implements OnInit {
   }
 
   // This method is used to generate rows numbers in the individus list instead of displaying the id 
-  // increment(): number {
-  //   return this.index += 1;
-  // }
+  increment(): number {
+    return this.index += 1;
+  }
 
   getAllIndividus() {
     this.individuService.getAllIndividus().then((response) => {
diff --git a/angular-frontend/src/app/Admin/Individu/edit-individu/edit-individu.component.html b/angular-frontend/src/app/Admin/Individu/edit-individu/edit-individu.component.html
index cbf65ad..766c183 100644
--- a/angular-frontend/src/app/Admin/Individu/edit-individu/edit-individu.component.html
+++ b/angular-frontend/src/app/Admin/Individu/edit-individu/edit-individu.component.html
@@ -3,13 +3,13 @@
     <div class="row">
       <div class="col-md-12">
         <div class="card">
-          <div class="card-header card-header-danger sticky-top fixed">
+          <div class="card-header card-header-danger">
             <h4 class="card-title">Modifier un individu</h4>
-            <div class="card-category">
+            <div class="card-header">
               <a
                 class="btn btn-outline-info float-right"
                 routerLink="/admin/individu/get"
-                >Toutes les Individus</a
+                >Toutes les Individu</a
               >
             </div>
           </div>
@@ -76,16 +76,15 @@ <h4 class="card-title">Modifier un individu</h4>
                   name="dateNaissance"
                   id="dateNaissance"
                 />
-                <div class="form-group text-center">
+
                 <button
                   [disabled]="isSubmited"
                   (click)="updateIndividu()"
                   type="button"
-                  class=" btn btn-outline-info  mt-3"
+                  class="btn btn-outline-primary mt-3"
                 >
                   Modifier
                 </button>
-                </div>
               </div>
             </form>
           </div>
diff --git a/angular-frontend/src/app/Admin/entreprise/create-entreprise/create-entreprise.component.html b/angular-frontend/src/app/Admin/entreprise/create-entreprise/create-entreprise.component.html
index 08ea5e8..0746f8f 100644
--- a/angular-frontend/src/app/Admin/entreprise/create-entreprise/create-entreprise.component.html
+++ b/angular-frontend/src/app/Admin/entreprise/create-entreprise/create-entreprise.component.html
@@ -75,16 +75,14 @@ <h4 class="card-title">Ajouter une entreprise</h4>
                   required
                 />
 
-                <div class="form-group text-center">
                 <button
                   [disabled]="isSubmitting"
                   (click)="addEntreprise()"
                   type="button"
-                  class=" btn btn-outline-info  mt-3" 
+                  class="form-control btn btn-outline-info mt-3"
                 >
                   Ajouter
                 </button>
-                </div>
               </div>
             </form>
           </div>
diff --git a/angular-frontend/src/app/Admin/entreprise/edit-entreprise/edit-entreprise.component.html b/angular-frontend/src/app/Admin/entreprise/edit-entreprise/edit-entreprise.component.html
index f06f6a2..cb1da4c 100644
--- a/angular-frontend/src/app/Admin/entreprise/edit-entreprise/edit-entreprise.component.html
+++ b/angular-frontend/src/app/Admin/entreprise/edit-entreprise/edit-entreprise.component.html
@@ -73,7 +73,6 @@ <h4 class="card-title">Modifier une entreprise</h4>
                   id="email"
                 />
 
-                <div class="form-group text-center">
                 <button
                   [disabled]="isSubmitting"
                   (click)="editentreprise()"
@@ -82,7 +81,6 @@ <h4 class="card-title">Modifier une entreprise</h4>
                 >
                   Modifier
                 </button>
-                </div>
               </div>
             </form>
           </div>
diff --git a/angular-frontend/src/app/Admin/entreprise/list-Entreprise/list-Entreprise.component.html b/angular-frontend/src/app/Admin/entreprise/list-Entreprise/list-Entreprise.component.html
index 72ffcef..2ef35fa 100644
--- a/angular-frontend/src/app/Admin/entreprise/list-Entreprise/list-Entreprise.component.html
+++ b/angular-frontend/src/app/Admin/entreprise/list-Entreprise/list-Entreprise.component.html
@@ -2,18 +2,21 @@
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-12">
-        <div class="card" style="height: 460px;">
-          <div class="card-header card-header-danger sticky-top fixed">
+        <div class="card">
+          <div class="card-header card-header-danger">
             <h4 class="card-title">Liste des entreprises</h4>
             <p class="card-category">
-              <a routerLink="/admin/entreprise/create" class="btn btn-outline-primary float-right ">Ajouter
-                Entreprise</a>
+              <a
+                routerLink="/admin/entreprise/create"
+                class="btn btn-outline-primary float-right"
+                >Ajouter Entreprise</a
+              >
             </p>
           </div>
           <div class="card-body">
-            <div class="table-responsive" style="max-height: 350px; overflow-y: auto;">
-              <table class="table">
-                <thead class="text-primary text-center">
+            <div class="table-responsive">
+              <table class="table text-center">
+                <thead class="text-primary">
                   <th>ID</th>
                   <th>Nom</th>
                   <th>Addresse</th>
@@ -22,7 +25,7 @@ <h4 class="card-title">Liste des entreprises</h4>
                   <th>E-Mail</th>
                   <th class="text-center" style="text-align: center">Action</th>
                 </thead>
-                <tbody class="text-center">
+                <tbody>
                   <tr *ngFor="let entreprise of entreprises">
                     <td>{{ entreprise.id }}</td>
                     <td>{{ entreprise.nom }}</td>
@@ -31,19 +34,29 @@ <h4 class="card-title">Liste des entreprises</h4>
                     <td>{{ entreprise.url }}</td>
                     <td>{{ entreprise.email }}</td>
                     <td class="text-center">
-                      <a [routerLink]="[
+                      <a
+                        [routerLink]="[
                           '/admin/entreprise',
                           entreprise.id,
                           'details'
-                        ]" class="btn btn-outline-info mx-1">Details</a>
-                      <button [routerLink]="[
+                        ]"
+                        class="btn btn-outline-info mx-1"
+                        >Details</a
+                      >
+                      <button
+                        [routerLink]="[
                           '/admin/entreprise',
                           entreprise.id,
                           'edit'
-                        ]" class="btn btn-outline-warning mx-1">
+                        ]"
+                        class="btn btn-outline-warning mx-1"
+                      >
                         Edit
                       </button>
-                      <button (click)="deleteEntreprise(entreprise.id)" class="btn btn-outline-danger mx-1">
+                      <button
+                        (click)="deleteEntreprise(entreprise.id)"
+                        class="btn btn-outline-danger mx-1"
+                      >
                         Delete
                       </button>
                     </td>
@@ -56,4 +69,4 @@ <h4 class="card-title">Liste des entreprises</h4>
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/angular-frontend/src/app/Admin/formator/add-formator/add-formator.component.html b/angular-frontend/src/app/Admin/formator/add-formator/add-formator.component.html
index fda3d91..8ad9128 100644
--- a/angular-frontend/src/app/Admin/formator/add-formator/add-formator.component.html
+++ b/angular-frontend/src/app/Admin/formator/add-formator/add-formator.component.html
@@ -4,12 +4,10 @@
             <div class="col-md-12">
                 <div class="card">
                     <div class="card-header card-header-danger sticky-top fixed">
-                        <h4 class="card-title">Ajouter Un Formateur</h4>
-                        <div class="card-category">
-                            <a class="btn btn-outline-primary float-right" routerLink="/admin/formateur/get">
-                                Liste Des Formateurs
-                            </a>
-                        </div>
+                        <h4 class="card-title d-inline-block">Ajouter Un Formateur</h4>
+                      <button class="btn btn-success"  routerLink="/admin/formateur/get" >
+                        Liste Des Formateurs
+                      </button>
                     </div>
 
                     <div class="card-body ">
@@ -18,8 +16,7 @@ <h4 class="card-title">Ajouter Un Formateur</h4>
                                 <!-- NOM -->
                                 <label for="name">Nom</label>
                                 <!-- ngModel same name in ts -->
-                                <input [(ngModel)]="name" class="form-control" type="text" name="name" id="name"
-                                    required>
+                                <input [(ngModel)]="name" class="form-control" type="text" name="name" id="name" required>
                             </div>
                             <div class="form-group">
                                 <!-- email -->
@@ -30,26 +27,24 @@ <h4 class="card-title">Ajouter Un Formateur</h4>
                             <div class="form-group">
                                 <!-- password -->
                                 <label for="password">Password</label>
-                                <input [(ngModel)]="password" class="form-control" type="password" name="password"
-                                    id="password" required>
+                                <input [(ngModel)]="password" class="form-control" type="password" name="password" id="password"
+                                    required>
                             </div>
                             <div class="form-group">
                                 <!-- competences -->
                                 <label for="competences">Competences</label>
-                                <input [(ngModel)]="competences" class="form-control" type="text" name="competences"
-                                    id="competences">
-                            </div>
+                                <input [(ngModel)]="competences" class="form-control" type="text" name="competences" id="competences">
+                            </div>  
                             <div class="form-group">
                                 <!-- remarques -->
                                 <label for="remarques">Remarques</label>
-                                <input [(ngModel)]="remarques" class="form-control" type="text" name="remarques"
-                                    id="remarques">
-                            </div>
+                                <input [(ngModel)]="remarques" class="form-control" type="text" name="remarques" id="remarques">
+                            </div>  
                             <div class="form-group text-center">
                                 <button [disabled]="isSubmitting" (click)="addFormator()" type="button"
-                                    class=" btn btn-outline-info  mt-3">
+                                    class="btn button-add mt-3">
                                     Ajouter </button>
-                            </div>
+                             </div>
                         </form>
                     </div>
                 </div>
diff --git a/angular-frontend/src/app/Admin/formator/list-formator/list-formator.component.html b/angular-frontend/src/app/Admin/formator/list-formator/list-formator.component.html
index d1e8b9a..e36f5e3 100644
--- a/angular-frontend/src/app/Admin/formator/list-formator/list-formator.component.html
+++ b/angular-frontend/src/app/Admin/formator/list-formator/list-formator.component.html
@@ -2,38 +2,39 @@
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-12">
-        <div class="card" style="height: 460px;">
+        <div class="card" style="height: 430px;">
           <div class="card-header card-header-danger sticky-top fixed">
-            <h4 class="card-title">Formator List</h4>
-            <p class="card-category">
-              <a *ngIf="permission" class="btn btn-outline-primary float-right" routerLink="/admin/formateur/add">
-                Ajouter Formateur
-              </a>
-            </p>
+            <h4 class="card-title  d-inline-block">Formator List</h4>
+            <button *ngIf="permission" class="btn btn-success" routerLink="/admin/formateur/add">
+              Ajouter Formateur
+            </button>
           </div>
           <div class="card-body">
             <div class="table-responsive" style="max-height: 350px; overflow-y: auto;">
-              <table class="table">
-                <thead class="text-primary text-center fixed">
+              <table class="table" style="height: 400px;">
+                <thead class="text-primary fixed">
                   <th>ID</th>
                   <th>Name</th>
                   <th>Email</th>
                   <th>Competances</th>
                   <th>Remarques</th>
-                  <th>Actions</th>
+                  <th class="text-right" style="padding-right: 70px;">Actions</th>
                 </thead>
-                <tbody class="text-center">
+                <tbody>
                   <tr *ngFor="let formator of formators">
                     <td>{{formator.id}}</td>
                     <td>{{formator.name}}</td>
                     <td>{{formator.email}}</td>
                     <td>{{formator.competences}}</td>
                     <td>{{formator.remarques}}</td>
-                    <td class="text-center">
-                      <a [routerLink]="['/admin/formateur',formator.id,'update']"
-                        class="btn btn-outline-success mx-1">Edit</a>
-                      <button class="btn btn-outline-danger mx-1" (click)="deleteFormator(formator.id)"
-                        *ngIf="permission">Delete
+                    <td class="text-right">
+                      <button [routerLink]="['/admin/formateur',formator.id,'update']"
+                        class="btn btn-warning btn-sm mr-2">Edit</button>
+                      <button 
+                        class="btn btn-danger btn-sm" 
+                        (click)="deleteFormator(formator.id)"
+                        *ngIf="permission">
+                        <i class="fas fa-trash-alt"></i> Delete
                       </button>
                     </td>
                   </tr>
diff --git a/angular-frontend/src/app/Admin/formator/update-formator/update-formator.component.html b/angular-frontend/src/app/Admin/formator/update-formator/update-formator.component.html
index f394351..420c914 100644
--- a/angular-frontend/src/app/Admin/formator/update-formator/update-formator.component.html
+++ b/angular-frontend/src/app/Admin/formator/update-formator/update-formator.component.html
@@ -1,63 +1,75 @@
 <div class="main-content">
   <div class="container-fluid">
-    <div class="row">
-      <div class="col-md-12">
-        <div class="card">
-          <div class="card-header card-header-danger sticky-top fixed">
-            <h4 class="card-title">Modifier Un Formateur</h4>
-            <div class="card-category">
-              <a class="btn btn-outline-warning float-right" routerLink="/admin/formateur/get">
-                Liste Des Formateurs
-              </a>
-            </div>
-          </div>
+      <div class="row">
+          <div class="col-md-12">
+              <div class="card">
+                  <div class="card-header card-header-danger sticky-top fixed">
+                      <h4 class="card-title d-inline-block">Modifier Un Formateur</h4>
+                      <button class="btn btn-success"  routerLink="/admin/formateur/get" >
+                        Liste Des Formateurs
+                      </button>
+                  </div>
+     
+      <div class="card-body">
+          <form action="">
+                 <div class="form-group">
+                  <!-- NOM -->
+                  <label for="name">Nom</label>
+                  <!-- ngModel same name in ts -->
+                  <input                     
+                  [(ngModel)]="formator.name"
+                  class="form-control"  
+                  type="text" name="name" id="name">
+                  </div>
 
-          <div class="card-body">
-            <form action="">
-              <div class="form-group">
-                <!-- NOM -->
-                <label for="name">Nom</label>
-                <!-- ngModel same name in ts -->
-                <input [(ngModel)]="formator.name" class="form-control" type="text" name="name" id="name">
-              </div>
+                  <div class="form-group">
+                  <!-- email -->
+                  <label for="email">E-mail</label>
+                  <input                     
+                  [(ngModel)]="formator.email"
+                  class="form-control"  
+                  type="email" name="email" id="email">
+                  </div>  
 
-              <div class="form-group">
-                <!-- email -->
-                <label for="email">E-mail</label>
-                <input [(ngModel)]="formator.email" class="form-control" type="email" name="email" id="email">
-              </div>
+                  <div class="form-group">
+                  <label for="password">Password</label>
+                  <!-- ngModel same name in ts -->
+                  <input                     
+                  [(ngModel)]="formator.password"
+                  class="form-control"  
+                  type="password" name="password" id="password">
+                  </div>
 
-              <div class="form-group">
-                <label for="password">Password</label>
-                <!-- ngModel same name in ts -->
-                <input [(ngModel)]="formator.password" class="form-control" type="password" name="password"
-                  id="password">
-              </div>
+                  <div class="form-group">
+                  <!-- competences -->
+                  <label for="competences">Competences</label>
+                  <input            
+                  [(ngModel)]="formator.competences"
+                  class="form-control"  
+                  type="text" name="competences" id="competences"/>
+                  </div>
 
-              <div class="form-group">
-                <!-- competences -->
-                <label for="competences">Competences</label>
-                <input [(ngModel)]="formator.competences" class="form-control" type="text" name="competences"
-                  id="competences" />
-              </div>
+                  <div class="form-group">
+                  <!--remarques-->
+                  <label for="remarques">Remarques</label>
+                  <input          
+                  [(ngModel)]="formator.remarques"
+                  class="form-control"  
+                  type="text" name="remarques" id="remarques">
+                  </div>
 
-              <div class="form-group">
-                <!--remarques-->
-                <label for="remarques">Remarques</label>
-                <input [(ngModel)]="formator.remarques" class="form-control" type="text" name="remarques"
-                  id="remarques">
-              </div>
-
-              <div class="form-group text-center">
-                <button [disabled]="isSubmitting" (click)="updateFormator()" type="button"
-                  class=" btn btn-outline-info  mt-3">
+                  <div class="form-group text-center">
+                  <button [disabled]="isSubmitting"
+                  (click)="updateFormator()" 
+                  type="button"
+                  class="btn btn-outline-primary mt-3">
                   Modifier</button>
-              </div>
-            </form>
-          </div>
-        </div>
+                </div>
+          </form>
       </div>
-    </div>
-
   </div>
-</div>
\ No newline at end of file
+</div>
+</div>
+
+</div> </div>
+
diff --git a/angular-frontend/src/app/Admin/logout/logout.component.ts b/angular-frontend/src/app/Admin/logout/logout.component.ts
index e601614..693fda5 100644
--- a/angular-frontend/src/app/Admin/logout/logout.component.ts
+++ b/angular-frontend/src/app/Admin/logout/logout.component.ts
@@ -5,10 +5,10 @@ import { Component} from '@angular/core';
   templateUrl: './logout.component.html'
 })
 export class Logout {
-  router: any;
   logout(): void {
     
-    //this.router.navigate(['/home']);
+    window.location.href = 'https://www.google.com';
+
   }
 
 }
diff --git a/angular-frontend/src/app/components/sidebar/sidebar.component.ts b/angular-frontend/src/app/components/sidebar/sidebar.component.ts
index 7134948..6c91967 100644
--- a/angular-frontend/src/app/components/sidebar/sidebar.component.ts
+++ b/angular-frontend/src/app/components/sidebar/sidebar.component.ts
@@ -1,7 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { DemandeService } from 'app/Admin/formation copy/demande.service';
 import { UserAuthsService } from 'app/services/user-auths.service';
-import { Router } from 'express';
 
 declare const $: any;
 
@@ -24,7 +23,7 @@ export class SidebarComponent implements OnInit {
   menuItems: any[];
   countLine: number = 0;
 
-  constructor(private userAuthsService: UserAuthsService, public DemandeService: DemandeService, private router: Router) {}
+  constructor(private userAuthsService: UserAuthsService, public DemandeService: DemandeService) {}
 
   ngOnInit() {
     this.DemandeService.countLines()
@@ -48,7 +47,7 @@ export class SidebarComponent implements OnInit {
       { path: '/admin/calendar', title: 'Calendar', icon: 'event', class: '', role: this.userAuthsService.isAdminOrAssistant() },
       { path: '/admin/demande', title: 'Demandes Externes (' + this.countLine +')', icon: 'event', class: '', role: this.userAuthsService.isAdminOrAssistant() },
       { path: '/home', title: 'Page Acceuil', icon: 'dashboard', class: '', role: true },
-      { path: '/home', title: 'Logout', icon: 'logout', class: 'active-pro', role: this.userAuthsService.isAdminOrAssistant() },
+      { path: '/admin/logout', title: 'Logout', icon: 'logout', class: 'active-pro', role: this.userAuthsService.isAdminOrAssistant() },
     ];
   }