diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx
index b3148f09b..201e611b1 100644
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -77,121 +77,83 @@ function Header({
         onClick={handleMenuClick}
         subMenuCloseDelay={0.3}
       >
-        <Menu.Item key="home">
-          <Link to="/manage">
-            <HomeFilled />
-            {t("menus.header.home")}
-          </Link>
+        <Menu.Item key="home" icon={<HomeFilled />}>
+          <Link to="/manage">{t("menus.header.home")}</Link>
         </Menu.Item>
-        <Menu.Item key="schedule">
-          <Link to="/manage/schedule">
-            <Icon component={FaCalendarAlt} />
-            {t("menus.header.schedule")}
-          </Link>
+        <Menu.Item key="schedule" icon={<Icon component={FaCalendarAlt} />}>
+          <Link to="/manage/schedule">{t("menus.header.schedule")}</Link>
         </Menu.Item>
         <Menu.SubMenu
-          title={
-            <span>
-              <Icon component={FaCarCrash} />
-              <span>{t("menus.header.jobs")}</span>
-            </span>
-          }
+          icon={<Icon component={FaCarCrash} />}
+          title={t("menus.header.jobs")}
         >
-          <Menu.Item key="activejobs">
-            <FileFilled />
+          <Menu.Item key="activejobs" icon={<FileFilled />}>
             <Link to="/manage/jobs">{t("menus.header.activejobs")}</Link>
           </Menu.Item>
-          <Menu.Item key="parts-queue">
-            <Link to="/manage/partsqueue">
-              <ToolFilled /> {t("menus.header.parts-queue")}
-            </Link>
+          <Menu.Item key="parts-queue" icon={<ToolFilled />}>
+            <Link to="/manage/partsqueue">{t("menus.header.parts-queue")}</Link>
           </Menu.Item>
-          <Menu.Item key="availablejobs">
+          <Menu.Item key="availablejobs" icon={<ImportOutlined />}>
             <Link to="/manage/available">
-              <ImportOutlined /> {t("menus.header.availablejobs")}
+              {t("menus.header.availablejobs")}
             </Link>
           </Menu.Item>
           <Menu.Divider />
-          <Menu.Item key="alljobs">
-            <UnorderedListOutlined />
+          <Menu.Item key="alljobs" icon={<UnorderedListOutlined />}>
             <Link to="/manage/jobs/all">{t("menus.header.alljobs")}</Link>
           </Menu.Item>
           <Menu.Divider />
 
-          <Menu.Item key="productionlist">
+          <Menu.Item key="productionlist" icon={<ScheduleOutlined />}>
             <Link to="/manage/production/list">
-              <ScheduleOutlined />
               {t("menus.header.productionlist")}
             </Link>
           </Menu.Item>
-          <Menu.Item key="productionboard">
+          <Menu.Item key="productionboard" icon={<Icon component={BsKanban} />}>
             <Link to="/manage/production/board">
-              <Icon component={BsKanban} />
               {t("menus.header.productionboard")}
             </Link>
           </Menu.Item>
           <Menu.Divider />
 
-          <Menu.Item key="scoreboard">
-            <LineChartOutlined />
+          <Menu.Item key="scoreboard" icon={<LineChartOutlined />}>
             <Link to="/manage/scoreboard">{t("menus.header.scoreboard")}</Link>
           </Menu.Item>
         </Menu.SubMenu>
         <Menu.SubMenu
-          title={
-            <span>
-              <UserOutlined />
-              <span>{t("menus.header.customers")}</span>
-            </span>
-          }
+          icon={<UserOutlined />}
+          title={t("menus.header.customers")}
         >
-          <Menu.Item key="owners">
-            <Link to="/manage/owners">
-              <TeamOutlined />
-              {t("menus.header.owners")}
-            </Link>
+          <Menu.Item key="owners" icon={<TeamOutlined />}>
+            <Link to="/manage/owners">{t("menus.header.owners")}</Link>
           </Menu.Item>
-          <Menu.Item key="vehicles">
-            <Link to="/manage/vehicles">
-              <CarFilled />
-              {t("menus.header.vehicles")}
-            </Link>
+          <Menu.Item key="vehicles" icon={<CarFilled />}>
+            <Link to="/manage/vehicles">{t("menus.header.vehicles")}</Link>
           </Menu.Item>
         </Menu.SubMenu>
         <Menu.SubMenu
-          title={
-            <span>
-              <CarFilled />
-              <span>{t("menus.header.courtesycars")}</span>
-            </span>
-          }
+          icon={<CarFilled />}
+          title={t("menus.header.courtesycars")}
         >
-          <Menu.Item key="courtesycarsall">
+          <Menu.Item key="courtesycarsall" icon={<CarFilled />}>
             <Link to="/manage/courtesycars">
-              <CarFilled />
               {t("menus.header.courtesycars-all")}
             </Link>
           </Menu.Item>
-          <Menu.Item key="contracts">
+          <Menu.Item key="contracts" icon={<FileFilled />}>
             <Link to="/manage/courtesycars/contracts">
-              <FileFilled />
               {t("menus.header.courtesycars-contracts")}
             </Link>
           </Menu.Item>
-          <Menu.Item key="newcontract">
+          <Menu.Item key="newcontract" icon={<FileAddFilled />}>
             <Link to="/manage/courtesycars/contracts/new">
-              <FileAddFilled />
               {t("menus.header.courtesycars-newcontract")}
             </Link>
           </Menu.Item>
         </Menu.SubMenu>
         <Menu.SubMenu
-          title={
-            <span>
-              <DollarCircleFilled />
-              <span>{t("menus.header.accounting")}</span>
-            </span>
-          }
+          icon={<DollarCircleFilled />}
+          title={t("menus.header.accounting")}
         >
           <Menu.Item key="bills">
             <Link to="/manage/bills">{t("menus.header.bills")}</Link>
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 32749484e..c4831c15b 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
@@ -37,6 +37,33 @@ export function TimeTicketModalComponent({
 }) {
   const { t } = useTranslation();
 
+  const CostCenterSelect = ({ emps, value, ...props }) => {
+    return (
+      <Select
+        value={value === "timetickets.labels.shift" ? t(value) : value}
+        {...props}
+        disabled={value === "timetickets.labels.shift"}
+      >
+        {emps &&
+          emps.rates.map((item) => (
+            <Select.Option key={item.cost_center}>
+              {item.cost_center}
+            </Select.Option>
+          ))}
+      </Select>
+    );
+  };
+
+  const MemoInput = ({ value, ...props }) => {
+    return (
+      <Input
+        value={value?.startsWith("timetickets.") ? t(value) : value}
+        {...props}
+        disabled={value?.startsWith("timetickets.")}
+      />
+    );
+  };
+
   return (
     <div>
       <LayoutFormRow grow noDivider>
@@ -102,14 +129,7 @@ export function TimeTicketModalComponent({
                   },
                 ]}
               >
-                <Select>
-                  {emps &&
-                    emps.rates.map((item) => (
-                      <Select.Option key={item.cost_center}>
-                        {item.cost_center}
-                      </Select.Option>
-                    ))}
-                </Select>
+                <CostCenterSelect emps={emps} />
               </Form.Item>
             );
           }}
@@ -117,17 +137,23 @@ export function TimeTicketModalComponent({
       </LayoutFormRow>
 
       <LayoutFormRow>
-        <Form.Item
-          label={t("timetickets.fields.productivehrs")}
-          name="productivehrs"
-          rules={[
-            {
-              required: true,
-              message: t("general.validation.required"),
-            },
-          ]}
-        >
-          <InputNumber min={0} precision={1} />
+        <Form.Item shouldUpdate>
+          {() => (
+            <Form.Item
+              label={t("timetickets.fields.productivehrs")}
+              name="productivehrs"
+              rules={[
+                {
+                  required:
+                    form.getFieldValue("cost_center") !==
+                    "timetickets.labels.shift",
+                  message: t("general.validation.required"),
+                },
+              ]}
+            >
+              <InputNumber min={0} precision={1} />
+            </Form.Item>
+          )}
         </Form.Item>
         <Form.Item label={t("timetickets.fields.actualhrs")} name="actualhrs">
           <InputNumber min={0} precision={1} />
@@ -155,7 +181,7 @@ export function TimeTicketModalComponent({
           />
         </Form.Item>
         <Form.Item label={t("timetickets.fields.memo")} name="memo">
-          <Input />
+          <MemoInput />
         </Form.Item>
         <Form.Item shouldUpdate>
           {() => (
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 4918f8716..49643aa46 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
@@ -54,7 +54,7 @@ export function TimeTicketModalContainer({
               emps.length === 1
                 ? emps[0].rates.filter(
                     (r) => r.cost_center === values.cost_center
-                  )[0].rate
+                  )[0]?.rate
                 : null,
           },
         },
@@ -205,7 +205,7 @@ export function TimeTicketModalContainer({
                   timeTicketModal.context.timeticket.jobid ||
                   null,
                 date: timeTicketModal.context.timeticket.date
-                  ? moment(timeTicketModal.context.date)
+                  ? moment(timeTicketModal.context.timeticket.date)
                   : null,
               }
             : { jobid: timeTicketModal.context.jobId || null }