diff --git a/src/app/pages/activetask/activetask.page.html b/src/app/pages/activetask/activetask.page.html
index d7855bd..f378124 100644
--- a/src/app/pages/activetask/activetask.page.html
+++ b/src/app/pages/activetask/activetask.page.html
@@ -33,115 +33,128 @@
       <!--      </div>-->
     </div>
 
-    <ion-segment [(ngModel)]="tabs">
-      <ion-segment-button value="about">
-        <ion-label>Details</ion-label>
-      </ion-segment-button>
-      <ion-segment-button value="lesson">
-        <ion-label>Send Updates</ion-label>
-      </ion-segment-button>
-      <ion-segment-button value="review">
-        <ion-label>Completed ?</ion-label>
-      </ion-segment-button>
-    </ion-segment>
+      <div *ngIf="status_description == 'ACTIVE'" >
+          <ion-segment [(ngModel)]="tabs">
+              <ion-segment-button value="about">
+                  <ion-label>Details</ion-label>
+              </ion-segment-button>
+              <ion-segment-button value="lesson">
+                  <ion-label>Send Updates</ion-label>
+              </ion-segment-button>
+              <ion-segment-button value="review">
+                  <ion-label>Completed ?</ion-label>
+              </ion-segment-button>
+          </ion-segment>
 
-    <div *ngIf="tabs =='about'" class="about">
-<!--      <ion-label class="head_text">Mentor</ion-label>-->
+          <div *ngIf="tabs =='about'" class="about">
+              <!--      <ion-label class="head_text">Mentor</ion-label>-->
 
-      <div class="mentor">
-        <div class="left">
-          <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/taskbanners/'+jobData.banner+')'"></div>
-          <div style="margin-left: 10px;">
-            <ion-label class="bold">Due Date</ion-label>
-            <ion-label class="grey">{{jobData.delivery_date}}</ion-label>
+              <div class="mentor">
+                  <div class="left">
+                      <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/taskbanners/'+jobData.banner+')'"></div>
+                      <div style="margin-left: 10px;">
+                          <ion-label class="bold">Due Date</ion-label>
+                          <ion-label class="grey">{{jobData.delivery_date}}</ion-label>
+                      </div>
+                  </div>
+                  <!--        <ion-icon name="chatbubble-ellipses-outline" color="primary"></ion-icon>-->
+              </div>
+
+              <ion-label class="head_text">Description</ion-label>
+              <ion-label class="description">{{jobData.job_description}}
+              </ion-label>
+
+              <ion-label class="head_text">Delivery Details</ion-label>
+              <ion-label class="description">{{jobData.description}}
+              </ion-label>
           </div>
-        </div>
-        <!--        <ion-icon name="chatbubble-ellipses-outline" color="primary"></ion-icon>-->
-      </div>
 
-      <ion-label class="head_text">Description</ion-label>
-      <ion-label class="description">{{jobData.job_description}}
-      </ion-label>
+          <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>-->
 
-      <ion-label class="head_text">Delivery Details</ion-label>
-      <ion-label class="description">{{jobData.description}}
-      </ion-label>
-    </div>
+              <div class="sec">
+                  <ion-label class="grey">Due Date:{{jobData.delivery_date}}</ion-label>
+                  <ion-label class="color">{{jobData.contract}}</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>-->
+              <ion-card>
+                  <ion-card-header>
+                      <ion-card-subtitle>Send Updates</ion-card-subtitle>
+                  </ion-card-header>
 
-      <div class="sec">
-        <ion-label class="grey">Due Date:{{jobData.delivery_date}}</ion-label>
-        <ion-label class="color">{{jobData.contract}}</ion-label>
-      </div>
+                  <ion-card-content>
+                      <ion-textarea label="Your Message to Job Owner" placeholder="Type message here"  [(ngModel)]='yourmessage' ></ion-textarea>
+                  </ion-card-content>
 
-      <ion-card>
-        <ion-card-header>
-          <ion-card-subtitle>Send Updates</ion-card-subtitle>
-        </ion-card-header>
+                  <ion-button color="secondary" expand="block" (click)="sendActiveJobMessage()">Send Updates</ion-button>
+                  <ion-label class="description">{{interest_msg_status}}
+                  </ion-label>
+              </ion-card>
 
-        <ion-card-content>
-          <ion-textarea label="Your Message to Job Owner" placeholder="Type message here"  [(ngModel)]='yourmessage' ></ion-textarea>
-        </ion-card-content>
+              <div class="video {{item.who}}" *ngFor="let item of msgListData">
+                  <div class="left">
+                      <div class="bg_image men_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/msg/TEXT.svg)'"></div>
 
-        <ion-button color="secondary" expand="block" (click)="sendActiveJobMessage()">Send Updates</ion-button>
-        <ion-label class="description">{{interest_msg_status}}
-        </ion-label>
-      </ion-card>
+                      <div class="text">
+                          <ion-label class="bold_text">{{item.msg_firstname}}-{{item.msg_date}}</ion-label>
+                          <ion-label class="grey_text">{{item.message}}</ion-label>
+                      </div>
+                  </div>
+                  <!--        <div class="right">-->
+                  <!--&lt;!&ndash;          <ion-icon name="lock-closed-outline"></ion-icon>&ndash;&gt;-->
+                  <!--        </div>-->
+              </div>
 
-      <div class="video {{item.who}}" *ngFor="let item of msgListData">
-        <div class="left">
-          <div class="bg_image men_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/msg/TEXT.svg)'"></div>
-
-          <div class="text">
-            <ion-label class="bold_text">{{item.msg_firstname}}-{{item.msg_date}}</ion-label>
-            <ion-label class="grey_text">{{item.message}}</ion-label>
           </div>
-        </div>
-<!--        <div class="right">-->
-<!--&lt;!&ndash;          <ion-icon name="lock-closed-outline"></ion-icon>&ndash;&gt;-->
-<!--        </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">Task Actions</ion-label>
+                  </div>
+                  <!--        <ion-label class="color">See all</ion-label>-->
+              </div>
+
+              <ion-card>
+                  <ion-card-header>
+                      <ion-card-subtitle>Completed the task?</ion-card-subtitle>
+                  </ion-card-header>
+
+                  <ion-card-content>
+                      <ion-button color="secondary" expand="block" >Send completion Message</ion-button>
+                      <ion-label class="description">{{interest_status}}
+                      </ion-label>
+                  </ion-card-content>
+              </ion-card>
+
+              <ion-card color="warning">
+                  <ion-card-header>
+                      <ion-card-subtitle>Cancel the task?</ion-card-subtitle>
+                  </ion-card-header>
+
+                  <ion-card-content>
+                      <ion-button color="secondary" expand="block" >Send cancellation request</ion-button>
+                      <ion-label class="description">{{interest_status}}
+                      </ion-label>
+                  </ion-card-content>
+              </ion-card>
+          </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">Task Actions</ion-label>
-        </div>
-<!--        <ion-label class="color">See all</ion-label>-->
+      <div *ngIf="status_description == 'PASTDUE'" >
+PAST DUE
       </div>
 
-      <ion-card>
-        <ion-card-header>
-          <ion-card-subtitle>Completed the task?</ion-card-subtitle>
-        </ion-card-header>
+      <div *ngIf="status_description == 'REVIEW'" >
+IN REVIEW
+      </div>
 
-        <ion-card-content>
-          <ion-button color="secondary" expand="block" >Send completion Message</ion-button>
-          <ion-label class="description">{{interest_status}}
-          </ion-label>
-        </ion-card-content>
-      </ion-card>
 
-      <ion-card color="warning">
-        <ion-card-header>
-          <ion-card-subtitle>Cancel the task?</ion-card-subtitle>
-        </ion-card-header>
 
-        <ion-card-content>
-          <ion-button color="secondary" expand="block" >Send cancellation request</ion-button>
-          <ion-label class="description">{{interest_status}}
-          </ion-label>
-        </ion-card-content>
-      </ion-card>
-    </div>
 
   </div>
 </ion-content>
diff --git a/src/app/pages/activetask/activetask.page.ts b/src/app/pages/activetask/activetask.page.ts
index b116d97..c604b5e 100644
--- a/src/app/pages/activetask/activetask.page.ts
+++ b/src/app/pages/activetask/activetask.page.ts
@@ -13,6 +13,8 @@ import { WrenchService } from 'src/app/services/wrench.service';
 export class ActivetaskPage implements OnInit {
   @ViewChild('yourmessage') yourmessage;
   tabs = 'about';
+  status_description:string='';
+
 
   jobData: any;
   constructor(
@@ -27,6 +29,7 @@ export class ActivetaskPage implements OnInit {
     console.log("XXXXX 1",   this.router.getCurrentNavigation().extras);
     console.log("XXXXX 2",   this.router.getCurrentNavigation().extras.state);
     //console.log("XXXXX 3",   this.router.getCurrentNavigation().extras.state.ID);
+    this.status_description =  this.jobData.status_description;
   }
 
   ngOnInit() {
diff --git a/src/app/pages/mytasks/mytasks.page.html b/src/app/pages/mytasks/mytasks.page.html
index f307e2b..2258070 100644
--- a/src/app/pages/mytasks/mytasks.page.html
+++ b/src/app/pages/mytasks/mytasks.page.html
@@ -78,7 +78,7 @@
           </ion-card-content>
         </ion-card>
       </div>
-      <div class="chat" *ngFor="let item of jobsPastDueData;" >
+      <div class="chat" *ngFor="let item of jobsPastDueData;"  (click)="activeSeleted(item)">
         <div class="flex">
           <div class="bg_image back_image" [style.backgroundImage]="'url(assets/images/taskbanners/'+item.banner+')'"></div>
           <div style="margin-left: 10px;">
@@ -88,8 +88,8 @@
 
             </div>
             <div>
-              <hr />
-              <ion-label> {{item.delivery_date}}</ion-label>
+<!--              <hr />-->
+              <ion-label class="due_date">Due : {{item.delivery_date |date}}</ion-label>
             </div>
           </div>
         </div>
@@ -104,7 +104,7 @@
     <div *ngIf="tabs =='review'">
       <div *ngIf="review_job_count == 0">
         <ion-card>
-          <img alt="Silhouette of mountains" src="https://www.wrenchboard.com/assets/images/apps/review-task.png" />
+          <img alt="WrenchBoard Review" src="https://www.wrenchboard.com/assets/images/apps/review-task.png" />
           <ion-card-header>
             <ion-card-title>In Review</ion-card-title>
             <!--        <ion-card-subtitle>Card Subtitle</ion-card-subtitle>-->
@@ -117,18 +117,17 @@
       </div>
 
 
-      <div class="chat" *ngFor="let item of jobsInReviewData;">
+      <div class="chat" *ngFor="let item of jobsInReviewData;"  (click)="activeSeleted(item)">
         <div class="flex">
           <div class="bg_image back_image" [style.backgroundImage]="'url(assets/images/taskbanners/'+item.banner+')'"></div>
           <div style="margin-left: 10px;">
             <ion-label class="bold_text"> {{item.title}}</ion-label>
             <div style="display: flex;">
               <ion-label class="grey_text"> {{item.job_description}} </ion-label>
-
             </div>
             <div>
-              <hr />
-              <ion-label> {{item.delivery_date}}</ion-label>
+<!--              <hr />-->
+              <ion-label class="due_date">Due : {{item.delivery_date |date}}</ion-label>
             </div>
           </div>
         </div>