diff --git a/ng6-seed/package-lock.json b/ng6-seed/package-lock.json
index 2d75f21dc..42f212434 100755
--- a/ng6-seed/package-lock.json
+++ b/ng6-seed/package-lock.json
@@ -4369,12 +4369,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4389,17 +4391,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4516,7 +4521,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4528,6 +4534,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4542,6 +4549,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4549,12 +4557,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -4573,6 +4583,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -4653,7 +4664,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -4665,6 +4677,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4786,6 +4799,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
index f71bdcbf3..1bc85a7e4 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
@@ -189,7 +189,8 @@
 
             <mat-tab label="Docs">
                 <ng-template matTabContent>
-                    <div fxLayout="row wrap" style="padding:20px;" *ngIf="documentsAndFilesList.length>0; else noFiles">
+                  <div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles">
+                    <div fxLayout="row wrap" style="padding:20px;">
                         <div fxFlex="100">
                             <div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList">
                                 <div class="p-list-main mb-2" style="width: 60%;height: auto;" *ngIf="doc.document_type != 'pdf'">
@@ -215,12 +216,12 @@
                             </div>
                         </div>
                     </div>
+                  </div>
                     <ng-template #noFiles>
                             <mat-card-content>
                               <p style="margin: 20px;">No Files</p>
                             </mat-card-content>
                     </ng-template> 
-
                 </ng-template>
             </mat-tab>
 
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 adeae3e20..786522a1f 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
@@ -430,7 +430,8 @@
       </mat-tab>
       <mat-tab label="Docs">
           <ng-template matTabContent>
-              <div fxLayout="row wrap" style="padding:20px;" *ngIf="documentsAndFilesList.length>0; else noFiles">
+            <div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles">
+              <div fxLayout="row wrap" style="padding:20px;">
                   <div fxFlex="100">
                       <div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList">
                           <div class="p-list-main mb-2" style="width: 60%;height: auto;" *ngIf="doc.document_type != 'pdf'">
@@ -456,14 +457,14 @@
                       </div>
                   </div>
               </div>
+            </div>
               <ng-template #noFiles>
                       <mat-card-content>
                         <p style="margin: 20px;">No Files</p>
                       </mat-card-content>
               </ng-template> 
-
           </ng-template>
-      </mat-tab>
+  </mat-tab>
     </mat-tab-group>
   </mat-dialog-content>
   <mat-dialog-actions>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
index e561ae888..e1cee77d8 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
@@ -218,7 +218,8 @@
             </mat-tab>
             <mat-tab label="Docs">
                     <ng-template matTabContent>
-                        <div fxLayout="row wrap" style="padding:20px;" *ngIf="documentsAndFilesList.length>0; else noFiles">
+                      <div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles">
+                        <div fxLayout="row wrap" style="padding:20px;">
                             <div fxFlex="100">
                                 <div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList">
                                     <div class="p-list-main mb-2" style="width: 60%;height: auto;" *ngIf="doc.document_type != 'pdf'">
@@ -244,14 +245,14 @@
                                 </div>
                             </div>
                         </div>
+                      </div>
                         <ng-template #noFiles>
                                 <mat-card-content>
                                   <p style="margin: 20px;">No Files</p>
                                 </mat-card-content>
                         </ng-template> 
-    
                     </ng-template>
-                </mat-tab>
+            </mat-tab>
 
         </mat-tab-group>
     </mat-dialog-content>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html
index 949d0d89d..9bd046f59 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html
@@ -384,7 +384,8 @@
       </mat-tab>
       <mat-tab label="Docs">
           <ng-template matTabContent>
-              <div fxLayout="row wrap" style="padding:20px;" *ngIf="documentsAndFilesList.length>0; else noFiles">
+            <div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles">
+              <div fxLayout="row wrap" style="padding:20px;">
                   <div fxFlex="100">
                       <div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList">
                           <div class="p-list-main mb-2" style="width: 60%;height: auto;" *ngIf="doc.document_type != 'pdf'">
@@ -410,12 +411,12 @@
                       </div>
                   </div>
               </div>
+            </div>
               <ng-template #noFiles>
                       <mat-card-content>
                         <p style="margin: 20px;">No Files</p>
                       </mat-card-content>
               </ng-template> 
-
           </ng-template>
       </mat-tab>
     </mat-tab-group>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html
index 51f402b42..c6df84f1b 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html
@@ -150,7 +150,8 @@
             </mat-tab>
             <mat-tab label="Docs">
                     <ng-template matTabContent>
-                        <div fxLayout="row wrap" style="padding:20px;" *ngIf="documentsAndFilesList.length>0; else noFiles">
+                      <div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles">
+                        <div fxLayout="row wrap" style="padding:20px;">
                             <div fxFlex="100">
                                 <div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList">
                                     <div class="p-list-main mb-2" style="width: 60%;height: auto;" *ngIf="doc.document_type != 'pdf'">
@@ -176,14 +177,14 @@
                                 </div>
                             </div>
                         </div>
+                      </div>
                         <ng-template #noFiles>
                                 <mat-card-content>
                                   <p style="margin: 20px;">No Files</p>
                                 </mat-card-content>
                         </ng-template> 
-    
                     </ng-template>
-                </mat-tab>
+            </mat-tab>
 
         </mat-tab-group>
     </mat-dialog-content>
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 d2c629c24..9c69fc080 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
@@ -1717,7 +1717,8 @@
 
             <mat-tab label="Docs">
                     <ng-template matTabContent>
-                        <div fxLayout="row wrap" style="padding:20px;" *ngIf="documentsAndFilesList.length>0; else noFiles">
+                      <div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles">
+                        <div fxLayout="row wrap" style="padding:20px;">
                             <div fxFlex="100">
                                 <div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList">
                                     <div class="p-list-main mb-2" style="width: 60%;height: auto;" *ngIf="doc.document_type != 'pdf'">
@@ -1726,9 +1727,8 @@
                                         </div>
                                     </div>
                                 </div>
-                                </div>
-                        </div>
-                        <div fxFlex="row">
+                            </div>
+                            <div fxFlex="row">
                                 <div fxFlex="100" class="m-gap p-gap">
                                     <div fxLayout="row" fxLayoutWrap="wrap">
                                         <div *ngFor="let doc of documentsAndFilesList">
@@ -1742,13 +1742,14 @@
                                         </div>
                                     </div>
                                 </div>
+                            </div>
                         </div>
-                        <ng-template #noFiles fxLayout="row wrap" style="padding:20px;">
+                      </div>
+                        <ng-template #noFiles>
                                 <mat-card-content>
                                   <p style="margin: 20px;">No Files</p>
                                 </mat-card-content>
                         </ng-template> 
-    
                     </ng-template>
             </mat-tab>
 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
index 78a580e26..a93ed0ed7 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
@@ -430,7 +430,8 @@
     
     <mat-tab label="Docs">
             <ng-template matTabContent>
-                <div fxLayout="row wrap" style="padding:20px;" *ngIf="documentsAndFilesList.length>0; else noFiles">
+              <div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles">
+                <div fxLayout="row wrap" style="padding:20px;">
                     <div fxFlex="100">
                         <div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList">
                             <div class="p-list-main mb-2" style="width: 60%;height: auto;" *ngIf="doc.document_type != 'pdf'">
@@ -456,14 +457,14 @@
                         </div>
                     </div>
                 </div>
+              </div>
                 <ng-template #noFiles>
                         <mat-card-content>
                           <p style="margin: 20px;">No Files</p>
                         </mat-card-content>
                 </ng-template> 
-
             </ng-template>
-        </mat-tab>
+    </mat-tab>
 
     </mat-tab-group>
 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html
index 04656a116..0eb8db80f 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html
@@ -195,7 +195,8 @@
 
             <mat-tab label="Docs">
                     <ng-template matTabContent>
-                        <div fxLayout="row wrap" style="padding:20px;" *ngIf="documentsAndFilesList.length>0; else noFiles">
+                      <div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles">
+                        <div fxLayout="row wrap" style="padding:20px;">
                             <div fxFlex="100">
                                 <div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList">
                                     <div class="p-list-main mb-2" style="width: 60%;height: auto;" *ngIf="doc.document_type != 'pdf'">
@@ -221,14 +222,14 @@
                                 </div>
                             </div>
                         </div>
+                      </div>
                         <ng-template #noFiles>
                                 <mat-card-content>
                                   <p style="margin: 20px;">No Files</p>
                                 </mat-card-content>
                         </ng-template> 
-    
                     </ng-template>
-                </mat-tab>
+            </mat-tab>
 
         </mat-tab-group>
 
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 4a140547c..9103f18ac 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html
@@ -278,7 +278,8 @@
             </mat-tab>
             <mat-tab label="Docs">
                     <ng-template matTabContent>
-                        <div fxLayout="row wrap" style="padding:20px;" *ngIf="documentsAndFilesList.length>0; else noFiles">
+                      <div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles">
+                        <div fxLayout="row wrap" style="padding:20px;">
                             <div fxFlex="100">
                                 <div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList">
                                     <div class="p-list-main mb-2" style="width: 60%;height: auto;" *ngIf="doc.document_type != 'pdf'">
@@ -304,14 +305,14 @@
                                 </div>
                             </div>
                         </div>
+                      </div>
                         <ng-template #noFiles>
                                 <mat-card-content>
                                   <p style="margin: 20px;">No Files</p>
                                 </mat-card-content>
                         </ng-template> 
-    
                     </ng-template>
-                </mat-tab>
+            </mat-tab>
         </mat-tab-group>
     </mat-dialog-content>
     <mat-dialog-actions>
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 08edef613..5594504f4 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
@@ -179,8 +179,7 @@
                                                                 <input matInput placeholder="Income Per Month"
                                                                     formControlName="earning_gross_income_per_month"
                                                                     OnlyNumber type="text">
-                                                                <mat-hint align="start" style="font-size:90%" *ngIf="item.get('earning_gross_income_per_month').value != ''">{{"&#8377;"}}
-                                                                    {{item.get('earning_gross_income_per_month').value  | numberToWords}} Only</mat-hint>
+                                                                <mat-hint align="start" style="font-size:90%" *ngIf="item.get('earning_gross_income_per_month').value != ''">{{"&#8377;"}} {{item.get('earning_gross_income_per_month').value | numberToWords}} Only</mat-hint>                                                
                                                             </mat-form-field>
                                                             <mat-form-field style="width:45%;">
                                                                 <input matInput [placeholder]="item.get('earning_segment').value != 5 ? 'Name of the Employer/Business' : 'Pension Received From'"
@@ -272,7 +271,8 @@
 
             <mat-tab label="Docs">
                     <ng-template matTabContent>
-                        <div fxLayout="row wrap" style="padding:20px;" *ngIf="documentsAndFilesList.length>0; else noFiles">
+                      <div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles">
+                        <div fxLayout="row wrap" style="padding:20px;">
                             <div fxFlex="100">
                                 <div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList">
                                     <div class="p-list-main mb-2" style="width: 60%;height: auto;" *ngIf="doc.document_type != 'pdf'">
@@ -298,14 +298,14 @@
                                 </div>
                             </div>
                         </div>
+                      </div>
                         <ng-template #noFiles>
                                 <mat-card-content>
                                   <p style="margin: 20px;">No Files</p>
                                 </mat-card-content>
                         </ng-template> 
-    
                     </ng-template>
-                </mat-tab>
+            </mat-tab>
 
         </mat-tab-group>
 
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 1e217e168..e8c338fe2 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
@@ -511,41 +511,43 @@
                 </ng-template>
             </mat-tab>
             <mat-tab label="Docs">
-                <ng-template matTabContent>
-                    <div fxLayout="row wrap" style="padding:20px;" *ngIf="documentsAndFilesList.length>0; else noFiles">
-                        <div fxFlex="100">
-                            <div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList">
-                                <div class="p-list-main mb-2" style="width: 60%;height: auto;" *ngIf="doc.document_type != 'pdf'">
-                                    <div class="p-list">
-                                        <div class="top"> <img src="{{doc.document}}" alt="{{doc.document_name}}"></div>
+                    <ng-template matTabContent>
+                      <div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles">
+                        <div fxLayout="row wrap" style="padding:20px;">
+                            <div fxFlex="100">
+                                <div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList">
+                                    <div class="p-list-main mb-2" style="width: 60%;height: auto;" *ngIf="doc.document_type != 'pdf'">
+                                        <div class="p-list">
+                                            <div class="top"> <img src="{{doc.document}}" alt="{{doc.document_name}}"></div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div fxFlex="row">
+                                <div fxFlex="100" class="m-gap p-gap">
+                                    <div fxLayout="row" fxLayoutWrap="wrap">
+                                        <div *ngFor="let doc of documentsAndFilesList">
+                                        <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20"
+                                            fxFlex.lg="20" fxFlex.xl="20" *ngIf="doc.document_type == 'pdf';">
+                                            <!-- <a href="http://www.google.com" target="_blank"> -->
+                                                <mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;" (click)="pdf(doc.document)">picture_as_pdf</mat-icon>
+                                                <span class="d-block">{{doc.document_title}}</span>
+                                            <!-- </a> -->
+                                        </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                        <div fxFlex="row">
-                            <div fxFlex="100" class="m-gap p-gap">
-                                <div fxLayout="row" fxLayoutWrap="wrap">
-                                    <div *ngFor="let doc of documentsAndFilesList">
-                                    <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="20"
-                                        fxFlex.lg="20" fxFlex.xl="20" *ngIf="doc.document_type == 'pdf';">
-                                        <!-- <a href="http://www.google.com" target="_blank"> -->
-                                            <mat-icon style="color: #e00201;font-size: 60px !important;width:inherit !important;" (click)="pdf(doc.document)">picture_as_pdf</mat-icon>
-                                            <span class="d-block">{{doc.document_title}}</span>
-                                        <!-- </a> -->
-                                    </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <ng-template #noFiles>
-                            <mat-card-content>
-                              <p style="margin: 20px;">No Files</p>
-                            </mat-card-content>
-                    </ng-template> 
-
-                </ng-template>
-            </mat-tab> </mat-tab-group>
+                      </div>
+                        <ng-template #noFiles>
+                                <mat-card-content>
+                                  <p style="margin: 20px;">No Files</p>
+                                </mat-card-content>
+                        </ng-template> 
+                    </ng-template>
+            </mat-tab>
+        </mat-tab-group>
     </mat-dialog-content>
     <mat-dialog-actions>
         <div fxFlex="60" class="pb-0 text-sm-left" align="left">
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 bb321569a..b7aa0b40e 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
@@ -399,7 +399,8 @@
             
             <mat-tab label="Docs">
                     <ng-template matTabContent>
-                        <div fxLayout="row wrap" style="padding:20px;" *ngIf="documentsAndFilesList.length>0; else noFiles">
+                      <div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles">
+                        <div fxLayout="row wrap" style="padding:20px;">
                             <div fxFlex="100">
                                 <div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList">
                                     <div class="p-list-main mb-2" style="width: 60%;height: auto;" *ngIf="doc.document_type != 'pdf'">
@@ -425,14 +426,14 @@
                                 </div>
                             </div>
                         </div>
+                      </div>
                         <ng-template #noFiles>
                                 <mat-card-content>
                                   <p style="margin: 20px;">No Files</p>
                                 </mat-card-content>
                         </ng-template> 
-    
                     </ng-template>
-                </mat-tab>
+            </mat-tab>
     
             </mat-tab-group>
     </mat-dialog-content>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html
index 024a7e37e..31a595550 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html
@@ -64,7 +64,8 @@
 
             <mat-tab label="Docs">
                     <ng-template matTabContent>
-                        <div fxLayout="row wrap" style="padding:20px;" *ngIf="documentsAndFilesList.length>0; else noFiles">
+                      <div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles">
+                        <div fxLayout="row wrap" style="padding:20px;">
                             <div fxFlex="100">
                                 <div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList">
                                     <div class="p-list-main mb-2" style="width: 60%;height: auto;" *ngIf="doc.document_type != 'pdf'">
@@ -90,14 +91,14 @@
                                 </div>
                             </div>
                         </div>
+                      </div>
                         <ng-template #noFiles>
                                 <mat-card-content>
                                   <p style="margin: 20px;">No Files</p>
                                 </mat-card-content>
                         </ng-template> 
-    
                     </ng-template>
-                </mat-tab>
+            </mat-tab>
         </mat-tab-group>
     </mat-dialog-content>
 
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 f6a405364..731c43751 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
@@ -232,7 +232,8 @@
             </mat-tab>
             <mat-tab label="Docs">
                     <ng-template matTabContent>
-                        <div fxLayout="row wrap" style="padding:20px;" *ngIf="documentsAndFilesList.length>0; else noFiles">
+                      <div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles">
+                        <div fxLayout="row wrap" style="padding:20px;">
                             <div fxFlex="100">
                                 <div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList">
                                     <div class="p-list-main mb-2" style="width: 60%;height: auto;" *ngIf="doc.document_type != 'pdf'">
@@ -258,14 +259,14 @@
                                 </div>
                             </div>
                         </div>
+                      </div>
                         <ng-template #noFiles>
                                 <mat-card-content>
                                   <p style="margin: 20px;">No Files</p>
                                 </mat-card-content>
                         </ng-template> 
-    
                     </ng-template>
-                </mat-tab>
+            </mat-tab>
         </mat-tab-group>
     </mat-dialog-content>
     <mat-dialog-actions>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
index 4760f9b47..bbcce624b 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
@@ -310,7 +310,7 @@ export class LoanDetailsComponent implements OnInit {
             this.loanDetailsForm.controls['owner_name'].updateValueAndValidity();
 
         }
-        this._pd.retriveFile(this.pdid,this.form_id,'null').subscribe(data => {
+        this._pd.retriveFile(this.pdid,this.form_id,null).subscribe(data => {
             if (data.status == 200) {        
                 if(data.records.length>0){
                     data.records.forEach((val, index) => {
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
index 2c87ec908..7045bf34f 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
@@ -222,10 +222,11 @@
                 </mat-tab>
                 <mat-tab label="Docs">
                         <ng-template matTabContent>
-                            <div fxLayout="row wrap" style="padding:20px;" *ngIf="documentsAndFilesList.length>0; else noFiles">
+                          <div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles">
+                            <div fxLayout="row wrap" style="padding:20px;">
                                 <div fxFlex="100">
                                     <div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList">
-                                        <div class="p-list-main mb-2" style="width: 60%;height: auto;" *ngIf="doc.document_type == 'images'">
+                                        <div class="p-list-main mb-2" style="width: 60%;height: auto;" *ngIf="doc.document_type != 'pdf'">
                                             <div class="p-list">
                                                 <div class="top"> <img src="{{doc.document}}" alt="{{doc.document_name}}"></div>
                                             </div>
@@ -248,14 +249,14 @@
                                     </div>
                                 </div>
                             </div>
+                          </div>
                             <ng-template #noFiles>
                                     <mat-card-content>
                                       <p style="margin: 20px;">No Files</p>
                                     </mat-card-content>
                             </ng-template> 
-        
                         </ng-template>
-                    </mat-tab>
+                </mat-tab>
             </mat-tab-group>
 
         <!-- <mat-card>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts
index 5e1496dff..7086ed7dc 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts
@@ -105,7 +105,7 @@ export class NeighbourHoodComponent implements OnInit {
     //   }
     // });
 
-    this._pd.retriveFile(this.pdid,'19','null').subscribe(data => {
+    this._pd.retriveFile(this.pdid,'19',null).subscribe(data => {
       if (data.status == 200) {        
           if(data.records.length>0){
               data.records.forEach((val, index) => {
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
index 327dc3395..b4e5ceb5d 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
@@ -155,7 +155,8 @@
 
             <mat-tab label="Docs">
                     <ng-template matTabContent>
-                        <div fxLayout="row wrap" style="padding:20px;" *ngIf="documentsAndFilesList.length>0; else noFiles">
+                      <div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles">
+                        <div fxLayout="row wrap" style="padding:20px;">
                             <div fxFlex="100">
                                 <div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList">
                                     <div class="p-list-main mb-2" style="width: 60%;height: auto;" *ngIf="doc.document_type != 'pdf'">
@@ -181,14 +182,14 @@
                                 </div>
                             </div>
                         </div>
+                      </div>
                         <ng-template #noFiles>
                                 <mat-card-content>
                                   <p style="margin: 20px;">No Files</p>
                                 </mat-card-content>
                         </ng-template> 
-    
                     </ng-template>
-                </mat-tab>
+            </mat-tab>
 
         </mat-tab-group>
 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts
index 0c07f37a6..794e3aa27 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts
@@ -170,7 +170,7 @@ export class OtherIncomeComponent implements OnInit {
                 //control.push(this.createDetail());
             }
         })
-        this._pd.retriveFile(this.pdid,this.form_id,'null').subscribe(data => {
+        this._pd.retriveFile(this.pdid,this.form_id,null).subscribe(data => {
             if (data.status == 200) {        
                 if(data.records.length>0){
                     data.records.forEach((val, index) => {
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 baec4f04e..45a7ccbad 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
@@ -389,7 +389,8 @@
 
                 <mat-tab label="Docs">
                         <ng-template matTabContent>
-                            <div fxLayout="row wrap" style="padding:20px;" *ngIf="documentsAndFilesList.length>0; else noFiles">
+                          <div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles">
+                            <div fxLayout="row wrap" style="padding:20px;">
                                 <div fxFlex="100">
                                     <div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList">
                                         <div class="p-list-main mb-2" style="width: 60%;height: auto;" *ngIf="doc.document_type != 'pdf'">
@@ -415,14 +416,14 @@
                                     </div>
                                 </div>
                             </div>
+                          </div>
                             <ng-template #noFiles>
                                     <mat-card-content>
                                       <p style="margin: 20px;">No Files</p>
                                     </mat-card-content>
                             </ng-template> 
-        
                         </ng-template>
-                    </mat-tab>
+                </mat-tab>
 
             </mat-tab-group>
         </mat-dialog-content>
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 34e258ee3..7d4aeb3c3 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
@@ -58,7 +58,7 @@
                                         </mat-form-field>
                                         <mat-form-field style="width: 35%" *ngIf="items.get('person_designation').value == 1">
                                             <input matInput placeholder="Specify Person Designation" formControlName="other_person_designation">
-                                            <mat-error *ngIf="itemrow.controls['other_person_designation'].hasError('required')">Person Designation Required</mat-error>
+                                            <mat-error *ngIf="items.controls['other_person_designation'].hasError('required')">Person Designation Required</mat-error>
                                         </mat-form-field>
                                     </div>
                                     <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
@@ -195,7 +195,7 @@
                                         </mat-form-field>
                                         <mat-form-field style="width: 35%" *ngIf="items.get('person_designation').value == 1">
                                             <input matInput placeholder="Specify Person Designation" formControlName="other_person_designation">
-                                            <mat-error *ngIf="itemrow.controls['other_person_designation'].hasError('required')">Person Designation Required</mat-error>
+                                            <mat-error *ngIf="items.controls['other_person_designation'].hasError('required')">Person Designation Required</mat-error>
                                         </mat-form-field>
                                     </div>
                                     <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
@@ -293,7 +293,8 @@
     
     <mat-tab label="Docs">
             <ng-template matTabContent>
-                <div fxLayout="row wrap" style="padding:20px;" *ngIf="documentsAndFilesList.length>0; else noFiles">
+              <div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles">
+                <div fxLayout="row wrap" style="padding:20px;">
                     <div fxFlex="100">
                         <div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList">
                             <div class="p-list-main mb-2" style="width: 60%;height: auto;" *ngIf="doc.document_type != 'pdf'">
@@ -319,14 +320,14 @@
                         </div>
                     </div>
                 </div>
+              </div>
                 <ng-template #noFiles>
                         <mat-card-content>
                           <p style="margin: 20px;">No Files</p>
                         </mat-card-content>
                 </ng-template> 
-
             </ng-template>
-        </mat-tab>
+    </mat-tab>
 
     </mat-tab-group>
 
diff --git a/ng6-seed/src/environments/environment.ts b/ng6-seed/src/environments/environment.ts
index 67aab72f9..af7a9fb85 100755
--- a/ng6-seed/src/environments/environment.ts
+++ b/ng6-seed/src/environments/environment.ts
@@ -25,5 +25,5 @@ export const environment = {
   s3_endpoint: '',
   accessToken:'',
   //apiUrl:'http://localhost/sparqapi/api/'
-  apiEndpoint: 'https://ssa.sineedge.com/sparqapi/api/'
+  apiEndpoint: 'https://ssa.sineedge.com/sparqtest/api/'
 };