diff --git a/src/app/pages/forgot/forgot.page.html b/src/app/pages/forgot/forgot.page.html
index dc78e76..4123b38 100644
--- a/src/app/pages/forgot/forgot.page.html
+++ b/src/app/pages/forgot/forgot.page.html
@@ -1,18 +1,17 @@
 <ion-content>
-  <div  class="start-pages">
+  <div class="start-pages">
     <div class="page_logo">
       <img alt="WrenchBoard" src="/assets/images/wrenchboard-line.png" />
     </div>
 
     <div class="boxed_contents">
-
       <div *ngIf="tab == 1" class="ion-padding">
-
-
-
         <ion-label class="welcome_lbl">Forgot password</ion-label>
 
-        <ion-label class="simp_lbl">Select which contact details should we use to reset your password:</ion-label>
+        <ion-label class="simp_lbl"
+          >Select which contact details should we use to reset your
+          password:</ion-label
+        >
 
         <ion-item lines="none">
           <ion-icon slot="start" name="mail-outline"></ion-icon>
@@ -28,43 +27,64 @@
       </div>
 
       <div *ngIf="tab == 2" class="ion-padding">
+        <div class="login_box">
+          <ion-label
+            style="padding-top: 2px; padding-bottom: 10px"
+            class="simp_lbl"
+            >Forgot Password</ion-label>
+          <div lines="none" style="padding-bottom: 15px;">
+            <div>Enter your registered email</div>
+          </div>
+          <div lines="none" style="margin-bottom: 1px; display: flex; flex-direction: row">
+           <div style="padding: 5px;">
+             <ion-icon  style="font-size: 24px;" slot="start" name="mail-outline"></ion-icon>
+           </div>
 
-        <ion-label class="simp_lbl">Forgot password</ion-label>
-        <div class="login_box" >
-          <ion-label>Enter your registered email</ion-label>
-          <ion-item lines="none" style="--margin-top:  10px;">
-            <ion-input type="email"
-                       class ="login_entry"
-                       placeholder="Your username"
-                       maxlength="35"
-                       [(ngModel)]='username'></ion-input>
-          </ion-item>
+            <ion-input
+              type="email"
+              class="login_entry"
+              placeholder="Your username"
+              maxlength="35"
+              [(ngModel)]="username"
+            ></ion-input>
+          </div>
 
           <ion-button (click)="onEnterEmail()" expand="block">
             Continue
           </ion-button>
-
         </div>
-
       </div>
 
-
       <div *ngIf="tab == 3" class="ion-padding">
-
         <ion-label class="welcome_lbl">Forgot password</ion-label>
 
-        <ion-label class="simp_lbl">Code has been sent to the your registered email</ion-label>
+        <ion-label class="simp_lbl"
+          >Code has been sent to the your registered email</ion-label
+        >
 
         <ion-item lines="none">
-          <ion-input type="text" placeholder="Enter Code"  maxlength="10" [(ngModel)]='reset_pin'></ion-input>
+          <ion-input
+            type="text"
+            placeholder="Enter Code"
+            maxlength="10"
+            [(ngModel)]="reset_pin"
+          ></ion-input>
         </ion-item>
 
         <ion-button (click)="onCompleteReset()" expand="block">
           Continue
         </ion-button>
       </div>
-      <div class="bottom" style="padding: 5px 30px 5px 10px; font-weight: bolder;">
-        <ion-label class="last_lbl">Already have an account? <span style="color: #4B5DFA;" (click)="onLogin()">Login</span></ion-label>
+      <div
+        class="bottom"
+        style="padding: 5px 30px 5px 10px; font-weight: bolder"
+      >
+        <ion-label class="last_lbl"
+          >Already have an account?
+          <span style="color: #4b5dfa" (click)="onLogin()"
+            >Login</span
+          ></ion-label
+        >
       </div>
     </div>
   </div>
diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html
index 81d2091..355e8b8 100644
--- a/src/app/pages/login/login.page.html
+++ b/src/app/pages/login/login.page.html
@@ -44,7 +44,7 @@
                 >Welcome back</ion-label
               >
               <ion-item lines="none">
-                <ion-icon slot="start" name="person-outline"></ion-icon>
+                <ion-icon slot="start" name="mail-outline"></ion-icon>
                 <ion-input
                   class="login_entry"
                   (ionChange)="refreshBut()"
@@ -82,6 +82,7 @@
                   Login
                 </ion-button>
               </div>
+              <div style="color: red;">{{login_response}}</div>
             </div>
 
             <!--            <ion-button shape="round">Round</ion-button>-->
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index b89ab02..f8e502a 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -53,6 +53,8 @@ export class LoginPage implements OnInit {
   signup_country:string='';
   signup_username:string='';
 
+  login_response:string="";
+
   constructor(
     private router: Router,
     private wrenchService: WrenchService,
@@ -128,6 +130,7 @@ getBlogData(){
     username: string, password: string, sessionid: string
   };
   async startLogin() {
+      this.login_response = "";
       const loading = await this.loadingCtrl.create({
           message: 'Starting ... ',
           duration: 3500,
@@ -171,7 +174,12 @@ getBlogData(){
                 this.signup_country = loginResult.country;
             }
             else{
-                this.showAlert("Error","Invalid username/password");
+                this.login_response = "Invalid username or Password";
+                setTimeout(()=>{
+                    this.login_response = "";
+                }, 5000);
+
+                // this.showAlert("Error","Invalid username/password");
                 this.isDisabled=false;
             }
          // this.showAlert("Error","Invalid username/password");