diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html
index 246e654..b789702 100644
--- a/src/app/home/home.page.html
+++ b/src/app/home/home.page.html
@@ -116,13 +116,21 @@
 <div *ngIf="isShow" [@slideInOut]>
     <ion-header>
         <div class="nav_header">
-            <button class="nav_btn nav_back floatLeft" (click)="istoggle()">
-                <img src="../assets/Group17_2.png" />
-            </button>
-            <div class="nav_title floatLeft">
-                <h4>CHANGE LOCATION</h4>
-            </div>
-            <div class="clear"></div>
+            <ion-grid class="no-gutter">
+                <ion-row class="no-gutter">
+                    <ion-col class="no-gutter" size="2">
+                        <button class="nav_btn nav_back floatLeft" (click)="istoggle()">
+                            <img src="../assets/Group17_2.png" />
+                        </button>
+                    </ion-col>
+                    <ion-col class="no-gutter" size="8">
+                        <div class="nav_title floatLeft">
+                            <h4>CHANGE LOCATION</h4>
+                        </div>
+                    </ion-col>
+                    <ion-col class="no-gutter" size="2"></ion-col>
+                </ion-row>
+            </ion-grid>
         </div>
     </ion-header>
     <ion-content class="sort_wrappper">
diff --git a/src/app/nearby/nearby.page.html b/src/app/nearby/nearby.page.html
index 8a0bed8..e2179af 100644
--- a/src/app/nearby/nearby.page.html
+++ b/src/app/nearby/nearby.page.html
@@ -1,19 +1,21 @@
 <ion-header>
-    <ion-grid class="no-gutter">
-        <ion-row class="no-gutter">
-            <ion-col class="no-gutter" size="2">
-                <button class="nav_btn nav_back floatLeft" (click)="goBack()" *ngIf="authService.regState">
-                    <img src="../assets/Group17_2.png" />
-                </button>
-            </ion-col>
-            <ion-col class="no-gutter" size="8">
-                <div class="nav_title floatLeft">
-                    <h4>NEW ADDRESS</h4>
-                </div>
-            </ion-col>
-            <ion-col class="no-gutter" size="2"></ion-col>
-        </ion-row>
-    </ion-grid>
+    <div class="header-cc">
+        <ion-grid class="no-gutter">
+            <ion-row class="no-gutter">
+                <ion-col class="no-gutter" size="2">
+                    <button class="nav_btn nav_back floatLeft" (click)="goBack()" *ngIf="authService.regState">
+                        <img src="../assets/Group17_2.png" />
+                    </button>
+                </ion-col>
+                <ion-col class="no-gutter" size="8">
+                    <div class="nav_title floatLeft">
+                        <h4>NEW ADDRESS</h4>
+                    </div>
+                </ion-col>
+                <ion-col class="no-gutter" size="2"></ion-col>
+            </ion-row>
+        </ion-grid>
+    </div>
 </ion-header>
 <ion-content>
     <div class="nearby_map">
diff --git a/src/app/nearby/nearby.page.scss b/src/app/nearby/nearby.page.scss
index 4eca916..46db849 100644
--- a/src/app/nearby/nearby.page.scss
+++ b/src/app/nearby/nearby.page.scss
@@ -1,3 +1,7 @@
+    .header-cc {
+        background-color: #fff;
+    }
+    
     .nearby_map {
         width: 100%;
         height: 100%;
diff --git a/src/config/auth.service.ts b/src/config/auth.service.ts
index 14871bd..805c0cf 100644
--- a/src/config/auth.service.ts
+++ b/src/config/auth.service.ts
@@ -36,32 +36,32 @@ export class AuthService {
     this.type = 1;
     this.regState = true;
 
-    // this.afAuth.authState.subscribe(user => {
-    //   console.log('here');
-    //   console.log(user);
-    //   if (user) {
-    //     this.subjectService.sendLoginData(false);
-    //     this.userData = user;
-    //     console.log(this.userData);
-    //     this.service.set('user', JSON.stringify(this.userData));
-    //     this.SetUserData(user);
-    //     this.loader = false;
-    //     if (this.type === 1) {
-    //       this.regState = true;
-    //       this.router.navigateByUrl('home', { replaceUrl: true });
-    //     } else {
-    //       this.regState = false;
-    //       this.router.navigateByUrl('verification', { replaceUrl: true });
-    //     }
-    //   } else {
-    //     console.log('here too');
-    //     this.loader = false;
-    //     this.subjectService.sendLoginData(true);
-    //     this.service.set('user', null);
-    //     JSON.parse(localStorage.getItem('user'));
-    //     this.router.navigateByUrl('login', { replaceUrl: true });
-    //   }
-    // });
+    this.afAuth.authState.subscribe(user => {
+      console.log('here');
+      console.log(user);
+      if (user) {
+        this.subjectService.sendLoginData(false);
+        this.userData = user;
+        console.log(this.userData);
+        this.service.set('user', JSON.stringify(this.userData));
+        this.SetUserData(user);
+        this.loader = false;
+        if (this.type === 1) {
+          this.regState = true;
+          this.router.navigateByUrl('home', { replaceUrl: true });
+        } else {
+          this.regState = false;
+          this.router.navigateByUrl('verification', { replaceUrl: true });
+        }
+      } else {
+        console.log('here too');
+        this.loader = false;
+        this.subjectService.sendLoginData(true);
+        this.service.set('user', null);
+        JSON.parse(localStorage.getItem('user'));
+        this.router.navigateByUrl('login', { replaceUrl: true });
+      }
+    });
   }
 
   checkLogin() {