diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index a5a36ebfb..1fac37348 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -25660,6 +25660,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>coversheet_landscape</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>coversheet_portrait</name>
                                         <definition_loaded>false</definition_loaded>
@@ -25744,6 +25765,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>estimate_followup</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>express_repair_checklist</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>filing_coversheet_portrait</name>
                                         <definition_loaded>false</definition_loaded>
@@ -25828,6 +25891,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>guarantee</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>invoice_customer_payable</name>
                                         <definition_loaded>false</definition_loaded>
@@ -26059,6 +26143,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>qc_sheet</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>ro_with_description</name>
                                         <definition_loaded>false</definition_loaded>
@@ -26122,6 +26227,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>vehicle_check_in</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>vehicle_delivery_check</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>window_tag</name>
                                         <definition_loaded>false</definition_loaded>
@@ -27305,6 +27452,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>timetickets_employee</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>timetickets_summary</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>
                                 </children>
                             </folder_node>
                         </children>
diff --git a/client/public/index.html b/client/public/index.html
index c24a163ad..697bb87c3 100644
--- a/client/public/index.html
+++ b/client/public/index.html
@@ -9,6 +9,12 @@
     <!-- <link rel="apple-touch-icon" href="logo192.png" /> -->
     <link rel="apple-touch-icon" href="logo192.png" />
 
+    <!-- <script
+      data-jsd-embedded
+      data-key="51adb36e-ee16-46b1-a4c6-4b6d5fcd8530"
+      data-base-url="https://jsd-widget.atlassian.com"
+      src="https://jsd-widget.atlassian.com/assets/embed.js"
+    ></script> -->
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
diff --git a/client/src/components/jira-support-widget/jira-support-widget.component.jsx b/client/src/components/jira-support-widget/jira-support-widget.component.jsx
index d6d23610c..54280f8dc 100644
--- a/client/src/components/jira-support-widget/jira-support-widget.component.jsx
+++ b/client/src/components/jira-support-widget/jira-support-widget.component.jsx
@@ -1,29 +1,37 @@
 import React, { useEffect } from "react";
 
 export default function JiraSupportComponent() {
+  useScript();
+
+  return <div>Jira Temp Widget</div>;
+}
+
+const useScript = () => {
   useEffect(() => {
+    console.log("Creating JIRA widget.");
     const script = document.createElement("script");
-
     script.src = "https://jsd-widget.atlassian.com/assets/embed.js";
-    // script.attributes.setNamedItem({ "data-jsd-embedded": true });
-    // script.attributes.setNamedItem({
-    //   "data-key": "d69bb65c-1dd3-483f-b109-66a970d03f44",
-    // });
-    // script.attributes.setNamedItem({
-    //   "data-base-url": "https://jsd-widget.atlassian.com",
-    // });
-
     // script["data-jsd-embedded"] = true;
-    // script["data-key"] = "d69bb65c-1dd3-483f-b109-66a970d03f44";
+    // script["data-key"] = "51adb36e-ee16-46b1-a4c6-4b6d5fcd8530";
     // script["data-base-url"] = "https://jsd-widget.atlassian.com";
-    script.async = true;
 
-    document.body.appendChild(script);
+    // script.attributes.setNamedItem("data-jsd-embedded");
+    // script.attributes.setNamedItem("data-key");
+    // script.attributes.setNamedItem("data-base-url");
+
+    script.setAttribute("data-jsd-embedded", true);
+    script.setAttribute("data-key", "51adb36e-ee16-46b1-a4c6-4b6d5fcd8530");
+    script.setAttribute("data-base-url", "https://jsd-widget.atlassian.com");
+    //script.async = true;
+    script.onload = () => {
+      var DOMContentLoaded_event = document.createEvent("Event");
+      DOMContentLoaded_event.initEvent("DOMContentLoaded", true, true);
+      window.document.dispatchEvent(DOMContentLoaded_event);
+    };
+    document.head.appendChild(script);
 
     return () => {
-      document.body.removeChild(script);
+      document.head.removeChild(script);
     };
   }, []);
-
-  return <div></div>;
-}
+};
diff --git a/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx b/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx
index d16c59f56..23a213f0b 100644
--- a/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx
+++ b/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx
@@ -5,7 +5,7 @@ import queryString from "query-string";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { Link, useHistory, useLocation } from "react-router-dom";
+import { useHistory, useLocation } from "react-router-dom";
 import { GET_JOB_BY_PK } from "../../graphql/jobs.queries";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import AlertComponent from "../alert/alert.component";
@@ -90,13 +90,7 @@ export function JobDetailCards({ setPrintCenterContext }) {
               {t("jobs.labels.inproduction")}
             </Tag>,
           ]}
-          title={
-            <Link to={`/manage/jobs/${data.jobs_by_pk.id}`}>
-              {data.jobs_by_pk.ro_number
-                ? `${t("jobs.fields.ro_number")} ${data.jobs_by_pk.ro_number}`
-                : t("general.labels.na")}
-            </Link>
-          }
+          title={t("jobs.fields.ro_number") || t("general.labels.na")}
           subTitle={data.jobs_by_pk.status}
           extra={
             <Button
diff --git a/client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx b/client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx
index fc43fb458..88c22b4d1 100644
--- a/client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx
+++ b/client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx
@@ -5,7 +5,7 @@ import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { Link, useHistory, useLocation } from "react-router-dom";
+import { useHistory, useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -95,11 +95,8 @@ export function TechLookupJobsList({ bodyshop }) {
       sortOrder:
         state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
 
-      render: (text, record) => (
-        <Link to={"/manage/jobs/" + record.id}>{record.ro_number}</Link>
-      ),
+      render: (text, record) => record.ro_number || t("general.labels.na"),
     },
-
     {
       title: t("jobs.fields.owner"),
       dataIndex: "owner",
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 33477cb78..06cc92b2d 100644
--- a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
+++ b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
@@ -10,7 +10,7 @@ import Axios from "axios";
 import Dinero from "dinero.js";
 import moment from "moment";
 import queryString from "query-string";
-import React, { lazy, Suspense, useState, useEffect } from "react";
+import React, { lazy, Suspense, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FaHardHat, FaRegStickyNote, FaShieldAlt } from "react-icons/fa";
 import { connect } from "react-redux";
@@ -95,7 +95,6 @@ export function JobsDetailPage({
   };
 
   useEffect(() => {
-    console.log("Resetting jobs form as job has changed.");
     form.resetFields();
     form.resetFields();
   }, [form, job]);
diff --git a/client/src/pages/reset-password/reset-password.component.jsx b/client/src/pages/reset-password/reset-password.component.jsx
index 5dec13d70..90a11c226 100644
--- a/client/src/pages/reset-password/reset-password.component.jsx
+++ b/client/src/pages/reset-password/reset-password.component.jsx
@@ -7,7 +7,6 @@ import UserValidatePwReset from "../../components/user-validate-pw-reset/user-va
 export default function ResetPassword() {
   const searchParams = queryString.parse(useLocation().search);
   const { mode, oobCode } = searchParams;
-  console.log("ResetPassword -> mode, oobCode", mode, oobCode);
 
   if (mode === "resetPassword")
     return <UserValidatePwReset oobCode={oobCode} />;
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index f5420a800..fd4c94970 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1554,14 +1554,18 @@
 				"appointment_confirmation": "Appointment Confirmation",
 				"appointment_reminder": "Appointment Reminder",
 				"casl_authorization": "CASL Authorization",
+				"coversheet_landscape": "Coversheet (Landscape)",
 				"coversheet_portrait": "Coversheet Portrait",
 				"diagnostic_authorization": "Diagnostic Authorization",
 				"estimate": "Estimate Only",
 				"estimate_detail": "Estimate Details",
+				"estimate_followup": "Estimate Followup",
+				"express_repair_checklist": "Express Repair Checklist",
 				"filing_coversheet_portrait": "Filing Coversheet (Portrait)",
 				"final_invoice": "Final Invoice",
 				"fippa_authorization": "FIPPA Authorization",
 				"glass_express_checklist": "Glass Express Checklist",
+				"guarantee": "Repair Guarantee",
 				"invoice_customer_payable": "Invoice (Customer Payable)",
 				"invoice_total_payable": "Invoice (Total Payable)",
 				"job_notes": "Job Notes",
@@ -1573,9 +1577,12 @@
 				"payment_receipt": "Payment Receipt",
 				"payment_request": "Payment Request",
 				"payments_by_job": "Job Payments",
+				"qc_sheet": "Quality Control Sheet",
 				"ro_with_description": "RO Summary with Descriptions",
 				"supplement_request": "Supplement Request",
 				"thirdpartypayer": "Third Party Payer",
+				"vehicle_check_in": "Vehicle Intake",
+				"vehicle_delivery_check": "Vehicle Delivery Checklist",
 				"window_tag": "Window Tag",
 				"work_authorization": "Work Authorization",
 				"worksheet_by_line_number": "Worksheet by Line Number",
@@ -1656,7 +1663,9 @@
 				"purchases_by_vendor_detailed_date_range": "Purchases By Vendor - Detailed",
 				"purchases_by_vendor_summary_date_range": "Purchases by Vendor - Summary",
 				"schedule": "Appointment Schedule",
-				"timetickets": "Time Tickets"
+				"timetickets": "Time Tickets",
+				"timetickets_employee": "Employee Time Tickets",
+				"timetickets_summary": "Time Tickets Summary"
 			}
 		},
 		"scoreboard": {
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 7b29c217d..8b119b68e 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1554,14 +1554,18 @@
 				"appointment_confirmation": "",
 				"appointment_reminder": "",
 				"casl_authorization": "",
+				"coversheet_landscape": "",
 				"coversheet_portrait": "",
 				"diagnostic_authorization": "",
 				"estimate": "",
 				"estimate_detail": "",
+				"estimate_followup": "",
+				"express_repair_checklist": "",
 				"filing_coversheet_portrait": "",
 				"final_invoice": "",
 				"fippa_authorization": "",
 				"glass_express_checklist": "",
+				"guarantee": "",
 				"invoice_customer_payable": "",
 				"invoice_total_payable": "",
 				"job_notes": "",
@@ -1573,9 +1577,12 @@
 				"payment_receipt": "",
 				"payment_request": "",
 				"payments_by_job": "",
+				"qc_sheet": "",
 				"ro_with_description": "",
 				"supplement_request": "",
 				"thirdpartypayer": "",
+				"vehicle_check_in": "",
+				"vehicle_delivery_check": "",
 				"window_tag": "",
 				"work_authorization": "",
 				"worksheet_by_line_number": "",
@@ -1656,7 +1663,9 @@
 				"purchases_by_vendor_detailed_date_range": "",
 				"purchases_by_vendor_summary_date_range": "",
 				"schedule": "",
-				"timetickets": ""
+				"timetickets": "",
+				"timetickets_employee": "",
+				"timetickets_summary": ""
 			}
 		},
 		"scoreboard": {
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 1920dd9a9..61f862c86 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1554,14 +1554,18 @@
 				"appointment_confirmation": "",
 				"appointment_reminder": "",
 				"casl_authorization": "",
+				"coversheet_landscape": "",
 				"coversheet_portrait": "",
 				"diagnostic_authorization": "",
 				"estimate": "",
 				"estimate_detail": "",
+				"estimate_followup": "",
+				"express_repair_checklist": "",
 				"filing_coversheet_portrait": "",
 				"final_invoice": "",
 				"fippa_authorization": "",
 				"glass_express_checklist": "",
+				"guarantee": "",
 				"invoice_customer_payable": "",
 				"invoice_total_payable": "",
 				"job_notes": "",
@@ -1573,9 +1577,12 @@
 				"payment_receipt": "",
 				"payment_request": "",
 				"payments_by_job": "",
+				"qc_sheet": "",
 				"ro_with_description": "",
 				"supplement_request": "",
 				"thirdpartypayer": "",
+				"vehicle_check_in": "",
+				"vehicle_delivery_check": "",
 				"window_tag": "",
 				"work_authorization": "",
 				"worksheet_by_line_number": "",
@@ -1656,7 +1663,9 @@
 				"purchases_by_vendor_detailed_date_range": "",
 				"purchases_by_vendor_summary_date_range": "",
 				"schedule": "",
-				"timetickets": ""
+				"timetickets": "",
+				"timetickets_employee": "",
+				"timetickets_summary": ""
 			}
 		},
 		"scoreboard": {
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index 47a4e5054..bef2ee906 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -167,6 +167,13 @@ export const TemplateList = (type, context) => {
             key: "coversheet_portrait",
             disabled: false,
           },
+          coversheet_landscape: {
+            title: i18n.t("printcenter.jobs.coversheet_landscape"),
+            description: "All Jobs Notes",
+            subject: i18n.t("printcenter.jobs.coversheet_landscape"),
+            key: "coversheet_landscape",
+            disabled: false,
+          },
           filing_coversheet_portrait: {
             title: i18n.t("printcenter.jobs.filing_coversheet_portrait"),
             description: "All Jobs Notes",
@@ -174,6 +181,48 @@ export const TemplateList = (type, context) => {
             key: "filing_coversheet_portrait",
             disabled: false,
           },
+          qc_sheet: {
+            title: i18n.t("printcenter.jobs.qc_sheet"),
+            description: "All Jobs Notes",
+            subject: i18n.t("printcenter.jobs.qc_sheet"),
+            key: "qc_sheet",
+            disabled: false,
+          },
+          estimate_followup: {
+            title: i18n.t("printcenter.jobs.estimate_followup"),
+            description: "All Jobs Notes",
+            subject: i18n.t("printcenter.jobs.estimate_followup"),
+            key: "estimate_followup",
+            disabled: false,
+          },
+          vehicle_delivery_check: {
+            title: i18n.t("printcenter.jobs.vehicle_delivery_check"),
+            description: "All Jobs Notes",
+            subject: i18n.t("printcenter.jobs.vehicle_delivery_check"),
+            key: "vehicle_delivery_check",
+            disabled: false,
+          },
+          express_repair_checklist: {
+            title: i18n.t("printcenter.jobs.express_repair_checklist"),
+            description: "All Jobs Notes",
+            subject: i18n.t("printcenter.jobs.express_repair_checklist"),
+            key: "express_repair_checklist",
+            disabled: false,
+          },
+          guarantee: {
+            title: i18n.t("printcenter.jobs.guarantee"),
+            description: "All Jobs Notes",
+            subject: i18n.t("printcenter.jobs.guarantee"),
+            key: "guarantee",
+            disabled: false,
+          },
+          vehicle_check_in: {
+            title: i18n.t("printcenter.jobs.vehicle_check_in"),
+            description: "All Jobs Notes",
+            subject: i18n.t("printcenter.jobs.vehicle_check_in"),
+            key: "vehicle_check_in",
+            disabled: false,
+          },
         }
       : {}),
     ...(!type || type === "job_special"
@@ -308,6 +357,22 @@ export const TemplateList = (type, context) => {
             idtype: "vendor",
             disabled: false,
           },
+          timetickets_employee: {
+            title: i18n.t("reportcenter.templates.timetickets_employee"),
+            description: "Est Detail",
+            subject: i18n.t("reportcenter.templates.timetickets_employee"),
+            key: "timetickets_employee",
+            idtype: "vendor",
+            disabled: false,
+          },
+          timetickets_summary: {
+            title: i18n.t("reportcenter.templates.timetickets_summary"),
+            description: "Est Detail",
+            subject: i18n.t("reportcenter.templates.timetickets_summary"),
+            key: "timetickets_summary",
+            idtype: "vendor",
+            disabled: false,
+          },
         }
       : {}),
     ...(!type || type === "courtesycarcontract"