diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 319a8d546..152f7805e 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.6.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.6.1">
     <!--
 
     BabelEdit project file
@@ -280,6 +280,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>loadingapp</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>na</name>
                                         <definition_loaded>false</definition_loaded>
@@ -1685,6 +1706,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>labor_rate_desc</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>loss_date</name>
                                         <definition_loaded>false</definition_loaded>
@@ -1916,6 +1958,468 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>rate_atp</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>rate_la1</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>rate_la2</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>rate_la3</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>rate_la4</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>rate_lab</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>rate_lad</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>rate_lae</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>rate_laf</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>rate_lag</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>rate_lam</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>rate_lar</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>rate_las</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>rate_lau</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>rate_ma2s</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>rate_ma3s</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>rate_mabl</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>rate_macs</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>rate_mahw</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>rate_mapa</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>rate_mash</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>rate_matd</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>referralsource</name>
                                         <definition_loaded>false</definition_loaded>
@@ -3777,6 +4281,27 @@
                                     </translation>
                                 </translations>
                             </concept_node>
+                            <concept_node>
+                                <name>jobsavailable</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>jobsdetail</name>
                                 <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx b/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx
index a6c17e793..5c0b7fff8 100644
--- a/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx
+++ b/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx
@@ -1,8 +1,8 @@
+import { Timeline } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { DateFormatter } from "../../utils/DateFormatter";
 import CardTemplate from "./job-detail-cards.template.component";
-import Moment from "react-moment";
-import { Timeline } from "antd";
 
 export default function JobDetailCardsDatesComponent({ loading, data }) {
   const { t } = useTranslation();
@@ -31,90 +31,84 @@ export default function JobDetailCardsDatesComponent({ loading, data }) {
           {data.actual_in ? (
             <Timeline.Item>
               {t("jobs.fields.actual_in")}
-              <Moment format='MM/DD/YYYY'>{data.actual_in || ""}</Moment>
+              <DateFormatter>{data.actual_in}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.scheduled_completion ? (
             <Timeline.Item>
-            {t("jobs.fields.scheduled_completion")}
-              <Moment format='MM/DD/YYYY'>
-                {data.scheduled_completion || ""}
-              </Moment>
+              {t("jobs.fields.scheduled_completion")}
+              <DateFormatter>{data.scheduled_completion}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.scheduled_in ? (
             <Timeline.Item>
               {t("jobs.fields.scheduled_in")}
-              <Moment format='MM/DD/YYYY'>{data.scheduled_in || ""}</Moment>
+              <DateFormatter>{data.scheduled_in}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.actual_completion ? (
             <Timeline.Item>
               {t("jobs.fields.actual_completion")}
-              <Moment format='MM/DD/YYYY'>
-                {data.actual_completion || ""}
-              </Moment>
+              <DateFormatter>{data.actual_completion}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.scheduled_delivery ? (
             <Timeline.Item>
               {t("jobs.fields.scheduled_delivery")}
-              <Moment format='MM/DD/YYYY'>
-                {data.scheduled_delivery || ""}
-              </Moment>
+              <DateFormatter>{data.scheduled_delivery}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.actual_delivery ? (
             <Timeline.Item>
               {t("jobs.fields.actual_delivery")}
-              <Moment format='MM/DD/YYYY'>{data.actual_delivery || ""}</Moment>
+              <DateFormatter>{data.actual_delivery}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.date_estimated ? (
             <Timeline.Item>
               {t("jobs.fields.date_estimated")}
-              <Moment format='MM/DD/YYYY'>{data.date_estimated || ""}</Moment>
+              <DateFormatter>{data.date_estimated}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.date_open ? (
             <Timeline.Item>
               {t("jobs.fields.date_open")}
-              <Moment format='MM/DD/YYYY'>{data.date_open || ""}</Moment>
+              <DateFormatter>{data.date_open}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.date_scheduled ? (
             <Timeline.Item>
               {t("jobs.fields.date_scheduled")}
-              <Moment format='MM/DD/YYYY'>{data.date_scheduled || ""}</Moment>
+              <DateFormatter>{data.date_scheduled}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.date_invoiced ? (
             <Timeline.Item>
               {t("jobs.fields.date_invoiced")}
-              <Moment format='MM/DD/YYYY'>{data.date_invoiced || ""}</Moment>
+              <DateFormatter>{data.date_invoiced}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.date_closed ? (
             <Timeline.Item>
               {t("jobs.fields.date_closed")}
-              <Moment format='MM/DD/YYYY'>{data.date_closed || ""}</Moment>
+              <DateFormatter>{data.date_closed}</DateFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.date_exported ? (
             <Timeline.Item>
               {t("jobs.fields.date_exported")}
-              <Moment format='MM/DD/YYYY'>{data.date_exported || ""}</Moment>
+              <DateFormatter>{data.date_exported}</DateFormatter>
             </Timeline.Item>
           ) : null}
         </Timeline>
diff --git a/client/src/components/job-detail-lines/job-lines.component.jsx b/client/src/components/job-detail-lines/job-lines.component.jsx
index 135dc6dea..02ab7ff4a 100644
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -1,19 +1,17 @@
-import { Table, Button } from "antd";
-import React, { useContext, useState } from "react";
+import { Button, Table, Form, Input, Alert } from "antd";
+import React, { useState, useContext } from "react";
 import { useTranslation } from "react-i18next";
-import JobDetailFormContext from "../../pages/jobs-detail/jobs-detail.page.context";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { alphaSort } from "../../utils/sorters";
-import EditableCell from "./job-lines-cell.component";
+//import EditableCell from "./job-lines-cell.component";
 
-export default function JobLinesComponent({ job }) {
-  //const form = useContext(JobDetailFormContext);
-  //const { getFieldDecorator } = form;
+export default function JobLinesComponent({ jobLines, form, handleSubmit }) {
+  const { getFieldDecorator, isFieldsTouched, resetFields } = form;
   const [state, setState] = useState({
     sortedInfo: {},
     filteredInfo: { text: "" }
   });
-  const [editingKey, setEditingKey] = useState("");
+
   const { t } = useTranslation();
 
   const columns = [
@@ -70,16 +68,7 @@ export default function JobLinesComponent({ job }) {
         state.sortedInfo.columnKey === "act_price" && state.sortedInfo.order,
       ellipsis: true,
       render: (text, record) => (
-        <div>
-          {" "}
-          <CurrencyFormatter>{record.act_price}</CurrencyFormatter>{" "}
-          <Button
-            onClick={() => {
-              setEditingKey(record.id);
-            }}>
-            EDIT
-          </Button>
-        </div>
+        <CurrencyFormatter>{record.act_price}</CurrencyFormatter>
       )
     }
   ];
@@ -92,33 +81,43 @@ export default function JobLinesComponent({ job }) {
   //   const { value } = event.target;
   //   setState({ ...state, filterinfo: { text: [value] } });
   // };
+  const formItemLayout = {
+    labelCol: {
+      xs: { span: 12 },
+      sm: { span: 5 }
+    },
+    wrapperCol: {
+      xs: { span: 24 },
+      sm: { span: 12 }
+    }
+  };
+
   return (
-    <Table
-      size='small'
-      pagination={{ position: "bottom" }}
-      columns={columns.map(col => {
-        if (!col.editable) {
-          return col;
-        }
-        return {
-          ...col,
-          onCell: record => ({
-            record,
-            inputType: col.dataIndex === "age" ? "number" : "text",
-            dataIndex: col.dataIndex,
-            title: col.title,
-            editing: editingKey === record.id
-          })
-        };
-      })}
-      components={{
-        body: {
-          cell: EditableCell
-        }
-      }}
-      rowKey='id'
-      dataSource={job.joblines}
-      onChange={handleTableChange}
-    />
+    <Form onSubmit={handleSubmit} {...formItemLayout}>
+      <div>Testing Place</div>
+
+      {isFieldsTouched() ? (
+        <Alert
+          message={
+            <div>
+              {t("general.messages.unsavedchanges")}
+              <Button onClick={() => resetFields()}>
+                {t("general.actions.reset")}
+              </Button>
+            </div>
+          }
+          closable
+        />
+      ) : null}
+
+      <Table
+        size="small"
+        pagination={{ position: "bottom" }}
+        columns={columns.map(item => ({ ...item }))}
+        rowKey="id"
+        dataSource={jobLines}
+        onChange={handleTableChange}
+      />
+    </Form>
   );
 }
diff --git a/client/src/components/job-detail-lines/job-lines.container.jsx b/client/src/components/job-detail-lines/job-lines.container.jsx
index cf59100b2..d91845908 100644
--- a/client/src/components/job-detail-lines/job-lines.container.jsx
+++ b/client/src/components/job-detail-lines/job-lines.container.jsx
@@ -2,18 +2,51 @@ import React from "react";
 import JobLinesComponent from "./job-lines.component";
 import { useQuery } from "@apollo/react-hooks";
 import AlertComponent from "../alert/alert.component";
-
+import { Form, notification } from "antd";
 import { GET_JOB_LINES_BY_PK } from "../../graphql/jobs-lines.queries";
+import { useTranslation } from "react-i18next";
 
-export default function JobLinesContainer({ jobId }) {
+export default Form.create({ name: "JobsDetailJobLines" })(
+  function JobLinesContainer({ jobId, form }) {
+    const { loading, error, data } = useQuery(GET_JOB_LINES_BY_PK, {
+      variables: { id: jobId },
+      fetchPolicy: "network-only"
+    });
+    const { t } = useTranslation();
+    const handleSubmit = e => {
+      e.preventDefault();
 
-  const { loading, error, data } = useQuery(GET_JOB_LINES_BY_PK, {
-    variables: { id: jobId },
-    fetchPolicy: "network-only"
-  });
-  if (error) return <AlertComponent message={error.message} type="error" />;
-  return (
-    <JobLinesComponent loading={loading} joblines={data ? data.joblines : null} />
-  );
-}
- 
\ No newline at end of file
+      form.validateFieldsAndScroll((err, values) => {
+        if (err) {
+          notification["error"]({
+            message: t("jobs.errors.validationtitle"),
+            description: t("jobs.errors.validation")
+          });
+        }
+        if (!err) {
+          console.log("Save the est lines!", values);
+          // mutationUpdateJob({
+          //   variables: { jobId: data.jobs_by_pk.id, job: values }
+          // }).then(r => {
+          //   notification["success"]({
+          //     message: t("jobs.successes.savetitle")
+          //   });
+          //   //TODO: Better way to reset the field decorators?
+          //   refetch().then(r => form.resetFields());
+          // });
+        }
+      });
+    };
+
+    if (error) return <AlertComponent message={error.message} type="error" />;
+
+    return (
+      <JobLinesComponent
+        loading={loading}
+        jobLines={data && data.joblines ? data.joblines : null}
+        handleSubmit={handleSubmit}
+        form={form}
+      />
+    );
+  }
+);
diff --git a/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx b/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
new file mode 100644
index 000000000..f33f6652e
--- /dev/null
+++ b/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
@@ -0,0 +1,90 @@
+import { DatePicker, Form } from "antd";
+import moment from "moment";
+import React, { useContext } from "react";
+import { useTranslation } from "react-i18next";
+import JobDetailFormContext from "../../pages/jobs-detail/jobs-detail.page.context";
+
+export default function JobsDetailDatesComponent({ job }) {
+  const form = useContext(JobDetailFormContext);
+  const { getFieldDecorator } = form;
+  const { t } = useTranslation();
+
+  return (
+    <div>
+      <Form.Item label={t("jobs.fields.loss_date")}>
+        {getFieldDecorator("loss_date", {
+          initialValue: job.loss_date ? moment(job.loss_date) : null
+        })(<DatePicker name="loss_date" />)}
+      </Form.Item>
+      DAMAGE {JSON.stringify(job.area_of_damage)}
+      CAA # seems not correct based on field mapping Class seems not correct
+      based on field mapping
+      <Form.Item label={t("jobs.fields.date_estimated")}>
+        {getFieldDecorator("date_estimated", {
+          initialValue: job.date_estimated ? moment(job.date_estimated) : null
+        })(<DatePicker name="date_estimated" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.date_open")}>
+        {getFieldDecorator("date_open", {
+          initialValue: job.date_open ? moment(job.date_open) : null
+        })(<DatePicker name="date_open" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.date_scheduled")}>
+        {getFieldDecorator("date_scheduled", {
+          initialValue: job.date_scheduled ? moment(job.date_scheduled) : null
+        })(<DatePicker name="date_scheduled" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.scheduled_in")}>
+        {getFieldDecorator("scheduled_in", {
+          initialValue: job.scheduled_in ? moment(job.scheduled_in) : null
+        })(<DatePicker name="scheduled_in" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.actual_in")}>
+        {getFieldDecorator("actual_in", {
+          initialValue: job.actual_in ? moment(job.actual_in) : null
+        })(<DatePicker name="actual_in" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.scheduled_completion")}>
+        {getFieldDecorator("scheduled_completion", {
+          initialValue: job.scheduled_completion
+            ? moment(job.scheduled_completion)
+            : null
+        })(<DatePicker name="scheduled_completion" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.actual_completion")}>
+        {getFieldDecorator("actual_completion", {
+          initialValue: job.actual_completion
+            ? moment(job.actual_completion)
+            : null
+        })(<DatePicker name="actual_completion" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.scheduled_delivery")}>
+        {getFieldDecorator("scheduled_delivery", {
+          initialValue: job.scheduled_delivery
+            ? moment(job.scheduled_delivery)
+            : null
+        })(<DatePicker name="scheduled_delivery" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.actual_delivery")}>
+        {getFieldDecorator("actual_delivery", {
+          initialValue: job.actual_delivery ? moment(job.actual_delivery) : null
+        })(<DatePicker name="actual_delivery" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.date_invoiced")}>
+        {getFieldDecorator("date_invoiced", {
+          initialValue: job.date_invoiced ? moment(job.date_invoiced) : null
+        })(<DatePicker name="date_invoiced" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.date_closed")}>
+        {getFieldDecorator("date_closed", {
+          initialValue: job.date_closed ? moment(job.date_closed) : null
+        })(<DatePicker name="date_closed" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.date_exported")}>
+        {getFieldDecorator("date_exported", {
+          initialValue: job.date_exported ? moment(job.date_exported) : null
+        })(<DatePicker name="date_exported" />)}
+      </Form.Item>
+    </div>
+  );
+}
diff --git a/client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx b/client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx
index 7954b133e..360d22de2 100644
--- a/client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx
+++ b/client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx
@@ -1,4 +1,4 @@
-import { Form, Input, InputNumber } from "antd";
+import { Form, Input, InputNumber, Divider } from "antd";
 import React, { useContext } from "react";
 import { useTranslation } from "react-i18next";
 import JobDetailFormContext from "../../pages/jobs-detail/jobs-detail.page.context";
@@ -52,6 +52,126 @@ export default function JobsDetailFinancials({ job }) {
           initialValue: job.adjustment_bottom_line
         })(<InputNumber name="adjustment_bottom_line" />)}
       </Form.Item>
+      <Divider />
+      Totals Table
+      <Form.Item label={t("jobs.fields.labor_rate_desc")}>
+        {getFieldDecorator("labor_rate_desc", {
+          initialValue: job.labor_rate_desc
+        })(<Input name="labor_rate_desc" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_lab")}>
+        {getFieldDecorator("rate_lab", {
+          initialValue: job.rate_lab
+        })(<InputNumber name="rate_lab" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_lad")}>
+        {getFieldDecorator("rate_lad", {
+          initialValue: job.rate_lad
+        })(<InputNumber name="rate_lad" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_lae")}>
+        {getFieldDecorator("rate_lae", {
+          initialValue: job.rate_lae
+        })(<InputNumber name="rate_lae" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_lar")}>
+        {getFieldDecorator("rate_lar", {
+          initialValue: job.rate_lar
+        })(<InputNumber name="rate_lar" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_las")}>
+        {getFieldDecorator("rate_las", {
+          initialValue: job.rate_las
+        })(<InputNumber name="rate_las" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_laf")}>
+        {getFieldDecorator("rate_laf", {
+          initialValue: job.rate_laf
+        })(<InputNumber name="rate_laf" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_lam")}>
+        {getFieldDecorator("rate_lam", {
+          initialValue: job.rate_lam
+        })(<InputNumber name="rate_lam" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_lag")}>
+        {getFieldDecorator("rate_lag", {
+          initialValue: job.rate_lag
+        })(<InputNumber name="rate_lag" />)}
+      </Form.Item>
+      Note //TODO: Remove ATP rate?
+      <Form.Item label={t("jobs.fields.rate_atp")}>
+        {getFieldDecorator("rate_atp", {
+          initialValue: job.rate_atp
+        })(<InputNumber name="rate_atp" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_lau")}>
+        {getFieldDecorator("rate_lau", {
+          initialValue: job.rate_lau
+        })(<InputNumber name="rate_lau" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_la1")}>
+        {getFieldDecorator("rate_la1", {
+          initialValue: job.rate_la1
+        })(<InputNumber name="rate_la1" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_la2")}>
+        {getFieldDecorator("rate_la2", {
+          initialValue: job.rate_la2
+        })(<InputNumber name="rate_la2" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_la3")}>
+        {getFieldDecorator("rate_la3", {
+          initialValue: job.rate_la3
+        })(<InputNumber name="rate_la3" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_la4")}>
+        {getFieldDecorator("rate_la4", {
+          initialValue: job.rate_la4
+        })(<InputNumber name="rate_la4" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_mapa")}>
+        {getFieldDecorator("rate_mapa", {
+          initialValue: job.rate_mapa
+        })(<InputNumber name="rate_mapa" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_mash")}>
+        {getFieldDecorator("rate_mash", {
+          initialValue: job.rate_mash
+        })(<InputNumber name="rate_mash" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_mahw")}>
+        {getFieldDecorator("rate_mahw", {
+          initialValue: job.rate_mahw
+        })(<InputNumber name="rate_mahw" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_ma2s")}>
+        {getFieldDecorator("rate_ma2s", {
+          initialValue: job.rate_ma2s
+        })(<InputNumber name="rate_ma2s" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_ma3s")}>
+        {getFieldDecorator("rate_ma3s", {
+          initialValue: job.rate_ma3s
+        })(<InputNumber name="rate_ma3s" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_mabl")}>
+        {getFieldDecorator("rate_mabl", {
+          initialValue: job.rate_mabl
+        })(<InputNumber name="rate_mabl" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_macs")}>
+        {getFieldDecorator("rate_macs", {
+          initialValue: job.rate_macs
+        })(<InputNumber name="rate_macs" />)}
+      </Form.Item>
+      <Form.Item label={t("jobs.fields.rate_matd")}>
+        {getFieldDecorator("rate_matd", {
+          initialValue: job.rate_matd
+        })(<InputNumber name="rate_matd" />)}
+      </Form.Item>
+
+
     </div>
   );
 }
diff --git a/client/src/components/jobs-detail-insurance/jobs-detail-insurance.component.jsx b/client/src/components/jobs-detail-insurance/jobs-detail-insurance.component.jsx
index f0178d6f1..4dc589973 100644
--- a/client/src/components/jobs-detail-insurance/jobs-detail-insurance.component.jsx
+++ b/client/src/components/jobs-detail-insurance/jobs-detail-insurance.component.jsx
@@ -11,8 +11,6 @@ export default function JobsDetailInsurance({ job }) {
   const { getFieldDecorator, getFieldValue } = form;
   const { t } = useTranslation();
 
-  console.log("job.loss_date", job.loss_date);
-
   return (
     <div>
       <Form.Item label={t("jobs.fields.ins_co_id")}>
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index f90290794..c04fd8fb2 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -154,13 +154,48 @@ export const GET_JOB_BY_PK = gql`
       adjustment_bottom_line
       ownr_fn
       ownr_ln
-      owner{
+      owner {
         id
         ownr_fn
         ownr_ln
       }
+      labor_rate_desc
+      rate_lab
+      rate_lad
+      rate_lae
+      rate_lar
+      rate_las
+      rate_laf
+      rate_lam
+      rate_lag
+      rate_atp
+      rate_lau
+      rate_la1
+      rate_la2
+      rate_la3
+      rate_la4
+      rate_mapa
+      rate_mash
+      rate_mahw
+      rate_ma2s
+      rate_ma3s
+      rate_mabl
+      rate_macs
+      rate_matd
+      actual_in
+      scheduled_completion
+      scheduled_in
+      actual_completion
+      scheduled_delivery
+      actual_delivery
+      date_estimated
+      date_open
+      date_scheduled
+      date_invoiced
+      date_closed
+      date_exported
 
-      joblines{
+      joblines {
         id
         unq_seq
         line_ind
diff --git a/client/src/pages/jobs-available/jobs-available.page.container.jsx b/client/src/pages/jobs-available/jobs-available.page.container.jsx
index 9dc54c321..86f1704ac 100644
--- a/client/src/pages/jobs-available/jobs-available.page.container.jsx
+++ b/client/src/pages/jobs-available/jobs-available.page.container.jsx
@@ -1,13 +1,15 @@
-import React from "react";
+import React, { useEffect } from "react";
 import { useMutation, useLazyQuery } from "react-apollo";
 import {
   DELETE_AVAILABLE_JOB,
   QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK
 } from "../../graphql/available-jobs.queries";
 import JobsAvailablePageComponent from "./jobs-available.page.component";
+import { useTranslation } from "react-i18next";
 
 export default function JobsAvailablePageContainer() {
   const [deleteJob] = useMutation(DELETE_AVAILABLE_JOB);
+  const { t } = useTranslation();
 
   const estDataLazyLoad = useLazyQuery(
     QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK,
@@ -15,6 +17,11 @@ export default function JobsAvailablePageContainer() {
       fetchPolicy: "network-only"
     }
   );
+
+  useEffect(() => {
+    document.title = t("titles.jobsavailable");
+  }, [t]);
+
   return (
     <div>
       <JobsAvailablePageComponent
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 beb249db2..a91ebfbef 100644
--- a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
+++ b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
@@ -7,7 +7,7 @@ import {
   FaRegStickyNote,
   FaShieldAlt
 } from "react-icons/fa";
-import JobsLines from '../../components/job-detail-lines/job-lines.component'
+import JobsLinesContainer from "../../components/job-detail-lines/job-lines.container";
 import JobsDetailClaims from "../../components/jobs-detail-claims/jobs-detail-claims.component";
 import JobsDetailFinancials from "../../components/jobs-detail-financial/jobs-detail-financial.component";
 import JobsDetailHeader from "../../components/jobs-detail-header/jobs-detail-header.component";
@@ -15,6 +15,7 @@ import JobsDetailInsurance from "../../components/jobs-detail-insurance/jobs-det
 import JobsDocumentsContainer from "../../components/jobs-documents/jobs-documents.container";
 import JobNotesContainer from "../../components/jobs-notes/jobs-notes.container";
 import JobDetailFormContext from "./jobs-detail.page.context";
+import JobsDetailDatesComponent from "../../components/jobs-detail-dates/jobs-detail-dates.component";
 
 export default function JobsDetailPage({
   job,
@@ -94,7 +95,7 @@ export default function JobsDetailPage({
           }
           key="repairdata"
         >
-          <JobsLines job={job} />
+          <JobsLinesContainer jobId={job.id} />
         </Tabs.TabPane>
 
         <Tabs.TabPane
@@ -142,7 +143,7 @@ export default function JobsDetailPage({
           }
           key="dates"
         >
-          Dates
+          <JobsDetailDatesComponent job={job} />}
         </Tabs.TabPane>
 
         <Tabs.TabPane
@@ -152,7 +153,7 @@ export default function JobsDetailPage({
               {t("jobs.labels.documents")}
             </span>
           }
-          key="#documents"
+          key="documents"
         >
           <JobsDocumentsContainer jobId={job.id} />
         </Tabs.TabPane>
@@ -163,7 +164,7 @@ export default function JobsDetailPage({
               {t("jobs.labels.notes")}
             </span>
           }
-          key="#notes"
+          key="notes"
         >
           <JobNotesContainer jobId={job.id} />
         </Tabs.TabPane>
diff --git a/client/src/pages/jobs-detail/jobs-detail.page.container.jsx b/client/src/pages/jobs-detail/jobs-detail.page.container.jsx
index e0c49840b..81aca70bd 100644
--- a/client/src/pages/jobs-detail/jobs-detail.page.container.jsx
+++ b/client/src/pages/jobs-detail/jobs-detail.page.container.jsx
@@ -4,7 +4,11 @@ import { useMutation, useQuery } from "react-apollo";
 import { useTranslation } from "react-i18next";
 import AlertComponent from "../../components/alert/alert.component";
 import SpinComponent from "../../components/loading-spinner/loading-spinner.component";
-import { CONVERT_JOB_TO_RO, GET_JOB_BY_PK, UPDATE_JOB } from "../../graphql/jobs.queries";
+import {
+  CONVERT_JOB_TO_RO,
+  GET_JOB_BY_PK,
+  UPDATE_JOB
+} from "../../graphql/jobs.queries";
 import JobsDetailPage from "./jobs-detail.page.component";
 import JobDetailFormContext from "./jobs-detail.page.context";
 
@@ -21,11 +25,13 @@ function JobsDetailPageContainer({ match, form }) {
 
   useEffect(() => {
     document.title = loading
-      ? "..."
+      ? t("titles.app")
       : error
       ? t("titles.app")
       : t("titles.jobsdetail", {
-          ro_number: data.jobs_by_pk.ro_number
+          ro_number: data.jobs_by_pk.converted
+            ? data.jobs_by_pk.ro_number
+            : `EST ${data.jobs_by_pk.est_number}`
         });
   }, [loading, data, t, error]);
 
@@ -54,7 +60,7 @@ function JobsDetailPageContainer({ match, form }) {
   };
 
   if (loading) return <SpinComponent />;
-  if (error) return <AlertComponent message={error.message} type='error' />;
+  if (error) return <AlertComponent message={error.message} type="error" />;
 
   return data.jobs_by_pk ? (
     <JobDetailFormContext.Provider value={form}>
@@ -68,7 +74,7 @@ function JobsDetailPageContainer({ match, form }) {
       />
     </JobDetailFormContext.Provider>
   ) : (
-    <AlertComponent message={t("jobs.errors.noaccess")} type='error' />
+    <AlertComponent message={t("jobs.errors.noaccess")} type="error" />
   );
 }
 export default Form.create({ name: "JobsDetailPageContainer" })(
diff --git a/client/src/pages/manage-root/manage-root.page.component.jsx b/client/src/pages/manage-root/manage-root.page.component.jsx
new file mode 100644
index 000000000..a7ff94d11
--- /dev/null
+++ b/client/src/pages/manage-root/manage-root.page.component.jsx
@@ -0,0 +1,9 @@
+import React from 'react'
+
+export default function ManageRootPageComponent() {
+    return (
+        <div>
+            Temporary Home Page.
+        </div>
+    )
+}
diff --git a/client/src/pages/manage-root/manage-root.page.container.jsx b/client/src/pages/manage-root/manage-root.page.container.jsx
new file mode 100644
index 000000000..c525563e4
--- /dev/null
+++ b/client/src/pages/manage-root/manage-root.page.container.jsx
@@ -0,0 +1,8 @@
+import React from 'react'
+import ManageRootPageComponent from './manage-root.page.component'
+
+export default function ManageRootPageContainer() {
+    return (
+    <ManageRootPageComponent />
+    )
+}
diff --git a/client/src/pages/manage/manage.page.jsx b/client/src/pages/manage/manage.page.jsx
index 93245792f..07ebc470c 100644
--- a/client/src/pages/manage/manage.page.jsx
+++ b/client/src/pages/manage/manage.page.jsx
@@ -1,17 +1,20 @@
+import { BackTop, Layout } from "antd";
 import React, { lazy, Suspense, useEffect } from "react";
-import { Route } from "react-router";
-import { Layout, BackTop } from "antd";
 import { useTranslation } from "react-i18next";
-
+import { Route } from "react-router";
+import ChatWindowContainer from "../../components/chat-window/chat-window.container";
+import ErrorBoundary from "../../components/error-boundary/error-boundary.component";
+import FooterComponent from "../../components/footer/footer.component";
 //Component Imports
 import HeaderContainer from "../../components/header/header.container";
-import FooterComponent from "../../components/footer/footer.component";
-import ErrorBoundary from "../../components/error-boundary/error-boundary.component";
-
+import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
 import "./manage.page.styles.scss";
-import ChatWindowContainer from "../../components/chat-window/chat-window.container";
 
-const WhiteBoardPage = lazy(() => import("../white-board/white-board.page"));
+
+//const WhiteBoardPage = lazy(() => import("../white-board/white-board.page"));
+const ManageRootPage = lazy(() =>
+  import("../manage-root/manage-root.page.container")
+);
 const JobsPage = lazy(() => import("../jobs/jobs.page"));
 const JobsDetailPage = lazy(() =>
   import("../jobs-detail/jobs-detail.page.container")
@@ -39,11 +42,14 @@ export default function Manage({ match }) {
         <HeaderContainer />
       </Header>
 
-      <Content className='content-container'>
+      <Content className="content-container">
         <ErrorBoundary>
           <Suspense
-            fallback={<div>TODO: Suspended Loading in Manage Page...</div>}>
-            <Route exact path={`${match.path}`} component={WhiteBoardPage} />
+            fallback={
+              <LoadingSpinner message={t("general.labels.loadingapp")} />
+            }
+          >
+            <Route exact path={`${match.path}`} component={ManageRootPage} />
 
             <Route exact path={`${match.path}/jobs`} component={JobsPage} />
 
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 8de53dc4b..c8b2c725e 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -23,6 +23,7 @@
 				"actions": "Actions",
 				"in": "In",
 				"loading": "Loading...",
+				"loadingapp": "Loading Bodyshop.app",
 				"na": "N/A",
 				"out": "Out",
 				"save": "Save",
@@ -104,6 +105,7 @@
 				"ins_ph1": "File Handler Phone #",
 				"kmin": "Mileage In",
 				"kmout": "Mileage Out",
+				"labor_rate_desc": "Labor Rate Name",
 				"loss_date": "Loss Date",
 				"loss_desc": "Loss of Use",
 				"other_amount_payable": "Other Amount Payable",
@@ -115,6 +117,28 @@
 				"phoneshort": "PH",
 				"policy_no": "Policy #",
 				"ponumber": "PO Number",
+				"rate_atp": "ATP",
+				"rate_la1": "LA1 Rate",
+				"rate_la2": "LA2 Rate",
+				"rate_la3": "LA3 Rate",
+				"rate_la4": "LA4 Rate",
+				"rate_lab": "Labor Rate",
+				"rate_lad": "Diagnostic Rate",
+				"rate_lae": "Electrical Rate",
+				"rate_laf": "Frame Rate",
+				"rate_lag": "Glass Rate",
+				"rate_lam": "Mechanical Rate",
+				"rate_lar": "Refinish Rate",
+				"rate_las": "Sublet Rate",
+				"rate_lau": "Aluminum Rate",
+				"rate_ma2s": "2 Stage Paint Rate",
+				"rate_ma3s": "3 Stage Paint Rate",
+				"rate_mabl": "MABL??",
+				"rate_macs": "MACS??",
+				"rate_mahw": "Hazardous Waste Rate",
+				"rate_mapa": "Paint Materials Rate",
+				"rate_mash": "Shop Material Rate",
+				"rate_matd": "Tire Disposal Rate",
 				"referralsource": "Referral Source",
 				"regie_number": "Registration #",
 				"repairtotal": "Repair Total",
@@ -238,6 +262,7 @@
 		"titles": {
 			"app": "Bodyshop by ImEX Systems",
 			"jobs": "All Jobs | $t(titles.app)",
+			"jobsavailable": "Available Jobs | $t(titles.app)",
 			"jobsdetail": "Job {{ro_number}} | $t(titles.app)",
 			"jobsdocuments": "Job Documents {{ro_number}} | $t(titles.app)",
 			"profile": "My Profile | $t(titles.app)"
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index b45b9e15c..769f114cd 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -23,6 +23,7 @@
 				"actions": "Comportamiento",
 				"in": "en",
 				"loading": "Cargando...",
+				"loadingapp": "Cargando Bodyshop.app",
 				"na": "N / A",
 				"out": "Afuera",
 				"save": "Salvar",
@@ -104,6 +105,7 @@
 				"ins_ph1": "File Handler Phone #",
 				"kmin": "Kilometraje en",
 				"kmout": "Kilometraje",
+				"labor_rate_desc": "Nombre de la tasa laboral",
 				"loss_date": "Fecha de pérdida",
 				"loss_desc": "Perdida de uso",
 				"other_amount_payable": "Otra cantidad a pagar",
@@ -115,6 +117,28 @@
 				"phoneshort": "PH",
 				"policy_no": "Política #",
 				"ponumber": "numero postal",
+				"rate_atp": "ATP",
+				"rate_la1": "Tarifa LA1",
+				"rate_la2": "Tarifa LA2",
+				"rate_la3": "Tarifa LA3",
+				"rate_la4": "Tarifa LA4",
+				"rate_lab": "Tasa de trabajo",
+				"rate_lad": "Tasa de diagnóstico",
+				"rate_lae": "tarifa eléctrica",
+				"rate_laf": "Cuadros por segundo",
+				"rate_lag": "Tasa de vidrio",
+				"rate_lam": "Tasa mecánica",
+				"rate_lar": "Tasa de acabado",
+				"rate_las": "Tasa de subarriendo",
+				"rate_lau": "Tasa de aluminio",
+				"rate_ma2s": "Velocidad de pintura de 2 etapas",
+				"rate_ma3s": "Tasa de pintura de 3 etapas",
+				"rate_mabl": "MABL ??",
+				"rate_macs": "MACS ??",
+				"rate_mahw": "Tasa de residuos peligrosos",
+				"rate_mapa": "Tasa de materiales de pintura",
+				"rate_mash": "Comprar material de tarifa",
+				"rate_matd": "Tasa de eliminación de neumáticos",
 				"referralsource": "Fuente de referencia",
 				"regie_number": "N. ° de registro",
 				"repairtotal": "Reparación total",
@@ -238,6 +262,7 @@
 		"titles": {
 			"app": "Carrocería de ImEX Systems",
 			"jobs": "Todos los trabajos | $t(titles.app)",
+			"jobsavailable": "Empleos disponibles | $t(titles.app)",
 			"jobsdetail": "Trabajo {{ro_number}} | $t(titles.app)",
 			"jobsdocuments": "Documentos de trabajo {{ro_number}} | $ t (títulos.app)",
 			"profile": "Mi perfil | $t(titles.app)"
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 676a09487..c416bb92f 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -23,6 +23,7 @@
 				"actions": "actes",
 				"in": "dans",
 				"loading": "Chargement...",
+				"loadingapp": "Chargement de Bodyshop.app",
 				"na": "N / A",
 				"out": "En dehors",
 				"save": "sauvegarder",
@@ -104,6 +105,7 @@
 				"ins_ph1": "Numéro de téléphone du gestionnaire de fichiers",
 				"kmin": "Kilométrage en",
 				"kmout": "Kilométrage hors",
+				"labor_rate_desc": "Nom du taux de main-d'œuvre",
 				"loss_date": "Date de perte",
 				"loss_desc": "Perte d'usage",
 				"other_amount_payable": "Autre montant à payer",
@@ -115,6 +117,28 @@
 				"phoneshort": "PH",
 				"policy_no": "Politique #",
 				"ponumber": "Numéro de bon de commande",
+				"rate_atp": "ATP",
+				"rate_la1": "Taux LA1",
+				"rate_la2": "Taux LA2",
+				"rate_la3": "Taux LA3",
+				"rate_la4": "Taux LA4",
+				"rate_lab": "Taux de la main-d'œuvre",
+				"rate_lad": "Taux de diagnostic",
+				"rate_lae": "Tarif électrique",
+				"rate_laf": "Taux de trame",
+				"rate_lag": "Taux de verre",
+				"rate_lam": "Taux mécanique",
+				"rate_lar": "Taux de finition",
+				"rate_las": "Taux de sous-location",
+				"rate_lau": "Taux d'aluminium",
+				"rate_ma2s": "Taux de peinture en 2 étapes",
+				"rate_ma3s": "Taux de peinture en 3 étapes",
+				"rate_mabl": "MABL ??",
+				"rate_macs": "MACS ??",
+				"rate_mahw": "Taux de déchets dangereux",
+				"rate_mapa": "Taux de matériaux de peinture",
+				"rate_mash": "Tarif du matériel de la boutique",
+				"rate_matd": "Taux d'élimination des pneus",
 				"referralsource": "Source de référence",
 				"regie_number": "Enregistrement #",
 				"repairtotal": "Réparation totale",
@@ -238,6 +262,7 @@
 		"titles": {
 			"app": "Carrosserie par ImEX Systems",
 			"jobs": "Tous les emplois | $t(titles.app)",
+			"jobsavailable": "Emplois disponibles | $t(titles.app)",
 			"jobsdetail": "Travail {{ro_number}} | $t(titles.app)",
 			"jobsdocuments": "Documents de travail {{ro_number}} | $ t (titres.app)",
 			"profile": "Mon profil | $t(titles.app)"
diff --git a/client/src/utils/DateFormatter.jsx b/client/src/utils/DateFormatter.jsx
index 4f551f8ce..07a41d7b4 100644
--- a/client/src/utils/DateFormatter.jsx
+++ b/client/src/utils/DateFormatter.jsx
@@ -2,7 +2,7 @@ import React from "react";
 import Moment from "react-moment";
 
 export function DateFormatter(props) {
-  return <Moment format="MM/DD/YYYY">{props.children || ""}</Moment>;
+  return <Moment format="MM/DD/YYYY">{props.children || null}</Moment>;
 }
 
 export function DateTimeFormatter(props) {