diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.html
index 28ffe3d7d..b8a07d63f 100644
--- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.html
+++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.html
@@ -1,4 +1,4 @@
-<div fxLayout="row wrap" fxLayoutAlign="end">
+<div fxLayout="row wrap" fxLayoutAlign="end" style="padding-top:1%">
     <button mat-fab class="mr-1 mb-1" color="primary" matTooltip="Add More Billing Information" matTooltipPosition="above" (click)="editDetails(null); false"><mat-icon>add</mat-icon></button>
 </div>
 <mat-card *ngFor="let data of entityBillingInfoRecord">
@@ -8,17 +8,17 @@
         </div>
         <div fxFlex="50%">
           <div>
-            {{data.addressline2}}, {{data.addressline3}}
+            {{data.addressline2}}<span *ngIf="data.addressline3">, {{data.addressline3}}</span>
           </div>
           <div>
-            Pan: {{data.pan}}, Gst: {{data.gstno}}
+           <span *ngIf="data.pan">Pan: {{data.pan}}</span> <span *ngIf="data.gstno">,  Gst: {{data.gstno}}</span>
           </div>
           <div>
             <div *ngFor="let conts of data.contacts; let last = last">{{conts.contact_person}} - {{conts.contact_email}} - {{conts.contact_mobile_no}} <span *ngIf="!last">,</span></div>
           </div>
         </div>
         <div fxFlex="20%">
-          <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="editDetails(data)"><mat-icon>edit</mat-icon></button>
+          <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editDetails(data)"><mat-icon>edit</mat-icon></button>
         </div>
    </div>
 </mat-card>
\ No newline at end of file
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-region/entity-edit-region.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-region/entity-edit-region.component.html
index bcca26bbe..750981985 100644
--- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-region/entity-edit-region.component.html
+++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-region/entity-edit-region.component.html
@@ -1,6 +1,7 @@
 <form [formGroup]="_editEntityRegionFrom" (submit)="onSubmit()">
     <div formArrayName="region_lender" class="example-full-width">
         <mat-card *ngFor="let region of _editEntityRegionFrom.controls.region_lender['controls']; let i=index">
+           <mat-card-content>
             <div [formGroupName]="i">
                 <div fxLayout="row wrap" fxLayout.xs="column" fxLayoutGap="2%" fxLayoutAlign="center center">
                     <mat-form-field fxFlex="30%">
@@ -31,7 +32,7 @@
                         <mat-error *ngIf="submitted && region['controls'].fk_branch_id.hasError('required')" class="mat-text-warn">Branch Required.!</mat-error>
                     </mat-form-field>-->
                      
-                     <div fxFlex="30%">
+                     <div fxFlex="30%" style="text-align:center;">
                             <mat-checkbox *ngIf="region.get('entity_region_map_id').value != null" formControlName="isactive" [ngModel]="region.get('isactive').value == 1 ? true : region.get('isactive').value == 0 ? false : null"
                             (ngModelChange)="region.get('isactive').value = $event ? 1 : 0"></mat-checkbox>
                             
@@ -41,6 +42,7 @@
                      </div>
                 </div>
             </div>
+        </mat-card-content>
         </mat-card>
          </div>
     <div class="row" style="text-align:right;">
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-add-tat.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-add-tat.component.html
index 921e2291d..b7de951e7 100644
--- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-add-tat.component.html
+++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-add-tat.component.html
@@ -1,4 +1,4 @@
-<div style="overflow: auto;">
+<div >
     <div class="ml-xs mr-xs" style="width: 100%;" fxLayout="row" fxLayoutAlign="end">
         <div style="text-align:right;">
             <button mat-raised-button mat-icon-button color="primary" class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above"
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-edit-tat.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-edit-tat.component.html
index 13d6670fe..ecc31a782 100644
--- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-edit-tat.component.html
+++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-edit-tat.component.html
@@ -1,6 +1,6 @@
 <div fxLayout="row" fxLayout.xs="column" fxLayoutWrap fxLayoutAlign="end" style="padding-top:1%">
-      <div fxFlex="20%">
-        <button mat-fab class="mr-1 mb-1" color="primary"matTooltip="Add New Tat Details" matTooltipPosition="above"  (click)="addNewTatDetails()"><mat-icon>add</mat-icon></button>
+      <div fxFlex="20%" style="text-align:right;">
+        <button mat-fab class="mr-1 mb-1" color="primary"matTooltip="Add More TAT Details" matTooltipPosition="above"  (click)="addNewTatDetails()"><mat-icon>add</mat-icon></button>
       </div>
 </div>
 
@@ -18,7 +18,7 @@
           {{data.tatVal2}}
         </div>
         <div fxFlex="18%">
-          <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="editDetails(data)"><mat-icon>edit</mat-icon></button>
+          <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editDetails(data)"><mat-icon>edit</mat-icon></button>
         </div>
    </div>
 </mat-card>
\ No newline at end of file