diff --git a/apps/web/src/app/billing/shared/payment-method.component.html b/apps/web/src/app/billing/shared/payment-method.component.html
index 2ac9233b5b..495785af45 100644
--- a/apps/web/src/app/billing/shared/payment-method.component.html
+++ b/apps/web/src/app/billing/shared/payment-method.component.html
@@ -3,7 +3,7 @@
     type="button"
     bitButton
     buttonType="secondary"
-    (click)="load()"
+    [bitAction]="load"
     class="tw-ml-auto"
     *ngIf="firstLoaded"
     [disabled]="loading"
@@ -14,115 +14,93 @@
 </app-header>
 
 <bit-container>
-  <div class="tabbed-header" *ngIf="!organizationId">
-    <!--TODO: Organization and individual should use different "page" components -->
-    <h1>{{ "paymentMethod" | i18n }}</h1>
-  </div>
+  <!-- TODO: Organization and individual should use different "page" components -->
+  <h2 bitTypography="h1" *ngIf="!organizationId">{{ "paymentMethod" | i18n }}</h2>
 
   <ng-container *ngIf="!firstLoaded && loading">
     <i
-      class="bwi bwi-spinner bwi-spin text-muted"
+      class="bwi bwi-spinner bwi-spin tw-text-muted"
       title="{{ 'loading' | i18n }}"
       aria-hidden="true"
     ></i>
-    <span class="sr-only">{{ "loading" | i18n }}</span>
+    <span class="tw-sr-only">{{ "loading" | i18n }}</span>
   </ng-container>
   <ng-container *ngIf="billing">
-    <h2>{{ (isCreditBalance ? "accountCredit" : "accountBalance") | i18n }}</h2>
-    <p class="text-lg">
-      <strong>{{ creditOrBalance | currency: "$" }}</strong>
-    </p>
-    <p>{{ "creditAppliedDesc" | i18n }}</p>
-    <button type="button" bitButton buttonType="secondary" [bitAction]="addCredit">
-      {{ "addCredit" | i18n }}
-    </button>
-    <h2 class="spaced-header">{{ "paymentMethod" | i18n }}</h2>
-    <p *ngIf="!paymentSource">{{ "noPaymentMethod" | i18n }}</p>
-    <ng-container *ngIf="paymentSource">
-      <app-callout
-        type="warning"
-        title="{{ 'verifyBankAccount' | i18n }}"
-        *ngIf="
-          forOrganization &&
-          paymentSource.type === paymentMethodType.BankAccount &&
-          paymentSource.needsVerification
-        "
-      >
-        <p>{{ "verifyBankAccountDesc" | i18n }} {{ "verifyBankAccountFailureWarning" | i18n }}</p>
-        <form
-          #verifyForm
-          class="form-inline"
-          (ngSubmit)="verifyBank()"
-          [formGroup]="verifyBankForm"
-          [appApiAction]="verifyBankPromise"
-          ngNativeValidate
+    <bit-section>
+      <h2 bitTypography="h2">
+        {{ (isCreditBalance ? "accountCredit" : "accountBalance") | i18n }}
+      </h2>
+      <p class="tw-text-lg tw-font-bold">{{ creditOrBalance | currency: "$" }}</p>
+      <p bitTypography="body1">{{ "creditAppliedDesc" | i18n }}</p>
+      <button type="button" bitButton buttonType="secondary" [bitAction]="addCredit">
+        {{ "addCredit" | i18n }}
+      </button>
+    </bit-section>
+    <bit-section>
+      <h2 bitTypography="h2">{{ "paymentMethod" | i18n }}</h2>
+      <p *ngIf="!paymentSource" bitTypography="body1">{{ "noPaymentMethod" | i18n }}</p>
+      <ng-container *ngIf="paymentSource">
+        <bit-callout
+          type="warning"
+          title="{{ 'verifyBankAccount' | i18n }}"
+          *ngIf="
+            forOrganization &&
+            paymentSource.type === paymentMethodType.BankAccount &&
+            paymentSource.needsVerification
+          "
         >
-          <bit-form-field class="tw-mr-2 tw-w-40">
-            <bit-label>{{ "amountX" | i18n: "1" }}</bit-label>
-            <input bitInput type="number" step="1" placeholder="xx" formControlName="amount1" />
-            <span bitPrefix>$0.</span>
-          </bit-form-field>
-          <bit-form-field class="tw-mr-2 tw-w-40">
-            <bit-label>{{ "amountX" | i18n: "2" }}</bit-label>
-            <input bitInput type="number" step="1" placeholder="xx" formControlName="amount2" />
-            <span bitPrefix>$0.</span>
-          </bit-form-field>
-          <button
-            type="button"
-            bitButton
-            buttonType="primary"
-            type="submit"
-            class="btn-submit"
-            [disabled]="verifyForm.loading"
+          <p bitTypography="body1">
+            {{ "verifyBankAccountDesc" | i18n }} {{ "verifyBankAccountFailureWarning" | i18n }}
+          </p>
+          <form
+            [formGroup]="verifyBankForm"
+            [bitSubmit]="verifyBank"
+            class="tw-flex tw-flex-wrap tw-items-center tw-space-x-2"
           >
-            <i
-              class="bwi bwi-spinner bwi-spin"
-              title="{{ 'loading' | i18n }}"
-              aria-hidden="true"
-            ></i>
-            <span>{{ "verifyBankAccount" | i18n }}</span>
-          </button>
-        </form>
-      </app-callout>
-      <p>
-        <i class="bwi bwi-fw" [ngClass]="paymentSourceClasses"></i>
-        {{ paymentSource.description }}
+            <bit-form-field class="tw-w-40">
+              <bit-label>{{ "amountX" | i18n: "1" }}</bit-label>
+              <input bitInput type="number" step="1" placeholder="xx" formControlName="amount1" />
+              <span bitPrefix>$0.</span>
+            </bit-form-field>
+            <bit-form-field class="tw-w-40">
+              <bit-label>{{ "amountX" | i18n: "2" }}</bit-label>
+              <input bitInput type="number" step="1" placeholder="xx" formControlName="amount2" />
+              <span bitPrefix>$0.</span>
+            </bit-form-field>
+            <button bitButton bitFormButton buttonType="primary" type="submit">
+              {{ "verifyBankAccount" | i18n }}
+            </button>
+          </form>
+        </bit-callout>
+        <p>
+          <i class="bwi bwi-fw" [ngClass]="paymentSourceClasses"></i>
+          {{ paymentSource.description }}
+        </p>
+      </ng-container>
+      <button type="button" bitButton buttonType="secondary" [bitAction]="changePayment">
+        {{ (paymentSource ? "changePaymentMethod" : "addPaymentMethod") | i18n }}
+      </button>
+      <p *ngIf="isUnpaid" bitTypography="body1">
+        {{ "paymentChargedWithUnpaidSubscription" | i18n }}
       </p>
-    </ng-container>
-    <button type="button" bitButton buttonType="secondary" [bitAction]="changePayment">
-      {{ (paymentSource ? "changePaymentMethod" : "addPaymentMethod") | i18n }}
-    </button>
-    <p *ngIf="isUnpaid">{{ "paymentChargedWithUnpaidSubscription" | i18n }}</p>
-    <ng-container *ngIf="forOrganization">
-      <h2 class="spaced-header">{{ "taxInformation" | i18n }}</h2>
-      <p>{{ "taxInformationDesc" | i18n }}</p>
+    </bit-section>
+    <bit-section *ngIf="forOrganization">
+      <h2 bitTypography="h2">{{ "taxInformation" | i18n }}</h2>
+      <p bitTypography="body1">{{ "taxInformationDesc" | i18n }}</p>
       <div *ngIf="!org || loading">
         <i
-          class="bwi bwi-spinner bwi-spin text-muted"
+          class="bwi bwi-spinner bwi-spin tw-text-muted"
           title="{{ 'loading' | i18n }}"
           aria-hidden="true"
         ></i>
-        <span class="sr-only">{{ "loading" | i18n }}</span>
+        <span class="tw-sr-only">{{ "loading" | i18n }}</span>
       </div>
-      <form
-        *ngIf="org && !loading"
-        #formTax
-        (ngSubmit)="submitTaxInfo()"
-        [appApiAction]="taxFormPromise"
-        ngNativeValidate
-      >
+      <form *ngIf="org && !loading" [formGroup]="taxForm" [bitSubmit]="submitTaxInfo">
         <app-tax-info></app-tax-info>
-        <button
-          bitButton
-          buttonType="primary"
-          type="submit"
-          class="btn-submit"
-          [disabled]="formTax.loading"
-        >
-          <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
-          <span>{{ "save" | i18n }}</span>
+        <button bitButton bitFormButton buttonType="primary" type="submit">
+          {{ "save" | i18n }}
         </button>
       </form>
-    </ng-container>
+    </bit-section>
   </ng-container>
 </bit-container>
diff --git a/apps/web/src/app/billing/shared/payment-method.component.ts b/apps/web/src/app/billing/shared/payment-method.component.ts
index 967bff6d1a..eacc0b4739 100644
--- a/apps/web/src/app/billing/shared/payment-method.component.ts
+++ b/apps/web/src/app/billing/shared/payment-method.component.ts
@@ -38,9 +38,6 @@ export class PaymentMethodComponent implements OnInit {
   organizationId: string;
   isUnpaid = false;
 
-  verifyBankPromise: Promise<any>;
-  taxFormPromise: Promise<any>;
-
   verifyBankForm = this.formBuilder.group({
     amount1: new FormControl<number>(null, [
       Validators.required,
@@ -54,6 +51,8 @@ export class PaymentMethodComponent implements OnInit {
     ]),
   });
 
+  taxForm = this.formBuilder.group({});
+
   constructor(
     protected apiService: ApiService,
     protected organizationApiService: OrganizationApiServiceAbstraction,
@@ -83,7 +82,7 @@ export class PaymentMethodComponent implements OnInit {
     });
   }
 
-  async load() {
+  load = async () => {
     if (this.loading) {
       return;
     }
@@ -109,7 +108,7 @@ export class PaymentMethodComponent implements OnInit {
     this.isUnpaid = this.subscription?.status === "unpaid" ?? false;
 
     this.loading = false;
-  }
+  };
 
   addCredit = async () => {
     const dialogRef = openAddCreditDialog(this.dialogService, {
@@ -136,35 +135,23 @@ export class PaymentMethodComponent implements OnInit {
     }
   };
 
-  async verifyBank() {
+  verifyBank = async () => {
     if (this.loading || !this.forOrganization) {
       return;
     }
 
-    try {
-      const request = new VerifyBankRequest();
-      request.amount1 = this.verifyBankForm.value.amount1;
-      request.amount2 = this.verifyBankForm.value.amount2;
-      this.verifyBankPromise = this.organizationApiService.verifyBank(this.organizationId, request);
-      await this.verifyBankPromise;
-      this.platformUtilsService.showToast(
-        "success",
-        null,
-        this.i18nService.t("verifiedBankAccount"),
-      );
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.load();
-    } catch (e) {
-      this.logService.error(e);
-    }
-  }
+    const request = new VerifyBankRequest();
+    request.amount1 = this.verifyBankForm.value.amount1;
+    request.amount2 = this.verifyBankForm.value.amount2;
+    await this.organizationApiService.verifyBank(this.organizationId, request);
+    this.platformUtilsService.showToast("success", null, this.i18nService.t("verifiedBankAccount"));
+    await this.load();
+  };
 
-  async submitTaxInfo() {
-    this.taxFormPromise = this.taxInfo.submitTaxInfo();
-    await this.taxFormPromise;
+  submitTaxInfo = async () => {
+    await this.taxInfo.submitTaxInfo();
     this.platformUtilsService.showToast("success", null, this.i18nService.t("taxInfoUpdated"));
-  }
+  };
 
   get isCreditBalance() {
     return this.billing == null || this.billing.balance <= 0;