diff --git a/src/components/orders-table/listOrderDetails.component.tsx b/src/components/orders-table/list-order-details.component.tsx
similarity index 91%
rename from src/components/orders-table/listOrderDetails.component.tsx
rename to src/components/orders-table/list-order-details.component.tsx
index 159aabc0..b3654e4a 100644
--- a/src/components/orders-table/listOrderDetails.component.tsx
+++ b/src/components/orders-table/list-order-details.component.tsx
@@ -1,13 +1,12 @@
 import React from "react";
-import styles from "./listOrderDetails.scss";
-
 import { useTranslation } from "react-i18next";
-import { showModal } from "@openmrs/esm-framework";
 import { Button, Tile } from "@carbon/react";
-import { OrderDetail } from "./orderDetail.component";
-import { ListOrdersDetailsProps } from "../../types";
+import { showModal } from "@openmrs/esm-framework";
 import { launchOverlay } from "../overlay/store";
+import { ListOrdersDetailsProps } from "../../types";
+import { OrderDetail } from "./order-detail.component";
 import ResultForm from "../../results/result-form.component";
+import styles from "./list-order-details.scss";
 
 const ListOrderDetails: React.FC<ListOrdersDetailsProps> = (props) => {
   const orders = props.groupedOrders?.orders;
@@ -42,7 +41,7 @@ const ListOrderDetails: React.FC<ListOrdersDetailsProps> = (props) => {
                             );
                           }}
                         >
-                          {t("pickupLabRequest", "PickUp Lab Request")}
+                          {t("pickupLabRequest", "Pick up lab request")}
                         </Button>
                       );
                     }
@@ -52,12 +51,12 @@ const ListOrderDetails: React.FC<ListOrdersDetailsProps> = (props) => {
                           kind="primary"
                           onClick={() => {
                             launchOverlay(
-                              t("labResultsForm", "Lab Results form"),
+                              t("labResultsForm", "Lab results form"),
                               <ResultForm patientUuid={patientId} order={row} />
                             );
                           }}
                         >
-                          {t("labResultsForm", "Lab Results Form")}
+                          {t("labResultsForm", "Lab results form")}
                         </Button>
                       );
                     }
@@ -87,7 +86,7 @@ const ListOrderDetails: React.FC<ListOrdersDetailsProps> = (props) => {
                   value={row.dateActivated}
                 />
                 <OrderDetail
-                  label={t("orderNumber", "Order Number").toUpperCase()}
+                  label={t("orderNumber", "Order number").toUpperCase()}
                   value={row.orderNumber}
                 />
                 <OrderDetail
diff --git a/src/components/orders-table/listOrderDetails.scss b/src/components/orders-table/list-order-details.scss
similarity index 100%
rename from src/components/orders-table/listOrderDetails.scss
rename to src/components/orders-table/list-order-details.scss
diff --git a/src/components/orders-table/orderDetail.component.tsx b/src/components/orders-table/order-detail.component.tsx
similarity index 89%
rename from src/components/orders-table/orderDetail.component.tsx
rename to src/components/orders-table/order-detail.component.tsx
index 25b06ae7..e13e6b8f 100644
--- a/src/components/orders-table/orderDetail.component.tsx
+++ b/src/components/orders-table/order-detail.component.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import styles from "./orderDetail.scss";
+import styles from "./order-detail.scss";
 
 export const OrderDetail: React.FC<{ label: string; value: string | any }> = ({
   label,
diff --git a/src/components/orders-table/orderDetail.scss b/src/components/orders-table/order-detail.scss
similarity index 100%
rename from src/components/orders-table/orderDetail.scss
rename to src/components/orders-table/order-detail.scss
diff --git a/src/components/orders-table/orders-data-table.component.tsx b/src/components/orders-table/orders-data-table.component.tsx
index fc7ca01d..d788def5 100644
--- a/src/components/orders-table/orders-data-table.component.tsx
+++ b/src/components/orders-table/orders-data-table.component.tsx
@@ -3,41 +3,41 @@ import { useTranslation } from "react-i18next";
 import {
   DataTable,
   DataTableSkeleton,
+  DatePicker,
+  DatePickerInput,
+  Dropdown,
+  Layer,
   Pagination,
   Table,
   TableBody,
   TableCell,
   TableContainer,
-  TableHead,
-  TableHeader,
+  TableExpandedRow,
   TableExpandHeader,
   TableExpandRow,
-  TableExpandedRow,
+  TableHead,
+  TableHeader,
   TableRow,
-  Tile,
-  Dropdown,
   TableToolbar,
   TableToolbarContent,
-  Layer,
   TableToolbarSearch,
-  DatePicker,
-  DatePickerInput,
+  Tile,
 } from "@carbon/react";
+import dayjs from "dayjs";
 import {
   formatDate,
   parseDate,
   useConfig,
   usePagination,
 } from "@openmrs/esm-framework";
-import styles from "./orders-data-table.scss";
 import { FulfillerStatus, OrdersDataTableProps } from "../../types";
 import {
   useLabOrders,
   useSearchGroupedResults,
 } from "../../laboratory-resource";
-import dayjs from "dayjs";
 import { isoDateTimeString } from "../../constants";
-import ListOrderDetails from "./listOrderDetails.component";
+import ListOrderDetails from "./list-order-details.component";
+import styles from "./orders-data-table.scss";
 
 const OrdersDataTable: React.FC<OrdersDataTableProps> = (props) => {
   const { t } = useTranslation();
@@ -133,7 +133,7 @@ const OrdersDataTable: React.FC<OrdersDataTableProps> = (props) => {
   const columns = useMemo(() => {
     return [
       { id: 0, header: t("patient", "Patient"), key: "patientName" },
-      { id: 1, header: t("totalorders", "Total Orders"), key: "totalOrders" },
+      { id: 1, header: t("totalOrders", "Total Orders"), key: "totalOrders" },
     ];
   }, [t]);
 
@@ -160,19 +160,21 @@ const OrdersDataTable: React.FC<OrdersDataTableProps> = (props) => {
       orders: patient.orders,
       totalOrders: patient.orders?.length,
     }));
-  }, [
-    paginatedLabOrders,
-    redirectToResultsViewer,
-    redirectToOrders,
-    props.actionsSlotName,
-  ]);
+  }, [paginatedLabOrders]);
 
   if (isLoading) {
-    return <DataTableSkeleton role="progressbar" />;
+    return <DataTableSkeleton className={styles.loader} role="progressbar" />;
   }
   return (
     <DataTable rows={tableRows} headers={columns} useZebraStyles>
-      {({ rows, headers, getHeaderProps, getTableProps, getRowProps }) => (
+      {({
+        getExpandHeaderProps,
+        getHeaderProps,
+        getRowProps,
+        getTableProps,
+        headers,
+        rows,
+      }) => (
         <TableContainer className={styles.tableContainer}>
           <TableToolbar>
             <TableToolbarContent>
@@ -201,10 +203,7 @@ const OrdersDataTable: React.FC<OrdersDataTableProps> = (props) => {
                   {props.useActivatedOnOrAfterDateFilter && (
                     <>
                       <p>
-                        {t(
-                          "onOrAfterDateFilter",
-                          "Filter orders on or after : "
-                        )}
+                        {t("onOrAfterDateFilter", "Filter orders on or after")}:
                       </p>
                       <DatePicker
                         onChange={([date]) =>
@@ -238,7 +237,7 @@ const OrdersDataTable: React.FC<OrdersDataTableProps> = (props) => {
           <Table {...getTableProps()} className={styles.tableWrapper}>
             <TableHead>
               <TableRow>
-                <TableExpandHeader />
+                <TableExpandHeader enableToggle {...getExpandHeaderProps()} />
                 {headers.map((header) => (
                   <TableHeader {...getHeaderProps({ header })}>
                     {header.header?.content ?? header.header}
@@ -257,14 +256,21 @@ const OrdersDataTable: React.FC<OrdersDataTableProps> = (props) => {
                         </TableCell>
                       ))}
                     </TableExpandRow>
-                    <TableExpandedRow colSpan={headers.length + 1}>
-                      <ListOrderDetails
-                        actions={props.actions}
-                        groupedOrders={groupedOrdersByPatient.find(
-                          (item) => item.patientId === row.id
-                        )}
+                    {row.isExpanded ? (
+                      <TableExpandedRow colSpan={headers.length + 1}>
+                        <ListOrderDetails
+                          actions={props.actions}
+                          groupedOrders={groupedOrdersByPatient.find(
+                            (item) => item.patientId === row.id
+                          )}
+                        />
+                      </TableExpandedRow>
+                    ) : (
+                      <TableExpandedRow
+                        className={styles.hiddenRow}
+                        colSpan={headers.length + 2}
                       />
-                    </TableExpandedRow>
+                    )}
                   </React.Fragment>
                 );
               })}
@@ -275,9 +281,12 @@ const OrdersDataTable: React.FC<OrdersDataTableProps> = (props) => {
               <Tile className={styles.tile}>
                 <div className={styles.tileContent}>
                   <p className={styles.content}>
+                    {t("noLabRequestsFoundC", "No lab requests found")}
+                  </p>
+                  <p className={styles.emptyStateHelperText}>
                     {t(
-                      "noLabRequestsFoundCheckFilters",
-                      "No lab requests found. Please check your filters and try again."
+                      "checkFilters",
+                      "Please check the filters above and try again"
                     )}
                   </p>
                 </div>
diff --git a/src/components/orders-table/orders-data-table.scss b/src/components/orders-table/orders-data-table.scss
index 3a4d6b57..eb139651 100644
--- a/src/components/orders-table/orders-data-table.scss
+++ b/src/components/orders-table/orders-data-table.scss
@@ -3,8 +3,9 @@
 @use '@carbon/colors';
 
 .tableContainer {
+  border: 1px solid colors.$gray-20;
   background-color: colors.$gray-10;
-  margin: 0 spacing.$spacing-05;
+  margin: spacing.$spacing-05;
   padding: 0;
 
   :global(.cds--data-table-content) {
@@ -32,12 +33,20 @@
     width: 75%;
   }
 
+  :global(.cds--pagination) {
+    border-top: none;
+  }
+
   .toolbarContent {
     height: spacing.$spacing-07;
     margin-bottom: spacing.$spacing-02;
   }
 }
 
+.loader {
+  margin: spacing.$spacing-05;
+}
+
 .toolbarItem {
   display: flex;
   margin: 5px 10px;
@@ -83,4 +92,13 @@
 
 .singleLineDisplay {
   white-space: nowrap;
-}
\ No newline at end of file
+}
+
+.emptyStateHelperText {
+  @include type.type-style('helper-text-02');
+}
+
+.hiddenRow {
+  display: none;
+}
+
diff --git a/src/components/overlay/overlay.component.tsx b/src/components/overlay/overlay.component.tsx
index 368dd492..594838f6 100644
--- a/src/components/overlay/overlay.component.tsx
+++ b/src/components/overlay/overlay.component.tsx
@@ -1,10 +1,10 @@
 import React from "react";
 import { Button, Header } from "@carbon/react";
 import { ArrowLeft, Close } from "@carbon/react/icons";
-import { useLayoutType } from "@openmrs/esm-framework";
-import styles from "./overlay.scss";
 import { useTranslation } from "react-i18next";
+import { useLayoutType } from "@openmrs/esm-framework";
 import { closeOverlay, useOverlay } from "./store";
+import styles from "./overlay.scss";
 
 const Overlay: React.FC = () => {
   const { header, component, isOverlayOpen } = useOverlay();
diff --git a/src/components/summary-tile/lab-summary-tile.component.tsx b/src/components/summary-tile/lab-summary-tile.component.tsx
index 243d3931..ffdb67de 100644
--- a/src/components/summary-tile/lab-summary-tile.component.tsx
+++ b/src/components/summary-tile/lab-summary-tile.component.tsx
@@ -3,6 +3,7 @@ import { useTranslation } from "react-i18next";
 import { Tile, Button } from "@carbon/react";
 import { ArrowRight } from "@carbon/react/icons";
 import styles from "./lab-summary-tile.scss";
+import { ConfigurableLink } from "@openmrs/esm-framework";
 
 interface LabSummaryTileProps {
   label: string;
@@ -20,23 +21,18 @@ const LabSummaryTile: React.FC<LabSummaryTileProps> = ({
   const { t } = useTranslation();
 
   return (
-    <Tile className={styles.tileContainer} light={true}>
+    <Tile className={styles.tileContainer} light>
       <div className={styles.tileHeader}>
         <div className={styles.headerLabelContainer}>
           <label className={styles.headerLabel}>{headerLabel}</label>
           {children}
         </div>
-        <div></div>
-        <Button
-          kind="ghost"
-          renderIcon={(props) => (
-            <ArrowRight size={16} className={styles.arrowIcon} />
-          )}
-          iconDescription={t("view", "View ")}
-        >
-          {t("view", "View ")}
-          &nbsp;
-        </Button>
+        {/* <div className={styles.link}>
+          <ConfigurableLink className={styles.link} to="">
+            {t("view", "View")}
+          </ConfigurableLink>
+          <ArrowRight size={16} />
+        </div> */}
       </div>
       <div>
         <label className={styles.totalsLabel}>{label}</label>
diff --git a/src/components/summary-tile/lab-summary-tile.scss b/src/components/summary-tile/lab-summary-tile.scss
index 54ff875c..46b2d9b7 100644
--- a/src/components/summary-tile/lab-summary-tile.scss
+++ b/src/components/summary-tile/lab-summary-tile.scss
@@ -1,24 +1,23 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
+@use '@carbon/layout';
+@use '@carbon/type';
 @import "~@openmrs/esm-styleguide/src/vars";
 
 .tileContainer {
   border: 0.0625rem solid $ui-03;
-  flex-grow: 1;
   height: 7.875rem;
-  padding: 0 spacing.$spacing-05;
-  margin: spacing.$spacing-03 spacing.$spacing-03;
+  padding: layout.$spacing-05;
+  margin: layout.$spacing-03 layout.$spacing-03;
 }
 
 .tileHeader {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin-bottom: spacing.$spacing-03;
+  margin-bottom: layout.$spacing-03;
 }
 
 .headerLabel {
-  @include type.type-style("heading-01");
+  @include type.type-style("heading-compact-01");
   color: $text-02;
 }
 
@@ -35,9 +34,31 @@
 .headerLabelContainer {
   display: flex;
   align-items: center;
-  height: spacing.$spacing-07;
+  height: layout.$spacing-07;
 }
 
 .arrowIcon {
   fill: var(--cds-link-primary, #0f62fe) !important;
 }
+
+.link {
+  text-decoration: none;
+  display: flex;
+  align-items: center;
+  color: $interactive-01;
+
+  svg {
+    margin-left: layout.$spacing-03;
+  }
+}
+
+// Overriding styles for RTL support
+html[dir='rtl'] {
+  .link {
+    svg {
+      margin-right: layout.$spacing-03;
+      margin-left: unset;
+      transform: scale(-1, 1);
+    }
+  }
+}
diff --git a/src/index.ts b/src/index.ts
index f9137c33..4578bee9 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -69,7 +69,7 @@ export const completedLabRequestsTable = getAsyncLifecycle(
 );
 
 export const worklistTile = getAsyncLifecycle(
-  () => import("./lab-tiles/inprogress-lab-requests-tile.component"),
+  () => import("./lab-tiles/in-progress-lab-requests-tile.component"),
   options
 );
 
diff --git a/src/lab-tabs/actions/add-lab-request-results-action.component.tsx b/src/lab-tabs/actions/add-lab-request-results-action.component.tsx
index 2539dd7e..3718c58d 100644
--- a/src/lab-tabs/actions/add-lab-request-results-action.component.tsx
+++ b/src/lab-tabs/actions/add-lab-request-results-action.component.tsx
@@ -1,9 +1,9 @@
-import { Order } from "@openmrs/esm-patient-common-lib";
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { OverflowMenuItem } from "@carbon/react";
+import { Order } from "@openmrs/esm-patient-common-lib";
 import { launchOverlay } from "../../components/overlay/store";
 import ResultForm from "../../results/result-form.component";
-import { useTranslation } from "react-i18next";
 import styles from "./actions.scss";
 
 interface AddLabRequestResultsActionProps {
@@ -16,10 +16,10 @@ const AddLabRequestResultsAction: React.FC<AddLabRequestResultsActionProps> = ({
 
   return (
     <OverflowMenuItem
-      itemText={t("labResultsForm", "Lab Results Form")}
+      itemText={t("labResultsForm", "Lab results form")}
       onClick={() => {
         launchOverlay(
-          t("labResultsForm", "Lab Results Form"),
+          t("labResultsForm", "Lab results form"),
           <ResultForm patientUuid={order.patient.uuid} order={order} />
         );
       }}
diff --git a/src/lab-tabs/actions/pickup-lab-request-action.component.tsx b/src/lab-tabs/actions/pickup-lab-request-action.component.tsx
index de340d8b..4c570c46 100644
--- a/src/lab-tabs/actions/pickup-lab-request-action.component.tsx
+++ b/src/lab-tabs/actions/pickup-lab-request-action.component.tsx
@@ -1,8 +1,8 @@
+import React, { useCallback } from "react";
+import { useTranslation } from "react-i18next";
 import { OverflowMenuItem } from "@carbon/react";
 import { showModal } from "@openmrs/esm-framework";
 import { Order } from "@openmrs/esm-patient-common-lib";
-import React, { useCallback } from "react";
-import { useTranslation } from "react-i18next";
 import styles from "./actions.scss";
 
 interface PickLabRequestActionMenuProps {
@@ -24,7 +24,7 @@ const PickupLabRequestAction: React.FC<PickLabRequestActionMenuProps> = ({
 
   return (
     <OverflowMenuItem
-      itemText={t("pickupLabRequest", "Pickup Lab Request")}
+      itemText={t("pickupLabRequest", "Pick up lab request")}
       onClick={launchModal}
       disabled={unSupportedStatuses.includes(order.fulfillerStatus)}
       className={styles.menuItem}
diff --git a/src/lab-tabs/actions/reject-lab-request-action.component.tsx b/src/lab-tabs/actions/reject-lab-request-action.component.tsx
index d7ea82cf..4efeff5a 100644
--- a/src/lab-tabs/actions/reject-lab-request-action.component.tsx
+++ b/src/lab-tabs/actions/reject-lab-request-action.component.tsx
@@ -23,12 +23,12 @@ const RejectLabRequestAction: React.FC<RejectLabRequestActionProps> = ({
 
   return (
     <OverflowMenuItem
-      itemText={t("rejectLabRequest", "Reject Lab Request")}
-      onClick={launchRejectLabRequestModal}
       className={styles.menuItem}
-      isDelete={true}
       disabled={unSupportedStatuses.includes(order.fulfillerStatus)}
       hasDivider
+      isDelete
+      itemText={t("rejectLabRequest", "Reject lab request")}
+      onClick={launchRejectLabRequestModal}
     />
   );
 };
diff --git a/src/lab-tabs/data-table-extensions/completed-lab-requests-table.extension.tsx b/src/lab-tabs/data-table-extensions/completed-lab-requests-table.extension.tsx
index dbdd1c6d..37c9728d 100644
--- a/src/lab-tabs/data-table-extensions/completed-lab-requests-table.extension.tsx
+++ b/src/lab-tabs/data-table-extensions/completed-lab-requests-table.extension.tsx
@@ -6,7 +6,7 @@ const CompletedLabRequestsTable: React.FC = () => {
     <OrdersDataTable
       fulfillerStatus="COMPLETED"
       excludeColumns={[]}
-      useActivatedOnOrAfterDateFilter={true}
+      useActivatedOnOrAfterDateFilter
       excludeCanceledAndDiscontinuedOrders={false}
       actions={[]}
     />
diff --git a/src/lab-tabs/data-table-extensions/in-progress-lab-requests-table.extension.tsx b/src/lab-tabs/data-table-extensions/in-progress-lab-requests-table.extension.tsx
index ab9ce918..f0ddfd18 100644
--- a/src/lab-tabs/data-table-extensions/in-progress-lab-requests-table.extension.tsx
+++ b/src/lab-tabs/data-table-extensions/in-progress-lab-requests-table.extension.tsx
@@ -6,7 +6,7 @@ const InProgressLabRequestsTable: React.FC = () => {
     <OrdersDataTable
       excludeColumns={[]}
       actionsSlotName="inprogress-tests-actions-slot"
-      useActivatedOnOrAfterDateFilter={true}
+      useActivatedOnOrAfterDateFilter
       fulfillerStatus="IN_PROGRESS"
       actions={[
         { actionName: "labResultsForm", order: 0 },
diff --git a/src/lab-tabs/laboratory-tabs.component.tsx b/src/lab-tabs/laboratory-tabs.component.tsx
index d3a37b3d..fa4dfd1d 100644
--- a/src/lab-tabs/laboratory-tabs.component.tsx
+++ b/src/lab-tabs/laboratory-tabs.component.tsx
@@ -1,13 +1,13 @@
 import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Tab, Tabs, TabList, TabPanels, TabPanel } from "@carbon/react";
 import {
   type AssignedExtension,
   Extension,
   useConnectedExtensions,
 } from "@openmrs/esm-framework";
-import { Tab, Tabs, TabList, TabPanels, TabPanel } from "@carbon/react";
-import { useTranslation } from "react-i18next";
-import styles from "./laboratory-tabs.scss";
 import { ComponentContext } from "@openmrs/esm-framework/src/internal";
+import styles from "./laboratory-tabs.scss";
 
 const labPanelSlot = "lab-panels-slot";
 
diff --git a/src/lab-tabs/laboratory-tabs.scss b/src/lab-tabs/laboratory-tabs.scss
index 747ccf39..91b8016c 100644
--- a/src/lab-tabs/laboratory-tabs.scss
+++ b/src/lab-tabs/laboratory-tabs.scss
@@ -35,5 +35,14 @@
 }
 
 .tab {
-  width: 150px;
-}
\ No newline at end of file
+  min-width: 8.875rem;
+
+  &:active,
+  &:focus {
+    outline: 2px solid var(--brand-03) !important;
+  }
+
+  &[aria-selected='true'] {
+    box-shadow: inset 0 2px 0 0 var(--brand-03) !important;
+  }
+}
diff --git a/src/lab-tabs/modals/pickup-lab-request-modal.component.tsx b/src/lab-tabs/modals/pickup-lab-request-modal.component.tsx
index 30be6aaa..0cd768a2 100644
--- a/src/lab-tabs/modals/pickup-lab-request-modal.component.tsx
+++ b/src/lab-tabs/modals/pickup-lab-request-modal.component.tsx
@@ -1,7 +1,8 @@
-import { Order } from "@openmrs/esm-patient-common-lib";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { setFulfillerStatus } from "../../laboratory-resource";
+import { Button, ModalBody, ModalFooter, ModalHeader } from "@carbon/react";
+import { mutate } from "swr";
+import { Order } from "@openmrs/esm-patient-common-lib";
 import {
   restBaseUrl,
   showNotification,
@@ -9,9 +10,8 @@ import {
   useAbortController,
   useConfig,
 } from "@openmrs/esm-framework";
-import { Button, ModalBody, ModalFooter, ModalHeader } from "@carbon/react";
-import { mutate } from "swr";
 import { Config } from "../../config-schema";
+import { setFulfillerStatus } from "../../laboratory-resource";
 
 interface PickupLabRequestModal {
   closeModal: () => void;
@@ -55,7 +55,7 @@ const PickupLabRequestModal: React.FC<PickupLabRequestModal> = ({
       (error) => {
         setIsSubmitting(false);
         showNotification({
-          title: t(`errorPickingAnOrder', 'Error picking an order`),
+          title: t(`errorPickingOrder', 'Error picking order`),
           kind: "error",
           critical: true,
           description: error?.message,
@@ -68,7 +68,7 @@ const PickupLabRequestModal: React.FC<PickupLabRequestModal> = ({
     <div>
       <ModalHeader
         closeModal={closeModal}
-        title={t("pickRequest", "Pick Lab Request")}
+        title={t("pickRequest", "Pick lab request")}
       />
       <ModalBody>
         <p>
@@ -83,7 +83,7 @@ const PickupLabRequestModal: React.FC<PickupLabRequestModal> = ({
           {t("discard", "Discard")}
         </Button>
         <Button type="submit" onClick={handlePickup} disabled={isSubmitting}>
-          {t("pickupLabRequest", "Pickup Lab Request")}
+          {t("pickupLabRequest", "Pick up lab request")}
         </Button>
       </ModalFooter>
     </div>
diff --git a/src/lab-tabs/modals/reject-lab-request-modal.component.tsx b/src/lab-tabs/modals/reject-lab-request-modal.component.tsx
index cdfc2e63..b35ac588 100644
--- a/src/lab-tabs/modals/reject-lab-request-modal.component.tsx
+++ b/src/lab-tabs/modals/reject-lab-request-modal.component.tsx
@@ -1,5 +1,4 @@
 import React, { useState } from "react";
-
 import {
   Button,
   Form,
@@ -10,7 +9,6 @@ import {
   Layer,
 } from "@carbon/react";
 import { useTranslation } from "react-i18next";
-import styles from "./reject-lab-request-modal.scss";
 import {
   showNotification,
   showSnackbar,
@@ -18,6 +16,7 @@ import {
 } from "@openmrs/esm-framework";
 import { Order } from "@openmrs/esm-patient-common-lib";
 import { rejectLabOrder } from "../../laboratory-resource";
+import styles from "./reject-lab-request-modal.scss";
 
 interface RejectLabRequestModalProps {
   order: Order;
@@ -37,23 +36,24 @@ const RejectLabRequestModal: React.FC<RejectLabRequestModalProps> = ({
     event.preventDefault();
     setIsSubmitting(true);
     rejectLabOrder(order.uuid, fulfillerComment, abortController).then(
-      (resp) => {
+      () => {
         setIsSubmitting(false);
         closeModal();
         showSnackbar({
           isLowContrast: true,
-          title: t("rejectLabRequestTitle", "Lab Request Rejected"),
+          title: t("rejectLabRequestTitle", "Lab request rejected"),
           kind: "success",
           subtitle: t(
             "rejectLabRequestSuccessMessage",
-            `You have successfully rejected a lab request with Order Number: ${order.orderNumber}.`
+            'Lab request with order number "{{orderNumber}}" rejected successfully',
+            { orderNumber: order.orderNumber }
           ),
         });
       },
       (err) => {
         setIsSubmitting(false);
         showNotification({
-          title: t(`errorRejectingRequest', 'Error Rejecting a lab request.`),
+          title: t("errorRejectingRequest", "Error rejecting lab request"),
           kind: "error",
           critical: true,
           description: err?.message,
@@ -63,43 +63,41 @@ const RejectLabRequestModal: React.FC<RejectLabRequestModalProps> = ({
   };
 
   return (
-    <div>
-      <Form onSubmit={handleRejectOrder}>
-        <ModalHeader
-          closeModal={closeModal}
-          title={`${t("rejectLabRequest", "Reject Lab Request")} [${
-            order.orderNumber
-          }]`}
-        />
-        <ModalBody>
-          <div className={styles.modalBody}>
-            <Layer>
-              <p className={styles.section}>
-                {`${t("testType", "Test Type")}: ${order.concept?.display}`}
-              </p>
-            </Layer>
-            <br />
-            <Layer>
-              <TextArea
-                labelText={t("fulfillerComment", "Fulfiller Comment")}
-                id="commentField"
-                maxCount={500}
-                enableCounter
-                onChange={(e) => setFulfillerComment(e.target.value)}
-              />
-            </Layer>
-          </div>
-        </ModalBody>
-        <ModalFooter>
-          <Button kind="secondary" onClick={closeModal}>
-            {t("cancel", "Cancel")}
-          </Button>
-          <Button kind="danger" type="submit" disabled={isSubmitting}>
-            {t("reject", "Reject")}
-          </Button>
-        </ModalFooter>
-      </Form>
-    </div>
+    <Form onSubmit={handleRejectOrder}>
+      <ModalHeader
+        closeModal={closeModal}
+        title={`${t("rejectLabRequest", "Reject lab request")} [${
+          order.orderNumber
+        }]`}
+      />
+      <ModalBody>
+        <div className={styles.modalBody}>
+          <Layer>
+            <p className={styles.section}>
+              {`${t("testType", "Test type")}: ${order.concept?.display}`}
+            </p>
+          </Layer>
+          <br />
+          <Layer>
+            <TextArea
+              labelText={t("fulfillerComment", "Fulfiller comment")}
+              id="commentField"
+              maxCount={500}
+              enableCounter
+              onChange={(e) => setFulfillerComment(e.target.value)}
+            />
+          </Layer>
+        </div>
+      </ModalBody>
+      <ModalFooter>
+        <Button kind="secondary" onClick={closeModal}>
+          {t("cancel", "Cancel")}
+        </Button>
+        <Button kind="danger" type="submit" disabled={isSubmitting}>
+          {t("reject", "Reject")}
+        </Button>
+      </ModalFooter>
+    </Form>
   );
 };
 
diff --git a/src/lab-tiles/inprogress-lab-requests-tile.component.tsx b/src/lab-tiles/in-progress-lab-requests-tile.component.tsx
similarity index 99%
rename from src/lab-tiles/inprogress-lab-requests-tile.component.tsx
rename to src/lab-tiles/in-progress-lab-requests-tile.component.tsx
index cfd04f97..6cdeb723 100644
--- a/src/lab-tiles/inprogress-lab-requests-tile.component.tsx
+++ b/src/lab-tiles/in-progress-lab-requests-tile.component.tsx
@@ -5,7 +5,6 @@ import LabSummaryTile from "../components/summary-tile/lab-summary-tile.componen
 
 const InProgressLabRequestsTile = () => {
   const { t } = useTranslation();
-
   const { labOrders } = useLabOrders("IN_PROGRESS");
 
   return (
diff --git a/src/results/result-form-field.component.tsx b/src/results/result-form-field.component.tsx
index 709f3992..15acc2df 100644
--- a/src/results/result-form-field.component.tsx
+++ b/src/results/result-form-field.component.tsx
@@ -91,7 +91,7 @@ const ResultFormField: React.FC<ResultFormFieldProps> = ({
               rules={{ required: true }}
             >
               <SelectItem
-                text={t("chooseOption", "Choose an Option")}
+                text={t("chooseOption", "Choose an option")}
                 value=""
               />
 
@@ -158,7 +158,7 @@ const ResultFormField: React.FC<ResultFormFieldProps> = ({
                     autoFocus={index === 0}
                   >
                     <SelectItem
-                      text={t("option", "Choose an Option")}
+                      text={t("option", "Choose an option")}
                       value=""
                     />
 
diff --git a/src/results/result-form.component.tsx b/src/results/result-form.component.tsx
index e7a6b4f5..c1520eb3 100644
--- a/src/results/result-form.component.tsx
+++ b/src/results/result-form.component.tsx
@@ -15,7 +15,7 @@ import {
 } from "@openmrs/esm-framework";
 import {
   useGetOrderConceptByUuid,
-  UpdateOrderResult,
+  updateOrderResult,
 } from "./result-form.resource";
 import ResultFormField from "./result-form-field.component";
 import { useForm } from "react-hook-form";
@@ -133,7 +133,7 @@ const ResultForm: React.FC<ResultFormProps> = ({ order, patientUuid }) => {
       orderer: order.orderer,
     };
 
-    UpdateOrderResult(encounterPayload, orderDiscontinuationPayload).then(
+    updateOrderResult(encounterPayload, orderDiscontinuationPayload).then(
       (response) => {
         if (response.ok) {
           showSnackbar({
@@ -141,8 +141,8 @@ const ResultForm: React.FC<ResultFormProps> = ({ order, patientUuid }) => {
             title: t("updateEncounter", "Update lab results"),
             kind: "success",
             subtitle: t(
-              "generateSuccessfully",
-              "You have successfully updated test results"
+              "labResultsUpdatedSuccessfully",
+              "Lab test results updated successfully"
             ),
           });
 
@@ -187,9 +187,7 @@ const ResultForm: React.FC<ResultFormProps> = ({ order, patientUuid }) => {
       },
       (err) => {
         showNotification({
-          title: t(
-            `errorUpdatingEncounter', 'Error occurred while updating test results`
-          ),
+          title: t("errorUpdatingEncounter", "Error updating test results"),
           kind: "error",
           critical: true,
           description: err?.message,
diff --git a/src/results/result-form.resource.ts b/src/results/result-form.resource.ts
index e1f79170..5693cfaa 100644
--- a/src/results/result-form.resource.ts
+++ b/src/results/result-form.resource.ts
@@ -334,7 +334,7 @@ export function useGetOrderConceptByUuid(uuid: string) {
   };
 }
 
-export async function UpdateEncounter(uuid: string, payload: any) {
+export async function updateEncounter(uuid: string, payload: any) {
   const abortController = new AbortController();
   return openmrsFetch(`${restBaseUrl}/encounter/${uuid}`, {
     method: "POST",
@@ -346,8 +346,8 @@ export async function UpdateEncounter(uuid: string, payload: any) {
   });
 }
 
-//TODO: the calls to update order and observations for results should be transactional to allow for rollback
-export async function UpdateOrderResult(
+// TODO: the calls to update order and observations for results should be transactional to allow for rollback
+export async function updateOrderResult(
   encounterPayload: any,
   orderPayload: any
 ): Promise<FetchResponse<any>> {
diff --git a/translations/en.json b/translations/en.json
index 1f223119..ad4b72df 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -2,49 +2,50 @@
   "all": "All",
   "allFieldsRequired": "All fields are required",
   "cancel": "Cancel",
-  "chooseOption": "Choose an Option",
+  "checkFilters": "Please check the filters above and try again",
+  "chooseOption": "Choose an option",
   "completed": "Completed",
   "completedStatus": "COMPLETED",
   "date": "Date",
   "declinedStatus": "DECLINED",
   "discard": "Discard",
   "errorMarkingOrderFulfillStatus": "Error occurred while marking order fulfill status",
-  "errorPickingAnOrder', 'Error picking an order": "",
-  "errorRejectingRequest', 'Error Rejecting a lab request": "",
-  "errorUpdatingEncounter', 'Error occurred while updating test results": "",
+  "errorPickingOrder', 'Error picking order": "",
+  "errorRejectingRequest": "Error rejecting lab request",
+  "errorUpdatingEncounter": "Error updating test results",
   "exceptionStatus": "EXCEPTION",
-  "filterOrdersByStatus": "Filter Orders by status",
-  "fulfillerComment": "Fulfiller Comment",
-  "generateSuccessfully": "You have successfully updated test results",
+  "filterOrdersByStatus": "Filter orders by status",
+  "fulfillerComment": "Fulfiller comment",
   "inProgress": "In progress",
   "inProgressStatus": "IN_PROGRESS",
   "instructions": "Instructions",
   "laboratory": "Laboratory",
-  "labResultsForm": "Lab Results Form",
+  "labResultsForm": "Lab results form",
+  "labResultsUpdatedSuccessfully": "Lab test results updated successfully",
   "loading": "Loading",
   "markOrderFulfillStatus": "Test order completed",
   "newStatus": "NEW",
   "nextPage": "Next page",
-  "noLabRequestsFoundCheckFilters": "No lab requests found. Please check your filters and try again.",
+  "noLabRequestsFoundC": "No lab requests found",
   "onHoldStatus": "ON_HOLD",
-  "onOrAfterDateFilter": "Filter orders on or after : ",
-  "option": "Choose an Option",
+  "onOrAfterDateFilter": "Filter orders on or after",
+  "option": "Choose an option",
   "orderer": "orderer",
-  "orderNumber": "Order Number",
+  "orderNumber": "Order number",
   "orderPickedSuccessfully": "You have successfully picked an order",
   "orders": "Orders",
   "patient": "Patient",
   "pickedAnOrder": "Picked an order",
-  "pickRequest": "Pick Lab Request",
+  "pickRequest": "Pick lab request",
   "pickRequestConfirmationText": "Continuing will update the request status to \"In Progress\" and advance it to the next stage. Are you sure you want to proceed?",
-  "pickupLabRequest": "Pickup Lab Request",
+  "pickupLabRequest": "Pick up lab request",
   "previousPage": "Previous page",
   "procedure": "procedure",
   "receivedStatus": "RECEIVED",
   "reject": "Reject",
-  "rejectLabRequest": "Reject Lab Request",
+  "rejectLabRequest": "Reject lab request",
   "rejectLabRequestSuccessMessage": "",
-  "rejectLabRequestTitle": "Lab Request Rejected",
+  "rejectLabRequestTitle": "Lab request rejected",
   "results": "Results",
   "save": "Save",
   "searchThisList": "Search this list",
@@ -52,10 +53,9 @@
   "tabletOverlay": "Tablet overlay",
   "testOrderCompletedSuccessfully": "You have successfully completed the test order",
   "testsOrdered": "Tests ordered",
-  "testType": "Test Type",
-  "totalorders": "Total Orders",
+  "testType": "Test type",
+  "totalOrders": "Total orders",
   "updateEncounter": "Update lab results",
   "urgency": "Urgency",
-  "view": "View ",
   "worklist": "Worklist"
 }