diff --git a/src/app/auth/autologin/autologin.component.ts b/src/app/auth/autologin/autologin.component.ts
index d35481e7334b..ecf86c6ff554 100755
--- a/src/app/auth/autologin/autologin.component.ts
+++ b/src/app/auth/autologin/autologin.component.ts
@@ -228,7 +228,8 @@ export class AutologinComponent implements OnInit {
           window['analytics'].track('Signed In', {
             "username": userFullname,
             "userId": user._id,
-            'method': "Sign in with Google"
+            'button': 'Sign in with Google',
+            'method': "Google Auth"
           });
         } catch (err) {
           this.logger.error('track Sign in with Google event error', err);
diff --git a/src/app/auth/signin/signin.component.ts b/src/app/auth/signin/signin.component.ts
index 5bb04474216c..651d4b810f99 100755
--- a/src/app/auth/signin/signin.component.ts
+++ b/src/app/auth/signin/signin.component.ts
@@ -316,6 +316,7 @@ export class SigninComponent implements OnInit {
               window['analytics'].track('Signed In', {
                 "username": userFullname,
                 "userId": user._id,
+                'button': 'Login',
                 'method': "Email and Password"
               });
             } catch (err) {
diff --git a/src/app/auth/signup/signup.component.ts b/src/app/auth/signup/signup.component.ts
index 7551698a61f6..56c0a6fd251f 100755
--- a/src/app/auth/signup/signup.component.ts
+++ b/src/app/auth/signup/signup.component.ts
@@ -569,7 +569,7 @@ export class SignupComponent implements OnInit, AfterViewInit {
                 window['analytics'].track("Signed Up", {
                   "type": "organic",
                   "utm_source": utm_source_value,
-                  "signupButton": su,
+                  "button": su,
                   "first_name": signupResponse.user.firstname,
                   "last_name": signupResponse.user.lastname,
                   "email": signupResponse.user.email,
diff --git a/src/app/bots/templates/templates.component.html b/src/app/bots/templates/templates.component.html
index c2c696a71553..c2d21c40d2dc 100644
--- a/src/app/bots/templates/templates.component.html
+++ b/src/app/bots/templates/templates.component.html
@@ -517,14 +517,6 @@ <h2 weight="normal" class="template-name template-card-title">
                                                         <div class="css-1fubhz3 cmnty-tmplt-card-footer">
                                                             <div class="css-pqgycx cmnty-tmplt-card-footer-left">
 
-
-
-                                                                <!-- <button type="button"
-                                                                    class="btn btn-new btn-size-m btn--primary btn-block"
-                                                                    (click)="openDialog(template)">
-                                                    
-                                                                    <span>Use template </span>
-                                                                </button> -->
                                                             </div>
                                                             <div class="css-sa2iis cmnty-tmplt-card-footer-right-wpr">
                                                                 <div class="css-1p5njkb cmnty-tmplt-card-footer-right">
diff --git a/src/app/create-new-project/cnp-templates/cnp-templates.component.html b/src/app/create-new-project/cnp-templates/cnp-templates.component.html
index 62c355f30ed6..0cf20e5cff03 100644
--- a/src/app/create-new-project/cnp-templates/cnp-templates.component.html
+++ b/src/app/create-new-project/cnp-templates/cnp-templates.component.html
@@ -124,7 +124,7 @@ <h2 class="onboarding-templt-page-title" [ngClass]="{'onboarding-templt-page-tit
                                 <div class="template-preview-card-import-and-start-from-scratch">
                                     <div style="color: #3ea9f5;" (class)="template-preview--link"
                                         (click)="forkTemplate()">
-                                        <!-- Import template -->
+                               
                                         {{ 'ImportChatbot' | translate}}
                                     </div>
                                     <div style="color: #3c4858;"> {{ 'Or' | translate}} </div>
diff --git a/src/app/create-project-wizard/create-project-gs/create-project-gs.component.ts b/src/app/create-project-wizard/create-project-gs/create-project-gs.component.ts
index 91b2fb4c0cd2..af426ac5b2ca 100644
--- a/src/app/create-project-wizard/create-project-gs/create-project-gs.component.ts
+++ b/src/app/create-project-wizard/create-project-gs/create-project-gs.component.ts
@@ -84,7 +84,8 @@ export class CreateProjectGsComponent implements OnInit {
                 "email": user.email,
                 "username": userFullname,
                 'userId': user._id,
-                'method': "Signup up with Google"
+                'button': "Signup up with Google",
+                'method': "Google Auth"
               });
             } catch (err) {
               this.logger.error('track signup event error', err);
diff --git a/src/app/create-project-wizard/install-template/install-template.component.ts b/src/app/create-project-wizard/install-template/install-template.component.ts
index f7496187574d..d22d1de27c05 100644
--- a/src/app/create-project-wizard/install-template/install-template.component.ts
+++ b/src/app/create-project-wizard/install-template/install-template.component.ts
@@ -417,7 +417,7 @@ export class InstallTemplateComponent extends WidgetSetUpBaseComponent implement
           }
 
           try {
-            window['analytics'].track('Use template', {
+            window['analytics'].track('Create chatbot', {
               "username": userFullname,
               "email": this.user.email,
               "userId": this.user._id,
diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
index 4cc5393fe986..d72cc2839e26 100755
--- a/src/app/home/home.component.html
+++ b/src/app/home/home.component.html
@@ -206,12 +206,12 @@
                     <mat-checkbox class="home-settings-checkbox" [checked]="displayKnowledgeBase"
                       (change)="switchyKnowledgeBase($event.checked)"></mat-checkbox>
                     <span>Knowledge Base</span>
-                  </button>
+                  </button> 
                   <button mat-menu-item (click)="$event.stopPropagation()">
                     <mat-checkbox class="home-settings-checkbox" [checked]="displayCustomizeWidget"
                       (change)="switchCustomizeWidget($event.checked)"></mat-checkbox>
                     <span>Customize widget</span>
-                  </button>  -->
+                  </button>    -->
 
                   <!-- --------------------- -->
                   <!-- To here -->
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index dcae196ebfe1..774593dd067b 100755
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -654,7 +654,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
       trackObjct['chatbotId'] = userActionRes._id
       trackObjct['button'] = "Start from scratch"
     }
-    // Created chatbot
+    // Install App 
     if (userAction === 'Install app') {
       trackObjct['appTitle'] = "WhatsApp Business"
       trackObjct['appID'] = this.whatsAppAppId
@@ -675,6 +675,12 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
       trackObjct['category'] = userActionRes
     }
 
+    if (userAction === 'Customize widget' &&  userActionRes === null) {
+      trackObjct['button'] = 'Customize'
+    }
+
+    
+
     this.logger.log('[HOME] - trackUserAction trackObjct', trackObjct);
     if (!isDevMode()) {
       try {