diff --git a/src/portal/src/app/project/webhook/webhook.component.html b/src/portal/src/app/project/webhook/webhook.component.html
index 6a8ad2ce5..ff6d92769 100644
--- a/src/portal/src/app/project/webhook/webhook.component.html
+++ b/src/portal/src/app/project/webhook/webhook.component.html
@@ -1,4 +1,7 @@
-<div class="row">
+<div *ngIf="loadingWebhook" class="clr-row mt-2 center">
+    <span class="spinner spinner-md"></span>
+</div>
+<div class="row" *ngIf="!loadingWebhook">
   <div *ngIf="!showCreate">
     <div>
         <div class="row flex-items-xs-between rightPos">
@@ -20,7 +23,7 @@
           <clr-dg-column>{{'WEBHOOK.STATUS' | translate}}</clr-dg-column>
           <clr-dg-column>{{'WEBHOOK.CREATED' | translate}}</clr-dg-column>
           <clr-dg-column>{{'WEBHOOK.LAST_TRIGGERED' | translate}}</clr-dg-column>
-          <clr-dg-row *ngFor="let item of lastTriggers">
+          <clr-dg-row *clrDgItems="let item of lastTriggers">
               <clr-dg-cell>{{item.event_type}}</clr-dg-cell>
               <clr-dg-cell [ngSwitch]="item.enabled">
                 <div *ngSwitchCase="true" class="icon-wrap">
@@ -37,6 +40,7 @@
           </clr-dg-row>
           <clr-dg-footer>
               <span *ngIf="lastTriggerCount">1 - {{lastTriggerCount}} {{'WEBHOOK.OF' | translate}} </span> {{lastTriggerCount}} {{'WEBHOOK.ITEMS' | translate}}
+              <clr-dg-pagination [clrDgPageSize]="10"></clr-dg-pagination>
           </clr-dg-footer>
       </clr-datagrid>
     </div>
diff --git a/src/portal/src/app/project/webhook/webhook.component.scss b/src/portal/src/app/project/webhook/webhook.component.scss
index c9254f6e1..66520bd73 100644
--- a/src/portal/src/app/project/webhook/webhook.component.scss
+++ b/src/portal/src/app/project/webhook/webhook.component.scss
@@ -34,4 +34,8 @@
 
 .enabled-icon {
     margin: -2px 5px 0 0;
-}
\ No newline at end of file
+}
+.center {
+    justify-content: center;
+    align-items: center;
+}
diff --git a/src/portal/src/app/project/webhook/webhook.component.ts b/src/portal/src/app/project/webhook/webhook.component.ts
index d19759f46..dddf7eb4a 100644
--- a/src/portal/src/app/project/webhook/webhook.component.ts
+++ b/src/portal/src/app/project/webhook/webhook.component.ts
@@ -50,6 +50,7 @@ export class WebhookComponent implements OnInit {
   isEnabled: boolean;
   loading: boolean = false;
   showCreate: boolean = false;
+  loadingWebhook: boolean = true;
   projectId: number;
   projectName: string;
   constructor(
@@ -92,6 +93,7 @@ export class WebhookComponent implements OnInit {
   getWebhook(projectId: number) {
     this.webhookService
       .listWebhook(projectId)
+      .pipe(finalize(() => (this.loadingWebhook = false)))
       .subscribe(
         response => {
           if (response.length) {
diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json
index 51816506d..ae060f0f8 100644
--- a/src/portal/src/i18n/lang/en-us-lang.json
+++ b/src/portal/src/i18n/lang/en-us-lang.json
@@ -341,8 +341,8 @@
     },
     "WEBHOOK": {
         "EDIT_BUTTON": "EDIT",
-        "ENABLED_BUTTON": "ENABLED",
-        "DISABLED_BUTTON": "DISABLED",
+        "ENABLED_BUTTON": "ENABLE",
+        "DISABLED_BUTTON": "DISABLE",
         "TYPE": "Webhook",
         "STATUS": "Status",
         "CREATED": "Created",
diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json
index d1614be2d..df102d442 100644
--- a/src/portal/src/i18n/lang/es-es-lang.json
+++ b/src/portal/src/i18n/lang/es-es-lang.json
@@ -342,8 +342,8 @@
     },
     "WEBHOOK": {
         "EDIT_BUTTON": "EDIT",
-        "ENABLED_BUTTON": "ENABLED",
-        "DISABLED_BUTTON": "DISABLED",
+        "ENABLED_BUTTON": "ENABLE",
+        "DISABLED_BUTTON": "DISABLE",
         "TYPE": "Webhook",
         "STATUS": "Status",
         "CREATED": "Created",
diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json
index 8ac0a0f2b..ae3d5faa3 100644
--- a/src/portal/src/i18n/lang/fr-fr-lang.json
+++ b/src/portal/src/i18n/lang/fr-fr-lang.json
@@ -334,8 +334,8 @@
     },
     "WEBHOOK": {
         "EDIT_BUTTON": "EDIT",
-        "ENABLED_BUTTON": "ENABLED",
-        "DISABLED_BUTTON": "DISABLED",
+        "ENABLED_BUTTON": "ENABLE",
+        "DISABLED_BUTTON": "DISABLE",
         "TYPE": "Webhook",
         "STATUS": "Status",
         "CREATED": "Created",
diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json
index a3343bb43..13e36487d 100644
--- a/src/portal/src/i18n/lang/pt-br-lang.json
+++ b/src/portal/src/i18n/lang/pt-br-lang.json
@@ -368,8 +368,8 @@
     },
     "WEBHOOK": {
         "EDIT_BUTTON": "EDIT",
-        "ENABLED_BUTTON": "ENABLED",
-        "DISABLED_BUTTON": "DISABLED",
+        "ENABLED_BUTTON": "ENABLE",
+        "DISABLED_BUTTON": "DISABLE",
         "TYPE": "Webhook",
         "STATUS": "Status",
         "CREATED": "Created",