diff --git a/client/src/components/bills-list-table/bills-list-table.component.jsx b/client/src/components/bills-list-table/bills-list-table.component.jsx
index a9ec77186..9170b563b 100644
--- a/client/src/components/bills-list-table/bills-list-table.component.jsx
+++ b/client/src/components/bills-list-table/bills-list-table.component.jsx
@@ -208,7 +208,9 @@ export function BillsListTableComponent({
     >
       <Table
         loading={billsQuery.loading}
-        scroll={{ x: true, y: "50rem" }}
+        scroll={{
+          x: true, // y: "50rem"
+        }}
         columns={columns}
         rowKey="id"
         dataSource={bills}
diff --git a/client/src/components/contracts-list/contracts-list.component.jsx b/client/src/components/contracts-list/contracts-list.component.jsx
index 4cbe5d7b6..d7ca3989d 100644
--- a/client/src/components/contracts-list/contracts-list.component.jsx
+++ b/client/src/components/contracts-list/contracts-list.component.jsx
@@ -158,7 +158,9 @@ export default function ContractsList({ loading, contracts, refetch, total }) {
     >
       <Table
         loading={loading}
-        scroll={{ x: "50%", y: "40rem" }}
+        scroll={{
+          x: "50%", //y: "40rem"
+        }}
         pagination={{
           position: "top",
           pageSize: 25,
diff --git a/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx b/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
index f6a069ad7..29e9d7a99 100644
--- a/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
+++ b/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
@@ -24,7 +24,10 @@ export function Jobd3RdPartyModal({ bodyshop, jobId }) {
   const { t } = useTranslation();
   const [form] = Form.useForm();
   const { data: VendorAutoCompleteData } = useQuery(
-    SEARCH_VENDOR_AUTOCOMPLETE_WITH_ADDR
+    SEARCH_VENDOR_AUTOCOMPLETE_WITH_ADDR,
+    {
+      skip: !isModalVisible,
+    }
   );
 
   const showModal = () => {
diff --git a/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx b/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx
index acc81ef91..6e80f1fad 100644
--- a/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx
+++ b/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx
@@ -87,7 +87,9 @@ export default function JobCostingPartsTable({ data, summaryData }) {
             </Space>
           );
         }}
-        scroll={{ x: "50%", y: "40rem" }}
+        scroll={{
+          x: "50%", //y: "40rem"
+        }}
         onChange={handleTableChange}
         pagination={{ position: "top", defaultPageSize: 25 }}
         columns={columns}
diff --git a/client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx b/client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx
index 48e7008f7..be0fba05d 100644
--- a/client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx
+++ b/client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx
@@ -1,4 +1,4 @@
-import { Checkbox, Table } from "antd";
+import { Checkbox, PageHeader, Table } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
@@ -86,7 +86,7 @@ export default function JobReconciliationBillsTable({
   };
 
   return (
-    <div>
+    <PageHeader title={t("bills.labels.bills")}>
       <Table
         pagination={false}
         scroll={{ y: "40vh", x: true }}
@@ -99,6 +99,6 @@ export default function JobReconciliationBillsTable({
           selectedRowKeys: selectedLines,
         }}
       />
-    </div>
+    </PageHeader>
   );
 }
diff --git a/client/src/components/job-reconciliation-parts-table/job-reconciliation-parts-table.component.jsx b/client/src/components/job-reconciliation-parts-table/job-reconciliation-parts-table.component.jsx
index 3103fe29f..496c06e4b 100644
--- a/client/src/components/job-reconciliation-parts-table/job-reconciliation-parts-table.component.jsx
+++ b/client/src/components/job-reconciliation-parts-table/job-reconciliation-parts-table.component.jsx
@@ -1,4 +1,4 @@
-import { Table } from "antd";
+import { PageHeader, Table } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
@@ -102,7 +102,7 @@ export default function JobReconcilitionPartsTable({
   };
 
   return (
-    <div>
+    <PageHeader title={t("jobs.labels.lines")}>
       <Table
         pagination={false}
         columns={columns}
@@ -122,6 +122,6 @@ export default function JobReconcilitionPartsTable({
       <div style={{ fontStyle: "italic", margin: "4px" }}>
         {t("jobs.labels.reconciliation.removedpartsstrikethrough")}
       </div>
-    </div>
+    </PageHeader>
   );
 }
diff --git a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
index c1c79c677..6ee708aa6 100644
--- a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
+++ b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
@@ -321,18 +321,19 @@ export function PartsOrderListTableComponent({
     ];
 
     return (
-      <>
+      <div>
         <PageHeader
           title={record && `${record.vendor.name} - ${record.order_number}`}
           extra={recordActions(record)}
         />
         <Table
-          scroll={{ x: true, y: "50rem" }}
+          scroll={{ x: true, //y: "50rem"
+         }}
           columns={columns}
           rowKey="id"
           dataSource={record.parts_order_lines}
         />
-      </>
+      </div>
     );
   };
 
@@ -367,7 +368,9 @@ export function PartsOrderListTableComponent({
       </Drawer>
       <Table
         loading={billsQuery.loading}
-        scroll={{ x: true, y: "50rem" }}
+        scroll={{ x: true, 
+          //y: "50rem"
+       }}
         columns={columns}
         rowKey="id"
         dataSource={parts_orders}
diff --git a/client/src/components/print-center-jobs/print-center-jobs.component.jsx b/client/src/components/print-center-jobs/print-center-jobs.component.jsx
index 428f468fa..5b4f646c1 100644
--- a/client/src/components/print-center-jobs/print-center-jobs.component.jsx
+++ b/client/src/components/print-center-jobs/print-center-jobs.component.jsx
@@ -32,7 +32,6 @@ export function PrintCenterJobsComponent({ printCenterModal }) {
   //Group it, create cards, and then filter out.
 
   const grouped = _.groupBy(filteredJobsReportsList, "group");
-  console.log("grouped :>> ", grouped);
 
   return (
     <div>
diff --git a/client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx b/client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx
index 4c41b0d95..46e203eb5 100644
--- a/client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx
+++ b/client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx
@@ -217,7 +217,8 @@ const JobRelatedTicketsTable = ({
     <Card title={t("timetickets.labels.jobhours")}>
       <Table
         loading={loading}
-        scroll={{ x: true, y: "50rem" }}
+        scroll={{ x: true,// y: "50rem"
+       }}
         columns={columns}
         rowKey="id"
         dataSource={data}
@@ -301,7 +302,8 @@ const ShiftRelatedTicketsTable = ({
     <Card title={t("timetickets.labels.clockhours")}>
       <Table
         loading={loading}
-        scroll={{ x: true, y: "50rem" }}
+        scroll={{ x: true,// y: "50rem"
+       }}
         columns={columns}
         rowKey="id"
         dataSource={data}
diff --git a/client/src/pages/bills/bills.page.component.jsx b/client/src/pages/bills/bills.page.component.jsx
index aa1cc4066..bd089873e 100644
--- a/client/src/pages/bills/bills.page.component.jsx
+++ b/client/src/pages/bills/bills.page.component.jsx
@@ -250,7 +250,8 @@ export function BillsListPage({
 
       <Table
         loading={loading}
-        scroll={{ x: "50%", y: "40rem" }}
+        scroll={{ x: "50%",// y: "40rem"
+       }}
         pagination={{
           position: "top",
           pageSize: 25,
diff --git a/client/src/utils/RenderTemplate.js b/client/src/utils/RenderTemplate.js
index 00f99739a..b7766c221 100644
--- a/client/src/utils/RenderTemplate.js
+++ b/client/src/utils/RenderTemplate.js
@@ -8,6 +8,7 @@ import { setEmailOptions } from "../redux/email/email.actions";
 import { store } from "../redux/store";
 import client from "../utils/GraphQLClient";
 import { TemplateList } from "./TemplateConstants";
+import _ from "lodash";
 const server = process.env.REACT_APP_REPORTS_SERVER_URL;
 jsreport.serverUrl = server;
 
@@ -63,7 +64,7 @@ export async function RenderTemplates(
   renderAsHtml = false
 ) {
   //Query assets that match the template name. Must be in format <<templateName>>.query
-  let templateAndData = [];
+  let unsortedTemplatesAndData = [];
   let proms = [];
   templateObjects.forEach((template) => {
     proms.push(
@@ -71,7 +72,7 @@ export async function RenderTemplates(
         let { contextData, useShopSpecificTemplate } = await fetchContextData(
           template
         );
-        templateAndData.push({
+        unsortedTemplatesAndData.push({
           templateObject: template,
           contextData,
           useShopSpecificTemplate,
@@ -80,6 +81,22 @@ export async function RenderTemplates(
     );
   });
   await Promise.all(proms);
+
+  //Re-order list to follow speedprint.
+  // var templateAndData = _.sortBy(unsortedTemplatesAndData, function (item) {
+  //   return templateObjects.findIndex(
+  //     (template) => template.name === item.templateObject.name
+  //   );
+  // });
+
+  unsortedTemplatesAndData.sort(function (a, b) {
+    return (
+      templateObjects.findIndex((x) => x.name === a.templateObject.name) -
+      templateObjects.findIndex((x) => x.name === b.templateObject.name)
+    );
+  });
+  const templateAndData = unsortedTemplatesAndData;
+
   let rootTemplate = templateAndData.shift();
 
   let reportRequest = {