diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index f60623fb7..ffe0ef237 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -8951,6 +8951,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>pin</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>termination_date</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/App/App.styles.scss b/client/src/App/App.styles.scss
index 38a1d9d23..052f79b17 100644
--- a/client/src/App/App.styles.scss
+++ b/client/src/App/App.styles.scss
@@ -73,6 +73,9 @@
 }
 
 .ant-input-number-input,
-.ant-input-number {
+.ant-input-number,
+.ant-picker-input,
+.ant-picker,
+.ant-select {
   width: 100%;
 }
diff --git a/client/src/components/shop-employees/shop-employees-form.component.jsx b/client/src/components/shop-employees/shop-employees-form.component.jsx
index 4e7d3c673..47bcf538d 100644
--- a/client/src/components/shop-employees/shop-employees-form.component.jsx
+++ b/client/src/components/shop-employees/shop-employees-form.component.jsx
@@ -6,7 +6,7 @@ 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 CurrencyInput from "../form-items-formatted/currency-form-item.component";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -157,7 +157,7 @@ export function ShopEmployeesFormComponent({
           },
         ]}
       >
-        <InputNumber />
+        <CurrencyInput />
       </Form.Item>
       <Form.Item label={t("employees.fields.user_email")} name="user_email">
         <Input />
diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
index 96e228405..39187c51d 100644
--- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
@@ -6,6 +6,7 @@ import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import InputNumberCalculator from "../form-input-number-calculator/form-input-number-calculator.component";
 import JobSearchSelect from "../job-search-select/job-search-select.component";
 import LaborAllocationsTable from "../labor-allocations-table/labor-allocations-table.component";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
 export default function TimeTicketModalComponent({
   form,
@@ -19,7 +20,7 @@ export default function TimeTicketModalComponent({
 
   return (
     <div>
-      <div style={{ display: "flex" }}>
+      <LayoutFormRow grow>
         <Form.Item
           name="jobid"
           label={t("timetickets.fields.ro_number")}
@@ -53,9 +54,9 @@ export default function TimeTicketModalComponent({
         >
           <EmployeeSearchSelect options={employeeAutoCompleteOptions} />
         </Form.Item>
-      </div>
+      </LayoutFormRow>
 
-      <div style={{ display: "flex" }}>
+      <LayoutFormRow>
         <Form.Item
           label={t("timetickets.fields.date")}
           name="date"
@@ -102,7 +103,7 @@ export default function TimeTicketModalComponent({
             },
           ]}
         >
-          <Select style={{ width: "150px" }}>
+          <Select>
             {responsibilityCenters.costs.map((item) => (
               <Select.Option key={item.name}>{item.name}</Select.Option>
             ))}
@@ -120,7 +121,7 @@ export default function TimeTicketModalComponent({
         >
           <Input disabled />
         </Form.Item>
-      </div>
+      </LayoutFormRow>
       <LaborAllocationsTable
         joblines={lineTicketData.joblines}
         timetickets={lineTicketData.timetickets}
diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
index 89a72b579..06e66fb3e 100644
--- a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
@@ -171,6 +171,7 @@ export function TimeTicketModalContainer({
     >
       <Form
         onFinish={handleFinish}
+        layout="vertical"
         autoComplete={"off"}
         form={form}
         initialValues={
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 3809cd10b..318d1a925 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -598,6 +598,7 @@
 				"flat_rate": "Flat Rate (Disabled is Straight Time)",
 				"hire_date": "Hire Date",
 				"last_name": "Last Name",
+				"pin": "Tech Console PIN",
 				"termination_date": "Termination Date",
 				"user_email": "User Email"
 			},
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 5d92c5c06..5299768f2 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -598,6 +598,7 @@
 				"flat_rate": "Tarifa plana (deshabilitado es tiempo recto)",
 				"hire_date": "Fecha de contratación",
 				"last_name": "Apellido",
+				"pin": "",
 				"termination_date": "Fecha de conclusión",
 				"user_email": ""
 			},
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 6c346b06d..ca6d59951 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -598,6 +598,7 @@
 				"flat_rate": "Taux fixe (désactivé est le temps normal)",
 				"hire_date": "Date d'embauche",
 				"last_name": "Nom de famille",
+				"pin": "",
 				"termination_date": "Date de résiliation",
 				"user_email": ""
 			},