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 03dbbc63b..b15a8e0c8 100644
--- 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
@@ -253,7 +253,7 @@
             <button mat-raised-button mat-icon-button mat-button color="primary" matTooltip="Add More Asset Details" matTooltipPosition="above"
             class="mr-1 mb-1 hover-icon" (click)="addSupplierDetails($event); false"><mat-icon>add</mat-icon></button>
         
-            <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" (click)="onReset(); false"><mat-icon>settings_backup_restore</mat-icon></button>
+          <!----  <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" (click)="onReset(); false"><mat-icon>settings_backup_restore</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/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 a508f499c..1563deb3d 100644
--- 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
@@ -5,7 +5,7 @@
         <input matInput placeholder="Name of Business / Profession" formControlName="profession_name">
     </mat-form-field>
     <mat-form-field>
-        <input matInput placeholder="How many years in Business" formControlName="business_years">
+        <input matInput placeholder="How many years in business" formControlName="business_years">
     </mat-form-field>
     <mat-form-field>
         <mat-select placeholder="Industry"
@@ -25,7 +25,7 @@
     <mat-card>
         <mat-card-header>
             <p>Designation
-            <p>
+            </p>
         </mat-card-header>
         <div formArrayName="designation">
             <div *ngFor="let members of businessForm.controls.designation['controls']; let i=index"
@@ -37,13 +37,13 @@
                     <mat-form-field>
                         <input matInput placeholder="Designation" formControlName="sec_designation">
                     </mat-form-field>
-                    <button type="button" mat-raised-button mat-icon-button (click)="addDesignation()"
-                            *ngIf="i==0">
+                    <button type="button"  class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addDesignation()"
+                    matTooltip="Add More Designation" matTooltipPosition="above" color="primary" *ngIf="i==0">
                         <mat-icon>add</mat-icon>
                     </button>
-                    <button type="button" mat-raised-button mat-icon-button (click)="deleteDesignation(i)"
-                            *ngIf="i>0">
-                        <mat-icon>close</mat-icon>
+                    <button type="button"  class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="deleteDesignation(i)"
+                    matTooltip="Delete" matTooltipPosition="above"  *ngIf="i>0">
+                        <mat-icon>delete</mat-icon>
                     </button>
                 </mat-card-content>
             </div>
@@ -65,7 +65,7 @@
         </mat-select>
     </mat-form-field>
     <mat-form-field *ngIf="businessForm.controls['main_person'].value == 'Others'">
-        <input matInput placeholder="Specify other persion"
+        <input matInput placeholder="Specify other person"
                formControlName="other_main_person">
     </mat-form-field>
     <mat-form-field>
@@ -85,7 +85,7 @@
     <mat-card>
         <mat-card-header>
             <p>Partners / Directors / Shareholders
-            <p>
+            </p>
         </mat-card-header>
         <div formArrayName="partners">
             <div *ngFor="let members of businessForm.controls.partners['controls']; let i=index"
@@ -104,16 +104,16 @@
                                formControlName="current_business_experiance">
                     </mat-form-field>
                     <mat-form-field>
-                        <input matInput placeholder="Total Business experience"
+                        <input matInput placeholder="Total Business Experience"
                                formControlName="total_business_experiance">
                     </mat-form-field>
-                    <button type="button" mat-raised-button mat-icon-button (click)="addPartnerDetails()"
-                            *ngIf="i==0">
+                    <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addPartnerDetails()"
+                    matTooltip="Add More Partners / Directors / Shareholders" matTooltipPosition="above" color="primary"  *ngIf="i==0">
                         <mat-icon>add</mat-icon>
                     </button>
-                    <button type="button" mat-raised-button mat-icon-button (click)="deletePartnerDetails(i)"
-                            *ngIf="i>0">
-                        <mat-icon>close</mat-icon>
+                    <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="deletePartnerDetails(i)"
+                    matTooltip="Delete" matTooltipPosition="above"   *ngIf="i>0">
+                        <mat-icon>delete</mat-icon>
                     </button>
                 </mat-card-content>
             </div>
@@ -122,7 +122,7 @@
     <mat-card>
         <mat-card-header>
             <p>Employees As per applicant
-            <p>
+            </p>
         </mat-card-header>
         <mat-card-content class="matcard">
             <mat-form-field>
@@ -142,7 +142,7 @@
     <mat-card>
         <mat-card-header>
             <p>As per PD Officer
-            <p>
+            </p>
         </mat-card-header>
         <mat-card-content class="matcard">
             <mat-form-field>
@@ -162,15 +162,15 @@
     <mat-card>
         <mat-card-header>
             <p>Investments
-            <p>
+            </p>
         </mat-card-header>
         <mat-card-content class="matcard">
             <mat-form-field>
-                <input matInput placeholder="Amount invested by applicant"
+                <input matInput placeholder="Amount Invested by Applicant"
                        formControlName="invested_amount">
             </mat-form-field>
             <mat-form-field>
-                <input matInput placeholder="Monthly Working capital needed"
+                <input matInput placeholder="Monthly Working Capital Needed"
                        formControlName="working_capital">
             </mat-form-field>
         </mat-card-content>
@@ -178,9 +178,9 @@
     <mat-card>
         <mat-card-header>
             <p>Location
-            <p>
+            </p>
         </mat-card-header>
-        <mat-card-content class="matcard">
+        <mat-card-content class="matcards">
             <mat-form-field>
                 <mat-select
                             placeholder="Is the location of the business / profession suited to the nature of business / service provided? "
@@ -195,11 +195,11 @@
     <mat-card>
         <mat-card-header>
             <p>Business Setup
-            <p>
+            </p>
         </mat-card-header>
-        <mat-card-content class="matcard">
+        <mat-card-content class="matcards">
             <mat-form-field>
-                <mat-select  placeholder="What is the Ownership of the setup ?"
+                <mat-select  placeholder="What is the ownership of the setup ?"
                             formControlName="ownership_setup">
                     <mat-option value="self_owned">self owned</mat-option>
                     <mat-option value="rented">Rented</mat-option>
@@ -208,11 +208,11 @@
                 </mat-select>
             </mat-form-field>
             <mat-form-field *ngIf="businessForm.controls['ownership_setup'].value == 'others'">
-                <input matInput placeholder="please specify"
+                <input matInput placeholder="Please Specify"
                        formControlName="ownership_others">
             </mat-form-field>
             <mat-form-field *ngIf="businessForm.controls['ownership_setup'].value == 'rented'">
-                <input matInput placeholder="provide rent paid?"
+                <input matInput placeholder="Provide Rent Paid?"
                        formControlName="rent_paid">
             </mat-form-field>
         </mat-card-content>
@@ -220,7 +220,7 @@
     <mat-card>
         <mat-card-header>
             <p>Is the below documents seen and photo captured ?
-            <p>
+            </p>
         </mat-card-header>
         <mat-card-content class="matcard">
             <mat-form-field>
@@ -231,28 +231,28 @@
                 </mat-select>
             </mat-form-field>
             <mat-form-field>
-                <mat-select  placeholder="GST Regn cert"
+                <mat-select  placeholder="GST Regn Cert"
                             formControlName="gst_Regn_cert">
                     <mat-option value="yes">Yes</mat-option>
                     <mat-option value="no">No</mat-option>
                 </mat-select>
             </mat-form-field>
             <mat-form-field>
-                <mat-select  placeholder="Export / import cert"
+                <mat-select  placeholder="Export / Import cert"
                             formControlName="export_import_cert">
                     <mat-option value="yes">Yes</mat-option>
                     <mat-option value="no">No</mat-option>
                 </mat-select>
             </mat-form-field>
             <mat-form-field>
-                <mat-select  placeholder="FactoryCert"
+                <mat-select  placeholder="Factory Cert"
                             formControlName="factory_cert">
                     <mat-option value="yes">Yes</mat-option>
                     <mat-option value="no">No</mat-option>
                 </mat-select>
             </mat-form-field>
             <mat-form-field>
-                <mat-select  placeholder="Cert of practice"
+                <mat-select  placeholder="Cert of Practice"
                             formControlName="practice_cert">
                     <mat-option value="yes">Yes</mat-option>
                     <mat-option value="no">No</mat-option>
@@ -273,7 +273,7 @@
                 </mat-select>
             </mat-form-field>
             <mat-form-field>
-                <mat-select  placeholder="do you want to add other documents?"
+                <mat-select  placeholder="Do you want to add other documents?"
                             formControlName="other_documents">
                     <mat-option value="yes">Yes</mat-option>
                     <mat-option value="no">No</mat-option>
@@ -282,17 +282,17 @@
             <div formArrayName="documents" *ngIf="businessForm.controls['other_documents'].value == 'yes'">
                 <div *ngFor="let members of businessForm.controls.documents['controls']; let i=index"
                      [formGroupName]="i">
-                    <mat-form-field>
+                    <mat-form-field style="width:100%">
                         <input matInput placeholder="Specify Document Details"
                                formControlName="document">
                     </mat-form-field>
-                    <button type="button" mat-raised-button mat-icon-button (click)="addDocuments()"
-                            *ngIf="i==0">
+                    <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addDocuments()"
+                    matTooltip="Add More Document Details" matTooltipPosition="above" color="primary" *ngIf="i==0">
                         <mat-icon>add</mat-icon>
                     </button>
-                    <button type="button" mat-raised-button mat-icon-button (click)="deleteDocuments(i)"
-                            *ngIf="i>0">
-                        <mat-icon>close</mat-icon>
+                    <button type="button" class="mr-1 mb-1 hover-icon"  mat-raised-button mat-icon-button (click)="deleteDocuments(i)"
+                    matTooltip="Delete" matTooltipPosition="above"   *ngIf="i>0">
+                        <mat-icon>delete</mat-icon>
                     </button>
                 </div>
             </div>
@@ -306,6 +306,9 @@
             </mat-form-field>
         </div>
     </div>
-    <button mat-raised-button type="submit" class="button" (click)="submitDetails()">Submit</button>
+    <div style="text-align: right;">
+        <button type="submit" class="mr-1 mb-1 hover-icon"  mat-raised-button mat-icon-button  matTooltip="Submit" matTooltipPosition="above"  (click)="submitDetails()"><mat-icon>save</mat-icon>
+        </button>
+     </div>
 </form>
 </mat-card>
\ No newline at end of file
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 3be75d28c..96152853a 100644
--- 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
@@ -8,13 +8,19 @@
   width: 100%;
 }
 .matcard > * {
-  width: 80%;
+  width: 45%;
 }
 .card mat-form-field {
   margin: 0 2%;
+  width: 40%;
 }
 .matcard mat-form-field {
   margin: 0 2%;
+  width: 40%;
+}
+.matcards mat-form-field {
+  margin: 0 2%;
+  width: 98%;
 }
 .address .button {
   float: right;
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 3bc4dd36a..b2affd34d 100644
--- 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,7 +1,8 @@
 <mat-card style="padding: 12px;">
+    <p>Employement Information</p>
 <form [formGroup]="employmentForm" class="address">
     <mat-form-field>
-        <input matInput placeholder="Name of employer" formControlName="employer_name">
+        <input matInput placeholder="Name of Employer" formControlName="employer_name">
     </mat-form-field>
     <div>
         <label>Since how long working with this employer?</label>
@@ -22,6 +23,7 @@
             <mat-option value="no">No</mat-option>
         </mat-select>
     </mat-form-field>
+<<<<<<< HEAD
     <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="employmentForm.controls['was_met'].value == 'yes'">
         <mat-form-field>
             <input matInput placeholder="Name of person met" formControlName="name_person_met">
@@ -30,6 +32,11 @@
             <input matInput placeholder="Designation of person met" formControlName="designation_person_met">
         </mat-form-field>
     </div>
+=======
+    <mat-form-field *ngIf="employmentForm.controls['was_met'].value == 'yes'">
+        <input matInput placeholder="Name and designation of person met" formControlName="name_designation">
+    </mat-form-field>
+>>>>>>> 5c030410fe6ccc3b23a783988e739a66e93bf0ea
     <mat-form-field>
         <mat-select placeholder="Salary amount confirmed ?"
                     formControlName="confirm_salary">
@@ -41,7 +48,7 @@
         <input matInput placeholder="What is the salary amount confirmed?" formControlName="confirm_salary_amount">
     </mat-form-field>
     <mat-form-field>
-        <mat-select placeholder="Attendance Register  seen ?"
+        <mat-select placeholder="Attendance register  seen ?"
                     formControlName="attendance_seen">
             <mat-option value="yes">Yes</mat-option>
             <mat-option value="no">No</mat-option>
@@ -64,15 +71,20 @@
             </mat-form-field>
 
             <mat-form-field>
+<<<<<<< HEAD
                 <input matInput placeholder="Net Monthly Salary"
                        formControlName="net_monthly_salary">
+=======
+                <input matInput placeholder="Net Take Home"
+                       formControlName="net_take_home">
+>>>>>>> 5c030410fe6ccc3b23a783988e739a66e93bf0ea
             </mat-form-field>
             <mat-form-field>
-                <input matInput placeholder="Bonus or incentive"
+                <input matInput placeholder="Bonus or Incentive"
                        formControlName="bonus_incentive">
             </mat-form-field>
              <mat-form-field>
-                <input matInput placeholder="Any delays"
+                <input matInput placeholder="Any Delays"
                        formControlName="any_delays">
             </mat-form-field>
         </mat-card-content>
@@ -85,6 +97,9 @@
             </mat-form-field>
         </div>
     </div>
-    <button mat-raised-button type="submit" class="button" (click)="submitDetails()">Submit</button>
+    <div style="text-align: right;">
+        <button type="submit" class="mr-1 mb-1 hover-icon"  mat-raised-button mat-icon-button  matTooltip="Submit" matTooltipPosition="above"  (click)="submitDetails()"><mat-icon>save</mat-icon>
+        </button>
+     </div>    
 </form>
 </mat-card>
\ No newline at end of file
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 b002c681c..d1cfcc450 100644
--- 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
@@ -88,7 +88,7 @@
                             </mat-option>
                         </mat-select>
                     </mat-form-field>
-                    <mat-form-field>
+                    <mat-form-field *ngIf="members['controls'].occupation.value==3">
                         <input matInput placeholder="Retired From"
                                formControlName="retired">
                     </mat-form-field>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts
index 6b53a6e5c..f5c65ad57 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts
@@ -145,7 +145,7 @@ export class FamilyDetailsComponent implements OnInit {
         return this.fb.group({
             relationship: ['', Validators.compose([Validators.required])],
             occupation: ['', Validators.compose([Validators.required])],
-            retired: ['', Validators.compose([Validators.required])],
+            retired: [''],
         });
     }
 
@@ -194,31 +194,38 @@ export class FamilyDetailsComponent implements OnInit {
         if (!this.familyForm.valid) {
                 return;
         }
-        console.log('data', this.familyForm.value);
         let records: any = {};
         records.no_of_years = this.years.value;
-        if (this.ownership.value == 'Others') {
+        if (this.ownership.value == 4) {
             records.ownership_others = this.ownershipOther.value;
         }
         records.ownership = this.ownership.value;
         records.residence = this.residence.value;
-        if (this.ownership.value == 'Rented') {
+        if (this.ownership.value == 3) {
             records.what_rent = this.rent.value;
         }
-        if (this.person.value == 'Other') {
+        if (this.person.value == 8) {
             records.person_met_other = this.personOther.value;
         }
         records.person_met = this.person.value;
         records.family_members = this.members.value;
         records.earning_members = this.familyForm.controls['earningMembers'].value;
-        records.non_earning_members = this.familyForm.controls['nonEarningMembers'].value;
+       // filter retired conditions
+        let non_earning_members_filter = this.familyForm.controls['nonEarningMembers'].value.map(function(obj) {
+        if(obj.occupation==3){
+            return obj;
+        }
+        else{
+             obj.retired='';
+            return obj;
+        }
+        });
+        records.non_earning_members = non_earning_members_filter;
         records.family_details_form_remark = this.familyForm.controls['family_details_form_remark'].value;
         records.pdid = this.pdid;
         records.formid = '6';
         // records.fk_createdby = '251';
-        console.log('params', records);
         this._pd.saveForm(records).subscribe(data => {
-            console.log('data', data);
             this.notifier.notify('success', 'Saved Successfully.');
         }, error => {
             this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
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 720f89fc3..d8f448ac2 100644
--- 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
@@ -1,8 +1,9 @@
 <mat-card style="padding: 12px;">
+    <p>Financial Information</p>
     <form [formGroup]="financialForm" class="address">
         <mat-card>
             <mat-card-header>
-                <p>Data as per Financial statements<p>
+                <p>Data as Per Financial Statements<p>
             </mat-card-header>
             <div formArrayName="date_per_financial">
                 <div *ngFor="let details of financialForm.controls.date_per_financial['controls']; let i=index"
@@ -24,16 +25,16 @@
                             <input matInput [ngClass]="{'highlight': details.controls['financial_variation'].value >= 40 || details.controls['financial_variation'].value >= -40}" placeholder="Variation from Previous Year" formControlName="financial_variation">
                         </mat-form-field>
                         <mat-form-field>
-                            <input matInput placeholder="Reason for major difference" formControlName="financial_reason">
+                            <input matInput placeholder="Reason For Major Difference" formControlName="financial_reason">
                         </mat-form-field>
 
                         <button type="button" mat-raised-button mat-icon-button (click)="addDate()"
-                                *ngIf="i==0">
+                        matTooltip="Add More Financial Statements" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary" *ngIf="i==0">
                             <mat-icon>add</mat-icon>
                         </button>
                         <button type="button" mat-raised-button mat-icon-button (click)="deleteDate(i)"
-                                *ngIf="i>0">
-                            <mat-icon>close</mat-icon>
+                        matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" *ngIf="i>0">
+                            <mat-icon>delete</mat-icon>
                         </button>
                     </mat-card-content>
                 </div>
@@ -63,15 +64,15 @@
                             <input matInput [ngClass]="{'highlight': details.controls['estimate_variation'].value >= 40 || details.controls['estimate_variation'].value >= -40}" placeholder="Variation from Previous Year" formControlName="estimate_variation">
                         </mat-form-field>
                         <mat-form-field>
-                            <input matInput placeholder="Reason for major difference" formControlName="estimate_reason">
+                            <input matInput placeholder="Reason For Major Difference" formControlName="estimate_reason">
                         </mat-form-field>
                         <button type="button" mat-raised-button mat-icon-button (click)="addGoods()"
-                                *ngIf="i==0">
+                        matTooltip="Add More Estimated Value" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary"  *ngIf="i==0">
                             <mat-icon>add</mat-icon>
                         </button>
                         <button type="button" mat-raised-button mat-icon-button (click)="deleteGoods(i)"
-                                *ngIf="i>0">
-                            <mat-icon>close</mat-icon>
+                        matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon"    *ngIf="i>0">
+                            <mat-icon>delete</mat-icon>
                         </button>
                     </mat-card-content>
                 </div>
@@ -85,6 +86,9 @@
                 </mat-form-field>
             </div>
         </div>
-        <button mat-raised-button type="submit" class="button" (click)="submitDetails()">Submit</button>
+        <div style="text-align: right;">
+            <button type="submit" class="mr-1 mb-1 hover-icon"  mat-raised-button mat-icon-button  matTooltip="Submit" matTooltipPosition="above"  (click)="submitDetails()"><mat-icon>save</mat-icon>
+            </button>
+         </div> 
     </form>
 </mat-card>
\ No newline at end of file
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 efbc1400d..833488467 100644
--- 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
@@ -9,6 +9,7 @@
 }
 .matcard mat-form-field {
   margin: 0 2%;
+  width:26%
 }
 .address .button {
   float: right;
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 c696112c5..db7dbacfa 100644
--- 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,7 +1,8 @@
 <mat-card style="padding: 12px;">
+    <p>Loan Details</p>
 <form [formGroup]="loanDetailsForm" class="address">
     <mat-form-field>
-        <input matInput placeholder="Loan Amount applied" formControlName="loan_amount">
+        <input matInput placeholder="Loan Amount Applied" formControlName="loan_amount">
     </mat-form-field>
     <mat-form-field>
         <mat-select multiple (selectionChange)="endUserChange($event)" placeholder="What is the end use" formControlName="end_use">
@@ -20,33 +21,34 @@
         </mat-select>-->
     </mat-form-field>
     <mat-form-field *ngIf="isOtherPurpose">
-        <input matInput placeholder="Specify end use" formControlName="end_use_other">
+        <input matInput placeholder="Specify End Use" formControlName="end_use_other">
     </mat-form-field>
     <mat-form-field>
-        <mat-select placeholder="Is there a Balance Transfer"
+        <mat-select placeholder="Is there a balance transfer"
                     formControlName="is_transfer">
             <mat-option value="yes">Yes</mat-option>
             <mat-option value="no">No</mat-option>
         </mat-select>
     </mat-form-field>
-    <mat-form-field>
-        <mat-select  placeholder="Is there a Top/Up"
+    
+    <mat-form-field *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes'">
+            <input matInput placeholder="Balance Transfer Amount" formControlName="balance_transfer_amount">
+        </mat-form-field>
+    <mat-form-field *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes'">
+        <mat-select  placeholder="Is there a Top Up"
                     formControlName="is_topup">
             <mat-option value="yes">Yes</mat-option>
             <mat-option value="no">No</mat-option>
         </mat-select>
     </mat-form-field>
-    <mat-form-field *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes'">
-        <input matInput placeholder="Balance Transfer Amount" formControlName="balance_transfer_amount">
-    </mat-form-field>
-    <mat-form-field  *ngIf="loanDetailsForm.controls['is_topup'].value == 'yes'">
+    <mat-form-field  *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes' && loanDetailsForm.controls['is_topup'].value == 'yes'">
         <input matInput placeholder="Top Up Amt" formControlName="topup_amount">
     </mat-form-field>
-    <mat-form-field *ngIf="loanDetailsForm.controls['is_topup'].value == 'yes' || loanDetailsForm.controls['is_transfer'].value == 'yes'">
-        <input matInput placeholder="Lender from where Balance Transfer done" formControlName="lender">
+    <mat-form-field *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes'">
+        <input matInput placeholder="Lender from where balance transfer done" formControlName="lender">
     </mat-form-field>
     <mat-form-field>
-        <input matInput placeholder="Amount of own contribution" formControlName="own_contribution">
+        <input matInput placeholder="Amount of Own Contribution" formControlName="own_contribution">
     </mat-form-field>
 
     <mat-form-field>
@@ -62,10 +64,10 @@
         </mat-select>-->
     </mat-form-field>
     <mat-form-field *ngIf="loanDetailsForm.controls['source'].value =='other'">
-        <input matInput placeholder="Specify lender name and type" formControlName="lender_name_type">
+        <input matInput placeholder="Specify Lender Name and Type" formControlName="lender_name_type">
     </mat-form-field>
     <mat-form-field>
-        <input matInput placeholder="EMI comfort level" formControlName="emi_level">
+        <input matInput placeholder="EMI Comfort Level" formControlName="emi_level">
     </mat-form-field>
     <mat-card>
         <mat-card-header>
@@ -74,7 +76,7 @@
         </mat-card-header>
         <mat-card-content class="matcard">
             <mat-form-field>
-                <mat-select placeholder="Type of property" formControlName="property_type">
+                <mat-select placeholder="Type of Property" formControlName="property_type">
                     <mat-option *ngFor="let typeprop of m_mortageTypeProperty" [value]="typeprop.id">{{ typeprop.name }}</mat-option>
                 </mat-select>
                 
@@ -96,17 +98,17 @@
                 </mat-select>-->
             </mat-form-field>
             <mat-form-field *ngIf="loanDetailsForm.controls['property_type'].value =='others'">
-                <input matInput placeholder="Please specify type of property" formControlName="ownershipOther">
+                <input matInput placeholder="Specify Type of Property" formControlName="ownershipOther">
             </mat-form-field>
             <mat-form-field>
-                <mat-select multiple placeholder="Name of owner"
+                <mat-select multiple placeholder="Name of Owner"
                             formControlName="owner_name" (selectionChange)="ownerNameChange($event)">
                     <mat-option value="{{owner.pd_co_applicant_id}}" *ngFor="let owner of applicants">{{owner.applicant_name}}</mat-option>
                 </mat-select>
             </mat-form-field>
             <mat-form-field>
 
-                <mat-select placeholder="Status of construction" formControlName="construction_status">
+                <mat-select placeholder="Status of Construction" formControlName="construction_status">
                     <mat-option *ngFor="let status of m_statusofCunstruction" [value]="status.id">{{ status.name }}</mat-option>
                 </mat-select>
 
@@ -119,11 +121,11 @@
             </mat-form-field>
 
             <mat-form-field>
-                <input matInput placeholder="EMV as per customer"
+                <input matInput placeholder="EMV as Per Customer"
                        formControlName="emv_per_customer">
             </mat-form-field>
             <mat-form-field>
-                <input matInput placeholder="Value as per agreement"
+                <input matInput placeholder="Value as Per Agreement"
                        formControlName="value_per_agreement">
             </mat-form-field>
         </mat-card-content>
@@ -136,6 +138,9 @@
             </mat-form-field>
         </div>
     </div>
-    <button mat-raised-button type="submit" class="button" (click)="submitLoanDetails()">Submit</button>
+    <div style="text-align: right;">
+        <button type="submit" class="mr-1 mb-1 hover-icon"  mat-raised-button mat-icon-button  matTooltip="Submit" matTooltipPosition="above"  (click)="submitLoanDetails()"><mat-icon>save</mat-icon>
+        </button>
+     </div> 
 </form>
 </mat-card>
\ No newline at end of file
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 3a55530a2..d293f4b58 100644
--- 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,4 +1,5 @@
 <mat-card style="padding: 12px;">
+<p>Stock Details</p>
 <form [formGroup]="stockForm" class="address">
 
     <mat-card>
@@ -18,20 +19,20 @@
                     <mat-form-field>
                         <input matInput placeholder="Value" formControlName="raw_value">
                     </mat-form-field>
-                    <mat-form-field>
-                        <input matInput placeholder="Value of Rawmaterials as per Financial Statements" formControlName="rawmaterial_value">
+                    <mat-form-field style="width:76%">
+                        <input matInput placeholder="Value of raw materials as per financial Statements" formControlName="rawmaterial_value">
                     </mat-form-field>
-                    <mat-form-field>
-                        <input matInput placeholder="Is the Stock of Raw Materials Sufficient ?" formControlName="is_sufficiant_raw">
+                    <mat-form-field style="width:76%">
+                        <input matInput placeholder="Is the stock of raw materials sufficient ?" formControlName="is_sufficiant_raw">
                     </mat-form-field>
 
                     <button type="button" mat-raised-button mat-icon-button (click)="addRawMaterials()"
-                            *ngIf="i==0">
+                    matTooltip="Add More Raw Materials" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary"  *ngIf="i==0">
                         <mat-icon>add</mat-icon>
                     </button>
                     <button type="button" mat-raised-button mat-icon-button (click)="deleteRawMaterials(i)"
-                            *ngIf="i>0">
-                        <mat-icon>close</mat-icon>
+                    matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" *ngIf="i>0">
+                        <mat-icon>delete</mat-icon>
                     </button>
                 </mat-card-content>
             </div>
@@ -54,20 +55,20 @@
                     <mat-form-field>
                         <input matInput placeholder="Value" formControlName="goods_value">
                     </mat-form-field>
-                    <mat-form-field>
-                        <input matInput placeholder="Value of Finished Goods as per Financial Statements" formControlName="finished_goods_value">
+                    <mat-form-field style="width:76%">
+                        <input matInput placeholder="Value of finished goods as per financial statements" formControlName="finished_goods_value">
                     </mat-form-field>
-                    <mat-form-field>
-                        <input matInput placeholder="Is the Stock of Finished Goods Sufficient ?" formControlName="is_sufficiant_goods">
+                    <mat-form-field style="width:76%">
+                        <input matInput placeholder="Is the stock of finished goods sufficient ?" formControlName="is_sufficiant_goods">
                     </mat-form-field>
 
                     <button type="button" mat-raised-button mat-icon-button (click)="addGoods()"
-                            *ngIf="i==0">
+                    matTooltip="Add More Finished Goods" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary"  *ngIf="i==0">
                         <mat-icon>add</mat-icon>
                     </button>
                     <button type="button" mat-raised-button mat-icon-button (click)="deleteGoods(i)"
-                            *ngIf="i>0">
-                        <mat-icon>close</mat-icon>
+                    matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon"  *ngIf="i>0">
+                        <mat-icon>delete</mat-icon>
                     </button>
                 </mat-card-content>
             </div>
@@ -81,6 +82,10 @@
             </mat-form-field>
         </div>
     </div>
-    <button mat-raised-button type="submit" class="button" (click)="submitDetails()">Submit</button>
+    <div style="text-align: right;">
+        <button type="submit" class="mr-1 mb-1 hover-icon"  mat-raised-button mat-icon-button  matTooltip="Submit" matTooltipPosition="above"  (click)="submitDetails()"><mat-icon>save</mat-icon>
+        </button>
+     </div>
+     
 </form>
 </mat-card>
\ No newline at end of file
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 d70281fbc..aebcd79b4 100644
--- 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
@@ -89,7 +89,7 @@
     <div class="row" style="text-align:right;">
       <button mat-raised-button mat-icon-button mat-button color="primary" matTooltip="Add More Supplier Details" matTooltipPosition="above"
           class="mr-1 mb-1 hover-icon" (click)="addSupplierDetails($event); false"><mat-icon>add</mat-icon></button>
-      <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="reset"><mat-icon>settings_backup_restore</mat-icon></button>
+      <!----<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="reset"><mat-icon>settings_backup_restore</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>