diff --git a/ogWebconsole/src/app/components/admin/env-vars/env-vars.component.css b/ogWebconsole/src/app/components/admin/env-vars/env-vars.component.css
index f47d03e..5dd7cdc 100644
--- a/ogWebconsole/src/app/components/admin/env-vars/env-vars.component.css
+++ b/ogWebconsole/src/app/components/admin/env-vars/env-vars.component.css
@@ -1,9 +1,5 @@
 .env-settings {
-  padding: 16px;
-
-  h1 {
-    margin-bottom: 16px;
-  }
+  padding: 0rem 1rem 0rem 1rem;
 
   .mat-table {
     margin-bottom: 16px;
diff --git a/ogWebconsole/src/app/components/admin/env-vars/env-vars.component.html b/ogWebconsole/src/app/components/admin/env-vars/env-vars.component.html
index f12f8ce..47e71b8 100644
--- a/ogWebconsole/src/app/components/admin/env-vars/env-vars.component.html
+++ b/ogWebconsole/src/app/components/admin/env-vars/env-vars.component.html
@@ -1,5 +1,9 @@
 <div class="env-settings">
-  <h1>Editar Variables de Entorno</h1>
+  <div class="header-container">
+    <div class="header-container-title">
+      <h2>Editar Variables de Entorno</h2>
+    </div>
+  </div>
 
   <mat-table [dataSource]="envVars" class="mat-elevation-z8">
     <!-- Nombre de la variable -->
@@ -22,8 +26,8 @@
     <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
   </mat-table>
 
-  <div class="actions" >
+  <div class="actions">
     <button mat-raised-button color="primary" (click)="saveEnvVars()">Guardar Cambios</button>
     <button mat-raised-button color="accent" (click)="loadEnvVars()">Recargar</button>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/ogWebconsole/src/app/components/admin/roles/roles/roles.component.css b/ogWebconsole/src/app/components/admin/roles/roles/roles.component.css
index f658cc1..e255f4f 100644
--- a/ogWebconsole/src/app/components/admin/roles/roles/roles.component.css
+++ b/ogWebconsole/src/app/components/admin/roles/roles/roles.component.css
@@ -1,21 +1,30 @@
-table {
-  width: 100%;
-  margin-top: 50px;
+.header-container {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10px 10px;
+  border-bottom: 1px solid #ddd;
 }
 
-.search-container  {
+.header-container-title {
+  flex-grow: 1;
+  text-align: left;
+  margin-left: 1em;
+}
+
+table {
+  width: 100%;
+}
+
+.search-container {
   display: flex;
   justify-content: space-between;
   align-items: center;
   width: 100%;
-  padding: 0 5px;
+  margin: 1.5rem 0rem 1.5rem 0rem;
   box-sizing: border-box;
 }
 
-.divider {
-  margin: 20px 0;
-}
-
 .search-string {
   flex: 2;
   padding: 5px;
@@ -26,20 +35,12 @@ table {
   padding: 5px;
 }
 
-.header-container {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 10px;
-}
-
 .mat-elevation-z8 {
-  box-shadow: 0px 0px 0px rgba(0,0,0,0.2);
+  box-shadow: 0px 0px 0px rgba(0, 0, 0, 0.2);
 }
 
 .paginator-container {
   display: flex;
   justify-content: end;
   margin-bottom: 30px;
-}
-
+}
\ No newline at end of file
diff --git a/ogWebconsole/src/app/components/admin/roles/roles/roles.component.html b/ogWebconsole/src/app/components/admin/roles/roles/roles.component.html
index 6875c49..d5070fb 100644
--- a/ogWebconsole/src/app/components/admin/roles/roles/roles.component.html
+++ b/ogWebconsole/src/app/components/admin/roles/roles/roles.component.html
@@ -1,24 +1,25 @@
 <div class="header-container">
-  <h2 class="title">{{ 'adminRolesTitle' | translate }}</h2>
+  <div class="header-container-title">
+    <h2>{{ 'adminRolesTitle' | translate }}</h2>
+  </div>
   <div class="images-button-row">
     <button mat-flat-button color="primary" (click)="addUser()">
       {{ 'addRole' | translate }}
     </button>
   </div>
 </div>
-<mat-divider class="divider"></mat-divider>
+
 <div class="search-container">
   <mat-form-field appearance="fill" class="search-string">
     <mat-label>{{ 'searchRoleLabel' | translate }}</mat-label>
-    <input matInput placeholder="{{ 'searchPlaceholder' | translate }}" [(ngModel)]="filters['name']" (keyup.enter)="search()">
+    <input matInput placeholder="{{ 'searchPlaceholder' | translate }}" [(ngModel)]="filters['name']"
+      (keyup.enter)="search()">
     <mat-icon matSuffix>search</mat-icon>
     <mat-hint>{{ 'searchHint' | translate }}</mat-hint>
   </mat-form-field>
 </div>
 
-<div *ngIf="loading" class="loading-container">
-  <mat-spinner></mat-spinner>
-</div>
+<app-loading [isLoading]="loading"></app-loading>
 
 <div *ngIf="!loading">
   <table mat-table [dataSource]="dataSource" class="mat-elevation-z8">
@@ -33,7 +34,8 @@
         <button mat-icon-button color="primary" (click)="editRole(role)">
           <mat-icon>edit</mat-icon>
         </button>
-        <button mat-icon-button color="warn" (click)="deleteRole(role)" [disabled]="role.permissions.includes('ROLE_SUPER_ADMIN')">
+        <button mat-icon-button color="warn" (click)="deleteRole(role)"
+          [disabled]="role.permissions.includes('ROLE_SUPER_ADMIN')">
           <mat-icon>delete</mat-icon>
         </button>
       </td>
@@ -44,10 +46,7 @@
 </div>
 
 <div class="paginator-container">
-  <mat-paginator [length]="length"
-                 [pageSize]="itemsPerPage"
-                 [pageIndex]="page"
-                 [pageSizeOptions]="pageSizeOptions"
-                 (page)="onPageChange($event)">
+  <mat-paginator [length]="length" [pageSize]="itemsPerPage" [pageIndex]="page" [pageSizeOptions]="pageSizeOptions"
+    (page)="onPageChange($event)">
   </mat-paginator>
-</div>
+</div>
\ No newline at end of file
diff --git a/ogWebconsole/src/app/components/admin/users/users/users.component.css b/ogWebconsole/src/app/components/admin/users/users/users.component.css
index f658cc1..4a1e699 100644
--- a/ogWebconsole/src/app/components/admin/users/users/users.component.css
+++ b/ogWebconsole/src/app/components/admin/users/users/users.component.css
@@ -1,6 +1,19 @@
+.header-container {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10px 10px;
+  border-bottom: 1px solid #ddd;
+}
+
+.header-container-title {
+  flex-grow: 1;
+  text-align: left;
+  margin-left: 1em;
+}
+
 table {
   width: 100%;
-  margin-top: 50px;
 }
 
 .search-container  {
@@ -8,14 +21,10 @@ table {
   justify-content: space-between;
   align-items: center;
   width: 100%;
-  padding: 0 5px;
+  margin: 1.5rem 0rem 1.5rem 0rem;
   box-sizing: border-box;
 }
 
-.divider {
-  margin: 20px 0;
-}
-
 .search-string {
   flex: 2;
   padding: 5px;
@@ -26,13 +35,6 @@ table {
   padding: 5px;
 }
 
-.header-container {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 10px;
-}
-
 .mat-elevation-z8 {
   box-shadow: 0px 0px 0px rgba(0,0,0,0.2);
 }
diff --git a/ogWebconsole/src/app/components/admin/users/users/users.component.html b/ogWebconsole/src/app/components/admin/users/users/users.component.html
index f26e1ff..7c2ccee 100644
--- a/ogWebconsole/src/app/components/admin/users/users/users.component.html
+++ b/ogWebconsole/src/app/components/admin/users/users/users.component.html
@@ -1,24 +1,26 @@
 <div class="header-container">
-  <h2 class="title">{{ 'adminUsersTitle' | translate }}</h2>
+  <div class="header-container-title">
+    <h2>{{ 'adminUsersTitle' | translate }}</h2>
+  </div>
   <div class="images-button-row">
     <button mat-flat-button color="primary" (click)="addUser()">
       {{ 'addUser' | translate }}
     </button>
   </div>
 </div>
-<mat-divider class="divider"></mat-divider>
+
+
 <div class="search-container">
   <mat-form-field appearance="fill" class="search-string">
     <mat-label>{{ 'searchLabel' | translate }}</mat-label>
-    <input matInput placeholder="{{ 'searchPlaceholder' | translate }}" [(ngModel)]="filters['name']" (keyup.enter)="search()">
+    <input matInput placeholder="{{ 'searchPlaceholder' | translate }}" [(ngModel)]="filters['name']"
+      (keyup.enter)="search()">
     <mat-icon matSuffix>search</mat-icon>
     <mat-hint>{{ 'searchHint' | translate }}</mat-hint>
   </mat-form-field>
 </div>
 
-<div *ngIf="loading" class="loading-container">
-  <mat-spinner></mat-spinner>
-</div>
+<app-loading [isLoading]="loading"></app-loading>
 
 <div *ngIf="!loading">
   <table mat-table [dataSource]="dataSource" class="mat-elevation-z8">
@@ -44,10 +46,7 @@
 </div>
 
 <div class="paginator-container">
-  <mat-paginator [length]="length"
-                 [pageSize]="itemsPerPage"
-                 [pageIndex]="page"
-                 [pageSizeOptions]="pageSizeOptions"
-                 (page)="onPageChange($event)">
+  <mat-paginator [length]="length" [pageSize]="itemsPerPage" [pageIndex]="page" [pageSizeOptions]="pageSizeOptions"
+    (page)="onPageChange($event)">
   </mat-paginator>
-</div>
+</div>
\ No newline at end of file