diff --git a/bookie/src/app/app.component.html b/bookie/src/app/app.component.html
index 758d87e2..5db390d0 100644
--- a/bookie/src/app/app.component.html
+++ b/bookie/src/app/app.component.html
@@ -1,4 +1,4 @@
 <app-nav-bar></app-nav-bar>
-<div class="flex flex-col justify-center items-stretch mat-app-background basic-container">
+<div class="flex-col justify-center items-stretch mat-app-background basic-container">
   <router-outlet></router-outlet>
 </div>
diff --git a/bookie/src/app/app.config.ts b/bookie/src/app/app.config.ts
index 65fd87ad..f1f3f330 100644
--- a/bookie/src/app/app.config.ts
+++ b/bookie/src/app/app.config.ts
@@ -4,7 +4,6 @@ import { ApplicationConfig, LOCALE_ID, importProvidersFrom, provideZonelessChang
 import { ReactiveFormsModule } from '@angular/forms';
 import { MomentDateAdapter } from '@angular/material-moment-adapter';
 import { MatButtonModule } from '@angular/material/button';
-import { MatCardModule } from '@angular/material/card';
 import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatDividerModule } from '@angular/material/divider';
@@ -34,7 +33,7 @@ export const appConfig: ApplicationConfig = {
     importProvidersFrom(
       BrowserModule,
       MatButtonModule,
-      MatCardModule,
+
       MatDialogModule,
       MatDividerModule,
       MatFormFieldModule,
diff --git a/bookie/src/app/auth/login/login.component.html b/bookie/src/app/auth/login/login.component.html
index 7aa39ae5..14a58682 100644
--- a/bookie/src/app/auth/login/login.component.html
+++ b/bookie/src/app/auth/login/login.component.html
@@ -1,5 +1,5 @@
 <h2>Login</h2>
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Username</mat-label>
diff --git a/bookie/src/app/beer-sale-report/beer-sale-report.component.html b/bookie/src/app/beer-sale-report/beer-sale-report.component.html
index 2bbf9cb1..6b5d8969 100644
--- a/bookie/src/app/beer-sale-report/beer-sale-report.component.html
+++ b/bookie/src/app/beer-sale-report/beer-sale-report.component.html
@@ -5,7 +5,7 @@
   </button>
 </h2>
 
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container sm:max-lg:flex-col">
     <mat-form-field class="flex-auto basis-2-5">
       <mat-label>Start Date</mat-label>
diff --git a/bookie/src/app/bill-settlement-report/bill-settlement-report.component.html b/bookie/src/app/bill-settlement-report/bill-settlement-report.component.html
index fead5c90..838bc0d5 100644
--- a/bookie/src/app/bill-settlement-report/bill-settlement-report.component.html
+++ b/bookie/src/app/bill-settlement-report/bill-settlement-report.component.html
@@ -5,7 +5,7 @@
   </button>
 </h2>
 
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container sm:max-lg:flex-col">
     <mat-form-field class="flex-auto basis-2-5">
       <mat-label>Start Date</mat-label>
diff --git a/bookie/src/app/cashier-report/cashier-report.component.html b/bookie/src/app/cashier-report/cashier-report.component.html
index 84d7288b..4617a8d1 100644
--- a/bookie/src/app/cashier-report/cashier-report.component.html
+++ b/bookie/src/app/cashier-report/cashier-report.component.html
@@ -9,7 +9,7 @@
   </button>
 </h2>
 
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container sm:max-lg:flex-col">
     <mat-form-field class="flex-auto">
       <mat-label>Start Date</mat-label>
diff --git a/bookie/src/app/customers/customer-detail/customer-detail.component.html b/bookie/src/app/customers/customer-detail/customer-detail.component.html
index 923de991..e1d6fb2c 100644
--- a/bookie/src/app/customers/customer-detail/customer-detail.component.html
+++ b/bookie/src/app/customers/customer-detail/customer-detail.component.html
@@ -1,24 +1,24 @@
 <h2>Customer</h2>
-<form [formGroup]="form" class="flex flex-col">
-  <div class="flex flex-row">
+<form [formGroup]="form" class="flex-col">
+  <div class="flex-row">
     <mat-form-field class="flex-auto">
       <mat-label>Name</mat-label>
       <input matInput #nameElement formControlName="name" />
     </mat-form-field>
   </div>
-  <div class="flex flex-row">
+  <div class="flex-row">
     <mat-form-field class="flex-auto">
       <mat-label>Phone</mat-label>
       <input matInput formControlName="phone" />
     </mat-form-field>
   </div>
-  <div class="flex flex-row">
+  <div class="flex-row">
     <mat-form-field class="flex-auto">
       <mat-label>Address</mat-label>
       <textarea matInput formControlName="address"> </textarea>
     </mat-form-field>
   </div>
-  <div class="flex flex-row">
+  <div class="flex-row">
     <mat-checkbox formControlName="printInBill">Print in Bill?</mat-checkbox>
   </div>
   <mat-divider></mat-divider>
diff --git a/bookie/src/app/customers/customer-list/customer-list.component.html b/bookie/src/app/customers/customer-list/customer-list.component.html
index 75573cb1..b37ac040 100644
--- a/bookie/src/app/customers/customer-list/customer-list.component.html
+++ b/bookie/src/app/customers/customer-list/customer-list.component.html
@@ -5,8 +5,8 @@
     Add
   </a>
 </h2>
-<form [formGroup]="form" class="flex flex-col">
-  <div class="flex flex-row">
+<form [formGroup]="form" class="flex-col">
+  <div class="flex-row">
     <mat-form-field class="flex-auto">
       <mat-label>Filter</mat-label>
       <input type="text" matInput #filterElement formControlName="filter" autocomplete="off" />
diff --git a/bookie/src/app/devices/device-detail/device-detail.component.html b/bookie/src/app/devices/device-detail/device-detail.component.html
index cde5da3b..2ddadab2 100644
--- a/bookie/src/app/devices/device-detail/device-detail.component.html
+++ b/bookie/src/app/devices/device-detail/device-detail.component.html
@@ -1,12 +1,12 @@
 <h2>Device</h2>
-<form [formGroup]="form" class="flex flex-col">
-  <div class="flex flex-row">
+<form [formGroup]="form" class="flex-col">
+  <div class="flex-row">
     <mat-form-field class="flex-auto">
       <mat-label>Name</mat-label>
       <input matInput #nameElement formControlName="name" (keyup.enter)="save()" />
     </mat-form-field>
   </div>
-  <div class="flex flex-row">
+  <div class="flex-row">
     <mat-form-field class="flex-auto">
       <mat-label>Section</mat-label>
       <mat-select formControlName="section">
@@ -18,7 +18,7 @@
       </mat-select>
     </mat-form-field>
   </div>
-  <div class="flex flex-row">
+  <div class="flex-row">
     <mat-checkbox formControlName="enabled" class="flex-auto">Enabled?</mat-checkbox>
   </div>
 </form>
diff --git a/bookie/src/app/discount-report/discount-report.component.html b/bookie/src/app/discount-report/discount-report.component.html
index a7b757a6..8447dbbd 100644
--- a/bookie/src/app/discount-report/discount-report.component.html
+++ b/bookie/src/app/discount-report/discount-report.component.html
@@ -9,7 +9,7 @@
   </button>
 </h2>
 
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container sm:max-lg:flex-col">
     <mat-form-field class="flex-auto basis-2-5">
       <mat-label>Start Date</mat-label>
diff --git a/bookie/src/app/guest-book/guest-book-detail/guest-book-detail.component.html b/bookie/src/app/guest-book/guest-book-detail/guest-book-detail.component.html
index c936cf1f..872d5448 100644
--- a/bookie/src/app/guest-book/guest-book-detail/guest-book-detail.component.html
+++ b/bookie/src/app/guest-book/guest-book-detail/guest-book-detail.component.html
@@ -1,5 +1,5 @@
 <h2>Guest Details</h2>
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Name</mat-label>
diff --git a/bookie/src/app/guest-book/guest-book-list/guest-book-list.component.html b/bookie/src/app/guest-book/guest-book-list/guest-book-list.component.html
index 20952f7c..456f83d4 100644
--- a/bookie/src/app/guest-book/guest-book-list/guest-book-list.component.html
+++ b/bookie/src/app/guest-book/guest-book-list/guest-book-list.component.html
@@ -10,7 +10,7 @@
   </a>
 </h2>
 
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Date</mat-label>
diff --git a/bookie/src/app/header-footer/header-footer.component.html b/bookie/src/app/header-footer/header-footer.component.html
index c8cad35e..d2d66eaa 100644
--- a/bookie/src/app/header-footer/header-footer.component.html
+++ b/bookie/src/app/header-footer/header-footer.component.html
@@ -1,4 +1,4 @@
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Header / Footer</mat-label>
diff --git a/bookie/src/app/home/home.component.html b/bookie/src/app/home/home.component.html
index 1bf674d4..73c49ffc 100644
--- a/bookie/src/app/home/home.component.html
+++ b/bookie/src/app/home/home.component.html
@@ -3,17 +3,17 @@
     <h2>Sales</h2>
   }
   @if (auth.allowed('customers')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'guest-book']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'guest-book']">
       <h3>Guest Book</h3>
     </mat-card>
   }
   @if (auth.allowed('sales')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'sales']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'sales']">
       <h3>Sales</h3>
     </mat-card>
   }
   @if (auth.allowed('customers')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'customers']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'customers']">
       <h3>Customers</h3>
     </mat-card>
   }
@@ -29,42 +29,42 @@
     <h2>Reports</h2>
   }
   @if (auth.allowed('cashier-report')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'cashier-report']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'cashier-report']">
       <h3>Cashier Report</h3>
     </mat-card>
   }
   @if (auth.allowed('sale-report')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'sale-report']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'sale-report']">
       <h3>Sale Report</h3>
     </mat-card>
   }
   @if (auth.allowed('tax-report')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'tax-report']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'tax-report']">
       <h3>Tax Report</h3>
     </mat-card>
   }
   @if (auth.allowed('product-sale-report')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'product-sale-report']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'product-sale-report']">
       <h3>Product Sale Report</h3>
     </mat-card>
   }
   @if (auth.allowed('bill-settlement-report')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'bill-settlement-report']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'bill-settlement-report']">
       <h3>Bill Settlement Report</h3>
     </mat-card>
   }
   @if (auth.allowed('beer-sale-report')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'beer-sale-report']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'beer-sale-report']">
       <h3>Beer Sale Report</h3>
     </mat-card>
   }
   @if (auth.allowed('discount-report')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'discount-report']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'discount-report']">
       <h3>Discount Report</h3>
     </mat-card>
   }
   @if (auth.allowed('product-sale-report')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'menu-engineering-report']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'menu-engineering-report']">
       <h3>Menu Engineering Report</h3>
     </mat-card>
   }
@@ -72,32 +72,32 @@
     <h2>Products</h2>
   }
   @if (auth.allowed('products')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'products']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'products']">
       <h3>Products</h3>
     </mat-card>
   }
   @if (auth.allowed('temporal-products')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'temporal-products']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'temporal-products']">
       <h3>Temporal Products</h3>
     </mat-card>
   }
   @if (auth.allowed('products')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'update-product-prices']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'update-product-prices']">
       <h3>Update Product Prices</h3>
     </mat-card>
   }
   @if (auth.allowed('products')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'product-updates-report']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'product-updates-report']">
       <h3>Product Updates Report</h3>
     </mat-card>
   }
   @if (auth.allowed('modifiers')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'modifiers']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'modifiers']">
       <h3>Modifiers</h3>
     </mat-card>
   }
   @if (auth.allowed('modifiers')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'modifier-categories']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'modifier-categories']">
       <h3>Modifier Categories</h3>
     </mat-card>
   }
@@ -113,47 +113,47 @@
     <h2>Masters</h2>
   }
   @if (auth.allowed('sections')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'tables']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'tables']">
       <h3>Tables</h3>
     </mat-card>
   }
   @if (auth.allowed('sections')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'sections']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'sections']">
       <h3>Sections</h3>
     </mat-card>
   }
   @if (auth.allowed('products')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'menu-categories']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'menu-categories']">
       <h3>Menu Categories</h3>
     </mat-card>
   }
   @if (auth.allowed('products')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'sale-categories']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'sale-categories']">
       <h3>Sale Categories</h3>
     </mat-card>
   }
   @if (auth.allowed('taxes')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'taxes']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'taxes']">
       <h3>Taxes</h3>
     </mat-card>
   }
   @if (auth.allowed('regimes')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'regimes']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'regimes']">
       <h3>Regimes</h3>
     </mat-card>
   }
   @if (auth.allowed('devices')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'devices']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'devices']">
       <h3>Devices</h3>
     </mat-card>
   }
   @if (auth.allowed('section-printers')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'section-printers']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'section-printers']">
       <h3>Section Printers</h3>
     </mat-card>
   }
   @if (auth.allowed('printers')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'printers']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'printers']">
       <h3>Printers</h3>
     </mat-card>
   }
@@ -161,32 +161,32 @@
     <h2>Users</h2>
   }
   @if (auth.allowed('users')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'roles']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'roles']">
       <h3>Roles</h3>
     </mat-card>
   }
   @if (auth.allowed('users')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'users']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'users']">
       <h3>Users</h3>
     </mat-card>
   }
   @if (auth.allowed('authenticated')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'users', 'me']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'users', 'me']">
       <h3>Change Password</h3>
     </mat-card>
   }
   @if (auth.allowed('owner')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'header-footer']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'header-footer']">
       <h3>Header / Footer</h3>
     </mat-card>
   }
   @if (auth.allowed('owner')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'settle-options']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'settle-options']">
       <h3>Settle Options</h3>
     </mat-card>
   }
   @if (auth.allowed('settings')) {
-    <mat-card class="flex flex-col square-button" matRipple [routerLink]="['/', 'settings']">
+    <mat-card class="flex-col square-button" matRipple [routerLink]="['/', 'settings']">
       <h3>Settings</h3>
     </mat-card>
   }
diff --git a/bookie/src/app/menu-category/menu-category-detail/menu-category-detail.component.html b/bookie/src/app/menu-category/menu-category-detail/menu-category-detail.component.html
index 835d2ed1..731b01f2 100644
--- a/bookie/src/app/menu-category/menu-category-detail/menu-category-detail.component.html
+++ b/bookie/src/app/menu-category/menu-category-detail/menu-category-detail.component.html
@@ -1,5 +1,5 @@
 <h2>Menu Category</h2>
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Name</mat-label>
diff --git a/bookie/src/app/menu-engineering-report/menu-engineering-report.component.html b/bookie/src/app/menu-engineering-report/menu-engineering-report.component.html
index 97801adb..d3725078 100644
--- a/bookie/src/app/menu-engineering-report/menu-engineering-report.component.html
+++ b/bookie/src/app/menu-engineering-report/menu-engineering-report.component.html
@@ -9,7 +9,7 @@
   </button>
 </h2>
 
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto basis-2-5">
       <mat-label>Start Date</mat-label>
diff --git a/bookie/src/app/modifier-categories/modifier-category-detail/modifier-category-detail.component.html b/bookie/src/app/modifier-categories/modifier-category-detail/modifier-category-detail.component.html
index ce951501..96285419 100644
--- a/bookie/src/app/modifier-categories/modifier-category-detail/modifier-category-detail.component.html
+++ b/bookie/src/app/modifier-categories/modifier-category-detail/modifier-category-detail.component.html
@@ -1,5 +1,5 @@
 <h2>Modifier Category</h2>
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Name</mat-label>
diff --git a/bookie/src/app/modifiers/modifier-detail/modifier-detail.component.html b/bookie/src/app/modifiers/modifier-detail/modifier-detail.component.html
index 6c992437..b4a5979a 100644
--- a/bookie/src/app/modifiers/modifier-detail/modifier-detail.component.html
+++ b/bookie/src/app/modifiers/modifier-detail/modifier-detail.component.html
@@ -1,5 +1,5 @@
 <h2>Modifier</h2>
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Name</mat-label>
diff --git a/bookie/src/app/modifiers/modifier-list/modifier-list.component.html b/bookie/src/app/modifiers/modifier-list/modifier-list.component.html
index d1de7759..62fce671 100644
--- a/bookie/src/app/modifiers/modifier-list/modifier-list.component.html
+++ b/bookie/src/app/modifiers/modifier-list/modifier-list.component.html
@@ -5,7 +5,7 @@
     Add
   </a>
 </h2>
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Modifier Category</mat-label>
@@ -34,7 +34,7 @@
     <mat-header-cell *matHeaderCellDef>Show In Bill</mat-header-cell>
     <mat-cell *matCellDef="let row">
       <div layout="row">
-        <div flex>
+        <div>
           <mat-icon>
             {{ row.showInBill ? 'visibility' : 'visibility_off' }}
           </mat-icon>
diff --git a/bookie/src/app/printers/printer-detail/printer-detail.component.html b/bookie/src/app/printers/printer-detail/printer-detail.component.html
index aa02d0b1..208cd71e 100644
--- a/bookie/src/app/printers/printer-detail/printer-detail.component.html
+++ b/bookie/src/app/printers/printer-detail/printer-detail.component.html
@@ -1,5 +1,5 @@
 <h2>Printer</h2>
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Name</mat-label>
diff --git a/bookie/src/app/product-sale-report/product-sale-report.component.html b/bookie/src/app/product-sale-report/product-sale-report.component.html
index 16a4e18b..575b3f8f 100644
--- a/bookie/src/app/product-sale-report/product-sale-report.component.html
+++ b/bookie/src/app/product-sale-report/product-sale-report.component.html
@@ -9,7 +9,7 @@
   </button>
 </h2>
 
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container sm:max-lg:flex-col">
     <mat-form-field class="flex-auto basis-1-3">
       <mat-label>Start Date</mat-label>
diff --git a/bookie/src/app/product-updates-report/product-updates-report.component.html b/bookie/src/app/product-updates-report/product-updates-report.component.html
index 2e9a4108..ff3aabc5 100644
--- a/bookie/src/app/product-updates-report/product-updates-report.component.html
+++ b/bookie/src/app/product-updates-report/product-updates-report.component.html
@@ -5,7 +5,7 @@
   </button>
 </h2>
 
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container sm:max-lg:flex-col">
     <mat-form-field class="flex-auto basis-2-5">
       <mat-label>Start Date</mat-label>
diff --git a/bookie/src/app/product/product-detail/product-detail.component.html b/bookie/src/app/product/product-detail/product-detail.component.html
index fc06f190..240bbdf0 100644
--- a/bookie/src/app/product/product-detail/product-detail.component.html
+++ b/bookie/src/app/product/product-detail/product-detail.component.html
@@ -1,11 +1,11 @@
 <h2>Product</h2>
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form">
   <div class="row-container">
-    <mat-form-field class="flex-auto basis-3-4">
+    <mat-form-field class="basis-3-4">
       <mat-label>Name</mat-label>
       <input matInput #name formControlName="name" />
     </mat-form-field>
-    <mat-form-field class="flex-auto basis-1-4">
+    <mat-form-field class="basis-1-4">
       <mat-label>Units</mat-label>
       <input matInput formControlName="units" />
     </mat-form-field>
diff --git a/bookie/src/app/product/product-list/product-list.component.html b/bookie/src/app/product/product-list/product-list.component.html
index 18119d31..10f8faf2 100644
--- a/bookie/src/app/product/product-list/product-list.component.html
+++ b/bookie/src/app/product/product-list/product-list.component.html
@@ -16,7 +16,7 @@
     Add
   </a>
 </h2>
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Filter</mat-label>
@@ -74,13 +74,13 @@
     <mat-header-cell *matHeaderCellDef>Details</mat-header-cell>
     <mat-cell *matCellDef="let row">
       <div layout="row">
-        <div flex>
+        <div>
           <mat-icon>
             {{ row.hasHappyHour ? 'sentiment_satisfied_alt' : 'sentiment_dissatisfied' }}
           </mat-icon>
           <b> {{ row.hasHappyHour ? 'Happy Hour' : 'Regular' }}</b>
         </div>
-        <div flex>
+        <div>
           <mat-icon>
             {{ row.isNotAvailable ? 'pause' : 'play_arrow' }}
           </mat-icon>
diff --git a/bookie/src/app/regimes/regime-detail/regime-detail.component.html b/bookie/src/app/regimes/regime-detail/regime-detail.component.html
index 164bf91a..303efffe 100644
--- a/bookie/src/app/regimes/regime-detail/regime-detail.component.html
+++ b/bookie/src/app/regimes/regime-detail/regime-detail.component.html
@@ -1,5 +1,5 @@
 <h2>Regime</h2>
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Name</mat-label>
diff --git a/bookie/src/app/roles/role-detail/role-detail.component.html b/bookie/src/app/roles/role-detail/role-detail.component.html
index 5a752b94..b7ec1b68 100644
--- a/bookie/src/app/roles/role-detail/role-detail.component.html
+++ b/bookie/src/app/roles/role-detail/role-detail.component.html
@@ -1,5 +1,5 @@
 <h2>Role</h2>
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Name</mat-label>
diff --git a/bookie/src/app/sale-category/sale-category-detail/sale-category-detail.component.html b/bookie/src/app/sale-category/sale-category-detail/sale-category-detail.component.html
index 9b0730ce..ddef183f 100644
--- a/bookie/src/app/sale-category/sale-category-detail/sale-category-detail.component.html
+++ b/bookie/src/app/sale-category/sale-category-detail/sale-category-detail.component.html
@@ -1,5 +1,5 @@
 <h2>Sale Category</h2>
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Name</mat-label>
diff --git a/bookie/src/app/sale-report/sale-report.component.html b/bookie/src/app/sale-report/sale-report.component.html
index 3d79ecb1..929b0e37 100644
--- a/bookie/src/app/sale-report/sale-report.component.html
+++ b/bookie/src/app/sale-report/sale-report.component.html
@@ -9,7 +9,7 @@
   </button>
 </h2>
 
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container sm:max-lg:flex-col">
     <mat-form-field class="flex-auto basis-1-3">
       <mat-label>Start Date</mat-label>
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 ad15b9e1..be4e2b83 100644
--- a/bookie/src/app/sales/bill-type/bill-type.component.html
+++ b/bookie/src/app/sales/bill-type/bill-type.component.html
@@ -2,7 +2,7 @@
 <mat-dialog-content>
   <div class="tables-grid">
     <mat-card
-      class="flex flex-col square-button"
+      class="flex-col square-button"
       matRipple
       (click)="select('REGULAR_BILL')"
       [class.strong-primary]="selected === 'REGULAR_BILL'"
@@ -11,7 +11,7 @@
       <h3>Regular</h3>
     </mat-card>
     <mat-card
-      class="flex flex-col square-button"
+      class="flex-col square-button"
       matRipple
       (click)="select('STAFF')"
       [class.strong-primary]="selected === 'STAFF'"
@@ -20,7 +20,7 @@
       <h3>Staff</h3>
     </mat-card>
     <mat-card
-      class="flex flex-col square-button"
+      class="flex-col square-button"
       matRipple
       (click)="select('NO_CHARGE')"
       [class.strong-primary]="selected === 'NO_CHARGE'"
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 958fb68e..5781572a 100644
--- a/bookie/src/app/sales/choose-customer/choose-customer.component.html
+++ b/bookie/src/app/sales/choose-customer/choose-customer.component.html
@@ -1,6 +1,6 @@
 <h2 mat-dialog-title>Customer</h2>
 <mat-dialog-content>
-  <form [formGroup]="form" class="flex flex-col">
+  <form [formGroup]="form" class="flex-col">
     <div class="row-container">
       <mat-form-field class="flex-auto">
         <mat-label>Phone</mat-label>
diff --git a/bookie/src/app/sales/discount/discount.component.html b/bookie/src/app/sales/discount/discount.component.html
index 41228ff3..59200c46 100644
--- a/bookie/src/app/sales/discount/discount.component.html
+++ b/bookie/src/app/sales/discount/discount.component.html
@@ -1,6 +1,6 @@
 <h2 mat-dialog-title>Discount</h2>
 <mat-dialog-content>
-  <form [formGroup]="form" class="flex flex-col">
+  <form [formGroup]="form" class="flex-col">
     <mat-table #table [dataSource]="dataSource" formArrayName="discounts">
       <!-- Name Column -->
       <ng-container matColumnDef="name">
diff --git a/bookie/src/app/sales/home/sales-home.component.html b/bookie/src/app/sales/home/sales-home.component.html
index f624b4e4..953daafa 100644
--- a/bookie/src/app/sales/home/sales-home.component.html
+++ b/bookie/src/app/sales/home/sales-home.component.html
@@ -1,6 +1,6 @@
 <div class="tables-grid">
   <mat-card
-    class="primary flex flex-col square-button"
+    class="primary flex-col square-button"
     matRipple
     [routerLink]="['menu-categories']"
     queryParamsHandling="preserve"
@@ -8,7 +8,7 @@
     <h3>Add Product</h3>
   </mat-card>
   <mat-card
-    class="flex flex-col square-button"
+    class="flex-col square-button"
     matRipple
     (click)="discount()"
     [class.disabled]="!discountAllowed()"
@@ -17,7 +17,7 @@
     <h3>Discount</h3>
   </mat-card>
   <mat-card
-    class="flex flex-col square-button"
+    class="flex-col square-button"
     matRipple
     (click)="printKot()"
     [class.disabled]="!printKotAllowed()"
@@ -26,7 +26,7 @@
     <h3>Print KOT</h3>
   </mat-card>
   <mat-card
-    class="flex flex-col square-button"
+    class="flex-col square-button"
     matRipple
     (click)="printBill()"
     [class.disabled]="!printBillAllowed()"
@@ -34,11 +34,11 @@
   >
     <h3>Print Bill</h3>
   </mat-card>
-  <mat-card class="flex flex-col square-button warn" matRipple [routerLink]="['/', 'sales', 'tables']">
+  <mat-card class="flex-col square-button warn" matRipple [routerLink]="['/', 'sales', 'tables']">
     <h3>Back to Tables</h3>
   </mat-card>
   <mat-card
-    class="flex flex-col square-button"
+    class="flex-col square-button"
     matRipple
     (click)="receivePayment()"
     [class.disabled]="!receivePaymentAllowed()"
@@ -47,7 +47,7 @@
     <h3>Receive Payment</h3>
   </mat-card>
   <mat-card
-    class="flex flex-col square-button"
+    class="flex-col square-button"
     matRipple
     (click)="moveTable()"
     [class.disabled]="!moveTableAllowed()"
@@ -56,7 +56,7 @@
     <h3>Move Table</h3>
   </mat-card>
   <mat-card
-    class="flex flex-col square-button"
+    class="flex-col square-button"
     matRipple
     (click)="cancelBill()"
     [class.disabled]="!cancelBillAllowed()"
@@ -65,7 +65,7 @@
     <h3>Cancel Bill</h3>
   </mat-card>
   <mat-card
-    class="flex flex-col square-button"
+    class="flex-col square-button"
     matRipple
     (click)="splitBill()"
     [class.disabled]="!splitBillAllowed()"
diff --git a/bookie/src/app/sales/menu-categories/menu-categories.component.html b/bookie/src/app/sales/menu-categories/menu-categories.component.html
index 2f5e075e..ebc0f6ae 100644
--- a/bookie/src/app/sales/menu-categories/menu-categories.component.html
+++ b/bookie/src/app/sales/menu-categories/menu-categories.component.html
@@ -1,10 +1,10 @@
 <div class="tables-grid">
-  <mat-card class="flex flex-col square-button warn" matRipple [routerLink]="['../']" queryParamsHandling="preserve">
+  <mat-card class="flex-col square-button warn" matRipple [routerLink]="['../']" queryParamsHandling="preserve">
     <h3>Back</h3>
   </mat-card>
   @for (item of list; track item) {
     <mat-card
-      class="primary flex flex-col square-button"
+      class="primary flex-col square-button"
       matRipple
       [routerLink]="['../products', item.id]"
       queryParamsHandling="preserve"
diff --git a/bookie/src/app/sales/modifiers/modifiers.component.html b/bookie/src/app/sales/modifiers/modifiers.component.html
index b5ec2b1c..c3d626b9 100644
--- a/bookie/src/app/sales/modifiers/modifiers.component.html
+++ b/bookie/src/app/sales/modifiers/modifiers.component.html
@@ -16,7 +16,7 @@
         <div class="tables-grid">
           @for (m of item.modifiers; track m.id) {
             <mat-card
-              class="flex flex-col square-button"
+              class="flex-col square-button"
               matRipple
               (click)="select(m)"
               [class.primary]="selectedIds.indexOf(m.id) === -1"
diff --git a/bookie/src/app/sales/products/products.component.html b/bookie/src/app/sales/products/products.component.html
index 9b20512c..620e0689 100644
--- a/bookie/src/app/sales/products/products.component.html
+++ b/bookie/src/app/sales/products/products.component.html
@@ -1,6 +1,6 @@
 <div class="tables-grid">
   <mat-card
-    class="flex flex-col square-button warn"
+    class="flex-col square-button warn"
     matRipple
     [routerLink]="['../../menu-categories']"
     queryParamsHandling="preserve"
@@ -9,7 +9,7 @@
   </mat-card>
   @for (item of list; track item) {
     <mat-card
-      class="flex flex-col square-button"
+      class="flex-col square-button"
       matRipple
       (click)="addProduct(item)"
       [class.accent]="item.hasHappyHour"
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 71f5013b..783df611 100644
--- a/bookie/src/app/sales/receive-payment/receive-payment.component.html
+++ b/bookie/src/app/sales/receive-payment/receive-payment.component.html
@@ -1,6 +1,6 @@
 <h2 mat-dialog-title>Receive Payment</h2>
 <mat-dialog-content>
-  <form [formGroup]="form" class="flex flex-col">
+  <form [formGroup]="form" class="flex-col">
     <mat-table
       #table
       [dataSource]="dataSource"
diff --git a/bookie/src/app/sales/running-tables/running-tables.component.html b/bookie/src/app/sales/running-tables/running-tables.component.html
index db5eac04..9e7191b1 100644
--- a/bookie/src/app/sales/running-tables/running-tables.component.html
+++ b/bookie/src/app/sales/running-tables/running-tables.component.html
@@ -3,7 +3,7 @@
 <div class="tables-grid">
   @for (table of list; track table) {
     <mat-card
-      class="flex flex-col square-button"
+      class="flex-col square-button"
       matRipple
       (click)="navigateToBill(table)"
       [class.primary]="table.status !== 'running' && table.status !== 'printed'"
@@ -21,7 +21,7 @@
       }
     </mat-card>
   }
-  <mat-card class="flex flex-col square-button strong-primary" matRipple (click)="openBill()">
+  <mat-card class="flex-col square-button strong-primary" matRipple (click)="openBill()">
     <h3>Open Bill</h3>
   </mat-card>
 </div>
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 30aa9bb8..0b0aaf7a 100644
--- a/bookie/src/app/sales/split-bill/split-bill.component.html
+++ b/bookie/src/app/sales/split-bill/split-bill.component.html
@@ -1,6 +1,6 @@
 <h2 mat-dialog-title>Select Sale Categories</h2>
 <mat-dialog-content>
-  <form [formGroup]="form" class="flex flex-col">
+  <form [formGroup]="form" class="flex-col">
     <div formArrayName="saleCategories">
       @for (sc of list; track sc; let i = $index) {
         <div [formGroupName]="i" class="row-container">
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 bf72b788..9741c6e3 100644
--- a/bookie/src/app/sales/tables-dialog/tables-dialog.component.html
+++ b/bookie/src/app/sales/tables-dialog/tables-dialog.component.html
@@ -3,7 +3,7 @@
   <div class="tables-grid">
     @for (table of list; track table) {
       <mat-card
-        class="flex flex-col square-button"
+        class="flex-col square-button"
         matRipple
         (click)="select(table)"
         [class.primary]="table.status === 'running'"
diff --git a/bookie/src/app/section-printers/section-printer.component.html b/bookie/src/app/section-printers/section-printer.component.html
index 1d792a24..d389de0a 100644
--- a/bookie/src/app/section-printers/section-printer.component.html
+++ b/bookie/src/app/section-printers/section-printer.component.html
@@ -1,4 +1,4 @@
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Section</mat-label>
diff --git a/bookie/src/app/sections/section-detail/section-detail.component.html b/bookie/src/app/sections/section-detail/section-detail.component.html
index 64f0feae..43b3a7f6 100644
--- a/bookie/src/app/sections/section-detail/section-detail.component.html
+++ b/bookie/src/app/sections/section-detail/section-detail.component.html
@@ -1,5 +1,5 @@
 <h2>Section</h2>
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Name</mat-label>
diff --git a/bookie/src/app/settings/settings.component.html b/bookie/src/app/settings/settings.component.html
index 36b8c3ef..4d3068d6 100644
--- a/bookie/src/app/settings/settings.component.html
+++ b/bookie/src/app/settings/settings.component.html
@@ -11,7 +11,7 @@
   <mat-tab label="DB Maintenance">
     <mat-card>
       <mat-card-content>
-        <form [formGroup]="maintenanceForm" class="flex flex-col">
+        <form [formGroup]="maintenanceForm" class="flex-col">
           <div class="row-container">
             <mat-form-field class="flex-auto">
               <mat-label>Start Date</mat-label>
diff --git a/bookie/src/app/settle-option/settle-option-detail/settle-option-detail.component.html b/bookie/src/app/settle-option/settle-option-detail/settle-option-detail.component.html
index 51a1d747..4f84b677 100644
--- a/bookie/src/app/settle-option/settle-option-detail/settle-option-detail.component.html
+++ b/bookie/src/app/settle-option/settle-option-detail/settle-option-detail.component.html
@@ -1,5 +1,5 @@
 <h2>Settle Option</h2>
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Name</mat-label>
diff --git a/bookie/src/app/tables/table-detail/table-detail.component.html b/bookie/src/app/tables/table-detail/table-detail.component.html
index daf342ba..cde68af1 100644
--- a/bookie/src/app/tables/table-detail/table-detail.component.html
+++ b/bookie/src/app/tables/table-detail/table-detail.component.html
@@ -1,5 +1,5 @@
 <h2>Table</h2>
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Name</mat-label>
diff --git a/bookie/src/app/tax-report/tax-report.component.html b/bookie/src/app/tax-report/tax-report.component.html
index 5b577948..f76730b4 100644
--- a/bookie/src/app/tax-report/tax-report.component.html
+++ b/bookie/src/app/tax-report/tax-report.component.html
@@ -5,7 +5,7 @@
   </button>
 </h2>
 
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container sm:max-lg:flex-col">
     <mat-form-field class="flex-auto basis-2-5">
       <mat-label>Start Date</mat-label>
diff --git a/bookie/src/app/taxes/tax-detail/tax-detail.component.html b/bookie/src/app/taxes/tax-detail/tax-detail.component.html
index 922f8b82..792ccacb 100644
--- a/bookie/src/app/taxes/tax-detail/tax-detail.component.html
+++ b/bookie/src/app/taxes/tax-detail/tax-detail.component.html
@@ -1,5 +1,5 @@
 <h2>Tax</h2>
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Name</mat-label>
diff --git a/bookie/src/app/temporal-product/temporal-product-detail/temporal-product-detail.component.html b/bookie/src/app/temporal-product/temporal-product-detail/temporal-product-detail.component.html
index 4b8f110c..04706a23 100644
--- a/bookie/src/app/temporal-product/temporal-product-detail/temporal-product-detail.component.html
+++ b/bookie/src/app/temporal-product/temporal-product-detail/temporal-product-detail.component.html
@@ -1,5 +1,5 @@
 <h2>Product</h2>
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Product ID</mat-label>
diff --git a/bookie/src/app/temporal-product/temporal-product-list/temporal-product-list.component.html b/bookie/src/app/temporal-product/temporal-product-list/temporal-product-list.component.html
index b46b310d..f4b2a95f 100644
--- a/bookie/src/app/temporal-product/temporal-product-list/temporal-product-list.component.html
+++ b/bookie/src/app/temporal-product/temporal-product-list/temporal-product-list.component.html
@@ -1,7 +1,7 @@
 <h2 class="row-container space-between">
   <span>Temporal Products</span>
 </h2>
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container sm:max-lg:flex-col">
     <mat-form-field class="flex-auto basis-2-5">
       <mat-label>Filter</mat-label>
diff --git a/bookie/src/app/update-product-prices/update-product-prices.component.html b/bookie/src/app/update-product-prices/update-product-prices.component.html
index b937e828..ceb4b9a5 100644
--- a/bookie/src/app/update-product-prices/update-product-prices.component.html
+++ b/bookie/src/app/update-product-prices/update-product-prices.component.html
@@ -5,7 +5,7 @@
   </button>
 </h2>
 
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container sm:max-lg:flex-col">
     <mat-form-field class="flex-auto basis-2-5">
       <mat-label>Date</mat-label>
diff --git a/bookie/src/app/users/user-detail/user-detail.component.html b/bookie/src/app/users/user-detail/user-detail.component.html
index 6cab6161..d3cc3f4b 100644
--- a/bookie/src/app/users/user-detail/user-detail.component.html
+++ b/bookie/src/app/users/user-detail/user-detail.component.html
@@ -1,5 +1,5 @@
 <h2>User</h2>
-<form [formGroup]="form" class="flex flex-col">
+<form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Name</mat-label>
diff --git a/deploy.sh b/deploy.sh
index 1c77a4aa..b80a544a 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -3,15 +3,15 @@ set -euo pipefail
 parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" || exit ; pwd -P )
 cd "$parent_path" || exit
 
-./lint.sh
+#./lint.sh
 
 if [ 1 -eq "$#" ]
 then
-  ./version_bump.sh "$1"
+  # ./version_bump.sh "$1"
   make build-production TAG="$1"
 else
-  ./version_bump.sh
+  # ./version_bump.sh
   make build-production
 fi
 cd "$parent_path/ansible" || exit
-ansible-playbook --inventory hosts playbook.yml
+ansible-playbook --inventory=hosts playbook.yml