diff --git a/AstuteClient2/src/app/invoice-payment/invoice-payment.component.ts b/AstuteClient2/src/app/invoice-payment/invoice-payment.component.ts
index 9d5b8c1..240107e 100644
--- a/AstuteClient2/src/app/invoice-payment/invoice-payment.component.ts
+++ b/AstuteClient2/src/app/invoice-payment/invoice-payment.component.ts
@@ -1,5 +1,6 @@
 import {Component, OnInit, ViewChild} from '@angular/core';
 import {AstuteClientService} from '../services/astute-client-service';
+import {formatCurrency} from "@angular/common";
 
 @Component({
     selector: 'app-invoice-payment',
@@ -108,6 +109,9 @@ export class InvoicePaymentComponent implements OnInit {
         });
 
         this.rowData = this.astuteClientService.getInvoicePayments();
+        this.rowData.forEach((row) => {
+            row.invoiceAmount = formatCurrency(row.invoiceAmount, 'en-US', '$', "USD");
+        });
         this.astuteClientService.getInvoicePayments().then((data) => {
             this.invoicePaymentData = data;
         });
diff --git a/AstuteClient2/src/app/invoice/invoice.component.html b/AstuteClient2/src/app/invoice/invoice.component.html
index 8fbc40f..424a2ba 100644
--- a/AstuteClient2/src/app/invoice/invoice.component.html
+++ b/AstuteClient2/src/app/invoice/invoice.component.html
@@ -189,15 +189,15 @@
                 </td>
                 <td class="p-0 m-0"><input type="text" class="form-control cell" [value]="feeTypes[inDet.feeTypeId - 1]"
                                            disabled></td>
-                <td class="p-0 m-0"><input type="number" class="form-control cell" [value]="inDet.fee"
-                                           (change)="onSelectedCellChange(i, 'fee', fee.value); updateSelectedBillAmt()" #fee disabled>
+                <td class="p-0 m-0"><input type="text" class="form-control cell" [value]="inDet.fee | currency" #fee disabled>
+                                           <!--(change)="onSelectedCellChange(i, 'fee', fee.value); updateSelectedBillAmt()" -->
                 </td>
                 <td class="p-0 m-0"><input type="number" class="form-control cell" [value]="inDet.qty"
                                            [step]="inDet.remainingQty / 100"
                                            (change)="onSelectedCellChange(i, 'qty', qty.value); updateSelectedBillAmt()" #qty>
                 </td>
             </tr>
-            <tr class="p-0 m-0" *ngIf="inDet.poLineItemNum != -1" >
+            <tr class="p-0 m-0" *ngIf="inDet.poLineItemNum != -1">
                 <th class="align-content-center">
                     <p>{{getPerc(qty.value, inDet.remainingQty)}}%</p>
                 </th>
@@ -268,31 +268,31 @@
             <tbody>
             <tr>
                 <td style="width: 40%" class="text-right"><b>Original Contract Amount</b></td>
-                <td style="width: 10%">
-                    <div *ngIf="selectedPO">{{selectedPO.contractAmt}}</div>
+                <td style="width: 10%" class="text-right">
+                    <div *ngIf="selectedPO">{{selectedPO.contractAmt | currency}}</div>
                 </td>
                 <td style="width: 30%" class="text-right">&nbsp;</td>
-                <td style="width: 20%" >&nbsp;</td>
+                <td style="width: 20%" class="text-right">&nbsp;</td>
             </tr>
             <tr>
                 <td class="text-right"><b>Net Changes by Change Orders</b></td>
-                <td>
-                    <div *ngIf="selectedPO">0</div>
+                <td class="text-right">
+                    <div *ngIf="selectedPO">{{0 | currency}}</div>
                 </td>
                 <td class="text-right">&nbsp;</td>
-                <td>&nbsp;</td>
+                <td class="text-right">&nbsp;</td>
             </tr>
             <tr>
                 <td class="text-right"><b>Total Contract Amount</b></td>
-                <td><div *ngIf="selectedPO">{{selectedPO.contractAmt}}</div></td>
+                <td class="text-right"><div *ngIf="selectedPO">{{selectedPO.contractAmt | currency}}</div></td>
+                <td class="text-right">&nbsp;</td>
                 <td class="text-right">&nbsp;</td>
-                <td>&nbsp;</td>
             </tr>
             <tr>
                 <td class="text-right"><b>Previously Billed</b></td>
-                <td><div *ngIf="selectedPO">{{selectedPO.previouslyBilledAmount}}</div></td>
+                <td class="text-right"><div *ngIf="selectedPO">{{selectedPO.previouslyBilledAmount | currency}}</div></td>
+                <td class="text-right">&nbsp;</td>
                 <td class="text-right">&nbsp;</td>
-                <td>&nbsp;</td>
             </tr>
             <!--<tr>-->
             <!--<td class="text-right"><b>Amount This Invoice</b></td>-->
@@ -302,7 +302,7 @@
             <!--</tr>-->
             <tr>
                 <td class="text-right"><b>Balance to be Billed</b></td>
-                <td><div *ngIf="selectedPO">{{selectedPO.contractAmt - selectedPO.previouslyBilledAmount - selectedBillAmt}}</div></td>
+                <td class="text-right"><div *ngIf="selectedPO">{{(selectedPO.contractAmt - selectedPO.previouslyBilledAmount - selectedBillAmt) | currency}}</div></td>
                 <!--<td>-->
                 <!--<div class="input-group mb-3">-->
                 <!--<div class="input-group-prepend">-->
@@ -316,7 +316,7 @@
                 <!--</div>-->
                 <!--</td>-->
                 <td class="text-right"><b>Total due this invoice</b></td>
-                <td>{{selectedBillAmt}}</td>
+                <td>{{selectedBillAmt | currency}}</td>
             </tr>
             </tbody>
         </table>
@@ -480,8 +480,8 @@
                 </td>
                 <td class="p-0 m-0"><input type="text" class="form-control cell" [value]="feeTypes[inDet.feeTypeId - 1]"
                                            disabled></td>
-                <td class="p-0 m-0"><input type="number" class="form-control cell" [value]="inDet.fee"
-                                           (change)="onNewCellChange(i, 'fee', fee.value); updateNewBillAmt();" #fee disabled>
+                <td class="p-0 m-0"><input type="text" class="form-control cell" [value]="inDet.fee | currency" #fee disabled>
+                                           <!--(change)="onNewCellChange(i, 'fee', fee.value.substr(1)); updateNewBillAmt();" -->
                 </td>
                 <td class="p-0 m-0"><input type="number" class="form-control cell" [value]="inDet.qty"
                                            [step]="inDet.remainingQty / 100"
@@ -528,32 +528,30 @@
         <table class="table table-borderless table-sm">
             <tbody>
             <tr>
-                <td style="width: 40%" class="text-right"><b>Original Contract Amount</b></td>
-                <td style="width: 10%">
-                    <div *ngIf="chosenPo">{{chosenPo.contractAmt}}</div>
+                <td class="text-right" style="width: 40%" class="text-right"><b>Original Contract Amount</b></td>
+                <td class="text-right" style="width: 10%">
+                    <div *ngIf="chosenPo">{{chosenPo.contractAmt | currency}}</div>
                 </td>
-                <td style="width: 30%" class="text-right">&nbsp;</td>
-                <td style="width: 20%" >&nbsp;</td>
+                <td class="text-right" style="width: 30%" class="text-right">&nbsp;</td>
+                <td class="text-right" style="width: 20%" >&nbsp;</td>
             </tr>
             <tr>
                 <td class="text-right"><b>Net Changes by Change Orders</b></td>
-                <td>
-                    <div *ngIf="chosenPo">0</div>
-                </td>
+                <td class="text-right"><div *ngIf="chosenPo">{{0  | currency}}</div></td>
+                <td class="text-right">&nbsp;</td>
                 <td class="text-right">&nbsp;</td>
-                <td>&nbsp;</td>
             </tr>
             <tr>
                 <td class="text-right"><b>Total Contract Amount</b></td>
-                <td><div *ngIf="chosenPo">{{chosenPo.contractAmt}}</div></td>
+                <td class="text-right"><div *ngIf="chosenPo">{{chosenPo.contractAmt | currency}}</div></td>
+                <td class="text-right">&nbsp;</td>
                 <td class="text-right">&nbsp;</td>
-                <td>&nbsp;</td>
             </tr>
             <tr>
                 <td class="text-right"><b>Previously Billed</b></td>
-                <td><div *ngIf="chosenPo">{{chosenPo.previouslyBilledAmount}}</div></td>
+                <td class="text-right"><div *ngIf="chosenPo">{{chosenPo.previouslyBilledAmount | currency}}</div></td>
+                <td class="text-right">&nbsp;</td>
                 <td class="text-right">&nbsp;</td>
-                <td>&nbsp;</td>
             </tr>
             <!--<tr>-->
                 <!--<td class="text-right"><b>Amount This Invoice</b></td>-->
@@ -563,7 +561,7 @@
             <!--</tr>-->
             <tr>
                 <td class="text-right"><b>Balance to be Billed</b></td>
-                <td><div *ngIf="chosenPo">{{chosenPo.contractAmt - chosenPo.previouslyBilledAmount - newBillAmt}}</div></td>
+                <td class="text-right"><div *ngIf="chosenPo">{{(chosenPo.contractAmt - chosenPo.previouslyBilledAmount - newBillAmt) | currency}}</div></td>
                 <!--<td>-->
                     <!--<div class="input-group mb-3">-->
                         <!--<div class="input-group-prepend">-->
@@ -577,7 +575,7 @@
                     <!--</div>-->
                 <!--</td>-->
                 <td class="text-right"><b>Total due this invoice</b></td>
-                <td>{{newBillAmt}}</td>
+                <td>{{newBillAmt | currency}}</td>
             </tr>
             </tbody>
         </table>
diff --git a/AstuteClient2/src/app/invoice/invoice.component.ts b/AstuteClient2/src/app/invoice/invoice.component.ts
index ceb28b0..5a586e9 100644
--- a/AstuteClient2/src/app/invoice/invoice.component.ts
+++ b/AstuteClient2/src/app/invoice/invoice.component.ts
@@ -1,5 +1,6 @@
 import {Component, OnInit, ViewChild} from '@angular/core';
 import {AstuteClientService} from '../services/astute-client-service';
+import {formatCurrency} from "@angular/common";
 
 declare var $: any;
 
@@ -143,6 +144,9 @@ export class InvoiceComponent implements OnInit {
     refreshData() {
         this.astuteClientService.getInvoices().then((data) => {
             this.source = data;
+            this.source.forEach((row) => {
+                row.billAmt = formatCurrency(row.billAmt, 'en-US', '$', 'USD');
+            });
         });
 
         this.astuteClientService.getCustomers().then((data) => {
@@ -227,7 +231,7 @@ export class InvoiceComponent implements OnInit {
         if (selectedNodes.length) {
             this.chosenInv = selectedNodes.map(node => node.data)[0];
             // console.log (this.chosenInv);
-            this.selectedBillAmt = +this.chosenInv.billAmt;
+            this.selectedBillAmt = +(this.chosenInv.billAmt.replace(',', '').replace('$', ''));
             this.astuteClientService.getPODetail(this.chosenInv.poNum).then((poDetails) => {
                 if (poDetails) {
                     this.selectedPODetails = poDetails;
diff --git a/AstuteClient2/src/app/sales-order/sales-order.component.html b/AstuteClient2/src/app/sales-order/sales-order.component.html
index 4fb7de2..185bb4b 100644
--- a/AstuteClient2/src/app/sales-order/sales-order.component.html
+++ b/AstuteClient2/src/app/sales-order/sales-order.component.html
@@ -162,7 +162,7 @@
   <div class="modal-footer">
     <button class="btn btn-success" type="button"
             [disabled]="!(ponum.value && podate.value && customerid.value && contractnum.value && contractamt.value)"
-            (click)="addPo(projNum.value, ponum.value, podate.value, customerid.value, contractnum.value, contractamt.value, title.value, new)"
+            (click)="addPo(projNum.value, ponum.value, podate.value, customerid.value, contractnum.value, contractamt.value.replace('$', '').replace(',', ''), title.value, new)"
     >
       Add
     </button>
@@ -205,7 +205,7 @@
           <td style="width: 20%"><span class="input-group-text">Contract Number</span></td>
           <td style="width: 30%"><input type="text" class="form-control" placeholder="Contract Number" [value]="selected.contractNum" #contractnum></td>
           <td style="width: 20%"><span class="input-group-text">Contract Amount</span></td>
-          <td style="width: 30%"><input type="number" class="form-control" placeholder="Contract Amount" [value]="editContractAmount" #contractamt></td>
+          <td style="width: 30%"><input type="text" class="form-control" placeholder="Contract Amount" [value]="editContractAmount | currency" #contractamt disabled></td>
         </tr>
         </tbody>
       </table>
@@ -358,7 +358,7 @@
     <div class="modal-footer">
       <button class="btn btn-success" type="button"
               [disabled]="!(ponum.value && podate.value && contractnum.value && contractamt.value)"
-              (click)="editPo(projNum.value, ponum.value, podate.value, contractnum.value, contractamt.value, title.value, edit)"
+              (click)="editPo(projNum.value, ponum.value, podate.value, contractnum.value.repalce(',', '').replace('$', ''), contractamt.value, title.value, edit)"
       >
         Update
       </button>
diff --git a/AstuteClient2/src/app/sales-order/sales-order.component.ts b/AstuteClient2/src/app/sales-order/sales-order.component.ts
index 4b026ba..52e700d 100644
--- a/AstuteClient2/src/app/sales-order/sales-order.component.ts
+++ b/AstuteClient2/src/app/sales-order/sales-order.component.ts
@@ -1,5 +1,6 @@
 import {Component, OnInit, ViewChild} from '@angular/core';
 import {AstuteClientService} from '../services/astute-client-service';
+import {formatCurrency} from "@angular/common";
 
 @Component({
     selector: 'app-sales-order',
@@ -238,6 +239,7 @@ export class SalesOrderComponent implements OnInit {
                         this.rowData = data;
                         this.rowData.forEach((row) => {
                             row.customerName = this.getCustomerName(row.customerId);
+                            row.contractAmt = formatCurrency(row.contractAmt, 'en-US', '$', 'USD');
                         });
                     }
                 });
@@ -246,7 +248,6 @@ export class SalesOrderComponent implements OnInit {
             }
         });
         // this.rowData = this.astuteClientService.getPOs();
-
     }
 
     getCustomerName(customerId) {