diff --git a/client/src/components/bill-form/bill-form.component.jsx b/client/src/components/bill-form/bill-form.component.jsx
index 5f748e2d5..84360b257 100644
--- a/client/src/components/bill-form/bill-form.component.jsx
+++ b/client/src/components/bill-form/bill-form.component.jsx
@@ -219,6 +219,79 @@ export function BillFormComponent({
         >
           <CurrencyInput min={0} />
         </Form.Item>
+        <Form.Item shouldUpdate grow>
+          {() => {
+            const values = form.getFieldsValue([
+              "billlines",
+              "total",
+              "federal_tax_rate",
+              "state_tax_rate",
+              "local_tax_rate",
+            ]);
+            let totals;
+            if (
+              !!values.total &&
+              !!values.billlines &&
+              values.billlines.length > 0
+            )
+              totals = CalculateBillTotal(values);
+            if (!!totals)
+              return (
+                <div>
+                  <Space split={<Divider type="vertical" />} wrap>
+                    <Statistic
+                      title={t("bills.labels.subtotal")}
+                      value={totals.subtotal.toFormat()}
+                      precision={2}
+                    />
+                    <Statistic
+                      title={t("bills.labels.federal_tax")}
+                      value={totals.federalTax.toFormat()}
+                      precision={2}
+                    />
+                    <Statistic
+                      title={t("bills.labels.state_tax")}
+                      value={totals.stateTax.toFormat()}
+                      precision={2}
+                    />
+                    <Statistic
+                      title={t("bills.labels.local_tax")}
+                      value={totals.localTax.toFormat()}
+                      precision={2}
+                    />
+                    <Statistic
+                      title={t("bills.labels.entered_total")}
+                      value={totals.enteredTotal.toFormat()}
+                      precision={2}
+                    />
+                    <Statistic
+                      title={t("bills.labels.bill_total")}
+                      value={totals.invoiceTotal.toFormat()}
+                      precision={2}
+                    />
+                    <Statistic
+                      title={t("bills.labels.discrepancy")}
+                      valueStyle={{
+                        color:
+                          totals.discrepancy.getAmount() === 0
+                            ? "green"
+                            : "red",
+                      }}
+                      value={totals.discrepancy.toFormat()}
+                      precision={2}
+                    />
+                  </Space>
+                  {form.getFieldValue("is_credit_memo") ? (
+                    <AlertComponent
+                      type="warning"
+                      message={t("bills.labels.enteringcreditmemo")}
+                    />
+                  ) : null}
+                </div>
+              );
+            return null;
+          }}
+        </Form.Item>
       </LayoutFormRow>
       <Divider orientation="left">{t("bills.labels.bill_lines")}</Divider>
       <BillFormLines
@@ -244,77 +317,6 @@ export function BillFormComponent({
           <Button>Click to upload</Button>
         </Upload>
       </Form.Item>
-      <Form.Item shouldUpdate>
-        {() => {
-          const values = form.getFieldsValue([
-            "billlines",
-            "total",
-            "federal_tax_rate",
-            "state_tax_rate",
-            "local_tax_rate",
-          ]);
-          let totals;
-          if (
-            !!values.total &&
-            !!values.billlines &&
-            values.billlines.length > 0
-          )
-            totals = CalculateBillTotal(values);
-          if (!!totals)
-            return (
-              <div>
-                <Space split={<Divider type="vertical" />}>
-                  <Statistic
-                    title={t("bills.labels.subtotal")}
-                    value={totals.subtotal.toFormat()}
-                    precision={2}
-                  />
-                  <Statistic
-                    title={t("bills.labels.federal_tax")}
-                    value={totals.federalTax.toFormat()}
-                    precision={2}
-                  />
-                  <Statistic
-                    title={t("bills.labels.state_tax")}
-                    value={totals.stateTax.toFormat()}
-                    precision={2}
-                  />
-                  <Statistic
-                    title={t("bills.labels.local_tax")}
-                    value={totals.localTax.toFormat()}
-                    precision={2}
-                  />
-                  <Statistic
-                    title={t("bills.labels.entered_total")}
-                    value={totals.enteredTotal.toFormat()}
-                    precision={2}
-                  />
-                  <Statistic
-                    title={t("bills.labels.bill_total")}
-                    value={totals.invoiceTotal.toFormat()}
-                    precision={2}
-                  />
-                  <Statistic
-                    title={t("bills.labels.discrepancy")}
-                    valueStyle={{
-                      color:
-                        totals.discrepancy.getAmount() === 0 ? "green" : "red",
-                    }}
-                    value={totals.discrepancy.toFormat()}
-                    precision={2}
-                  />
-                </Space>
-                {form.getFieldValue("is_credit_memo") ? (
-                  <AlertComponent
-                    type="warning"
-                    message={t("bills.labels.enteringcreditmemo")}
-                  />
-                ) : null}
-              </div>
-            );
-          return null;
-        }}
-      </Form.Item>
     </div>
   );
 }
diff --git a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
index 9933d12c7..f0237cf20 100644
--- a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
+++ b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
@@ -159,7 +159,7 @@ export function JobsDetailPage({
         initialValues={transormJobToForm(job)}
       >
         <PageHeader
-          onBack={() => window.history.back()}
+          // onBack={() => window.history.back()}
           title={job.ro_number || t("general.labels.na")}
           extra={menuExtra}
         />