diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.html b/ng6-seed/src/app/layouts/admin/admin-layout.component.html
index dd92367ca..f9cdd28a9 100755
--- a/ng6-seed/src/app/layouts/admin/admin-layout.component.html
+++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.html
@@ -108,12 +108,12 @@
            </div>
            </div>
            <div fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100">
-           <div class="search-bar" fxFlex>
+           <!--<div class="search-bar" fxFlex>
               <form class="search-form">
                  <mat-icon>search</mat-icon>
                  <input type="text" placeholder="Search" autofocus="true" />
               </form>
-           </div>
+           </div>-->
            </div>
 
            <div fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100">
@@ -124,7 +124,7 @@
                  <!--<span>{{ menuitem.name | translate }}</span>-->
                  </button>
             </span>
-               <button [mat-menu-trigger-for]="multi" matTooltip="settings" matTooltipPosition="below" mat-icon-button class="ml-xs">
+               <button [mat-menu-trigger-for]="multi" matTooltip="Settings" matTooltipPosition="below" mat-icon-button class="ml-xs">
                     <mat-icon>settings</mat-icon>
                </button>       
             <mat-menu #multi="matMenu" class="opt-menu" x-position="before">
@@ -145,7 +145,7 @@
                  </div>
            </div>
         </mat-menu>
-              <button appToggleFullscreen mat-icon-button>
+              <button appToggleFullscreen matTooltip="Fullscreen" matTooltipPosition="below" mat-icon-button>
                  <mat-icon>fullscreen</mat-icon>
               </button>
               <!--<button [mat-menu-trigger-for]="user2" mat-icon-button class="ml-xs overflow-visible">
@@ -193,7 +193,7 @@
                     Calendar Settings
                  </button>
               </mat-menu> -->
-              <button (click)="end.toggle()" mat-icon-button class="ml-xs overflow-visible">
+              <button (click)="end.toggle()" matTooltip="Notifications" matTooltipPosition="below" mat-icon-button class="ml-xs overflow-visible">
                  <mat-icon>notifications</mat-icon>
                  <!-- <span class="notification-label">2</span> -->
                  <span *ngIf="alertCount != 0" style = "width:23px" class="notification-label"  >{{alertCount}}</span>
@@ -288,7 +288,7 @@
            <mat-icon>notifications</mat-icon>
            <span *ngIf="alertCount != 0" style = "width:23px" class="notification-label"  >{{alertCount}}</span>
         </button>
-        <button [mat-menu-trigger-for]="user" mat-icon-button class="ml-xs">
+        <button [mat-menu-trigger-for]="user"  matTooltip="Person" matTooltipPosition="below" mat-icon-button class="ml-xs">
            <mat-icon>person</mat-icon>
         </button>
         <mat-menu #user="matMenu" class="opt-menu" x-position="before">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.html
index 13dece34f..2f3e829fe 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.html
@@ -1,5 +1,5 @@
 <h2 mat-dialog-title class="paragraph_change">
-        <div fxFlex="70" align="left">
+        <div fxFlex="70" align="left" style="padding: 10px !important;">
                 {{data.first_name}}
         </div>
         <div fxFlex="30" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.scss
index 8777abac5..ca19d341c 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/allocation-view-more/allocation-view-more.component.scss
@@ -1,5 +1,6 @@
 .paragraph_change {
-    color:  #e00201 !important;
+    color:  #fff !important;
+    background-color: #e00201 !important;
 }
 ol {
     list-style-type: none;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.scss
index 3bd6bebcf..6795e1e30 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.scss
@@ -3,6 +3,6 @@ mat-form-field {
   }
 .paragraph_change {
   color:  #fff !important;
-   background-color: #e00201 !important;
+  background-color: #e00201 !important;
   // padding: 10px !important;
 }
\ No newline at end of file
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html
index c41ba5c4a..4d2e945c6 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html
@@ -1,5 +1,5 @@
-<h2 mat-dialog-title>
-<div fxFlex="70">
+<h2 mat-dialog-title class="paragraph_change">
+<div fxFlex="70" style="padding: 10px !important;">
         {{pageTitle}}
 </div>
 <div fxFlex="30" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.scss
index 4a8d6adb2..044bbd96c 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.scss
@@ -15,4 +15,9 @@
  .cdk-global-overlay-wrapper{
         justify-content: center !important;
 }
+.paragraph_change {
+  color:  #fff !important;
+  background-color: #e00201 !important;
+  // padding: 10px !important;
+}
 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.html
index 914f09e74..25c364190 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="_EditPDRequirementForm" novalidate>
 
     <h2 mat-dialog-title class="paragraph_change">
-            <div fxFlex="70" align="left">
+            <div fxFlex="70" align="left" style="padding: 10px !important;">
                     {{pageTitle}}
             </div>
             <div fxFlex="30" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.scss
index 4fe099dd8..9bb4a0404 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-requirement/pd-requirement.component.scss
@@ -2,5 +2,6 @@ mat-form-field {
     margin: 0 2%;
   }
 .paragraph_change {
-  color:  #e00201 !important;
+  color:  #fff !important;
+  background-color: #e00201 !important;
 }
\ No newline at end of file
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
index edf72fb72..4f150c5d2 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
@@ -2,7 +2,7 @@
 <form class="address" [formGroup]="addressForm">
 
     <h2 mat-dialog-title class="paragraph_change">
-            <div fxFlex="70" align="left">
+            <div fxFlex="70" align="left" style="padding: 10px !important;">
                     {{pageTitle}}
             </div>
             <div fxFlex="30" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.scss
index 35daae966..e899923d3 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.scss
@@ -1,5 +1,6 @@
 .paragraph_change {
-  color:  #e00201 !important;
+  color:  #fff !important;
+  background-color: #e00201 !important;
 }
 .mat-card-content {
     background-color: white;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html
index f9c8c2402..5f071b389 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="_assessedIncomeFormFrom">
 
         <h2 mat-dialog-title class="paragraph_change">
-                <div fxFlex="70" align="left">
+                <div fxFlex="70" align="left" style="padding: 10px !important;">
                         {{pageTitle}}
                 </div>
                 <div fxFlex="30" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss
index 5e603e032..ab69d07d0 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss
@@ -35,7 +35,8 @@ tr.mat-footer-row {
 
 
   .paragraph_change {
-    color:  #e00201 !important;
+    color:  #fff !important;
+    background-color: #e00201 !important;
   }
   .mat-card-content {
       background-color: white;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
index c07476cda..acb2f4f66 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
@@ -1,7 +1,7 @@
 <form *ngIf="apiLoadFinish && loadDetails" [formGroup]="_assetsQuesFrom" (submit)="onSubmit()" novalidate>
 
 <h2 mat-dialog-title class="paragraph_change">
-        <div fxFlex="70" align="left">
+        <div fxFlex="70" align="left" style="padding: 10px !important;">
                 {{pageTitle}}
         </div>
         <div fxFlex="30" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.scss
index 295f68262..8acfd1d59 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.scss
@@ -1,5 +1,6 @@
 .paragraph_change {
-    color:  #e00201 !important;
+    color:  #fff !important;
+    background-color: #e00201 !important;
   }
   .mat-card-content {
       background-color: white;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
index c39bc3442..65381d8f6 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
@@ -69,7 +69,7 @@
 <!--=======-->
 <form [formGroup]="bankingForm" class="bankForm">
 <h2 mat-dialog-title class="paragraph_change">
-    <div fxFlex="70" align="left">{{pageTitle}}</div>
+    <div fxFlex="70" align="left" style="padding: 10px !important;">{{pageTitle}}</div>
     <div fxFlex="30" align="end">
                         <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="right" mat-dialog-close><mat-icon>close</mat-icon></button>
                                 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.scss
index 08086044f..96645e7af 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.scss
@@ -11,7 +11,8 @@
 
 
 .paragraph_change {
-  color:  #e00201 !important;
+  color:  #fff !important;
+  background-color: #e00201 !important;
 }
 .mat-card-content {
     background-color: white;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
index 8304e99af..2efcff73a 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="businessForm" class="address">
 
     <h2 mat-dialog-title class="paragraph_change">
-        <div fxFlex="70" align="left">{{pageTitle}}</div>
+        <div fxFlex="70" align="left" style="padding: 10px !important;">{{pageTitle}}</div>
         <div fxFlex="30" align="end">
                 <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="right" mat-dialog-close><mat-icon>close</mat-icon></button>
                         
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss
index 34bdc26e8..f49982241 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss
@@ -33,7 +33,8 @@
 
 
 .paragraph_change {
-  color:  #e00201 !important;
+  color:  #fff !important;
+  background-color: #e00201 !important;
 }
 .mat-card-content {
     background-color: white;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
index 77ee86f38..7faf85907 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
@@ -1,7 +1,7 @@
 <form *ngIf="apiLoadFinish" [formGroup]="_clientQuesFrom" (submit)="onSubmit()" novalidate>
 
     <h2 mat-dialog-title class="paragraph_change">
-            <div fxFlex="70" align="left">{{pageTitle}}</div>
+            <div fxFlex="70" align="left" style="padding: 10px !important;">{{pageTitle}}</div>
             <div fxFlex="30" align="end">
                     <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="right" mat-dialog-close><mat-icon>close</mat-icon></button>
             
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.scss
index 6dbbafcf7..c2c0ef8c2 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.scss
@@ -1,5 +1,6 @@
 .paragraph_change {
-    color:  #e00201 !important;
+    color:  #fff !important;
+    background-color: #e00201 !important;
   }
   .mat-card-content {
       background-color: white;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html
index cc87f6dc9..42c95060c 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="currentLoanForm" class="address">
 
         <h2 mat-dialog-title class="paragraph_change">
-                <div fxFlex="70" align="left">{{pageTitle}}</div>
+                <div fxFlex="70" align="left" style="padding: 10px !important;">{{pageTitle}}</div>
                 <div fxFlex="30" align="end">
                         <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="right" mat-dialog-close><mat-icon>close</mat-icon></button>
                 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.scss
index cd0448ed0..e639a3521 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.scss
@@ -19,7 +19,8 @@
 // }
 
 .paragraph_change {
-  color:  #e00201 !important;
+    color:  #fff !important;
+    background-color: #e00201 !important;
 }
 .mat-card-content {
     background-color: white;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html
index 985d7b252..da9d3a8da 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html
@@ -1,6 +1,6 @@
 <form [formGroup]="employmentForm" class="address">
         <h2 mat-dialog-title class="paragraph_change">
-                <div fxFlex="70" align="left">
+                <div fxFlex="70" align="left" style="padding: 10px !important;">
                         {{pageTitle}}
                 </div>
                 <div fxFlex="30" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.scss
index 9e5a3eaf8..2138b2c0f 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.scss
@@ -21,7 +21,8 @@
 }
 
 .paragraph_change {
-  color:  #e00201 !important;
+   color:  #fff !important;
+    background-color: #e00201 !important;
 }
 .mat-card-content {
     background-color: white;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
index bcbbef8eb..06ed67ddf 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
@@ -1,6 +1,6 @@
 <form class="address" [formGroup]="familyForm">
     <h2 mat-dialog-title class="paragraph_change">
-            <div fxFlex="70" align="left">
+            <div fxFlex="70" align="left" style="padding: 10px !important;">
                     {{pageTitle}}
             </div>
             <div fxFlex="30" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.scss
index 197f8353a..e7f2a1bcb 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.scss
@@ -24,7 +24,8 @@
 
 
 .paragraph_change {
-  color:  #e00201 !important;
+   color:  #fff !important;
+    background-color: #e00201 !important;
 }
 .mat-card-content {
     background-color: white;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
index b5f22eecf..8c8d31237 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
@@ -2,7 +2,7 @@
      <form [formGroup]="financialForm" class="address">
 
     <h2 mat-dialog-title class="paragraph_change">
-            <div fxFlex="70" align="left">
+            <div fxFlex="70" align="left" style="padding: 10px !important;">
                     {{pageTitle}}
             </div>
             <div fxFlex="30" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.scss
index 41f2bb3ed..b1652e4c4 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.scss
@@ -23,7 +23,8 @@
 
 
 .paragraph_change {
-  color:  #e00201 !important;
+  color:  #fff !important;
+  background-color: #e00201 !important;
 }
 .mat-card-content {
     background-color: white;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
index 3bcede64a..0b3e3fc52 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="_generalForm" novalidate>
 
     <h2 mat-dialog-title class="paragraph_change">
-            <div fxFlex="70" align="left">
+            <div fxFlex="70" align="left" style="padding: 10px !important;">
                     {{pageTitle}}
             </div>
             <div fxFlex="30" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss
index d730ff59a..448028b25 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss
@@ -1,5 +1,6 @@
 .paragraph_change {
-    color:  #e00201 !important;
+  color:  #fff !important;
+  background-color: #e00201 !important;
   }
 .example-section {
     height: 120px;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html
index 58085ce20..7867a8508 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html
@@ -1,6 +1,6 @@
 <form [formGroup]="representativeForm" class="address">
   <h2 mat-dialog-title class="paragraph_change">
-                <div fxFlex="70" align="left">
+                <div fxFlex="70" align="left" style="padding: 10px !important;">
                         {{pageTitle}}
                 </div>
                 <div fxFlex="30" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.scss
index d422798d3..1ddd78f24 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.scss
@@ -11,7 +11,8 @@
 //   }
 
 .paragraph_change {
-  color:  #e00201 !important;
+   color:  #fff !important;
+    background-color: #e00201 !important;
 }
 .mat-card-content {
     background-color: white;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
index 7d9d47cbd..202c771b7 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
@@ -1,6 +1,6 @@
 <form [formGroup]="loanDetailsForm" class="address">
         <h2 mat-dialog-title class="paragraph_change">
-                <div fxFlex="70" align="left">
+                <div fxFlex="70" align="left" style="padding: 10px !important;">
                         {{pageTitle}}
                 </div>
                 <div fxFlex="30" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss
index aade5c39e..c010d7fa9 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss
@@ -23,7 +23,8 @@
 
 
 .paragraph_change {
-  color:  #e00201 !important;
+  color:  #fff !important;
+  background-color: #e00201 !important;
 }
 .mat-card-content {
     background-color: white;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
old mode 100644
new mode 100755
index 62e2d0d80..b795cfaa4
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="_neighbourhoodForm" novalidate>
 
   <h2 mat-dialog-title class="paragraph_change">
-          <div fxFlex="70" align="left">
+          <div fxFlex="70" align="left" style="padding: 10px !important;">
                   <div fxLayout="row wrap">
                       <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
                           {{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.scss
old mode 100644
new mode 100755
index f18a47720..d16b77a3b
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.scss
@@ -1,5 +1,6 @@
 .paragraph_change {
-    color:  #e00201 !important;
+    color:  #fff !important;
+  background-color: #e00201 !important;
   }
   mat-form-field {
     margin: 0 2%;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.spec.ts
old mode 100644
new mode 100755
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts
old mode 100644
new mode 100755
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.html
index 4d81081b0..ab04d54a4 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="_OtherForm" novalidate>
 
     <h2 mat-dialog-title class="paragraph_change">
-            <div fxFlex="70" align="left">
+            <div fxFlex="70" align="left" style="padding: 10px !important;">
                     {{pageTitle}}
             </div>
             <div fxFlex="30" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.scss
index ae78439a5..eee866396 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.scss
@@ -1,5 +1,6 @@
 .paragraph_change {
-    color:  #e00201 !important;
+     color:  #fff !important;
+    background-color: #e00201 !important;
   }
   mat-form-field {
     margin: 0 2%;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
index 71651f88f..7249bed24 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="otherIncomeForm" class="address">
 
     <h2 mat-dialog-title class="paragraph_change">
-            <div fxFlex="70" align="left">
+            <div fxFlex="70" align="left" style="padding: 10px !important;">
                     {{pageTitle}}
             </div>
             <div fxFlex="30" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.scss
index b4ffad50d..baeef985a 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.scss
@@ -18,7 +18,8 @@
 // }
 
 .paragraph_change {
-  color:  #e00201 !important;
+  color:  #fff !important;
+  background-color: #e00201 !important;
 }
 .mat-card-content {
     background-color: white;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html
index 59e13fa12..144a5ab5e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="_personalForm" (submit)="submitPersonalForm(_personalForm.value)" novalidate>
 
 <h2 mat-dialog-title class="paragraph_change">
-        <div fxFlex="70" align="left">
+        <div fxFlex="70" align="left" style="padding: 10px !important;">
                 {{pageTitle}}
         </div>
         <div fxFlex="30" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.scss
index b7f235278..7b668d62c 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.scss
@@ -1,5 +1,6 @@
 .paragraph_change {
-  color:  #e00201 !important;
+  color:  #fff !important;
+  background-color: #e00201 !important;
 }
 .mat-card-content {
     background-color: white;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html
index 6362fe0a1..586607736 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html
@@ -1,7 +1,7 @@
 <form class="address" [formGroup]="rentalForm">
 
 <h2 mat-dialog-title class="paragraph_change">
-                <div fxFlex="70" align="left">
+                <div fxFlex="70" align="left" style="padding: 10px !important;">
                         {{pageTitle}}
                 </div>
                 <div fxFlex="30" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.scss
index f731f4f4f..8965f2346 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.scss
@@ -27,7 +27,8 @@
 // }
 
 .paragraph_change {
-  color:  #e00201 !important;
+  color:  #fff !important;
+  background-color: #e00201 !important;
 }
 .mat-card-content {
     background-color: white;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
index 6c81c0054..291abc847 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
@@ -1,6 +1,6 @@
 <form [formGroup]="stockForm" class="address">
         <h2 mat-dialog-title class="paragraph_change">
-                <div fxFlex="70" align="left">
+                <div fxFlex="70" align="left" style="padding: 10px !important;">
                         {{pageTitle}}
                 </div>
                 <div fxFlex="30" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.scss
index b4ffad50d..baeef985a 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.scss
@@ -18,7 +18,8 @@
 // }
 
 .paragraph_change {
-  color:  #e00201 !important;
+  color:  #fff !important;
+  background-color: #e00201 !important;
 }
 .mat-card-content {
     background-color: white;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
index 772274f88..93b4ad4c9 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
@@ -1,7 +1,7 @@
 <form *ngIf="apiLoadFinish" [formGroup]="_supplierQuesFrom" (submit)="onSubmit()" novalidate>
 
     <h2 mat-dialog-title class="paragraph_change">
-            <div fxFlex="70" align="left">{{pageTitle}}</div>
+            <div fxFlex="70" align="left" style="padding: 10px !important;">{{pageTitle}}</div>
             <div fxFlex="30" align="end">
                     <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="right" mat-dialog-close><mat-icon>close</mat-icon></button>
             
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.scss
index 4e655f1ef..70945645a 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.scss
@@ -3,7 +3,8 @@
 // }
 
 .paragraph_change {
-    color:  #e00201 !important;
+    color:  #fff !important;
+  background-color: #e00201 !important;
   }
   .mat-card-content {
       background-color: white;
diff --git a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html
index 30604576f..d2380d6c5 100755
--- a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html
+++ b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html
@@ -1,7 +1,7 @@
 <div *ngIf="listView">
   <mat-card> 
     <mat-card-content>
-        <div fxLayout="row" fxLayout.xs="column" fxLayoutWrap fxLayoutAlign="center none" style="padding-top:1%">
+        <div fxLayout="row" fxLayout.xs="column" fxLayoutWrap style="padding-top:1%">
             <div fxFlex="80%">
                 <mat-card-title><span style="font-size:24px"> Entity Master</span></mat-card-title>
               </div>
diff --git a/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts b/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts
index 6e9485485..12d6afdcd 100755
--- a/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts
+++ b/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts
@@ -38,7 +38,7 @@ const HORIZONTALMENUITEMS = [
       {state:'setting/mastermodule',name:'Master Details'},
       {state:'setting/entity',name:'Entities'},
       {state:'setting/pdteamlist',name:'PD Team'}, 
-      {state:'template/questions', name: 'Questions'},
+      // {state:'template/questions', name: 'Questions'},
       {state:'template/templates', name: 'Templates'},
     ]
   },
diff --git a/ng6-seed/src/app/template/templates/templates-list/edit/edit-category/edit-category.component.html b/ng6-seed/src/app/template/templates/templates-list/edit/edit-category/edit-category.component.html
index 3743bbaae..ffcd6bdd7 100755
--- a/ng6-seed/src/app/template/templates/templates-list/edit/edit-category/edit-category.component.html
+++ b/ng6-seed/src/app/template/templates/templates-list/edit/edit-category/edit-category.component.html
@@ -14,7 +14,7 @@
                             </mat-form-field>
                         </div>
                         <div fxFlex="30%">
-                            <mat-form-field style="width: 80px; text-align: center" appearance="outline">
+                            <mat-form-field style="width: 110px; text-align: center">
                                 <input matInput placeholder="Weightage *" formControlName="weightage">
                             </mat-form-field> <span>%</span>
                             <mat-error *ngIf="submitted && answ['controls'].weightage.hasError('required')" class="mat-text-warn">Weightage Required.!</mat-error>
diff --git a/ng6-seed/src/app/template/templates/templates-list/edit/edit-question-answer/category-question-answer/category-question-answer.component.html b/ng6-seed/src/app/template/templates/templates-list/edit/edit-question-answer/category-question-answer/category-question-answer.component.html
index 92589721b..cc8b3ef87 100755
--- a/ng6-seed/src/app/template/templates/templates-list/edit/edit-question-answer/category-question-answer/category-question-answer.component.html
+++ b/ng6-seed/src/app/template/templates/templates-list/edit/edit-question-answer/category-question-answer/category-question-answer.component.html
@@ -13,7 +13,7 @@
                     <span>{{i+1}}</span> ) <label>{{ques.get('question').value}}</label>
                   </div>
                   <div fxFlex="1 1 auto" class="ml-xs" fxFlex="20%">
-                    <mat-form-field style="width: 35%; text-align: center" appearance="outline">
+                    <mat-form-field style="width: 100px; text-align: center">
                       <input matInput formControlName="weightage">
                     </mat-form-field> <span> % </span>
                     <mat-error *ngIf="submitted && ques['controls'].weightage.hasError('required')" class="mat-text-warn">Ques. WT is Required.!</mat-error>
@@ -61,7 +61,7 @@
   </div>
   
   <div class="row" style="text-align:right;">
-    <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Add More Question and Answer" matTooltipPosition="above" color="primary" (click)="openDialog(); false"><mat-icon>add</mat-icon></button>  
+    <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Add Data Points" matTooltipPosition="above" color="primary" (click)="openDialog(); false"><mat-icon>add</mat-icon></button>  
     <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>
   </div>
 </form>
diff --git a/ng6-seed/src/app/template/templates/templates-list/templates.list.component.html b/ng6-seed/src/app/template/templates/templates-list/templates.list.component.html
index df2caf7d8..6d38e18e1 100755
--- a/ng6-seed/src/app/template/templates/templates-list/templates.list.component.html
+++ b/ng6-seed/src/app/template/templates/templates-list/templates.list.component.html
@@ -26,14 +26,16 @@
                         </div>
                         </div>
                 <ng-container>
-                        <mat-table [dataSource]="dataSource" *ngIf="templateList.length > 0" >
+                        <mat-table [dataSource]="dataSource" *ngIf="templateList.length > 0" matSort>
     
                                 <ng-container matColumnDef="template_name">
+                                   <mat-header-cell *matHeaderCellDef mat-sort-header>Template Name</mat-header-cell>
                                       <mat-cell  fxFlex="25%" *matCellDef="let template;"> 
                                         <span *ngIf="template.template_name" mat-line>{{ template.template_name }}</span>
                                          </mat-cell>
                                 </ng-container>
                                 <ng-container matColumnDef="lender_details">
+                                    <mat-header-cell *matHeaderCellDef mat-sort-header>Lender Details</mat-header-cell>
                                   <mat-cell  fxFlex="65%" *matCellDef="let template;"> 
                                         <div *ngIf="template.lender_details.length > 0" class="text-line-limit">
                                                 <span *ngFor="let lender of template.lender_details ; let last = last" > {{lender.full_name}} - {{lender.product_name}} - {{lender.customer_segment_name}} <span *ngIf="!last">,<br><br></span></span>
@@ -41,10 +43,12 @@
                                      </mat-cell>
                                </ng-container>
                                 <ng-container matColumnDef="actions">
+                                    <mat-header-cell *matHeaderCellDef mat-sort-header style="justify-content: flex-end;">Actions</mat-header-cell>
                                   <mat-cell  fxFlex="10%" *matCellDef="let template;"> 
                                         <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="goToEdit(template.template_id)"><mat-icon>edit</mat-icon></button>
                                     </mat-cell>
                                </ng-container>
+                                <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
                                <mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;">
                                 </mat-row>
                                 </mat-table>