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 e1d6fb2..72db9ed 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-col">
-  <div class="flex-row">
+  <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Name</mat-label>
       <input matInput #nameElement formControlName="name" />
     </mat-form-field>
   </div>
-  <div class="flex-row">
+  <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Phone</mat-label>
       <input matInput formControlName="phone" />
     </mat-form-field>
   </div>
-  <div class="flex-row">
+  <div class="row-container">
     <mat-form-field class="flex-auto">
       <mat-label>Address</mat-label>
       <textarea matInput formControlName="address"> </textarea>
     </mat-form-field>
   </div>
-  <div class="flex-row">
+  <div class="row-container">
     <mat-checkbox formControlName="printInBill">Print in Bill?</mat-checkbox>
   </div>
   <mat-divider></mat-divider>
@@ -27,7 +27,7 @@
       <mat-form-field [formGroupName]="i">
         <mat-label>Discount on {{ r.name }}</mat-label>
         <input matInput formControlName="discount" />
-        <span matSuffix>%</span>
+        <span matTextSuffix>%</span>
         <mat-hint>Max {{ r.limit | percent: '1.2-2' }}</mat-hint>
       </mat-form-field>
     }
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 b37ac04..dcaea6d 100644
--- a/bookie/src/app/customers/customer-list/customer-list.component.html
+++ b/bookie/src/app/customers/customer-list/customer-list.component.html
@@ -6,7 +6,7 @@
   </a>
 </h2>
 <form [formGroup]="form" class="flex-col">
-  <div class="flex-row">
+  <div class="row-container">
     <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 2ddadab..2d2086f 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-col">
-  <div class="flex-row">
+  <div class="row-container">
     <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-row">
+  <div class="row-container">
     <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-row">
+  <div class="row-container">
     <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 8447dbb..54297c8 100644
--- a/bookie/src/app/discount-report/discount-report.component.html
+++ b/bookie/src/app/discount-report/discount-report.component.html
@@ -8,7 +8,6 @@
     <mat-icon>print</mat-icon>
   </button>
 </h2>
-
 <form [formGroup]="form" class="flex-col">
   <div class="row-container sm:max-lg:flex-col">
     <mat-form-field class="flex-auto basis-2-5">
diff --git a/bookie/src/app/header-footer/header-footer.component.html b/bookie/src/app/header-footer/header-footer.component.html
index d2d66ea..b571c5c 100644
--- a/bookie/src/app/header-footer/header-footer.component.html
+++ b/bookie/src/app/header-footer/header-footer.component.html
@@ -11,12 +11,12 @@
       </mat-select>
     </mat-form-field>
   </div>
-  <mat-form-field>
-    <mat-label>Text</mat-label>
-    <textarea matInput matAutosizeMinRows="5" formControlName="text"></textarea>
-  </mat-form-field>
-
-  <mat-divider></mat-divider>
+  <div class="row-container">
+    <mat-form-field class="flex-auto">
+      <mat-label>Text</mat-label>
+      <textarea matInput matAutosizeMinRows="5" formControlName="text"></textarea>
+    </mat-form-field>
+  </div>
 </form>
 <div class="row-container">
   <button mat-raised-button color="primary" (click)="save()">Save</button>
diff --git a/bookie/src/app/nav-bar/nav-bar.component.css b/bookie/src/app/nav-bar/nav-bar.component.css
index b7da323..e69de29 100644
--- a/bookie/src/app/nav-bar/nav-bar.component.css
+++ b/bookie/src/app/nav-bar/nav-bar.component.css
@@ -1,5 +0,0 @@
-.fill-remaining-space {
-  /* This fills the remaining space, by using flexbox.
-     Every toolbar row uses a flexbox row layout. */
-  flex: 1 1 auto;
-}
diff --git a/bookie/src/app/nav-bar/nav-bar.component.html b/bookie/src/app/nav-bar/nav-bar.component.html
index cc69d68..0b9c56e 100644
--- a/bookie/src/app/nav-bar/nav-bar.component.html
+++ b/bookie/src/app/nav-bar/nav-bar.component.html
@@ -15,7 +15,7 @@
       Sales
     </a>
   }
-  <span class="fill-remaining-space"></span>
+  <span class="spacer"></span>
   @if ((auth.currentUser | async) === null) {
     <button mat-button [routerLink]="['/', 'login']">
       <mat-icon>account_box</mat-icon>
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 ddef183..ae5911c 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
@@ -10,7 +10,7 @@
     <mat-form-field class="flex-auto">
       <mat-label>Discount Limit</mat-label>
       <input matInput type="number" formControlName="discountLimit" class="right-align" />
-      <span matSuffix>%</span>
+      <span matTextSuffix>%</span>
     </mat-form-field>
   </div>
   <div class="row-container">
diff --git a/bookie/src/app/sales/bills/bills.component.html b/bookie/src/app/sales/bills/bills.component.html
index d880c57..24ddc75 100644
--- a/bookie/src/app/sales/bills/bills.component.html
+++ b/bookie/src/app/sales/bills/bills.component.html
@@ -1,4 +1,4 @@
-<span>Bill</span>
+<h2>Bill</h2>
 
 <table mat-table #table [dataSource]="dataSource" aria-label="Elements" class="mat-elevation-z8">
   <ng-container matColumnDef="bill-no-title">
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 5781572..819455d 100644
--- a/bookie/src/app/sales/choose-customer/choose-customer.component.html
+++ b/bookie/src/app/sales/choose-customer/choose-customer.component.html
@@ -46,7 +46,7 @@
           <mat-form-field class="flex-auto">
             <mat-label>Discount on {{ r.name }}</mat-label>
             <input matInput formControlName="discount" />
-            <span matSuffix>%</span>
+            <span matTextSuffix>%</span>
           </mat-form-field>
         </div>
       }
diff --git a/bookie/src/app/sales/discount/discount.component.html b/bookie/src/app/sales/discount/discount.component.html
index 59200c4..5b697e8 100644
--- a/bookie/src/app/sales/discount/discount.component.html
+++ b/bookie/src/app/sales/discount/discount.component.html
@@ -14,7 +14,7 @@
         <mat-cell *matCellDef="let row; let i = index" class="center" [formGroupName]="i" class="flex-auto">
           <mat-form-field class="flex-auto">
             <input matInput type="number" formControlName="discount" autocomplete="off" />
-            <span matSuffix>%</span>
+            <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-form-field>
diff --git a/bookie/src/app/section-printers/section-printer.component.html b/bookie/src/app/section-printers/section-printer.component.html
index d389de0..389c13a 100644
--- a/bookie/src/app/section-printers/section-printer.component.html
+++ b/bookie/src/app/section-printers/section-printer.component.html
@@ -1,3 +1,4 @@
+<h2>Section Printer</h2>
 <form [formGroup]="form" class="flex-col">
   <div class="row-container">
     <mat-form-field class="flex-auto">
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 792ccac..2c9455e 100644
--- a/bookie/src/app/taxes/tax-detail/tax-detail.component.html
+++ b/bookie/src/app/taxes/tax-detail/tax-detail.component.html
@@ -11,7 +11,7 @@
     <mat-form-field class="flex-auto">
       <mat-label>Rate</mat-label>
       <input matInput type="number" formControlName="rate" class="right-align" />
-      <span matSuffix>%</span>
+      <span matTextSuffix>%</span>
     </mat-form-field>
   </div>
   <div class="row-container">
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 f4b2a95..9b4376a 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,6 +1,4 @@
-<h2 class="row-container space-between">
-  <span>Temporal Products</span>
-</h2>
+<h2>Temporal Products</h2>
 <form [formGroup]="form" class="flex-col">
   <div class="row-container sm:max-lg:flex-col">
     <mat-form-field class="flex-auto basis-2-5">