diff --git a/bookie/src/app/sales/bill-type/bill-type.component.html b/bookie/src/app/sales/bill-type/bill-type.component.html
index be4e2b8..bacdc34 100644
--- a/bookie/src/app/sales/bill-type/bill-type.component.html
+++ b/bookie/src/app/sales/bill-type/bill-type.component.html
@@ -30,7 +30,7 @@
     </mat-card>
   </div>
 </mat-dialog-content>
-<mat-dialog-actions align="end">
+<mat-dialog-actions>
   <button mat-button [mat-dialog-close]="false">Cancel</button>
   <button mat-button [mat-dialog-close]="selectedVal">Done</button>
 </mat-dialog-actions>
diff --git a/bookie/src/app/sales/choose-customer/choose-customer.component.html b/bookie/src/app/sales/choose-customer/choose-customer.component.html
index 853ca7b..7a452cd 100644
--- a/bookie/src/app/sales/choose-customer/choose-customer.component.html
+++ b/bookie/src/app/sales/choose-customer/choose-customer.component.html
@@ -27,22 +27,22 @@
     <div class="row-container">
       <mat-form-field class="flex-auto">
         <mat-label>Name</mat-label>
-        <input matInput [value]="formModel().name" readonly />
+        <input matInput [formField]="form.name" />
       </mat-form-field>
     </div>
     <div class="row-container">
       <mat-form-field class="flex-auto">
         <mat-label>Address</mat-label>
-        <textarea matInput [value]="formModel().address" readonly> </textarea>
+        <textarea matInput [formField]="form.address"> </textarea>
       </mat-form-field>
     </div>
     <div class="row-container">
-      <mat-checkbox [checked]="formModel().printInBill" [disabled]="true">Print in Bill?</mat-checkbox>
+      <mat-checkbox [formField]="form.printInBill">Print in Bill?</mat-checkbox>
     </div>
     <p></p>
     <div class="discounts">
       <ul>
-        @for (r of formModel().discounts; track r.id) {
+        @for (r of form().value().discounts; track r.id) {
           @if (r.discount > 0) {
             <li>{{ r.name }} - {{ r.discount | percent: '1.2-2' }}</li>
           }
@@ -51,7 +51,7 @@
     </div>
   </form>
 </mat-dialog-content>
-<mat-dialog-actions align="end">
+<mat-dialog-actions>
   <button mat-button [mat-dialog-close]="false">Cancel</button>
   <button type="button" mat-raised-button color="primary" (click)="save()">Select</button>
 </mat-dialog-actions>
diff --git a/bookie/src/app/sales/choose-customer/choose-customer.component.ts b/bookie/src/app/sales/choose-customer/choose-customer.component.ts
index 20681a7..859f32f 100644
--- a/bookie/src/app/sales/choose-customer/choose-customer.component.ts
+++ b/bookie/src/app/sales/choose-customer/choose-customer.component.ts
@@ -79,6 +79,7 @@ export class ChooseCustomerComponent {
 
   save() {
     const customer = this.getItem();
+    console.log(customer);
     const promise = this.ser.saveOrUpdate(customer);
     promise.subscribe((x) => this.dialogRef.close(x));
   }
@@ -96,15 +97,15 @@ export class ChooseCustomerComponent {
   }
 
   getItem(): Customer {
-    const formModel = this.formModel();
+    const formValue = this.form().value();
 
     return new Customer({
-      id: formModel.id,
-      name: formModel.name ?? '',
-      phone: formModel.phone ?? '',
-      address: formModel.address ?? '',
-      printInBill: formModel.printInBill ?? false,
-      discounts: formModel.discounts.map((item) => ({ ...item })),
+      id: formValue.id,
+      name: formValue.name ?? '',
+      phone: formValue.phone ?? '',
+      address: formValue.address ?? '',
+      printInBill: formValue.printInBill ?? false,
+      discounts: formValue.discounts.map((item) => ({ ...item })),
     });
   }
 }
diff --git a/bookie/src/app/sales/discount/discount.component.html b/bookie/src/app/sales/discount/discount.component.html
index 7bd684e..446801b 100644
--- a/bookie/src/app/sales/discount/discount.component.html
+++ b/bookie/src/app/sales/discount/discount.component.html
@@ -16,7 +16,7 @@
             <input matInput type="number" [formField]="form.discounts[i].discount" autocomplete="off" />
             <span matTextSuffix>%</span>
             <mat-hint>Cust: {{ row.customer | percent: '1.2-2' }}</mat-hint>
-            <mat-hint align="end">Max: {{ row.limit | percent: '1.2-2' }}</mat-hint>
+            <mat-hint>Max: {{ row.limit | percent: '1.2-2' }}</mat-hint>
           </mat-form-field>
         </mat-cell>
       </ng-container>
@@ -26,7 +26,7 @@
     </mat-table>
   </form>
 </mat-dialog-content>
-<mat-dialog-actions align="end">
+<mat-dialog-actions>
   <button mat-button [mat-dialog-close]="false">Cancel</button>
   <button type="button" mat-button (click)="accept()" color="primary">Ok</button>
 </mat-dialog-actions>
diff --git a/bookie/src/app/sales/modifiers/modifiers.component.html b/bookie/src/app/sales/modifiers/modifiers.component.html
index 1685aac..92a75f0 100644
--- a/bookie/src/app/sales/modifiers/modifiers.component.html
+++ b/bookie/src/app/sales/modifiers/modifiers.component.html
@@ -30,6 +30,6 @@
     }
   </mat-tab-group>
 </mat-dialog-content>
-<mat-dialog-actions align="end">
+<mat-dialog-actions>
   <button mat-button [mat-dialog-close]="selected()">Done</button>
 </mat-dialog-actions>
diff --git a/bookie/src/app/sales/reason/reason.component.html b/bookie/src/app/sales/reason/reason.component.html
index 023dfb7..d17cf9f 100644
--- a/bookie/src/app/sales/reason/reason.component.html
+++ b/bookie/src/app/sales/reason/reason.component.html
@@ -26,7 +26,7 @@
     </mat-table>
   </form>
 </mat-dialog-content>
-<mat-dialog-actions align="end">
+<mat-dialog-actions>
   <button mat-button [mat-dialog-close]="false">Cancel</button>
   <button type="button" mat-button (click)="accept()" color="primary" [disabled]="!selected">Ok</button>
 </mat-dialog-actions>
diff --git a/bookie/src/app/sales/receive-payment/receive-payment.component.html b/bookie/src/app/sales/receive-payment/receive-payment.component.html
index 479eaa4..942ef02 100644
--- a/bookie/src/app/sales/receive-payment/receive-payment.component.html
+++ b/bookie/src/app/sales/receive-payment/receive-payment.component.html
@@ -48,7 +48,7 @@
       </mat-form-field>
     </form>
   </mat-dialog-content>
-  <mat-dialog-actions align="end">
+  <mat-dialog-actions>
     <button mat-button [mat-dialog-close]>Cancel</button>
     <button type="button" mat-button (click)="accept()" color="primary" [disabled]="!!balance()">Ok</button>
   </mat-dialog-actions>
diff --git a/bookie/src/app/sales/split-bill/split-bill.component.html b/bookie/src/app/sales/split-bill/split-bill.component.html
index a2c8089..ddbdd15 100644
--- a/bookie/src/app/sales/split-bill/split-bill.component.html
+++ b/bookie/src/app/sales/split-bill/split-bill.component.html
@@ -10,7 +10,7 @@
     </div>
   </form>
 </mat-dialog-content>
-<mat-dialog-actions align="end">
+<mat-dialog-actions>
   <button mat-button [mat-dialog-close]="false">Cancel</button>
   <button type="button" mat-button (click)="accept()" color="primary">Ok</button>
 </mat-dialog-actions>
diff --git a/bookie/src/app/sales/tables-dialog/tables-dialog.component.html b/bookie/src/app/sales/tables-dialog/tables-dialog.component.html
index e4e9024..68ef0e5 100644
--- a/bookie/src/app/sales/tables-dialog/tables-dialog.component.html
+++ b/bookie/src/app/sales/tables-dialog/tables-dialog.component.html
@@ -23,7 +23,7 @@
     }
   </div>
 </mat-dialog-content>
-<mat-dialog-actions align="end">
+<mat-dialog-actions>
   <button mat-button [mat-dialog-close]="false">Cancel</button>
   <button type="button" mat-button (click)="accept()" color="primary">Ok</button>
 </mat-dialog-actions>