diff --git a/src/app/app.component.html b/src/app/app.component.html
index 13b9677..9f1076e 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,3 +1,3 @@
 <ion-app>
-  <ion-router-outlet></ion-router-outlet>
+  <ion-router-outlet [swipeGesture]="false"></ion-router-outlet>
 </ion-app>
diff --git a/src/app/pages/marketdetail/marketdetail.page.html b/src/app/pages/marketdetail/marketdetail.page.html
index bbfdf79..3887379 100644
--- a/src/app/pages/marketdetail/marketdetail.page.html
+++ b/src/app/pages/marketdetail/marketdetail.page.html
@@ -74,19 +74,31 @@
         </ion-segment-button>
       </ion-segment>
 
+      <div *ngIf="interestStatus==true;">
+        <div style=" display: inline-flex; width: 100%; margin-top: 10px; border-radius: 10px; background-color: #f8fcff">
+          <div style="border-radius: 10px; max-width: 150px; height: auto;">
+            <img style="border-radius: 10px;" alt="Waiting Task" src="https://www.wrenchboard.com/assets/images/apps/waiting-task.jpg" />
+          </div>
+          <div style="padding: 2px 1px 1px 10px;">
+            <span style="font-size: 14px; font-weight: bolder"> Waiting for feedback</span>
+            <div style="font-size: 14px; font-weight: bolder; color: #2dd36f;">Sent:  {{interestDate |date}}</div>
+            <div style="font-size: 12px; font-weight: normal">You have already sent a notice of interest. If the owner accepts, you will receive a notification to start.</div>
+          </div>
+        </div>
+      </div>
 
 
-      <ion-card *ngIf="interestStatus==true;">
-        <img alt="Silhouette of mountains" src="https://www.wrenchboard.com/assets/images/apps/waiting-task.jpg" />
-        <ion-card-header>
-          <ion-card-title>Waiting for feedback</ion-card-title>
-          <ion-card-subtitle>Sent:  {{interestDate |date}}</ion-card-subtitle>
-        </ion-card-header>
+<!--      <ion-card *ngIf="interestStatus==true;">-->
+<!--        <img alt="Waiting Task" src="https://www.wrenchboard.com/assets/images/apps/waiting-task.jpg" />-->
+<!--        <ion-card-header>-->
+<!--          <ion-card-title>Waiting for feedback</ion-card-title>-->
+<!--          <ion-card-subtitle>Sent:  {{interestDate |date}}</ion-card-subtitle>-->
+<!--        </ion-card-header>-->
 
-        <ion-card-content>
-          You have already sent a notice of interest. If the owner accepts, you will receive a notification to start.
-        </ion-card-content>
-      </ion-card>
+<!--        <ion-card-content>-->
+<!--          You have already sent a notice of interest. If the owner accepts, you will receive a notification to start.-->
+<!--        </ion-card-content>-->
+<!--      </ion-card>-->
 
 
 
diff --git a/src/app/pages/notification/notification.page.html b/src/app/pages/notification/notification.page.html
index e469e53..ccfe974 100644
--- a/src/app/pages/notification/notification.page.html
+++ b/src/app/pages/notification/notification.page.html
@@ -15,7 +15,16 @@
 </ion-header>
 
 <ion-content class="ion-padding">
+
   <div class="boxed_contents">
+    <div *ngIf="total_item==0">
+      <ion-card style="background-color: #e3d1d4; margin: 0px;">
+        <ion-card-content>
+          You currently have yet to receive a notification.
+        </ion-card-content>
+      </ion-card>
+    </div>
+
     <div class="flex" *ngFor="let item of notificationData">
       <div class="bg_image back_image" [style.backgroundImage]="'url(assets/images/notifications/'+item.icon+')'"></div>
       <div class="text">
diff --git a/src/app/pages/notification/notification.page.ts b/src/app/pages/notification/notification.page.ts
index c1bdc9c..efbd8ed 100644
--- a/src/app/pages/notification/notification.page.ts
+++ b/src/app/pages/notification/notification.page.ts
@@ -20,7 +20,7 @@ export class NotificationPage implements OnInit {
 
 
   }
-
+  total_item:number=0;
   ngOnInit() {
     this.getNotificationData();
   }
@@ -45,7 +45,7 @@ export class NotificationPage implements OnInit {
           this.notificationTotalData = notificationTotalData;
           console.log("NOTIFICATION  RETURN->", this.notificationTotalData);
           this.notificationData = this.notificationTotalData.result_list;
-          // debugger;
+          this.total_item =  this.notificationData.length;
           console.log("JOBS RETURN DATA->", this.notificationData);
         }
     );
diff --git a/src/app/pages/pendingoffers/pendingoffers.page.html b/src/app/pages/pendingoffers/pendingoffers.page.html
index cb5af3c..aec354e 100644
--- a/src/app/pages/pendingoffers/pendingoffers.page.html
+++ b/src/app/pages/pendingoffers/pendingoffers.page.html
@@ -10,9 +10,6 @@
 </ion-header>
 
 <ion-content>
-<!--      <ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>-->
-
-
   <div class="ion-padding">
     <div class="boxed_contents">
       <div class="flex">
@@ -21,59 +18,5 @@
 
       <app-myjob-offers></app-myjob-offers>
     </div>
-
-
-<!--    <div class="row">-->
-<!--      <ion-label class="bg_text">3D Design</ion-label>-->
-<!--      <div class="rate">-->
-<!--        <ion-icon name="star-half-outline" color="warning"></ion-icon>-->
-<!--        <ion-label class="review">4.8 (4478 reviews)</ion-label>-->
-<!--      </div>-->
-<!--    </div>-->
-
-<!--    <ion-label class="color_text">$40</ion-label>-->
-
-<!--    <div class="items">-->
-<!--&lt;!&ndash;      <div class="stud">&ndash;&gt;-->
-<!--&lt;!&ndash;        <ion-icon slot="start" name="people" color="primary"></ion-icon>&ndash;&gt;-->
-<!--&lt;!&ndash;        <ion-label>9876 Students</ion-label>&ndash;&gt;-->
-<!--&lt;!&ndash;      </div>&ndash;&gt;-->
-<!--&lt;!&ndash;      <div class="stud">&ndash;&gt;-->
-<!--&lt;!&ndash;        <ion-icon slot="start" name="time" color="primary"></ion-icon>&ndash;&gt;-->
-<!--&lt;!&ndash;        <ion-label>2.5 hours</ion-label>&ndash;&gt;-->
-<!--&lt;!&ndash;      </div>&ndash;&gt;-->
-<!--&lt;!&ndash;      <div class="stud">&ndash;&gt;-->
-<!--&lt;!&ndash;        <ion-icon slot="start" name="document-text" color="primary"></ion-icon>&ndash;&gt;-->
-<!--&lt;!&ndash;        <ion-label>Certificate</ion-label>&ndash;&gt;-->
-<!--&lt;!&ndash;      </div>&ndash;&gt;-->
-<!--    </div>-->
-
-<!--    <div  class="lesson">-->
-<!--      <div class="video" *ngFor="let item of jobManagerOffersData">-->
-<!--        <div class="left">-->
-<!--          <div class="bg_image men_image" [style.backgroundImage]="'url('+session_image_server+'/'+curr_session+'/job/'+item.job_uid+')'"></div>-->
-
-<!--          <div class="text">-->
-<!--            <ion-label class="bold_text">{{item.title}}</ion-label>-->
-<!--            <ion-label class="grey_text">{{item.description}}</ion-label>-->
-<!--            <ion-label class="price_line">{{item.offer_code}}   {{item.price*0.01}} {{item.currency}}  </ion-label>-->
-<!--            <ion-label class="due_date">Expire: {{item.expire |date}}</ion-label>-->
-<!--            <ion-label class="grey_text">Send to : {{item.job_to}}</ion-label>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--        <div class="right">-->
-<!--          <ion-icon name="chevron-forward-outline" color="medium"></ion-icon>-->
-<!--        </div>-->
-<!--      </div>-->
-<!--    </div>-->
-
   </div>
 </ion-content>
-
-<!--<ion-footer>-->
-<!--  <ion-toolbar>-->
-<!--    <div class="button" (click)="onBack()">-->
-<!--      <ion-label class="text">Return</ion-label>-->
-<!--    </div>-->
-<!--  </ion-toolbar>-->
-<!--</ion-footer>-->
diff --git a/src/app/pages/resetpass/resetpass.page.html b/src/app/pages/resetpass/resetpass.page.html
index 9fae85d..915f6e6 100644
--- a/src/app/pages/resetpass/resetpass.page.html
+++ b/src/app/pages/resetpass/resetpass.page.html
@@ -1,266 +1,71 @@
+<ion-header mode="ios" class="ion-no-border">
+  <ion-toolbar>
+    <ion-buttons slot="start" (click)="onBack()">
+      <ion-button>
+        <ion-icon name="arrow-back-outline"></ion-icon>
+      </ion-button>
+    </ion-buttons>
+    <ion-title>Reset Password</ion-title>
+  </ion-toolbar>
+</ion-header>
 
 <ion-content>
-  <div class="bg_image back_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/password.jpg)'">
+  <div class="boxed_contents">
+    <div class="bg_image back_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/password.jpg)'">
+      <div class="ion-padding">
+        <ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>
+      </div>
+    </div>
+
     <div class="ion-padding">
-      <ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>
+      <div class="flex">
+        <ion-label class="bold_text">Reset Password</ion-label>
+        <!--      <ion-icon slot="end" name="bookmark-outline" color="primary"></ion-icon>-->
+      </div>
+
+      <div  class="lesson">
+
+
+
+        <ion-card>
+          <!--        <ion-card-header>-->
+          <!--          <ion-card-title>Card Title</ion-card-title>-->
+          <!--          <ion-card-subtitle>Card Subtitle</ion-card-subtitle>-->
+          <!--        </ion-card-header>-->
+
+          <ion-card-content>
+            <ion-label class="simp_lbl">Enter your current password</ion-label>
+            <ion-item lines="none">
+              <ion-input type="password" placeholder="Current Password"  [(ngModel)]='curr_pass'></ion-input>
+            </ion-item>
+
+            <ion-label class="simp_lbl">Enter your new password</ion-label>
+
+            <ion-item lines="none">
+              <ion-input type="password" placeholder="New Password"  [(ngModel)]='new_pass'></ion-input>
+            </ion-item>
+
+            <ion-label class="simp_lbl">Confirm your new password</ion-label>
+
+            <ion-item lines="none">
+              <ion-input type="password" placeholder="Confirm New Password"  [(ngModel)]='confirm_new_pass'></ion-input>
+            </ion-item>
+
+            <ion-button shape="round" size="small" (click)="onResetPass()" color="warning" expand="block">
+              Reset Password
+            </ion-button>
+          </ion-card-content>
+        </ion-card>
+
+      </div>
     </div>
   </div>
-
-  <div class="ion-padding">
-    <div class="flex">
-      <ion-label class="bold_text">Reset Password</ion-label>
-<!--      <ion-icon slot="end" name="bookmark-outline" color="primary"></ion-icon>-->
-    </div>
-
-    <div  class="lesson">
-
-
-
-      <ion-card>
-<!--        <ion-card-header>-->
-<!--          <ion-card-title>Card Title</ion-card-title>-->
-<!--          <ion-card-subtitle>Card Subtitle</ion-card-subtitle>-->
-<!--        </ion-card-header>-->
-
-        <ion-card-content>
-          <ion-label class="simp_lbl">Enter your current password</ion-label>
-          <ion-item lines="none">
-            <ion-input type="password" placeholder="Current Password"  [(ngModel)]='curr_pass'></ion-input>
-          </ion-item>
-
-          <ion-label class="simp_lbl">Enter your new password</ion-label>
-
-          <ion-item lines="none">
-            <ion-input type="password" placeholder="New Password"  [(ngModel)]='new_pass'></ion-input>
-          </ion-item>
-
-          <ion-label class="simp_lbl">Confirm your new password</ion-label>
-
-          <ion-item lines="none">
-            <ion-input type="password" placeholder="Confirm New Password"  [(ngModel)]='confirm_new_pass'></ion-input>
-          </ion-item>
-
-          <ion-button (click)="onResetPass()" color="warning" expand="block">
-            Reset Password
-          </ion-button>
-        </ion-card-content>
-      </ion-card>
-
-
-
-
-    </div>
-
-<!--    <div class="row">-->
-<!--      <ion-label class="bg_text">3D Design</ion-label>-->
-<!--      <div class="rate">-->
-<!--        <ion-icon name="star-half-outline" color="warning"></ion-icon>-->
-<!--        <ion-label class="review">4.8 (4478 reviews)</ion-label>-->
-<!--      </div>-->
-<!--    </div>-->
-
-<!--    <ion-label class="color_text">$40</ion-label>-->
-
-<!--    <div class="items">-->
-<!--      <div class="stud">-->
-<!--        <ion-icon slot="start" name="people" color="primary"></ion-icon>-->
-<!--        <ion-label>9876 Students</ion-label>-->
-<!--      </div>-->
-<!--      <div class="stud">-->
-<!--        <ion-icon slot="start" name="time" color="primary"></ion-icon>-->
-<!--        <ion-label>2.5 hours</ion-label>-->
-<!--      </div>-->
-<!--      <div class="stud">-->
-<!--        <ion-icon slot="start" name="document-text" color="primary"></ion-icon>-->
-<!--        <ion-label>Certificate</ion-label>-->
-<!--      </div>-->
-<!--    </div>-->
-
-<!--    <ion-segment [(ngModel)]="tabs">-->
-<!--      <ion-segment-button value="about">-->
-<!--        <ion-label>About</ion-label>-->
-<!--      </ion-segment-button>-->
-<!--      <ion-segment-button value="lesson">-->
-<!--        <ion-label>Lessons</ion-label>-->
-<!--      </ion-segment-button>-->
-<!--      <ion-segment-button value="review">-->
-<!--        <ion-label>Reviews</ion-label>-->
-<!--      </ion-segment-button>-->
-<!--    </ion-segment>-->
-
-<!--    <div *ngIf="tabs =='about'" class="about">-->
-<!--      <ion-label class="head_text">Mentor</ion-label>-->
-
-<!--      <div class="mentor" (click)="onMentor()">-->
-<!--        <div class="left">-->
-<!--          <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/p3.jpg)'"></div>-->
-<!--          <div style="margin-left: 10px;">-->
-<!--            <ion-label class="bold">Jonathon Williams</ion-label>-->
-<!--            <ion-label class="grey">Senier UI/UX designer at google</ion-label>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--        <ion-icon name="chatbubble-ellipses-outline" color="primary"></ion-icon>-->
-<!--      </div>-->
-
-<!--      <ion-label class="head_text">About Course</ion-label>-->
-
-<!--      <ion-label class="description">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aperiam, dolor, quasi-->
-<!--        commodi-->
-<!--      </ion-label>-->
-
-<!--      <ion-label class="description">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aperiam, dolor, quasi-->
-<!--        commodi-->
-<!--      </ion-label>-->
-
-<!--      <ion-label class="description">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aperiam, dolor, quasi-->
-<!--        commodi-->
-<!--      </ion-label>-->
-
-<!--      <ion-label class="head_text">Tools</ion-label>-->
-
-<!--      <ion-label>Figma</ion-label>-->
-<!--    </div>-->
-
-<!--    <div *ngIf="tabs =='lesson'" class="lesson">-->
-<!--      <div class="flex">-->
-<!--        <ion-label class="bold">Most Popular Courses</ion-label>-->
-<!--        <ion-label class="color">See all</ion-label>-->
-<!--      </div>-->
-
-<!--      <div class="sec">-->
-<!--        <ion-label class="grey">Section 1 - Introduction</ion-label>-->
-<!--        <ion-label class="color">15 min</ion-label>-->
-<!--      </div>-->
-
-<!--      <div class="video" *ngFor="let item of [1,2]">-->
-<!--        <div class="left">-->
-<!--          <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/line.png)'"></div>-->
-
-<!--          <div class="text">-->
-<!--            <ion-label class="bold_text">Why Using Figma ?</ion-label>-->
-<!--            <ion-label class="grey_text">10 mins</ion-label>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--        <div class="right">-->
-<!--          <ion-icon name="lock-closed-outline"></ion-icon>-->
-<!--        </div>-->
-<!--      </div>-->
-
-<!--      <div class="sec">-->
-<!--        <ion-label class="grey">Section 2 - Figma Basic</ion-label>-->
-<!--        <ion-label class="color">60 min</ion-label>-->
-<!--      </div>-->
-
-
-<!--      <div class="video" *ngFor="let item of [1,2,3,4,5,6]">-->
-<!--        <div class="left">-->
-<!--          <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/line.png)'"></div>-->
-
-<!--          <div class="text">-->
-<!--            <ion-label class="bold_text">Why Using Figma ?</ion-label>-->
-<!--            <ion-label class="grey_text">10 mins</ion-label>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--        <div class="right">-->
-<!--          <ion-icon name="lock-closed-outline"></ion-icon>-->
-<!--        </div>-->
-<!--      </div>-->
-
-<!--      <div class="sec">-->
-<!--        <ion-label class="grey">Section 3 - Let's Practice</ion-label>-->
-<!--        <ion-label class="color">75 min</ion-label>-->
-<!--      </div>-->
-
-
-<!--      <div class="video" *ngFor="let item of [1,2,3,4,5,6]">-->
-<!--        <div class="left">-->
-<!--          <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/line.png)'"></div>-->
-
-<!--          <div class="text">-->
-<!--            <ion-label class="bold_text">Why Using Figma ?</ion-label>-->
-<!--            <ion-label class="grey_text">10 mins</ion-label>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--        <div class="right">-->
-<!--          <ion-icon name="lock-closed-outline"></ion-icon>-->
-<!--        </div>-->
-<!--      </div>-->
-<!--    </div>-->
-
-<!--    <div *ngIf="tabs =='review'" class="review_tab">-->
-<!--      <div class="total">-->
-<!--        <div class="star-rate">-->
-<!--          <ion-icon name="star-half-outline" color="warning"></ion-icon>-->
-<!--          <ion-label class="bold">4.8 (5456 Reviews)</ion-label>-->
-<!--        </div>-->
-<!--        <ion-label class="color">See all</ion-label>-->
-<!--      </div>-->
-
-<!--      <div class="story-item">-->
-<!--        <div class="menu">-->
-<!--          <div class="text">-->
-<!--            <div class="select show">-->
-<!--              <ion-icon slot="start" name="star" color="light" class="star_icon"></ion-icon>-->
-<!--              <ion-label class="rate_num white">All</ion-label>-->
-<!--            </div>-->
-<!--            <div class="select">-->
-<!--              <ion-icon slot="start" name="star" color="primary" class="star_icon"></ion-icon>-->
-<!--              <ion-label class="rate_num">1</ion-label>-->
-<!--            </div>-->
-<!--            <div class="select">-->
-<!--              <ion-icon slot="start" name="star" color="primary" class="star_icon"></ion-icon>-->
-<!--              <ion-label class="rate_num">2</ion-label>-->
-<!--            </div>-->
-<!--            <div class="select">-->
-<!--              <ion-icon slot="start" name="star" color="primary" class="star_icon"></ion-icon>-->
-<!--              <ion-label class="rate_num">3</ion-label>-->
-<!--            </div>-->
-<!--            <div class="select">-->
-<!--              <ion-icon slot="start" name="star" color="primary" class="star_icon"></ion-icon>-->
-<!--              <ion-label class="rate_num">4</ion-label>-->
-<!--            </div>-->
-<!--            <div class="select">-->
-<!--              <ion-icon slot="start" name="star" color="primary" class="star_icon"></ion-icon>-->
-<!--              <ion-label class="rate_num">5</ion-label>-->
-<!--            </div>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--      </div>-->
-
-<!--      <div class="reviw_list" *ngFor="let item of [1,2,3,4,5]">-->
-<!--        <div class="profile">-->
-<!--          <div class="left">-->
-<!--            <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/p2.jpg)'"></div>-->
-<!--            <div style="margin-left: 10px;">-->
-<!--              <ion-label class="bold">Jonathon Williams</ion-label>-->
-<!--            </div>-->
-<!--          </div>-->
-<!--          <div class="right">-->
-<!--            <div class="select">-->
-<!--              <ion-icon slot="start" name="star" color="primary" class="star_icon"></ion-icon>-->
-<!--              <ion-label class="rate_num">5</ion-label>-->
-<!--            </div>-->
-<!--            <ion-icon name="ellipsis-horizontal-circle-outline"></ion-icon>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--        <ion-label>The course is very good. the experience of the menter is very clear and easy to understand-->
-<!--        </ion-label>-->
-
-<!--        <div class="like">-->
-<!--          <ion-icon slot="start" name="heart" color="danger" class="heart"></ion-icon>-->
-<!--          <ion-label class="count">330</ion-label>-->
-<!--          <ion-label class="time">2 Days ago</ion-label>-->
-<!--        </div>-->
-<!--      </div>-->
-<!--    </div>-->
-
-  </div>
 </ion-content>
 
-<ion-footer>
-  <ion-toolbar>
-    <div class="button" (click)="onBack()">
-      <ion-label class="text">Return</ion-label>
-    </div>
-  </ion-toolbar>
-</ion-footer>
+<!--<ion-footer>-->
+<!--  <ion-toolbar>-->
+<!--    <div class="button" (click)="onBack()">-->
+<!--      <ion-label class="text">Return</ion-label>-->
+<!--    </div>-->
+<!--  </ion-toolbar>-->
+<!--</ion-footer>-->