diff --git a/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx b/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
index 354eb3ad4..01754dd21 100644
--- a/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
+++ b/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
@@ -5,14 +5,14 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
-import InputNumberCalculator from "../form-input-number-calculator/form-input-number-calculator.component";
+import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import FormItemEmail from "../form-items-formatted/email-form-item.component";
 import FormItemPhone, {
   PhoneItemFormatterValidation,
 } from "../form-items-formatted/phone-form-item.component";
+import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
 import { JobsDetailRatesParts } from "../jobs-detail-rates/jobs-detail-rates.parts.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
-
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
@@ -92,7 +92,7 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
             >
               <FormItemEmail email={getFieldValue("ins_ea")} />
             </Form.Item>
-            Appraiser Info
+
             <Form.Item label={t("jobs.fields.est_co_nm")} name="est_co_nm">
               <Input />
             </Form.Item>
@@ -188,9 +188,11 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
           key="financial"
           header={t("menus.jobsdetail.financials")}
         >
+          <JobsDetailRatesChangeButton form={form} />
+
           <LayoutFormRow>
             <Form.Item label={t("jobs.fields.ded_amt")} name="ded_amt">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.ded_status")} name="ded_status">
               <Select>
@@ -206,7 +208,7 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
               label={t("jobs.fields.depreciation_taxes")}
               name="depreciation_taxes"
             >
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item
               label={t("jobs.fields.ca_gst_registrant")}
@@ -219,98 +221,93 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
               label={t("jobs.fields.other_amount_payable")}
               name="other_amount_payable"
             >
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item
               label={t("jobs.fields.towing_payable")}
               name="towing_payable"
             >
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item
               label={t("jobs.fields.storage_payable")}
               name="storage_payable"
             >
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item
               label={t("jobs.fields.adjustment_bottom_line")}
               name="adjustment_bottom_line"
             >
-              <InputNumberCalculator />
-            </Form.Item>
-            Totals Table
-            <Form.Item
-              label={t("jobs.fields.labor_rate_desc")}
-              name="labor_rate_desc"
-            >
-              <Input />
+              <CurrencyInput />
             </Form.Item>
+          </LayoutFormRow>
+          <LayoutFormRow>
             <Form.Item label={t("jobs.fields.rate_lab")} name="rate_lab">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.rate_lad")} name="rate_lad">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.rate_lae")} name="rate_lae">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.rate_lar")} name="rate_lar">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.rate_las")} name="rate_las">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.rate_laf")} name="rate_laf">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.rate_lam")} name="rate_lam">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.rate_lag")} name="rate_lag">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.rate_lau")} name="rate_lau">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.rate_la1")} name="rate_la1">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.rate_la2")} name="rate_la2">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.rate_la3")} name="rate_la3">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.rate_la4")} name="rate_la4">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.rate_mapa")} name="rate_mapa">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.rate_mash")} name="rate_mash">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.rate_mahw")} name="rate_mahw">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.rate_ma2s")} name="rate_ma2s">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.rate_ma3s")} name="rate_ma3s">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.rate_mabl")} name="rate_mabl">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.rate_macs")} name="rate_macs">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.rate_matd")} name="rate_matd">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
             <Form.Item label={t("jobs.fields.rate_laa")} name="rate_laa">
-              <InputNumberCalculator />
+              <CurrencyInput />
             </Form.Item>
           </LayoutFormRow>
         </Collapse.Panel>