diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
index 46efa23f7..4188d4851 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
@@ -81,13 +81,14 @@
                         <!-- <mat-error *ngIf="pdMain.fk_subproduct_id.hasError('required')">Sub Product Required.</mat-error> -->
     
                 </mat-form-field>   
+                <!-- {{customerSegmentList | json}} -->
                 <mat-form-field style="width: 32%">
                     <mat-select  placeholder="Customer Segment" formControlName="fk_customer_segment">
                             <mat-option>
                                     Select
                                      </mat-option>    
                         <mat-option *ngFor="let CSL of customerSegmentList" [value]="CSL.customer_segment_id" >
-                    {{CSL.customer_segment}}
+                    {{CSL.abbr}}
                             </mat-option>
                     </mat-select>
                     <!-- <mat-error *ngIf="pdMain.fk_customer_segment.hasError('required')">Customer Segment Required.</mat-error> -->
@@ -106,8 +107,9 @@
                     <!-- <mat-error *ngIf="pdMain.fk_pd_type.hasError('required')">PD Type Required.</mat-error> -->
     
             </mat-form-field>
-            <mat-form-field style="width: 24%">
-                            <input matInput placeholder="Loan Amount" formControlName="loan_amount" (keypress)="keyPress($event)">
+            <mat-form-field style="width: 32%">
+                            <input matInput placeholder="Loan Amount" formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,1)" required autocomplete="off">
+                            <mat-hint align="end" *ngIf="pdMain.loan_amount.value">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
                             <!-- <mat-error *ngIf="pdMain.loan_amount.hasError('required')">Amount Required.</mat-error> -->
                             <mat-error *ngIf="pdMain.loan_amount.hasError('pattern')">Enter valid amount. </mat-error>  
     
@@ -184,8 +186,9 @@
                                             <mat-error *ngIf="pdMain.mobile_no.hasError('maxlength') || pdMain.mobile_no.hasError('minlength')">Enter Valid Mobile Number. </mat-error>  
                                     </mat-form-field>
                                    
-                                   <mat-form-field style="width: 10%">
+                                   <mat-form-field style="width: 15%">
                                         <input matInput placeholder="STD Code" formControlName="stdcode" type="text" (keypress)="keyPress($event)">
+                                        <span matPrefix>+91</span>
                                         <mat-error *ngIf="pdMain.stdcode.hasError('maxlength') || pdMain.stdcode.hasError('minlength')">Enter Valid STD Code Number. </mat-error>  
                                     </mat-form-field> &nbsp; - &nbsp;
                                     <mat-form-field style="width: 20%">
@@ -264,14 +267,15 @@
                   <div fxFlex="30" align="end">
                         <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="button"
                         (click)="onReset()"><mat-icon>settings_backup_restore</mat-icon></button>
-                    <button  mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" (click)="saveDraftPD(_PDtriggerForm.value,draftStatus)" matTooltip="PD Draft" matTooltipPosition="above" type="button"><mat-icon>description</mat-icon></button> 
-                  <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="PD Process" matTooltipPosition="above" (click)="triggerPD(_PDtriggerForm.value,PDTriggerStatus)"><mat-icon>save</mat-icon></button>
+                    <button  mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" (click)="saveDraftPD(_PDtriggerForm.value,draftStatus)" matTooltip="Save as Draft" matTooltipPosition="above" type="button"><mat-icon>description</mat-icon></button> 
+                    <button  mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Trigger PD" matTooltipPosition="above" (click)="triggerPD(_PDtriggerForm.value,PDTriggerStatus)"><mat-icon>save</mat-icon></button>
                       </div>
                 
           </mat-card-actions>
            </form>
         </mat-card-content>
     </mat-card>
+<notifier-container></notifier-container>
             
          
           
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
index 8db401982..6c23033f2 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
@@ -33,6 +33,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
   billingList: any;
   relationShipList: any;
   errorMessage: any;
+  loanAmtInWords : any;
    // Dynamic co applicant
    createWithLongContent = false;
    dynamicCoApplicant = [];
@@ -272,6 +273,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
 
     // save pd in draft
     saveDraftPD(formValue: any, status:string){
+      alert('Inside The Draft PD');
       this.submitPdDetails(formValue, status);
     }
     //trigger  pd 
@@ -360,8 +362,11 @@ export class AddPdComponent implements OnInit, OnDestroy {
 
     // common function for both draft and process pd
     submitPdDetails(formValue: any, status:string) {
+      alert('Inside Function Submit Function');
       if(this._PDtriggerForm.invalid) {
-        this.validateAllFormFields(this._PDtriggerForm)
+        this.validateAllFormFields(this._PDtriggerForm);
+        alert('validationError');
+        console.log(this._PDtriggerForm);
         return;
       }
       else {
@@ -433,7 +438,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
        if(formValue.addtional_requirements.length > 0){
         pd_form.append("addtional_requirements",JSON.stringify(formValue.addtional_requirements))
 
-       }
+       } 
        this._pd.addPdDetails(pd_form).subscribe(result => {
          if (result.status == 200) {
            this.notifier.notify('success', 'PD Saved.');
@@ -490,4 +495,16 @@ validateAllFormFields(formGroup: any) {
   });
 } 
 
+/** To Convert Amount into Words  */
+inWords(e,flag:number){
+  switch(flag){
+  case 1 :
+      this.loanAmtInWords = this._pd.convertNumberToWords(e.target.value);    
+      break;
+  default:
+      break;
+}
+}
+
+
 }
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html
index beea70bd3..cdee436c6 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html
@@ -31,8 +31,9 @@
                             <input matInput placeholder="Mobile Number" formControlName="mobile_no" type="text" (keypress)="keyPress($event)" required>
                             <mat-error *ngIf="pdMainApplicant.mobile_no.hasError('maxlength') || pdMainApplicant.mobile_no.hasError('minlength')">Enter Valid Mobile Number. </mat-error>  
                 </mat-form-field>
-                <mat-form-field style="width: 10%">
+                <mat-form-field style="width: 15%">
                     <input matInput placeholder="STD Code" formControlName="stdcode" type="text" (keypress)="keyPress($event)">
+                    <span matPrefix>+91</span>
                     <mat-error *ngIf="pdMainApplicant.stdcode.hasError('maxlength') || pdMainApplicant.stdcode.hasError('minlength')">Enter Valid STD Code. </mat-error>  
           </mat-form-field> &nbsp;-&nbsp;
                 <mat-form-field style="width: 25%">
@@ -64,8 +65,9 @@
                         <input matInput placeholder="LandLine Number" formControlName="coapplicant_landline" type="text" (keypress)="keyPress($event)">
                         <mat-error *ngIf=" coDetails['controls'].coapplicant_landline.hasError('maxlength') || coDetails['controls'].coapplicant_landline.hasError('minlength')">Enter Valid Phone Number. </mat-error>  
                       </mat-form-field> -->
-                      <mat-form-field style="width: 10%">
+                      <mat-form-field style="width: 15%">
                         <input matInput placeholder="STD Code" formControlName="coapplicant_stdcode" type="text" (keypress)="keyPress($event)">
+                        <span matPrefix>+91</span>
                         <mat-error *ngIf="coDetails['controls'].coapplicant_stdcode.hasError('maxlength') || coDetails['controls'].coapplicant_stdcode.hasError('minlength')">Enter Valid STD Number. </mat-error>  
                     </mat-form-field> &nbsp;-&nbsp;
                     <mat-form-field style="width: 25%">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
index 04d9cd3a5..b0d4e742e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
@@ -71,7 +71,7 @@
                                                     <mat-select  placeholder="Customer Segment" formControlName="fk_customer_segment">
                                                                 <mat-option>Select</mat-option>    
                                                         <mat-option *ngFor="let CSL of customerSegmentList" [value]="CSL.customer_segment_id" >
-                                                    {{CSL.customer_segment}}
+                                                    <!-- {{CSL.customer_segment}} -->{{CSL.abbr}}
                                                             </mat-option>
                                                     </mat-select>
                                                     <!-- <mat-error *ngIf="pdMain.fk_customer_segment.hasError('required')">Customer Segment Required.</mat-error> -->
@@ -88,7 +88,9 @@
                                     
                                             </mat-form-field>
                                             <mat-form-field style="width: 24%">
-                                                            <input matInput placeholder="Loan Amount" formControlName="loan_amount">
+                                                            <!-- <input matInput placeholder="Loan Amount" formControlName="loan_amount"> -->
+                                                            <input matInput placeholder="Loan Amount" formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,1)" (change)="loanCalc()" required autocomplete="off">
+                                                            <mat-hint align="end" *ngIf="pdMain.loan_amount.value != ''">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
                                                             <!-- <mat-error *ngIf="pdMain.loan_amount.hasError('required')">Amount Required.</mat-error> -->
                                                             <mat-error *ngIf="pdMain.loan_amount.hasError('pattern')">Enter valid amount. </mat-error>  
                 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
index 38bfe29f5..2c8e9b102 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
@@ -26,6 +26,7 @@ export class EditPdMasterComponent implements OnInit {
   // PDTriggerStatus: string;
   enablePDButton: boolean;
   currentPDStatus: string;
+  loanAmtInWords : any;
   public _EditPDtriggerForm:FormGroup;
   public notifier: NotifierService;
   // create values for status check
@@ -43,6 +44,7 @@ export class EditPdMasterComponent implements OnInit {
     @Inject(MAT_DIALOG_DATA) public data: any) {
       this.notifier=notifier
       this.currentPDStatus = data.records.pd_status;
+      if(this.data.records.loan_amount){ this.loanAmtInWords = this._pd.convertNumberToWords(this.data.records.loan_amount); }
      }
 
   ngOnInit() {
@@ -279,6 +281,17 @@ validateAllFormFields(formGroup: any) {
       }
   });
 } 
+
+/** To Convert Amount into Words  */
+inWords(e,flag:number){
+  switch(flag){
+  case 1 :
+      this.loanAmtInWords = this._pd.convertNumberToWords(e.target.value);    
+      break;
+  default:
+      break;
+}
+}
   
 
 }
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 f25950d8d..2c8b9bc4f 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
@@ -249,10 +249,10 @@
                                                                 <mat-select formControlName="area_of_sale" placeholder="Area of Sale" (selectionChange)="changeManufacturingAreaSale(manufacturing,m)" required>
                                                                     <mat-option value="Within India">Within India</mat-option>
                                                                     <mat-option value="Export">Export</mat-option>
-                                                                    <!-- <mat-option value="Both">Both</mat-option> -->
+                                                                    <mat-option value="Both">Both</mat-option>
                                                                 </mat-select>
                                                             </mat-form-field>
-                                                            <ng-container *ngIf="manufacturing.value.india_where_sale_done !=undefined">
+                                                            <ng-container *ngIf="manufacturing.value.india_where_sale_done !=undefined && manufacturing.value.countries_where_export_done ==undefined">
                                                                <div formArrayName="india_where_sale_done">
                                                                 <div fxLayout="row nowrap"  *ngFor="let saleList of manufacturing.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
 
@@ -283,7 +283,7 @@
                                                             </div>
                                                             </ng-container>
                                                             
-                                                            <ng-container *ngIf="manufacturing.value.countries_where_export_done !=undefined">
+                                                            <ng-container *ngIf="manufacturing.value.countries_where_export_done !=undefined && manufacturing.value.india_where_sale_done ==undefined">
                                                                     <div formArrayName="countries_where_export_done">
                                                                             <div fxLayout="row nowrap"  *ngFor="let countryList of manufacturing.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
                                                                                     
@@ -305,6 +305,58 @@
                                                                             </div>
                                                                         </div>
                                                                 </ng-container>
+                                                                <ng-container *ngIf="manufacturing.value.countries_where_export_done !=undefined && manufacturing.value.india_where_sale_done !=undefined">
+                                                                        
+                                                                                            <mat-tab-group>
+                                                                                                <mat-tab label="Within India" formArrayName="india_where_sale_done">
+
+                                                                                                        <div fxLayout="row nowrap" class="tab_class" *ngFor="let saleList of manufacturing.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
+                                                                                                                <mat-form-field style="width:35%;">
+                                                                                                                        <mat-select  placeholder="State" formControlName="state_name" required>
+                                                                                                                            <mat-option *ngFor="let SL of stateList" [value]="SL.state_id">
+                                                                                                                                {{SL.state_name}}
+                                                                                                                            </mat-option>                                                            
+                                                                                                                        </mat-select>
+                                                                                                                    </mat-form-field>
+                                                                                                                    <mat-form-field style="width:45%;">
+                                                                                                                            <mat-select multiple formControlName="city_name" placeholder="City" required>
+                                                                                                                                <mat-option *ngFor="let CL of filterCity(stateList,saleList.value.state_name)" [value]="CL.city_id">{{CL.city_name}}</mat-option>
+                                                                                                                               
+                                                                                                                            </mat-select>
+                                                                                                                        </mat-form-field>
+                                                                
+                                                                                                                              <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addMoreState(m,'1')" *ngIf="s==0"
+                                                                                                                        matTooltip="Add More State" matTooltipPosition="right" color="primary">
+                                                                                                                            <mat-icon>add</mat-icon>
+                                                                                                                        </button> 
+                                                                                                                        <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeState(m,s,'1')" *ngIf="s>0"
+                                                                                                                        matTooltip="Remove State" matTooltipPosition="right">
+                                                                                                                            <mat-icon>delete</mat-icon>
+                                                                                                                        </button>
+                                                                                                    </div>
+                                                                                                </mat-tab>
+                                                                                                <mat-tab label="Export" formArrayName="countries_where_export_done">
+                                                                                                        <div fxLayout="row nowrap" class="tab_class" *ngFor="let countryList of manufacturing.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
+                                                                                                                <mat-form-field style="width:35%;">
+                                                                                                                        <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" >
+                                                                                                                    </mat-form-field>
+                                                                                                                    <mat-form-field style="width:45%;">
+                                                                                                                            <input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required>
+                                                                                                                        </mat-form-field>
+                                                                                                                        
+                                                                                                                        <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addMoreState(m,'2')" *ngIf="c==0"
+                                                                                                                        matTooltip="Add More Country" matTooltipPosition="right" color="primary">
+                                                                                                                            <mat-icon>add</mat-icon>
+                                                                                                                        </button> 
+                                                                                                                        <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeState(m,c,'2')" *ngIf="c>0"
+                                                                                                                        matTooltip="Remove Country" matTooltipPosition="right">
+                                                                                                                            <mat-icon>delete</mat-icon>
+                                                                                                                        </button>
+                                                                                                                        </div>
+                                                                                                </mat-tab>
+                                                                                              </mat-tab-group>
+                                                                                
+                                                                    </ng-container>
 
                                                 </mat-card-content>
                                                 <mat-card-actions>
@@ -337,10 +389,10 @@
                                                                 <mat-select formControlName="area_of_sale" placeholder="Area of Sale" (selectionChange)="changeRetailAreaSale(retail,r)" required>
                                                                     <mat-option value="Within India">Within India</mat-option>
                                                                     <mat-option value="Export">Export</mat-option>
-                                                                    <!-- <mat-option value="Both">Both</mat-option> -->
+                                                                    <mat-option value="Both">Both</mat-option>
                                                                 </mat-select>
                                                             </mat-form-field>
-                                                            <ng-container *ngIf="retail.value.india_where_sale_done !=undefined">
+                                                            <ng-container *ngIf="retail.value.india_where_sale_done !=undefined && retail.value.countries_where_export_done ==undefined">
                                                                <div formArrayName="india_where_sale_done">
                                                                 <div fxLayout="row nowrap"  *ngFor="let saleList of retail.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
 
@@ -371,7 +423,7 @@
                                                             </div>
                                                             </ng-container>
                                                             
-                                                            <ng-container *ngIf="retail.value.countries_where_export_done !=undefined">
+                                                            <ng-container *ngIf="retail.value.india_where_sale_done ==undefined && retail.value.countries_where_export_done !=undefined">
                                                                     <div formArrayName="countries_where_export_done">
                                                                             <div fxLayout="row nowrap"  *ngFor="let countryList of retail.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
                                                                                     
@@ -394,6 +446,59 @@
                                                                         </div>
                                                                 </ng-container>
 
+                                                                <ng-container *ngIf="retail.value.countries_where_export_done !=undefined && retail.value.india_where_sale_done !=undefined">
+                                                                        
+                                                                        <mat-tab-group>
+                                                                            <mat-tab label="Within India" formArrayName="india_where_sale_done">
+
+                                                                                    <div fxLayout="row nowrap" class="tab_class" *ngFor="let saleList of retail.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
+                                                                                            <mat-form-field style="width:35%;">
+                                                                                                    <mat-select  placeholder="State" formControlName="state_name" required>
+                                                                                                        <mat-option *ngFor="let SL of stateList" [value]="SL.state_id">
+                                                                                                            {{SL.state_name}}
+                                                                                                        </mat-option>                                                            
+                                                                                                    </mat-select>
+                                                                                                </mat-form-field>
+                                                                                                <mat-form-field style="width:45%;">
+                                                                                                        <mat-select multiple formControlName="city_name" placeholder="City" required>
+                                                                                                            <mat-option *ngFor="let CL of filterCity(stateList,saleList.value.state_name)" [value]="CL.city_id">{{CL.city_name}}</mat-option>
+                                                                                                           
+                                                                                                        </mat-select>
+                                                                                                    </mat-form-field>
+                                            
+                                                                                                          <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addRetailMoreState(r,'1')" *ngIf="s==0"
+                                                                                                    matTooltip="Add More State" matTooltipPosition="right" color="primary">
+                                                                                                        <mat-icon>add</mat-icon>
+                                                                                                    </button> 
+                                                                                                    <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeRetailState(r,s,'1')" *ngIf="s>0"
+                                                                                                    matTooltip="Remove State" matTooltipPosition="right">
+                                                                                                        <mat-icon>delete</mat-icon>
+                                                                                                    </button>
+                                                                                </div>
+                                                                            </mat-tab>
+                                                                            <mat-tab label="Export" formArrayName="countries_where_export_done">
+                                                                                    <div fxLayout="row nowrap" class="tab_class" *ngFor="let countryList of retail.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
+                                                                                            <mat-form-field style="width:35%;">
+                                                                                                    <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" >
+                                                                                                </mat-form-field>
+                                                                                                <mat-form-field style="width:45%;">
+                                                                                                        <input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required>
+                                                                                                    </mat-form-field>
+                                                                                                    
+                                                                                                    <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addRetailMoreState(r,'2')" *ngIf="c==0"
+                                                                                                    matTooltip="Add More Country" matTooltipPosition="right" color="primary">
+                                                                                                        <mat-icon>add</mat-icon>
+                                                                                                    </button> 
+                                                                                                    <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeRetailState(r,c,'2')" *ngIf="c>0"
+                                                                                                    matTooltip="Remove Country" matTooltipPosition="right">
+                                                                                                        <mat-icon>delete</mat-icon>
+                                                                                                    </button>
+                                                                                                    </div>
+                                                                            </mat-tab>
+                                                                          </mat-tab-group>
+                                                            
+                                                                </ng-container>
+
                                                 </mat-card-content>
                                                 <mat-card-actions>
                                                         <mat-form-field style="width: 92%">
@@ -425,10 +530,10 @@
                                                                 <mat-select formControlName="area_of_sale" placeholder="Area of Sale" (selectionChange)="changeWholesaleAreaSale(wholesale,w)" required>
                                                                     <mat-option value="Within India">Within India</mat-option>
                                                                     <mat-option value="Export">Export</mat-option>
-                                                                    <!-- <mat-option value="Both">Both</mat-option> -->
+                                                                    <mat-option value="Both">Both</mat-option>
                                                                 </mat-select>
                                                             </mat-form-field>
-                                                            <ng-container *ngIf="wholesale.value.india_where_sale_done !=undefined">
+                                                            <ng-container *ngIf="wholesale.value.india_where_sale_done !=undefined && wholesale.value.countries_where_export_done ==undefined">
                                                                <div formArrayName="india_where_sale_done">
                                                                 <div fxLayout="row nowrap"  *ngFor="let saleList of wholesale.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
 
@@ -459,7 +564,7 @@
                                                             </div>
                                                             </ng-container>
                                                             
-                                                            <ng-container *ngIf="wholesale.value.countries_where_export_done !=undefined">
+                                                            <ng-container *ngIf="wholesale.value.india_where_sale_done ==undefined && wholesale.value.countries_where_export_done !=undefined">
                                                                     <div formArrayName="countries_where_export_done">
                                                                             <div fxLayout="row nowrap"  *ngFor="let countryList of wholesale.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
                                                                                     
@@ -481,6 +586,58 @@
                                                                             </div>
                                                                         </div>
                                                                 </ng-container>
+                                                                <ng-container *ngIf="wholesale.value.countries_where_export_done !=undefined && wholesale.value.india_where_sale_done !=undefined">
+                                                                        
+                                                                        <mat-tab-group>
+                                                                            <mat-tab label="Within India" formArrayName="india_where_sale_done">
+
+                                                                                    <div fxLayout="row nowrap" class="tab_class" *ngFor="let saleList of wholesale.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
+                                                                                            <mat-form-field style="width:35%;">
+                                                                                                    <mat-select  placeholder="State" formControlName="state_name" required>
+                                                                                                        <mat-option *ngFor="let SL of stateList" [value]="SL.state_id">
+                                                                                                            {{SL.state_name}}
+                                                                                                        </mat-option>                                                            
+                                                                                                    </mat-select>
+                                                                                                </mat-form-field>
+                                                                                                <mat-form-field style="width:45%;">
+                                                                                                        <mat-select multiple formControlName="city_name" placeholder="City" required>
+                                                                                                            <mat-option *ngFor="let CL of filterCity(stateList,saleList.value.state_name)" [value]="CL.city_id">{{CL.city_name}}</mat-option>
+                                                                                                           
+                                                                                                        </mat-select>
+                                                                                                    </mat-form-field>
+                                            
+                                                                                                          <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addWholesaleMoreState(w,'1')" *ngIf="s==0"
+                                                                                                    matTooltip="Add More State" matTooltipPosition="right" color="primary">
+                                                                                                        <mat-icon>add</mat-icon>
+                                                                                                    </button> 
+                                                                                                    <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeWholesaleState(w,s,'1')" *ngIf="s>0"
+                                                                                                    matTooltip="Remove State" matTooltipPosition="right">
+                                                                                                        <mat-icon>delete</mat-icon>
+                                                                                                    </button>
+                                                                                </div>
+                                                                            </mat-tab>
+                                                                            <mat-tab label="Export" formArrayName="countries_where_export_done">
+                                                                                    <div fxLayout="row nowrap" class="tab_class" *ngFor="let countryList of wholesale.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
+                                                                                            <mat-form-field style="width:35%;">
+                                                                                                    <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" >
+                                                                                                </mat-form-field>
+                                                                                                <mat-form-field style="width:45%;">
+                                                                                                        <input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required>
+                                                                                                    </mat-form-field>
+                                                                                                    
+                                                                                                    <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addWholesaleMoreState(w,'2')" *ngIf="c==0"
+                                                                                                    matTooltip="Add More Country" matTooltipPosition="right" color="primary">
+                                                                                                        <mat-icon>add</mat-icon>
+                                                                                                    </button> 
+                                                                                                    <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeWholesaleState(w,c,'2')" *ngIf="c>0"
+                                                                                                    matTooltip="Remove Country" matTooltipPosition="right">
+                                                                                                        <mat-icon>delete</mat-icon>
+                                                                                                    </button>
+                                                                                                    </div>
+                                                                            </mat-tab>
+                                                                          </mat-tab-group>
+                                                            
+                                                                </ng-container>
 
                                                 </mat-card-content>
                                                 <mat-card-actions>
@@ -513,10 +670,10 @@
                                                                 <mat-select formControlName="area_of_sale" placeholder="Area of Service" (selectionChange)="changeServiceArea(serviceprovider,sp)" required>
                                                                     <mat-option value="Within India">Within India</mat-option>
                                                                     <mat-option value="Export">Export</mat-option>
-                                                                    <!-- <mat-option value="Both">Both</mat-option> -->
+                                                                    <mat-option value="Both">Both</mat-option>
                                                                 </mat-select>
                                                             </mat-form-field>
-                                                            <ng-container *ngIf="serviceprovider.value.india_where_sale_done !=undefined">
+                                                            <ng-container *ngIf="serviceprovider.value.india_where_sale_done !=undefined && serviceprovider.value.countries_where_export_done ==undefined">
                                                                <div formArrayName="india_where_sale_done">
                                                                 <div fxLayout="row nowrap"  *ngFor="let saleList of serviceprovider.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
 
@@ -547,7 +704,7 @@
                                                             </div>
                                                             </ng-container>
                                                             
-                                                            <ng-container *ngIf="serviceprovider.value.countries_where_export_done !=undefined">
+                                                            <ng-container *ngIf="serviceprovider.value.countries_where_export_done !=undefined && serviceprovider.value.india_where_sale_done ==undefined">
                                                                     <div formArrayName="countries_where_export_done">
                                                                             <div fxLayout="row nowrap"  *ngFor="let countryList of serviceprovider.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
                                                                                     
@@ -569,6 +726,59 @@
                                                                             </div>
                                                                         </div>
                                                                 </ng-container>
+                                                                <ng-container *ngIf="serviceprovider.value.countries_where_export_done !=undefined && serviceprovider.value.india_where_sale_done !=undefined">
+                                                                        
+                                                                        <mat-tab-group>
+                                                                            <mat-tab label="Within India" formArrayName="india_where_sale_done">
+
+                                                                                    <div fxLayout="row nowrap" class="tab_class" *ngFor="let saleList of serviceprovider.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
+                                                                                            <mat-form-field style="width:35%;">
+                                                                                                    <mat-select  placeholder="Where, In India, Is The Service Provided" formControlName="state_name" required>
+                                                                                                        <mat-option *ngFor="let SL of stateList" [value]="SL.state_id">
+                                                                                                            {{SL.state_name}}
+                                                                                                        </mat-option>                                                            
+                                                                                                    </mat-select>
+                                                                                                </mat-form-field>
+                                                                                                <mat-form-field style="width:45%;">
+                                                                                                        <mat-select multiple formControlName="city_name" placeholder="City" required>
+                                                                                                            <mat-option *ngFor="let CL of filterCity(stateList,saleList.value.state_name)" [value]="CL.city_id">{{CL.city_name}}</mat-option>
+                                                                                                           
+                                                                                                        </mat-select>
+                                                                                                    </mat-form-field>
+                                                                                                    
+                                                                                                    
+                                                                                                          <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addServiceMoreState(sp,'1')" *ngIf="s==0"
+                                                                                                    matTooltip="Add More State" matTooltipPosition="right" color="primary">
+                                                                                                        <mat-icon>add</mat-icon>
+                                                                                                    </button> 
+                                                                                                    <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeServiceState(sp,s,'1')" *ngIf="s>0"
+                                                                                                    matTooltip="Remove State" matTooltipPosition="right">
+                                                                                                        <mat-icon>delete</mat-icon>
+                                                                                                    </button>
+                                                                                </div>
+                                                                            </mat-tab>
+                                                                            <mat-tab label="Export" formArrayName="countries_where_export_done">
+                                                                                    <div fxLayout="row nowrap" class="tab_class" *ngFor="let countryList of serviceprovider.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
+                                                                                            <mat-form-field style="width:35%;">
+                                                                                                    <input matInput placeholder="Countries Where Services Are Being Exported" formControlName="country_name" >
+                                                                                                </mat-form-field>
+                                                                                                <mat-form-field style="width:45%;">
+                                                                                                        <input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required>
+                                                                                                    </mat-form-field>
+                                                                                                    
+                                                                                                    <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addServiceMoreState(sp,'2')" *ngIf="c==0"
+                                                                                                    matTooltip="Add More Country" matTooltipPosition="right" color="primary">
+                                                                                                        <mat-icon>add</mat-icon>
+                                                                                                    </button> 
+                                                                                                    <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeServiceState(sp,c,'2')" *ngIf="c>0"
+                                                                                                    matTooltip="Remove Country" matTooltipPosition="right">
+                                                                                                        <mat-icon>delete</mat-icon>
+                                                                                                    </button>
+                                                                                                    </div>
+                                                                            </mat-tab>
+                                                                          </mat-tab-group>
+                                                            
+                                                                </ng-container>
 
                                                 </mat-card-content>
                                                 <mat-card-actions>
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 647e45ba4..a656a6bd9 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
@@ -132,4 +132,7 @@ mat-header-cell mat-cell {
   .example-margin {
     margin: 0 10px;
   }
+  .tab_class {
+      margin-top: 3%;
+  }
 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
index 19d62f38a..520dec67e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
@@ -247,6 +247,19 @@ export class BusinessInfoComponent implements OnInit {
                              innercontrol.push(this.createCountrySale())
                          });
                         }
+                        else if(element.area_of_sale=='Both'){
+                            manufacturingControl.controls[index].addControl('india_where_sale_done', this.fb.array([]));
+                            element.india_where_sale_done.forEach((innerElement,innerIndex) => {
+                             let innercontrol:any = manufacturingControl.controls[index].get('india_where_sale_done') as FormArray;
+                             innercontrol.push(this.createStateSale())
+                         });
+                         manufacturingControl.controls[index].addControl('countries_where_export_done', this.fb.array([]));
+                         element.countries_where_export_done.forEach((innerElement,innerIndex) => {
+                          let innercontrol:any = manufacturingControl.controls[index].get('countries_where_export_done') as FormArray;
+                          innercontrol.push(this.createCountrySale())
+                      });
+                         
+                        }
                     });
                     businessVal.manufacturing_activity_details=selectedManufacturing;
                 }
@@ -280,6 +293,18 @@ export class BusinessInfoComponent implements OnInit {
                              innercontrol.push(this.createCountrySale())
                          });
                         }
+                        else if(element.area_of_sale=='Both'){
+                            retailControl.controls[index].addControl('india_where_sale_done', this.fb.array([]));
+                            element.india_where_sale_done.forEach((innerElement,innerIndex) => {
+                             let innercontrol:any = retailControl.controls[index].get('india_where_sale_done') as FormArray;
+                             innercontrol.push(this.createStateSale())
+                         });
+                         retailControl.controls[index].addControl('countries_where_export_done', this.fb.array([]));
+                         element.countries_where_export_done.forEach((innerElement,innerIndex) => {
+                          let innercontrol:any = retailControl.controls[index].get('countries_where_export_done') as FormArray;
+                          innercontrol.push(this.createCountrySale())
+                      });
+                        }
                     });
                     businessVal.retail_trading_activity_details=selectedRetail;
                 }
@@ -314,6 +339,19 @@ export class BusinessInfoComponent implements OnInit {
                              innercontrol.push(this.createCountrySale())
                          });
                         }
+                        else if(element.area_of_sale=='Both'){
+                            wholesaleControl.controls[index].addControl('india_where_sale_done', this.fb.array([]));
+                            element.india_where_sale_done.forEach((innerElement,innerIndex) => {
+                             let innercontrol:any = wholesaleControl.controls[index].get('india_where_sale_done') as FormArray;
+                             innercontrol.push(this.createStateSale())
+                         });
+                         wholesaleControl.controls[index].addControl('countries_where_export_done', this.fb.array([]));
+                         element.countries_where_export_done.forEach((innerElement,innerIndex) => {
+                          let innercontrol:any = wholesaleControl.controls[index].get('countries_where_export_done') as FormArray;
+                          innercontrol.push(this.createCountrySale())
+                      });
+                        }
+                        
                     });
                     businessVal.wholesale_trading_activity_details=selectedWholesale;
                 }
@@ -348,6 +386,18 @@ export class BusinessInfoComponent implements OnInit {
                              innercontrol.push(this.createCountrySale())
                          });
                         }
+                        else if(element.area_of_sale=='Both'){
+                            serviceProviderControl.controls[index].addControl('india_where_sale_done', this.fb.array([]));
+                            element.india_where_sale_done.forEach((innerElement,innerIndex) => {
+                             let innercontrol:any = serviceProviderControl.controls[index].get('india_where_sale_done') as FormArray;
+                             innercontrol.push(this.createStateSale())
+                         });
+                         serviceProviderControl.controls[index].addControl('countries_where_export_done', this.fb.array([]));
+                            element.countries_where_export_done.forEach((innerElement,innerIndex) => {
+                             let innercontrol:any = serviceProviderControl.controls[index].get('countries_where_export_done') as FormArray;
+                             innercontrol.push(this.createCountrySale())
+                         });
+                        }
                     });
                     businessVal.service_provider_activity_details=selectedService;
                 }
@@ -566,12 +616,20 @@ export class BusinessInfoComponent implements OnInit {
 
         if(getDetails.value.area_of_sale=="Within India"){
             control.controls[getIndex].removeControl('countries_where_export_done');
+            control.controls[getIndex].removeControl('india_where_sale_done');
             control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()]));
         }
         else if(getDetails.value.area_of_sale=="Export"){
+            control.controls[getIndex].removeControl('countries_where_export_done');
             control.controls[getIndex].removeControl('india_where_sale_done');
             control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()]));
         }
+        else if(getDetails.value.area_of_sale=="Both") {
+            control.controls[getIndex].removeControl('india_where_sale_done');
+            control.controls[getIndex].removeControl('countries_where_export_done');
+            control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()]));
+            control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()]));
+        }
     }
 
     // change retail options
@@ -580,10 +638,18 @@ export class BusinessInfoComponent implements OnInit {
 
         if(getDetails.value.area_of_sale=="Within India"){
             control.controls[getIndex].removeControl('countries_where_export_done');
+            control.controls[getIndex].removeControl('india_where_sale_done');
             control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()]));
         }
         else if(getDetails.value.area_of_sale=="Export"){
+            control.controls[getIndex].removeControl('countries_where_export_done');
+            control.controls[getIndex].removeControl('india_where_sale_done');            
+            control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()]));
+        }
+        else if(getDetails.value.area_of_sale=="Both"){
+            control.controls[getIndex].removeControl('countries_where_export_done');
             control.controls[getIndex].removeControl('india_where_sale_done');
+            control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()]));
             control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()]));
         }
     }
@@ -594,12 +660,20 @@ export class BusinessInfoComponent implements OnInit {
 
         if(getDetails.value.area_of_sale=="Within India"){
             control.controls[getIndex].removeControl('countries_where_export_done');
+            control.controls[getIndex].removeControl('india_where_sale_done');
             control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()]));
         }
         else if(getDetails.value.area_of_sale=="Export"){
+            control.controls[getIndex].removeControl('countries_where_export_done');
             control.controls[getIndex].removeControl('india_where_sale_done');
             control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()]));
         }
+        else if(getDetails.value.area_of_sale=="Both"){
+            control.controls[getIndex].removeControl('countries_where_export_done');
+            control.controls[getIndex].removeControl('india_where_sale_done');
+            control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()]));
+            control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()]));
+        }
     }
     // change service provider 
     changeServiceArea(getDetails: any, getIndex) {
@@ -607,11 +681,19 @@ export class BusinessInfoComponent implements OnInit {
 
         if(getDetails.value.area_of_sale=="Within India"){
             control.controls[getIndex].removeControl('countries_where_export_done');
+            control.controls[getIndex].removeControl('india_where_sale_done');
             control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()]));
         }
         else if(getDetails.value.area_of_sale=="Export"){
+            control.controls[getIndex].removeControl('countries_where_export_done');
             control.controls[getIndex].removeControl('india_where_sale_done');
-            control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([this.createCountrySale()]));
+            control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()]));
+        }
+        else if(getDetails.value.area_of_sale=="Both"){
+            control.controls[getIndex].removeControl('countries_where_export_done');
+            control.controls[getIndex].removeControl('india_where_sale_done');
+            control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()]));
+            control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()]));
         }
     }
 
@@ -715,6 +797,7 @@ export class BusinessInfoComponent implements OnInit {
             control = control.controls[windex].get('countries_where_export_done') as FormArray;
             control.push(this.createCountrySale())
         }
+
     }
     // remove  for whole sale
     removeWholesaleState(mindex,sindex,type) {
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/dialogue/other-applicant-details/other-applicant-details.component.html
similarity index 80%
rename from ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.html
rename to ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.html
index 6433832c0..ff4bce671 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/dialogue/other-applicant-details/other-applicant-details.component.html
@@ -20,7 +20,7 @@
     
     </mat-dialog-content>
     <mat-dialog-actions align="end">
-        <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Save" matTooltipPosition="above" (click)="addMoreApplicant()"><mat-icon>add</mat-icon></button>
-            <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Save" matTooltipPosition="above" (click)="saveApplicant(_OtherForm.value)"><mat-icon>save</mat-icon></button>
+        <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Add More" matTooltipPosition="above" (click)="addMoreApplicant()"><mat-icon>add</mat-icon></button>
+            <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Add List" matTooltipPosition="above" (click)="saveApplicant(_OtherForm.value)"><mat-icon>save</mat-icon></button>
     </mat-dialog-actions>
     
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/dialogue/other-applicant-details/other-applicant-details.component.scss
similarity index 100%
rename from ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.scss
rename to ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.scss
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.spec.ts
similarity index 100%
rename from ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.spec.ts
rename to ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.spec.ts
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts
similarity index 100%
rename from ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component.ts
rename to ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts
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 25f21ceb7..866e9d4c6 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
@@ -15,12 +15,14 @@
               </mat-card-header>
                 <mat-card-content>
                   <div fxLayout="row wrap" class="example-section" formArrayName="applicant_list">
-                    <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25" *ngFor="let applicant of _generalForm.controls.applicant_list['controls']; let c = index;" [formGroupName]="c">
+                    <div fxFlex.xs="100" fxFlex.sm="50" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25" *ngFor="let applicant of _generalForm.controls.applicant_list['controls']; let c = index;" [formGroupName]="c">
                         <mat-checkbox class="example-margin" color="primary" formControlName="exist_status" (change)="checkboxChange($event, c, applicant.controls)">{{applicant.controls.applicant_name.value}}</mat-checkbox>
-
                     </div>
                   </div>
                 </mat-card-content>
+                <mat-card-actions align="end">
+                    <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Add Other Applicant" matTooltipPosition="above" color="primary" (click)="addOtherApplicant()"><mat-icon>add</mat-icon></button>
+                </mat-card-actions>
             </mat-card>
 
             <mat-card>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
index 7f18d0981..4981b675a 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
@@ -3,7 +3,7 @@ import { FormBuilder, FormGroup, Validators, FormControl, FormArray } from '@ang
 import { MatDialog, MatDialogRef, MAT_DIALOG_DATA , DialogPosition} from '@angular/material';
 import { NotifierService } from 'angular-notifier';
 import { PdTrigerService } from './../../../../../pd-service/pd-triger.service';
-import {OtherApplicantDetailsComponent} from './../other-applicant-details/other-applicant-details.component';
+import {OtherApplicantDetailsComponent} from './../dialogue/other-applicant-details/other-applicant-details.component';
 @Component({
   selector: 'app-general-info',
   templateUrl: './general-info.component.html',
@@ -27,7 +27,7 @@ export class GeneralInfoComponent implements OnInit {
     this.form_id = 18;
     this.pd_applicants_details = this.pd_all_details.pdapplicants_detials;
     // push Other options to applicant details
-    this.pd_applicants_details.push({'pd_co_applicant_id':"0",'applicant_name':'Others',    });
+   // this.pd_applicants_details.push({'pd_co_applicant_id':"0",'applicant_name':'Others',    });
    }
 
   ngOnInit() {
@@ -147,37 +147,11 @@ export class GeneralInfoComponent implements OnInit {
       // checkand un check function
       checkboxChange(event, index, item) {     
         if(item.exist_status.value){
-          if(item.pd_co_applicant_id.value==0){
-            const dialogRef = this.dialog.open(OtherApplicantDetailsComponent, {
-              data: '',
-              width:'40%',
-              disableClose: true
-            });
-            dialogRef.afterClosed()
-            .subscribe(dataresult => {
-              if(dataresult.data.length>0){
-                let relationControl = <FormArray>this._generalForm.controls['applicant_relation'];
-                dataresult.data.forEach(element => {
-                  let applicant_details: any= {'pd_co_applicant_id':element.pd_co_applicant_id,'applicant_name':element.applicant_name,'applicant_relation_to':'','relation':'','company_name':element.company_name,'company_relation':''};
-                relationControl.push(this.createApplicantRelation(applicant_details));
-                // push related to details
-                this.fetch_related_details.push(element.applicant_name);
-                });
-                
-              }
-        
-             
-             // exist_status
-            });
-            
-          }
-          else{
             let relationControl = <FormArray>this._generalForm.controls['applicant_relation'];
           let applicant_details: any= {'pd_co_applicant_id':item.pd_co_applicant_id.value,'applicant_name':item.applicant_name.value,'applicant_relation_to':'','relation':'','company_name':item.company_name.value,'company_relation':''};
           relationControl.push(this.createApplicantRelation(applicant_details));
          // push related to details
           this.fetch_related_details.push(item.applicant_name.value);
-          }
          
         }
         else {
@@ -192,6 +166,30 @@ export class GeneralInfoComponent implements OnInit {
       }
     }
 
+    // add more applicant details
+    addOtherApplicant() {     
+        const dialogRef = this.dialog.open(OtherApplicantDetailsComponent, {
+            data: '',
+            width:'40%',
+            disableClose: true
+          });
+          dialogRef.afterClosed()
+          .subscribe(dataresult => {
+            if(dataresult.data.length>0){
+              let relationControl = <FormArray>this._generalForm.controls['applicant_relation'];
+              dataresult.data.forEach(element => {
+                let applicant_details: any= {'pd_co_applicant_id':element.pd_co_applicant_id,'applicant_name':element.applicant_name,'applicant_relation_to':'','relation':'','company_name':element.company_name,'company_relation':''};
+              relationControl.push(this.createApplicantRelation(applicant_details));
+              // push related to details
+              this.fetch_related_details.push(element.applicant_name);
+              });
+              
+            }
+          });
+          
+      }
+
+
     // remove other details
     removeOthers(index, item: any){
       console.log(item)
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
index 87a3a1ddf..48043d646 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
@@ -35,7 +35,7 @@
      </mat-card>
       
  <mat-card-content>
-     <div fxLayout="row wrap">
+  <div fxLayout="row wrap">
 
      <div class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
          <!--pd master  -->
@@ -64,13 +64,11 @@
                <p><span>{{master.addressline1}}</span></p>    
                <p *ngIf="master.remarks"><span style="font-size:13px;"> Remarks : </span> <span style="color:red">{{master.remarks}}</span></p>        
              </mat-card-content>
-           </mat-card>
-                   
-         
-       </div>
-       <div fxFlex.xs="100" class="m-gap p-gap" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
+       </mat-card>
+     </div>
+     <div fxFlex.xs="100" class="m-gap p-gap" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
            <!-- applicant card  -->
-         <mat-card  class="minheight">
+           <mat-card  class="minheight">
                <div class="cardEdit" *ngIf="currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED">
                    <button mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editPdApplicant(pdApplicantData)"><mat-icon>edit</mat-icon></button>
                  </div>
@@ -91,7 +89,7 @@
                       </span> &nbsp;&nbsp;&nbsp;
                       <span *ngIf="applicant.landline != '' && applicant.landline != 'null-null' && applicant.landline != null " class="mb-2 text-center hover-icon">
                         <i class="fa-1x fa fa-phone"></i>
-                             &nbsp;{{applicant.landline}} 
+                        &nbsp;<span matPrefix>+91</span>{{applicant.landline}} 
                       </span>
                       <br><span *ngIf="applicant.applicant_type=='1';else codetails" style="font-size:12px;">Main Applicant </span> 
                   <ng-template #codetails><span>{{applicant.relation_name}}</span></ng-template>
@@ -101,10 +99,10 @@
              </mat-card-content>
              <ng-template #noApplicant><mat-card-content><p>No Applicant</p></mat-card-content></ng-template>                
            </mat-card>                          
-         </div>
-         <div fxFlex.xs="100" class="m-gap p-gap" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="100" fxFlex.xl="100">
+     </div>
+     <div fxFlex.xs="100" class="m-gap p-gap" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="100" fxFlex.xl="100">
             <!-- applicant card  -->
-          <mat-card  class="minheight">
+            <mat-card  class="minheight">
                 <div class="cardEdit" *ngIf="currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED">
                     <button mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editAdditionalRequirement(pdAdditionalReqData)"><mat-icon>edit</mat-icon></button>
                   </div>
@@ -121,13 +119,8 @@
               </mat-card-content>
               <ng-template #noRequirement><mat-card-content><p>No Additional Requirements</p></mat-card-content></ng-template>                
             </mat-card>   
-
-            
-            
-            
-          </div>
-         
-           <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50" class="m-gap p-gap">
+     </div>    
+     <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50" class="m-gap p-gap">
                 <!-- pd documents card -->
                 <mat-expansion-panel *ngIf="pdDocumentsData.length>0; else nodocument">
                    <mat-expansion-panel-header>
@@ -148,8 +141,8 @@
                  <mat-card-content><p>No Document</p></mat-card-content>
                 </mat-card>
               </ng-template>
-           </div>
-               <div class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
+     </div>
+     <div class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
                    <!--pd logs card  -->
                      <mat-expansion-panel *ngIf="masterPdLogsData.length>0; else nohistory">
                          <mat-expansion-panel-header>
@@ -193,6 +186,8 @@
                    </mat-card>
                   </div>
                  </div>
+     </div>
+  </div>
  </mat-card-content>
 </div>
   </mat-card-content>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts
index 64756a67c..90d398715 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts
@@ -79,7 +79,7 @@ import { AllocationViewMoreComponent } from './list-pd/allocation-view-more/allo
 import { PdRequirementComponent } from './list-pd/pd-requirement/pd-requirement.component';
 import { GeneralInfoComponent } from './list-pd/start-pd/forms/general-info/general-info.component';
 import { ModelEditPdReportComponent } from './list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component';
-import { OtherApplicantDetailsComponent } from './list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component';
+import { OtherApplicantDetailsComponent } from './list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component';
 import { NeighbourHoodComponent } from './list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component';
 
 // import ngx-viewer module