diff --git a/.eslintrc b/.eslintrc
index 992c5621d..485b7ea01 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -2,17 +2,23 @@
   "env": {
     "node": true
   },
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:jest-dom/recommended",
-    "plugin:testing-library/react"
+  "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:jest-dom/recommended"],
+  "overrides": [
+    {
+      "files": ["**/*.test.tsx"],
+      "extends": ["plugin:testing-library/react"]
+    },
+    {
+      "files": ["e2e/**/*.spec.ts"],
+      "extends": ["plugin:playwright/recommended"],
+      "rules": {
+        "testing-library/prefer-screen-queries": "off"
+      }
+    }
   ],
   "parser": "@typescript-eslint/parser",
   "plugins": ["@typescript-eslint", "import", "jest-dom", "react-hooks", "testing-library"],
   "rules": {
-    "import/no-duplicates": "error",
-    "react-hooks/rules-of-hooks": "error",
     // Disabling these rules for now just to keep the diff small. We'll enable them one by one as we go.
     "@typescript-eslint/ban-ts-comment": "off",
     "@typescript-eslint/ban-types": "off",
@@ -32,7 +38,7 @@
         "fixStyle": "inline-type-imports"
       }
     ],
-    "prefer-const": "off",
+    "import/no-duplicates": "error",
     "no-console": [
       "error",
       {
@@ -69,36 +75,9 @@
           }
         ]
       }
-    ]
-  },
-  "overrides": [
-    {
-      "files": ["**/e2e/**"],
-      "rules": {
-        "testing-library/await-async-events": "off",
-        "testing-library/await-async-query": "off",
-        "testing-library/await-async-utils": "off",
-        "testing-library/no-await-sync-events": "off",
-        "testing-library/no-await-sync-queries": "off",
-        "testing-library/no-container": "off",
-        "testing-library/no-debugging-utils": "off",
-        "testing-library/no-dom-import": "off",
-        "testing-library/no-global-regexp-flag-in-query": "off",
-        "testing-library/no-manual-cleanup": "off",
-        "testing-library/no-node-access": "off",
-        "testing-library/no-promise-in-fire-event": "off",
-        "testing-library/no-render-in-lifecycle": "off",
-        "testing-library/no-unnecessary-act": "off",
-        "testing-library/no-wait-for-multiple-assertions": "off",
-        "testing-library/no-wait-for-side-effects": "off",
-        "testing-library/no-wait-for-snapshot": "off",
-        "testing-library/prefer-find-by": "off",
-        "testing-library/prefer-implicit-assert": "off",
-        "testing-library/prefer-presence-queries": "off",
-        "testing-library/prefer-query-by-disappearance": "off",
-        "testing-library/prefer-screen-queries": "off",
-        "testing-library/render-result-naming-convention": "off"
-      }
-    }
-  ]
+    ],
+    "prefer-const": "off",
+    "react-hooks/rules-of-hooks": "error",
+    "react-hooks/exhaustive-deps": "warn"
+  }
 }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d22aae375..2ad3945f0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,7 @@
 name: OpenMRS CI
 
 on:
+  workflow_dispatch:
   push:
     branches: [main]
   pull_request:
diff --git a/__mocks__/appointments.mock.ts b/__mocks__/appointments.mock.ts
index e852e520f..a2a76e0a0 100644
--- a/__mocks__/appointments.mock.ts
+++ b/__mocks__/appointments.mock.ts
@@ -368,10 +368,12 @@ export const mockProviders = {
     {
       uuid: 'f9badd80-ab76-11e2-9e96-0800200c9a66',
       person: { uuid: '24252571-dd5a-11e6-9d9c-0242ac150002', display: 'Dr James Cook' },
+      display: 'doctor - James Cook',
     },
     {
       uuid: '3191eddf-5cc5-4fa4-94ef-dfc25e8d33e4',
       person: { uuid: '89af8ba6-2ec5-4d77-b3ed-7e9e02448e96', display: 'Dr Amstrong Neil' },
+      display: 'doctor - Amstrong Neil',
     },
   ],
 };
diff --git a/__mocks__/index.ts b/__mocks__/index.ts
index 0fc40834c..15692d4f8 100644
--- a/__mocks__/index.ts
+++ b/__mocks__/index.ts
@@ -8,7 +8,7 @@ export * from './identifiers.mock';
 export * from './locations.mock';
 export * from './metrics.mock';
 export * from './patient.mock';
-export * from './patient-visits.mock';
+export * from './patient-appointments.mock';
 export * from './patient-registration.mock';
 export * from './queue-entry.mock';
 export * from './queue-rooms.mock';
diff --git a/__mocks__/patient-visits.mock.ts b/__mocks__/patient-appointments.mock.ts
similarity index 97%
rename from __mocks__/patient-visits.mock.ts
rename to __mocks__/patient-appointments.mock.ts
index e5b106e5c..07055ca5d 100644
--- a/__mocks__/patient-visits.mock.ts
+++ b/__mocks__/patient-appointments.mock.ts
@@ -1,5 +1,5 @@
-export const mockPatientsVisits = {
-  recentVisits: [
+export const mockPatientAppointments = {
+  recentAppointments: [
     {
       uuid: '6baa7963-68ea-497e-b258-6fb82382bd07',
       appointmentNumber: '0000',
@@ -59,7 +59,7 @@ export const mockPatientsVisits = {
       recurring: false,
     },
   ],
-  futureVisits: [
+  futureAppointments: [
     {
       uuid: '6baa7963-68ea-497e-b258-6fb82382bd07',
       appointmentNumber: '0000',
diff --git a/__mocks__/queue-entry.mock.ts b/__mocks__/queue-entry.mock.ts
index dc36d30c7..138eaf43b 100644
--- a/__mocks__/queue-entry.mock.ts
+++ b/__mocks__/queue-entry.mock.ts
@@ -125,7 +125,7 @@ export const mockQueueEntryAlice: QueueEntry = {
   endedAt: null,
   locationWaitingFor: null,
   patient: mockPatientAlice,
-  priority: mockPriorityNonUrgent,
+  priority: mockPriorityUrgent,
   priorityComment: null,
   providerWaitingFor: null,
   queue: mockQueueSurgery,
diff --git a/__mocks__/search.mock.ts b/__mocks__/search.mock.ts
index 783ca54f7..fdaf71236 100644
--- a/__mocks__/search.mock.ts
+++ b/__mocks__/search.mock.ts
@@ -33,3 +33,116 @@ export const mockSearchResults = {
     ],
   },
 };
+
+export const mockAdvancedSearchResults = [
+  {
+    patientId: 14,
+    uuid: 'e46dfea6-f32d-4b61-bc7d-e79fd35332a4',
+    identifiers: [
+      {
+        identifier: '100008E',
+        identifierType: {
+          uuid: '05a29f94-c0ed-11e2-94be-8c13b969e334',
+          display: 'OpenMRS ID',
+        },
+      },
+    ],
+    display: '100008E - Joshua Johnson',
+    patientIdentifier: {
+      uuid: '1e6c2da6-f63f-4ea5-a595-ded69df9f882',
+      identifier: '100008E',
+    },
+    person: {
+      gender: 'M',
+      age: 5,
+      birthdate: '2019-09-25T00:00:00.000+0000',
+      birthdateEstimated: false,
+      personName: {
+        display: 'Joshua Johnson',
+        givenName: 'Joshua',
+        familyName: 'Johnson',
+      },
+      addresses: [
+        {
+          address1: 'Address16442',
+          cityVillage: 'City6442',
+          stateProvince: 'State6442',
+          country: 'Country6442',
+          postalCode: '20839',
+          preferred: true,
+        },
+      ],
+      dead: false,
+      deathDate: null,
+    },
+    attributes: [
+      {
+        value: '0785434125',
+        attributeType: {
+          uuid: '14d4f066-15f5-102d-96e4-000c29c2a5d7',
+          display: 'Telephone Number',
+        },
+      },
+    ],
+  },
+  {
+    patientId: 42,
+    uuid: 'a83747aa-3041-489a-a112-1c024582c83d',
+    identifiers: [
+      {
+        identifier: '100016H',
+        identifierType: {
+          uuid: '05a29f94-c0ed-11e2-94be-8c13b969e334',
+          display: 'OpenMRS ID',
+        },
+      },
+    ],
+    display: '100016H - Joseph Davis',
+    patientIdentifier: {
+      uuid: '0ac0a9a0-b040-4c0a-9c35-c4e0bb52a570',
+      identifier: '100016H',
+    },
+    person: {
+      gender: 'M',
+      age: 30,
+      birthdate: '1994-10-13T00:00:00.000+0000',
+      birthdateEstimated: false,
+      personName: {
+        display: 'Joseph Davis',
+        givenName: 'Joseph',
+        familyName: 'Davis',
+      },
+      addresses: [
+        {
+          address1: 'Address19050',
+          cityVillage: 'City9050',
+          stateProvince: 'State9050',
+          country: 'Country9050',
+          postalCode: '46548',
+          preferred: true,
+        },
+      ],
+      dead: false,
+      deathDate: null,
+    },
+    attributes: [
+      {
+        value: {
+          uuid: '1ce1b7d4-c865-4178-82b0-5932e51503d6',
+          display: 'Community Outreach',
+          links: [
+            {
+              rel: 'self',
+              uri: 'http://dev3.openmrs.org/openmrs/ws/rest/v1/location/1ce1b7d4-c865-4178-82b0-5932e51503d6',
+              resourceAlias: 'location',
+            },
+          ],
+        },
+        attributeType: {
+          uuid: '8d87236c-c2cc-11de-8d13-0010c6dffd0f',
+          display: 'Health Center',
+        },
+      },
+    ],
+  },
+];
diff --git a/e2e/commands/cohort-operations.ts b/e2e/commands/cohort-operations.ts
index 496038970..2a7042abd 100644
--- a/e2e/commands/cohort-operations.ts
+++ b/e2e/commands/cohort-operations.ts
@@ -1,43 +1,5 @@
 import { type APIRequestContext, expect } from '@playwright/test';
-import { type Patient } from './patient-operations';
-
-export interface CohortType {
-  uuid: string;
-  name: string;
-  description: string;
-  display: string;
-  links: { rel: string; uri: string; resourceAlias: string }[];
-  resourceVersion: string;
-}
-
-export interface Cohort {
-  uuid: string;
-  name: string;
-  description: string;
-  attributes: any[];
-  links: any[];
-  location: any;
-  groupCohort: boolean | null;
-  startDate: Date;
-  endDate: Date;
-  voidReason: string | null;
-  voided: boolean;
-  isStarred?: boolean;
-  type?: string;
-  size: number;
-  cohortType?: CohortType;
-  resourceVersion: string;
-}
-
-export interface CohortMember {
-  attributes: Array<any>;
-  description: string;
-  endDate: string;
-  startDate: string;
-  name: string;
-  uuid: string;
-  patient: Patient;
-}
+import { type Cohort, type CohortMember } from '../types';
 
 export const generateRandomCohort = async (api: APIRequestContext): Promise<Cohort> => {
   const cohortRes = await api.post('cohortm/cohort', {
diff --git a/e2e/commands/encounter-operations.ts b/e2e/commands/encounter-operations.ts
index aeb991013..efccad25e 100644
--- a/e2e/commands/encounter-operations.ts
+++ b/e2e/commands/encounter-operations.ts
@@ -1,6 +1,6 @@
-import { Encounter } from './../../packages/esm-active-visits-app/src/visits-summary/visit.resource';
-import { APIRequestContext, expect } from '@playwright/test';
+import { type APIRequestContext, expect } from '@playwright/test';
 import dayjs from 'dayjs';
+import { type Encounter } from '../types';
 
 export const createEncounter = async (
   api: APIRequestContext,
diff --git a/e2e/commands/patient-operations.ts b/e2e/commands/patient-operations.ts
index cc9fe99ff..e2efa2491 100644
--- a/e2e/commands/patient-operations.ts
+++ b/e2e/commands/patient-operations.ts
@@ -1,50 +1,5 @@
 import { type APIRequestContext, expect } from '@playwright/test';
-
-export interface Patient {
-  uuid: string;
-  identifiers: Identifier[];
-  display: string;
-  person: {
-    uuid: string;
-    display: string;
-    gender: string;
-    age: number;
-    birthdate: string;
-    birthdateEstimated: boolean;
-    dead: boolean;
-    deathDate?: any;
-    causeOfDeath?: any;
-    preferredAddress: {
-      address1: string;
-      cityVillage: string;
-      country: string;
-      postalCode: string;
-      stateProvince: string;
-      countyDistrict: string;
-    };
-    attributes: any[];
-    voided: boolean;
-    birthtime?: any;
-    deathdateEstimated: boolean;
-    resourceVersion: string;
-  };
-  attributes: { value: string; attributeType: { uuid: string; display: string } }[];
-  voided: boolean;
-}
-
-export interface Address {
-  preferred: boolean;
-  address1: string;
-  cityVillage: string;
-  country: string;
-  postalCode: string;
-  stateProvince: string;
-}
-
-export interface Identifier {
-  uuid: string;
-  display: string;
-}
+import { type Patient } from '../types';
 
 export const generateRandomPatient = async (api: APIRequestContext): Promise<Patient> => {
   const identifierRes = await api.post('idgen/identifiersource/8549f706-7e85-4c1d-9424-217d50a2988b/identifier', {
diff --git a/e2e/commands/provider-operations.ts b/e2e/commands/provider-operations.ts
index c925313dc..8c056665d 100644
--- a/e2e/commands/provider-operations.ts
+++ b/e2e/commands/provider-operations.ts
@@ -1,5 +1,5 @@
-import { Provider } from '../../packages/esm-appointments-app/src/types/index';
-import { APIRequestContext, expect } from '@playwright/test';
+import { type APIRequestContext, expect } from '@playwright/test';
+import { type Provider } from '../types';
 
 export const getProvider = async (api: APIRequestContext): Promise<Provider> => {
   const providerRes = await api.get('provider?q=admin', {
diff --git a/e2e/commands/visit-operations.ts b/e2e/commands/visit-operations.ts
index 2091740ab..4316c395d 100644
--- a/e2e/commands/visit-operations.ts
+++ b/e2e/commands/visit-operations.ts
@@ -1,6 +1,6 @@
-import { APIRequestContext, expect } from '@playwright/test';
-import { Visit } from '@openmrs/esm-framework';
+import { type APIRequestContext, expect } from '@playwright/test';
 import dayjs from 'dayjs';
+import { type Visit } from '@openmrs/esm-framework';
 
 export const startVisit = async (api: APIRequestContext, patientId: string): Promise<Visit> => {
   const visitRes = await api.post('visit', {
diff --git a/e2e/pages/home-page.ts b/e2e/pages/home-page.ts
index 8359dd9a5..bb5ff1700 100644
--- a/e2e/pages/home-page.ts
+++ b/e2e/pages/home-page.ts
@@ -1,4 +1,4 @@
-import { Page } from '@playwright/test';
+import { type Page } from '@playwright/test';
 
 export class HomePage {
   constructor(readonly page: Page) {}
diff --git a/e2e/pages/patient-lists-page.ts b/e2e/pages/patient-lists-page.ts
index b5ac5f7e4..8e0922d10 100644
--- a/e2e/pages/patient-lists-page.ts
+++ b/e2e/pages/patient-lists-page.ts
@@ -1,4 +1,4 @@
-import { Page } from '@playwright/test';
+import { type Page } from '@playwright/test';
 
 export class PatientListsPage {
   constructor(readonly page: Page) {}
diff --git a/e2e/pages/registration-and-edit-page.ts b/e2e/pages/registration-and-edit-page.ts
index 3041689a2..753b6d194 100644
--- a/e2e/pages/registration-and-edit-page.ts
+++ b/e2e/pages/registration-and-edit-page.ts
@@ -1,27 +1,5 @@
 import { type Locator, type Page, expect } from '@playwright/test';
-
-export type PatientRegistrationSex = 'male' | 'female' | 'other' | 'unknown';
-
-export interface PatientRegistrationFormValues {
-  givenName?: string;
-  middleName?: string;
-  familyName?: string;
-  sex?: PatientRegistrationSex;
-  birthdate?: {
-    day: string;
-    month: string;
-    year: string;
-  };
-  postalCode?: string;
-  address1?: string;
-  address2?: string;
-  country?: string;
-  countyDistrict?: string;
-  stateProvince?: string;
-  cityVillage?: string;
-  phone?: string;
-  email?: string;
-}
+import { type PatientRegistrationFormValues, type PatientRegistrationSex } from '../types';
 
 export class RegistrationAndEditPage {
   constructor(readonly page: Page) {}
diff --git a/e2e/specs/active-visits.spec.ts b/e2e/specs/active-visits.spec.ts
index fb70f607b..1ba677c18 100644
--- a/e2e/specs/active-visits.spec.ts
+++ b/e2e/specs/active-visits.spec.ts
@@ -1,19 +1,18 @@
 import { expect } from '@playwright/test';
 import type { Visit } from '@openmrs/esm-framework';
 import { test } from '../core';
-import type { Provider } from '../../packages/esm-appointments-app/src/types/index';
-import type { Encounter } from '../../packages/esm-active-visits-app/src/visits-summary/visit.resource';
+
 import {
   createEncounter,
   deleteEncounter,
   deletePatient,
   endVisit,
   generateRandomPatient,
-  type Patient,
-  startVisit,
   getProvider,
+  startVisit,
 } from '../commands';
 import { HomePage } from '../pages';
+import { type Encounter, type Patient, type Provider } from '../types';
 
 let patient: Patient;
 let visit: Visit;
diff --git a/e2e/specs/appointments.spec.ts b/e2e/specs/appointments.spec.ts
index 87d387989..7705ea0a9 100644
--- a/e2e/specs/appointments.spec.ts
+++ b/e2e/specs/appointments.spec.ts
@@ -1,8 +1,9 @@
 import { expect } from '@playwright/test';
-import { generateRandomPatient, deletePatient, type Patient, startVisit, endVisit } from '../commands';
+import { generateRandomPatient, deletePatient, startVisit, endVisit } from '../commands';
+import { type Visit } from '@openmrs/esm-framework';
+import { type Patient } from '../types';
 import { test } from '../core';
 import { AppointmentsPage } from '../pages';
-import { type Visit } from '@openmrs/esm-framework';
 
 let patient: Patient;
 let visit: Visit;
@@ -111,7 +112,7 @@ test('Add, edit and cancel an appointment', async ({ page, api }) => {
     await page.getByRole('button', { name: 'Options' }).click();
   });
 
-  await test.step('And I choose the "Cancel" option ', async () => {
+  await test.step('And I choose the "Cancel" option', async () => {
     await page.getByRole('menuitem', { name: 'Cancel' }).click();
   });
 
diff --git a/e2e/specs/edit-patient.spec.ts b/e2e/specs/edit-patient.spec.ts
index c76d228aa..0aa701512 100644
--- a/e2e/specs/edit-patient.spec.ts
+++ b/e2e/specs/edit-patient.spec.ts
@@ -1,8 +1,9 @@
 import dayjs from 'dayjs';
 import { expect } from '@playwright/test';
 import { test } from '../core';
-import { deletePatient, generateRandomPatient, getPatient, type Patient } from '../commands';
-import { type PatientRegistrationFormValues, RegistrationAndEditPage } from '../pages';
+import { deletePatient, generateRandomPatient, getPatient } from '../commands';
+import { RegistrationAndEditPage } from '../pages';
+import { type Patient, type PatientRegistrationFormValues } from '../types';
 
 let patient: Patient;
 
diff --git a/e2e/specs/patient-list.spec.ts b/e2e/specs/patient-list.spec.ts
index 69092ccea..1591b4b90 100644
--- a/e2e/specs/patient-list.spec.ts
+++ b/e2e/specs/patient-list.spec.ts
@@ -2,9 +2,6 @@ import { test } from '../core';
 import { PatientListsPage } from '../pages';
 import { expect } from '@playwright/test';
 import {
-  type Cohort,
-  type CohortMember,
-  type Patient,
   addPatientToCohort,
   deleteCohort,
   deletePatient,
@@ -12,6 +9,7 @@ import {
   generateRandomPatient,
   removePatientFromCohort,
 } from '../commands';
+import { type Cohort, type CohortMember, type Patient } from '../types';
 
 let cohortMember: CohortMember;
 let cohortUuid: string;
@@ -46,7 +44,8 @@ test('Create and edit a patient list', async ({ page }) => {
 
   await test.step('Then I should see the information about the list', async () => {
     await expect(page).toHaveURL(new RegExp('^[\\w\\d:\\/.-]+\\/patient-lists\\/[\\w\\d-]+$'));
-    cohortUuid = /patient-lists\/([\w\d-]+)/.exec(page.url())?.[1] ?? null;
+    const [, extractedUuid] = /patient-lists\/([\w\d-]+)/.exec(page.url());
+    cohortUuid = extractedUuid;
 
     await expect(patientListPage.patientListHeader()).toHaveText(new RegExp(patientListName));
     await expect(patientListPage.patientListHeader()).toHaveText(new RegExp(patientListDescription));
diff --git a/e2e/specs/patient-search.spec.ts b/e2e/specs/patient-search.spec.ts
index b91f53c67..54c13b1ac 100644
--- a/e2e/specs/patient-search.spec.ts
+++ b/e2e/specs/patient-search.spec.ts
@@ -1,7 +1,8 @@
 import { expect } from '@playwright/test';
 import { test } from '../core';
 import { HomePage } from '../pages';
-import { generateRandomPatient, deletePatient, type Patient } from '../commands';
+import { generateRandomPatient, deletePatient } from '../commands';
+import { type Patient } from '../types';
 
 let patient: Patient;
 
diff --git a/e2e/specs/register-new-patient.spec.ts b/e2e/specs/register-new-patient.spec.ts
index 365b0bdf8..ed4fca8ae 100644
--- a/e2e/specs/register-new-patient.spec.ts
+++ b/e2e/specs/register-new-patient.spec.ts
@@ -1,6 +1,7 @@
 import { expect } from '@playwright/test';
 import { test } from '../core';
-import { type PatientRegistrationFormValues, RegistrationAndEditPage } from '../pages';
+import { RegistrationAndEditPage } from '../pages';
+import { type PatientRegistrationFormValues } from '../types';
 import { deletePatient } from '../commands';
 
 let patientUuid: string;
@@ -101,7 +102,7 @@ test('Register an unknown patient', async ({ api, page }) => {
   });
 
   await test.step('And then I fill in 25 as the estimated age in years', async () => {
-    const estimatedAgeField = await page.getByLabel(/estimated age in years/i);
+    const estimatedAgeField = page.getByLabel(/estimated age in years/i);
     await estimatedAgeField.clear();
     await estimatedAgeField.fill('25');
   });
@@ -123,7 +124,7 @@ test('Register an unknown patient', async ({ api, page }) => {
   await test.step("And I should see the newly registered patient's details displayed in the patient banner", async () => {
     const patientBanner = page.locator('header[aria-label="patient banner"]');
 
-    expect(patientBanner).toBeVisible();
+    await expect(patientBanner).toBeVisible();
     await expect(patientBanner.getByText('Unknown Unknown')).toBeVisible();
     await expect(patientBanner.getByText(/female/i)).toBeVisible();
     await expect(patientBanner.getByText(/25 yrs/i)).toBeVisible();
diff --git a/e2e/specs/return-to-patient-list.spec.ts b/e2e/specs/return-to-patient-list.spec.ts
index 2023f0840..a86c56572 100644
--- a/e2e/specs/return-to-patient-list.spec.ts
+++ b/e2e/specs/return-to-patient-list.spec.ts
@@ -3,15 +3,13 @@ import { PatientListsPage } from '../pages';
 import { expect } from '@playwright/test';
 import {
   addPatientToCohort,
-  type Cohort,
-  type CohortMember,
   deleteCohort,
   deletePatient,
   generateRandomCohort,
   generateRandomPatient,
-  type Patient,
   removePatientFromCohort,
 } from '../commands';
+import { type Cohort, type CohortMember, type Patient } from '../types';
 
 let cohortMembership: CohortMember;
 let cohort: Cohort;
@@ -123,7 +121,7 @@ test('Return to patient list after navigating to visits and refreshing the page'
 
 test('Return to patient list from the patient chart on a new tab', async ({ page, context }) => {
   const patientListPage = new PatientListsPage(page);
-  const locator = await page.locator('table tbody tr td:nth-child(1) a');
+  const locator = page.locator('table tbody tr td:nth-child(1) a');
   const pagePromise = context.waitForEvent('page');
 
   await test.step('When I navigate to the patient list', async () => {
diff --git a/e2e/types/index.ts b/e2e/types/index.ts
new file mode 100644
index 000000000..540f16211
--- /dev/null
+++ b/e2e/types/index.ts
@@ -0,0 +1,218 @@
+import { type OpenmrsResource } from '@openmrs/esm-framework';
+
+export type PatientRegistrationSex = 'male' | 'female' | 'other' | 'unknown';
+
+export interface PatientRegistrationFormValues {
+  givenName?: string;
+  middleName?: string;
+  familyName?: string;
+  sex?: PatientRegistrationSex;
+  birthdate?: {
+    day: string;
+    month: string;
+    year: string;
+  };
+  postalCode?: string;
+  address1?: string;
+  address2?: string;
+  country?: string;
+  countyDistrict?: string;
+  stateProvince?: string;
+  cityVillage?: string;
+  phone?: string;
+  email?: string;
+}
+
+export interface Encounter {
+  uuid: string;
+  encounterDateTime: string;
+  encounterProviders: Array<{
+    uuid: string;
+    display: string;
+    encounterRole: {
+      uuid: string;
+      display: string;
+    };
+    provider: {
+      uuid: string;
+      person: {
+        uuid: string;
+        display: string;
+      };
+    };
+  }>;
+  encounterType: {
+    uuid: string;
+    display: string;
+  };
+  obs: Array<Observation>;
+  orders: Array<Order>;
+}
+
+export interface Observation {
+  uuid: string;
+  concept: {
+    uuid: string;
+    display: string;
+    conceptClass: {
+      uuid: string;
+      display: string;
+    };
+  };
+  display: string;
+  groupMembers: null | Array<{
+    uuid: string;
+    concept: {
+      uuid: string;
+      display: string;
+    };
+    value: {
+      uuid: string;
+      display: string;
+    };
+  }>;
+  value: any;
+  obsDatetime: string;
+}
+
+export interface Order {
+  uuid: string;
+  dateActivated: string;
+  dateStopped?: Date | null;
+  dose: number;
+  dosingInstructions: string | null;
+  dosingType?: 'org.openmrs.FreeTextDosingInstructions' | 'org.openmrs.SimpleDosingInstructions';
+  doseUnits: {
+    uuid: string;
+    display: string;
+  };
+  drug: {
+    uuid: string;
+    name: string;
+    strength: string;
+    display: string;
+  };
+  duration: number;
+  durationUnits: {
+    uuid: string;
+    display: string;
+  };
+  frequency: {
+    uuid: string;
+    display: string;
+  };
+  numRefills: number;
+  orderNumber: string;
+  orderReason: string | null;
+  orderReasonNonCoded: string | null;
+  orderer: {
+    uuid: string;
+    person: {
+      uuid: string;
+      display: string;
+    };
+  };
+  orderType: {
+    uuid: string;
+    display: string;
+  };
+  route: {
+    uuid: string;
+    display: string;
+  };
+  quantity: number;
+  quantityUnits: OpenmrsResource;
+}
+
+export interface Provider {
+  uuid: string;
+  display: string;
+  comments?: string;
+  response?: string;
+  person: OpenmrsResource;
+  name?: string;
+}
+
+export interface CohortType {
+  uuid: string;
+  name: string;
+  description: string;
+  display: string;
+  links: { rel: string; uri: string; resourceAlias: string }[];
+  resourceVersion: string;
+}
+
+export interface Cohort {
+  uuid: string;
+  name: string;
+  description: string;
+  attributes: any[];
+  links: any[];
+  location: any;
+  groupCohort: boolean | null;
+  startDate: Date;
+  endDate: Date;
+  voidReason: string | null;
+  voided: boolean;
+  isStarred?: boolean;
+  type?: string;
+  size: number;
+  cohortType?: CohortType;
+  resourceVersion: string;
+}
+
+export interface CohortMember {
+  attributes: Array<any>;
+  description: string;
+  endDate: string;
+  startDate: string;
+  name: string;
+  uuid: string;
+  patient: Patient;
+}
+
+export interface Patient {
+  uuid: string;
+  identifiers: Identifier[];
+  display: string;
+  person: {
+    uuid: string;
+    display: string;
+    gender: string;
+    age: number;
+    birthdate: string;
+    birthdateEstimated: boolean;
+    dead: boolean;
+    deathDate?: any;
+    causeOfDeath?: any;
+    preferredAddress: {
+      address1: string;
+      cityVillage: string;
+      country: string;
+      postalCode: string;
+      stateProvince: string;
+      countyDistrict: string;
+    };
+    attributes: any[];
+    voided: boolean;
+    birthtime?: any;
+    deathdateEstimated: boolean;
+    resourceVersion: string;
+  };
+  attributes: { value: string; attributeType: { uuid: string; display: string } }[];
+  voided: boolean;
+}
+
+export interface Address {
+  preferred: boolean;
+  address1: string;
+  cityVillage: string;
+  country: string;
+  postalCode: string;
+  stateProvince: string;
+}
+
+export interface Identifier {
+  uuid: string;
+  display: string;
+}
diff --git a/package.json b/package.json
index 65701f7cf..fce37340b 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.11.6",
-    "@carbon/react": "~1.37.0",
+    "@carbon/react": "^1.71.0",
     "@openmrs/esm-framework": "next",
     "@openmrs/esm-patient-common-lib": "next",
     "@playwright/test": "1.48.2",
@@ -55,6 +55,7 @@
     "eslint": "^8.55.0",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jest-dom": "^5.4.0",
+    "eslint-plugin-playwright": "^2.1.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-testing-library": "^6.2.2",
     "husky": "^8.0.3",
diff --git a/packages/esm-active-visits-app/package.json b/packages/esm-active-visits-app/package.json
index 4a9e4bb51..fd2b237ca 100644
--- a/packages/esm-active-visits-app/package.json
+++ b/packages/esm-active-visits-app/package.json
@@ -18,7 +18,7 @@
     "test:watch": "cross-env TZ=UTC jest --watch --config jest.config.js --color",
     "coverage": "yarn test --coverage",
     "typescript": "tsc",
-    "extract-translations": "i18next 'src/**/*.component.tsx' 'src/**/*.extension.tsx' 'src/**/*modal.tsx' 'src/**/*.workspace.tsx' 'src/index.ts' --config ../../tools/i18next-parser.config.js"
+    "extract-translations": "i18next 'src/**/*.component.tsx' 'src/**/*.resource.tsx' 'src/**/*.extension.tsx' 'src/**/*modal.tsx' 'src/**/*.workspace.tsx' 'src/index.ts' --config ../../tools/i18next-parser.config.js"
   },
   "browserslist": [
     "extends browserslist-config-openmrs"
@@ -37,7 +37,7 @@
     "url": "https://github.com/openmrs/openmrs-esm-patient-management/issues"
   },
   "dependencies": {
-    "@carbon/react": "~1.37.0",
+    "@carbon/react": "^1.71.0",
     "lodash-es": "^4.17.15"
   },
   "peerDependencies": {
diff --git a/packages/esm-active-visits-app/src/active-visits-widget/active-visits.component.tsx b/packages/esm-active-visits-app/src/active-visits-widget/active-visits.component.tsx
index 08e3e53a3..f7ba849fb 100644
--- a/packages/esm-active-visits-app/src/active-visits-widget/active-visits.component.tsx
+++ b/packages/esm-active-visits-app/src/active-visits-widget/active-visits.component.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useState, useCallback } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import {
   DataTable,
   DataTableSkeleton,
@@ -20,88 +20,53 @@ import {
 } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
 import {
-  useLayoutType,
+  ConfigurableLink,
+  ErrorState,
+  ExtensionSlot,
   isDesktop,
   useConfig,
+  useLayoutType,
   usePagination,
-  ExtensionSlot,
-  ErrorState,
-  ConfigurableLink,
 } from '@openmrs/esm-framework';
 import { EmptyDataIllustration } from './empty-data-illustration.component';
-import { useActiveVisits } from './active-visits.resource';
+import { useActiveVisits, useActiveVisitsSorting, useObsConcepts, useTableHeaders } from './active-visits.resource';
 import styles from './active-visits.scss';
-
-function generateTableHeaders(t, config) {
-  let headersIndex = 0;
-
-  const headers = [
-    {
-      id: headersIndex++,
-      header: t('visitStartTime', 'Visit Time'),
-      key: 'visitStartTime',
-    },
-  ];
-
-  config?.activeVisits?.identifiers?.map((identifier) => {
-    headers.push({
-      id: headersIndex++,
-      header: t(identifier?.header?.key, identifier?.header?.default),
-      key: identifier?.header?.key,
-    });
-  });
-
-  if (!config?.activeVisit?.identifiers) {
-    headers.push({
-      id: headersIndex++,
-      header: t('idNumber', 'ID Number'),
-      key: 'idNumber',
-    });
-  }
-
-  config?.activeVisits?.attributes?.map((attribute) => {
-    headers.push({
-      id: headersIndex++,
-      header: t(attribute?.header?.key, attribute?.header?.default),
-      key: attribute?.header?.key,
-    });
-  });
-
-  headers.push(
-    {
-      id: headersIndex++,
-      header: t('name', 'Name'),
-      key: 'name',
-    },
-    {
-      id: headersIndex++,
-      header: t('gender', 'Gender'),
-      key: 'gender',
-    },
-    {
-      id: headersIndex++,
-      header: t('age', 'Age'),
-      key: 'age',
-    },
-    {
-      id: headersIndex++,
-      header: t('visitType', 'Visit Type'),
-      key: 'visitType',
-    },
-  );
-
-  return headers;
-}
+import { type ActiveVisitsConfigSchema } from '../config-schema';
+import { type ActiveVisit } from '../types';
 
 const ActiveVisitsTable = () => {
   const { t } = useTranslation();
-  const config = useConfig();
+  const config = useConfig<ActiveVisitsConfigSchema>();
   const layout = useLayoutType();
   const pageSizes = config?.activeVisits?.pageSizes ?? [10, 20, 30, 40, 50];
   const [pageSize, setPageSize] = useState(config?.activeVisits?.pageSize ?? 10);
+  const { obsConcepts, isLoadingObsConcepts } = useObsConcepts(config.activeVisits.obs);
   const { activeVisits, isLoading, isValidating, error } = useActiveVisits();
   const [searchString, setSearchString] = useState('');
-  const headerData = useMemo(() => generateTableHeaders(t, config), [config, t]);
+  const headerData = useTableHeaders(obsConcepts);
+
+  const transformVisitForDisplay = useCallback(
+    (visit: ActiveVisit) => {
+      const displayData = { ...visit };
+
+      // Add observation values to the display data
+      obsConcepts?.forEach((concept) => {
+        const obsValues = visit?.observations?.[concept.uuid] ?? [];
+        const latestObs = obsValues[0];
+
+        if (latestObs) {
+          // Handle both string and object values
+          displayData[`obs-${concept.uuid}`] =
+            typeof latestObs.value === 'object' ? latestObs.value.display : latestObs.value;
+        } else {
+          displayData[`obs-${concept.uuid}`] = '--';
+        }
+      });
+
+      return displayData;
+    },
+    [obsConcepts],
+  );
 
   const searchResults = useMemo(() => {
     if (activeVisits !== undefined && activeVisits.length > 0) {
@@ -118,10 +83,11 @@ const ActiveVisitsTable = () => {
       }
     }
 
-    return activeVisits;
-  }, [searchString, activeVisits]);
+    return activeVisits.map(transformVisitForDisplay);
+  }, [searchString, activeVisits, transformVisitForDisplay]);
 
-  const { paginated, goTo, results, currentPage } = usePagination(searchResults, pageSize);
+  const { sortedRows, sortRow } = useActiveVisitsSorting(searchResults);
+  const { paginated, goTo, results, currentPage } = usePagination(sortedRows, pageSize as number);
 
   const handleSearch = useCallback(
     (e) => {
@@ -131,7 +97,7 @@ const ActiveVisitsTable = () => {
     [goTo, setSearchString],
   );
 
-  if (isLoading) {
+  if (isLoading || isLoadingObsConcepts) {
     return (
       <div className={styles.activeVisitsContainer}>
         <div className={styles.activeVisitsDetailHeaderContainer}>
@@ -187,125 +153,128 @@ const ActiveVisitsTable = () => {
         </Layer>
       </div>
     );
-  } else {
-    return (
-      <div className={styles.activeVisitsContainer}>
-        <div className={styles.activeVisitsDetailHeaderContainer}>
-          <div className={!isDesktop(layout) ? styles.tabletHeading : styles.desktopHeading}>
-            <h4>{t('activeVisits', 'Active Visits')}</h4>
-          </div>
-          <div className={styles.backgroundDataFetchingIndicator}>
-            <span>{isValidating ? <InlineLoading /> : null}</span>
-          </div>
+  }
+
+  return (
+    <div className={styles.activeVisitsContainer}>
+      <div className={styles.activeVisitsDetailHeaderContainer}>
+        <div className={!isDesktop(layout) ? styles.tabletHeading : styles.desktopHeading}>
+          <h4>{t('activeVisits', 'Active Visits')}</h4>
         </div>
-        <Search
-          labelText=""
-          placeholder={t('filterTable', 'Filter table')}
-          onChange={handleSearch}
-          size={isDesktop(layout) ? 'sm' : 'lg'}
-        />
-        <DataTable
-          rows={results}
-          headers={headerData}
-          size={isDesktop(layout) ? 'sm' : 'lg'}
-          useZebraStyles={activeVisits?.length > 1 ? true : false}>
-          {({ rows, headers, getHeaderProps, getTableProps, getRowProps, getExpandHeaderProps }) => (
-            <TableContainer className={styles.tableContainer}>
-              <Table className={styles.activeVisitsTable} {...getTableProps()}>
-                <TableHead>
-                  <TableRow>
-                    <TableExpandHeader enableToggle {...getExpandHeaderProps()} />
-                    {headers.map((header) => (
-                      <TableHeader {...getHeaderProps({ header })}>{header.header}</TableHeader>
-                    ))}
-                  </TableRow>
-                </TableHead>
-                <TableBody>
-                  {rows.map((row, index) => {
-                    const currentVisit = activeVisits.find((visit) => visit.id === row.id);
+        <div className={styles.backgroundDataFetchingIndicator}>
+          <span>{isValidating ? <InlineLoading /> : null}</span>
+        </div>
+      </div>
+      <Search
+        labelText=""
+        placeholder={t('filterTable', 'Filter table')}
+        onChange={handleSearch}
+        size={isDesktop(layout) ? 'sm' : 'lg'}
+      />
+      <DataTable
+        isSortable
+        useStaticWidth
+        rows={results}
+        headers={headerData}
+        sortRow={sortRow}
+        size={isDesktop(layout) ? 'sm' : 'lg'}
+        useZebraStyles={activeVisits?.length > 1}>
+        {({ rows, headers, getHeaderProps, getTableProps, getRowProps, getExpandHeaderProps }) => (
+          <TableContainer className={styles.tableContainer}>
+            <Table className={styles.activeVisitsTable} {...getTableProps()}>
+              <TableHead>
+                <TableRow>
+                  <TableExpandHeader enableToggle {...getExpandHeaderProps()} />
+                  {headers.map((header) => (
+                    <TableHeader {...getHeaderProps({ header })}>{header.header}</TableHeader>
+                  ))}
+                </TableRow>
+              </TableHead>
+              <TableBody>
+                {rows.map((row, index) => {
+                  const currentVisit = activeVisits.find((visit) => visit.id === row.id);
 
-                    if (!currentVisit) {
-                      return null;
-                    }
+                  if (!currentVisit) {
+                    return null;
+                  }
 
-                    const patientChartUrl = '${openmrsSpaBase}/patient/${patientUuid}/chart/Patient%20Summary';
+                  const patientChartUrl = '${openmrsSpaBase}/patient/${patientUuid}/chart';
 
-                    return (
-                      <React.Fragment key={`active-visit-row-${index}`}>
-                        <TableExpandRow
-                          {...getRowProps({ row })}
-                          data-testid={`activeVisitRow${currentVisit.patientUuid || 'unknown'}`}>
-                          {row.cells.map((cell) => (
-                            <TableCell key={`active-visit-row-${index}-cell-${cell.id}`} data-testid={cell.id}>
-                              {cell.info.header === 'name' && currentVisit.patientUuid ? (
-                                <ConfigurableLink
-                                  to={patientChartUrl}
-                                  templateParams={{ patientUuid: currentVisit.patientUuid }}>
-                                  {cell.value}
-                                </ConfigurableLink>
-                              ) : (
-                                cell.value
-                              )}
-                            </TableCell>
-                          ))}
-                        </TableExpandRow>
-                        {row.isExpanded ? (
-                          <TableRow className={styles.expandedActiveVisitRow}>
-                            <th colSpan={headers.length + 2}>
-                              <ExtensionSlot
-                                className={styles.visitSummaryContainer}
-                                name="visit-summary-slot"
-                                state={{
-                                  patientUuid: currentVisit.patientUuid,
-                                  visitUuid: currentVisit.visitUuid,
-                                }}
-                              />
-                            </th>
-                          </TableRow>
-                        ) : (
-                          <TableExpandedRow className={styles.hiddenRow} colSpan={headers.length + 2} />
-                        )}
-                      </React.Fragment>
-                    );
-                  })}
-                </TableBody>
-              </Table>
-            </TableContainer>
-          )}
-        </DataTable>
-        {searchResults?.length === 0 && (
-          <div className={styles.filterEmptyState}>
-            <Layer level={0}>
-              <Tile className={styles.filterEmptyStateTile}>
-                <p className={styles.filterEmptyStateContent}>{t('noVisitsToDisplay', 'No visits to display')}</p>
-                <p className={styles.filterEmptyStateHelper}>{t('checkFilters', 'Check the filters above')}</p>
-              </Tile>
-            </Layer>
-          </div>
+                  return (
+                    <React.Fragment key={`active-visit-row-${index}`}>
+                      <TableExpandRow
+                        {...getRowProps({ row })}
+                        data-testid={`activeVisitRow${currentVisit.patientUuid || 'unknown'}`}>
+                        {row.cells.map((cell) => (
+                          <TableCell key={`active-visit-row-${index}-cell-${cell.id}`} data-testid={cell.id}>
+                            {cell.info.header === 'name' && currentVisit.patientUuid ? (
+                              <ConfigurableLink
+                                to={patientChartUrl}
+                                templateParams={{ patientUuid: currentVisit.patientUuid }}>
+                                {cell.value}
+                              </ConfigurableLink>
+                            ) : (
+                              cell.value
+                            )}
+                          </TableCell>
+                        ))}
+                      </TableExpandRow>
+                      {row.isExpanded ? (
+                        <TableRow className={styles.expandedActiveVisitRow}>
+                          <th colSpan={headers.length + 2}>
+                            <ExtensionSlot
+                              className={styles.visitSummaryContainer}
+                              name="visit-summary-slot"
+                              state={{
+                                patientUuid: currentVisit.patientUuid,
+                                visitUuid: currentVisit.visitUuid,
+                              }}
+                            />
+                          </th>
+                        </TableRow>
+                      ) : (
+                        <TableExpandedRow className={styles.hiddenRow} colSpan={headers.length + 2} />
+                      )}
+                    </React.Fragment>
+                  );
+                })}
+              </TableBody>
+            </Table>
+          </TableContainer>
         )}
-        {paginated && (
-          <Pagination
-            forwardText="Next page"
-            backwardText="Previous page"
-            page={currentPage}
-            pageSize={pageSize}
-            pageSizes={pageSizes}
-            totalItems={searchResults?.length}
-            className={styles.pagination}
-            size={isDesktop(layout) ? 'sm' : 'lg'}
-            onChange={({ pageSize: newPageSize, page: newPage }) => {
-              if (newPageSize !== pageSize) {
-                setPageSize(newPageSize);
-              }
-              if (newPage !== currentPage) {
-                goTo(newPage);
-              }
-            }}
-          />
-        )}
-      </div>
-    );
-  }
+      </DataTable>
+      {searchResults?.length === 0 && (
+        <div className={styles.filterEmptyState}>
+          <Layer level={0}>
+            <Tile className={styles.filterEmptyStateTile}>
+              <p className={styles.filterEmptyStateContent}>{t('noVisitsToDisplay', 'No visits to display')}</p>
+              <p className={styles.filterEmptyStateHelper}>{t('checkFilters', 'Check the filters above')}</p>
+            </Tile>
+          </Layer>
+        </div>
+      )}
+      {paginated && (
+        <Pagination
+          forwardText="Next page"
+          backwardText="Previous page"
+          page={currentPage}
+          pageSize={pageSize}
+          pageSizes={pageSizes}
+          totalItems={searchResults?.length}
+          className={styles.pagination}
+          size={isDesktop(layout) ? 'sm' : 'lg'}
+          onChange={({ pageSize: newPageSize, page: newPage }) => {
+            if (newPageSize !== pageSize) {
+              setPageSize(newPageSize);
+            }
+            if (newPage !== currentPage) {
+              goTo(newPage);
+            }
+          }}
+        />
+      )}
+    </div>
+  );
 };
 
 export default ActiveVisitsTable;
diff --git a/packages/esm-active-visits-app/src/active-visits-widget/active-visits.resource.tsx b/packages/esm-active-visits-app/src/active-visits-widget/active-visits.resource.tsx
index 765d8e872..975bfb653 100644
--- a/packages/esm-active-visits-app/src/active-visits-widget/active-visits.resource.tsx
+++ b/packages/esm-active-visits-app/src/active-visits-widget/active-visits.resource.tsx
@@ -1,39 +1,24 @@
-import { useEffect } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import useSWRInfinite from 'swr/infinite';
 import dayjs from 'dayjs';
 import isToday from 'dayjs/plugin/isToday';
 import last from 'lodash-es/last';
 import {
-  openmrsFetch,
-  type Visit,
-  useSession,
   type FetchResponse,
   formatDatetime,
+  openmrsFetch,
+  type OpenmrsResource,
   parseDate,
-  useConfig,
   restBaseUrl,
+  useConfig,
+  useSession,
+  type Visit,
 } from '@openmrs/esm-framework';
-dayjs.extend(isToday);
+import useSWR from 'swr';
+import { type ActiveVisit, type VisitResponse } from '../types';
+import { useTranslation } from 'react-i18next';
 
-export interface ActiveVisit {
-  age: string;
-  id: string;
-  idNumber: string;
-  gender: string;
-  location: string;
-  name: string;
-  patientUuid: string;
-  visitStartTime: string;
-  visitType: string;
-  visitUuid: string;
-  [identifier: string]: string;
-}
-
-interface VisitResponse {
-  results: Array<Visit>;
-  links: Array<{ rel: 'prev' | 'next' }>;
-  totalCount: number;
-}
+dayjs.extend(isToday);
 
 export function useActiveVisits() {
   const session = useSession();
@@ -41,8 +26,10 @@ export function useActiveVisits() {
   const sessionLocation = session?.sessionLocation?.uuid;
 
   const customRepresentation =
-    'custom:(uuid,patient:(uuid,identifiers:(identifier,uuid,identifierType:(name,uuid)),person:(age,display,gender,uuid,attributes:(value,attributeType:(uuid,display)))),' +
-    'visitType:(uuid,name,display),location:(uuid,name,display),startDatetime,stopDatetime)';
+    'custom:(uuid,patient:(uuid,identifiers:(identifier,uuid,identifierType:(name,uuid)),' +
+    'person:(age,display,gender,uuid,attributes:(value,attributeType:(uuid,display)))),' +
+    'visitType:(uuid,name,display),location:(uuid,name,display),startDatetime,stopDatetime,' +
+    'encounters:(encounterDatetime,obs:(uuid,concept:(uuid,display),value)))';
 
   const getUrl = (pageIndex, previousPageData: FetchResponse<VisitResponse>) => {
     if (pageIndex && !previousPageData?.data?.links?.some((link) => link.rel === 'next')) {
@@ -76,7 +63,7 @@ export function useActiveVisits() {
     if (data && data?.[pageNumber - 1]?.data?.links?.some((link) => link.rel === 'next')) {
       setSize((currentSize) => currentSize + 1);
     }
-  }, [data, pageNumber]);
+  }, [data, pageNumber, setSize]);
 
   const mapVisitProperties = (visit: Visit): ActiveVisit => {
     // create base object
@@ -126,6 +113,23 @@ export function useActiveVisits() {
       activeVisits[header?.key] = personAttributes?.value ?? '--';
     });
 
+    // Add flattened observations
+    const allObs = visit.encounters.reduce((accumulator, encounter) => {
+      return [...accumulator, ...(encounter.obs || [])];
+    }, []);
+
+    activeVisits.observations = allObs.reduce((map, obs) => {
+      const key = obs.concept.uuid;
+      if (!map[key]) {
+        map[key] = [];
+      }
+      map[key].push({
+        value: obs.value,
+        uuid: obs.uuid,
+      });
+      return map;
+    }, {});
+
     return activeVisits;
   };
 
@@ -142,6 +146,176 @@ export function useActiveVisits() {
   };
 }
 
+export function useObsConcepts(uuids: Array<string>): {
+  obsConcepts: Array<OpenmrsResource> | undefined;
+  isLoadingObsConcepts: boolean;
+} {
+  const fetchConcept = async (uuid: string): Promise<OpenmrsResource | null> => {
+    try {
+      const response = await openmrsFetch(`${restBaseUrl}/concept/${uuid}?v=custom:(uuid,display)`);
+      return response?.data;
+    } catch (error) {
+      console.error(`Error fetching concept for UUID: ${uuid}`, error);
+      return null;
+    }
+  };
+
+  const { data, isLoading, error } = useSWR(uuids.length > 0 ? ['obs-concepts', uuids] : null, async () => {
+    const results = await Promise.all(uuids.map(fetchConcept));
+    return results.filter((concept) => concept !== null);
+  });
+
+  return useMemo(
+    () => ({
+      obsConcepts: data ?? [],
+      isLoadingObsConcepts: isLoading,
+    }),
+    [data, isLoading],
+  );
+}
+
+export function useActiveVisitsSorting(tableRows: Array<any>) {
+  const [sortParams, setSortParams] = useState<{
+    key: string;
+    sortDirection: 'ASC' | 'DESC' | 'NONE';
+  }>({ key: 'visitStartTime', sortDirection: 'DESC' });
+
+  const sortRow = (cellA, cellB, { key, sortDirection }) => {
+    setSortParams({ key, sortDirection });
+  };
+
+  const getSortValue = (item: any, key: string) => {
+    // For observation columns
+    if (key.startsWith('obs-')) {
+      const conceptUuid = key.replace('obs-', '');
+      const obsValue = item?.observations?.[conceptUuid]?.[0]?.value;
+
+      if (!obsValue) return null;
+      if (typeof obsValue === 'object' && obsValue.display) {
+        return obsValue.display.toLowerCase();
+      }
+      return obsValue;
+    }
+
+    const value = item[key];
+    if (value == null) return null;
+
+    if (key === 'visitStartTime') {
+      return new Date(value).getTime();
+    }
+
+    if (key === 'age' && !isNaN(value)) {
+      return Number(value);
+    }
+
+    return String(value).toLowerCase();
+  };
+
+  const sortedRows = useMemo(() => {
+    if (sortParams.sortDirection === 'NONE') {
+      return tableRows;
+    }
+
+    return [...tableRows].sort((a, b) => {
+      const valueA = getSortValue(a, sortParams.key);
+      const valueB = getSortValue(b, sortParams.key);
+
+      if (valueA === null && valueB === null) return 0;
+      if (valueA === null) return 1;
+      if (valueB === null) return -1;
+
+      if (typeof valueA === 'number' && typeof valueB === 'number') {
+        return sortParams.sortDirection === 'DESC' ? valueB - valueA : valueA - valueB;
+      }
+
+      const compareResult = String(valueA).localeCompare(String(valueB), undefined, {
+        numeric: true,
+      });
+
+      return sortParams.sortDirection === 'DESC' ? -compareResult : compareResult;
+    });
+  }, [sortParams, tableRows]);
+
+  return {
+    sortedRows,
+    sortRow,
+  };
+}
+
+export function useTableHeaders(obsConcepts: OpenmrsResource[]) {
+  const { t } = useTranslation();
+  const config = useConfig();
+  return useMemo(() => {
+    let headersIndex = 0;
+
+    const headers = [
+      {
+        id: headersIndex++,
+        header: t('visitStartTime', 'Visit Time'),
+        key: 'visitStartTime',
+      },
+    ];
+
+    config?.activeVisits?.identifiers?.forEach((identifier) => {
+      headers.push({
+        id: headersIndex++,
+        header: t(identifier?.header?.key, identifier?.header?.default),
+        key: identifier?.header?.key,
+      });
+    });
+
+    if (!config?.activeVisits?.identifiers) {
+      headers.push({
+        id: headersIndex++,
+        header: t('idNumber', 'ID Number'),
+        key: 'idNumber',
+      });
+    }
+
+    config?.activeVisits?.attributes?.forEach((attribute) => {
+      headers.push({
+        id: headersIndex++,
+        header: t(attribute?.header?.key, attribute?.header?.default),
+        key: attribute?.header?.key,
+      });
+    });
+
+    // Add headers for obs concepts
+    obsConcepts?.forEach((concept) => {
+      headers.push({
+        id: headersIndex++,
+        header: concept.display,
+        key: `obs-${concept.uuid}`,
+      });
+    });
+
+    headers.push(
+      {
+        id: headersIndex++,
+        header: t('name', 'Name'),
+        key: 'name',
+      },
+      {
+        id: headersIndex++,
+        header: t('gender', 'Gender'),
+        key: 'gender',
+      },
+      {
+        id: headersIndex++,
+        header: t('age', 'Age'),
+        key: 'age',
+      },
+      {
+        id: headersIndex++,
+        header: t('visitType', 'Visit Type'),
+        key: 'visitType',
+      },
+    );
+
+    return headers;
+  }, [t, config, obsConcepts]);
+}
+
 export const getOriginFromPathName = (pathname = '') => {
   const from = pathname.split('/');
   return last(from);
diff --git a/packages/esm-active-visits-app/src/active-visits-widget/active-visits.scss b/packages/esm-active-visits-app/src/active-visits-widget/active-visits.scss
index 99752b452..92ee6dc8a 100644
--- a/packages/esm-active-visits-app/src/active-visits-widget/active-visits.scss
+++ b/packages/esm-active-visits-app/src/active-visits-widget/active-visits.scss
@@ -24,6 +24,14 @@
 }
 
 .activeVisitsTable {
+  width: 100%;
+
+  th,
+  td {
+    white-space: nowrap;
+    text-align: left;
+  }
+
   tbody tr[data-parent-row] {
     // Don't show a bottom border on the last row so we don't end up with a double border from the activeVisitContainer
     &:nth-last-of-type(2) > td {
@@ -154,12 +162,14 @@ html[dir='rtl'] {
     .activeVisitsDetailHeaderContainer {
       padding: layout.$spacing-04 layout.$spacing-05 layout.$spacing-04 0;
     }
+
     .desktopHeading,
     .tabletHeading {
       h4 {
         text-align: right;
       }
     }
+
     div[role='search'] {
       & :first-child {
         svg {
@@ -167,21 +177,29 @@ html[dir='rtl'] {
           right: layout.$spacing-03;
         }
       }
+
       & :last-child {
         right: unset;
         left: 0;
       }
     }
+
     .tableContainer {
+      overflow-x: auto;
+      text-wrap: nowrap;
+
       th > div {
         text-align: right;
       }
+
       td {
         text-align: right;
+
         .serviceColor {
           margin-right: 0;
           margin-left: layout.$spacing-03;
         }
+
         button {
           text-align: right;
         }
diff --git a/packages/esm-active-visits-app/src/active-visits-widget/active-visits.test.tsx b/packages/esm-active-visits-app/src/active-visits-widget/active-visits.test.tsx
index 2b5b5fbfd..38977c3bf 100644
--- a/packages/esm-active-visits-app/src/active-visits-widget/active-visits.test.tsx
+++ b/packages/esm-active-visits-app/src/active-visits-widget/active-visits.test.tsx
@@ -1,41 +1,72 @@
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { render, screen } from '@testing-library/react';
-import { getDefaultsFromConfigSchema, useConfig } from '@openmrs/esm-framework';
-import { mockPatient, mockSession } from '__mocks__';
-import { configSchema, type SectionDefinition } from '../config-schema';
-import { useActiveVisits } from './active-visits.resource';
+import { getDefaultsFromConfigSchema, type OpenmrsResource, useConfig } from '@openmrs/esm-framework';
+import { mockSession } from '__mocks__';
+import { type ActiveVisitsConfigSchema, configSchema } from '../config-schema';
+import { useActiveVisits, useObsConcepts } from './active-visits.resource';
 import ActiveVisitsTable from './active-visits.component';
+import { type ActiveVisit, type Observation } from '../types';
 
 const mockUseActiveVisits = jest.mocked(useActiveVisits);
-const mockUseConfig = jest.mocked(useConfig<SectionDefinition>);
+const mockUseObsConcepts = jest.mocked(useObsConcepts);
+const mockIsDesktop = jest.mocked(useObsConcepts);
+const mockUseConfig = jest.mocked(useConfig<ActiveVisitsConfigSchema>);
 
 jest.mock('./active-visits.resource', () => ({
   ...jest.requireActual('./active-visits.resource'),
   useActiveVisits: jest.fn(),
+  useObsConcepts: jest.fn(),
 }));
 
+const mockObsConcepts: Array<OpenmrsResource> = [
+  { uuid: '160225AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', display: 'Sickle cell screening test' },
+  { uuid: '5484AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', display: 'Nutritional support' },
+];
+
+const mockConfig: ActiveVisitsConfigSchema = {
+  activeVisits: {
+    ...getDefaultsFromConfigSchema(configSchema).activeVisits,
+    obs: ['160225AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', '5484AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'],
+  },
+};
+
+const mockActiveVisits: ActiveVisit[] = [
+  {
+    age: '20',
+    gender: 'male',
+    id: '1',
+    idNumber: '000001A',
+    location: mockSession.data.sessionLocation.uuid,
+    name: 'John Doe',
+    patientUuid: 'uuid1',
+    visitStartTime: '',
+    visitType: 'Checkup',
+    visitUuid: 'visit-uuid-1',
+  },
+  {
+    age: '25',
+    gender: 'female',
+    id: '2',
+    idNumber: '000001B',
+    location: mockSession.data.sessionLocation.uuid,
+    name: 'Some One',
+    patientUuid: 'uuid2',
+    visitStartTime: '',
+    visitType: 'Checkup',
+    visitUuid: 'visit-uuid-2',
+  },
+];
+
 describe('ActiveVisitsTable', () => {
   beforeEach(() => {
-    mockUseConfig.mockReturnValue({
-      ...getDefaultsFromConfigSchema(configSchema),
+    mockUseConfig.mockReturnValue(mockConfig);
+    mockUseObsConcepts.mockReturnValue({
+      obsConcepts: mockObsConcepts,
+      isLoadingObsConcepts: false,
     });
-
     mockUseActiveVisits.mockReturnValue({
-      activeVisits: [
-        {
-          age: '20',
-          gender: 'male',
-          id: '1',
-          idNumber: mockPatient.uuid,
-          location: mockSession.data.sessionLocation.uuid,
-          name: 'John Doe',
-          patientUuid: 'uuid1',
-          visitStartTime: '',
-          visitType: 'Checkup',
-          visitUuid: 'visit-uuid-1',
-        },
-      ],
+      activeVisits: mockActiveVisits,
       isLoading: false,
       isValidating: false,
       error: undefined,
@@ -43,51 +74,82 @@ describe('ActiveVisitsTable', () => {
     });
   });
 
-  it('renders data table with active visits', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders data table with standard and observation columns', () => {
+    mockUseActiveVisits.mockReturnValue({
+      activeVisits: mockActiveVisits.map((visit) => ({
+        ...visit,
+        observations: {
+          '160225AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA': [
+            {
+              value: { uuid: '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', display: 'Patient is sick' },
+              uuid: 'obs-uuid-1',
+            } as unknown as Observation,
+          ],
+          '5484AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA': [
+            {
+              value: 'Not done',
+              uuid: 'obs-uuid-2',
+            } as unknown as Observation,
+          ],
+        },
+      })),
+      isLoading: false,
+      isValidating: false,
+      error: undefined,
+      totalResults: 0,
+    });
+
     render(<ActiveVisitsTable />);
 
-    expect(screen.getByText('Visit Time')).toBeInTheDocument();
-    expect(screen.getByText('ID Number')).toBeInTheDocument();
-    const expectedColumnHeaders = [/Visit Time/, /ID Number/, /Name/, /Gender/, /Age/, /Visit Type/];
-    expectedColumnHeaders.forEach((header) => {
-      expect(screen.getByRole('columnheader', { name: new RegExp(header, 'i') })).toBeInTheDocument();
+    const standardColumnHeaders = [/Visit Time/, /ID Number/, /Name/, /Gender/, /Age/, /Visit Type/];
+    standardColumnHeaders.forEach((header) => {
+      expect(screen.getByRole('columnheader', { name: header })).toBeInTheDocument();
     });
 
-    const patientNameLink = screen.getByText('John Doe');
-    expect(patientNameLink).toBeInTheDocument();
-    expect(patientNameLink.tagName).toBe('A');
+    expect(screen.getByRole('columnheader', { name: /Sickle cell screening test/ })).toBeInTheDocument();
+    expect(screen.getByRole('columnheader', { name: /Nutritional support/ })).toBeInTheDocument();
+  });
+
+  it('displays observation values correctly', () => {
+    mockUseActiveVisits.mockReturnValue({
+      activeVisits: mockActiveVisits.map((visit) => ({
+        ...visit,
+        observations: {
+          '160225AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA': [
+            {
+              value: { uuid: '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', display: 'Patient is sick' },
+              uuid: 'obs-uuid-1',
+            } as unknown as Observation,
+          ],
+          '5484AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA': [
+            {
+              value: 'Not done',
+              uuid: 'obs-uuid-2',
+            } as unknown as Observation,
+          ],
+        },
+      })),
+      isLoading: false,
+      isValidating: false,
+      error: undefined,
+      totalResults: 0,
+    });
+
+    render(<ActiveVisitsTable />);
+
+    expect(screen.getAllByRole('cell', { name: /Patient is sick/ }).length).toBe(2);
+    expect(screen.getAllByRole('cell', { name: /Not done/ }).length).toBe(2);
   });
 
   it('filters active visits based on search input', async () => {
     const user = userEvent.setup();
 
     mockUseActiveVisits.mockReturnValue({
-      activeVisits: [
-        {
-          age: '20',
-          gender: 'male',
-          id: '1',
-          idNumber: '000001A',
-          location: mockSession.data.sessionLocation.uuid,
-          name: 'John Doe',
-          patientUuid: 'uuid1',
-          visitStartTime: '',
-          visitType: 'Checkup',
-          visitUuid: 'visit-uuid-1',
-        },
-        {
-          age: '25',
-          gender: 'female',
-          id: '2',
-          idNumber: '000001B',
-          location: mockSession.data.sessionLocation.uuid,
-          name: 'Some One',
-          patientUuid: 'uuid2',
-          visitStartTime: '',
-          visitType: 'Checkup',
-          visitUuid: 'visit-uuid-2',
-        },
-      ],
+      activeVisits: mockActiveVisits,
       isLoading: false,
       isValidating: false,
       error: undefined,
@@ -151,32 +213,7 @@ describe('ActiveVisitsTable', () => {
 
   it('should display the pagination when pagination is true', () => {
     mockUseActiveVisits.mockReturnValue({
-      activeVisits: [
-        {
-          age: '20',
-          gender: 'male',
-          id: '1',
-          idNumber: '000001A',
-          location: mockSession.data.sessionLocation.uuid,
-          name: 'John Doe',
-          patientUuid: 'uuid1',
-          visitStartTime: '',
-          visitType: 'Checkup',
-          visitUuid: 'visit-uuid-1',
-        },
-        {
-          age: '25',
-          gender: 'female',
-          id: '2',
-          idNumber: '000001B',
-          location: mockSession.data.sessionLocation.uuid,
-          name: 'Some One',
-          patientUuid: 'uuid2',
-          visitStartTime: '',
-          visitType: 'Checkup',
-          visitUuid: 'visit-uuid-2',
-        },
-      ],
+      activeVisits: mockActiveVisits,
       isLoading: false,
       isValidating: false,
       error: undefined,
diff --git a/packages/esm-active-visits-app/src/config-schema.ts b/packages/esm-active-visits-app/src/config-schema.ts
index fedc9d50e..9f144e10f 100644
--- a/packages/esm-active-visits-app/src/config-schema.ts
+++ b/packages/esm-active-visits-app/src/config-schema.ts
@@ -1,10 +1,11 @@
 import { Type } from '@openmrs/esm-framework';
 
-export interface SectionDefinition {
+export interface ActiveVisitsConfigSchema {
   activeVisits: {
     pageSize: Number;
     pageSizes: Array<Number>;
     identifiers: Array<IdentifiersDefinition>;
+    obs: Array<string>;
   };
 }
 
@@ -53,5 +54,14 @@ export const configSchema = {
       _description: 'Customizable page sizes that user can choose',
       _default: [10, 20, 50],
     },
+    obs: {
+      _type: Type.Array,
+      _description: 'Array of observation concept UUIDs to be displayed on the active visits table.',
+      _elements: {
+        _type: Type.UUID,
+        _description: 'UUID of an observation concept.',
+      },
+      _default: [],
+    },
   },
 };
diff --git a/packages/esm-active-visits-app/src/types/index.ts b/packages/esm-active-visits-app/src/types/index.ts
index 6910c23eb..55fce7015 100644
--- a/packages/esm-active-visits-app/src/types/index.ts
+++ b/packages/esm-active-visits-app/src/types/index.ts
@@ -1,4 +1,4 @@
-import { type OpenmrsResource } from '@openmrs/esm-framework';
+import { type OpenmrsResource, type Visit } from '@openmrs/esm-framework';
 
 export interface SearchedPatient {
   patientId: number;
@@ -28,3 +28,158 @@ export interface Identifier {
   preferred: boolean;
   voided: boolean;
 }
+
+export interface Encounter {
+  uuid: string;
+  encounterDateTime: string;
+  encounterProviders: Array<{
+    uuid: string;
+    display: string;
+    encounterRole: {
+      uuid: string;
+      display: string;
+    };
+    provider: {
+      uuid: string;
+      person: {
+        uuid: string;
+        display: string;
+      };
+    };
+  }>;
+  encounterType: {
+    uuid: string;
+    display: string;
+  };
+  obs: Array<Observation>;
+  orders: Array<Order>;
+}
+
+export interface EncounterProvider {
+  uuid: string;
+  display: string;
+  encounterRole: {
+    uuid: string;
+    display: string;
+  };
+  provider: {
+    uuid: string;
+    person: {
+      uuid: string;
+      display: string;
+    };
+  };
+}
+
+export interface Observation {
+  uuid: string;
+  concept: {
+    uuid: string;
+    display: string;
+    conceptClass: {
+      uuid: string;
+      display: string;
+    };
+  };
+  display: string;
+  groupMembers: null | Array<{
+    uuid: string;
+    concept: {
+      uuid: string;
+      display: string;
+    };
+    value: {
+      uuid: string;
+      display: string;
+    };
+  }>;
+  value: any;
+  obsDatetime: string;
+}
+
+export interface Order {
+  uuid: string;
+  dateActivated: string;
+  dateStopped?: Date | null;
+  dose: number;
+  dosingInstructions: string | null;
+  dosingType?: 'org.openmrs.FreeTextDosingInstructions' | 'org.openmrs.SimpleDosingInstructions';
+  doseUnits: {
+    uuid: string;
+    display: string;
+  };
+  drug: {
+    uuid: string;
+    name: string;
+    strength: string;
+    display: string;
+  };
+  duration: number;
+  durationUnits: {
+    uuid: string;
+    display: string;
+  };
+  frequency: {
+    uuid: string;
+    display: string;
+  };
+  numRefills: number;
+  orderNumber: string;
+  orderReason: string | null;
+  orderReasonNonCoded: string | null;
+  orderer: {
+    uuid: string;
+    person: {
+      uuid: string;
+      display: string;
+    };
+  };
+  orderType: {
+    uuid: string;
+    display: string;
+  };
+  route: {
+    uuid: string;
+    display: string;
+  };
+  quantity: number;
+  quantityUnits: OpenmrsResource;
+}
+
+export interface Note {
+  note: string;
+  provider: {
+    name: string;
+    role: string;
+  };
+  time: string;
+}
+
+export interface OrderItem {
+  order: Order;
+  provider: {
+    name: string;
+    role: string;
+  };
+}
+
+export interface ActiveVisit {
+  age: string;
+  id: string;
+  idNumber: string;
+  gender: string;
+  location: string;
+  name: string;
+  patientUuid: string;
+  visitStartTime: string;
+  visitType: string;
+  visitUuid: string;
+  observations?: Record<string, Observation[]>;
+  [identifier: string]: string | Record<string, Observation[]>;
+}
+
+export interface VisitResponse {
+  results: Array<Visit>;
+  links: Array<{ rel: 'prev' | 'next' }>;
+  totalCount: number;
+}
diff --git a/packages/esm-active-visits-app/src/visits-summary/visit-detail.component.tsx b/packages/esm-active-visits-app/src/visits-summary/visit-detail.component.tsx
index 427045e32..27c7f228f 100644
--- a/packages/esm-active-visits-app/src/visits-summary/visit-detail.component.tsx
+++ b/packages/esm-active-visits-app/src/visits-summary/visit-detail.component.tsx
@@ -2,8 +2,9 @@ import React, { useMemo, useState } from 'react';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 import { ContentSwitcher, DataTableSkeleton, Switch } from '@carbon/react';
-import { type Encounter, useVisit } from './visit.resource';
-import { formatTime, formatDatetime, parseDate } from '@openmrs/esm-framework';
+import { useVisit } from './visit.resource';
+import { type Encounter } from '../types';
+import { formatDatetime, formatTime, parseDate } from '@openmrs/esm-framework';
 import EncounterList from './visits-components/encounter-list.component';
 import VisitSummary from './visits-components/visit-summary.component';
 import styles from './visit-detail-overview.scss';
diff --git a/packages/esm-active-visits-app/src/visits-summary/visit-detail.test.tsx b/packages/esm-active-visits-app/src/visits-summary/visit-detail.test.tsx
index 0b5b32439..3103efbdf 100644
--- a/packages/esm-active-visits-app/src/visits-summary/visit-detail.test.tsx
+++ b/packages/esm-active-visits-app/src/visits-summary/visit-detail.test.tsx
@@ -1,21 +1,23 @@
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { render, screen } from '@testing-library/react';
-import { formatDate } from '@openmrs/esm-framework';
 import { useVisit } from './visit.resource';
 import VisitDetailComponent from './visit-detail.component';
 
+const mockUseVisit = jest.mocked(useVisit);
 const defaultProps = {
   patientUuid: '691eed12-c0f1-11e2-94be-8c13b969e334',
   visitUuid: '497b8b17-54ec-4726-87ec-3c4da8cdcaeb',
 };
-const mockUseVisit = jest.mocked(useVisit);
 
-jest.mock('./visit.resource');
+jest.mock('./visit.resource', () => ({
+  ...jest.requireActual('./visit.resource'),
+  useVisit: jest.fn(),
+}));
 
 describe('VisitDetail', () => {
   it('renders a loading spinner when data is loading', () => {
-    mockUseVisit.mockReturnValueOnce({
+    mockUseVisit.mockReturnValue({
       visit: null,
       error: undefined,
       isLoading: true,
@@ -29,7 +31,8 @@ describe('VisitDetail', () => {
 
   it('renders a visit detail overview when data is available', () => {
     const mockVisitDate = new Date();
-    mockUseVisit.mockReturnValueOnce({
+
+    mockUseVisit.mockReturnValue({
       visit: {
         encounters: [],
         startDatetime: mockVisitDate.toISOString(),
@@ -43,13 +46,14 @@ describe('VisitDetail', () => {
 
     render(<VisitDetailComponent {...defaultProps} />);
 
-    expect(screen.getByText(/Some Visit Type/)).toBeInTheDocument();
-    expect(screen.getByText(formatDate(mockVisitDate), { collapseWhitespace: false })).toBeInTheDocument();
-    expect(screen.getByText('All Encounters')).toBeInTheDocument();
-    expect(screen.getByText('Visit Summary')).toBeInTheDocument();
+    expect(screen.getByRole('heading', { name: /some visit type/i })).toBeInTheDocument();
+    expect(screen.getByRole('heading', { name: /no encounters found/i })).toBeInTheDocument();
+    expect(screen.getByText(/there is no information to display here/i)).toBeInTheDocument();
+    expect(screen.getByRole('tab', { name: /all encounters/i })).toBeInTheDocument();
+    expect(screen.getByRole('tab', { name: /visit summary/i })).toBeInTheDocument();
   });
 
-  it('render the Encounter Lists view when the "All Encounters" tab is clicked', async () => {
+  it('renders the Encounter Lists view when the "All Encounters" tab is clicked', async () => {
     const user = userEvent.setup();
 
     mockUseVisit.mockReturnValue({
@@ -74,8 +78,12 @@ describe('VisitDetail', () => {
 
     render(<VisitDetailComponent {...defaultProps} />);
 
-    await user.click(screen.getByText('All Encounters'));
-    expect(screen.getByTestId('encountersTable')).toBeInTheDocument();
+    await user.click(screen.getByRole('tab', { name: /all encounters/i }));
+    expect(screen.getByRole('table')).toBeInTheDocument();
+    expect(screen.getByRole('columnheader', { name: /time/i })).toBeInTheDocument();
+    expect(screen.getByRole('columnheader', { name: /encounter type/i })).toBeInTheDocument();
+    expect(screen.getByRole('columnheader', { name: /provider/i })).toBeInTheDocument();
+    expect(screen.getByRole('row', { name: /12:34 pm encounter type/i })).toBeInTheDocument();
   });
 
   it('renders the Visit Summaries view when the "Visit Summary" tab is clicked', async () => {
@@ -112,7 +120,12 @@ describe('VisitDetail', () => {
 
     render(<VisitDetailComponent {...defaultProps} />);
 
-    await user.click(screen.getByText('Visit Summary'));
-    expect(screen.getByRole('tablist', { name: 'Visit summary tabs' })).toBeInTheDocument();
+    await user.click(screen.getByRole('tab', { name: /visit summary/i }));
+    expect(screen.getByRole('tablist', { name: /visit summary tabs/i })).toBeInTheDocument();
+    expect(screen.getByRole('tab', { name: /notes/i })).toBeInTheDocument();
+    expect(screen.getByRole('tab', { name: /tests/i })).toBeInTheDocument();
+    expect(screen.getByRole('tab', { name: /medications/i })).toBeInTheDocument();
+    expect(screen.getByText(/no diagnoses found/i)).toBeInTheDocument();
+    expect(screen.getByText(/there are no notes to display for this patient/i)).toBeInTheDocument();
   });
 });
diff --git a/packages/esm-active-visits-app/src/visits-summary/visit.resource.ts b/packages/esm-active-visits-app/src/visits-summary/visit.resource.ts
index 74c76caac..ff98833ea 100644
--- a/packages/esm-active-visits-app/src/visits-summary/visit.resource.ts
+++ b/packages/esm-active-visits-app/src/visits-summary/visit.resource.ts
@@ -1,139 +1,5 @@
 import useSWR from 'swr';
-import { openmrsFetch, restBaseUrl, type OpenmrsResource, type Visit } from '@openmrs/esm-framework';
-
-export interface Encounter {
-  uuid: string;
-  encounterDateTime: string;
-  encounterProviders: Array<{
-    uuid: string;
-    display: string;
-    encounterRole: {
-      uuid: string;
-      display: string;
-    };
-    provider: {
-      uuid: string;
-      person: {
-        uuid: string;
-        display: string;
-      };
-    };
-  }>;
-  encounterType: {
-    uuid: string;
-    display: string;
-  };
-  obs: Array<Observation>;
-  orders: Array<Order>;
-}
-
-export interface EncounterProvider {
-  uuid: string;
-  display: string;
-  encounterRole: {
-    uuid: string;
-    display: string;
-  };
-  provider: {
-    uuid: string;
-    person: {
-      uuid: string;
-      display: string;
-    };
-  };
-}
-
-export interface Observation {
-  uuid: string;
-  concept: {
-    uuid: string;
-    display: string;
-    conceptClass: {
-      uuid: string;
-      display: string;
-    };
-  };
-  display: string;
-  groupMembers: null | Array<{
-    uuid: string;
-    concept: {
-      uuid: string;
-      display: string;
-    };
-    value: {
-      uuid: string;
-      display: string;
-    };
-  }>;
-  value: any;
-  obsDatetime: string;
-}
-
-export interface Order {
-  uuid: string;
-  dateActivated: string;
-  dateStopped?: Date | null;
-  dose: number;
-  dosingInstructions: string | null;
-  dosingType?: 'org.openmrs.FreeTextDosingInstructions' | 'org.openmrs.SimpleDosingInstructions';
-  doseUnits: {
-    uuid: string;
-    display: string;
-  };
-  drug: {
-    uuid: string;
-    name: string;
-    strength: string;
-    display: string;
-  };
-  duration: number;
-  durationUnits: {
-    uuid: string;
-    display: string;
-  };
-  frequency: {
-    uuid: string;
-    display: string;
-  };
-  numRefills: number;
-  orderNumber: string;
-  orderReason: string | null;
-  orderReasonNonCoded: string | null;
-  orderer: {
-    uuid: string;
-    person: {
-      uuid: string;
-      display: string;
-    };
-  };
-  orderType: {
-    uuid: string;
-    display: string;
-  };
-  route: {
-    uuid: string;
-    display: string;
-  };
-  quantity: number;
-  quantityUnits: OpenmrsResource;
-}
-
-export interface Note {
-  note: string;
-  provider: {
-    name: string;
-    role: string;
-  };
-  time: string;
-}
-
-export interface OrderItem {
-  order: Order;
-  provider: {
-    name: string;
-    role: string;
-  };
-}
+import { openmrsFetch, restBaseUrl, type Visit } from '@openmrs/esm-framework';
 
 export function useVisit(visitUuid: string) {
   const customRepresentation =
diff --git a/packages/esm-active-visits-app/src/visits-summary/visits-components/encounter-list.component.tsx b/packages/esm-active-visits-app/src/visits-summary/visits-components/encounter-list.component.tsx
index 4d2b42a88..7479eb66f 100644
--- a/packages/esm-active-visits-app/src/visits-summary/visits-components/encounter-list.component.tsx
+++ b/packages/esm-active-visits-app/src/visits-summary/visits-components/encounter-list.component.tsx
@@ -1,21 +1,21 @@
-import React, { useEffect, useState, useMemo, useRef } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 import {
   DataTable,
-  TableContainer,
   Table,
-  TableHead,
-  TableExpandHeader,
-  TableRow,
-  TableHeader,
   TableBody,
-  TableExpandRow,
   TableCell,
+  TableContainer,
   TableExpandedRow,
+  TableExpandHeader,
+  TableExpandRow,
+  TableHead,
+  TableHeader,
+  TableRow,
 } from '@carbon/react';
-import { useLayoutType, isDesktop } from '@openmrs/esm-framework';
-import { type Observation } from '../visit.resource';
+import { isDesktop, useLayoutType } from '@openmrs/esm-framework';
+import { type Observation } from '../../types';
 import EncounterObservations from './encounter-observations.component';
 import styles from '../visit-detail-overview.scss';
 
diff --git a/packages/esm-active-visits-app/src/visits-summary/visits-components/encounter-observations.component.tsx b/packages/esm-active-visits-app/src/visits-summary/visits-components/encounter-observations.component.tsx
index 747951188..efe158eac 100644
--- a/packages/esm-active-visits-app/src/visits-summary/visits-components/encounter-observations.component.tsx
+++ b/packages/esm-active-visits-app/src/visits-summary/visits-components/encounter-observations.component.tsx
@@ -2,7 +2,7 @@ import React, { useMemo } from 'react';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 import { SkeletonText } from '@carbon/react';
-import { type Observation } from '../visit.resource';
+import { type Observation } from '../../types';
 import styles from '../visit-detail-overview.scss';
 
 interface EncounterObservationsProps {
diff --git a/packages/esm-active-visits-app/src/visits-summary/visits-components/encounter-observations.test.tsx b/packages/esm-active-visits-app/src/visits-summary/visits-components/encounter-observations.test.tsx
index ff58eb842..4cd4a913e 100644
--- a/packages/esm-active-visits-app/src/visits-summary/visits-components/encounter-observations.test.tsx
+++ b/packages/esm-active-visits-app/src/visits-summary/visits-components/encounter-observations.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import { type Observation } from '../visit.resource';
+import { type Observation } from '../../types';
 import EncounterObservations from './encounter-observations.component';
 
 describe('EncounterObservations', () => {
diff --git a/packages/esm-active-visits-app/src/visits-summary/visits-components/medications-summary.component.tsx b/packages/esm-active-visits-app/src/visits-summary/visits-components/medications-summary.component.tsx
index 56c253396..7f96ed284 100644
--- a/packages/esm-active-visits-app/src/visits-summary/visits-components/medications-summary.component.tsx
+++ b/packages/esm-active-visits-app/src/visits-summary/visits-components/medications-summary.component.tsx
@@ -3,7 +3,7 @@ import classNames from 'classnames';
 import capitalize from 'lodash-es/capitalize';
 import { useTranslation } from 'react-i18next';
 import { formatDate, formatTime, parseDate } from '@openmrs/esm-framework';
-import { type OrderItem, getDosage } from '../visit.resource';
+import { type OrderItem } from '../../types';
 import styles from '../visit-detail-overview.scss';
 
 interface MedicationSummaryProps {
diff --git a/packages/esm-active-visits-app/src/visits-summary/visits-components/notes-summary.component.tsx b/packages/esm-active-visits-app/src/visits-summary/visits-components/notes-summary.component.tsx
index a0b0b3796..2543bbb5d 100644
--- a/packages/esm-active-visits-app/src/visits-summary/visits-components/notes-summary.component.tsx
+++ b/packages/esm-active-visits-app/src/visits-summary/visits-components/notes-summary.component.tsx
@@ -3,7 +3,7 @@ import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 import { Layer, Tile } from '@carbon/react';
 import { isDesktop, useLayoutType } from '@openmrs/esm-framework';
-import type { Note } from '../visit.resource';
+import type { Note } from '../../types';
 import { EmptyDataIllustration } from '../../active-visits-widget/empty-data-illustration.component';
 import styles from '../visit-detail-overview.scss';
 
diff --git a/packages/esm-active-visits-app/src/visits-summary/visits-components/tests-summary.component.tsx b/packages/esm-active-visits-app/src/visits-summary/visits-components/tests-summary.component.tsx
index 43434cf3c..70779f655 100644
--- a/packages/esm-active-visits-app/src/visits-summary/visits-components/tests-summary.component.tsx
+++ b/packages/esm-active-visits-app/src/visits-summary/visits-components/tests-summary.component.tsx
@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 import { ExtensionSlot } from '@openmrs/esm-framework';
-import { type Encounter } from '../visit.resource';
+import { type Encounter } from '../../types';
 import styles from '../visit-detail-overview.scss';
 
 const TestsSummary = ({ patientUuid, encounters }: { patientUuid: string; encounters: Array<Encounter> }) => {
diff --git a/packages/esm-active-visits-app/src/visits-summary/visits-components/visit-summary.component.tsx b/packages/esm-active-visits-app/src/visits-summary/visits-components/visit-summary.component.tsx
index 0cb59b83c..c5cc7854f 100644
--- a/packages/esm-active-visits-app/src/visits-summary/visits-components/visit-summary.component.tsx
+++ b/packages/esm-active-visits-app/src/visits-summary/visits-components/visit-summary.component.tsx
@@ -1,12 +1,12 @@
-import React, { useState, useMemo } from 'react';
+import React, { useMemo, useState } from 'react';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
-import { Tab, Tabs, TabList, TabPanel, TabPanels, Tag } from '@carbon/react';
-import { type OpenmrsResource, formatTime, parseDate } from '@openmrs/esm-framework';
+import { Tab, TabList, TabPanel, TabPanels, Tabs, Tag } from '@carbon/react';
+import { formatTime, type OpenmrsResource, parseDate } from '@openmrs/esm-framework';
 import NotesSummary from './notes-summary.component';
 import MedicationSummary from './medications-summary.component';
 import TestsSummary from './tests-summary.component';
-import { type Order, type Encounter, type Note, type Observation, type OrderItem } from '../visit.resource';
+import type { Encounter, Note, Observation, Order, OrderItem } from '../../types';
 import styles from '../visit-detail-overview.scss';
 
 interface DiagnosisItem {
diff --git a/packages/esm-active-visits-app/translations/es.json b/packages/esm-active-visits-app/translations/es.json
index 08ec3ff89..616651dc5 100644
--- a/packages/esm-active-visits-app/translations/es.json
+++ b/packages/esm-active-visits-app/translations/es.json
@@ -1,5 +1,5 @@
 {
-  "activeVisits": "Visitas Activas",
+  "activeVisits": "Consultas Activas",
   "age": "Edad",
   "allEncounters": "Todos Los Encuentros",
   "checkFilters": "Compruebe los filtros anteriores",
@@ -9,29 +9,29 @@
   "endDate": "Fecha de finalización",
   "filterTable": "Filtrar la tabla",
   "gender": "Género",
-  "idNumber": "Número ID",
+  "idNumber": "Número de ID",
   "indication": "Indicación",
-  "medications": "Medicaciones",
+  "medications": "Medicamentos",
   "name": "Nombre",
-  "noActiveVisitsForLocation": "No hay visitas activas para esta ubicación.",
+  "noActiveVisitsForLocation": "No hay visitas activas para mostrar para esta ubicación.",
   "noDiagnosesFound": "No se encontraron diagnósticos",
   "noEncountersFound": "No se encontraron encuentros",
   "noMedicationsFound": "No se encontraron medicamentos",
   "noNotesToShowForPatient": "No hay notas para mostrar para este paciente",
   "noObservationsFound": "No se encontraron observaciones",
   "notes": "Notas",
-  "noVisitsToDisplay": "No hay visitas para mostrar",
+  "noVisitsToDisplay": "No hay consultas para mostrar",
   "orderDurationAndUnit": "por {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Duración indefinida",
   "patients": "Pacientes",
-  "provider": "Proveedor",
+  "provider": "Personal de la Salud",
   "quantity": "Cantidad",
-  "refills": "Reposiciones",
+  "refills": "Reabastecimientos",
   "tests": "Pruebas",
   "thereIsNoInformationToDisplayHere": "No hay información para mostrar aquí",
   "time": "Hora",
-  "totalVisits": "Total de Visitas Hoy",
-  "visitStartTime": "Tiempo de Visita",
-  "visitSummary": "Resumen de Visita",
-  "visitType": "Tipo de Visita"
+  "totalVisits": "Total de Consultas Hoy",
+  "visitStartTime": "Tiempo de la Consulta",
+  "visitSummary": "Resumen de la Consulta",
+  "visitType": "Tipo de Consulta"
 }
diff --git a/packages/esm-active-visits-app/translations/ne.json b/packages/esm-active-visits-app/translations/ne.json
new file mode 100644
index 000000000..2016fc430
--- /dev/null
+++ b/packages/esm-active-visits-app/translations/ne.json
@@ -0,0 +1,37 @@
+{
+  "activeVisits": "Active Visits",
+  "age": "Age",
+  "allEncounters": "All Encounters",
+  "checkFilters": "Check the filters above",
+  "diagnoses": "Diagnoses",
+  "dose": "Dose",
+  "encounterType": "Encounter Type",
+  "endDate": "End date",
+  "filterTable": "Filter table",
+  "gender": "Gender",
+  "idNumber": "ID Number",
+  "indication": "Indication",
+  "medications": "Medications",
+  "name": "Name",
+  "noActiveVisitsForLocation": "There are no active visits to display for this location.",
+  "noDiagnosesFound": "No diagnoses found",
+  "noEncountersFound": "No encounters found",
+  "noMedicationsFound": "No medications found",
+  "noNotesToShowForPatient": "There are no notes to display for this patient",
+  "noObservationsFound": "No observations found",
+  "notes": "Notes",
+  "noVisitsToDisplay": "No visits to display",
+  "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "orderIndefiniteDuration": "Indefinite duration",
+  "patients": "Patients",
+  "provider": "Provider",
+  "quantity": "Quantity",
+  "refills": "Refills",
+  "tests": "Tests",
+  "thereIsNoInformationToDisplayHere": "There is no information to display here",
+  "time": "Time",
+  "totalVisits": "Total Visits Today",
+  "visitStartTime": "Visit Time",
+  "visitSummary": "Visit Summary",
+  "visitType": "Visit Type"
+}
diff --git a/packages/esm-active-visits-app/translations/pt.json b/packages/esm-active-visits-app/translations/pt.json
index 8e0c99edc..d717f9bf7 100644
--- a/packages/esm-active-visits-app/translations/pt.json
+++ b/packages/esm-active-visits-app/translations/pt.json
@@ -1,34 +1,34 @@
 {
   "activeVisits": "Visitas Ativas",
   "age": "Idade",
-  "allEncounters": "Todas Consultas",
+  "allEncounters": "Todas as consultas",
   "checkFilters": "Verifique os filtros acima",
   "diagnoses": "Diagnósticos",
   "dose": "Dose",
   "encounterType": "Tipo de Consulta",
   "endDate": "Data Final",
-  "filterTable": "Tabela de filtro",
+  "filterTable": "Filtrar tabela",
   "gender": "Sexo",
   "idNumber": "Número de Identificação",
   "indication": "Indicação",
   "medications": "Medicamentos",
   "name": "Nome",
-  "noActiveVisitsForLocation": "Não há visitas ativas por visualizar para este local.",
+  "noActiveVisitsForLocation": "Não há visitas ativas para visualizar neste local.",
   "noDiagnosesFound": "Nenhum diagnóstico encontrado",
   "noEncountersFound": "Nenhuma consulta encontrada",
   "noMedicationsFound": "Nenhuma medicação encontrada",
-  "noNotesToShowForPatient": "Não há notas por mostrar para este utente",
+  "noNotesToShowForPatient": "Não há notas para esse paciente",
   "noObservationsFound": "Nenhuma observação encontrada",
   "notes": "Notas",
   "noVisitsToDisplay": "Nenhuma visita para mostrar",
   "orderDurationAndUnit": "para {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Duração indefinida",
-  "patients": "Utentes",
+  "patients": "Pacientes",
   "provider": "Provedor",
   "quantity": "Quantidade",
-  "refills": "Repor",
+  "refills": "Recargas",
   "tests": "Testes",
-  "thereIsNoInformationToDisplayHere": "Sem informações por mostrar aqui",
+  "thereIsNoInformationToDisplayHere": "Sem informações para mostrar aqui",
   "time": "Tempo",
   "totalVisits": "Total de visitas hoje",
   "visitStartTime": "Hora da Visita",
diff --git a/packages/esm-active-visits-app/translations/zh.json b/packages/esm-active-visits-app/translations/zh.json
index c98732b7c..b876984f6 100644
--- a/packages/esm-active-visits-app/translations/zh.json
+++ b/packages/esm-active-visits-app/translations/zh.json
@@ -9,7 +9,7 @@
   "endDate": "结束日期",
   "filterTable": "筛选表格",
   "gender": "性别",
-  "idNumber": "ID",
+  "idNumber": "ID Number",
   "indication": "适应症",
   "medications": "药物",
   "name": "姓名",
diff --git a/packages/esm-appointments-app/package.json b/packages/esm-appointments-app/package.json
index 2c67163be..c91ba8a0e 100644
--- a/packages/esm-appointments-app/package.json
+++ b/packages/esm-appointments-app/package.json
@@ -37,7 +37,7 @@
     "url": "https://github.com/openmrs/openmrs-esm-patient-management/issues"
   },
   "dependencies": {
-    "@carbon/react": "~1.37.0",
+    "@carbon/react": "^1.71.0",
     "formik": "^2.2.9",
     "lodash-es": "^4.17.15",
     "yup": "^0.32.11"
diff --git a/packages/esm-appointments-app/src/appointments.component.tsx b/packages/esm-appointments-app/src/appointments.component.tsx
index 1ca3ac6c2..b9f8e4868 100644
--- a/packages/esm-appointments-app/src/appointments.component.tsx
+++ b/packages/esm-appointments-app/src/appointments.component.tsx
@@ -1,19 +1,19 @@
 import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 import dayjs from 'dayjs';
+import { useTranslation } from 'react-i18next';
+import { useParams } from 'react-router-dom';
+import { omrsDateFormat } from './constants';
 import AppointmentTabs from './appointments/appointment-tabs.component';
 import AppointmentsHeader from './header/appointments-header.component';
 import AppointmentMetrics from './metrics/appointments-metrics.component';
-import { useParams } from 'react-router-dom';
 import SelectedDateContext from './hooks/selectedDateContext';
-import { omrsDateFormat } from './constants';
 
 const Appointments: React.FC = () => {
   const { t } = useTranslation();
-  const [appointmentServiceType, setAppointmentServiceType] = useState<string>('');
-  const [selectedDate, setSelectedDate] = useState<string>(dayjs().startOf('day').format(omrsDateFormat));
+  const [appointmentServiceType, setAppointmentServiceType] = useState('');
+  const [selectedDate, setSelectedDate] = useState(dayjs().startOf('day').format(omrsDateFormat));
 
-  let params = useParams();
+  const params = useParams();
 
   useEffect(() => {
     if (params.date) {
@@ -30,9 +30,9 @@ const Appointments: React.FC = () => {
   return (
     <SelectedDateContext.Provider value={{ selectedDate, setSelectedDate }}>
       <AppointmentsHeader
-        title={t('appointments', 'Appointments')}
         appointmentServiceType={appointmentServiceType}
         onChange={setAppointmentServiceType}
+        title={t('appointments', 'Appointments')}
       />
       <AppointmentMetrics appointmentServiceType={appointmentServiceType} />
       <AppointmentTabs appointmentServiceType={appointmentServiceType} />
diff --git a/packages/esm-appointments-app/src/appointments.test.tsx b/packages/esm-appointments-app/src/appointments.test.tsx
index 972843323..ce43724c6 100644
--- a/packages/esm-appointments-app/src/appointments.test.tsx
+++ b/packages/esm-appointments-app/src/appointments.test.tsx
@@ -2,14 +2,24 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 import Appointments from './appointments.component';
 
+// TODO: Tweak the ExtensionSlot stub in the framework to not return a function. Functions are not valid React children.
 describe('Appointments', () => {
   it('renders the appointments dashboard', async () => {
     render(<Appointments />);
 
     await screen.findByText(/^appointments$/i);
+
     expect(screen.getByRole('button', { name: /appointments calendar/i })).toBeInTheDocument();
     expect(screen.getByPlaceholderText(/dd-mmm-yyyy/i)).toBeInTheDocument();
-    expect(screen.getByRole('combobox', { name: /view/i })).toBeInTheDocument();
+    expect(
+      screen.getByRole('combobox', {
+        name: /select service type/i,
+      }),
+    ).toBeInTheDocument();
+    expect(screen.getByRole('listbox', { name: /view/i })).toBeInTheDocument();
     expect(screen.getByText(/appointment metrics/i)).toBeInTheDocument();
+    expect(screen.getByText(/scheduled appointments/i)).toBeInTheDocument();
+    expect(screen.getByText(/highest volume service/i)).toBeInTheDocument();
+    expect(screen.getByText(/providers booked/i)).toBeInTheDocument();
   });
 });
diff --git a/packages/esm-appointments-app/src/appointments/appointment-tabs.component.tsx b/packages/esm-appointments-app/src/appointments/appointment-tabs.component.tsx
index a59b453ef..a8f566476 100644
--- a/packages/esm-appointments-app/src/appointments/appointment-tabs.component.tsx
+++ b/packages/esm-appointments-app/src/appointments/appointment-tabs.component.tsx
@@ -13,8 +13,8 @@ interface AppointmentTabsProps {
 
 const AppointmentTabs: React.FC<AppointmentTabsProps> = ({ appointmentServiceType }) => {
   const { t } = useTranslation();
-  const [activeTabIndex, setActiveTabIndex] = useState<number>(0);
   const { showUnscheduledAppointmentsTab } = useConfig<ConfigObject>();
+  const [activeTabIndex, setActiveTabIndex] = useState(0);
 
   const handleTabChange = ({ selectedIndex }: { selectedIndex: number }) => {
     setActiveTabIndex(selectedIndex);
diff --git a/packages/esm-appointments-app/src/appointments/common-components/appointments-table.component.tsx b/packages/esm-appointments-app/src/appointments/common-components/appointments-table.component.tsx
index 1a5e8a6b0..01d8a5ef5 100644
--- a/packages/esm-appointments-app/src/appointments/common-components/appointments-table.component.tsx
+++ b/packages/esm-appointments-app/src/appointments/common-components/appointments-table.component.tsx
@@ -44,7 +44,6 @@ import { type ConfigObject } from '../../config-schema';
 import { getPageSizes, useAppointmentSearchResults } from '../utils';
 import AppointmentActions from './appointments-actions.component';
 import AppointmentDetails from '../details/appointment-details.component';
-import PatientSearch from '../../patient-search/patient-search.component';
 import styles from './appointments-table.scss';
 
 dayjs.extend(utc);
diff --git a/packages/esm-appointments-app/src/appointments/common-components/appointments-table.test.tsx b/packages/esm-appointments-app/src/appointments/common-components/appointments-table.test.tsx
index 65739d604..d0e9c4321 100644
--- a/packages/esm-appointments-app/src/appointments/common-components/appointments-table.test.tsx
+++ b/packages/esm-appointments-app/src/appointments/common-components/appointments-table.test.tsx
@@ -61,11 +61,15 @@ const mockAppointments = [
   },
 ] as unknown as Array<Appointment>;
 
-const mockExportAppointmentsToSpreadsheet = jest.mocked(exportAppointmentsToSpreadsheet);
 const mockUseConfig = jest.mocked(useConfig<ConfigObject>);
+const mockExportAppointmentsToSpreadsheet = jest.mocked(exportAppointmentsToSpreadsheet);
 
-jest.mock('../../helpers/excel');
-jest.mock('../../hooks/useOverlay');
+jest.mock('../../helpers/excel', () => {
+  return {
+    ...jest.requireActual('../../helpers/excel'),
+    exportAppointmentsToSpreadsheet: jest.fn(),
+  };
+});
 
 describe('AppointmentsTable', () => {
   beforeEach(() => {
diff --git a/packages/esm-appointments-app/src/appointments/common-components/checkin-button.component.tsx b/packages/esm-appointments-app/src/appointments/common-components/checkin-button.component.tsx
index 85ac5c605..173428f77 100644
--- a/packages/esm-appointments-app/src/appointments/common-components/checkin-button.component.tsx
+++ b/packages/esm-appointments-app/src/appointments/common-components/checkin-button.component.tsx
@@ -31,7 +31,11 @@ const CheckInButton: React.FC<CheckInButtonProps> = ({ appointment, patientUuid
                     to: checkInButton.customUrl,
                     templateParams: { patientUuid: appointment.patient.uuid, appointmentUuid: appointment.uuid },
                   })
-                : launchWorkspace('start-visit-workspace-form', { patientUuid: patientUuid, showPatientHeader: true })
+                : launchWorkspace('start-visit-workspace-form', {
+                    patientUuid: patientUuid,
+                    showPatientHeader: true,
+                    openedFrom: 'appointments-check-in',
+                  })
             }>
             {t('checkIn', 'Check in')}
           </Button>
diff --git a/packages/esm-appointments-app/src/appointments/common-components/end-appointment.modal.tsx b/packages/esm-appointments-app/src/appointments/common-components/end-appointment.modal.tsx
index 0325a4ab4..25e84d049 100644
--- a/packages/esm-appointments-app/src/appointments/common-components/end-appointment.modal.tsx
+++ b/packages/esm-appointments-app/src/appointments/common-components/end-appointment.modal.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
-import { showSnackbar, updateVisit, useVisit } from '@openmrs/esm-framework';
 import { Button, ModalBody, ModalFooter, ModalHeader } from '@carbon/react';
+import { showSnackbar, updateVisit, useVisit } from '@openmrs/esm-framework';
 import { changeAppointmentStatus } from '../../patient-appointments/patient-appointments.resource';
 import { useMutateAppointments } from '../../form/appointments-form.resource';
 
@@ -68,7 +68,7 @@ const EndAppointmentModal: React.FC<EndAppointmentModalProps> = ({ patientUuid,
       .finally(() => {
         closeModal();
       });
-  }, [activeVisit, mutate, mutateAppointments, closeModal, patientUuid, appointmentUuid]);
+  }, [activeVisit, appointmentUuid, closeModal, mutate, mutateAppointments, t]);
 
   return (
     <div>
diff --git a/packages/esm-appointments-app/src/appointments/scheduled/scheduled-appointments.component.tsx b/packages/esm-appointments-app/src/appointments/scheduled/scheduled-appointments.component.tsx
index 553d1376a..a40795d2c 100644
--- a/packages/esm-appointments-app/src/appointments/scheduled/scheduled-appointments.component.tsx
+++ b/packages/esm-appointments-app/src/appointments/scheduled/scheduled-appointments.component.tsx
@@ -35,7 +35,7 @@ const ScheduledAppointments: React.FC<ScheduledAppointmentsProps> = ({ appointme
   // t('checkedIn', 'Checked in');
   // t('expected', 'Expected');
 
-  const [currentTab, setCurrentTab] = useState<string>(null);
+  const [currentTab, setCurrentTab] = useState(null);
   const [dateType, setDateType] = useState<DateType>('today');
   const scheduledAppointmentPanels = useConnectedExtensions(scheduledAppointmentsPanelsSlot);
   const { allowedExtensions, showExtension, hideExtension } = useAllowedExtensions();
diff --git a/packages/esm-appointments-app/src/appointments/unscheduled/unscheduled-appointments.component.tsx b/packages/esm-appointments-app/src/appointments/unscheduled/unscheduled-appointments.component.tsx
index 718e20465..f126171fd 100644
--- a/packages/esm-appointments-app/src/appointments/unscheduled/unscheduled-appointments.component.tsx
+++ b/packages/esm-appointments-app/src/appointments/unscheduled/unscheduled-appointments.component.tsx
@@ -1,20 +1,20 @@
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
+  Button,
   DataTable,
-  TableContainer,
+  DataTableSkeleton,
+  Pagination,
   Table,
+  TableBody,
+  TableCell,
+  TableContainer,
   TableHead,
   TableHeader,
   TableRow,
-  TableBody,
-  TableCell,
   TableToolbar,
   TableToolbarContent,
   TableToolbarSearch,
-  Pagination,
-  DataTableSkeleton,
-  Button,
 } from '@carbon/react';
 import { Download } from '@carbon/react/icons';
 import { ConfigurableLink, useConfig, usePagination } from '@openmrs/esm-framework';
diff --git a/packages/esm-appointments-app/src/appointments/unscheduled/unscheduled-appointments.test.tsx b/packages/esm-appointments-app/src/appointments/unscheduled/unscheduled-appointments.test.tsx
index bb8e01173..6e5449f23 100644
--- a/packages/esm-appointments-app/src/appointments/unscheduled/unscheduled-appointments.test.tsx
+++ b/packages/esm-appointments-app/src/appointments/unscheduled/unscheduled-appointments.test.tsx
@@ -3,18 +3,28 @@ import userEvent from '@testing-library/user-event';
 import { render, screen } from '@testing-library/react';
 import { getDefaultsFromConfigSchema, useConfig } from '@openmrs/esm-framework';
 import { type ConfigObject, configSchema } from '../../config-schema';
+import { exportUnscheduledAppointmentsToSpreadsheet } from '../../helpers/excel';
 import { getByTextWithMarkup } from 'tools';
 import { useUnscheduledAppointments } from '../../hooks/useUnscheduledAppointments';
-import { exportUnscheduledAppointmentsToSpreadsheet } from '../../helpers/excel';
 import UnscheduledAppointments from './unscheduled-appointments.component';
 
 const mockExportUnscheduledAppointmentsToSpreadsheet = jest.mocked(exportUnscheduledAppointmentsToSpreadsheet);
 const mockUseUnscheduledAppointments = jest.mocked(useUnscheduledAppointments);
 const mockUseConfig = jest.mocked(useConfig<ConfigObject>);
 
-jest.mock('../../helpers/excel');
-jest.mock('../../hooks/useOverlay');
-jest.mock('../../hooks/useUnscheduledAppointments');
+jest.mock('../../helpers/excel', () => {
+  return {
+    ...jest.requireActual('../../helpers/excel'),
+    exportUnscheduledAppointmentsToSpreadsheet: jest.fn(),
+  };
+});
+
+jest.mock('../../hooks/useUnscheduledAppointments', () => {
+  return {
+    ...jest.requireActual('../../hooks/useUnscheduledAppointments'),
+    useUnscheduledAppointments: jest.fn(),
+  };
+});
 
 const mockUnscheduledAppointments = [
   {
@@ -45,6 +55,11 @@ describe('UnscheduledAppointments', () => {
       ...getDefaultsFromConfigSchema(configSchema),
       customPatientChartUrl: 'someUrl',
     });
+    mockUseUnscheduledAppointments.mockReturnValue({
+      isLoading: false,
+      data: mockUnscheduledAppointments,
+      error: null,
+    });
   });
 
   it('renders the component correctly', async () => {
diff --git a/packages/esm-appointments-app/src/calendar/appointments-calendar-view.component.tsx b/packages/esm-appointments-app/src/calendar/appointments-calendar-view.component.tsx
index af6901140..9c2799e60 100644
--- a/packages/esm-appointments-app/src/calendar/appointments-calendar-view.component.tsx
+++ b/packages/esm-appointments-app/src/calendar/appointments-calendar-view.component.tsx
@@ -2,16 +2,16 @@ import React, { useEffect, useState } from 'react';
 import dayjs from 'dayjs';
 import { useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
+import { omrsDateFormat } from '../constants';
 import { useAppointmentsCalendar } from '../hooks/useAppointmentsCalendar';
 import AppointmentsHeader from '../header/appointments-header.component';
 import CalendarHeader from './header/calendar-header.component';
 import MonthlyCalendarView from './monthly/monthly-calendar-view.component';
 import SelectedDateContext from '../hooks/selectedDateContext';
-import { omrsDateFormat } from '../constants';
 
 const AppointmentsCalendarView: React.FC = () => {
   const { t } = useTranslation();
-  const [selectedDate, setSelectedDate] = useState<string>(dayjs().startOf('day').format(omrsDateFormat));
+  const [selectedDate, setSelectedDate] = useState(dayjs().startOf('day').format(omrsDateFormat));
   const { calendarEvents } = useAppointmentsCalendar(dayjs(selectedDate).toISOString(), 'monthly');
 
   let params = useParams();
diff --git a/packages/esm-appointments-app/src/calendar/monthly/monthly-workload-view.component.tsx b/packages/esm-appointments-app/src/calendar/monthly/monthly-workload-view.component.tsx
index 044b0da07..f06b47cbd 100644
--- a/packages/esm-appointments-app/src/calendar/monthly/monthly-workload-view.component.tsx
+++ b/packages/esm-appointments-app/src/calendar/monthly/monthly-workload-view.component.tsx
@@ -25,7 +25,7 @@ const MonthlyWorkloadView: React.FC<MonthlyWorkloadViewProps> = ({ dateTime, eve
       events?.find(
         (event) => dayjs(event.appointmentDate)?.format('YYYY-MM-DD') === dayjs(dateTime)?.format('YYYY-MM-DD'),
       ),
-    [events],
+    [dateTime, events],
   );
 
   const visibleServices = useMemo(() => {
@@ -34,7 +34,7 @@ const MonthlyWorkloadView: React.FC<MonthlyWorkloadViewProps> = ({ dateTime, eve
       return currentData.services.slice(0, layout === 'small-desktop' ? 2 : 4);
     }
     return [];
-  }, [currentData, showAllServices, layout, currentData]);
+  }, [currentData, showAllServices, layout]);
 
   const hasHiddenServices = useMemo(() => {
     if (currentData?.services) {
@@ -42,7 +42,7 @@ const MonthlyWorkloadView: React.FC<MonthlyWorkloadViewProps> = ({ dateTime, eve
       return layout === 'small-desktop' ? currentData.services.length > 2 : currentData.services.length > 4;
     }
     return false;
-  }, [layout, currentData, currentData]);
+  }, [currentData?.services, layout, showAllServices]);
 
   const navigateToAppointmentsByDate = (serviceUuid: string) => {
     navigate({ to: `${spaHomePage}/appointments/${dayjs(dateTime).format('YYYY-MM-DD')}/${serviceUuid}` });
@@ -61,8 +61,8 @@ const MonthlyWorkloadView: React.FC<MonthlyWorkloadViewProps> = ({ dateTime, eve
             },
       )}>
       {isSameMonth(dateTime, dayjs(selectedDate)) && (
-        <p>
-          <div className={classNames(styles.totals)}>
+        <div>
+          <span className={classNames(styles.totals)}>
             {currentData?.services ? (
               <div role="button" tabIndex={0}>
                 <User size={16} />
@@ -72,7 +72,7 @@ const MonthlyWorkloadView: React.FC<MonthlyWorkloadViewProps> = ({ dateTime, eve
               <div />
             )}
             <b className={styles.calendarDate}>{dateTime.format('D')}</b>
-          </div>
+          </span>
           {currentData?.services && (
             <div className={styles.currentData}>
               {visibleServices.map(({ serviceName, serviceUuid, count }, i) => (
@@ -100,7 +100,7 @@ const MonthlyWorkloadView: React.FC<MonthlyWorkloadViewProps> = ({ dateTime, eve
               )}
             </div>
           )}
-        </p>
+        </div>
       )}
     </div>
   );
diff --git a/packages/esm-appointments-app/src/config-schema.ts b/packages/esm-appointments-app/src/config-schema.ts
index 2cc9de9eb..c74e49599 100644
--- a/packages/esm-appointments-app/src/config-schema.ts
+++ b/packages/esm-appointments-app/src/config-schema.ts
@@ -1,22 +1,11 @@
-import { Type, restBaseUrl, validators } from '@openmrs/esm-framework';
-import { spaHomePage } from './constants';
+import { Type, validators } from '@openmrs/esm-framework';
 
 export const configSchema = {
-  includePhoneNumberInExcelSpreadsheet: {
-    _type: Type.Boolean,
-    _description: 'Whether to include phone numbers in the exported Excel spreadsheet',
-    _default: false,
-  },
   allowAllDayAppointments: {
     _type: Type.Boolean,
     _description: 'Whether to allow scheduling of all-day appointments (vs appointments with start time and end time)',
     _default: false,
   },
-  appointmentsBaseUrl: {
-    _type: Type.String,
-    _description: 'Configurable alternative URL for the Appointments UI. Eg, the Bahmni Appointments UI URL',
-    _default: `${spaHomePage}`,
-  },
   appointmentStatuses: {
     _type: Type.Array,
     _description: 'Configurable appointment status (status of appointments)',
@@ -27,11 +16,6 @@ export const configSchema = {
     _description: 'Configurable appointment types (types of appointments)',
     _default: ['Scheduled'],
   },
-  bahmniAppointmentsUiBaseUrl: {
-    _type: Type.String,
-    _description: 'Configurable base URL that points to the Bahmni Appointments UI',
-    _default: '/appointments',
-  },
   checkInButton: {
     enabled: {
       _type: Type.Boolean,
@@ -61,13 +45,6 @@ export const configSchema = {
       _default: '',
     },
   },
-  concepts: {
-    visitQueueNumberAttributeUuid: {
-      _type: Type.String,
-      _description: 'The UUID of the visit attribute that contains the visit queue number.',
-      _default: 'c61ce16f-272a-41e7-9924-4c555d0932c5',
-    },
-  },
   customPatientChartUrl: {
     _type: Type.String,
     _description: `Template URL that will be used when clicking on the patient name in the queues table.
@@ -76,57 +53,26 @@ export const configSchema = {
     _default: '${openmrsSpaBase}/patient/${patientUuid}/chart',
     _validators: [validators.isUrlWithTemplateParameters(['patientUuid'])],
   },
-  daysOfTheWeek: {
-    _type: Type.Array,
-    _description: 'Configurable days of the week',
-    _default: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
-  },
-  defaultFacilityUrl: {
-    _type: Type.String,
-    _default: `${restBaseUrl}/kenyaemr/default-facility`,
-    _description: 'Custom URL to load default facility if it is not in the session',
-  },
-  fullViewPrivilege: {
-    _type: Type.String,
-    _description: 'Name of the privilege to display the full view of the Appointments dashboard widget.',
-    _default: "Today's Appointments Widget: Display Full View",
-  },
-  hiddenFormFields: {
-    _type: Type.Array,
-    _description: 'Array of form controls to be hidden on form load',
-    _default: [],
+  includePhoneNumberInExcelSpreadsheet: {
+    _type: Type.Boolean,
+    _description: 'Whether to include phone numbers in the exported Excel spreadsheet',
+    _default: false,
   },
   patientIdentifierType: {
     _type: Type.String,
     _description: 'The name of the patient identifier type to be used for the patient identifier field',
     _default: '',
   },
-  showServiceQueueFields: {
-    _type: Type.Boolean,
-    _description: 'Whether start visit form should display service queue fields`',
-    _default: false,
-  },
   showUnscheduledAppointmentsTab: {
     _type: Type.Boolean,
     _description:
       'Whether to show the Unscheduled Appointments tab. Note that configuring this to true requires a custom unscheduledAppointment endpoint not currently available',
     _default: false,
   },
-  useBahmniAppointmentsUI: {
-    _type: Type.Boolean,
-    _description: 'Open links in Bahmni Appointments UI instead of O3 UI',
-    _default: false,
-  },
-  useFullViewPrivilege: {
-    _type: Type.Boolean,
-    _description: "If set to 'false', will always display the full view, disregarding any privilege",
-    _default: false,
-  },
 };
 
 export interface ConfigObject {
   allowAllDayAppointments: boolean;
-  appointmentComments: Array<string>;
   appointmentStatuses: Array<string>;
   appointmentTypes: Array<string>;
   checkInButton: {
@@ -138,18 +84,8 @@ export interface ConfigObject {
     enabled: boolean;
     customUrl: string;
   };
-  concepts: {
-    visitQueueNumberAttributeUuid: string;
-  };
   customPatientChartUrl: string;
-  daysOfTheWeek: Array<string>;
-  defaultFacilityUrl: string;
-  fullViewPrivilege: string;
-  hiddenFormFields: Array<string>;
+  includePhoneNumberInExcelSpreadsheet: boolean;
   patientIdentifierType: string;
-  showServiceQueueFields: boolean;
   showUnscheduledAppointmentsTab: boolean;
-  useBahmniAppointmentsUI: boolean;
-  useFullViewPrivilege: boolean;
-  includePhoneNumberInExcelSpreadsheet: boolean;
 }
diff --git a/packages/esm-appointments-app/src/form/appointments-form.component.tsx b/packages/esm-appointments-app/src/form/appointments-form.component.tsx
index 611d0f7ed..501b682ba 100644
--- a/packages/esm-appointments-app/src/form/appointments-form.component.tsx
+++ b/packages/esm-appointments-app/src/form/appointments-form.component.tsx
@@ -1,3 +1,7 @@
+import React, { useContext, useEffect, useState } from 'react';
+import dayjs from 'dayjs';
+import { Controller, useController, useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 import {
   Button,
   ButtonSet,
@@ -31,12 +35,15 @@ import {
   type DefaultWorkspaceProps,
   type FetchResponse,
 } from '@openmrs/esm-framework';
-import dayjs from 'dayjs';
-import React, { useContext, useEffect, useState } from 'react';
-import { Controller, useController, useForm } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
 import { z } from 'zod';
 import { type ConfigObject } from '../config-schema';
+import {
+  checkAppointmentConflict,
+  saveAppointment,
+  saveRecurringAppointments,
+  useAppointmentService,
+  useMutateAppointments,
+} from './appointments-form.resource';
 import {
   appointmentLocationTagName,
   dateFormat,
@@ -45,25 +52,12 @@ import {
   moduleName,
   weekDays,
 } from '../constants';
-import SelectedDateContext from '../hooks/selectedDateContext';
 import { useProviders } from '../hooks/useProviders';
 import type { Appointment, AppointmentPayload, RecurringPattern } from '../types';
+import SelectedDateContext from '../hooks/selectedDateContext';
 import Workload from '../workload/workload.component';
-import {
-  checkAppointmentConflict,
-  saveAppointment,
-  saveRecurringAppointments,
-  useAppointmentService,
-  useMutateAppointments,
-} from './appointments-form.resource';
 import styles from './appointments-form.scss';
 
-const time12HourFormatRegexPattern = '^(1[0-2]|0?[1-9]):[0-5][0-9]$';
-
-function isValidTime(timeStr) {
-  return timeStr.match(new RegExp(time12HourFormatRegexPattern));
-}
-
 interface AppointmentsFormProps {
   appointment?: Appointment;
   recurringPattern?: RecurringPattern;
@@ -71,6 +65,10 @@ interface AppointmentsFormProps {
   context: string;
 }
 
+const time12HourFormatRegexPattern = '^(1[0-2]|0?[1-9]):[0-5][0-9]$';
+
+const isValidTime = (timeStr: string) => timeStr.match(new RegExp(time12HourFormatRegexPattern));
+
 const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps> = ({
   appointment,
   recurringPattern,
@@ -127,7 +125,7 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
   const defaultDuration =
     appointment?.startDateTime && appointment?.endDateTime
       ? dayjs(appointment.endDateTime).diff(dayjs(appointment.startDateTime), 'minutes')
-      : null;
+      : undefined;
 
   // t('durationErrorMessage', 'Duration should be greater than zero')
   const appointmentsFormSchema = z
@@ -156,7 +154,9 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
       recurringPatternPeriod: z.number(),
       recurringPatternDaysOfWeek: z.array(z.string()),
       selectedDaysOfWeekText: z.string().optional(),
-      startTime: z.string().refine((value) => isValidTime(value)),
+      startTime: z.string().refine((value) => isValidTime(value), {
+        message: translateFrom(moduleName, 'invalidTime', 'Invalid time'),
+      }),
       timeFormat: z.enum(['AM', 'PM']),
       appointmentDateTime: z.object({
         startDate: z.date(),
@@ -220,7 +220,7 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
     watch,
     handleSubmit,
     reset,
-    formState: { isDirty },
+    formState: { errors, isDirty },
   } = useForm<AppointmentFormData>({
     mode: 'all',
     resolver: zodResolver(appointmentsFormSchema),
@@ -251,7 +251,7 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
     },
   });
 
-  useEffect(() => setValue('formIsRecurringAppointment', isRecurringAppointment), [isRecurringAppointment]);
+  useEffect(() => setValue('formIsRecurringAppointment', isRecurringAppointment), [isRecurringAppointment, setValue]);
 
   // Retrive ref callback for appointmentDateTime (startDate & recurringPatternEndDate)
   const {
@@ -277,14 +277,14 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
       return;
     }
     promptBeforeClosing(() => isDirty);
-  }, [isDirty, promptBeforeClosing, isSuccessful]);
+  }, [isDirty, promptBeforeClosing, isSuccessful, reset, closeWorkspace]);
 
   const handleWorkloadDateChange = (date: Date) => {
     const appointmentDate = getValues('appointmentDateTime');
     setValue('appointmentDateTime', { ...appointmentDate, startDate: date });
   };
 
-  const handleMultiselectChange = (e) => {
+  const handleSelectChange = (e) => {
     setValue(
       'selectedDaysOfWeekText',
       (() => {
@@ -354,7 +354,9 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
       appointmentRequest: appointmentPayload,
       recurringPattern: constructRecurringPattern(data),
     };
+
     const abortController = new AbortController();
+
     (isRecurringAppointment
       ? saveRecurringAppointments(recurringAppointmentPayload, abortController)
       : saveAppointment(appointmentPayload, abortController)
@@ -458,15 +460,13 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
     };
   };
 
-  const onError = (error) => console.error(error);
-
   if (isLoading)
     return (
       <InlineLoading className={styles.loader} description={`${t('loading', 'Loading')} ...`} role="progressbar" />
     );
 
   return (
-    <Form onSubmit={handleSubmit(handleSaveAppointment, onError)}>
+    <Form onSubmit={handleSubmit(handleSaveAppointment)}>
       <Stack gap={4}>
         {patient && (
           <ExtensionSlot
@@ -484,16 +484,16 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
             <Controller
               name="location"
               control={control}
-              render={({ field: { onChange, value, onBlur, ref }, fieldState }) => (
+              render={({ field: { onChange, value, onBlur, ref } }) => (
                 <Select
                   id="location"
+                  invalid={!!errors?.location}
+                  invalidText={errors?.location?.message}
                   labelText={t('selectALocation', 'Select a location')}
                   onChange={onChange}
                   onBlur={onBlur}
-                  value={value}
                   ref={ref}
-                  invalid={!!fieldState?.error?.message}
-                  invalidText={fieldState?.error?.message}>
+                  value={value}>
                   <SelectItem text={t('chooseLocation', 'Choose a location')} value="" />
                   {locations?.length > 0 &&
                     locations.map((location) => (
@@ -512,10 +512,13 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
             <Controller
               name="selectedService"
               control={control}
-              render={({ field: { onBlur, onChange, value, ref }, fieldState }) => (
+              render={({ field: { onBlur, onChange, value, ref } }) => (
                 <Select
                   id="service"
+                  invalid={!!errors?.selectedService}
+                  invalidText={errors?.selectedService?.message}
                   labelText={t('selectService', 'Select a service')}
+                  onBlur={onBlur}
                   onChange={(event) => {
                     if (context === 'creating') {
                       setValue(
@@ -534,11 +537,8 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
                     }
                     onChange(event);
                   }}
-                  onBlur={onBlur}
-                  value={value}
                   ref={ref}
-                  invalid={!!fieldState?.error?.message}
-                  invalidText={fieldState?.error?.message}>
+                  value={value}>
                   <SelectItem text={t('chooseService', 'Select service')} value="" />
                   {services?.length > 0 &&
                     services.map((service) => (
@@ -557,17 +557,17 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
             <Controller
               name="appointmentType"
               control={control}
-              render={({ field: { onBlur, onChange, value, ref }, fieldState }) => (
+              render={({ field: { onBlur, onChange, value, ref } }) => (
                 <Select
                   disabled={!appointmentTypes?.length}
                   id="appointmentType"
+                  invalid={!!errors?.appointmentType}
+                  invalidText={errors?.appointmentType?.message}
                   labelText={t('selectAppointmentType', 'Select the type of appointment')}
+                  onBlur={onBlur}
                   onChange={onChange}
-                  value={value}
                   ref={ref}
-                  onBlur={onBlur}
-                  invalid={!!fieldState?.error?.message}
-                  invalidText={fieldState?.error?.message}>
+                  value={value}>
                   <SelectItem text={t('chooseAppointmentType', 'Choose appointment type')} value="" />
                   {appointmentTypes?.length > 0 &&
                     appointmentTypes.map((appointmentType, index) => (
@@ -645,7 +645,7 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
                 </ResponsiveWrapper>
 
                 {!isAllDayAppointment && (
-                  <TimeAndDuration isTablet={isTablet} control={control} services={services} watch={watch} t={t} />
+                  <TimeAndDuration control={control} errors={errors} services={services} watch={watch} t={t} />
                 )}
 
                 <ResponsiveWrapper>
@@ -697,21 +697,21 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
                       render={({ field: { onChange } }) => (
                         <MultiSelect
                           className={styles.weekSelect}
-                          label={getValues('selectedDaysOfWeekText')}
                           id="daysOfWeek"
+                          initialSelectedItems={weekDays.filter((i) =>
+                            getValues('recurringPatternDaysOfWeek').includes(i.id),
+                          )}
                           items={weekDays}
                           itemToString={(item) => (item ? t(item.labelCode, item.label) : '')}
+                          label={getValues('selectedDaysOfWeekText')}
+                          onChange={(e) => {
+                            onChange(e);
+                            handleSelectChange(e);
+                          }}
                           selectionFeedback="top-after-reopen"
                           sortItems={(items) => {
                             return items.sort((a, b) => a.order > b.order);
                           }}
-                          initialSelectedItems={weekDays.filter((i) => {
-                            return getValues('recurringPatternDaysOfWeek').includes(i.id);
-                          })}
-                          onChange={(e) => {
-                            onChange(e);
-                            handleMultiselectChange(e);
-                          }}
                         />
                       )}
                     />
@@ -759,7 +759,7 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
                 </ResponsiveWrapper>
 
                 {!isAllDayAppointment && (
-                  <TimeAndDuration isTablet={isTablet} control={control} services={services} watch={watch} t={t} />
+                  <TimeAndDuration control={control} services={services} watch={watch} t={t} errors={errors} />
                 )}
               </div>
             )}
@@ -770,9 +770,9 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
           <section className={styles.formGroup}>
             <ResponsiveWrapper>
               <Workload
-                selectedService={watch('selectedService')}
                 appointmentDate={watch('appointmentDateTime').startDate}
                 onWorkloadDateChange={handleWorkloadDateChange}
+                selectedService={watch('selectedService')}
               />
             </ResponsiveWrapper>
           </section>
@@ -785,11 +785,11 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
               <Controller
                 name="appointmentStatus"
                 control={control}
-                render={({ field: { onBlur, onChange, value, ref }, fieldState }) => (
+                render={({ field: { onBlur, onChange, value, ref } }) => (
                   <Select
                     id="appointmentStatus"
-                    invalid={!!fieldState?.error?.message}
-                    invalidText={fieldState?.error?.message}
+                    invalid={!!errors?.appointmentStatus}
+                    invalidText={errors?.appointmentStatus?.message}
                     labelText={t('selectAppointmentStatus', 'Select status')}
                     onChange={onChange}
                     value={value}
@@ -842,16 +842,16 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
             <Controller
               name="dateAppointmentScheduled"
               control={control}
-              render={({ field: { onChange, value, ref }, fieldState }) => (
+              render={({ field: { onChange, value, ref } }) => (
                 <div style={{ width: '100%' }}>
                   <DatePicker
                     datePickerType="single"
                     dateFormat={datePickerFormat}
-                    value={value}
+                    invalid={!!errors?.dateAppointmentScheduled}
+                    invalidText={errors?.dateAppointmentScheduled?.message}
                     maxDate={new Date().toISOString()}
                     onChange={([date]) => onChange(date)}
-                    invalid={!!fieldState?.error?.message}
-                    invalidText={fieldState?.error?.message}>
+                    value={value}>
                     <DatePickerInput
                       id="dateAppointmentScheduledPickerInput"
                       labelText={t('dateScheduledDetail', 'Date appointment issued')}
@@ -860,7 +860,6 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
                       ref={ref}
                     />
                   </DatePicker>
-                  {fieldState?.error?.message && <div className={styles.errorMessage}>{fieldState.error.message}</div>}
                 </div>
               )}
             />
@@ -900,7 +899,7 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
   );
 };
 
-function TimeAndDuration({ isTablet, t, watch, control, services }) {
+function TimeAndDuration({ t, watch, control, services, errors }) {
   const defaultDuration = services?.find((service) => service.name === watch('selectedService'))?.durationMins || null;
 
   return (
@@ -913,12 +912,14 @@ function TimeAndDuration({ isTablet, t, watch, control, services }) {
             <TimePicker
               id="time-picker"
               pattern={time12HourFormatRegexPattern}
-              invalid={!isValidTime(value)}
-              invalidText={t('invalidTime', 'Invalid time')}
-              onChange={(event) => onChange(event.target.value)}
-              value={value}
+              invalid={!!errors?.startTime}
+              invalidText={errors?.startTime?.message}
+              labelText={t('time', 'Time')}
+              onChange={(event) => {
+                onChange(event.target.value);
+              }}
               style={{ marginLeft: '0.125rem', flex: 'none' }}
-              labelText={t('time', 'Time')}>
+              value={value}>
               <Controller
                 name="timeFormat"
                 control={control}
@@ -941,22 +942,21 @@ function TimeAndDuration({ isTablet, t, watch, control, services }) {
         <Controller
           name="duration"
           control={control}
-          defaultValue={defaultDuration}
-          render={({ field: { onChange, onBlur, value, ref }, fieldState }) => (
+          render={({ field: { onChange, onBlur, value, ref } }) => (
             <NumberInput
-              hideSteppers
               disableWheel
+              hideSteppers
               id="duration"
-              min={0}
-              max={1440}
+              invalid={!!errors?.duration}
+              invalidText={errors?.duration?.message}
               label={t('durationInMinutes', 'Duration (minutes)')}
-              invalidText={t('invalidNumber', 'Number is not valid')}
-              size="md"
+              max={1440}
+              min={0}
               onBlur={onBlur}
               onChange={(event) => onChange(Number(event.target.value))}
-              value={value}
               ref={ref}
-              invalid={fieldState?.error?.message}
+              size="md"
+              value={value}
             />
           )}
         />
diff --git a/packages/esm-appointments-app/src/form/appointments-form.test.tsx b/packages/esm-appointments-app/src/form/appointments-form.test.tsx
index 033bb185e..1e4c3f5f5 100644
--- a/packages/esm-appointments-app/src/form/appointments-form.test.tsx
+++ b/packages/esm-appointments-app/src/form/appointments-form.test.tsx
@@ -5,14 +5,16 @@ import {
   type FetchResponse,
   getDefaultsFromConfigSchema,
   openmrsFetch,
+  showSnackbar,
   useConfig,
   useLocations,
   useSession,
 } from '@openmrs/esm-framework';
-import { mockUseAppointmentServiceData, mockSession, mockLocations } from '__mocks__';
+import { configSchema, type ConfigObject } from '../config-schema';
+import { mockUseAppointmentServiceData, mockSession, mockLocations, mockProviders } from '__mocks__';
 import { mockPatient, renderWithSwr, waitForLoadingToFinish } from 'tools';
 import { saveAppointment } from './appointments-form.resource';
-import { configSchema, type ConfigObject } from '../config-schema';
+import { useProviders } from '../hooks/useProviders';
 import AppointmentForm from './appointments-form.component';
 
 const defaultProps = {
@@ -20,79 +22,40 @@ const defaultProps = {
   closeWorkspace: jest.fn(),
   patientUuid: mockPatient.id,
   promptBeforeClosing: jest.fn(),
+  closeWorkspaceWithSavedChanges: jest.fn(),
+  setTitle: jest.fn(),
 };
 
-const mockCreateAppointment = jest.mocked(saveAppointment);
 const mockOpenmrsFetch = jest.mocked(openmrsFetch);
+const mockSaveAppointment = jest.mocked(saveAppointment);
+const mockShowSnackbar = jest.mocked(showSnackbar);
 const mockUseConfig = jest.mocked(useConfig<ConfigObject>);
 const mockUseLocations = jest.mocked(useLocations);
+const mockUseProviders = jest.mocked(useProviders);
 const mockUseSession = jest.mocked(useSession);
 
-jest.mock('react-hook-form', () => ({
-  ...jest.requireActual('react-hook-form'),
-  useForm: jest.fn().mockImplementation(() => ({
-    handleSubmit: () => jest.fn(),
-    control: {
-      register: jest.fn(),
-      unregister: jest.fn(),
-      getFieldState: jest.fn(),
-      _names: {
-        array: new Set('test'),
-        mount: new Set('test'),
-        unMount: new Set('test'),
-        watch: new Set('test'),
-        focus: 'test',
-        watchAll: false,
-      },
-      _subjects: {
-        watch: jest.fn(),
-        array: jest.fn(),
-        state: jest.fn(),
-      },
-      _getWatch: jest.fn(),
-      _formValues: [],
-      _defaultValues: [],
-    },
-    getValues: (str) => {
-      if (str === 'recurringPatternDaysOfWeek') {
-        return [];
-      } else {
-        return null;
-      }
-    },
-    setValue: () => jest.fn(),
-    formState: () => jest.fn(),
-    watch: () => jest.fn(),
-  })),
-  Controller: ({ render }) =>
-    render({
-      field: {
-        onChange: jest.fn(),
-        onBlur: jest.fn(),
-        value: '',
-        ref: jest.fn(),
-      },
-      formState: {
-        isSubmitted: false,
-      },
-      fieldState: {
-        isTouched: false,
-      },
-    }),
-  useSubscribe: () => ({
-    r: { current: { subject: { subscribe: () => jest.fn() } } },
-  }),
-  useController: () => ({
-    field: { ref: jest.fn() },
-  }),
-}));
-
 jest.mock('./appointments-form.resource', () => ({
   ...jest.requireActual('./appointments-form.resource'),
   saveAppointment: jest.fn(),
 }));
 
+jest.mock('../hooks/useProviders', () => ({
+  ...jest.requireActual('../hooks/useProviders'),
+  useProviders: jest.fn(),
+}));
+
+jest.mock('../workload/workload.resource', () => ({
+  ...jest.requireActual('../workload/workload.resource'),
+  getMonthlyCalendarDistribution: jest.fn(),
+  useAppointmentSummary: jest.fn(),
+  useCalendarDistribution: jest.fn(),
+  useMonthlyCalendarDistribution: jest.fn().mockReturnValue([]),
+  useMonthlyAppointmentSummary: jest.fn().mockReturnValue([]),
+}));
+
 describe('AppointmentForm', () => {
+  const dateTimeRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{3}Z|\+00:00)$/;
+
   beforeEach(() => {
     mockUseConfig.mockReturnValue({
       ...getDefaultsFromConfigSchema(configSchema),
@@ -100,36 +63,42 @@ describe('AppointmentForm', () => {
     });
     mockUseLocations.mockReturnValue(mockLocations.data.results);
     mockUseSession.mockReturnValue(mockSession.data);
+    mockUseProviders.mockReturnValue({
+      providers: mockProviders.data,
+      isLoading: false,
+      error: null,
+      isValidating: false,
+    });
   });
 
-  it('renders the appointments form showing all the relevant fields and values', async () => {
+  it('renders the appointments form', async () => {
     mockOpenmrsFetch.mockResolvedValue(mockUseAppointmentServiceData as unknown as FetchResponse);
 
     renderWithSwr(<AppointmentForm {...defaultProps} />);
 
     await waitForLoadingToFinish();
 
-    expect(screen.getByLabelText(/Select a location/i)).toBeInTheDocument();
-    expect(screen.getByLabelText(/^Date$/i)).toBeInTheDocument();
-    expect(screen.getByLabelText(/Select a service/i)).toBeInTheDocument();
-    expect(screen.getByLabelText(/Select the type of appointment/i)).toBeInTheDocument();
-    expect(screen.getByLabelText(/Write an additional note/i)).toBeInTheDocument();
-    expect(screen.getByPlaceholderText(/Write any additional points here/i)).toBeInTheDocument();
+    expect(screen.getByLabelText(/select a location/i)).toBeInTheDocument();
+    expect(screen.getByLabelText(/select a service/i)).toBeInTheDocument();
+    expect(screen.getByLabelText(/select the type of appointment/i)).toBeInTheDocument();
+    expect(screen.getByLabelText(/write an additional note/i)).toBeInTheDocument();
+    expect(screen.getByPlaceholderText(/write any additional points here/i)).toBeInTheDocument();
     expect(screen.getAllByPlaceholderText(/dd\/mm\/yyyy/i).length).toBe(2);
-    expect(screen.getByRole('option', { name: /Mosoriot/i })).toBeInTheDocument();
-    expect(screen.getByRole('option', { name: /Inpatient Ward/i })).toBeInTheDocument();
-    expect(screen.getByRole('option', { name: /AM/i })).toBeInTheDocument();
-    expect(screen.getByRole('option', { name: /PM/i })).toBeInTheDocument();
-    expect(screen.getByRole('option', { name: /Choose appointment type/i })).toBeInTheDocument();
-    expect(screen.getByRole('option', { name: /Scheduled/i })).toBeInTheDocument();
-    expect(screen.getByRole('option', { name: /WalkIn/i })).toBeInTheDocument();
-    expect(screen.getByRole('textbox', { name: /^Date$/i })).toBeInTheDocument();
-    expect(screen.getByRole('textbox', { name: /Time/i })).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: /Discard/i })).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: /Save and close/i })).toBeInTheDocument();
+    expect(screen.getByRole('option', { name: /mosoriot/i })).toBeInTheDocument();
+    expect(screen.getByRole('option', { name: /inpatient ward/i })).toBeInTheDocument();
+    expect(screen.getByLabelText(/^date$/i)).toBeInTheDocument();
+    expect(screen.getByRole('option', { name: /^am$/i })).toBeInTheDocument();
+    expect(screen.getByRole('option', { name: /^pm$/i })).toBeInTheDocument();
+    expect(screen.getByRole('option', { name: /choose appointment type/i })).toBeInTheDocument();
+    expect(screen.getByRole('option', { name: /scheduled/i })).toBeInTheDocument();
+    expect(screen.getByRole('option', { name: /walkin/i })).toBeInTheDocument();
+    expect(screen.getByRole('textbox', { name: /^date$/i })).toBeInTheDocument();
+    expect(screen.getByRole('textbox', { name: /time/i })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /discard/i })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /save and close/i })).toBeInTheDocument();
   });
 
-  it('closes the form and the workspace when the cancel button is clicked', async () => {
+  it('closes the workspace when the cancel button is clicked', async () => {
     const user = userEvent.setup();
 
     mockOpenmrsFetch.mockResolvedValueOnce(mockUseAppointmentServiceData as unknown as FetchResponse);
@@ -144,34 +113,64 @@ describe('AppointmentForm', () => {
     expect(defaultProps.closeWorkspace).toHaveBeenCalledTimes(1);
   });
 
-  it('renders a success snackbar  upon successfully scheduling an appointment', async () => {
+  it('renders a success snackbar upon successfully scheduling an appointment', async () => {
     const user = userEvent.setup();
 
     mockOpenmrsFetch.mockResolvedValue({ data: mockUseAppointmentServiceData } as unknown as FetchResponse);
-    mockCreateAppointment.mockResolvedValue({ status: 200, statusText: 'Ok' } as FetchResponse);
+    mockSaveAppointment.mockResolvedValue({ status: 200, statusText: 'Ok' } as FetchResponse);
 
     renderWithSwr(<AppointmentForm {...defaultProps} />);
 
     await waitForLoadingToFinish();
 
-    const saveButton = screen.getByRole('button', { name: /Save and close/i });
-    const dateInput = screen.getByRole('textbox', { name: /^Date$/i });
-    const timeInput = screen.getByRole('textbox', { name: /Time/i });
-    const timeFormat = screen.getByRole('combobox', { name: /Time/i });
-    const serviceSelect = screen.getByRole('combobox', { name: /Select a service/i });
-    const appointmentTypeSelect = screen.getByRole('combobox', { name: /Select the type of appointment/i });
-
-    expect(saveButton).toBeEnabled();
+    const locationSelect = screen.getByRole('combobox', { name: /select a location/i });
+    const serviceSelect = screen.getByRole('combobox', { name: /select a service/i });
+    const appointmentTypeSelect = screen.getByRole('combobox', { name: /select the type of appointment/i });
+    const providerSelect = screen.getByRole('combobox', { name: /select a provider/i });
+    const dateInput = screen.getByRole('textbox', { name: /^date$/i });
+    const timeInput = screen.getByRole('textbox', { name: /time/i });
+    const timeFormat = screen.getByRole('combobox', { name: /time/i });
+    const saveButton = screen.getByRole('button', { name: /save and close/i });
 
-    await user.clear(dateInput);
-    await user.type(dateInput, '4/4/2021');
-    await user.clear(timeInput);
-    await user.type(timeInput, '09:30');
-    await user.selectOptions(timeFormat, 'AM');
+    await user.selectOptions(locationSelect, ['Inpatient Ward']);
     await user.selectOptions(serviceSelect, ['Outpatient']);
     await user.selectOptions(appointmentTypeSelect, ['Scheduled']);
+    await user.selectOptions(providerSelect, ['doctor - James Cook']);
+
+    const date = '4/4/2021';
+    const time = '09:30';
 
+    await user.type(dateInput, date);
+    await user.type(timeInput, time);
+    await user.tab();
+    await user.selectOptions(timeFormat, 'AM');
     await user.click(saveButton);
+
+    expect(mockSaveAppointment).toHaveBeenCalledTimes(1);
+    expect(mockSaveAppointment).toHaveBeenCalledWith(
+      {
+        appointmentKind: 'Scheduled',
+        comments: '',
+        dateAppointmentScheduled: expect.stringMatching(dateTimeRegex),
+        endDateTime: expect.stringMatching(dateTimeRegex),
+        locationUuid: 'b1a8b05e-3542-4037-bbd3-998ee9c40574',
+        patientUuid: mockPatient.id,
+        providers: [{ uuid: 'f9badd80-ab76-11e2-9e96-0800200c9a66' }],
+        serviceUuid: 'e2ec9cf0-ec38-4d2b-af6c-59c82fa30b90',
+        startDateTime: expect.stringMatching(dateTimeRegex),
+        status: '',
+        uuid: undefined,
+      },
+      new AbortController(),
+    );
+
+    expect(mockShowSnackbar).toHaveBeenCalledTimes(1);
+    expect(mockShowSnackbar).toHaveBeenCalledWith({
+      kind: 'success',
+      isLowContrast: true,
+      subtitle: 'It is now visible on the Appointments page',
+      title: 'Appointment scheduled',
+    });
   });
 
   it('renders an error snackbar if there was a problem scheduling an appointment', async () => {
@@ -185,27 +184,60 @@ describe('AppointmentForm', () => {
       },
     };
 
-    mockOpenmrsFetch.mockResolvedValueOnce({ data: mockUseAppointmentServiceData } as unknown as FetchResponse);
-    mockCreateAppointment.mockRejectedValueOnce(error);
+    mockOpenmrsFetch.mockResolvedValue({ data: mockUseAppointmentServiceData } as unknown as FetchResponse);
+    mockSaveAppointment.mockRejectedValue(error);
 
     renderWithSwr(<AppointmentForm {...defaultProps} />);
 
     await waitForLoadingToFinish();
 
-    const saveButton = screen.getByRole('button', { name: /Save and close/i });
-    const dateInput = screen.getByRole('textbox', { name: /^Date$/i });
-    const timeInput = screen.getByRole('textbox', { name: /Time/i });
-    const timeFormat = screen.getByRole('combobox', { name: /Time/i });
-    const serviceSelect = screen.getByRole('combobox', { name: /Select a service/i });
-    const appointmentTypeSelect = screen.getByRole('combobox', { name: /Select the type of appointment/i });
-
-    await user.clear(dateInput);
-    await user.type(dateInput, '4/4/2021');
-    await user.clear(timeInput);
-    await user.type(timeInput, '09:30');
-    await user.selectOptions(timeFormat, 'AM');
+    const locationSelect = screen.getByRole('combobox', { name: /select a location/i });
+    const serviceSelect = screen.getByRole('combobox', { name: /select a service/i });
+    const appointmentTypeSelect = screen.getByRole('combobox', { name: /select the type of appointment/i });
+    const providerSelect = screen.getByRole('combobox', { name: /select a provider/i });
+    const dateInput = screen.getByRole('textbox', { name: /^date$/i });
+    const timeInput = screen.getByRole('textbox', { name: /time/i });
+    const timeFormat = screen.getByRole('combobox', { name: /time/i });
+    const saveButton = screen.getByRole('button', { name: /save and close/i });
+
+    await user.selectOptions(locationSelect, ['Inpatient Ward']);
     await user.selectOptions(serviceSelect, ['Outpatient']);
     await user.selectOptions(appointmentTypeSelect, ['Scheduled']);
+    await user.selectOptions(providerSelect, ['doctor - James Cook']);
+
+    const date = '4/4/2021';
+    const time = '09:30';
+
+    await user.type(dateInput, date);
+    await user.type(timeInput, time);
+    await user.tab();
+    await user.selectOptions(timeFormat, 'AM');
     await user.click(saveButton);
+
+    expect(mockSaveAppointment).toHaveBeenCalledTimes(1);
+    expect(mockSaveAppointment).toHaveBeenCalledWith(
+      {
+        appointmentKind: 'Scheduled',
+        comments: '',
+        dateAppointmentScheduled: expect.stringMatching(dateTimeRegex),
+        endDateTime: expect.stringMatching(dateTimeRegex),
+        locationUuid: 'b1a8b05e-3542-4037-bbd3-998ee9c40574',
+        patientUuid: mockPatient.id,
+        providers: [{ uuid: 'f9badd80-ab76-11e2-9e96-0800200c9a66' }],
+        serviceUuid: 'e2ec9cf0-ec38-4d2b-af6c-59c82fa30b90',
+        startDateTime: expect.stringMatching(dateTimeRegex),
+        status: '',
+        uuid: undefined,
+      },
+      new AbortController(),
+    );
+
+    expect(mockShowSnackbar).toHaveBeenCalledTimes(1);
+    expect(mockShowSnackbar).toHaveBeenCalledWith({
+      isLowContrast: false,
+      kind: 'error',
+      subtitle: 'Internal Server Error',
+      title: 'Error scheduling appointment',
+    });
   });
 });
diff --git a/packages/esm-appointments-app/src/hooks/useDefaultLocation.ts b/packages/esm-appointments-app/src/hooks/useDefaultLocation.ts
deleted file mode 100644
index 59be7209c..000000000
--- a/packages/esm-appointments-app/src/hooks/useDefaultLocation.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { type FetchResponse, openmrsFetch, useConfig } from '@openmrs/esm-framework';
-import useSWRImmutable from 'swr/immutable';
-
-export const useDefaultLoginLocation = () => {
-  const config = useConfig();
-  const apiUrl = config.defaultFacilityUrl;
-  const { data, error, isLoading } = useSWRImmutable<FetchResponse>(apiUrl, openmrsFetch);
-
-  return {
-    defaultFacility: data ? data?.data : null,
-    isLoading: isLoading,
-    error,
-  };
-};
diff --git a/packages/esm-appointments-app/src/patient-appointments/patient-appointments-action-menu.component.tsx b/packages/esm-appointments-app/src/patient-appointments/patient-appointments-action-menu.component.tsx
index 62a3187f9..db8f997c0 100644
--- a/packages/esm-appointments-app/src/patient-appointments/patient-appointments-action-menu.component.tsx
+++ b/packages/esm-appointments-app/src/patient-appointments/patient-appointments-action-menu.component.tsx
@@ -1,13 +1,11 @@
 import React, { useCallback, useContext } from 'react';
 import { useTranslation } from 'react-i18next';
-
 import { Layer, OverflowMenu, OverflowMenuItem } from '@carbon/react';
 import { launchPatientWorkspace } from '@openmrs/esm-patient-common-lib';
 import { launchWorkspace, showModal, useLayoutType } from '@openmrs/esm-framework';
 import type { Appointment } from '../types';
-import styles from './patient-appointments-action-menu.scss';
-
 import PatientAppointmentContext, { PatientAppointmentContextTypes } from '../hooks/patientAppointmentContext';
+import styles from './patient-appointments-action-menu.scss';
 
 interface appointmentsActionMenuProps {
   appointment: Appointment;
@@ -32,7 +30,7 @@ export const PatientAppointmentsActionMenu = ({ appointment, patientUuid }: appo
         appointment,
       });
     }
-  }, [appointment, t]);
+  }, [appointment, patientAppointmentContext, t]);
 
   const launchCancelAppointmentDialog = () => {
     const dispose = showModal('patient-appointment-cancel-confirmation-dialog', {
diff --git a/packages/esm-appointments-app/src/patient-appointments/patient-appointments-base.test.tsx b/packages/esm-appointments-app/src/patient-appointments/patient-appointments-base.test.tsx
index 2ef78d564..7e509c33b 100644
--- a/packages/esm-appointments-app/src/patient-appointments/patient-appointments-base.test.tsx
+++ b/packages/esm-appointments-app/src/patient-appointments/patient-appointments-base.test.tsx
@@ -14,7 +14,7 @@ const testProps = {
 
 const mockOpenmrsFetch = jest.mocked(openmrsFetch);
 
-describe('AppointmensOverview', () => {
+describe('AppointmentsOverview', () => {
   it('renders an empty state if appointments data is unavailable', async () => {
     mockOpenmrsFetch.mockResolvedValueOnce({
       data: [],
diff --git a/packages/esm-appointments-app/src/patient-appointments/patient-upcoming-appointments-card.component.tsx b/packages/esm-appointments-app/src/patient-appointments/patient-upcoming-appointments-card.component.tsx
index 7c070be92..ace547b74 100644
--- a/packages/esm-appointments-app/src/patient-appointments/patient-upcoming-appointments-card.component.tsx
+++ b/packages/esm-appointments-app/src/patient-appointments/patient-upcoming-appointments-card.component.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
   InlineLoading,
@@ -10,31 +10,84 @@ import {
   StructuredListRow,
   StructuredListWrapper,
 } from '@carbon/react';
-import { formatDate, parseDate } from '@openmrs/esm-framework';
-import { usePatientAppointments } from './patient-appointments.resource';
+import { formatDate, parseDate, showSnackbar, type Visit } from '@openmrs/esm-framework';
+import { changeAppointmentStatus, usePatientAppointments } from './patient-appointments.resource';
 import { ErrorState } from '@openmrs/esm-patient-common-lib';
 import styles from './patient-upcoming-appointments-card.scss';
 import dayjs from 'dayjs';
 import { type Appointment } from '../types';
+import { useMutateAppointments } from '../form/appointments-form.resource';
 
-interface PatientUpcomingAppointmentsProps {
+interface VisitFormCallbacks {
+  onVisitCreatedOrUpdated: (visit: Visit) => Promise<any>;
+}
+
+// See VisitFormExtensionState in esm-patient-chart-app
+export interface PatientUpcomingAppointmentsProps {
+  setVisitFormCallbacks(callbacks: VisitFormCallbacks);
+  visitFormOpenedFrom: string;
+  patientChartConfig?: {
+    showUpcomingAppointments: boolean;
+  };
   patientUuid: string;
-  setUpcomingAppointment: (value: Appointment) => void;
 }
 
+/**
+ * This is an extension that gets slotted into the patient chart start visit form when
+ * the appropriate config values are enabled.
+ * @param param0
+ * @returns
+ */
 const PatientUpcomingAppointmentsCard: React.FC<PatientUpcomingAppointmentsProps> = ({
   patientUuid,
-  setUpcomingAppointment,
+  setVisitFormCallbacks,
+  patientChartConfig,
 }) => {
   const { t } = useTranslation();
   const startDate = dayjs(new Date().toISOString()).subtract(6, 'month').toISOString();
   const headerTitle = t('upcomingAppointments', 'Upcoming appointments');
-  const [selectedAppointment, setSelectedAppointment] = useState(null);
+  const [selectedAppointment, setSelectedAppointment] = useState<Appointment>(null);
+  const { mutateAppointments } = useMutateAppointments();
+  const memoMutateAppointments = useMemo(() => mutateAppointments, [mutateAppointments]);
 
   const ac = useMemo<AbortController>(() => new AbortController(), []);
   useEffect(() => () => ac.abort(), [ac]);
   const { data: appointmentsData, error, isLoading } = usePatientAppointments(patientUuid, startDate, ac);
 
+  const onVisitCreatedOrUpdated = useMemo(
+    () => ({
+      onVisitCreatedOrUpdated: () => {
+        if (selectedAppointment) {
+          return changeAppointmentStatus('CheckedIn', selectedAppointment.uuid)
+            .then(() => {
+              memoMutateAppointments();
+              showSnackbar({
+                isLowContrast: true,
+                kind: 'success',
+                subtitle: t('appointmentMarkedChecked', 'Appointment marked as Checked In'),
+                title: t('appointmentCheckedIn', 'Appointment Checked In'),
+              });
+            })
+            .catch((error) => {
+              showSnackbar({
+                title: t('updateError', 'Error updating upcoming appointment'),
+                kind: 'error',
+                isLowContrast: false,
+                subtitle: error?.message,
+              });
+            });
+        } else {
+          return Promise.resolve();
+        }
+      },
+    }),
+    [selectedAppointment, memoMutateAppointments, t],
+  );
+
+  useEffect(() => {
+    setVisitFormCallbacks(onVisitCreatedOrUpdated);
+  }, [onVisitCreatedOrUpdated, setVisitFormCallbacks]);
+
   const todaysAppointments = appointmentsData?.todaysAppointments?.length ? appointmentsData?.todaysAppointments : [];
   const futureAppointments = appointmentsData?.upcomingAppointments?.length
     ? appointmentsData?.upcomingAppointments
@@ -46,9 +99,12 @@ const PatientUpcomingAppointmentsCard: React.FC<PatientUpcomingAppointmentsProps
 
   const handleRadioChange = (appointment: Appointment) => {
     setSelectedAppointment(appointment);
-    setUpcomingAppointment(appointment);
   };
 
+  if (!patientChartConfig.showUpcomingAppointments) {
+    return <></>;
+  }
+
   if (error) {
     return <ErrorState headerTitle={headerTitle} error={error} />;
   }
diff --git a/packages/esm-appointments-app/src/routes.json b/packages/esm-appointments-app/src/routes.json
index fbe5d8fac..0e81492e0 100644
--- a/packages/esm-appointments-app/src/routes.json
+++ b/packages/esm-appointments-app/src/routes.json
@@ -99,7 +99,7 @@
     {
       "name": "patient-upcoming-appointment-widget",
       "component": "patientUpcomingAppointmentsWidget",
-      "slot": "upcoming-appointment-slot"
+      "slot": "visit-form-top-slot"
     },
     {
       "name": "edit-appointments-form",
diff --git a/packages/esm-appointments-app/src/types/index.ts b/packages/esm-appointments-app/src/types/index.ts
index 0fa56ba89..dcb5a8bb5 100644
--- a/packages/esm-appointments-app/src/types/index.ts
+++ b/packages/esm-appointments-app/src/types/index.ts
@@ -149,7 +149,7 @@ export interface AppointmentSummary {
 export interface Provider {
   uuid: string;
   display: string;
-  comments: string;
+  comments?: string;
   response?: string;
   person: OpenmrsResource;
   name?: string;
diff --git a/packages/esm-appointments-app/src/workload/monthly-view-workload/monthly-view.component.tsx b/packages/esm-appointments-app/src/workload/monthly-view-workload/monthly-view.component.tsx
index 13c6091b6..670a7c775 100644
--- a/packages/esm-appointments-app/src/workload/monthly-view-workload/monthly-view.component.tsx
+++ b/packages/esm-appointments-app/src/workload/monthly-view-workload/monthly-view.component.tsx
@@ -1,11 +1,11 @@
-import dayjs from 'dayjs';
 import React, { useContext } from 'react';
+import dayjs from 'dayjs';
 import { useTranslation } from 'react-i18next';
-import DaysOfWeekCard from '../../calendar/monthly/days-of-week.component';
 import { monthDays } from '../../helpers';
+import DaysOfWeekCard from '../../calendar/monthly/days-of-week.component';
+import MonthlyWorkloadCard from './monthlyWorkCard';
 import SelectedDateContext from '../../hooks/selectedDateContext';
 import styles from './monthly-workload.scss';
-import MonthlyWorkloadCard from './monthlyWorkCard';
 
 interface MonthlyCalendarViewProps {
   calendarWorkload: Array<{ count: number; date: string }>;
@@ -13,22 +13,24 @@ interface MonthlyCalendarViewProps {
   onDateClick?: (pickedDate: Date) => void;
 }
 
-const monthFormat = 'MMMM, YYYY';
 const MonthlyCalendarView: React.FC<MonthlyCalendarViewProps> = ({
   calendarWorkload,
   dateToDisplay = '',
   onDateClick,
 }) => {
+  const monthFormat = 'MMMM, YYYY';
+  const { t } = useTranslation();
   const { selectedDate } = useContext(SelectedDateContext);
   const daysInWeek = ['SUN', 'MON', 'TUE', 'WED', 'THUR', 'FRI', 'SAT'];
   const monthViewDate = dateToDisplay === '' ? selectedDate : dateToDisplay;
+  const daysInWeeks = daysInWeek.map((day) => t(day));
+
   const handleClick = (date: Date) => {
     if (onDateClick) {
       onDateClick(date);
     }
   };
-  const { t } = useTranslation();
-  const daysInWeeks = daysInWeek.map((day) => t(day));
+
   return (
     <div className={styles.calendarViewContainer}>
       <>
diff --git a/packages/esm-appointments-app/src/workload/monthly-view-workload/monthlyWorkCard.tsx b/packages/esm-appointments-app/src/workload/monthly-view-workload/monthlyWorkCard.tsx
index 2a9c40f18..8193eea01 100644
--- a/packages/esm-appointments-app/src/workload/monthly-view-workload/monthlyWorkCard.tsx
+++ b/packages/esm-appointments-app/src/workload/monthly-view-workload/monthlyWorkCard.tsx
@@ -15,6 +15,7 @@ interface MonthlyWorkloadComponentProps {
 const MonthlyWorkloadCard: React.FC<MonthlyWorkloadComponentProps> = ({ date, count, isActive, selectedDate }) => {
   const layout = useLayoutType();
   const isToday = date.isSame(dayjs(), 'day');
+
   return (
     <div
       className={classNames(
@@ -30,7 +31,7 @@ const MonthlyWorkloadCard: React.FC<MonthlyWorkloadComponentProps> = ({ date, co
           [styles.largeDesktop]: layout !== 'small-desktop',
         },
       )}>
-      <p>
+      <div>
         <b className={[styles.calendarDate, isToday ? styles.blue : ''].join(' ')}>{date.format('D')}</b>
         <div className={styles.currentData}>
           <div tabIndex={0} role="button" className={classNames(styles.tileContainer, {})}></div>
@@ -38,7 +39,7 @@ const MonthlyWorkloadCard: React.FC<MonthlyWorkloadComponentProps> = ({ date, co
             <span className={isActive ? styles.blue : ''}>{count}</span>
           </div>
         </div>
-      </p>
+      </div>
     </div>
   );
 };
diff --git a/packages/esm-appointments-app/src/workload/workload-card.component.tsx b/packages/esm-appointments-app/src/workload/workload-card.component.tsx
index 8f547cced..b62937280 100644
--- a/packages/esm-appointments-app/src/workload/workload-card.component.tsx
+++ b/packages/esm-appointments-app/src/workload/workload-card.component.tsx
@@ -2,13 +2,14 @@ import React from 'react';
 import classNames from 'classnames';
 import styles from './workload.scss';
 
-interface WorkloadCardProp {
+interface WorkloadCardProps {
+  count: number;
   day: string;
   date: string;
-  count: number;
   isActive: boolean;
 }
-const WorkloadCard: React.FC<WorkloadCardProp> = ({ day, date, count, isActive }) => {
+
+const WorkloadCard = ({ count, day, date, isActive }: WorkloadCardProps) => {
   return (
     <div
       tabIndex={0}
@@ -28,4 +29,5 @@ const WorkloadCard: React.FC<WorkloadCardProp> = ({ day, date, count, isActive }
     </div>
   );
 };
+
 export default WorkloadCard;
diff --git a/packages/esm-appointments-app/src/workload/workload.component.tsx b/packages/esm-appointments-app/src/workload/workload.component.tsx
index b1f77e9e1..8f5c65fe0 100644
--- a/packages/esm-appointments-app/src/workload/workload.component.tsx
+++ b/packages/esm-appointments-app/src/workload/workload.component.tsx
@@ -1,12 +1,8 @@
 import React, { useState } from 'react';
-import { Tabs, Tab, TabPanel, TabPanels, TabList } from '@carbon/react';
-import WorkloadCard from './workload-card.component';
-import dayjs from 'dayjs';
-import { useTranslation } from 'react-i18next';
-import { useCalendarDistribution, useMonthlyCalendarDistribution } from './workload.resource';
-import styles from './workload.scss';
 import { useAppointmentService } from '../form/appointments-form.resource';
+import { useCalendarDistribution, useMonthlyCalendarDistribution } from './workload.resource';
 import MonthlyCalendarView from './monthly-view-workload/monthly-view.component';
+import styles from './workload.scss';
 
 interface WorkloadProps {
   selectedService: string;
@@ -15,31 +11,28 @@ interface WorkloadProps {
 }
 
 const Workload: React.FC<WorkloadProps> = ({ selectedService, appointmentDate, onWorkloadDateChange }) => {
-  const { t } = useTranslation();
-  const [selectedTab, setSelectedTab] = useState(0);
   const { data: services } = useAppointmentService();
   const serviceUuid = services?.find((service) => service.name === selectedService)?.uuid;
+
+  const [selectedTab, setSelectedTab] = useState(0);
+
   const calendarWorkload = useCalendarDistribution(serviceUuid, selectedTab === 0 ? 'week' : 'month', appointmentDate);
+
   const monthlyCalendarWorkload = useMonthlyCalendarDistribution(
     serviceUuid,
     selectedTab === 0 ? 'week' : 'month',
     appointmentDate,
   );
-  const handleDateClick = (pickedDate: Date) => {
-    onWorkloadDateChange(pickedDate);
-  };
+
+  const handleDateClick = (pickedDate: Date) => onWorkloadDateChange(pickedDate);
 
   return (
     <div className={styles.workLoadContainer}>
-      <div>
-        <div>
-          <MonthlyCalendarView
-            calendarWorkload={monthlyCalendarWorkload}
-            dateToDisplay={appointmentDate.toISOString()}
-            onDateClick={handleDateClick}
-          />
-        </div>
-      </div>
+      <MonthlyCalendarView
+        calendarWorkload={monthlyCalendarWorkload}
+        dateToDisplay={appointmentDate.toISOString()}
+        onDateClick={handleDateClick}
+      />
     </div>
   );
 };
diff --git a/packages/esm-appointments-app/src/workload/workload.resource.ts b/packages/esm-appointments-app/src/workload/workload.resource.ts
index bc80fb38f..fbd31171a 100644
--- a/packages/esm-appointments-app/src/workload/workload.resource.ts
+++ b/packages/esm-appointments-app/src/workload/workload.resource.ts
@@ -4,6 +4,7 @@ import first from 'lodash-es/first';
 import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 import { type AppointmentSummary } from '../types';
 import { omrsDateFormat } from '../constants';
+
 interface AppointmentCount {
   date: string;
   count: number;
@@ -40,6 +41,7 @@ export const useAppointmentSummary = (fromDate: Date, serviceUuid: string): Arra
   const { data } = useSWR<{ data: Array<AppointmentSummary> }>(url, openmrsFetch);
   const results = first(data?.data?.filter(({ appointmentService }) => appointmentService.uuid === serviceUuid));
   const appointmentCountMap = results?.appointmentCountMap;
+
   return Object.entries(appointmentCountMap ?? [])
     .map(([key, value]) => ({
       date: key,
@@ -47,6 +49,7 @@ export const useAppointmentSummary = (fromDate: Date, serviceUuid: string): Arra
     }))
     .sort((dateA, dateB) => new Date(dateA.date).getTime() - new Date(dateB.date).getTime());
 };
+
 export const useMonthlyCalendarDistribution = (
   serviceUuid: string,
   distributionType: 'month' | 'week',
diff --git a/packages/esm-appointments-app/translations/am.json b/packages/esm-appointments-app/translations/am.json
index 8e551fe63..72d4ba088 100644
--- a/packages/esm-appointments-app/translations/am.json
+++ b/packages/esm-appointments-app/translations/am.json
@@ -7,6 +7,7 @@
   "appointmentCancelError": "Error cancelling appointment",
   "appointmentCancelled": "Appointment Cancelled",
   "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "Appointment color",
   "appointmentConflict": "Appointment conflict",
   "appointmentEdited": "Appointment edited",
@@ -18,6 +19,7 @@
   "appointmentEndError": "Error ending appointment",
   "appointmentFormError": "Error scheduling appointment",
   "appointmentHistory": "Appointment History",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "Appointment metrics",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "Write an additional note",
@@ -92,7 +94,6 @@
   "highestServiceVolume": "Highest volume service: {{time}}",
   "identifier": "Identifier",
   "invalidNumber": "Number is not valid",
-  "invalidTime": "Invalid time",
   "isRecurringAppointment": "Is this a recurring appointment?",
   "itemsPerPage": "Items per page",
   "loading": "Loading",
@@ -159,6 +160,7 @@
   "unscheduledAppointments_lower": "unscheduled appointments",
   "upcoming": "Upcoming",
   "upcomingAppointments": "Upcoming appointments",
+  "updateError": "Error updating upcoming appointment",
   "view": "View",
   "vitals": "Vitals",
   "week": "Week",
diff --git a/packages/esm-appointments-app/translations/ar.json b/packages/esm-appointments-app/translations/ar.json
index 2a6c0ce9c..532d10393 100644
--- a/packages/esm-appointments-app/translations/ar.json
+++ b/packages/esm-appointments-app/translations/ar.json
@@ -7,6 +7,7 @@
   "appointmentCancelError": "خطأ في إلغاء الموعد",
   "appointmentCancelled": "تم إلغاء الموعد",
   "appointmentCancelledSuccessfully": "تم إلغاء الموعد بنجاح",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "لون الموعد",
   "appointmentConflict": "تعارض بالمواعيد",
   "appointmentEdited": "تم تعديل الموعد",
@@ -18,6 +19,7 @@
   "appointmentEndError": "خطأ في انهاء الموعد",
   "appointmentFormError": "خطأ في جدولة الموعد",
   "appointmentHistory": "تاريخ الموعد",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "مقاييس الموعد",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "كتابة ملاحظة اضافية",
@@ -32,8 +34,8 @@
   "appointmentService": "خدمة الموعد",
   "appointmentServiceCreate": "تم إنشاء خدمة الموعد بنجاح",
   "appointmentServiceName": "اسم خدمة الموعد",
-  "appointmentsScheduledForToday": "appointments scheduled for today",
-  "appointmentsTable": "Appointments table",
+  "appointmentsScheduledForToday": "المواعيد المقررة لهذا اليوم",
+  "appointmentsTable": "جدول المواعيد",
   "appointmentStatus": "Appointment status",
   "appointmentToFulfill": "Select appointment to fulfill",
   "appointmentType": "نوع الموعد",
@@ -63,7 +65,7 @@
   "date": "تاريخ",
   "date&Time": "Date & time",
   "dateAppointmentIssuedCannotBeAfterAppointmentDate": "Date appointment issued cannot be after the appointment date",
-  "dateOfBirth": "Date of birth",
+  "dateOfBirth": "تاريخ الميلاد",
   "dateScheduled": "Date appointment issued",
   "dateScheduledDetail": "Date appointment issued",
   "dateTime": "Date & Time",
@@ -92,9 +94,8 @@
   "highestServiceVolume": "Highest volume service: {{time}}",
   "identifier": "معرف",
   "invalidNumber": "Number is not valid",
-  "invalidTime": "Invalid time",
   "isRecurringAppointment": "Is this a recurring appointment?",
-  "itemsPerPage": "Items per page",
+  "itemsPerPage": "العناصر لكل صفحة",
   "loading": "Loading",
   "location": "الموقع",
   "medications": "الأدوية",
@@ -103,7 +104,7 @@
   "nextMonth": "Next month",
   "nextPage": "Next page",
   "no": "لا",
-  "noAppointmentsToDisplay": "No appointments to display",
+  "noAppointmentsToDisplay": "لا توجد مواعيد لعرضها",
   "noContent": "No Content",
   "noCurrentAppointments": "لا توجد مواعيد مجدولة لهذا المريض اليوم",
   "noEncountersFound": "لم يتم العثور على لقاءات",
@@ -131,10 +132,10 @@
   "recurringAppointmentShouldHaveEndDate": "A recurring appointment should have an end date",
   "repeatEvery": "Repeat every",
   "save": "حفظ",
-  "saveAndClose": "Save and close",
+  "saveAndClose": "حفظ وإغلاق",
   "scheduled": "مجدول",
   "scheduledAppointments": "المواعيد المجدولة",
-  "scheduledForToday": "Scheduled For Today",
+  "scheduledForToday": "مجدول لليوم",
   "selectALocation": "Select a location",
   "selectAppointmentStatus": "اختر الحالة",
   "selectAppointmentType": "اختر نوع الموعد",
@@ -159,6 +160,7 @@
   "unscheduledAppointments_lower": "مواعيد غير مجدولة",
   "upcoming": "القادمة",
   "upcomingAppointments": "المواعيد القادمة",
+  "updateError": "Error updating upcoming appointment",
   "view": "عرض",
   "vitals": "العلامات الحيوية",
   "week": "Week",
diff --git a/packages/esm-appointments-app/translations/de.json b/packages/esm-appointments-app/translations/de.json
index e26cc97bd..d8bf71b55 100644
--- a/packages/esm-appointments-app/translations/de.json
+++ b/packages/esm-appointments-app/translations/de.json
@@ -7,6 +7,7 @@
   "appointmentCancelError": "Error cancelling appointment",
   "appointmentCancelled": "Appointment Cancelled",
   "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "Appointment color",
   "appointmentConflict": "Appointment conflict",
   "appointmentEdited": "Appointment edited",
@@ -18,6 +19,7 @@
   "appointmentEndError": "Error ending appointment",
   "appointmentFormError": "Error scheduling appointment",
   "appointmentHistory": "Appointment History",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "Appointment metrics",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "Write an additional note",
@@ -92,7 +94,6 @@
   "highestServiceVolume": "Highest volume service: {{time}}",
   "identifier": "Identifier",
   "invalidNumber": "Number is not valid",
-  "invalidTime": "Invalid time",
   "isRecurringAppointment": "Is this a recurring appointment?",
   "itemsPerPage": "Items per page",
   "loading": "Loading",
@@ -159,6 +160,7 @@
   "unscheduledAppointments_lower": "unscheduled appointments",
   "upcoming": "Upcoming",
   "upcomingAppointments": "Upcoming appointments",
+  "updateError": "Error updating upcoming appointment",
   "view": "View",
   "vitals": "Vitals",
   "week": "Week",
diff --git a/packages/esm-appointments-app/translations/en.json b/packages/esm-appointments-app/translations/en.json
index e26cc97bd..d8bf71b55 100644
--- a/packages/esm-appointments-app/translations/en.json
+++ b/packages/esm-appointments-app/translations/en.json
@@ -7,6 +7,7 @@
   "appointmentCancelError": "Error cancelling appointment",
   "appointmentCancelled": "Appointment Cancelled",
   "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "Appointment color",
   "appointmentConflict": "Appointment conflict",
   "appointmentEdited": "Appointment edited",
@@ -18,6 +19,7 @@
   "appointmentEndError": "Error ending appointment",
   "appointmentFormError": "Error scheduling appointment",
   "appointmentHistory": "Appointment History",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "Appointment metrics",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "Write an additional note",
@@ -92,7 +94,6 @@
   "highestServiceVolume": "Highest volume service: {{time}}",
   "identifier": "Identifier",
   "invalidNumber": "Number is not valid",
-  "invalidTime": "Invalid time",
   "isRecurringAppointment": "Is this a recurring appointment?",
   "itemsPerPage": "Items per page",
   "loading": "Loading",
@@ -159,6 +160,7 @@
   "unscheduledAppointments_lower": "unscheduled appointments",
   "upcoming": "Upcoming",
   "upcomingAppointments": "Upcoming appointments",
+  "updateError": "Error updating upcoming appointment",
   "view": "View",
   "vitals": "Vitals",
   "week": "Week",
diff --git a/packages/esm-appointments-app/translations/es.json b/packages/esm-appointments-app/translations/es.json
index 0517bae97..03c0b87be 100644
--- a/packages/esm-appointments-app/translations/es.json
+++ b/packages/esm-appointments-app/translations/es.json
@@ -3,26 +3,28 @@
   "actions": "Acciones",
   "add": "Agregar",
   "age": "Edad",
-  "allDay": "All day",
+  "allDay": "Todo el día",
   "appointmentCancelError": "Error al cancelar la cita",
-  "appointmentCancelled": "Cita cancelada",
+  "appointmentCancelled": "Cita Cancelada",
   "appointmentCancelledSuccessfully": "Cita cancelada con éxito",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "Color de la cita",
   "appointmentConflict": "Conflicto en las citas",
   "appointmentEdited": "Cita editada",
-  "appointmentEditError": "Error al editar cita",
+  "appointmentEditError": "Error al editar la cita",
   "appointmentEnded": "Cita finalizada",
-  "appointmentEndedAndVisitClosedSuccessfully": "Appointment successfully ended and visit successfully closed",
-  "appointmentEndedButVisitNotClosedError": "Cita finalizada, pero hubo un error al cerrar la visita",
-  "appointmentEndedSuccessfully": "Cita finalizada con éxito ",
-  "appointmentEndError": "Error al finalizar cita",
+  "appointmentEndedAndVisitClosedSuccessfully": "Cita finalizada exitosamente y consulta cerrada exitosamente",
+  "appointmentEndedButVisitNotClosedError": "Cita finalizada, pero hubo un error al cerrar la consulta",
+  "appointmentEndedSuccessfully": "Cita finalizada con éxito.",
+  "appointmentEndError": "Error al finalizar la cita",
   "appointmentFormError": "Error al programar la cita",
-  "appointmentHistory": "Historial de citas",
+  "appointmentHistory": "Historial de Citas",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "Métricas de citas",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "Escriba una nota adicional",
-  "appointmentNotePlaceholder": "Escriba algún punto adicional aquí",
-  "appointmentNotes": "Notas de cita",
+  "appointmentNotePlaceholder": "Escriba cualquier punto adicional aquí",
+  "appointmentNotes": "Notas de la Cita",
   "appointmentNowVisible": "Ahora es visible en la página de Citas",
   "appointments": "Citas",
   "Appointments": "Citas",
@@ -34,25 +36,25 @@
   "appointmentServiceName": "Nombre del servicio de citas",
   "appointmentsScheduledForToday": "citas agendadas para hoy",
   "appointmentsTable": "Tabla de citas",
-  "appointmentStatus": "Appointment status",
-  "appointmentToFulfill": "Seleccione cita para completar",
+  "appointmentStatus": "Estado de la cita",
+  "appointmentToFulfill": "Seleccione una cita para completar",
   "appointmentType": "Tipo de cita",
-  "appointmentType_title": "Tipo de cita",
+  "appointmentType_title": "Tipo de Cita",
   "back": "Atrás",
   "calendar": "Calendario",
-  "cameEarly": "Llegó temprano",
+  "cameEarly": "Llegó Temprano",
   "cancel": "Cancelar",
-  "cancelAppointment": "Cancelar cita",
+  "cancelAppointment": "Cancelar Cita",
   "cancelAppointmentModalConfirmationText": "¿Está seguro de que desea cancelar esta cita?",
   "cancelled": "Cancelada",
-  "checkedIn": "Checked in",
-  "checkedOut": "Completada",
-  "checkFilters": "Compruebe los filtros anteriores",
-  "checkIn": "Registrar",
-  "checkOut": "Finalizar",
-  "chooseAppointmentType": "Escoja un tipo de cita",
-  "chooseLocation": "Escoja una ubicación",
-  "chooseProvider": "Escoja un proveedor",
+  "checkedIn": "Llegada Registrada",
+  "checkedOut": "Salida Registrada",
+  "checkFilters": "Revise los filtros arriba",
+  "checkIn": "Registrar Entrada",
+  "checkOut": "Registrar Salida",
+  "chooseAppointmentType": "Elija un tipo de cita",
+  "chooseLocation": "Elija una ubicación",
+  "chooseProvider": "Elija un proveedor de la salud",
   "chooseService": "Seleccionar servicio",
   "completed": "Completado",
   "Contact": "Contacto {{index}}",
@@ -61,41 +63,40 @@
   "createAppointmentService": "Crear servicios de citas",
   "createNewAppointment": "Crear nueva cita",
   "date": "Fecha",
-  "date&Time": "Date & time",
-  "dateAppointmentIssuedCannotBeAfterAppointmentDate": "La fecha en que se emitió la cita no puede ser posterior a la fecha de la cita",
+  "date&Time": "Fecha y hora",
+  "dateAppointmentIssuedCannotBeAfterAppointmentDate": "La fecha de emisión de la cita no puede ser posterior a la fecha de la cita",
   "dateOfBirth": "Fecha de nacimiento",
   "dateScheduled": "Fecha de emisión de la cita",
   "dateScheduledDetail": "Fecha de emisión de la cita",
-  "dateTime": "Fecha y hora",
+  "dateTime": "Fecha y Hora",
   "day": "Día",
   "daysOfWeek": "Días de la semana",
   "discard": "Descartar",
   "download": "Descargar",
-  "durationErrorMessage": "La duración debería ser mayor a cero",
+  "durationErrorMessage": "La duración debe ser mayor que cero",
   "durationInMinutes": "Duración (minutos)",
   "durationMins": "Duración (min)",
   "edit": "Editar",
-  "editAppointment": "Editar cita",
-  "editAppointments": "Editar cita",
+  "editAppointment": "Editar Cita",
+  "editAppointments": "Editar Cita",
   "emptyStateText": "No hay <1>{{displayText}}</1> para mostrar",
   "encounters": "Encuentros",
   "encounterType": "Tipo de encuentro",
-  "endAppointmentAndVisitConfirmationMessage": "Marcar al paciente como dado de alta indicará que la cita está completa y cerrará la visita activa para este paciente.",
-  "endAppointmentConfirmation": "¿Está seguro de que desea marcar al paciente como dado de alta para esta cita?",
-  "endAppointmentConfirmationMessage": "Marcar al paciente como dado de alta indicará que la cita está completa.",
+  "endAppointmentAndVisitConfirmationMessage": "Registrar la salida del paciente marcará la cita como completada y cerrará la consulta activa para este paciente.",
+  "endAppointmentConfirmation": "¿Está seguro de que desea registrar la salida del paciente para esta cita?",
+  "endAppointmentConfirmationMessage": "Registrar la salida del paciente marcará la cita como completada.",
   "endDate": "Fecha de finalización",
   "endTime": "Hora de finalización",
-  "errorCreatingAppointmentService": "Error creating appointment service",
-  "expected": "Expected",
+  "errorCreatingAppointmentService": "Error al crear el servicio de cita",
+  "expected": "Esperado",
   "filterTable": "Filtrar tabla",
   "gender": "Género",
   "highestServiceVolume": "Servicio de mayor volumen: {{time}}",
   "identifier": "Identificador",
   "invalidNumber": "El número no es válido",
-  "invalidTime": "Hora inválida",
   "isRecurringAppointment": "¿Esta es una cita recurrente?",
   "itemsPerPage": "Elementos por página",
-  "loading": "Loading",
+  "loading": "Cargando",
   "location": "Ubicación",
   "medications": "Medicamentos",
   "missed": "Perdida",
@@ -104,19 +105,19 @@
   "nextPage": "Siguiente página",
   "no": "No",
   "noAppointmentsToDisplay": "No hay citas para mostrar",
-  "noContent": "No hay contenido",
-  "noCurrentAppointments": "No hay citas programadas que mostrar para hoy para este paciente",
+  "noContent": "No hay Contenido",
+  "noCurrentAppointments": "No hay citas programadas para hoy para mostrar para este paciente.",
   "noEncountersFound": "No se encontraron encuentros",
   "noPastAppointments": "No hay citas anteriores para mostrar para este paciente",
-  "noPreviousVisitFound": "No se encontraron visitas anteriores",
+  "noPreviousVisitFound": "No se encontraron consultas anteriores",
   "notArrived": "No ha llegado",
   "note": "Nota",
   "notes": "Notas",
-  "noUpcomingAppointments": "No hay próximas citas para mostrar para este paciente",
-  "noUpcomingAppointmentsForPatient": "No hay próximas citas para mostrar para este paciente",
+  "noUpcomingAppointments": "No se encontraron próximas citas",
+  "noUpcomingAppointmentsForPatient": "No hay próximas citas para mostrar para este paciente.",
   "pageNumber": "Número de página",
-  "past": "Anterior",
-  "patientDetails": "Detalles del paciente",
+  "past": "Pasado",
+  "patientDetails": "Detalles del Paciente",
   "patientDoubleBooking": "El paciente ya agendó una cita para esta hora",
   "patientName": "Nombre del paciente",
   "patients": "Pacientes",
@@ -124,28 +125,28 @@
   "prev": "Ant",
   "previousMonth": "Mes anterior",
   "previousPage": "Página anterior",
-  "provider": "Proveedor",
-  "providers": "Proveedores",
-  "providersBooked": "Proveedores agendados: {{time}}",
-  "recurringAppointment": "Cita recurrente",
-  "recurringAppointmentShouldHaveEndDate": "Una cita recurrente debería tener una fecha de finalización",
+  "provider": "Proveedor de la Salud",
+  "providers": "Personal de la Salud",
+  "providersBooked": "Personal de la Salud agendado: {{time}}",
+  "recurringAppointment": "Cita Recurrente",
+  "recurringAppointmentShouldHaveEndDate": "Una cita recurrente debe tener una fecha de finalización",
   "repeatEvery": "Repetir cada",
   "save": "Guardar",
   "saveAndClose": "Guardar y cerrar",
   "scheduled": "Programada",
   "scheduledAppointments": "Citas programadas",
-  "scheduledForToday": "Agendada Para Hoy",
+  "scheduledForToday": "Programada Para Hoy",
   "selectALocation": "Seleccionar una ubicación",
   "selectAppointmentStatus": "Seleccionar estado",
-  "selectAppointmentType": "Seleccionar tipo de cita",
+  "selectAppointmentType": "Seleccione un tipo de cita",
   "selectLocation": "Seleccionar ubicación",
-  "selectOption": "Seleccionar una opción",
-  "selectProvider": "Seleccionar un proveedor",
-  "selectService": "Seleccionar servicio",
+  "selectOption": "Seleccione una opción",
+  "selectProvider": "Seleccione un proveedor de la salud",
+  "selectService": "Seleccione un servicio",
   "selectServiceType": "Seleccionar tipo de servicio",
   "service": "Servicio",
   "serviceName": "Nombre del servicio",
-  "serviceType": "Tipo de servicio",
+  "serviceType": "Tipo de Servicio",
   "serviceUnavailable": "La hora de la cita está fuera de las horas de servicio",
   "startDate": "Fecha de inicio",
   "startTime": "Hora de inicio",
@@ -153,14 +154,15 @@
   "time": "Tiempo",
   "today": "Hoy",
   "todays": "Hoy día es",
-  "type": "Tip",
+  "type": "Tipo",
   "unscheduled": "No programada",
   "unscheduledAppointments": "Citas no programadas",
   "unscheduledAppointments_lower": "citas no programadas",
   "upcoming": "Próximas",
   "upcomingAppointments": "Próximas citas",
+  "updateError": "Error updating upcoming appointment",
   "view": "Ver",
-  "vitals": "Signos vitales",
+  "vitals": "Signos Vitales",
   "week": "Semana",
   "yes": "Sí"
 }
diff --git a/packages/esm-appointments-app/translations/fr.json b/packages/esm-appointments-app/translations/fr.json
index 46cf3efa3..e09b12bc4 100644
--- a/packages/esm-appointments-app/translations/fr.json
+++ b/packages/esm-appointments-app/translations/fr.json
@@ -7,6 +7,7 @@
   "appointmentCancelError": "Erreur d’annulation du rendez-vous",
   "appointmentCancelled": "Rendez-vous annulé",
   "appointmentCancelledSuccessfully": "Rendez-vous annulé avec succès",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "Couleur du rendez-vous",
   "appointmentConflict": "Conflit du rendez-vous",
   "appointmentEdited": "Rendez-vous modifié",
@@ -18,6 +19,7 @@
   "appointmentEndError": "Erreur lors de la clôture du rendez-vous",
   "appointmentFormError": "Erreur lors de la planification du rendez-vous",
   "appointmentHistory": "Historique de Rendez-vous",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "Métriques de rendez-vous",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "Écrire une note additionnelle",
@@ -92,7 +94,6 @@
   "highestServiceVolume": "Service le plus utilisé: {{time}}",
   "identifier": "Identifiant",
   "invalidNumber": "Le numéro n'est pas valide",
-  "invalidTime": "Heure non valide",
   "isRecurringAppointment": "S'agit-il d'un rendez-vous récurrent?",
   "itemsPerPage": "Eléments par page",
   "loading": "En cours de chargement",
@@ -159,6 +160,7 @@
   "unscheduledAppointments_lower": "rendez-vous non-planifiés",
   "upcoming": "À venir",
   "upcomingAppointments": "À venir rendez-vous",
+  "updateError": "Error updating upcoming appointment",
   "view": "Vue",
   "vitals": "Signes Vitaux",
   "week": "Semaine",
diff --git a/packages/esm-appointments-app/translations/he.json b/packages/esm-appointments-app/translations/he.json
index 792b610dd..ee77235c6 100644
--- a/packages/esm-appointments-app/translations/he.json
+++ b/packages/esm-appointments-app/translations/he.json
@@ -1,165 +1,167 @@
 {
   "action": "פעולה",
   "actions": "פעולות",
-  "add": "הוסף",
+  "add": "הוספה",
   "age": "גיל",
   "allDay": "כל היום",
   "appointmentCancelError": "שגיאה בביטול התור",
   "appointmentCancelled": "התור בוטל",
   "appointmentCancelledSuccessfully": "התור בוטל בהצלחה",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "צבע התור",
-  "appointmentConflict": "Appointment conflict",
-  "appointmentEdited": "Appointment edited",
-  "appointmentEditError": "Error editing appointment",
-  "appointmentEnded": "Appointment ended",
-  "appointmentEndedAndVisitClosedSuccessfully": "Appointment successfully ended and visit successfully closed",
-  "appointmentEndedButVisitNotClosedError": "Appointment ended, but error closing visit",
-  "appointmentEndedSuccessfully": "Appointment successfully ended.",
-  "appointmentEndError": "Error ending appointment",
+  "appointmentConflict": "סתירת תורים",
+  "appointmentEdited": "התור נערך",
+  "appointmentEditError": "שגיאה בעריכת תור",
+  "appointmentEnded": "התור הסתיים",
+  "appointmentEndedAndVisitClosedSuccessfully": "התור הסתיים והביקור נסגר בהצלחה",
+  "appointmentEndedButVisitNotClosedError": "התור הסתיים אבל אירעה שגיאה בסגירת הביקור",
+  "appointmentEndedSuccessfully": "התור הסתיים בהצלחה.",
+  "appointmentEndError": "שגיאה בסיום תור",
   "appointmentFormError": "שגיאה בתזמון התור",
   "appointmentHistory": "היסטוריית התורים",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "מדדי התורים",
   "appointmentMetricsLoadError": "",
-  "appointmentNoteLabel": "Write an additional note",
-  "appointmentNotePlaceholder": "Write any additional points here",
+  "appointmentNoteLabel": "הצגת הערה נוספ",
+  "appointmentNotePlaceholder": "כאן ניתן לכתוב נקודות נוספות",
   "appointmentNotes": "הערות לתור",
-  "appointmentNowVisible": "התור כעת נראה בעמוד התורים",
+  "appointmentNowVisible": "התור מופיע כעת בעמוד התורים",
   "appointments": "תורים",
-  "Appointments": "Appointments",
-  "appointments_lower": "appointments",
-  "appointmentsCalendar": "Appointments calendar",
+  "Appointments": "תורים",
+  "appointments_lower": "תורים",
+  "appointmentsCalendar": "לוח תורים",
   "appointmentScheduled": "התור נקבע",
-  "appointmentService": "שירות התור",
-  "appointmentServiceCreate": "שירות התור נוצר בהצלחה",
-  "appointmentServiceName": "שם שירות התור",
-  "appointmentsScheduledForToday": "appointments scheduled for today",
-  "appointmentsTable": "Appointments table",
-  "appointmentStatus": "סטטוס התור",
-  "appointmentToFulfill": "Select appointment to fulfill",
+  "appointmentService": "שירות התורים",
+  "appointmentServiceCreate": "שירות התורים נוצר בהצלחה",
+  "appointmentServiceName": "שם שירות התורים",
+  "appointmentsScheduledForToday": "תורים שתוזמנו להיום",
+  "appointmentsTable": "טבלת תורים",
+  "appointmentStatus": "מצב התור",
+  "appointmentToFulfill": "נא לבחור תור למילוי",
   "appointmentType": "סוג התור",
   "appointmentType_title": "סוג התור",
-  "back": "חזור",
+  "back": "חזרה",
   "calendar": "לוח שנה",
-  "cameEarly": "הגיע מוקדם",
+  "cameEarly": "הקדמה",
   "cancel": "ביטול",
   "cancelAppointment": "ביטול תור",
-  "cancelAppointmentModalConfirmationText": "?האם אתה בטוח שברצונך לבטל תור זה",
+  "cancelAppointmentModalConfirmationText": "לבטל את התור הזה?",
   "cancelled": "בוטל",
   "checkedIn": "נרשם",
   "checkedOut": "נסגר",
-  "checkFilters": "Check the filters above",
+  "checkFilters": "נא לסמן את המסננים לעיל",
   "checkIn": "הרשמה",
-  "checkOut": "לראות",
-  "chooseAppointmentType": "Choose appointment type",
-  "chooseLocation": "Choose a location",
-  "chooseProvider": "Choose a provider",
+  "checkOut": "סגירה",
+  "chooseAppointmentType": "בחירת סוג תור",
+  "chooseLocation": "נא לבחור מקום",
+  "chooseProvider": "נא לבחור ספק",
   "chooseService": "בחירת שירות",
   "completed": "הושלם",
-  "Contact": "Contact {{index}}",
-  "countMore_one": "{{count}} more",
-  "countMore_other": "{{count}} more",
+  "Contact": "יצירת קשר עם {{index}}",
+  "countMore_one": "עוד {{count}}",
+  "countMore_other": "עוד {{count}}",
   "createAppointmentService": "יצירת שירותי תורים",
   "createNewAppointment": "יצירת תור חדש",
   "date": "תאריך",
   "date&Time": "תאריך ושעה",
-  "dateAppointmentIssuedCannotBeAfterAppointmentDate": "Date appointment issued cannot be after the appointment date",
-  "dateOfBirth": "Date of birth",
-  "dateScheduled": "Date appointment issued",
-  "dateScheduledDetail": "Date appointment issued",
-  "dateTime": "Date & Time",
-  "day": "Day",
-  "daysOfWeek": "Days of the week",
+  "dateAppointmentIssuedCannotBeAfterAppointmentDate": "תאריך התור שהונפק לא יכול להיות אחרי תאריך התור",
+  "dateOfBirth": "תאריך לידה",
+  "dateScheduled": "הונפק תאריך לתור",
+  "dateScheduledDetail": "הונפק תאריך לתור",
+  "dateTime": "תאריך ושעה",
+  "day": "יום",
+  "daysOfWeek": "ימי השבוע",
   "discard": "סגירה מבלי לשמור",
   "download": "הורדה",
-  "durationErrorMessage": "Duration should be greater than zero",
-  "durationInMinutes": "Duration (minutes)",
+  "durationErrorMessage": "המשך צריך להיות גדול מאפס",
+  "durationInMinutes": "משך (דקות)",
   "durationMins": "משך בדקות",
-  "edit": "ערוך",
+  "edit": "עריכה",
   "editAppointment": "עריכת תור",
-  "editAppointments": "עריכת תורים",
-  "emptyStateText": "There are no <1>{{displayText}}</1> to display",
+  "editAppointments": "עריכת תור",
+  "emptyStateText": "אין <1>{{displayText}}</1> להצגה",
   "encounters": "פגישות",
   "encounterType": "סוג הפגישה",
   "endAppointmentAndVisitConfirmationMessage": "Checking the patient out will mark the appointment as complete, and close out the active visit for this patient.",
   "endAppointmentConfirmation": "Are you sure you want to check the patient out for this appointment?",
   "endAppointmentConfirmationMessage": "Checking the patient out will mark the appointment as complete.",
-  "endDate": "End date",
+  "endDate": "תאריך סיום",
   "endTime": "שעת סיום",
   "errorCreatingAppointmentService": "שגיאה ביצירת שירות התור",
   "expected": "צפוי",
-  "filterTable": "Filter table",
+  "filterTable": "סינון הטבלה",
   "gender": "מגדר",
-  "highestServiceVolume": "Highest volume service: {{time}}",
+  "highestServiceVolume": "השירות הכי עמוס: {{time}}",
   "identifier": "מזהה",
-  "invalidNumber": "Number is not valid",
-  "invalidTime": "Invalid time",
-  "isRecurringAppointment": "Is this a recurring appointment?",
-  "itemsPerPage": "Items per page",
-  "loading": "טוען",
-  "location": "מיקום",
+  "invalidNumber": "המספר שגוי",
+  "isRecurringAppointment": "זה תור חוזר?",
+  "itemsPerPage": "פריטים בעמוד",
+  "loading": "בטעינה",
+  "location": "מקום",
   "medications": "תרופות",
-  "missed": "לא התקיים",
-  "next": "Next",
-  "nextMonth": "Next month",
-  "nextPage": "Next page",
+  "missed": "הוחמץ",
+  "next": "הבא",
+  "nextMonth": "חודש הבא",
+  "nextPage": "העמוד הבא",
   "no": "לא",
-  "noAppointmentsToDisplay": "No appointments to display",
-  "noContent": "No Content",
+  "noAppointmentsToDisplay": "אין תורים להצגה",
+  "noContent": "אין תוכן",
   "noCurrentAppointments": "אין תורים מתוזמנים להצגה עבור מטופל זה ליום הזה",
   "noEncountersFound": "לא נמצאו פגישות",
-  "noPastAppointments": "אין תורים עבריים להצגה עבור מטופל זה",
+  "noPastAppointments": "אין תורי עבר להצגה עבור מטופל/ת אלה",
   "noPreviousVisitFound": "לא נמצא ביקור קודם",
-  "notArrived": "לא הגיע",
-  "note": "Note",
+  "notArrived": "לא הגיע/ה",
+  "note": "הערה",
   "notes": "הערות",
-  "noUpcomingAppointments": "אין תורים עתידיים להצגה עבור מטופל זה",
-  "noUpcomingAppointmentsForPatient": "אין תורים עתידיים להצגה עבור מטופל זה",
-  "pageNumber": "Page number",
+  "noUpcomingAppointments": "לא נמצאו תורים עתידיים",
+  "noUpcomingAppointmentsForPatient": "לא נמצאו תורים עתידיים למטפל/ת האלה",
+  "pageNumber": "מספר עמוד",
   "past": "עבר",
   "patientDetails": "פרטי המטופל",
-  "patientDoubleBooking": "Patient already booked for an appointment at this time",
+  "patientDoubleBooking": "למטופל/ת כבר הוזמן תור במועד הזה",
   "patientName": "שם המטופל",
   "patients": "מטופלים",
-  "period": "Period",
-  "prev": "Prev",
-  "previousMonth": "Previous month",
-  "previousPage": "Previous page",
+  "period": "תקופה",
+  "prev": "הקודם",
+  "previousMonth": "החודש הקודם",
+  "previousPage": "העמוד הקודם",
   "provider": "ספק",
   "providers": "ספקים",
-  "providersBooked": "Providers booked: {{time}}",
-  "recurringAppointment": "Recurring Appointment",
-  "recurringAppointmentShouldHaveEndDate": "A recurring appointment should have an end date",
-  "repeatEvery": "Repeat every",
+  "providersBooked": "ספקים שהוזמנו: {{time}}",
+  "recurringAppointment": "תור חוזר",
+  "recurringAppointmentShouldHaveEndDate": "לתור חוזר צריך להיות תאריך סיום",
+  "repeatEvery": "חוזר כל",
   "save": "שמירה",
-  "saveAndClose": "Save and close",
+  "saveAndClose": "שמירה וסגירה",
   "scheduled": "מתוזמן",
   "scheduledAppointments": "תורים מתוזמנים",
-  "scheduledForToday": "Scheduled For Today",
-  "selectALocation": "Select a location",
-  "selectAppointmentStatus": "בחר סטטוס",
-  "selectAppointmentType": "בחר סוג תור",
-  "selectLocation": "בחר מיקום",
-  "selectOption": "בחר אפשרות",
-  "selectProvider": "Select a provider",
-  "selectService": "בחר שירות",
-  "selectServiceType": "בחר סוג שירות",
+  "scheduledForToday": "מתוזמן להיום",
+  "selectALocation": "בחירת מקום",
+  "selectAppointmentStatus": "בחירת מצב",
+  "selectAppointmentType": "בחירת סוג תור",
+  "selectLocation": "בחירת מקום",
+  "selectOption": "בחירת אפשרות",
+  "selectProvider": "בחירת ספק",
+  "selectService": "בחירת שירות",
+  "selectServiceType": "בחירת סוג שירות",
   "service": "שירות",
   "serviceName": "שם השירות",
   "serviceType": "סוג השירות",
-  "serviceUnavailable": "Appointment time is outside of service hours",
-  "startDate": "Start date",
+  "serviceUnavailable": "זמן התור הוא מחוץ לשעות השירות",
+  "startDate": "תאריך התחלה",
   "startTime": "שעת התחלה",
-  "status": "Status",
+  "status": "מצב",
   "time": "זמן",
   "today": "היום",
-  "todays": "Today's",
-  "type": "Type",
+  "todays": "להיום",
+  "type": "סוג",
   "unscheduled": "לא מתוזמן",
   "unscheduledAppointments": "תורים שאינם מתוזמנים",
   "unscheduledAppointments_lower": "תורים שאינם מתוזמנים",
   "upcoming": "בקרוב",
   "upcomingAppointments": "תורים עתידיים",
-  "view": "הצג",
+  "updateError": "Error updating upcoming appointment",
+  "view": "הצגה",
   "vitals": "מדדים",
   "week": "Week",
   "yes": "כן"
diff --git a/packages/esm-appointments-app/translations/hi.json b/packages/esm-appointments-app/translations/hi.json
index e26cc97bd..d8bf71b55 100644
--- a/packages/esm-appointments-app/translations/hi.json
+++ b/packages/esm-appointments-app/translations/hi.json
@@ -7,6 +7,7 @@
   "appointmentCancelError": "Error cancelling appointment",
   "appointmentCancelled": "Appointment Cancelled",
   "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "Appointment color",
   "appointmentConflict": "Appointment conflict",
   "appointmentEdited": "Appointment edited",
@@ -18,6 +19,7 @@
   "appointmentEndError": "Error ending appointment",
   "appointmentFormError": "Error scheduling appointment",
   "appointmentHistory": "Appointment History",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "Appointment metrics",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "Write an additional note",
@@ -92,7 +94,6 @@
   "highestServiceVolume": "Highest volume service: {{time}}",
   "identifier": "Identifier",
   "invalidNumber": "Number is not valid",
-  "invalidTime": "Invalid time",
   "isRecurringAppointment": "Is this a recurring appointment?",
   "itemsPerPage": "Items per page",
   "loading": "Loading",
@@ -159,6 +160,7 @@
   "unscheduledAppointments_lower": "unscheduled appointments",
   "upcoming": "Upcoming",
   "upcomingAppointments": "Upcoming appointments",
+  "updateError": "Error updating upcoming appointment",
   "view": "View",
   "vitals": "Vitals",
   "week": "Week",
diff --git a/packages/esm-appointments-app/translations/hi_IN.json b/packages/esm-appointments-app/translations/hi_IN.json
index e26cc97bd..d8bf71b55 100644
--- a/packages/esm-appointments-app/translations/hi_IN.json
+++ b/packages/esm-appointments-app/translations/hi_IN.json
@@ -7,6 +7,7 @@
   "appointmentCancelError": "Error cancelling appointment",
   "appointmentCancelled": "Appointment Cancelled",
   "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "Appointment color",
   "appointmentConflict": "Appointment conflict",
   "appointmentEdited": "Appointment edited",
@@ -18,6 +19,7 @@
   "appointmentEndError": "Error ending appointment",
   "appointmentFormError": "Error scheduling appointment",
   "appointmentHistory": "Appointment History",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "Appointment metrics",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "Write an additional note",
@@ -92,7 +94,6 @@
   "highestServiceVolume": "Highest volume service: {{time}}",
   "identifier": "Identifier",
   "invalidNumber": "Number is not valid",
-  "invalidTime": "Invalid time",
   "isRecurringAppointment": "Is this a recurring appointment?",
   "itemsPerPage": "Items per page",
   "loading": "Loading",
@@ -159,6 +160,7 @@
   "unscheduledAppointments_lower": "unscheduled appointments",
   "upcoming": "Upcoming",
   "upcomingAppointments": "Upcoming appointments",
+  "updateError": "Error updating upcoming appointment",
   "view": "View",
   "vitals": "Vitals",
   "week": "Week",
diff --git a/packages/esm-appointments-app/translations/id.json b/packages/esm-appointments-app/translations/id.json
index e26cc97bd..d8bf71b55 100644
--- a/packages/esm-appointments-app/translations/id.json
+++ b/packages/esm-appointments-app/translations/id.json
@@ -7,6 +7,7 @@
   "appointmentCancelError": "Error cancelling appointment",
   "appointmentCancelled": "Appointment Cancelled",
   "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "Appointment color",
   "appointmentConflict": "Appointment conflict",
   "appointmentEdited": "Appointment edited",
@@ -18,6 +19,7 @@
   "appointmentEndError": "Error ending appointment",
   "appointmentFormError": "Error scheduling appointment",
   "appointmentHistory": "Appointment History",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "Appointment metrics",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "Write an additional note",
@@ -92,7 +94,6 @@
   "highestServiceVolume": "Highest volume service: {{time}}",
   "identifier": "Identifier",
   "invalidNumber": "Number is not valid",
-  "invalidTime": "Invalid time",
   "isRecurringAppointment": "Is this a recurring appointment?",
   "itemsPerPage": "Items per page",
   "loading": "Loading",
@@ -159,6 +160,7 @@
   "unscheduledAppointments_lower": "unscheduled appointments",
   "upcoming": "Upcoming",
   "upcomingAppointments": "Upcoming appointments",
+  "updateError": "Error updating upcoming appointment",
   "view": "View",
   "vitals": "Vitals",
   "week": "Week",
diff --git a/packages/esm-appointments-app/translations/it.json b/packages/esm-appointments-app/translations/it.json
index e26cc97bd..d8bf71b55 100644
--- a/packages/esm-appointments-app/translations/it.json
+++ b/packages/esm-appointments-app/translations/it.json
@@ -7,6 +7,7 @@
   "appointmentCancelError": "Error cancelling appointment",
   "appointmentCancelled": "Appointment Cancelled",
   "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "Appointment color",
   "appointmentConflict": "Appointment conflict",
   "appointmentEdited": "Appointment edited",
@@ -18,6 +19,7 @@
   "appointmentEndError": "Error ending appointment",
   "appointmentFormError": "Error scheduling appointment",
   "appointmentHistory": "Appointment History",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "Appointment metrics",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "Write an additional note",
@@ -92,7 +94,6 @@
   "highestServiceVolume": "Highest volume service: {{time}}",
   "identifier": "Identifier",
   "invalidNumber": "Number is not valid",
-  "invalidTime": "Invalid time",
   "isRecurringAppointment": "Is this a recurring appointment?",
   "itemsPerPage": "Items per page",
   "loading": "Loading",
@@ -159,6 +160,7 @@
   "unscheduledAppointments_lower": "unscheduled appointments",
   "upcoming": "Upcoming",
   "upcomingAppointments": "Upcoming appointments",
+  "updateError": "Error updating upcoming appointment",
   "view": "View",
   "vitals": "Vitals",
   "week": "Week",
diff --git a/packages/esm-appointments-app/translations/km.json b/packages/esm-appointments-app/translations/km.json
index 9bb690ae2..1350440e4 100644
--- a/packages/esm-appointments-app/translations/km.json
+++ b/packages/esm-appointments-app/translations/km.json
@@ -7,6 +7,7 @@
   "appointmentCancelError": "កំហុសក្នុងការបោះបង់ការណាត់ជួប",
   "appointmentCancelled": "ការណាត់ជួបត្រូវបានលុបចោល",
   "appointmentCancelledSuccessfully": "ការណាត់ជួបបានលុបចោលដោយជោគជ័យ",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "ពណ៌ណាត់ជួប",
   "appointmentConflict": "Appointment conflict",
   "appointmentEdited": "Appointment edited",
@@ -18,6 +19,7 @@
   "appointmentEndError": "Error ending appointment",
   "appointmentFormError": "កំហុសក្នុងការកំណត់ពេលណាត់ជួប",
   "appointmentHistory": "ប្រវត្តិនៃការណាត់ជួប",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "មាត្រដ្ឋានណាត់ជួប",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "Write an additional note",
@@ -92,7 +94,6 @@
   "highestServiceVolume": "Highest volume service: {{time}}",
   "identifier": "អ្នកកំណត់អត្តសញ្ញាណ",
   "invalidNumber": "Number is not valid",
-  "invalidTime": "Invalid time",
   "isRecurringAppointment": "Is this a recurring appointment?",
   "itemsPerPage": "Items per page",
   "loading": "Loading",
@@ -159,6 +160,7 @@
   "unscheduledAppointments_lower": "unscheduled appointments",
   "upcoming": "Upcoming",
   "upcomingAppointments": "ការណាត់ជួបនាពេលខាងមុខ",
+  "updateError": "Error updating upcoming appointment",
   "view": "ពិនិត្យមើល",
   "vitals": "សញ្ញាជីវិត",
   "week": "Week",
diff --git a/packages/esm-appointments-app/translations/ne.json b/packages/esm-appointments-app/translations/ne.json
new file mode 100644
index 000000000..d8bf71b55
--- /dev/null
+++ b/packages/esm-appointments-app/translations/ne.json
@@ -0,0 +1,168 @@
+{
+  "action": "Action",
+  "actions": "Actions",
+  "add": "Add",
+  "age": "Age",
+  "allDay": "All day",
+  "appointmentCancelError": "Error cancelling appointment",
+  "appointmentCancelled": "Appointment Cancelled",
+  "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
+  "appointmentCheckedIn": "Appointment Checked In",
+  "appointmentColor": "Appointment color",
+  "appointmentConflict": "Appointment conflict",
+  "appointmentEdited": "Appointment edited",
+  "appointmentEditError": "Error editing appointment",
+  "appointmentEnded": "Appointment ended",
+  "appointmentEndedAndVisitClosedSuccessfully": "Appointment successfully ended and visit successfully closed",
+  "appointmentEndedButVisitNotClosedError": "Appointment ended, but error closing visit",
+  "appointmentEndedSuccessfully": "Appointment successfully ended.",
+  "appointmentEndError": "Error ending appointment",
+  "appointmentFormError": "Error scheduling appointment",
+  "appointmentHistory": "Appointment History",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
+  "appointmentMetrics": "Appointment metrics",
+  "appointmentMetricsLoadError": "",
+  "appointmentNoteLabel": "Write an additional note",
+  "appointmentNotePlaceholder": "Write any additional points here",
+  "appointmentNotes": "Appointment Notes",
+  "appointmentNowVisible": "It is now visible on the Appointments page",
+  "appointments": "Appointments",
+  "Appointments": "Appointments",
+  "appointments_lower": "appointments",
+  "appointmentsCalendar": "Appointments calendar",
+  "appointmentScheduled": "Appointment scheduled",
+  "appointmentService": "Appointment service",
+  "appointmentServiceCreate": "Appointment service created successfully",
+  "appointmentServiceName": "Appointment service name",
+  "appointmentsScheduledForToday": "appointments scheduled for today",
+  "appointmentsTable": "Appointments table",
+  "appointmentStatus": "Appointment status",
+  "appointmentToFulfill": "Select appointment to fulfill",
+  "appointmentType": "Appointment type",
+  "appointmentType_title": "Appointment Type",
+  "back": "Back",
+  "calendar": "Calendar",
+  "cameEarly": "Came Early",
+  "cancel": "Cancel",
+  "cancelAppointment": "Cancel Appointment",
+  "cancelAppointmentModalConfirmationText": "Are you sure you want to cancel this appointment?",
+  "cancelled": "Cancelled",
+  "checkedIn": "Checked in",
+  "checkedOut": "Checked out",
+  "checkFilters": "Check the filters above",
+  "checkIn": "Check In",
+  "checkOut": "Check out",
+  "chooseAppointmentType": "Choose appointment type",
+  "chooseLocation": "Choose a location",
+  "chooseProvider": "Choose a provider",
+  "chooseService": "Select service",
+  "completed": "Completed",
+  "Contact": "Contact {{index}}",
+  "countMore_one": "{{count}} more",
+  "countMore_other": "{{count}} more",
+  "createAppointmentService": "Create appointment services",
+  "createNewAppointment": "Create new appointment",
+  "date": "Date",
+  "date&Time": "Date & time",
+  "dateAppointmentIssuedCannotBeAfterAppointmentDate": "Date appointment issued cannot be after the appointment date",
+  "dateOfBirth": "Date of birth",
+  "dateScheduled": "Date appointment issued",
+  "dateScheduledDetail": "Date appointment issued",
+  "dateTime": "Date & Time",
+  "day": "Day",
+  "daysOfWeek": "Days of the week",
+  "discard": "Discard",
+  "download": "Download",
+  "durationErrorMessage": "Duration should be greater than zero",
+  "durationInMinutes": "Duration (minutes)",
+  "durationMins": "Duration min",
+  "edit": "Edit",
+  "editAppointment": "Edit Appointment",
+  "editAppointments": "Edit Appointment",
+  "emptyStateText": "There are no <1>{{displayText}}</1> to display",
+  "encounters": "Encounters",
+  "encounterType": "Encounter type",
+  "endAppointmentAndVisitConfirmationMessage": "Checking the patient out will mark the appointment as complete, and close out the active visit for this patient.",
+  "endAppointmentConfirmation": "Are you sure you want to check the patient out for this appointment?",
+  "endAppointmentConfirmationMessage": "Checking the patient out will mark the appointment as complete.",
+  "endDate": "End date",
+  "endTime": "End Time",
+  "errorCreatingAppointmentService": "Error creating appointment service",
+  "expected": "Expected",
+  "filterTable": "Filter table",
+  "gender": "Gender",
+  "highestServiceVolume": "Highest volume service: {{time}}",
+  "identifier": "Identifier",
+  "invalidNumber": "Number is not valid",
+  "isRecurringAppointment": "Is this a recurring appointment?",
+  "itemsPerPage": "Items per page",
+  "loading": "Loading",
+  "location": "Location",
+  "medications": "Medications",
+  "missed": "Missed",
+  "next": "Next",
+  "nextMonth": "Next month",
+  "nextPage": "Next page",
+  "no": "No",
+  "noAppointmentsToDisplay": "No appointments to display",
+  "noContent": "No Content",
+  "noCurrentAppointments": "There are no appointments scheduled for today to display for this patient",
+  "noEncountersFound": "No encounters found",
+  "noPastAppointments": "There are no past appointments to display for this patient",
+  "noPreviousVisitFound": "No previous visit found",
+  "notArrived": "Not arrived",
+  "note": "Note",
+  "notes": "Notes",
+  "noUpcomingAppointments": "No upcoming appointments found",
+  "noUpcomingAppointmentsForPatient": "There are no upcoming appointments to display for this patient",
+  "pageNumber": "Page number",
+  "past": "Past",
+  "patientDetails": "Patient Details",
+  "patientDoubleBooking": "Patient already booked for an appointment at this time",
+  "patientName": "Patient name",
+  "patients": "Patients",
+  "period": "Period",
+  "prev": "Prev",
+  "previousMonth": "Previous month",
+  "previousPage": "Previous page",
+  "provider": "Provider",
+  "providers": "Providers",
+  "providersBooked": "Providers booked: {{time}}",
+  "recurringAppointment": "Recurring Appointment",
+  "recurringAppointmentShouldHaveEndDate": "A recurring appointment should have an end date",
+  "repeatEvery": "Repeat every",
+  "save": "Save",
+  "saveAndClose": "Save and close",
+  "scheduled": "Scheduled",
+  "scheduledAppointments": "Scheduled appointments",
+  "scheduledForToday": "Scheduled For Today",
+  "selectALocation": "Select a location",
+  "selectAppointmentStatus": "Select status",
+  "selectAppointmentType": "Select an appointment type",
+  "selectLocation": "Select location",
+  "selectOption": "Select an option",
+  "selectProvider": "Select a provider",
+  "selectService": "Select a service",
+  "selectServiceType": "Select service type",
+  "service": "Service",
+  "serviceName": "Service name",
+  "serviceType": "Service Type",
+  "serviceUnavailable": "Appointment time is outside of service hours",
+  "startDate": "Start date",
+  "startTime": "Start Time",
+  "status": "Status",
+  "time": "Time",
+  "today": "Today",
+  "todays": "Today's",
+  "type": "Type",
+  "unscheduled": "Unscheduled",
+  "unscheduledAppointments": "Unscheduled appointments",
+  "unscheduledAppointments_lower": "unscheduled appointments",
+  "upcoming": "Upcoming",
+  "upcomingAppointments": "Upcoming appointments",
+  "updateError": "Error updating upcoming appointment",
+  "view": "View",
+  "vitals": "Vitals",
+  "week": "Week",
+  "yes": "Yes"
+}
diff --git a/packages/esm-appointments-app/translations/pt.json b/packages/esm-appointments-app/translations/pt.json
index 983e4fb0c..9514c523f 100644
--- a/packages/esm-appointments-app/translations/pt.json
+++ b/packages/esm-appointments-app/translations/pt.json
@@ -7,6 +7,7 @@
   "appointmentCancelError": "Erro ao cancelar a marcação de consulta",
   "appointmentCancelled": "Consulta Cancelada ",
   "appointmentCancelledSuccessfully": "Consulta cancelada com sucesso",
+  "appointmentCheckedIn": "Marcação de consulta registada",
   "appointmentColor": "Cor da consulta",
   "appointmentConflict": "Conflito no agendamento da consulta",
   "appointmentEdited": "Agendamento da consulta editado",
@@ -16,8 +17,9 @@
   "appointmentEndedButVisitNotClosedError": "Consulta finalizada, mas houve erro ao fechar a visita",
   "appointmentEndedSuccessfully": "Consulta fechada com sucesso.",
   "appointmentEndError": "Erro ao encerrar a consulta",
-  "appointmentFormError": "Erro ao cancelar a marcação de consulta",
+  "appointmentFormError": "Erro ao agendar a consulta",
   "appointmentHistory": "Historico de Consultas",
+  "appointmentMarkedChecked": "Consulta marcada como registada.",
   "appointmentMetrics": "Metricas de Consulta",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "Escreva uma nota adicional",
@@ -92,7 +94,6 @@
   "highestServiceVolume": "Serviço de maior volume: {{time}}",
   "identifier": "Identificador",
   "invalidNumber": "Número não é válido",
-  "invalidTime": "Hora inválida",
   "isRecurringAppointment": "Esta é uma consulta recorrente?",
   "itemsPerPage": "Itens por página",
   "loading": "Carregando",
@@ -113,7 +114,7 @@
   "note": "Nota",
   "notes": "Notas",
   "noUpcomingAppointments": "Nenhuma próxima consulta foi encontrada",
-  "noUpcomingAppointmentsForPatient": "Não há consultas marcada por mostrar para este utente",
+  "noUpcomingAppointmentsForPatient": "Não há consultas marcadas por mostrar para este utente",
   "pageNumber": "Número da página",
   "past": "Passado",
   "patientDetails": "Detalhes do utente",
@@ -159,6 +160,7 @@
   "unscheduledAppointments_lower": "consultas não marcadas",
   "upcoming": "Por vir",
   "upcomingAppointments": "Próximas consultas",
+  "updateError": "Error updating upcoming appointment",
   "view": "Visualizar",
   "vitals": "Sinais vitais",
   "week": "Semana",
diff --git a/packages/esm-appointments-app/translations/qu.json b/packages/esm-appointments-app/translations/qu.json
index e26cc97bd..d8bf71b55 100644
--- a/packages/esm-appointments-app/translations/qu.json
+++ b/packages/esm-appointments-app/translations/qu.json
@@ -7,6 +7,7 @@
   "appointmentCancelError": "Error cancelling appointment",
   "appointmentCancelled": "Appointment Cancelled",
   "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "Appointment color",
   "appointmentConflict": "Appointment conflict",
   "appointmentEdited": "Appointment edited",
@@ -18,6 +19,7 @@
   "appointmentEndError": "Error ending appointment",
   "appointmentFormError": "Error scheduling appointment",
   "appointmentHistory": "Appointment History",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "Appointment metrics",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "Write an additional note",
@@ -92,7 +94,6 @@
   "highestServiceVolume": "Highest volume service: {{time}}",
   "identifier": "Identifier",
   "invalidNumber": "Number is not valid",
-  "invalidTime": "Invalid time",
   "isRecurringAppointment": "Is this a recurring appointment?",
   "itemsPerPage": "Items per page",
   "loading": "Loading",
@@ -159,6 +160,7 @@
   "unscheduledAppointments_lower": "unscheduled appointments",
   "upcoming": "Upcoming",
   "upcomingAppointments": "Upcoming appointments",
+  "updateError": "Error updating upcoming appointment",
   "view": "View",
   "vitals": "Vitals",
   "week": "Week",
diff --git a/packages/esm-appointments-app/translations/si.json b/packages/esm-appointments-app/translations/si.json
index e26cc97bd..d8bf71b55 100644
--- a/packages/esm-appointments-app/translations/si.json
+++ b/packages/esm-appointments-app/translations/si.json
@@ -7,6 +7,7 @@
   "appointmentCancelError": "Error cancelling appointment",
   "appointmentCancelled": "Appointment Cancelled",
   "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "Appointment color",
   "appointmentConflict": "Appointment conflict",
   "appointmentEdited": "Appointment edited",
@@ -18,6 +19,7 @@
   "appointmentEndError": "Error ending appointment",
   "appointmentFormError": "Error scheduling appointment",
   "appointmentHistory": "Appointment History",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "Appointment metrics",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "Write an additional note",
@@ -92,7 +94,6 @@
   "highestServiceVolume": "Highest volume service: {{time}}",
   "identifier": "Identifier",
   "invalidNumber": "Number is not valid",
-  "invalidTime": "Invalid time",
   "isRecurringAppointment": "Is this a recurring appointment?",
   "itemsPerPage": "Items per page",
   "loading": "Loading",
@@ -159,6 +160,7 @@
   "unscheduledAppointments_lower": "unscheduled appointments",
   "upcoming": "Upcoming",
   "upcomingAppointments": "Upcoming appointments",
+  "updateError": "Error updating upcoming appointment",
   "view": "View",
   "vitals": "Vitals",
   "week": "Week",
diff --git a/packages/esm-appointments-app/translations/sw.json b/packages/esm-appointments-app/translations/sw.json
index e26cc97bd..d8bf71b55 100644
--- a/packages/esm-appointments-app/translations/sw.json
+++ b/packages/esm-appointments-app/translations/sw.json
@@ -7,6 +7,7 @@
   "appointmentCancelError": "Error cancelling appointment",
   "appointmentCancelled": "Appointment Cancelled",
   "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "Appointment color",
   "appointmentConflict": "Appointment conflict",
   "appointmentEdited": "Appointment edited",
@@ -18,6 +19,7 @@
   "appointmentEndError": "Error ending appointment",
   "appointmentFormError": "Error scheduling appointment",
   "appointmentHistory": "Appointment History",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "Appointment metrics",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "Write an additional note",
@@ -92,7 +94,6 @@
   "highestServiceVolume": "Highest volume service: {{time}}",
   "identifier": "Identifier",
   "invalidNumber": "Number is not valid",
-  "invalidTime": "Invalid time",
   "isRecurringAppointment": "Is this a recurring appointment?",
   "itemsPerPage": "Items per page",
   "loading": "Loading",
@@ -159,6 +160,7 @@
   "unscheduledAppointments_lower": "unscheduled appointments",
   "upcoming": "Upcoming",
   "upcomingAppointments": "Upcoming appointments",
+  "updateError": "Error updating upcoming appointment",
   "view": "View",
   "vitals": "Vitals",
   "week": "Week",
diff --git a/packages/esm-appointments-app/translations/sw_KE.json b/packages/esm-appointments-app/translations/sw_KE.json
index e26cc97bd..d8bf71b55 100644
--- a/packages/esm-appointments-app/translations/sw_KE.json
+++ b/packages/esm-appointments-app/translations/sw_KE.json
@@ -7,6 +7,7 @@
   "appointmentCancelError": "Error cancelling appointment",
   "appointmentCancelled": "Appointment Cancelled",
   "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "Appointment color",
   "appointmentConflict": "Appointment conflict",
   "appointmentEdited": "Appointment edited",
@@ -18,6 +19,7 @@
   "appointmentEndError": "Error ending appointment",
   "appointmentFormError": "Error scheduling appointment",
   "appointmentHistory": "Appointment History",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "Appointment metrics",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "Write an additional note",
@@ -92,7 +94,6 @@
   "highestServiceVolume": "Highest volume service: {{time}}",
   "identifier": "Identifier",
   "invalidNumber": "Number is not valid",
-  "invalidTime": "Invalid time",
   "isRecurringAppointment": "Is this a recurring appointment?",
   "itemsPerPage": "Items per page",
   "loading": "Loading",
@@ -159,6 +160,7 @@
   "unscheduledAppointments_lower": "unscheduled appointments",
   "upcoming": "Upcoming",
   "upcomingAppointments": "Upcoming appointments",
+  "updateError": "Error updating upcoming appointment",
   "view": "View",
   "vitals": "Vitals",
   "week": "Week",
diff --git a/packages/esm-appointments-app/translations/tr.json b/packages/esm-appointments-app/translations/tr.json
index e26cc97bd..d8bf71b55 100644
--- a/packages/esm-appointments-app/translations/tr.json
+++ b/packages/esm-appointments-app/translations/tr.json
@@ -7,6 +7,7 @@
   "appointmentCancelError": "Error cancelling appointment",
   "appointmentCancelled": "Appointment Cancelled",
   "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "Appointment color",
   "appointmentConflict": "Appointment conflict",
   "appointmentEdited": "Appointment edited",
@@ -18,6 +19,7 @@
   "appointmentEndError": "Error ending appointment",
   "appointmentFormError": "Error scheduling appointment",
   "appointmentHistory": "Appointment History",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "Appointment metrics",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "Write an additional note",
@@ -92,7 +94,6 @@
   "highestServiceVolume": "Highest volume service: {{time}}",
   "identifier": "Identifier",
   "invalidNumber": "Number is not valid",
-  "invalidTime": "Invalid time",
   "isRecurringAppointment": "Is this a recurring appointment?",
   "itemsPerPage": "Items per page",
   "loading": "Loading",
@@ -159,6 +160,7 @@
   "unscheduledAppointments_lower": "unscheduled appointments",
   "upcoming": "Upcoming",
   "upcomingAppointments": "Upcoming appointments",
+  "updateError": "Error updating upcoming appointment",
   "view": "View",
   "vitals": "Vitals",
   "week": "Week",
diff --git a/packages/esm-appointments-app/translations/tr_TR.json b/packages/esm-appointments-app/translations/tr_TR.json
index e26cc97bd..d8bf71b55 100644
--- a/packages/esm-appointments-app/translations/tr_TR.json
+++ b/packages/esm-appointments-app/translations/tr_TR.json
@@ -7,6 +7,7 @@
   "appointmentCancelError": "Error cancelling appointment",
   "appointmentCancelled": "Appointment Cancelled",
   "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "Appointment color",
   "appointmentConflict": "Appointment conflict",
   "appointmentEdited": "Appointment edited",
@@ -18,6 +19,7 @@
   "appointmentEndError": "Error ending appointment",
   "appointmentFormError": "Error scheduling appointment",
   "appointmentHistory": "Appointment History",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "Appointment metrics",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "Write an additional note",
@@ -92,7 +94,6 @@
   "highestServiceVolume": "Highest volume service: {{time}}",
   "identifier": "Identifier",
   "invalidNumber": "Number is not valid",
-  "invalidTime": "Invalid time",
   "isRecurringAppointment": "Is this a recurring appointment?",
   "itemsPerPage": "Items per page",
   "loading": "Loading",
@@ -159,6 +160,7 @@
   "unscheduledAppointments_lower": "unscheduled appointments",
   "upcoming": "Upcoming",
   "upcomingAppointments": "Upcoming appointments",
+  "updateError": "Error updating upcoming appointment",
   "view": "View",
   "vitals": "Vitals",
   "week": "Week",
diff --git a/packages/esm-appointments-app/translations/uk.json b/packages/esm-appointments-app/translations/uk.json
index e26cc97bd..d8bf71b55 100644
--- a/packages/esm-appointments-app/translations/uk.json
+++ b/packages/esm-appointments-app/translations/uk.json
@@ -7,6 +7,7 @@
   "appointmentCancelError": "Error cancelling appointment",
   "appointmentCancelled": "Appointment Cancelled",
   "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "Appointment color",
   "appointmentConflict": "Appointment conflict",
   "appointmentEdited": "Appointment edited",
@@ -18,6 +19,7 @@
   "appointmentEndError": "Error ending appointment",
   "appointmentFormError": "Error scheduling appointment",
   "appointmentHistory": "Appointment History",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "Appointment metrics",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "Write an additional note",
@@ -92,7 +94,6 @@
   "highestServiceVolume": "Highest volume service: {{time}}",
   "identifier": "Identifier",
   "invalidNumber": "Number is not valid",
-  "invalidTime": "Invalid time",
   "isRecurringAppointment": "Is this a recurring appointment?",
   "itemsPerPage": "Items per page",
   "loading": "Loading",
@@ -159,6 +160,7 @@
   "unscheduledAppointments_lower": "unscheduled appointments",
   "upcoming": "Upcoming",
   "upcomingAppointments": "Upcoming appointments",
+  "updateError": "Error updating upcoming appointment",
   "view": "View",
   "vitals": "Vitals",
   "week": "Week",
diff --git a/packages/esm-appointments-app/translations/vi.json b/packages/esm-appointments-app/translations/vi.json
index f88c95541..1db048cb6 100644
--- a/packages/esm-appointments-app/translations/vi.json
+++ b/packages/esm-appointments-app/translations/vi.json
@@ -7,6 +7,7 @@
   "appointmentCancelError": "Lỗi khi hủy cuộc hẹn",
   "appointmentCancelled": "Cuộc hẹn dã hủy",
   "appointmentCancelledSuccessfully": "Hủy cuộc hẹn thành công",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "Màu cuộc hẹn",
   "appointmentConflict": "Xung đột cuộc hẹn",
   "appointmentEdited": "Cuộc hẹn đã được chỉnh sửa",
@@ -18,6 +19,7 @@
   "appointmentEndError": "Lỗi khi kết thúc cuộc hẹn",
   "appointmentFormError": "Lỗi khi lên lịch hẹn",
   "appointmentHistory": "Lịch sử cuộc hẹn",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "Số liệu cuộc hẹn",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "Viết thêm một ghi chú",
@@ -92,7 +94,6 @@
   "highestServiceVolume": "Dịch vụ có khối lượng cao nhất: {{hour}}",
   "identifier": "Mã định danh",
   "invalidNumber": "Số không hợp lệ",
-  "invalidTime": "Thời gian không hợp lệ",
   "isRecurringAppointment": "Đây có phải là cuộc hẹn định kỳ không?",
   "itemsPerPage": "Số mục trên mỗi trang",
   "loading": "Đang tải",
@@ -159,6 +160,7 @@
   "unscheduledAppointments_lower": "cuộc hẹn không theo lịch trình",
   "upcoming": "Sắp tới",
   "upcomingAppointments": "Cuộc hẹn sắp tới",
+  "updateError": "Error updating upcoming appointment",
   "view": "Xem",
   "vitals": "Các yếu tố quan trọng",
   "week": "Tuần",
diff --git a/packages/esm-appointments-app/translations/zh.json b/packages/esm-appointments-app/translations/zh.json
index ffc469fc6..13f6fd726 100644
--- a/packages/esm-appointments-app/translations/zh.json
+++ b/packages/esm-appointments-app/translations/zh.json
@@ -7,6 +7,7 @@
   "appointmentCancelError": "取消预约时出现错误",
   "appointmentCancelled": "预约已取消",
   "appointmentCancelledSuccessfully": "预约已成功取消",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "预约颜色",
   "appointmentConflict": "Appointment conflict",
   "appointmentEdited": "预约已编辑",
@@ -18,6 +19,7 @@
   "appointmentEndError": "Error ending appointment",
   "appointmentFormError": "安排预约时出现错误",
   "appointmentHistory": "预约历史",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "预约指标",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "输入附加备注",
@@ -92,7 +94,6 @@
   "highestServiceVolume": "最高量服务：{{time}}",
   "identifier": "ID",
   "invalidNumber": "数值无效",
-  "invalidTime": "无效时间",
   "isRecurringAppointment": "这是一个定期预约吗？",
   "itemsPerPage": "每页条目数",
   "loading": "加载中",
@@ -159,6 +160,7 @@
   "unscheduledAppointments_lower": "未安排的预约",
   "upcoming": "即将到来",
   "upcomingAppointments": "即将到来的预约",
+  "updateError": "Error updating upcoming appointment",
   "view": "查看",
   "vitals": "生命体征",
   "week": "周",
diff --git a/packages/esm-appointments-app/translations/zh_CN.json b/packages/esm-appointments-app/translations/zh_CN.json
index ffc469fc6..13f6fd726 100644
--- a/packages/esm-appointments-app/translations/zh_CN.json
+++ b/packages/esm-appointments-app/translations/zh_CN.json
@@ -7,6 +7,7 @@
   "appointmentCancelError": "取消预约时出现错误",
   "appointmentCancelled": "预约已取消",
   "appointmentCancelledSuccessfully": "预约已成功取消",
+  "appointmentCheckedIn": "Appointment Checked In",
   "appointmentColor": "预约颜色",
   "appointmentConflict": "Appointment conflict",
   "appointmentEdited": "预约已编辑",
@@ -18,6 +19,7 @@
   "appointmentEndError": "Error ending appointment",
   "appointmentFormError": "安排预约时出现错误",
   "appointmentHistory": "预约历史",
+  "appointmentMarkedChecked": "Appointment marked as Checked In",
   "appointmentMetrics": "预约指标",
   "appointmentMetricsLoadError": "",
   "appointmentNoteLabel": "输入附加备注",
@@ -92,7 +94,6 @@
   "highestServiceVolume": "最高量服务：{{time}}",
   "identifier": "ID",
   "invalidNumber": "数值无效",
-  "invalidTime": "无效时间",
   "isRecurringAppointment": "这是一个定期预约吗？",
   "itemsPerPage": "每页条目数",
   "loading": "加载中",
@@ -159,6 +160,7 @@
   "unscheduledAppointments_lower": "未安排的预约",
   "upcoming": "即将到来",
   "upcomingAppointments": "即将到来的预约",
+  "updateError": "Error updating upcoming appointment",
   "view": "查看",
   "vitals": "生命体征",
   "week": "周",
diff --git a/packages/esm-bed-management-app/package.json b/packages/esm-bed-management-app/package.json
index fe6cb162f..2772a26dc 100644
--- a/packages/esm-bed-management-app/package.json
+++ b/packages/esm-bed-management-app/package.json
@@ -37,7 +37,7 @@
     "url": "https://github.com/openmrs/openmrs-esm-patient-management/issues"
   },
   "dependencies": {
-    "@carbon/react": "~1.37.0",
+    "@carbon/react": "^1.71.0",
     "lodash-es": "^4.17.15"
   },
   "peerDependencies": {
diff --git a/packages/esm-bed-management-app/src/bed-administration/bed-administration-form.component.tsx b/packages/esm-bed-management-app/src/bed-administration/bed-administration-form.component.tsx
index 6fb0fed9c..11e6f44eb 100644
--- a/packages/esm-bed-management-app/src/bed-administration/bed-administration-form.component.tsx
+++ b/packages/esm-bed-management-app/src/bed-administration/bed-administration-form.component.tsx
@@ -249,7 +249,7 @@ const BedAdministrationForm: React.FC<BedAdministrationFormProps> = ({
                     defaultValue={selectedBedType}
                     id="bedType"
                     invalidText={t('required', 'Required')}
-                    labelText={t('bedType', 'Bed type')}
+                    labelText={t('bedTypes', 'Bed types')}
                     {...field}>
                     <SelectItem text={t('chooseBedtype', 'Choose a bed type')} />
                     {availableBedTypes.map((bedType, index) => (
diff --git a/packages/esm-bed-management-app/src/bed-administration/bed-administration-table.component.tsx b/packages/esm-bed-management-app/src/bed-administration/bed-administration-table.component.tsx
index 00649f232..b8cf88253 100644
--- a/packages/esm-bed-management-app/src/bed-administration/bed-administration-table.component.tsx
+++ b/packages/esm-bed-management-app/src/bed-administration/bed-administration-table.component.tsx
@@ -29,7 +29,7 @@ import styles from './bed-administration-table.scss';
 
 const BedAdministrationTable: React.FC = () => {
   const { t } = useTranslation();
-  const headerTitle = t('wardAllocation', 'Ward Allocation');
+  const headerTitle = t('wardAllocation', 'Ward allocation');
   const layout = useLayoutType();
   const isTablet = layout === 'tablet';
   const responsiveSize = isTablet ? 'lg' : 'sm';
@@ -72,7 +72,7 @@ const BedAdministrationTable: React.FC = () => {
   const { results, currentPage, totalPages, goTo } = usePagination(
     filterOption === 'ALL'
       ? bedsGroupedByLocation
-      : bedsGroupedByLocation.filter((bed) => bed.status === filterOption) ?? [],
+      : bedsGroupedByLocation.flat().filter((bed) => bed.status === filterOption) ?? [],
     pageSize,
   );
 
@@ -131,7 +131,7 @@ const BedAdministrationTable: React.FC = () => {
   if (isLoadingBedsGroupedByLocation && !bedsGroupedByLocation.length) {
     return (
       <>
-        <Header route="Ward Allocation" />
+        <Header title={t('wardAllocation', 'Ward allocation')} />
         <div className={styles.widgetCard}>
           <DataTableSkeleton role="progressbar" compact={isDesktop} zebra />
         </div>
@@ -142,7 +142,7 @@ const BedAdministrationTable: React.FC = () => {
   if (errorFetchingBedsGroupedByLocation) {
     return (
       <>
-        <Header route="Ward Allocation" />
+        <Header title={t('wardAllocation', 'Ward allocation')} />
         <div className={styles.widgetCard}>
           <ErrorState error={errorFetchingBedsGroupedByLocation} headerTitle={headerTitle} />
         </div>
@@ -152,7 +152,7 @@ const BedAdministrationTable: React.FC = () => {
 
   return (
     <>
-      <Header route="Ward Allocation" />
+      <Header title={t('wardAllocation', 'Ward allocation')} />
       <div className={styles.flexContainer}>
         {results?.length ? (
           <div className={styles.filterContainer}>
diff --git a/packages/esm-bed-management-app/src/bed-tag/bed-tag-administration-table.component.tsx b/packages/esm-bed-management-app/src/bed-tag/bed-tag-administration-table.component.tsx
index 4720d04e6..5b7943787 100644
--- a/packages/esm-bed-management-app/src/bed-tag/bed-tag-administration-table.component.tsx
+++ b/packages/esm-bed-management-app/src/bed-tag/bed-tag-administration-table.component.tsx
@@ -27,7 +27,7 @@ import styles from '../bed-administration/bed-administration-table.scss';
 
 const BedTagAdministrationTable: React.FC = () => {
   const { t } = useTranslation();
-  const headerTitle = t('bedTag', 'Bed tag');
+  const headerTitle = t('bedTags', 'Bed tags');
   const layout = useLayoutType();
   const isTablet = layout === 'tablet';
   const responsiveSize = isTablet ? 'lg' : 'sm';
@@ -43,7 +43,7 @@ const BedTagAdministrationTable: React.FC = () => {
 
   const tableHeaders = [
     {
-      header: t('ids', 'Id'),
+      header: t('ids', 'ID'),
       key: 'ids',
     },
     {
@@ -85,7 +85,7 @@ const BedTagAdministrationTable: React.FC = () => {
   if (isBedDataLoading || isLoadingBedTags) {
     return (
       <>
-        <Header route="Bed Tag" />
+        <Header title={t('bedTags', 'Bed tags')} />
         <div className={styles.widgetCard}>
           <DataTableSkeleton role="progressbar" compact={isDesktop} zebra />
         </div>
@@ -96,7 +96,7 @@ const BedTagAdministrationTable: React.FC = () => {
   if (errorLoadingBedTags) {
     return (
       <>
-        <Header route="Bed Tag" />
+        <Header title={t('bedTags', 'Bed tags')} />
         <div className={styles.widgetCard}>
           <ErrorState error={errorLoadingBedTags} headerTitle={headerTitle} />
         </div>
@@ -106,7 +106,7 @@ const BedTagAdministrationTable: React.FC = () => {
 
   return (
     <>
-      <Header route="Bed Tag" />
+      <Header title={t('bedTags', 'Bed tags')} />
 
       <div className={styles.widgetCard}>
         {showBedTagsModal ? (
diff --git a/packages/esm-bed-management-app/src/bed-tag/bed-tags-admin-form.component.tsx b/packages/esm-bed-management-app/src/bed-tag/bed-tags-admin-form.component.tsx
index 200a7ef76..3e9cbd94e 100644
--- a/packages/esm-bed-management-app/src/bed-tag/bed-tags-admin-form.component.tsx
+++ b/packages/esm-bed-management-app/src/bed-tag/bed-tags-admin-form.component.tsx
@@ -88,7 +88,7 @@ const BedTagsAdministrationForm: React.FC<BedTagAdministrationFormProps> = ({
                   <>
                     <TextInput
                       id="bedTag"
-                      labelText={t('bedTag', 'Bed tag')}
+                      labelText={t('bedTags', 'Bed tags')}
                       placeholder={t('bedTagPlaceholder', '')}
                       invalidText={fieldState.error?.message}
                       {...field}
diff --git a/packages/esm-bed-management-app/src/bed-type/bed-type-administration-table.component.tsx b/packages/esm-bed-management-app/src/bed-type/bed-type-administration-table.component.tsx
index d11549d16..5f104ad44 100644
--- a/packages/esm-bed-management-app/src/bed-type/bed-type-administration-table.component.tsx
+++ b/packages/esm-bed-management-app/src/bed-type/bed-type-administration-table.component.tsx
@@ -28,7 +28,7 @@ import styles from '../bed-administration/bed-administration-table.scss';
 
 const BedTypeAdministrationTable: React.FC = () => {
   const { t } = useTranslation();
-  const headerTitle = t('bedType', 'Bed type');
+  const headerTitle = t('bedTypes', 'Bed types');
   const layout = useLayoutType();
   const isTablet = layout === 'tablet';
   const responsiveSize = isTablet ? 'lg' : 'sm';
@@ -91,7 +91,7 @@ const BedTypeAdministrationTable: React.FC = () => {
   if (isLoadingBedTypes) {
     return (
       <>
-        <Header route="Bed Type" />
+        <Header title={t('bedTypes', 'Bed types')} />
         <div className={styles.widgetCard}>
           <DataTableSkeleton role="progressbar" compact={isDesktop} zebra />
         </div>
@@ -102,7 +102,7 @@ const BedTypeAdministrationTable: React.FC = () => {
   if (errorLoadingBedTypes) {
     return (
       <>
-        <Header route="Bed Type" />
+        <Header title={t('bedTypes', 'Bed types')} />
         <div className={styles.widgetCard}>
           <ErrorState error={errorLoadingBedTypes} headerTitle={headerTitle} />
         </div>
@@ -112,7 +112,7 @@ const BedTypeAdministrationTable: React.FC = () => {
 
   return (
     <>
-      <Header route="Bed Type" />
+      <Header title={t('bedTypes', 'Bed types')} />
 
       <div className={styles.widgetCard}>
         {showBedTypeModal ? (
diff --git a/packages/esm-bed-management-app/src/header/header.component.tsx b/packages/esm-bed-management-app/src/header/header.component.tsx
index 1f0ba249f..c3032bcd5 100644
--- a/packages/esm-bed-management-app/src/header/header.component.tsx
+++ b/packages/esm-bed-management-app/src/header/header.component.tsx
@@ -1,31 +1,36 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { Calendar, Location } from '@carbon/react/icons';
-import { ConfigurableLink, formatDate, useSession } from '@openmrs/esm-framework';
-import Illustration from './illustration.component';
+import {
+  ConfigurableLink,
+  formatDate,
+  InPatientPictogram,
+  PageHeader,
+  PageHeaderContent,
+  useSession,
+} from '@openmrs/esm-framework';
 import styles from './header.scss';
 
 type HeaderProps = {
-  route: string;
-  headerTitle?: string;
+  title: string;
 };
 
-const Header: React.FC<HeaderProps> = ({ route, headerTitle }) => {
+const Header: React.FC<HeaderProps> = ({ title }) => {
   const { t } = useTranslation();
   const userSession = useSession();
   const userLocation = userSession?.sessionLocation?.display;
 
   return (
-    <div className={styles.header}>
-      <div className={styles.leftJustifiedItems}>
-        <ConfigurableLink to={`${window.getOpenmrsSpaBase()}bed-management`}>
-          <Illustration />
-        </ConfigurableLink>
-        <div className={styles.pageLabels}>
-          <p>{t(headerTitle ?? 'bedManagement', headerTitle ?? 'Bed management')}</p>
-          <p className={styles.pageName}>{route}</p>
-        </div>
-      </div>
+    <PageHeader className={styles.header}>
+      <PageHeaderContent
+        illustration={
+          <ConfigurableLink to={`${window.getOpenmrsSpaBase()}bed-management`}>
+            <InPatientPictogram className={styles.inPatientPictogram} />
+          </ConfigurableLink>
+        }
+        title={title}
+        className={styles.leftJustifiedItems}
+      />
       <div className={styles.rightJustifiedItems}>
         <div className={styles.dateAndLocation}>
           <Location size={16} />
@@ -35,7 +40,7 @@ const Header: React.FC<HeaderProps> = ({ route, headerTitle }) => {
           <span className={styles.value}>{formatDate(new Date(), { mode: 'standard' })}</span>
         </div>
       </div>
-    </div>
+    </PageHeader>
   );
 };
 
diff --git a/packages/esm-bed-management-app/src/header/header.scss b/packages/esm-bed-management-app/src/header/header.scss
index a06b94ffc..11b4c4cb2 100644
--- a/packages/esm-bed-management-app/src/header/header.scss
+++ b/packages/esm-bed-management-app/src/header/header.scss
@@ -18,6 +18,21 @@
   flex-direction: row;
   align-items: center;
   cursor: pointer;
+
+  & > div:nth-child(2) {
+    margin: layout.$spacing-05;
+
+    & > p:last-child {
+      white-space: nowrap;
+      @include type.type-style('heading-04');
+    }
+  }
+}
+
+.inPatientPictogram {
+  width: 4.5rem;
+  height: 4.5rem;
+  fill: var(--brand-03);
 }
 
 .rightJustifiedItems {
@@ -27,19 +42,6 @@
   padding-top: layout.$spacing-04;
 }
 
-.pageName {
-  white-space: nowrap;
-  @include type.type-style('heading-04');
-}
-
-.pageLabels {
-  margin: layout.$spacing-05;
-}
-
-.middot {
-  margin: 0 layout.$spacing-03;
-}
-
 .dateAndLocation {
   display: flex;
   justify-content: flex-end;
@@ -54,19 +56,3 @@
 .middot {
   margin: 0 layout.$spacing-03;
 }
-
-.view {
-  @include type.type-style('label-01');
-}
-
-svg.iconOverrides {
-  width: 4.5rem !important;
-  height: 4.5rem !important;
-  fill: var(--brand-03);
-}
-
-.svgContainer svg {
-  width: 4.5rem;
-  height: 4.5rem;
-  fill: var(--brand-03);
-}
diff --git a/packages/esm-bed-management-app/src/header/illustration.component.tsx b/packages/esm-bed-management-app/src/header/illustration.component.tsx
deleted file mode 100644
index 210ae6a59..000000000
--- a/packages/esm-bed-management-app/src/header/illustration.component.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react';
-import { Stethoscope } from '@carbon/react/icons';
-import styles from './header.scss';
-
-const Illustration: React.FC = () => {
-  return (
-    <div className={styles.svgContainer}>
-      <Stethoscope className={styles.iconOverrides} />
-    </div>
-  );
-};
-
-export default Illustration;
diff --git a/packages/esm-bed-management-app/src/home.component.tsx b/packages/esm-bed-management-app/src/home.component.tsx
index 0d8e79a19..f2f761223 100644
--- a/packages/esm-bed-management-app/src/home.component.tsx
+++ b/packages/esm-bed-management-app/src/home.component.tsx
@@ -1,12 +1,15 @@
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 import BedManagementSummary from './summary/summary.component';
 import Header from './header/header.component';
 import styles from './home.scss';
 
 const Home: React.FC = () => {
+  const { t } = useTranslation();
+
   return (
     <section className={styles.section}>
-      <Header route="Summary" />
+      <Header title={t('bedManagement', 'Bed management')} />
       <BedManagementSummary />
     </section>
   );
diff --git a/packages/esm-bed-management-app/src/index.ts b/packages/esm-bed-management-app/src/index.ts
index a42726af6..36c0226fa 100644
--- a/packages/esm-bed-management-app/src/index.ts
+++ b/packages/esm-bed-management-app/src/index.ts
@@ -22,6 +22,7 @@ export const adminCardLink = getAsyncLifecycle(() => import('./admin-card-link.c
 export const summaryLeftPanelLink = getSyncLifecycle(
   createLeftPanelLink({
     name: 'bed-management',
+    // t('summary', 'Summary')
     title: 'Summary',
   }),
   options,
@@ -29,24 +30,27 @@ export const summaryLeftPanelLink = getSyncLifecycle(
 
 export const adminLeftPanelLink = getSyncLifecycle(
   createLeftPanelLink({
-    name: 'administration',
-    title: 'Ward Allocation',
+    name: 'bed-administration',
+    // t('wardAllocation', 'Ward allocation')
+    title: 'Ward allocation',
   }),
   options,
 );
 
 export const bedTypeLeftPanelLink = getSyncLifecycle(
   createLeftPanelLink({
-    name: 'bed-type',
-    title: 'Bed Type',
+    name: 'bed-types',
+    // t('bedTypes', 'Bed types')
+    title: 'Bed types',
   }),
   options,
 );
 
 export const bedTagLeftPanelLink = getSyncLifecycle(
   createLeftPanelLink({
-    name: 'bed-tag',
-    title: 'Bed Tag',
+    name: 'bed-tags',
+    // t('bedTags', 'Bed tags')
+    title: 'Bed tags',
   }),
   options,
 );
diff --git a/packages/esm-bed-management-app/src/root.component.tsx b/packages/esm-bed-management-app/src/root.component.tsx
index 993eeb2ea..f1d04fa16 100644
--- a/packages/esm-bed-management-app/src/root.component.tsx
+++ b/packages/esm-bed-management-app/src/root.component.tsx
@@ -28,9 +28,9 @@ const Root: React.FC = () => {
         <Routes>
           <Route path="/" element={<Home />} />
           <Route path="/location/:location" element={<WardWithBeds />} />
-          <Route path="/administration" element={<BedAdministrationTable />} />
-          <Route path="/bed-tag" element={<BedTagAdministrationTable />} />
-          <Route path="/bed-type" element={<BedTypeAdministrationTable />} />
+          <Route path="/bed-administration" element={<BedAdministrationTable />} />
+          <Route path="/bed-tags" element={<BedTagAdministrationTable />} />
+          <Route path="/bed-types" element={<BedTypeAdministrationTable />} />
         </Routes>
       </main>
     </BrowserRouter>
diff --git a/packages/esm-bed-management-app/src/routes.json b/packages/esm-bed-management-app/src/routes.json
index 7cfba80a5..fb76dd360 100644
--- a/packages/esm-bed-management-app/src/routes.json
+++ b/packages/esm-bed-management-app/src/routes.json
@@ -36,21 +36,6 @@
       "name": "bed-management-home-dashboard-link",
       "slot": "bed-management-left-panel-slot",
       "order": 0
-    },
-    {
-      "component": "bedAdmission",
-      "name": "bed-admission-dashboard",
-      "slot": "bed-admission-dashboard-slot"
-    },
-    {
-      "name": "bed-admission-dashboard-link",
-      "component": "bedAdmissionDashboardLink",
-      "slot": "homepage-dashboard-slot",
-      "meta": {
-        "name": "bed-admission",
-        "slot": "bed-admission-dashboard-slot",
-        "title": "Bed-admission"
-      }
     }
   ]
 }
diff --git a/packages/esm-bed-management-app/src/summary/summary.resource.ts b/packages/esm-bed-management-app/src/summary/summary.resource.ts
index 48e8e1e97..240493d88 100644
--- a/packages/esm-bed-management-app/src/summary/summary.resource.ts
+++ b/packages/esm-bed-management-app/src/summary/summary.resource.ts
@@ -142,7 +142,7 @@ export function useBedsGroupedByLocation() {
       isValidatingBedsGroupedByLocation: isValidating,
       mutateBedsGroupedByLocation: mutate,
     }),
-    [result, error, isLoading, isValidating, mutate],
+    [error, isLoading, isLoadingAdmissionLocations, isValidating, mutate, result],
   );
 
   return results;
diff --git a/packages/esm-bed-management-app/src/ward-with-beds/ward-with-beds.component.tsx b/packages/esm-bed-management-app/src/ward-with-beds/ward-with-beds.component.tsx
index 10bb2b380..6219cf862 100644
--- a/packages/esm-bed-management-app/src/ward-with-beds/ward-with-beds.component.tsx
+++ b/packages/esm-bed-management-app/src/ward-with-beds/ward-with-beds.component.tsx
@@ -93,7 +93,7 @@ const WardWithBeds: React.FC = () => {
 
   return (
     <>
-      <Header route={name ? name : '--'} />
+      <Header title={name ? name : '--'} />
       {isLoadingBeds && (
         <div className={styles.container}>
           <DataTableSkeleton role="progressbar" zebra />
diff --git a/packages/esm-bed-management-app/translations/am.json b/packages/esm-bed-management-app/translations/am.json
index dba1d2c0e..d19a3e425 100644
--- a/packages/esm-bed-management-app/translations/am.json
+++ b/packages/esm-bed-management-app/translations/am.json
@@ -1,51 +1,67 @@
 {
   "actions": "Actions",
   "addBed": "Add bed",
-  "addBedTag": "Create Bed Tag",
-  "addBedtype": "Add Bed Type",
-  "addBedType": "Create Bed type",
+  "addBedTag": "Create bed tag",
+  "addBedType": "Add bed type",
   "allocationStatus": "Allocated",
+  "bedDescription": "Bed description",
   "bedId": "Bed ID",
-  "bedIdPlaceholder": "e.g. BMW-201",
   "bedLocation": "Location",
-  "bedManagement": "Bed Management",
-  "bedName": "Bed Name",
+  "bedManagement": "Bed management",
+  "bedManagementLeftPanel": "Bed management left panel",
+  "bedName": "Bed name",
+  "bedNumber": "Bed number",
   "beds": "Beds",
-  "bedTag": "Bed Tag Name",
+  "bedTagCreated": "Bed tag created",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Add Bed Type",
+  "bedTags": "Bed tags",
+  "bedTagUpdated": "Bed tag updated",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Bed type created",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "Bed type updated",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Bed updated",
+  "bedUpdatedSuccessfully": "",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
+  "createBedTag": "Create bed tag",
+  "createBedType": "Create bed type",
   "createNewBed": "Create a new bed",
   "description": "Description",
-  "displayName": "Display Name",
+  "displayName": "Display name",
   "displayNamePlaceholder": "",
-  "editBed": "Edit Tag",
+  "editBed": "Edit bed",
   "editBedTag": "Edit Bed Tag",
-  "editBedType": "Edit Bed Type",
+  "editBedType": "Edit bed type",
+  "editTag": "Edit Tag",
+  "enterBedDescription": "Enter the bed description",
+  "enterBedNumber": "e.g. BMW-201",
   "error": "Error",
+  "errorCreatingBedTag": "Error creating bed tag",
   "errorCreatingForm": "Error creating bed",
   "errorFetchingbedInformation": "Error fetching bed information",
   "filterByOccupancyStatus": "Filter by occupancy status",
-  "formCreated": "Add bed Type",
-  "formSaved": "Bed Type",
-  "headerTitle": "",
   "ids": "Id",
-  "location": "Locations",
-  "manageBeds": "Manage Beds",
+  "location": "Location",
+  "manageBeds": "Manage beds",
   "name": "Name",
+  "newBedCreated": "New bed created",
   "no": "No",
   "No data": "No data to display",
+  "noDataToDisplay": "No data to display",
   "occupancyStatus": "Occupied",
   "or": "or",
   "pleaseFillField": "",
   "required": "Required",
   "save": "Save",
-  "saveSuccessMessage": "was saved successfully.",
   "selectBedLocation": "Select a bed location",
+  "summary": "Summary",
   "viewBeds": "View beds",
-  "wardAllocation": "Ward Allocation",
+  "wardAllocation": "Ward allocation",
   "yes": "Yes"
 }
diff --git a/packages/esm-bed-management-app/translations/ar.json b/packages/esm-bed-management-app/translations/ar.json
index dba1d2c0e..0c5600155 100644
--- a/packages/esm-bed-management-app/translations/ar.json
+++ b/packages/esm-bed-management-app/translations/ar.json
@@ -1,51 +1,67 @@
 {
   "actions": "Actions",
   "addBed": "Add bed",
-  "addBedTag": "Create Bed Tag",
-  "addBedtype": "Add Bed Type",
-  "addBedType": "Create Bed type",
+  "addBedTag": "إنشاء علامة السرير",
+  "addBedType": "أضف نوع السرير",
   "allocationStatus": "Allocated",
+  "bedDescription": "وصف السرير",
   "bedId": "Bed ID",
-  "bedIdPlaceholder": "e.g. BMW-201",
   "bedLocation": "Location",
-  "bedManagement": "Bed Management",
-  "bedName": "Bed Name",
+  "bedManagement": "إدارة السرير",
+  "bedManagementLeftPanel": "Bed management left panel",
+  "bedName": "Bed name",
+  "bedNumber": "Bed number",
   "beds": "Beds",
-  "bedTag": "Bed Tag Name",
+  "bedTagCreated": "Bed tag created",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Add Bed Type",
+  "bedTags": "Bed tags",
+  "bedTagUpdated": "Bed tag updated",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Bed type created",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "Bed type updated",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Bed updated",
+  "bedUpdatedSuccessfully": "",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
+  "createBedTag": "Create bed tag",
+  "createBedType": "Create bed type",
   "createNewBed": "Create a new bed",
   "description": "Description",
-  "displayName": "Display Name",
+  "displayName": "Display name",
   "displayNamePlaceholder": "",
-  "editBed": "Edit Tag",
+  "editBed": "Edit bed",
   "editBedTag": "Edit Bed Tag",
-  "editBedType": "Edit Bed Type",
+  "editBedType": "Edit bed type",
+  "editTag": "Edit Tag",
+  "enterBedDescription": "Enter the bed description",
+  "enterBedNumber": "e.g. BMW-201",
   "error": "Error",
+  "errorCreatingBedTag": "Error creating bed tag",
   "errorCreatingForm": "Error creating bed",
   "errorFetchingbedInformation": "Error fetching bed information",
   "filterByOccupancyStatus": "Filter by occupancy status",
-  "formCreated": "Add bed Type",
-  "formSaved": "Bed Type",
-  "headerTitle": "",
   "ids": "Id",
-  "location": "Locations",
-  "manageBeds": "Manage Beds",
+  "location": "الموقع",
+  "manageBeds": "Manage beds",
   "name": "Name",
+  "newBedCreated": "New bed created",
   "no": "No",
   "No data": "No data to display",
+  "noDataToDisplay": "No data to display",
   "occupancyStatus": "Occupied",
   "or": "or",
   "pleaseFillField": "",
   "required": "Required",
-  "save": "Save",
-  "saveSuccessMessage": "was saved successfully.",
+  "save": "حفظ",
   "selectBedLocation": "Select a bed location",
+  "summary": "Summary",
   "viewBeds": "View beds",
-  "wardAllocation": "Ward Allocation",
+  "wardAllocation": "Ward allocation",
   "yes": "Yes"
 }
diff --git a/packages/esm-bed-management-app/translations/de.json b/packages/esm-bed-management-app/translations/de.json
index dba1d2c0e..d19a3e425 100644
--- a/packages/esm-bed-management-app/translations/de.json
+++ b/packages/esm-bed-management-app/translations/de.json
@@ -1,51 +1,67 @@
 {
   "actions": "Actions",
   "addBed": "Add bed",
-  "addBedTag": "Create Bed Tag",
-  "addBedtype": "Add Bed Type",
-  "addBedType": "Create Bed type",
+  "addBedTag": "Create bed tag",
+  "addBedType": "Add bed type",
   "allocationStatus": "Allocated",
+  "bedDescription": "Bed description",
   "bedId": "Bed ID",
-  "bedIdPlaceholder": "e.g. BMW-201",
   "bedLocation": "Location",
-  "bedManagement": "Bed Management",
-  "bedName": "Bed Name",
+  "bedManagement": "Bed management",
+  "bedManagementLeftPanel": "Bed management left panel",
+  "bedName": "Bed name",
+  "bedNumber": "Bed number",
   "beds": "Beds",
-  "bedTag": "Bed Tag Name",
+  "bedTagCreated": "Bed tag created",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Add Bed Type",
+  "bedTags": "Bed tags",
+  "bedTagUpdated": "Bed tag updated",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Bed type created",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "Bed type updated",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Bed updated",
+  "bedUpdatedSuccessfully": "",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
+  "createBedTag": "Create bed tag",
+  "createBedType": "Create bed type",
   "createNewBed": "Create a new bed",
   "description": "Description",
-  "displayName": "Display Name",
+  "displayName": "Display name",
   "displayNamePlaceholder": "",
-  "editBed": "Edit Tag",
+  "editBed": "Edit bed",
   "editBedTag": "Edit Bed Tag",
-  "editBedType": "Edit Bed Type",
+  "editBedType": "Edit bed type",
+  "editTag": "Edit Tag",
+  "enterBedDescription": "Enter the bed description",
+  "enterBedNumber": "e.g. BMW-201",
   "error": "Error",
+  "errorCreatingBedTag": "Error creating bed tag",
   "errorCreatingForm": "Error creating bed",
   "errorFetchingbedInformation": "Error fetching bed information",
   "filterByOccupancyStatus": "Filter by occupancy status",
-  "formCreated": "Add bed Type",
-  "formSaved": "Bed Type",
-  "headerTitle": "",
   "ids": "Id",
-  "location": "Locations",
-  "manageBeds": "Manage Beds",
+  "location": "Location",
+  "manageBeds": "Manage beds",
   "name": "Name",
+  "newBedCreated": "New bed created",
   "no": "No",
   "No data": "No data to display",
+  "noDataToDisplay": "No data to display",
   "occupancyStatus": "Occupied",
   "or": "or",
   "pleaseFillField": "",
   "required": "Required",
   "save": "Save",
-  "saveSuccessMessage": "was saved successfully.",
   "selectBedLocation": "Select a bed location",
+  "summary": "Summary",
   "viewBeds": "View beds",
-  "wardAllocation": "Ward Allocation",
+  "wardAllocation": "Ward allocation",
   "yes": "Yes"
 }
diff --git a/packages/esm-bed-management-app/translations/en.json b/packages/esm-bed-management-app/translations/en.json
index ac668f7d9..d19a3e425 100644
--- a/packages/esm-bed-management-app/translations/en.json
+++ b/packages/esm-bed-management-app/translations/en.json
@@ -12,16 +12,16 @@
   "bedName": "Bed name",
   "bedNumber": "Bed number",
   "beds": "Beds",
-  "bedTag": "Bed tag",
   "bedTagCreated": "Bed tag created",
   "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
+  "bedTags": "Bed tags",
   "bedTagUpdated": "Bed tag updated",
   "bedTagUpdatedSuccessfully": "",
-  "bedType": "Bed type",
   "bedTypeCreated": "Bed type created",
   "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
   "bedTypeUpdated": "Bed type updated",
   "bedTypeUpdatedSuccessfully": "",
   "bedUpdated": "Bed updated",
@@ -60,7 +60,8 @@
   "required": "Required",
   "save": "Save",
   "selectBedLocation": "Select a bed location",
+  "summary": "Summary",
   "viewBeds": "View beds",
-  "wardAllocation": "Ward Allocation",
+  "wardAllocation": "Ward allocation",
   "yes": "Yes"
 }
diff --git a/packages/esm-bed-management-app/translations/es.json b/packages/esm-bed-management-app/translations/es.json
index 3a191820d..bfff0a577 100644
--- a/packages/esm-bed-management-app/translations/es.json
+++ b/packages/esm-bed-management-app/translations/es.json
@@ -1,50 +1,66 @@
 {
   "actions": "Acciones",
-  "addBed": "Añadir cama",
-  "addBedTag": "Crear Etiqueta de Cama",
-  "addBedtype": "Añadir Tipo de Cama",
-  "addBedType": "Crear Tipo de Cama",
-  "allocationStatus": "Asignado",
+  "addBed": "Agregar cama",
+  "addBedTag": "Crear etiqueta de cama",
+  "addBedType": "Agregar tipo de cama",
+  "allocationStatus": "Asignada",
+  "bedDescription": "Descripción de la cama",
   "bedId": "ID de la Cama",
-  "bedIdPlaceholder": "p. ej. BMW-201",
   "bedLocation": "Ubicación",
-  "bedManagement": "Administración de Camas",
-  "bedName": "Nombre de la Cama",
+  "bedManagement": "Administración de camas",
+  "bedManagementLeftPanel": "Panel izquierdo de administración de camas",
+  "bedName": "Nombre de cama",
+  "bedNumber": "Número de cama",
   "beds": "Camas",
-  "bedTag": "Nombre de la Etiqueta de la Cama",
+  "bedTagCreated": "Etiqueta de cama creada",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Añadir Tipo de Cama",
+  "bedTags": "Bed tags",
+  "bedTagUpdated": "Etiqueta de cama actualizada",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Tipo de cama creado",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
-  "checkFilters": "Compruebe los filtros anteriores",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "Tipo de cama actualizado",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Cama actualizada",
+  "bedUpdatedSuccessfully": "",
+  "checkFilters": "Revise los filtros de arriba",
   "chooseBedtype": "Elija un tipo de cama",
   "chooseOccupiedStatus": "Elija el estado ocupado",
+  "createBedTag": "Crear etiqueta de cama",
+  "createBedType": "Crear tipo de cama",
   "createNewBed": "Crear una nueva cama",
   "description": "Descripción",
-  "displayName": "Mostrar Nombre",
+  "displayName": "Nombre para mostrar",
   "displayNamePlaceholder": "",
-  "editBed": "Editar etiqueta",
+  "editBed": "Editar cama",
   "editBedTag": "Editar Etiqueta de la Cama",
-  "editBedType": "Editar Tipo de Cama",
+  "editBedType": "Editar tipo de cama",
+  "editTag": "Editar Etiqueta",
+  "enterBedDescription": "Ingrese la descripción de la cama",
+  "enterBedNumber": "p. ej. BMW-201",
   "error": "Error",
-  "errorCreatingForm": "Error al crear cama",
+  "errorCreatingBedTag": "Error al crear la etiqueta de la cama",
+  "errorCreatingForm": "Error al crear la cama",
   "errorFetchingbedInformation": "Error al obtener información de la cama",
   "filterByOccupancyStatus": "Filtrar por estado de ocupación",
-  "formCreated": "Añadir Tipo de Cama",
-  "formSaved": "Tipo de Cama",
-  "headerTitle": "",
   "ids": "Id",
-  "location": "Ubicaciones",
-  "manageBeds": "Administrar Camas",
+  "location": "Ubicación",
+  "manageBeds": "Administrar camas",
   "name": "Nombre",
+  "newBedCreated": "Nueva cama creada",
   "no": "No",
   "No data": "No hay datos para mostrar",
+  "noDataToDisplay": "No hay datos para mostrar",
   "occupancyStatus": "Ocupada",
   "or": "o",
   "pleaseFillField": "",
-  "required": "Obligatorio",
+  "required": "Requerido",
   "save": "Guardar",
-  "saveSuccessMessage": "fue guardado exitosamente.",
   "selectBedLocation": "Seleccione una ubicación para la cama",
+  "summary": "Summary",
   "viewBeds": "Ver camas",
   "wardAllocation": "Asignación de sala",
   "yes": "Sí"
diff --git a/packages/esm-bed-management-app/translations/fr.json b/packages/esm-bed-management-app/translations/fr.json
index 2ed9929f3..397fddeb6 100644
--- a/packages/esm-bed-management-app/translations/fr.json
+++ b/packages/esm-bed-management-app/translations/fr.json
@@ -1,51 +1,67 @@
 {
   "actions": "Actions",
   "addBed": "Ajouter un lit",
-  "addBedTag": "Créer une étiquette de lit",
-  "addBedtype": "Ajouter type de lit",
-  "addBedType": "Créer Type de lit",
+  "addBedTag": "Create bed tag",
+  "addBedType": "Add bed type",
   "allocationStatus": "Attribué",
+  "bedDescription": "Bed description",
   "bedId": "Identifiant du Lit",
-  "bedIdPlaceholder": "exemple : BMW-201",
   "bedLocation": "Emplacement",
-  "bedManagement": "Gestion du lit",
-  "bedName": "Nom du lit",
+  "bedManagement": "Bed management",
+  "bedManagementLeftPanel": "Bed management left panel",
+  "bedName": "Bed name",
+  "bedNumber": "Bed number",
   "beds": "Lits",
-  "bedTag": "Nom de l'étiquette du lit",
+  "bedTagCreated": "Bed tag created",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Ajouter un type de lit",
+  "bedTags": "Bed tags",
+  "bedTagUpdated": "Bed tag updated",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Bed type created",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "Bed type updated",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Bed updated",
+  "bedUpdatedSuccessfully": "",
   "checkFilters": "Vérifiez les filtres ci-dessus",
   "chooseBedtype": "Choisir un type de lit",
   "chooseOccupiedStatus": " Choisissez le statut occupé",
+  "createBedTag": "Create bed tag",
+  "createBedType": "Create bed type",
   "createNewBed": "Créer un nouveau lit",
   "description": "Description",
-  "displayName": "Display Name",
+  "displayName": "Display name",
   "displayNamePlaceholder": "",
-  "editBed": "Afficher un tag",
+  "editBed": "Edit bed",
   "editBedTag": "Afficher un Tag de lit",
-  "editBedType": "Afficher un type de lit",
+  "editBedType": "Edit bed type",
+  "editTag": "Edit Tag",
+  "enterBedDescription": "Enter the bed description",
+  "enterBedNumber": "e.g. BMW-201",
   "error": "Erreur",
+  "errorCreatingBedTag": "Error creating bed tag",
   "errorCreatingForm": "Erreur lors de la création du lit",
   "errorFetchingbedInformation": " Erreur lors de la récupération des informations sur le lit",
   "filterByOccupancyStatus": "Filtrer par statut d'occupation",
-  "formCreated": "Ajouter un type de lit",
-  "formSaved": "Type de lit",
-  "headerTitle": "",
   "ids": "Identifiant",
-  "location": "Emplacements",
-  "manageBeds": "Gestion des lits",
+  "location": "Location",
+  "manageBeds": "Manage beds",
   "name": "Nom",
+  "newBedCreated": "New bed created",
   "no": "Non",
   "No data": "Pas de données à afficher",
+  "noDataToDisplay": "No data to display",
   "occupancyStatus": "Occupé",
   "or": "ou",
   "pleaseFillField": "",
   "required": "Requis",
   "save": "Enregistrer",
-  "saveSuccessMessage": "a été enregistré avec succès.",
   "selectBedLocation": "Sélectionner un emplacement de lit",
+  "summary": "Summary",
   "viewBeds": "Voir lits",
-  "wardAllocation": "Ward Allocation",
+  "wardAllocation": "Ward allocation",
   "yes": "Oui"
 }
diff --git a/packages/esm-bed-management-app/translations/he.json b/packages/esm-bed-management-app/translations/he.json
index dba1d2c0e..1ac562924 100644
--- a/packages/esm-bed-management-app/translations/he.json
+++ b/packages/esm-bed-management-app/translations/he.json
@@ -1,51 +1,67 @@
 {
   "actions": "Actions",
   "addBed": "Add bed",
-  "addBedTag": "Create Bed Tag",
-  "addBedtype": "Add Bed Type",
-  "addBedType": "Create Bed type",
+  "addBedTag": "יצירת תגית מיטה",
+  "addBedType": "הוספת סוג מיטה",
   "allocationStatus": "Allocated",
+  "bedDescription": "תיאור מיטה",
   "bedId": "Bed ID",
-  "bedIdPlaceholder": "e.g. BMW-201",
   "bedLocation": "Location",
-  "bedManagement": "Bed Management",
-  "bedName": "Bed Name",
+  "bedManagement": "ניהול מיטות",
+  "bedManagementLeftPanel": "לוח ימני לניהול מיטות",
+  "bedName": "שם מיטה",
+  "bedNumber": "מספר מיטה",
   "beds": "Beds",
-  "bedTag": "Bed Tag Name",
+  "bedTagCreated": "נוצרה תגית מיטה",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Add Bed Type",
+  "bedTags": "תגיות מיטות",
+  "bedTagUpdated": "תגית מיטה עודכנה",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "נוצר סוג מיטה",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "סוג המיטה עודכן",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "המיטה עודכנה",
+  "bedUpdatedSuccessfully": "",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
+  "createBedTag": "יצירת תגית מיטה",
+  "createBedType": "יצירת סוג מיטה",
   "createNewBed": "Create a new bed",
   "description": "Description",
-  "displayName": "Display Name",
+  "displayName": "שם תצוגה",
   "displayNamePlaceholder": "",
-  "editBed": "Edit Tag",
+  "editBed": "עריכת מיטה",
   "editBedTag": "Edit Bed Tag",
-  "editBedType": "Edit Bed Type",
+  "editBedType": "עריכת סוג מיטה",
+  "editTag": "עריכת תגית",
+  "enterBedDescription": "נא למלא תיאור מיטה",
+  "enterBedNumber": "למשל: ילד-201",
   "error": "Error",
+  "errorCreatingBedTag": "שגיאה ביצירת תגית מיטה",
   "errorCreatingForm": "Error creating bed",
   "errorFetchingbedInformation": "Error fetching bed information",
   "filterByOccupancyStatus": "Filter by occupancy status",
-  "formCreated": "Add bed Type",
-  "formSaved": "Bed Type",
-  "headerTitle": "",
   "ids": "Id",
-  "location": "Locations",
-  "manageBeds": "Manage Beds",
+  "location": "מקום",
+  "manageBeds": "ניהול מיטות",
   "name": "Name",
+  "newBedCreated": "נוצרה מיטה חדשה",
   "no": "No",
   "No data": "No data to display",
+  "noDataToDisplay": "אין נתונים להצגה",
   "occupancyStatus": "Occupied",
   "or": "or",
   "pleaseFillField": "",
   "required": "Required",
   "save": "Save",
-  "saveSuccessMessage": "was saved successfully.",
   "selectBedLocation": "Select a bed location",
+  "summary": "Summary",
   "viewBeds": "View beds",
-  "wardAllocation": "Ward Allocation",
+  "wardAllocation": "Ward allocation",
   "yes": "Yes"
 }
diff --git a/packages/esm-bed-management-app/translations/hi.json b/packages/esm-bed-management-app/translations/hi.json
index dba1d2c0e..d19a3e425 100644
--- a/packages/esm-bed-management-app/translations/hi.json
+++ b/packages/esm-bed-management-app/translations/hi.json
@@ -1,51 +1,67 @@
 {
   "actions": "Actions",
   "addBed": "Add bed",
-  "addBedTag": "Create Bed Tag",
-  "addBedtype": "Add Bed Type",
-  "addBedType": "Create Bed type",
+  "addBedTag": "Create bed tag",
+  "addBedType": "Add bed type",
   "allocationStatus": "Allocated",
+  "bedDescription": "Bed description",
   "bedId": "Bed ID",
-  "bedIdPlaceholder": "e.g. BMW-201",
   "bedLocation": "Location",
-  "bedManagement": "Bed Management",
-  "bedName": "Bed Name",
+  "bedManagement": "Bed management",
+  "bedManagementLeftPanel": "Bed management left panel",
+  "bedName": "Bed name",
+  "bedNumber": "Bed number",
   "beds": "Beds",
-  "bedTag": "Bed Tag Name",
+  "bedTagCreated": "Bed tag created",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Add Bed Type",
+  "bedTags": "Bed tags",
+  "bedTagUpdated": "Bed tag updated",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Bed type created",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "Bed type updated",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Bed updated",
+  "bedUpdatedSuccessfully": "",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
+  "createBedTag": "Create bed tag",
+  "createBedType": "Create bed type",
   "createNewBed": "Create a new bed",
   "description": "Description",
-  "displayName": "Display Name",
+  "displayName": "Display name",
   "displayNamePlaceholder": "",
-  "editBed": "Edit Tag",
+  "editBed": "Edit bed",
   "editBedTag": "Edit Bed Tag",
-  "editBedType": "Edit Bed Type",
+  "editBedType": "Edit bed type",
+  "editTag": "Edit Tag",
+  "enterBedDescription": "Enter the bed description",
+  "enterBedNumber": "e.g. BMW-201",
   "error": "Error",
+  "errorCreatingBedTag": "Error creating bed tag",
   "errorCreatingForm": "Error creating bed",
   "errorFetchingbedInformation": "Error fetching bed information",
   "filterByOccupancyStatus": "Filter by occupancy status",
-  "formCreated": "Add bed Type",
-  "formSaved": "Bed Type",
-  "headerTitle": "",
   "ids": "Id",
-  "location": "Locations",
-  "manageBeds": "Manage Beds",
+  "location": "Location",
+  "manageBeds": "Manage beds",
   "name": "Name",
+  "newBedCreated": "New bed created",
   "no": "No",
   "No data": "No data to display",
+  "noDataToDisplay": "No data to display",
   "occupancyStatus": "Occupied",
   "or": "or",
   "pleaseFillField": "",
   "required": "Required",
   "save": "Save",
-  "saveSuccessMessage": "was saved successfully.",
   "selectBedLocation": "Select a bed location",
+  "summary": "Summary",
   "viewBeds": "View beds",
-  "wardAllocation": "Ward Allocation",
+  "wardAllocation": "Ward allocation",
   "yes": "Yes"
 }
diff --git a/packages/esm-bed-management-app/translations/hi_IN.json b/packages/esm-bed-management-app/translations/hi_IN.json
index dba1d2c0e..d19a3e425 100644
--- a/packages/esm-bed-management-app/translations/hi_IN.json
+++ b/packages/esm-bed-management-app/translations/hi_IN.json
@@ -1,51 +1,67 @@
 {
   "actions": "Actions",
   "addBed": "Add bed",
-  "addBedTag": "Create Bed Tag",
-  "addBedtype": "Add Bed Type",
-  "addBedType": "Create Bed type",
+  "addBedTag": "Create bed tag",
+  "addBedType": "Add bed type",
   "allocationStatus": "Allocated",
+  "bedDescription": "Bed description",
   "bedId": "Bed ID",
-  "bedIdPlaceholder": "e.g. BMW-201",
   "bedLocation": "Location",
-  "bedManagement": "Bed Management",
-  "bedName": "Bed Name",
+  "bedManagement": "Bed management",
+  "bedManagementLeftPanel": "Bed management left panel",
+  "bedName": "Bed name",
+  "bedNumber": "Bed number",
   "beds": "Beds",
-  "bedTag": "Bed Tag Name",
+  "bedTagCreated": "Bed tag created",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Add Bed Type",
+  "bedTags": "Bed tags",
+  "bedTagUpdated": "Bed tag updated",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Bed type created",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "Bed type updated",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Bed updated",
+  "bedUpdatedSuccessfully": "",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
+  "createBedTag": "Create bed tag",
+  "createBedType": "Create bed type",
   "createNewBed": "Create a new bed",
   "description": "Description",
-  "displayName": "Display Name",
+  "displayName": "Display name",
   "displayNamePlaceholder": "",
-  "editBed": "Edit Tag",
+  "editBed": "Edit bed",
   "editBedTag": "Edit Bed Tag",
-  "editBedType": "Edit Bed Type",
+  "editBedType": "Edit bed type",
+  "editTag": "Edit Tag",
+  "enterBedDescription": "Enter the bed description",
+  "enterBedNumber": "e.g. BMW-201",
   "error": "Error",
+  "errorCreatingBedTag": "Error creating bed tag",
   "errorCreatingForm": "Error creating bed",
   "errorFetchingbedInformation": "Error fetching bed information",
   "filterByOccupancyStatus": "Filter by occupancy status",
-  "formCreated": "Add bed Type",
-  "formSaved": "Bed Type",
-  "headerTitle": "",
   "ids": "Id",
-  "location": "Locations",
-  "manageBeds": "Manage Beds",
+  "location": "Location",
+  "manageBeds": "Manage beds",
   "name": "Name",
+  "newBedCreated": "New bed created",
   "no": "No",
   "No data": "No data to display",
+  "noDataToDisplay": "No data to display",
   "occupancyStatus": "Occupied",
   "or": "or",
   "pleaseFillField": "",
   "required": "Required",
   "save": "Save",
-  "saveSuccessMessage": "was saved successfully.",
   "selectBedLocation": "Select a bed location",
+  "summary": "Summary",
   "viewBeds": "View beds",
-  "wardAllocation": "Ward Allocation",
+  "wardAllocation": "Ward allocation",
   "yes": "Yes"
 }
diff --git a/packages/esm-bed-management-app/translations/id.json b/packages/esm-bed-management-app/translations/id.json
index dba1d2c0e..d19a3e425 100644
--- a/packages/esm-bed-management-app/translations/id.json
+++ b/packages/esm-bed-management-app/translations/id.json
@@ -1,51 +1,67 @@
 {
   "actions": "Actions",
   "addBed": "Add bed",
-  "addBedTag": "Create Bed Tag",
-  "addBedtype": "Add Bed Type",
-  "addBedType": "Create Bed type",
+  "addBedTag": "Create bed tag",
+  "addBedType": "Add bed type",
   "allocationStatus": "Allocated",
+  "bedDescription": "Bed description",
   "bedId": "Bed ID",
-  "bedIdPlaceholder": "e.g. BMW-201",
   "bedLocation": "Location",
-  "bedManagement": "Bed Management",
-  "bedName": "Bed Name",
+  "bedManagement": "Bed management",
+  "bedManagementLeftPanel": "Bed management left panel",
+  "bedName": "Bed name",
+  "bedNumber": "Bed number",
   "beds": "Beds",
-  "bedTag": "Bed Tag Name",
+  "bedTagCreated": "Bed tag created",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Add Bed Type",
+  "bedTags": "Bed tags",
+  "bedTagUpdated": "Bed tag updated",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Bed type created",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "Bed type updated",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Bed updated",
+  "bedUpdatedSuccessfully": "",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
+  "createBedTag": "Create bed tag",
+  "createBedType": "Create bed type",
   "createNewBed": "Create a new bed",
   "description": "Description",
-  "displayName": "Display Name",
+  "displayName": "Display name",
   "displayNamePlaceholder": "",
-  "editBed": "Edit Tag",
+  "editBed": "Edit bed",
   "editBedTag": "Edit Bed Tag",
-  "editBedType": "Edit Bed Type",
+  "editBedType": "Edit bed type",
+  "editTag": "Edit Tag",
+  "enterBedDescription": "Enter the bed description",
+  "enterBedNumber": "e.g. BMW-201",
   "error": "Error",
+  "errorCreatingBedTag": "Error creating bed tag",
   "errorCreatingForm": "Error creating bed",
   "errorFetchingbedInformation": "Error fetching bed information",
   "filterByOccupancyStatus": "Filter by occupancy status",
-  "formCreated": "Add bed Type",
-  "formSaved": "Bed Type",
-  "headerTitle": "",
   "ids": "Id",
-  "location": "Locations",
-  "manageBeds": "Manage Beds",
+  "location": "Location",
+  "manageBeds": "Manage beds",
   "name": "Name",
+  "newBedCreated": "New bed created",
   "no": "No",
   "No data": "No data to display",
+  "noDataToDisplay": "No data to display",
   "occupancyStatus": "Occupied",
   "or": "or",
   "pleaseFillField": "",
   "required": "Required",
   "save": "Save",
-  "saveSuccessMessage": "was saved successfully.",
   "selectBedLocation": "Select a bed location",
+  "summary": "Summary",
   "viewBeds": "View beds",
-  "wardAllocation": "Ward Allocation",
+  "wardAllocation": "Ward allocation",
   "yes": "Yes"
 }
diff --git a/packages/esm-bed-management-app/translations/it.json b/packages/esm-bed-management-app/translations/it.json
index dba1d2c0e..d19a3e425 100644
--- a/packages/esm-bed-management-app/translations/it.json
+++ b/packages/esm-bed-management-app/translations/it.json
@@ -1,51 +1,67 @@
 {
   "actions": "Actions",
   "addBed": "Add bed",
-  "addBedTag": "Create Bed Tag",
-  "addBedtype": "Add Bed Type",
-  "addBedType": "Create Bed type",
+  "addBedTag": "Create bed tag",
+  "addBedType": "Add bed type",
   "allocationStatus": "Allocated",
+  "bedDescription": "Bed description",
   "bedId": "Bed ID",
-  "bedIdPlaceholder": "e.g. BMW-201",
   "bedLocation": "Location",
-  "bedManagement": "Bed Management",
-  "bedName": "Bed Name",
+  "bedManagement": "Bed management",
+  "bedManagementLeftPanel": "Bed management left panel",
+  "bedName": "Bed name",
+  "bedNumber": "Bed number",
   "beds": "Beds",
-  "bedTag": "Bed Tag Name",
+  "bedTagCreated": "Bed tag created",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Add Bed Type",
+  "bedTags": "Bed tags",
+  "bedTagUpdated": "Bed tag updated",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Bed type created",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "Bed type updated",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Bed updated",
+  "bedUpdatedSuccessfully": "",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
+  "createBedTag": "Create bed tag",
+  "createBedType": "Create bed type",
   "createNewBed": "Create a new bed",
   "description": "Description",
-  "displayName": "Display Name",
+  "displayName": "Display name",
   "displayNamePlaceholder": "",
-  "editBed": "Edit Tag",
+  "editBed": "Edit bed",
   "editBedTag": "Edit Bed Tag",
-  "editBedType": "Edit Bed Type",
+  "editBedType": "Edit bed type",
+  "editTag": "Edit Tag",
+  "enterBedDescription": "Enter the bed description",
+  "enterBedNumber": "e.g. BMW-201",
   "error": "Error",
+  "errorCreatingBedTag": "Error creating bed tag",
   "errorCreatingForm": "Error creating bed",
   "errorFetchingbedInformation": "Error fetching bed information",
   "filterByOccupancyStatus": "Filter by occupancy status",
-  "formCreated": "Add bed Type",
-  "formSaved": "Bed Type",
-  "headerTitle": "",
   "ids": "Id",
-  "location": "Locations",
-  "manageBeds": "Manage Beds",
+  "location": "Location",
+  "manageBeds": "Manage beds",
   "name": "Name",
+  "newBedCreated": "New bed created",
   "no": "No",
   "No data": "No data to display",
+  "noDataToDisplay": "No data to display",
   "occupancyStatus": "Occupied",
   "or": "or",
   "pleaseFillField": "",
   "required": "Required",
   "save": "Save",
-  "saveSuccessMessage": "was saved successfully.",
   "selectBedLocation": "Select a bed location",
+  "summary": "Summary",
   "viewBeds": "View beds",
-  "wardAllocation": "Ward Allocation",
+  "wardAllocation": "Ward allocation",
   "yes": "Yes"
 }
diff --git a/packages/esm-bed-management-app/translations/km.json b/packages/esm-bed-management-app/translations/km.json
index dba1d2c0e..d19a3e425 100644
--- a/packages/esm-bed-management-app/translations/km.json
+++ b/packages/esm-bed-management-app/translations/km.json
@@ -1,51 +1,67 @@
 {
   "actions": "Actions",
   "addBed": "Add bed",
-  "addBedTag": "Create Bed Tag",
-  "addBedtype": "Add Bed Type",
-  "addBedType": "Create Bed type",
+  "addBedTag": "Create bed tag",
+  "addBedType": "Add bed type",
   "allocationStatus": "Allocated",
+  "bedDescription": "Bed description",
   "bedId": "Bed ID",
-  "bedIdPlaceholder": "e.g. BMW-201",
   "bedLocation": "Location",
-  "bedManagement": "Bed Management",
-  "bedName": "Bed Name",
+  "bedManagement": "Bed management",
+  "bedManagementLeftPanel": "Bed management left panel",
+  "bedName": "Bed name",
+  "bedNumber": "Bed number",
   "beds": "Beds",
-  "bedTag": "Bed Tag Name",
+  "bedTagCreated": "Bed tag created",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Add Bed Type",
+  "bedTags": "Bed tags",
+  "bedTagUpdated": "Bed tag updated",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Bed type created",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "Bed type updated",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Bed updated",
+  "bedUpdatedSuccessfully": "",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
+  "createBedTag": "Create bed tag",
+  "createBedType": "Create bed type",
   "createNewBed": "Create a new bed",
   "description": "Description",
-  "displayName": "Display Name",
+  "displayName": "Display name",
   "displayNamePlaceholder": "",
-  "editBed": "Edit Tag",
+  "editBed": "Edit bed",
   "editBedTag": "Edit Bed Tag",
-  "editBedType": "Edit Bed Type",
+  "editBedType": "Edit bed type",
+  "editTag": "Edit Tag",
+  "enterBedDescription": "Enter the bed description",
+  "enterBedNumber": "e.g. BMW-201",
   "error": "Error",
+  "errorCreatingBedTag": "Error creating bed tag",
   "errorCreatingForm": "Error creating bed",
   "errorFetchingbedInformation": "Error fetching bed information",
   "filterByOccupancyStatus": "Filter by occupancy status",
-  "formCreated": "Add bed Type",
-  "formSaved": "Bed Type",
-  "headerTitle": "",
   "ids": "Id",
-  "location": "Locations",
-  "manageBeds": "Manage Beds",
+  "location": "Location",
+  "manageBeds": "Manage beds",
   "name": "Name",
+  "newBedCreated": "New bed created",
   "no": "No",
   "No data": "No data to display",
+  "noDataToDisplay": "No data to display",
   "occupancyStatus": "Occupied",
   "or": "or",
   "pleaseFillField": "",
   "required": "Required",
   "save": "Save",
-  "saveSuccessMessage": "was saved successfully.",
   "selectBedLocation": "Select a bed location",
+  "summary": "Summary",
   "viewBeds": "View beds",
-  "wardAllocation": "Ward Allocation",
+  "wardAllocation": "Ward allocation",
   "yes": "Yes"
 }
diff --git a/packages/esm-bed-management-app/translations/ne.json b/packages/esm-bed-management-app/translations/ne.json
new file mode 100644
index 000000000..d19a3e425
--- /dev/null
+++ b/packages/esm-bed-management-app/translations/ne.json
@@ -0,0 +1,67 @@
+{
+  "actions": "Actions",
+  "addBed": "Add bed",
+  "addBedTag": "Create bed tag",
+  "addBedType": "Add bed type",
+  "allocationStatus": "Allocated",
+  "bedDescription": "Bed description",
+  "bedId": "Bed ID",
+  "bedLocation": "Location",
+  "bedManagement": "Bed management",
+  "bedManagementLeftPanel": "Bed management left panel",
+  "bedName": "Bed name",
+  "bedNumber": "Bed number",
+  "beds": "Beds",
+  "bedTagCreated": "Bed tag created",
+  "bedTagCreatedSuccessfully": "",
+  "bedTagPlaceholder": "",
+  "bedTags": "Bed tags",
+  "bedTagUpdated": "Bed tag updated",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Bed type created",
+  "bedTypeCreatedSuccessfully": "",
+  "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "Bed type updated",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Bed updated",
+  "bedUpdatedSuccessfully": "",
+  "checkFilters": "Check the filters above",
+  "chooseBedtype": "Choose a bed type",
+  "chooseOccupiedStatus": "Choose occupied status",
+  "createBedTag": "Create bed tag",
+  "createBedType": "Create bed type",
+  "createNewBed": "Create a new bed",
+  "description": "Description",
+  "displayName": "Display name",
+  "displayNamePlaceholder": "",
+  "editBed": "Edit bed",
+  "editBedTag": "Edit Bed Tag",
+  "editBedType": "Edit bed type",
+  "editTag": "Edit Tag",
+  "enterBedDescription": "Enter the bed description",
+  "enterBedNumber": "e.g. BMW-201",
+  "error": "Error",
+  "errorCreatingBedTag": "Error creating bed tag",
+  "errorCreatingForm": "Error creating bed",
+  "errorFetchingbedInformation": "Error fetching bed information",
+  "filterByOccupancyStatus": "Filter by occupancy status",
+  "ids": "Id",
+  "location": "Location",
+  "manageBeds": "Manage beds",
+  "name": "Name",
+  "newBedCreated": "New bed created",
+  "no": "No",
+  "No data": "No data to display",
+  "noDataToDisplay": "No data to display",
+  "occupancyStatus": "Occupied",
+  "or": "or",
+  "pleaseFillField": "",
+  "required": "Required",
+  "save": "Save",
+  "selectBedLocation": "Select a bed location",
+  "summary": "Summary",
+  "viewBeds": "View beds",
+  "wardAllocation": "Ward allocation",
+  "yes": "Yes"
+}
diff --git a/packages/esm-bed-management-app/translations/pt.json b/packages/esm-bed-management-app/translations/pt.json
index 4faed92b3..92b55c06a 100644
--- a/packages/esm-bed-management-app/translations/pt.json
+++ b/packages/esm-bed-management-app/translations/pt.json
@@ -1,51 +1,67 @@
 {
   "actions": "Ações",
   "addBed": "Adicionar cama",
-  "addBedTag": "Criar Etiqueta de Cama",
-  "addBedtype": "Adicionar Tipo de Cama",
-  "addBedType": "Criar tipo de cama",
+  "addBedTag": "Criar etiqueta da cama",
+  "addBedType": "Adicionar tipo de cama",
   "allocationStatus": "Alocada",
+  "bedDescription": "Descrição da cama",
   "bedId": "ID da Cama",
-  "bedIdPlaceholder": "exemplo: BMW-201",
   "bedLocation": "Local",
-  "bedManagement": "Gestão de Camas",
+  "bedManagement": "Gestão de Cama",
+  "bedManagementLeftPanel": "Gestão de Cama - Painel esquerdo",
   "bedName": "Nome da Cama",
+  "bedNumber": "Número da Cama",
   "beds": "Camas",
-  "bedTag": "Nome da Etiqueta de Cama",
+  "bedTagCreated": "Etiqueta de Cama Criada",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Adicionar Tipo de Cama",
+  "bedTags": "Etiquetas de Cama",
+  "bedTagUpdated": "Etiqueta de Cama Atualizada",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Tipo de cama criado",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Tipos de Cama",
+  "bedTypeUpdated": "Tipo de cama atualizado",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Cama atualizada",
+  "bedUpdatedSuccessfully": "",
   "checkFilters": "Verifique os filtros acima",
   "chooseBedtype": "Selecione o tipo de cama",
   "chooseOccupiedStatus": "Selecione o estado de ocupação ",
+  "createBedTag": "Criar etiqueta de cama",
+  "createBedType": "Criar tipo de cama",
   "createNewBed": "Criar nova cama",
   "description": "Descrição",
-  "displayName": "Nome de visualização",
+  "displayName": "Mostrar nome",
   "displayNamePlaceholder": "",
-  "editBed": "Editar Etiqueta",
+  "editBed": "Editar Cama",
   "editBedTag": "Editar Etiqueta da Cama",
-  "editBedType": "Editar Tipo de Cama",
+  "editBedType": "Editar tipo de Cama",
+  "editTag": "Editar etiqueta",
+  "enterBedDescription": "Escreva a descrição da cama",
+  "enterBedNumber": "ex.: ENF-201",
   "error": "Erro",
+  "errorCreatingBedTag": "Erro ao criar etiqueta da cama",
   "errorCreatingForm": "Erro ao criar cama",
   "errorFetchingbedInformation": "Erro ao buscar informações de cama",
   "filterByOccupancyStatus": "Filtrar por status de ocupação",
-  "formCreated": "Adicionar Tipo de Cama",
-  "formSaved": "Tipo de Cama",
-  "headerTitle": "",
   "ids": "Identificador",
-  "location": "Locais",
-  "manageBeds": "Gerir Camas",
+  "location": "Localização",
+  "manageBeds": "Gerir camas.",
   "name": "Nome",
+  "newBedCreated": "Novo cama criada.",
   "no": "Não",
   "No data": "Não há dados para visualizar",
+  "noDataToDisplay": "Sem dados para mostrar",
   "occupancyStatus": "Ocupado",
   "or": "ou",
   "pleaseFillField": "",
   "required": "Obrigatório",
   "save": "Salvar",
-  "saveSuccessMessage": "foi gravado com sucesso",
   "selectBedLocation": "Selecione a localização da cama",
+  "summary": "Summary",
   "viewBeds": "Visualizar camas",
-  "wardAllocation": "Enfermaria Alocada",
+  "wardAllocation": "Enfermaria alocada",
   "yes": "Sim"
 }
diff --git a/packages/esm-bed-management-app/translations/qu.json b/packages/esm-bed-management-app/translations/qu.json
index dba1d2c0e..d19a3e425 100644
--- a/packages/esm-bed-management-app/translations/qu.json
+++ b/packages/esm-bed-management-app/translations/qu.json
@@ -1,51 +1,67 @@
 {
   "actions": "Actions",
   "addBed": "Add bed",
-  "addBedTag": "Create Bed Tag",
-  "addBedtype": "Add Bed Type",
-  "addBedType": "Create Bed type",
+  "addBedTag": "Create bed tag",
+  "addBedType": "Add bed type",
   "allocationStatus": "Allocated",
+  "bedDescription": "Bed description",
   "bedId": "Bed ID",
-  "bedIdPlaceholder": "e.g. BMW-201",
   "bedLocation": "Location",
-  "bedManagement": "Bed Management",
-  "bedName": "Bed Name",
+  "bedManagement": "Bed management",
+  "bedManagementLeftPanel": "Bed management left panel",
+  "bedName": "Bed name",
+  "bedNumber": "Bed number",
   "beds": "Beds",
-  "bedTag": "Bed Tag Name",
+  "bedTagCreated": "Bed tag created",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Add Bed Type",
+  "bedTags": "Bed tags",
+  "bedTagUpdated": "Bed tag updated",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Bed type created",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "Bed type updated",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Bed updated",
+  "bedUpdatedSuccessfully": "",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
+  "createBedTag": "Create bed tag",
+  "createBedType": "Create bed type",
   "createNewBed": "Create a new bed",
   "description": "Description",
-  "displayName": "Display Name",
+  "displayName": "Display name",
   "displayNamePlaceholder": "",
-  "editBed": "Edit Tag",
+  "editBed": "Edit bed",
   "editBedTag": "Edit Bed Tag",
-  "editBedType": "Edit Bed Type",
+  "editBedType": "Edit bed type",
+  "editTag": "Edit Tag",
+  "enterBedDescription": "Enter the bed description",
+  "enterBedNumber": "e.g. BMW-201",
   "error": "Error",
+  "errorCreatingBedTag": "Error creating bed tag",
   "errorCreatingForm": "Error creating bed",
   "errorFetchingbedInformation": "Error fetching bed information",
   "filterByOccupancyStatus": "Filter by occupancy status",
-  "formCreated": "Add bed Type",
-  "formSaved": "Bed Type",
-  "headerTitle": "",
   "ids": "Id",
-  "location": "Locations",
-  "manageBeds": "Manage Beds",
+  "location": "Location",
+  "manageBeds": "Manage beds",
   "name": "Name",
+  "newBedCreated": "New bed created",
   "no": "No",
   "No data": "No data to display",
+  "noDataToDisplay": "No data to display",
   "occupancyStatus": "Occupied",
   "or": "or",
   "pleaseFillField": "",
   "required": "Required",
   "save": "Save",
-  "saveSuccessMessage": "was saved successfully.",
   "selectBedLocation": "Select a bed location",
+  "summary": "Summary",
   "viewBeds": "View beds",
-  "wardAllocation": "Ward Allocation",
+  "wardAllocation": "Ward allocation",
   "yes": "Yes"
 }
diff --git a/packages/esm-bed-management-app/translations/si.json b/packages/esm-bed-management-app/translations/si.json
index dba1d2c0e..d19a3e425 100644
--- a/packages/esm-bed-management-app/translations/si.json
+++ b/packages/esm-bed-management-app/translations/si.json
@@ -1,51 +1,67 @@
 {
   "actions": "Actions",
   "addBed": "Add bed",
-  "addBedTag": "Create Bed Tag",
-  "addBedtype": "Add Bed Type",
-  "addBedType": "Create Bed type",
+  "addBedTag": "Create bed tag",
+  "addBedType": "Add bed type",
   "allocationStatus": "Allocated",
+  "bedDescription": "Bed description",
   "bedId": "Bed ID",
-  "bedIdPlaceholder": "e.g. BMW-201",
   "bedLocation": "Location",
-  "bedManagement": "Bed Management",
-  "bedName": "Bed Name",
+  "bedManagement": "Bed management",
+  "bedManagementLeftPanel": "Bed management left panel",
+  "bedName": "Bed name",
+  "bedNumber": "Bed number",
   "beds": "Beds",
-  "bedTag": "Bed Tag Name",
+  "bedTagCreated": "Bed tag created",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Add Bed Type",
+  "bedTags": "Bed tags",
+  "bedTagUpdated": "Bed tag updated",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Bed type created",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "Bed type updated",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Bed updated",
+  "bedUpdatedSuccessfully": "",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
+  "createBedTag": "Create bed tag",
+  "createBedType": "Create bed type",
   "createNewBed": "Create a new bed",
   "description": "Description",
-  "displayName": "Display Name",
+  "displayName": "Display name",
   "displayNamePlaceholder": "",
-  "editBed": "Edit Tag",
+  "editBed": "Edit bed",
   "editBedTag": "Edit Bed Tag",
-  "editBedType": "Edit Bed Type",
+  "editBedType": "Edit bed type",
+  "editTag": "Edit Tag",
+  "enterBedDescription": "Enter the bed description",
+  "enterBedNumber": "e.g. BMW-201",
   "error": "Error",
+  "errorCreatingBedTag": "Error creating bed tag",
   "errorCreatingForm": "Error creating bed",
   "errorFetchingbedInformation": "Error fetching bed information",
   "filterByOccupancyStatus": "Filter by occupancy status",
-  "formCreated": "Add bed Type",
-  "formSaved": "Bed Type",
-  "headerTitle": "",
   "ids": "Id",
-  "location": "Locations",
-  "manageBeds": "Manage Beds",
+  "location": "Location",
+  "manageBeds": "Manage beds",
   "name": "Name",
+  "newBedCreated": "New bed created",
   "no": "No",
   "No data": "No data to display",
+  "noDataToDisplay": "No data to display",
   "occupancyStatus": "Occupied",
   "or": "or",
   "pleaseFillField": "",
   "required": "Required",
   "save": "Save",
-  "saveSuccessMessage": "was saved successfully.",
   "selectBedLocation": "Select a bed location",
+  "summary": "Summary",
   "viewBeds": "View beds",
-  "wardAllocation": "Ward Allocation",
+  "wardAllocation": "Ward allocation",
   "yes": "Yes"
 }
diff --git a/packages/esm-bed-management-app/translations/sw.json b/packages/esm-bed-management-app/translations/sw.json
index dba1d2c0e..d19a3e425 100644
--- a/packages/esm-bed-management-app/translations/sw.json
+++ b/packages/esm-bed-management-app/translations/sw.json
@@ -1,51 +1,67 @@
 {
   "actions": "Actions",
   "addBed": "Add bed",
-  "addBedTag": "Create Bed Tag",
-  "addBedtype": "Add Bed Type",
-  "addBedType": "Create Bed type",
+  "addBedTag": "Create bed tag",
+  "addBedType": "Add bed type",
   "allocationStatus": "Allocated",
+  "bedDescription": "Bed description",
   "bedId": "Bed ID",
-  "bedIdPlaceholder": "e.g. BMW-201",
   "bedLocation": "Location",
-  "bedManagement": "Bed Management",
-  "bedName": "Bed Name",
+  "bedManagement": "Bed management",
+  "bedManagementLeftPanel": "Bed management left panel",
+  "bedName": "Bed name",
+  "bedNumber": "Bed number",
   "beds": "Beds",
-  "bedTag": "Bed Tag Name",
+  "bedTagCreated": "Bed tag created",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Add Bed Type",
+  "bedTags": "Bed tags",
+  "bedTagUpdated": "Bed tag updated",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Bed type created",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "Bed type updated",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Bed updated",
+  "bedUpdatedSuccessfully": "",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
+  "createBedTag": "Create bed tag",
+  "createBedType": "Create bed type",
   "createNewBed": "Create a new bed",
   "description": "Description",
-  "displayName": "Display Name",
+  "displayName": "Display name",
   "displayNamePlaceholder": "",
-  "editBed": "Edit Tag",
+  "editBed": "Edit bed",
   "editBedTag": "Edit Bed Tag",
-  "editBedType": "Edit Bed Type",
+  "editBedType": "Edit bed type",
+  "editTag": "Edit Tag",
+  "enterBedDescription": "Enter the bed description",
+  "enterBedNumber": "e.g. BMW-201",
   "error": "Error",
+  "errorCreatingBedTag": "Error creating bed tag",
   "errorCreatingForm": "Error creating bed",
   "errorFetchingbedInformation": "Error fetching bed information",
   "filterByOccupancyStatus": "Filter by occupancy status",
-  "formCreated": "Add bed Type",
-  "formSaved": "Bed Type",
-  "headerTitle": "",
   "ids": "Id",
-  "location": "Locations",
-  "manageBeds": "Manage Beds",
+  "location": "Location",
+  "manageBeds": "Manage beds",
   "name": "Name",
+  "newBedCreated": "New bed created",
   "no": "No",
   "No data": "No data to display",
+  "noDataToDisplay": "No data to display",
   "occupancyStatus": "Occupied",
   "or": "or",
   "pleaseFillField": "",
   "required": "Required",
   "save": "Save",
-  "saveSuccessMessage": "was saved successfully.",
   "selectBedLocation": "Select a bed location",
+  "summary": "Summary",
   "viewBeds": "View beds",
-  "wardAllocation": "Ward Allocation",
+  "wardAllocation": "Ward allocation",
   "yes": "Yes"
 }
diff --git a/packages/esm-bed-management-app/translations/sw_KE.json b/packages/esm-bed-management-app/translations/sw_KE.json
index dba1d2c0e..d19a3e425 100644
--- a/packages/esm-bed-management-app/translations/sw_KE.json
+++ b/packages/esm-bed-management-app/translations/sw_KE.json
@@ -1,51 +1,67 @@
 {
   "actions": "Actions",
   "addBed": "Add bed",
-  "addBedTag": "Create Bed Tag",
-  "addBedtype": "Add Bed Type",
-  "addBedType": "Create Bed type",
+  "addBedTag": "Create bed tag",
+  "addBedType": "Add bed type",
   "allocationStatus": "Allocated",
+  "bedDescription": "Bed description",
   "bedId": "Bed ID",
-  "bedIdPlaceholder": "e.g. BMW-201",
   "bedLocation": "Location",
-  "bedManagement": "Bed Management",
-  "bedName": "Bed Name",
+  "bedManagement": "Bed management",
+  "bedManagementLeftPanel": "Bed management left panel",
+  "bedName": "Bed name",
+  "bedNumber": "Bed number",
   "beds": "Beds",
-  "bedTag": "Bed Tag Name",
+  "bedTagCreated": "Bed tag created",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Add Bed Type",
+  "bedTags": "Bed tags",
+  "bedTagUpdated": "Bed tag updated",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Bed type created",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "Bed type updated",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Bed updated",
+  "bedUpdatedSuccessfully": "",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
+  "createBedTag": "Create bed tag",
+  "createBedType": "Create bed type",
   "createNewBed": "Create a new bed",
   "description": "Description",
-  "displayName": "Display Name",
+  "displayName": "Display name",
   "displayNamePlaceholder": "",
-  "editBed": "Edit Tag",
+  "editBed": "Edit bed",
   "editBedTag": "Edit Bed Tag",
-  "editBedType": "Edit Bed Type",
+  "editBedType": "Edit bed type",
+  "editTag": "Edit Tag",
+  "enterBedDescription": "Enter the bed description",
+  "enterBedNumber": "e.g. BMW-201",
   "error": "Error",
+  "errorCreatingBedTag": "Error creating bed tag",
   "errorCreatingForm": "Error creating bed",
   "errorFetchingbedInformation": "Error fetching bed information",
   "filterByOccupancyStatus": "Filter by occupancy status",
-  "formCreated": "Add bed Type",
-  "formSaved": "Bed Type",
-  "headerTitle": "",
   "ids": "Id",
-  "location": "Locations",
-  "manageBeds": "Manage Beds",
+  "location": "Location",
+  "manageBeds": "Manage beds",
   "name": "Name",
+  "newBedCreated": "New bed created",
   "no": "No",
   "No data": "No data to display",
+  "noDataToDisplay": "No data to display",
   "occupancyStatus": "Occupied",
   "or": "or",
   "pleaseFillField": "",
   "required": "Required",
   "save": "Save",
-  "saveSuccessMessage": "was saved successfully.",
   "selectBedLocation": "Select a bed location",
+  "summary": "Summary",
   "viewBeds": "View beds",
-  "wardAllocation": "Ward Allocation",
+  "wardAllocation": "Ward allocation",
   "yes": "Yes"
 }
diff --git a/packages/esm-bed-management-app/translations/tr.json b/packages/esm-bed-management-app/translations/tr.json
index dba1d2c0e..d19a3e425 100644
--- a/packages/esm-bed-management-app/translations/tr.json
+++ b/packages/esm-bed-management-app/translations/tr.json
@@ -1,51 +1,67 @@
 {
   "actions": "Actions",
   "addBed": "Add bed",
-  "addBedTag": "Create Bed Tag",
-  "addBedtype": "Add Bed Type",
-  "addBedType": "Create Bed type",
+  "addBedTag": "Create bed tag",
+  "addBedType": "Add bed type",
   "allocationStatus": "Allocated",
+  "bedDescription": "Bed description",
   "bedId": "Bed ID",
-  "bedIdPlaceholder": "e.g. BMW-201",
   "bedLocation": "Location",
-  "bedManagement": "Bed Management",
-  "bedName": "Bed Name",
+  "bedManagement": "Bed management",
+  "bedManagementLeftPanel": "Bed management left panel",
+  "bedName": "Bed name",
+  "bedNumber": "Bed number",
   "beds": "Beds",
-  "bedTag": "Bed Tag Name",
+  "bedTagCreated": "Bed tag created",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Add Bed Type",
+  "bedTags": "Bed tags",
+  "bedTagUpdated": "Bed tag updated",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Bed type created",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "Bed type updated",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Bed updated",
+  "bedUpdatedSuccessfully": "",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
+  "createBedTag": "Create bed tag",
+  "createBedType": "Create bed type",
   "createNewBed": "Create a new bed",
   "description": "Description",
-  "displayName": "Display Name",
+  "displayName": "Display name",
   "displayNamePlaceholder": "",
-  "editBed": "Edit Tag",
+  "editBed": "Edit bed",
   "editBedTag": "Edit Bed Tag",
-  "editBedType": "Edit Bed Type",
+  "editBedType": "Edit bed type",
+  "editTag": "Edit Tag",
+  "enterBedDescription": "Enter the bed description",
+  "enterBedNumber": "e.g. BMW-201",
   "error": "Error",
+  "errorCreatingBedTag": "Error creating bed tag",
   "errorCreatingForm": "Error creating bed",
   "errorFetchingbedInformation": "Error fetching bed information",
   "filterByOccupancyStatus": "Filter by occupancy status",
-  "formCreated": "Add bed Type",
-  "formSaved": "Bed Type",
-  "headerTitle": "",
   "ids": "Id",
-  "location": "Locations",
-  "manageBeds": "Manage Beds",
+  "location": "Location",
+  "manageBeds": "Manage beds",
   "name": "Name",
+  "newBedCreated": "New bed created",
   "no": "No",
   "No data": "No data to display",
+  "noDataToDisplay": "No data to display",
   "occupancyStatus": "Occupied",
   "or": "or",
   "pleaseFillField": "",
   "required": "Required",
   "save": "Save",
-  "saveSuccessMessage": "was saved successfully.",
   "selectBedLocation": "Select a bed location",
+  "summary": "Summary",
   "viewBeds": "View beds",
-  "wardAllocation": "Ward Allocation",
+  "wardAllocation": "Ward allocation",
   "yes": "Yes"
 }
diff --git a/packages/esm-bed-management-app/translations/tr_TR.json b/packages/esm-bed-management-app/translations/tr_TR.json
index dba1d2c0e..d19a3e425 100644
--- a/packages/esm-bed-management-app/translations/tr_TR.json
+++ b/packages/esm-bed-management-app/translations/tr_TR.json
@@ -1,51 +1,67 @@
 {
   "actions": "Actions",
   "addBed": "Add bed",
-  "addBedTag": "Create Bed Tag",
-  "addBedtype": "Add Bed Type",
-  "addBedType": "Create Bed type",
+  "addBedTag": "Create bed tag",
+  "addBedType": "Add bed type",
   "allocationStatus": "Allocated",
+  "bedDescription": "Bed description",
   "bedId": "Bed ID",
-  "bedIdPlaceholder": "e.g. BMW-201",
   "bedLocation": "Location",
-  "bedManagement": "Bed Management",
-  "bedName": "Bed Name",
+  "bedManagement": "Bed management",
+  "bedManagementLeftPanel": "Bed management left panel",
+  "bedName": "Bed name",
+  "bedNumber": "Bed number",
   "beds": "Beds",
-  "bedTag": "Bed Tag Name",
+  "bedTagCreated": "Bed tag created",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Add Bed Type",
+  "bedTags": "Bed tags",
+  "bedTagUpdated": "Bed tag updated",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Bed type created",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "Bed type updated",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Bed updated",
+  "bedUpdatedSuccessfully": "",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
+  "createBedTag": "Create bed tag",
+  "createBedType": "Create bed type",
   "createNewBed": "Create a new bed",
   "description": "Description",
-  "displayName": "Display Name",
+  "displayName": "Display name",
   "displayNamePlaceholder": "",
-  "editBed": "Edit Tag",
+  "editBed": "Edit bed",
   "editBedTag": "Edit Bed Tag",
-  "editBedType": "Edit Bed Type",
+  "editBedType": "Edit bed type",
+  "editTag": "Edit Tag",
+  "enterBedDescription": "Enter the bed description",
+  "enterBedNumber": "e.g. BMW-201",
   "error": "Error",
+  "errorCreatingBedTag": "Error creating bed tag",
   "errorCreatingForm": "Error creating bed",
   "errorFetchingbedInformation": "Error fetching bed information",
   "filterByOccupancyStatus": "Filter by occupancy status",
-  "formCreated": "Add bed Type",
-  "formSaved": "Bed Type",
-  "headerTitle": "",
   "ids": "Id",
-  "location": "Locations",
-  "manageBeds": "Manage Beds",
+  "location": "Location",
+  "manageBeds": "Manage beds",
   "name": "Name",
+  "newBedCreated": "New bed created",
   "no": "No",
   "No data": "No data to display",
+  "noDataToDisplay": "No data to display",
   "occupancyStatus": "Occupied",
   "or": "or",
   "pleaseFillField": "",
   "required": "Required",
   "save": "Save",
-  "saveSuccessMessage": "was saved successfully.",
   "selectBedLocation": "Select a bed location",
+  "summary": "Summary",
   "viewBeds": "View beds",
-  "wardAllocation": "Ward Allocation",
+  "wardAllocation": "Ward allocation",
   "yes": "Yes"
 }
diff --git a/packages/esm-bed-management-app/translations/uk.json b/packages/esm-bed-management-app/translations/uk.json
index dba1d2c0e..d19a3e425 100644
--- a/packages/esm-bed-management-app/translations/uk.json
+++ b/packages/esm-bed-management-app/translations/uk.json
@@ -1,51 +1,67 @@
 {
   "actions": "Actions",
   "addBed": "Add bed",
-  "addBedTag": "Create Bed Tag",
-  "addBedtype": "Add Bed Type",
-  "addBedType": "Create Bed type",
+  "addBedTag": "Create bed tag",
+  "addBedType": "Add bed type",
   "allocationStatus": "Allocated",
+  "bedDescription": "Bed description",
   "bedId": "Bed ID",
-  "bedIdPlaceholder": "e.g. BMW-201",
   "bedLocation": "Location",
-  "bedManagement": "Bed Management",
-  "bedName": "Bed Name",
+  "bedManagement": "Bed management",
+  "bedManagementLeftPanel": "Bed management left panel",
+  "bedName": "Bed name",
+  "bedNumber": "Bed number",
   "beds": "Beds",
-  "bedTag": "Bed Tag Name",
+  "bedTagCreated": "Bed tag created",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Add Bed Type",
+  "bedTags": "Bed tags",
+  "bedTagUpdated": "Bed tag updated",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Bed type created",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "Bed type updated",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Bed updated",
+  "bedUpdatedSuccessfully": "",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
+  "createBedTag": "Create bed tag",
+  "createBedType": "Create bed type",
   "createNewBed": "Create a new bed",
   "description": "Description",
-  "displayName": "Display Name",
+  "displayName": "Display name",
   "displayNamePlaceholder": "",
-  "editBed": "Edit Tag",
+  "editBed": "Edit bed",
   "editBedTag": "Edit Bed Tag",
-  "editBedType": "Edit Bed Type",
+  "editBedType": "Edit bed type",
+  "editTag": "Edit Tag",
+  "enterBedDescription": "Enter the bed description",
+  "enterBedNumber": "e.g. BMW-201",
   "error": "Error",
+  "errorCreatingBedTag": "Error creating bed tag",
   "errorCreatingForm": "Error creating bed",
   "errorFetchingbedInformation": "Error fetching bed information",
   "filterByOccupancyStatus": "Filter by occupancy status",
-  "formCreated": "Add bed Type",
-  "formSaved": "Bed Type",
-  "headerTitle": "",
   "ids": "Id",
-  "location": "Locations",
-  "manageBeds": "Manage Beds",
+  "location": "Location",
+  "manageBeds": "Manage beds",
   "name": "Name",
+  "newBedCreated": "New bed created",
   "no": "No",
   "No data": "No data to display",
+  "noDataToDisplay": "No data to display",
   "occupancyStatus": "Occupied",
   "or": "or",
   "pleaseFillField": "",
   "required": "Required",
   "save": "Save",
-  "saveSuccessMessage": "was saved successfully.",
   "selectBedLocation": "Select a bed location",
+  "summary": "Summary",
   "viewBeds": "View beds",
-  "wardAllocation": "Ward Allocation",
+  "wardAllocation": "Ward allocation",
   "yes": "Yes"
 }
diff --git a/packages/esm-bed-management-app/translations/vi.json b/packages/esm-bed-management-app/translations/vi.json
index 5fcdeda69..eca9a59d7 100644
--- a/packages/esm-bed-management-app/translations/vi.json
+++ b/packages/esm-bed-management-app/translations/vi.json
@@ -1,50 +1,66 @@
 {
   "actions": "Hành động",
   "addBed": "Thêm giường",
-  "addBedTag": "Tạo thẻ giường",
-  "addBedtype": "Thêm loại giường",
-  "addBedType": "Tạo loại giường",
+  "addBedTag": "Create bed tag",
+  "addBedType": "Add bed type",
   "allocationStatus": "Đã phân bổ",
+  "bedDescription": "Bed description",
   "bedId": "ID",
-  "bedIdPlaceholder": "Ví dụ: BMW-201",
   "bedLocation": "Vị trí",
-  "bedManagement": "Quản lý giường bệnh",
-  "bedName": "Tên giường",
+  "bedManagement": "Bed management",
+  "bedManagementLeftPanel": "Bed management left panel",
+  "bedName": "Bed name",
+  "bedNumber": "Bed number",
   "beds": "Giường",
-  "bedTag": "Tên thẻ giường",
+  "bedTagCreated": "Bed tag created",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Thêm loại thẻ giường",
+  "bedTags": "Bed tags",
+  "bedTagUpdated": "Bed tag updated",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Bed type created",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "Bed type updated",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Bed updated",
+  "bedUpdatedSuccessfully": "",
   "checkFilters": "Kiểm tra các bộ lọc ở trên",
   "chooseBedtype": "Chọn loại giường",
   "chooseOccupiedStatus": "Chọn trạng thái đã chiếm đóng",
+  "createBedTag": "Create bed tag",
+  "createBedType": "Create bed type",
   "createNewBed": "Tạo một giường mới",
   "description": "Mô tả",
-  "displayName": "Tên hiển thị",
+  "displayName": "Display name",
   "displayNamePlaceholder": "",
-  "editBed": "Sủa thẻ",
+  "editBed": "Edit bed",
   "editBedTag": "Sửa thẻ giường",
-  "editBedType": "Sửa loại giường",
+  "editBedType": "Edit bed type",
+  "editTag": "Edit Tag",
+  "enterBedDescription": "Enter the bed description",
+  "enterBedNumber": "e.g. BMW-201",
   "error": "Lỗi",
+  "errorCreatingBedTag": "Error creating bed tag",
   "errorCreatingForm": "Lỗi khi tạo giường",
   "errorFetchingbedInformation": "Lỗi khi tìm kiếm thông tin giường",
   "filterByOccupancyStatus": "Lọc theo tình trạng cư trú",
-  "formCreated": "Thêm loại giường",
-  "formSaved": "Loại giường",
-  "headerTitle": "",
   "ids": "Id",
-  "location": "Vị trí",
-  "manageBeds": "Quản lý giường bệnh",
+  "location": "Location",
+  "manageBeds": "Manage beds",
   "name": "Tên",
+  "newBedCreated": "New bed created",
   "no": "Số",
   "No data": "Không có dữ liệu hiển thị",
+  "noDataToDisplay": "No data to display",
   "occupancyStatus": "Đã sử dụng",
   "or": "hoặc",
   "pleaseFillField": "",
   "required": "Yêu cầu",
   "save": "Lưu",
-  "saveSuccessMessage": "đã lưu thành công",
   "selectBedLocation": "Chọn một vị trí giường",
+  "summary": "Summary",
   "viewBeds": "Xem giường",
   "wardAllocation": "Phân bổ giường",
   "yes": "Có"
diff --git a/packages/esm-bed-management-app/translations/zh.json b/packages/esm-bed-management-app/translations/zh.json
index dba1d2c0e..d19a3e425 100644
--- a/packages/esm-bed-management-app/translations/zh.json
+++ b/packages/esm-bed-management-app/translations/zh.json
@@ -1,51 +1,67 @@
 {
   "actions": "Actions",
   "addBed": "Add bed",
-  "addBedTag": "Create Bed Tag",
-  "addBedtype": "Add Bed Type",
-  "addBedType": "Create Bed type",
+  "addBedTag": "Create bed tag",
+  "addBedType": "Add bed type",
   "allocationStatus": "Allocated",
+  "bedDescription": "Bed description",
   "bedId": "Bed ID",
-  "bedIdPlaceholder": "e.g. BMW-201",
   "bedLocation": "Location",
-  "bedManagement": "Bed Management",
-  "bedName": "Bed Name",
+  "bedManagement": "Bed management",
+  "bedManagementLeftPanel": "Bed management left panel",
+  "bedName": "Bed name",
+  "bedNumber": "Bed number",
   "beds": "Beds",
-  "bedTag": "Bed Tag Name",
+  "bedTagCreated": "Bed tag created",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Add Bed Type",
+  "bedTags": "Bed tags",
+  "bedTagUpdated": "Bed tag updated",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Bed type created",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "Bed type updated",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Bed updated",
+  "bedUpdatedSuccessfully": "",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
+  "createBedTag": "Create bed tag",
+  "createBedType": "Create bed type",
   "createNewBed": "Create a new bed",
   "description": "Description",
-  "displayName": "Display Name",
+  "displayName": "Display name",
   "displayNamePlaceholder": "",
-  "editBed": "Edit Tag",
+  "editBed": "Edit bed",
   "editBedTag": "Edit Bed Tag",
-  "editBedType": "Edit Bed Type",
+  "editBedType": "Edit bed type",
+  "editTag": "Edit Tag",
+  "enterBedDescription": "Enter the bed description",
+  "enterBedNumber": "e.g. BMW-201",
   "error": "Error",
+  "errorCreatingBedTag": "Error creating bed tag",
   "errorCreatingForm": "Error creating bed",
   "errorFetchingbedInformation": "Error fetching bed information",
   "filterByOccupancyStatus": "Filter by occupancy status",
-  "formCreated": "Add bed Type",
-  "formSaved": "Bed Type",
-  "headerTitle": "",
   "ids": "Id",
-  "location": "Locations",
-  "manageBeds": "Manage Beds",
+  "location": "Location",
+  "manageBeds": "Manage beds",
   "name": "Name",
+  "newBedCreated": "New bed created",
   "no": "No",
   "No data": "No data to display",
+  "noDataToDisplay": "No data to display",
   "occupancyStatus": "Occupied",
   "or": "or",
   "pleaseFillField": "",
   "required": "Required",
   "save": "Save",
-  "saveSuccessMessage": "was saved successfully.",
   "selectBedLocation": "Select a bed location",
+  "summary": "Summary",
   "viewBeds": "View beds",
-  "wardAllocation": "Ward Allocation",
+  "wardAllocation": "Ward allocation",
   "yes": "Yes"
 }
diff --git a/packages/esm-bed-management-app/translations/zh_CN.json b/packages/esm-bed-management-app/translations/zh_CN.json
index dba1d2c0e..d19a3e425 100644
--- a/packages/esm-bed-management-app/translations/zh_CN.json
+++ b/packages/esm-bed-management-app/translations/zh_CN.json
@@ -1,51 +1,67 @@
 {
   "actions": "Actions",
   "addBed": "Add bed",
-  "addBedTag": "Create Bed Tag",
-  "addBedtype": "Add Bed Type",
-  "addBedType": "Create Bed type",
+  "addBedTag": "Create bed tag",
+  "addBedType": "Add bed type",
   "allocationStatus": "Allocated",
+  "bedDescription": "Bed description",
   "bedId": "Bed ID",
-  "bedIdPlaceholder": "e.g. BMW-201",
   "bedLocation": "Location",
-  "bedManagement": "Bed Management",
-  "bedName": "Bed Name",
+  "bedManagement": "Bed management",
+  "bedManagementLeftPanel": "Bed management left panel",
+  "bedName": "Bed name",
+  "bedNumber": "Bed number",
   "beds": "Beds",
-  "bedTag": "Bed Tag Name",
+  "bedTagCreated": "Bed tag created",
+  "bedTagCreatedSuccessfully": "",
   "bedTagPlaceholder": "",
-  "bedType": "Add Bed Type",
+  "bedTags": "Bed tags",
+  "bedTagUpdated": "Bed tag updated",
+  "bedTagUpdatedSuccessfully": "",
+  "bedTypeCreated": "Bed type created",
+  "bedTypeCreatedSuccessfully": "",
   "bedTypePlaceholder": "",
+  "bedTypes": "Bed types",
+  "bedTypeUpdated": "Bed type updated",
+  "bedTypeUpdatedSuccessfully": "",
+  "bedUpdated": "Bed updated",
+  "bedUpdatedSuccessfully": "",
   "checkFilters": "Check the filters above",
   "chooseBedtype": "Choose a bed type",
   "chooseOccupiedStatus": "Choose occupied status",
+  "createBedTag": "Create bed tag",
+  "createBedType": "Create bed type",
   "createNewBed": "Create a new bed",
   "description": "Description",
-  "displayName": "Display Name",
+  "displayName": "Display name",
   "displayNamePlaceholder": "",
-  "editBed": "Edit Tag",
+  "editBed": "Edit bed",
   "editBedTag": "Edit Bed Tag",
-  "editBedType": "Edit Bed Type",
+  "editBedType": "Edit bed type",
+  "editTag": "Edit Tag",
+  "enterBedDescription": "Enter the bed description",
+  "enterBedNumber": "e.g. BMW-201",
   "error": "Error",
+  "errorCreatingBedTag": "Error creating bed tag",
   "errorCreatingForm": "Error creating bed",
   "errorFetchingbedInformation": "Error fetching bed information",
   "filterByOccupancyStatus": "Filter by occupancy status",
-  "formCreated": "Add bed Type",
-  "formSaved": "Bed Type",
-  "headerTitle": "",
   "ids": "Id",
-  "location": "Locations",
-  "manageBeds": "Manage Beds",
+  "location": "Location",
+  "manageBeds": "Manage beds",
   "name": "Name",
+  "newBedCreated": "New bed created",
   "no": "No",
   "No data": "No data to display",
+  "noDataToDisplay": "No data to display",
   "occupancyStatus": "Occupied",
   "or": "or",
   "pleaseFillField": "",
   "required": "Required",
   "save": "Save",
-  "saveSuccessMessage": "was saved successfully.",
   "selectBedLocation": "Select a bed location",
+  "summary": "Summary",
   "viewBeds": "View beds",
-  "wardAllocation": "Ward Allocation",
+  "wardAllocation": "Ward allocation",
   "yes": "Yes"
 }
diff --git a/packages/esm-patient-list-management-app/package.json b/packages/esm-patient-list-management-app/package.json
index 02cfa77bc..7fb7edcdd 100644
--- a/packages/esm-patient-list-management-app/package.json
+++ b/packages/esm-patient-list-management-app/package.json
@@ -37,7 +37,7 @@
     "url": "https://github.com/openmrs/openmrs-esm-patient-management/issues"
   },
   "dependencies": {
-    "@carbon/react": "~1.37.0",
+    "@carbon/react": "^1.71.0",
     "dexie": "^3.0.3",
     "fuzzy": "^0.1.3",
     "lodash-es": "^4.17.15"
diff --git a/packages/esm-patient-list-management-app/src/add-patient/add-patient.component.tsx b/packages/esm-patient-list-management-app/src/add-patient/add-patient.component.tsx
index 6c6b5b345..e3ec1d27d 100644
--- a/packages/esm-patient-list-management-app/src/add-patient/add-patient.component.tsx
+++ b/packages/esm-patient-list-management-app/src/add-patient/add-patient.component.tsx
@@ -39,7 +39,7 @@ const AddPatient: React.FC<AddPatientProps> = ({ closeModal, patientUuid }) => {
     const key = `${restBaseUrl}/cohortm/cohortmember?patient=${patientUuid}&v=custom:(uuid,patient:ref,cohort:(uuid,name,startDate,endDate))`;
 
     return mutate((k) => typeof k === 'string' && k === key);
-  }, []);
+  }, [patientUuid]);
 
   const handleSubmit = useCallback(() => {
     Promise.all(
@@ -67,7 +67,7 @@ const AddPatient: React.FC<AddPatientProps> = ({ closeModal, patientUuid }) => {
           });
       }),
     ).finally(closeModal);
-  }, [data, selected, closeModal, t, patientUuid]);
+  }, [selected, closeModal, data, mutateCohortMembers, t]);
 
   const searchResults = useMemo(() => {
     if (!data) {
@@ -88,7 +88,7 @@ const AddPatient: React.FC<AddPatientProps> = ({ closeModal, patientUuid }) => {
     if (currentPage !== 1) {
       goTo(1);
     }
-  }, [searchValue]);
+  }, [currentPage, goTo, searchValue]);
 
   return (
     <div className={styles.modalContent}>
diff --git a/packages/esm-patient-list-management-app/src/header/header.component.tsx b/packages/esm-patient-list-management-app/src/header/header.component.tsx
new file mode 100644
index 000000000..c585e96b0
--- /dev/null
+++ b/packages/esm-patient-list-management-app/src/header/header.component.tsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { Add } from '@carbon/react/icons';
+import { Button } from '@carbon/react';
+import { PageHeader, PageHeaderContent, PatientListsPictogram } from '@openmrs/esm-framework';
+import styles from './header.scss';
+
+interface HeaderProps {
+  handleShowNewListOverlay: () => void;
+}
+
+const Header: React.FC<HeaderProps> = ({ handleShowNewListOverlay }) => {
+  const { t } = useTranslation();
+  return (
+    <PageHeader className={styles.header}>
+      <PageHeaderContent title={t('patientLists', 'Patient lists')} illustration={<PatientListsPictogram />} />
+      <Button
+        className={styles.newListButton}
+        data-openmrs-role="New List"
+        kind="ghost"
+        iconDescription="Add"
+        renderIcon={(props) => <Add {...props} size={16} />}
+        onClick={handleShowNewListOverlay}
+        size="sm">
+        {t('newList', 'New list')}
+      </Button>
+    </PageHeader>
+  );
+};
+
+export default Header;
diff --git a/packages/esm-patient-list-management-app/src/header/header.scss b/packages/esm-patient-list-management-app/src/header/header.scss
index 4de1f6efc..34b3a77a2 100644
--- a/packages/esm-patient-list-management-app/src/header/header.scss
+++ b/packages/esm-patient-list-management-app/src/header/header.scss
@@ -2,51 +2,13 @@
 @use '@carbon/type';
 @use '@openmrs/esm-styleguide/src/vars' as *;
 
-.patientListHeader {
-  @include type.type-style('body-compact-02');
-  color: $text-02;
-  height: layout.$spacing-12;
-  display: flex;
-  justify-content: space-between;
-}
-
-.leftJustifiedItems {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-}
-
-.rightJustifiedItems {
-  @include type.type-style('body-compact-02');
-  display: flex;
-  flex-direction: column;
-  color: $text-02;
-  padding: layout.$spacing-05 0;
-  justify-content: space-between;
-}
-
-.date {
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-  margin-right: layout.$spacing-05;
-
-  svg {
-    margin-right: layout.$spacing-03;
-  }
-}
-
-.pageName {
-  @include type.type-style('heading-04');
-}
-
-.pageLabels {
-  p:first-of-type {
-    margin-bottom: layout.$spacing-02;
-  }
+.header {
+  background-color: $ui-02;
+  border-bottom: 1px solid $ui-03;
 }
 
 .newListButton {
-  align-self: flex-end;
   width: fit-content;
+  height: fit-content;
+  margin: layout.$spacing-05 0;
 }
diff --git a/packages/esm-patient-list-management-app/src/list-details/list-details.component.tsx b/packages/esm-patient-list-management-app/src/list-details/list-details.component.tsx
index fdfd2bb02..b530ccc57 100644
--- a/packages/esm-patient-list-management-app/src/list-details/list-details.component.tsx
+++ b/packages/esm-patient-list-management-app/src/list-details/list-details.component.tsx
@@ -2,7 +2,7 @@ import React, { useState, useCallback, useMemo } from 'react';
 import classNames from 'classnames';
 import { useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
-import { OverflowMenuItem, Modal } from '@carbon/react';
+import { Modal, OverflowMenuItem } from '@carbon/react';
 import { OverflowMenuVertical } from '@carbon/react/icons';
 import { navigate, formatDate, parseDate, showSnackbar, CustomOverflowMenu } from '@openmrs/esm-framework';
 import { deletePatientList } from '../api/api-remote';
diff --git a/packages/esm-patient-list-management-app/src/lists-dashboard/lists-dashboard.component.tsx b/packages/esm-patient-list-management-app/src/lists-dashboard/lists-dashboard.component.tsx
index 1b825c9a9..a5bf74d75 100755
--- a/packages/esm-patient-list-management-app/src/lists-dashboard/lists-dashboard.component.tsx
+++ b/packages/esm-patient-list-management-app/src/lists-dashboard/lists-dashboard.component.tsx
@@ -2,12 +2,11 @@ import React, { useMemo, useState } from 'react';
 import classnames from 'classnames';
 import { useLocation } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
-import { Tab, Tabs, TabList, Button } from '@carbon/react';
-import { Add } from '@carbon/react/icons';
-import { PageHeader, PageHeaderContent, PatientListsPictogram } from '@openmrs/esm-framework';
+import { Tab, Tabs, TabList } from '@carbon/react';
 import { type PatientListFilter, PatientListType } from '../api/types';
 import { useAllPatientLists } from '../api/hooks';
 import CreateEditPatientList from '../create-edit-patient-list/create-edit-list.component';
+import Header from '../header/header.component';
 import ListsTable from '../lists-table/lists-table.component';
 import styles from './lists-dashboard.scss';
 
@@ -61,43 +60,33 @@ const ListsDashboard: React.FC = () => {
   return (
     <main className={classnames('omrs-main-content', styles.dashboardContainer)}>
       <section className={styles.dashboard}>
-        <PageHeader>
-          <PageHeaderContent title={t('patientLists', 'Patient lists')} illustration={<PatientListsPictogram />} />
-          <Button
-            className={styles.newListButton}
-            data-openmrs-role="New List"
-            kind="ghost"
-            iconDescription="Add"
-            renderIcon={(props) => <Add {...props} size={16} />}
-            onClick={handleShowNewListOverlay}
-            size="sm">
-            {t('newList', 'New list')}
-          </Button>
-        </PageHeader>
-        <Tabs
-          className={styles.tabs}
-          onChange={({ selectedIndex }) => {
-            setSelectedTab(selectedIndex);
-          }}
-          selectedIndex={selectedTab}
-          tabContentClassName={styles.hiddenTabsContent}>
-          <TabList className={styles.tablist} aria-label="List tabs" contained>
-            <Tab className={styles.tab}>{t('starredLists', 'Starred lists')}</Tab>
-            <Tab className={styles.tab}>{t('systemLists', 'System lists')}</Tab>
-            <Tab className={styles.tab}>{t('myLists', 'My lists')}</Tab>
-            <Tab className={styles.tab}>{t('allLists', 'All lists')}</Tab>
-          </TabList>
-        </Tabs>
-        <div className={styles.listsTableContainer}>
-          <ListsTable
-            error={error}
-            headers={tableHeaders}
-            isLoading={isLoading}
-            key={patientListFilter.label}
-            listType={patientListFilter.label}
-            patientLists={patientLists}
-            refetch={mutate}
-          />
+        <Header handleShowNewListOverlay={handleShowNewListOverlay} />
+        <div className={styles.tabsContainer}>
+          <Tabs
+            className={styles.tabs}
+            onChange={({ selectedIndex }) => {
+              setSelectedTab(selectedIndex);
+            }}
+            selectedIndex={selectedTab}
+            tabContentClassName={styles.hiddenTabsContent}>
+            <TabList className={styles.tablist} aria-label="List tabs" contained>
+              <Tab className={styles.tab}>{t('starredLists', 'Starred lists')}</Tab>
+              <Tab className={styles.tab}>{t('systemLists', 'System lists')}</Tab>
+              <Tab className={styles.tab}>{t('myLists', 'My lists')}</Tab>
+              <Tab className={styles.tab}>{t('allLists', 'All lists')}</Tab>
+            </TabList>
+          </Tabs>
+          <div className={styles.listsTableContainer}>
+            <ListsTable
+              error={error}
+              headers={tableHeaders}
+              isLoading={isLoading}
+              key={patientListFilter.label}
+              listType={patientListFilter.label}
+              patientLists={patientLists}
+              refetch={mutate}
+            />
+          </div>
         </div>
       </section>
       <section>
diff --git a/packages/esm-patient-list-management-app/src/lists-dashboard/lists-dashboard.scss b/packages/esm-patient-list-management-app/src/lists-dashboard/lists-dashboard.scss
index 1b5b66def..8c1d07a5b 100644
--- a/packages/esm-patient-list-management-app/src/lists-dashboard/lists-dashboard.scss
+++ b/packages/esm-patient-list-management-app/src/lists-dashboard/lists-dashboard.scss
@@ -6,26 +6,23 @@
   margin: layout.$spacing-05 0;
 }
 
-.newListButton {
-  width: fit-content;
-  height: fit-content;
-  margin: 1rem 0;
-}
-
 .dashboardContainer {
   display: flex;
   background-color: $ui-02;
 }
 
 .dashboard {
-  height: 100%;
   width: 100%;
   background-color: $ui-02;
   height: calc(100vh - layout.$spacing-09);
 }
 
+.tabsContainer {
+  margin: layout.$spacing-05 0;
+}
+
 .tabs {
-  grid-column: 'span 2';
+  grid-column: span 2;
 }
 
 .tablist {
diff --git a/packages/esm-patient-list-management-app/src/lists-table/lists-table.component.tsx b/packages/esm-patient-list-management-app/src/lists-table/lists-table.component.tsx
index ad657e335..b8554bf01 100755
--- a/packages/esm-patient-list-management-app/src/lists-table/lists-table.component.tsx
+++ b/packages/esm-patient-list-management-app/src/lists-table/lists-table.component.tsx
@@ -269,19 +269,22 @@ function useStarredLists() {
     setStarredLists(starredPatientLists.split(','));
   }, [currentUser?.userProperties?.starredPatientLists, setStarredLists]);
 
-  const updateUserProperties = (newStarredLists: Array<string>) => {
-    const starredPatientLists = newStarredLists.join(',');
-    const userProperties = { ...(currentUser?.userProperties ?? {}), starredPatientLists };
+  const updateUserProperties = useCallback(
+    (newStarredLists: Array<string>) => {
+      const starredPatientLists = newStarredLists.join(',');
+      const userProperties = { ...(currentUser?.userProperties ?? {}), starredPatientLists };
 
-    starPatientList(currentUser?.uuid, userProperties).catch(() => {
-      setInitialStarredLists();
-      showSnackbar({
-        subtitle: t('starringPatientListFailed', 'Marking patient lists starred / unstarred failed'),
-        kind: 'error',
-        title: 'Failed to update patient lists',
+      starPatientList(currentUser?.uuid, userProperties).catch(() => {
+        setInitialStarredLists();
+        showSnackbar({
+          subtitle: t('starringPatientListFailed', 'Marking patient lists starred / unstarred failed'),
+          kind: 'error',
+          title: 'Failed to update patient lists',
+        });
       });
-    });
-  };
+    },
+    [currentUser?.userProperties, currentUser?.uuid, setInitialStarredLists, t],
+  );
 
   /**
    * Handles toggling the starred list
diff --git a/packages/esm-patient-list-management-app/translations/ar.json b/packages/esm-patient-list-management-app/translations/ar.json
index 4f3a9c83e..88be9bc32 100644
--- a/packages/esm-patient-list-management-app/translations/ar.json
+++ b/packages/esm-patient-list-management-app/translations/ar.json
@@ -31,7 +31,7 @@
   "errorUpdatingList": "Error updating list",
   "identifier": "المعرف",
   "items": "العناصر",
-  "itemsDisplayed": "{{numberOfItemsDisplayed}} items",
+  "itemsDisplayed": "{{numberOfItemsDisplayed}} العناصر",
   "listCreated": "List created successfully",
   "listDescriptionPlaceholder": "مثل: المرضى الذين تم تشخيصهم بالربو والذين قد يكونون على استعداد للمشاركة في دراسة جامعية",
   "listName": "اسم القائمة",
diff --git a/packages/esm-patient-list-management-app/translations/he.json b/packages/esm-patient-list-management-app/translations/he.json
index e0c87b8d5..ed5d7e7b8 100644
--- a/packages/esm-patient-list-management-app/translations/he.json
+++ b/packages/esm-patient-list-management-app/translations/he.json
@@ -47,7 +47,7 @@
   "newPatientListNameLabel": "שם הרשימה",
   "nextPage": "עמוד הבא",
   "noMatchingLists": "אין רשימות תואמות להצגה",
-  "noMatchingListsFound": "No matching lists found",
+  "noMatchingListsFound": "לא נמצאו רשימות מתאימות",
   "noMatchingPatients": "אין מטופלים תואמים להצגה",
   "noOfPatients": "מספר מטופלים",
   "noPatientsInList": "אין מטופלים ברשימה זו",
@@ -76,7 +76,7 @@
   "successfullyAdded": "נוסף בהצלחה",
   "systemDefined": "הוגדר על ידי המערכת",
   "systemLists": "רשימות מערכת",
-  "trySearchingForADifferentList": "Try searching for a different list",
+  "trySearchingForADifferentList": "נא לנסות לחפש רשימה אחרת",
   "unstarList": "Unstar list",
   "updated": "עודכן",
   "userDefined": "הוגדר על ידי המשתמש"
diff --git a/packages/esm-patient-list-management-app/translations/ne.json b/packages/esm-patient-list-management-app/translations/ne.json
new file mode 100644
index 000000000..03432c1a8
--- /dev/null
+++ b/packages/esm-patient-list-management-app/translations/ne.json
@@ -0,0 +1,83 @@
+{
+  "actions": "Actions",
+  "addPatientToList": "Add patient to list",
+  "addToList": "Add to list",
+  "allLists": "All lists",
+  "backToListsPage": "Back to lists page",
+  "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
+  "configureList": "Configure your patient list using the fields below",
+  "confirmDeletePatientList": "Are you sure you want to delete this patient list?",
+  "created": "Created",
+  "createdOn": "Created on",
+  "createList": "Create list",
+  "createNewPatientList": "Create new patient list",
+  "createPatientList": "Create patient list",
+  "deleted": "Deleted",
+  "deletedPatientList": "Deleted patient list",
+  "deletePatientList": "Delete patient list",
+  "editList": "Edit list",
+  "editNameDescription": "Edit name or description",
+  "editPatientListHeader": "Edit patient list",
+  "emptyList": "This list has no patients",
+  "emptyStateIllustration": "Empty state illustration",
+  "emptyStateText": "There are no {{listType}} patient lists to display",
+  "error": "Error",
+  "errorAddPatientToList": "Patient not added to list",
+  "errorCopy": "Sorry, there was a problem displaying this information. You can try to reload this page, or contact the site administrator and quote the error code above.",
+  "errorCreatingList": "Error creating list",
+  "errorDeletingList": "Error deleting patient list",
+  "errorRemovingPatientFromList": "Failed to remove patient from list",
+  "errorUpdatingList": "Error updating list",
+  "identifier": "Identifier",
+  "items": "items",
+  "itemsDisplayed": "{{numberOfItemsDisplayed}} items",
+  "listCreated": "List created successfully",
+  "listDescriptionPlaceholder": "e.g. Patients with diagnosed asthma who may be willing to be a part of a university research study",
+  "listName": "List name",
+  "listNamePlaceholder": "e.g. Potential research participants",
+  "listType": "List type",
+  "listUpdated": "List updated successfully",
+  "listUpToDate": "The list is now up to date",
+  "myLists": "My lists",
+  "name": "Name",
+  "newList": "New list",
+  "newPatientListDescriptionLabel": "Describe the purpose of this list in a few words",
+  "newPatientListHeader": "New patient list",
+  "newPatientListNameLabel": "List name",
+  "nextPage": "Next page",
+  "noMatchingLists": "No matching lists to display",
+  "noMatchingListsFound": "No matching lists found",
+  "noMatchingPatients": "No matching patients to display",
+  "noOfPatients": "No. of patients",
+  "noPatientsInList": "There are no patients in this list",
+  "openPatientList": "Add to list",
+  "patientListMemberCount_one": "This list has {{count}} patient",
+  "patientListMemberCount_other": "This list has {{count}} patients",
+  "patientLists": "Patient lists",
+  "patientRemovedFromList": "Patient removed from list",
+  "patients": "patients",
+  "previousPage": "Previous page",
+  "problemCreatingList": "There was a problem creating the list",
+  "problemUpdatingList": "There was a problem updating the list",
+  "removeFromList": "Remove from list",
+  "removePatientFromListConfirmation": "Are you sure you want to remove {{patientName}} from this list?",
+  "searchForAListToAddThisPatientTo": "Search for a list to add this patient to.",
+  "searchForList": "Search for a list",
+  "searchThisList": "Search this list",
+  "sex": "Sex",
+  "starList": "Star list",
+  "starred": "starred",
+  "starredLists": "Starred lists",
+  "starringPatientListFailed": "Marking patient lists starred / unstarred failed",
+  "startDate": "Start Date",
+  "submitting": "Submitting",
+  "successAddPatientToList": "Patient added to list",
+  "successfullyAdded": "Successfully added",
+  "systemDefined": "system-defined",
+  "systemLists": "System lists",
+  "trySearchingForADifferentList": "Try searching for a different list",
+  "unstarList": "Unstar list",
+  "updated": "Updated",
+  "userDefined": "user-defined"
+}
diff --git a/packages/esm-patient-list-management-app/translations/pt.json b/packages/esm-patient-list-management-app/translations/pt.json
index 2213f0d0b..d4b865cff 100644
--- a/packages/esm-patient-list-management-app/translations/pt.json
+++ b/packages/esm-patient-list-management-app/translations/pt.json
@@ -14,7 +14,7 @@
   "createNewPatientList": "Criar nova lista de utentes",
   "createPatientList": "Criar lista de utente",
   "deleted": "Excluído",
-  "deletedPatientList": "Lista de utentes excluída",
+  "deletedPatientList": "Lista de utentes apagada",
   "deletePatientList": "Apagar lista de utente",
   "editList": "Editar a lista",
   "editNameDescription": "Editar nome ou descrição",
@@ -42,7 +42,7 @@
   "myLists": "Minhas listas",
   "name": "Nome",
   "newList": "Nova lista",
-  "newPatientListDescriptionLabel": "Descreva em poucas palavras o proposito desta lista",
+  "newPatientListDescriptionLabel": "Descreva em poucas palavras o propósito desta lista",
   "newPatientListHeader": "Nova lista de utente",
   "newPatientListNameLabel": "Nome da Lista",
   "nextPage": "Próxima página",
@@ -62,12 +62,12 @@
   "problemUpdatingList": "Ocorreu um problema ao actualizar a lista",
   "removeFromList": "Remover da lista",
   "removePatientFromListConfirmation": "Tem certeza de que deseja remover {{patientName}} desta fila?",
-  "searchForAListToAddThisPatientTo": "Procure uma lista à qual a adicionar este utente.",
+  "searchForAListToAddThisPatientTo": "Procure uma lista à qual adicionar este utente.",
   "searchForList": "Procure uma lista",
   "searchThisList": "Pesquisar esta lista",
   "sex": "Sexo",
   "starList": "Lista de estrelas",
-  "starred": "estrelado",
+  "starred": "com estrela",
   "starredLists": "Listas com estrela",
   "starringPatientListFailed": "Falha ao marcar listas de utentes com estrela/sem estrela",
   "startDate": "Data inicial",
diff --git a/packages/esm-patient-list-management-app/translations/zh.json b/packages/esm-patient-list-management-app/translations/zh.json
index e980be62d..695dfcddf 100644
--- a/packages/esm-patient-list-management-app/translations/zh.json
+++ b/packages/esm-patient-list-management-app/translations/zh.json
@@ -29,7 +29,7 @@
   "errorDeletingList": "删除患者列表时出现错误",
   "errorRemovingPatientFromList": "未能从列表中移除患者",
   "errorUpdatingList": "更新列表时出现错误",
-  "identifier": "ID",
+  "identifier": "Identifier",
   "items": "项",
   "itemsDisplayed": "{{numberOfItemsDisplayed}} 项",
   "listCreated": "列表创建成功",
diff --git a/packages/esm-patient-registration-app/package.json b/packages/esm-patient-registration-app/package.json
index 5c0cbd36b..204e1ec42 100644
--- a/packages/esm-patient-registration-app/package.json
+++ b/packages/esm-patient-registration-app/package.json
@@ -37,7 +37,7 @@
     "url": "https://github.com/openmrs/openmrs-esm-patient-management/issues"
   },
   "dependencies": {
-    "@carbon/react": "~1.37.0",
+    "@carbon/react": "^1.71.0",
     "formik": "^2.1.5",
     "lodash-es": "^4.17.15",
     "uuid": "^8.3.2",
diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/address/address-search.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/address/address-search.component.tsx
index d763dfd3d..8a04666a6 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/field/address/address-search.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/field/address/address-search.component.tsx
@@ -14,8 +14,11 @@ const AddressSearchComponent: React.FC<AddressSearchComponentProps> = ({ address
   const separator = ' > ';
   const searchBox = useRef(null);
   const wrapper = useRef(null);
-  const [searchString, setSearchString] = useState<string>('');
-  const { addresses, isLoading, error } = useAddressHierarchy(searchString, separator);
+
+  const [searchString, setSearchString] = useState('');
+
+  const { addresses } = useAddressHierarchy(searchString, separator);
+
   const addressOptions: Array<string> = useMemo(() => {
     const options: Set<string> = new Set();
     addresses.forEach((address) => {
diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/date-and-time-of-death/date-and-time-of-death.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/date-and-time-of-death/date-and-time-of-death.component.tsx
index 0a27740f4..95b04468c 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/field/date-and-time-of-death/date-and-time-of-death.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/field/date-and-time-of-death/date-and-time-of-death.component.tsx
@@ -35,7 +35,7 @@ function DeathDateField() {
         selectedDate ? dayjs(selectedDate).hour(0).minute(0).second(0).millisecond(0).toDate() : undefined,
       );
     },
-    [deathDate],
+    [setFieldValue],
   );
 
   return (
diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/dob/dob.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/dob/dob.component.tsx
index 6599103ec..efbaa6b9b 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/field/dob/dob.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/field/dob/dob.component.tsx
@@ -41,7 +41,7 @@ export const DobField: React.FC = () => {
       setFieldValue('monthsEstimated', '');
       setFieldTouched('birthdateEstimated', true, false);
     },
-    [setFieldValue],
+    [setFieldTouched, setFieldValue],
   );
 
   const onDateChange = useCallback(
diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/gender/gender-field.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/gender/gender-field.component.tsx
index 75fa4663a..b2964df44 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/field/gender/gender-field.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/field/gender/gender-field.component.tsx
@@ -30,8 +30,12 @@ export const GenderField: React.FC = () => {
     <div className={styles.halfWidthInDesktopView}>
       <h4 className={styles.productiveHeading02Light}>{t('sexFieldLabelText', 'Sex')}</h4>
       <div className={styles.sexField}>
-        <p className="cds--label">{t('genderLabelText', 'Sex')}</p>
-        <RadioButtonGroup name="gender" orientation="vertical" onChange={setGender} valueSelected={field.value}>
+        <RadioButtonGroup
+          name="gender"
+          legendText={t('genderLabelText', 'Sex')}
+          orientation="vertical"
+          onChange={setGender}
+          valueSelected={field.value}>
           {fieldConfigs.map((option) => (
             <RadioButton
               key={option.label ?? option.value}
diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/id/identifier-selection-overlay.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/id/identifier-selection-overlay.component.tsx
index b181c5114..96e1f5647 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/field/id/identifier-selection-overlay.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/field/id/identifier-selection-overlay.component.tsx
@@ -23,7 +23,7 @@ const PatientIdentifierOverlay: React.FC<PatientIdentifierOverlayProps> = ({ clo
   const { identifierTypes } = useContext(ResourcesContext);
   const { isOffline, values, initialFormValues } = useContext(PatientRegistrationContext);
   const [unsavedIdentifierTypes, setUnsavedIdentifierTypes] = useState<FormValues['identifiers']>(values.identifiers);
-  const [searchString, setSearchString] = useState<string>('');
+  const [searchString, setSearchString] = useState('');
   const { t } = useTranslation();
   const { defaultPatientIdentifierTypes } = useConfig();
   const defaultPatientIdentifierTypesMap = useMemo(() => {
@@ -107,11 +107,11 @@ const PatientIdentifierOverlay: React.FC<PatientIdentifierOverlayProps> = ({ clo
             />
             {patientIdentifier &&
               identifierType?.identifierSources?.length > 0 &&
-              /* 
+              /*
                 This check are for the cases when there's an initialValue identifier is assigned
                 to the patient
                 The corresponding flow is like:
-                1. If there's no change to the actual initial identifier, then the source remains null, 
+                1. If there's no change to the actual initial identifier, then the source remains null,
                 hence the list of the identifier sources shouldn't be displayed.
                 2. If user wants to edit the patient identifier's value, hence there will be an initialValue,
                 along with a source assigned to itself(only if the identifierType has sources, else there's nothing to worry about), which by
diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/name/name-field.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/name/name-field.component.tsx
index f2b4e2147..8de9fe809 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/field/name/name-field.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/field/name/name-field.component.tsx
@@ -3,9 +3,9 @@ import { useTranslation } from 'react-i18next';
 import { ContentSwitcher, Switch } from '@carbon/react';
 import { useField } from 'formik';
 import { ExtensionSlot, useConfig } from '@openmrs/esm-framework';
+import { type RegistrationConfig } from '../../../config-schema';
 import { Input } from '../../input/basic-input/input/input.component';
 import { PatientRegistrationContext } from '../../patient-registration-context';
-import { type RegistrationConfig } from '../../../config-schema';
 import styles from '../field.scss';
 
 export const unidentifiedPatientAttributeTypeUuid = '8b56eac7-5c76-4b9c-8c6f-1deab8d3fc47';
@@ -51,7 +51,7 @@ export const NameField = () => {
         setFieldTouched('photo', true, false);
       }
     },
-    [setCapturePhotoProps],
+    [setCapturePhotoProps, setFieldTouched],
   );
 
   const toggleNameKnown = (e) => {
diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/coded-person-attribute-field.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/coded-person-attribute-field.component.tsx
index e5b06a050..d72e935cd 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/coded-person-attribute-field.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/coded-person-attribute-field.component.tsx
@@ -3,10 +3,10 @@ import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 import { Field } from 'formik';
 import { Layer, Select, SelectItem } from '@carbon/react';
+import { reportError } from '@openmrs/esm-framework';
 import { type PersonAttributeTypeResponse } from '../../patient-registration.types';
 import { useConceptAnswers } from '../field.resource';
 import styles from './../field.scss';
-import { reportError } from '@openmrs/esm-framework';
 
 export interface CodedPersonAttributeFieldProps {
   id: string;
@@ -44,7 +44,7 @@ export function CodedPersonAttributeField({
       );
       setError(true);
     }
-  }, [answerConceptSetUuid, customConceptAnswers]);
+  }, [answerConceptSetUuid, customConceptAnswers, id, t]);
 
   useEffect(() => {
     if (!isLoadingConceptAnswers && !customConceptAnswers.length) {
@@ -72,7 +72,7 @@ export function CodedPersonAttributeField({
         setError(true);
       }
     }
-  }, [isLoadingConceptAnswers, conceptAnswers, customConceptAnswers]);
+  }, [isLoadingConceptAnswers, conceptAnswers, customConceptAnswers, t, id, answerConceptSetUuid]);
 
   const answers = useMemo(() => {
     if (customConceptAnswers.length) {
diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/coded-person-attribute-field.test.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/coded-person-attribute-field.test.tsx
index dda9aa8a0..fd6ec4526 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/coded-person-attribute-field.test.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/coded-person-attribute-field.test.tsx
@@ -4,19 +4,19 @@ import { render, screen } from '@testing-library/react';
 import { useConceptAnswers } from '../field.resource';
 import { CodedPersonAttributeField } from './coded-person-attribute-field.component';
 
-jest.mock('formik', () => ({
-  ...jest.requireActual('formik'),
-}));
-
-jest.mock('../field.resource');
-
 const mockUseConceptAnswers = jest.mocked(useConceptAnswers);
 
+jest.mock('../field.resource', () => ({
+  ...jest.requireActual('../field.resource'),
+  useConceptAnswers: jest.fn(),
+}));
+
 describe('CodedPersonAttributeField', () => {
   const conceptAnswers = [
     { uuid: '1', display: 'Option 1' },
     { uuid: '2', display: 'Option 2' },
   ];
+
   const personAttributeType = {
     format: 'org.openmrs.Concept',
     display: 'Referred by',
@@ -24,26 +24,35 @@ describe('CodedPersonAttributeField', () => {
     name: '',
     description: '',
   };
+
   const answerConceptSetUuid = '6682d17f-0777-45e4-a39b-93f77eb3531c';
+  let consoleSpy: jest.SpyInstance;
 
   beforeEach(() => {
     mockUseConceptAnswers.mockReturnValue({
       data: conceptAnswers,
       isLoading: false,
+      error: null,
     });
+
+    consoleSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
   });
 
-  it('shows error if there is no concept answer set provided', () => {
+  afterEach(() => {
+    consoleSpy.mockRestore();
+  });
+
+  it('renders an error if there is no concept answer set provided', () => {
     expect(() => {
       render(
         <Formik initialValues={{}} onSubmit={() => {}}>
           <Form>
             <CodedPersonAttributeField
-              id="attributeId"
-              personAttributeType={personAttributeType}
               answerConceptSetUuid={null}
-              label={personAttributeType.display}
               customConceptAnswers={[]}
+              id="attributeId"
+              label={personAttributeType.display}
+              personAttributeType={personAttributeType}
               required={false}
             />
           </Form>
@@ -52,11 +61,13 @@ describe('CodedPersonAttributeField', () => {
     }).toThrow(expect.stringMatching(/has been defined without an answer concept set UUID/i));
   });
 
-  it('shows error if the concept answer set does not have any concept answers', () => {
+  it('renders an error if the concept answer set does not have any concept answers', () => {
     mockUseConceptAnswers.mockReturnValue({
       data: [],
       isLoading: false,
+      error: null,
     });
+
     expect(() => {
       render(
         <Formik initialValues={{}} onSubmit={() => {}}>
diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/location-person-attribute-field.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/location-person-attribute-field.component.tsx
index ba1156a23..3fcf15b74 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/location-person-attribute-field.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/location-person-attribute-field.component.tsx
@@ -25,7 +25,7 @@ export function LocationPersonAttributeField({
   const { t } = useTranslation();
   const fieldName = `attributes.${personAttributeType.uuid}`;
   const [field, meta, { setValue }] = useField(`attributes.${personAttributeType.uuid}`);
-  const [searchQuery, setSearchQuery] = useState<string>('');
+  const [searchQuery, setSearchQuery] = useState('');
   const { locations, isLoading, loadingNewData } = useLocations(locationTag || null, searchQuery);
   const prevLocationOptions = useRef([]);
 
diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/person-attribute-field.test.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/person-attribute-field.test.tsx
index 115f94b36..371490026 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/person-attribute-field.test.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/field/person-attributes/person-attribute-field.test.tsx
@@ -1,13 +1,20 @@
 import React from 'react';
 import { Form, Formik } from 'formik';
 import { render, screen } from '@testing-library/react';
+import { type FieldDefinition } from '../../../config-schema';
 import { usePersonAttributeType } from './person-attributes.resource';
 import { useConceptAnswers } from '../field.resource';
-import { type FieldDefinition } from '../../../config-schema';
 import { PersonAttributeField } from './person-attribute-field.component';
 
-jest.mock('./person-attributes.resource');
-jest.mock('../field.resource');
+jest.mock('./person-attributes.resource', () => ({
+  ...jest.requireActual('./person-attributes.resource'),
+  usePersonAttributeType: jest.fn(),
+}));
+
+jest.mock('../field.resource', () => ({
+  ...jest.requireActual('../field.resource'),
+  useConceptAnswers: jest.fn(),
+}));
 
 const mockUsePersonAttributeType = jest.mocked(usePersonAttributeType);
 const mockUseConceptAnswers = jest.mocked(useConceptAnswers);
@@ -92,6 +99,7 @@ describe('PersonAttributeField', () => {
         { uuid: '1', display: 'Option 1' },
         { uuid: '2', display: 'Option 2' },
       ],
+      error: null,
       isLoading: false,
     });
 
@@ -180,6 +188,6 @@ describe('PersonAttributeField', () => {
     );
 
     await screen.findByRole('heading', { name: /attribute/i });
-    expect(screen.queryByLabelText(/Referred by/i)).not.toBeInTheDocument();
+    expect(screen.queryByLabelText(/referred by/i)).not.toBeInTheDocument();
   });
 });
diff --git a/packages/esm-patient-registration-app/src/patient-registration/form-manager.test.ts b/packages/esm-patient-registration-app/src/patient-registration/form-manager.test.ts
index b54a3ee48..16c9b2667 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/form-manager.test.ts
+++ b/packages/esm-patient-registration-app/src/patient-registration/form-manager.test.ts
@@ -2,7 +2,10 @@ import { FormManager } from './form-manager';
 import { type FormValues } from './patient-registration.types';
 import { generateIdentifier } from './patient-registration.resource';
 
-jest.mock('./patient-registration.resource');
+jest.mock('./patient-registration.resource', () => ({
+  ...jest.requireActual('./patient-registration.resource'),
+  generateIdentifier: jest.fn(),
+}));
 
 const mockGenerateIdentifier = generateIdentifier as jest.Mock;
 
diff --git a/packages/esm-patient-registration-app/src/patient-registration/form-manager.ts b/packages/esm-patient-registration-app/src/patient-registration/form-manager.ts
index 531e8dc44..26b6b9304 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/form-manager.ts
+++ b/packages/esm-patient-registration-app/src/patient-registration/form-manager.ts
@@ -35,7 +35,6 @@ import {
   updateRelationship,
 } from './patient-registration.resource';
 import { type RegistrationConfig } from '../config-schema';
-import dayjs from 'dayjs';
 
 export type SavePatientForm = (
   isNewPatient: boolean,
diff --git a/packages/esm-patient-registration-app/src/patient-registration/patient-registration-hooks.ts b/packages/esm-patient-registration-app/src/patient-registration/patient-registration-hooks.ts
index ff50d4b20..b89aed9c6 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/patient-registration-hooks.ts
+++ b/packages/esm-patient-registration-app/src/patient-registration/patient-registration-hooks.ts
@@ -1,14 +1,15 @@
+import { type Dispatch, useEffect, useMemo, useState } from 'react';
 import {
   type FetchResponse,
+  type OpenmrsResource,
   getSynchronizationItems,
   openmrsFetch,
-  type OpenmrsResource,
   restBaseUrl,
   useConfig,
   usePatient,
 } from '@openmrs/esm-framework';
 import camelCase from 'lodash-es/camelCase';
-import { type Dispatch, useEffect, useMemo, useState } from 'react';
+import dayjs from 'dayjs';
 import useSWR from 'swr';
 import { v4 } from 'uuid';
 import { type RegistrationConfig } from '../config-schema';
@@ -29,7 +30,15 @@ import {
   latestFirstEncounter,
 } from './patient-registration-utils';
 import { useInitialPatientRelationships } from './section/patient-relationships/relationships.resource';
-import dayjs from 'dayjs';
+
+interface DeathInfoResults {
+  uuid: string;
+  display: string;
+  causeOfDeath: OpenmrsResource | null;
+  dead: boolean;
+  deathDate: string;
+  causeOfDeathNonCoded: string | null;
+}
 
 export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch<FormValues>] {
   const { freeTextFieldConceptUuid } = useConfig<RegistrationConfig>();
@@ -99,7 +108,7 @@ export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch
         setInitialFormValues(registration._patientRegistrationData.formValues);
       }
     })();
-  }, [isLoadingPatientToEdit, patientToEdit, patientUuid]);
+  }, [initialFormValues, isLoadingPatientToEdit, patientToEdit, patientUuid]);
 
   // Set initial patient death info
   useEffect(() => {
@@ -118,7 +127,7 @@ export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch
         nonCodedCauseOfDeath: deathInfo.causeOfDeathNonCoded,
       }));
     }
-  }, [isLoadingDeathInfo, deathInfo, setInitialFormValues]);
+  }, [isLoadingDeathInfo, deathInfo, setInitialFormValues, freeTextFieldConceptUuid]);
 
   // Set initial patient relationships
   useEffect(() => {
@@ -187,7 +196,7 @@ export function useInitialAddressFieldValues(patientUuid: string, fallback = {})
         setInitialAddressFieldValues(registration?._patientRegistrationData.initialAddressFieldValues ?? fallback);
       }
     })();
-  }, [isLoading, patient, patientUuid]);
+  }, [fallback, initialAddressFieldValues, isLoading, patient, patientUuid]);
 
   return [initialAddressFieldValues, setInitialAddressFieldValues];
 }
@@ -208,7 +217,7 @@ export function usePatientUuidMap(
         setPatientUuidMap(registration?._patientRegistrationData.initialAddressFieldValues ?? fallback),
       );
     }
-  }, [isLoadingPatientToEdit, patientToEdit, patientUuid]);
+  }, [fallback, isLoadingPatientToEdit, patientToEdit, patientUuid, patientUuidMap]);
 
   useEffect(() => {
     if (attributes) {
@@ -263,7 +272,7 @@ export function useInitialPatientIdentifiers(patientUuid: string): {
       data: identifiers,
       isLoading,
     };
-  }, [data, error]);
+  }, [data?.data?.results, isLoading]);
 
   return result;
 }
@@ -299,19 +308,10 @@ function useInitialPersonAttributes(personUuid: string) {
       data: data?.data?.results,
       isLoading,
     };
-  }, [data, error]);
+  }, [data?.data?.results, isLoading]);
   return result;
 }
 
-interface DeathInfoResults {
-  uuid: string;
-  display: string;
-  causeOfDeath: OpenmrsResource | null;
-  dead: boolean;
-  deathDate: string;
-  causeOfDeathNonCoded: string | null;
-}
-
 function useInitialPersonDeathInfo(personUuid: string) {
   const { data, error, isLoading } = useSWR<FetchResponse<DeathInfoResults>, Error>(
     !!personUuid
@@ -325,7 +325,7 @@ function useInitialPersonDeathInfo(personUuid: string) {
       data: data?.data,
       isLoading,
     };
-  }, [data, error]);
+  }, [data?.data, isLoading]);
   return result;
 }
 
diff --git a/packages/esm-patient-registration-app/src/patient-registration/patient-registration-utils.test.ts b/packages/esm-patient-registration-app/src/patient-registration/patient-registration-utils.test.ts
new file mode 100644
index 000000000..f5b636b88
--- /dev/null
+++ b/packages/esm-patient-registration-app/src/patient-registration/patient-registration-utils.test.ts
@@ -0,0 +1,33 @@
+import { filterOutUndefinedPatientIdentifiers } from './patient-registration-utils';
+
+describe('filterOutUndefinedPatientIdentifiers', () => {
+  const getIdentifiers = (autoGeneration = true, manualEntryEnabled = false) => ({
+    OpenMRSId: {
+      autoGeneration: autoGeneration,
+      identifierName: 'OpenMRS ID',
+      identifierTypeUuid: '05a29f94-c0ed-11e2-94be-8c13b969e334',
+      identifierValue: undefined,
+      initialValue: '100GEJ',
+      preferred: true,
+      required: true,
+      selectedSource: {
+        uuid: '01af8526-cea4-4175-aa90-340acb411771',
+        name: 'Generator for OpenMRS ID',
+        autoGenerationOption: {
+          manualEntryEnabled: manualEntryEnabled,
+          automaticGenerationEnabled: autoGeneration,
+        },
+      },
+    },
+  });
+
+  it('should fitler out undefined identifiers', () => {
+    const filteredIdentifiers = filterOutUndefinedPatientIdentifiers(getIdentifiers());
+    expect(filteredIdentifiers.OpenMRSId).not.toBeDefined();
+  });
+
+  it('should retain auto-generated identifiers with manual entry', () => {
+    const filteredIdentifiers = filterOutUndefinedPatientIdentifiers(getIdentifiers(true, true));
+    expect(filteredIdentifiers.OpenMRSId).toBeDefined();
+  });
+});
diff --git a/packages/esm-patient-registration-app/src/patient-registration/patient-registration-utils.ts b/packages/esm-patient-registration-app/src/patient-registration/patient-registration-utils.ts
index 3aa777a2c..971543b95 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/patient-registration-utils.ts
+++ b/packages/esm-patient-registration-app/src/patient-registration/patient-registration-utils.ts
@@ -200,10 +200,13 @@ export function getPhonePersonAttributeValueFromFhirPatient(patient: fhir.Patien
   return result;
 }
 
-export const filterOutUndefinedPatientIdentifiers = (patientIdentifiers) =>
+type IdentifierMap = { [identifierFieldName: string]: PatientIdentifierValue };
+export const filterOutUndefinedPatientIdentifiers = (patientIdentifiers: IdentifierMap): IdentifierMap =>
   Object.fromEntries(
-    Object.entries<PatientIdentifierValue>(patientIdentifiers).filter(
-      ([key, value]) => value.identifierValue !== undefined,
+    Object.entries(patientIdentifiers).filter(
+      ([key, value]) =>
+        (value.autoGeneration && value.selectedSource.autoGenerationOption.manualEntryEnabled) ||
+        value.identifierValue !== undefined,
     ),
   );
 
diff --git a/packages/esm-patient-registration-app/src/patient-registration/patient-registration.test.tsx b/packages/esm-patient-registration-app/src/patient-registration/patient-registration.test.tsx
index f2c93fd80..caa603f0e 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/patient-registration.test.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/patient-registration.test.tsx
@@ -11,21 +11,24 @@ import {
   useConfig,
   usePatient,
 } from '@openmrs/esm-framework';
+import type { AddressTemplate, Encounter, FormValues } from './patient-registration.types';
 import { mockedAddressTemplate } from '__mocks__';
 import { mockPatient } from 'tools';
 import { saveEncounter, savePatient } from './patient-registration.resource';
 import { esmPatientRegistrationSchema, type RegistrationConfig } from '../config-schema';
-import type { AddressTemplate, Encounter } from './patient-registration.types';
 import { ResourcesContext } from '../offline.resources';
 import { FormManager } from './form-manager';
 import { PatientRegistration } from './patient-registration.component';
+import { useInitialFormValues } from './patient-registration-hooks';
 
+const mockOpenmrsDatePicker = jest.mocked(OpenmrsDatePicker);
 const mockSaveEncounter = jest.mocked(saveEncounter);
 const mockSavePatient = savePatient as jest.Mock;
 const mockShowSnackbar = jest.mocked(showSnackbar);
 const mockUseConfig = jest.mocked(useConfig<RegistrationConfig>);
 const mockUsePatient = jest.mocked(usePatient);
-const mockOpenmrsDatePicker = jest.mocked(OpenmrsDatePicker);
+const mockUseParams = useParams as jest.Mock;
+const mockUseInitialFormValues = jest.mocked(useInitialFormValues);
 
 jest.mock('./field/field.resource', () => ({
   useConcept: jest.fn().mockImplementation((uuid: string) => {
@@ -85,7 +88,7 @@ jest.mock('./field/field.resource', () => ({
 }));
 
 jest.mock('react-router-dom', () => ({
-  ...(jest.requireActual('react-router-dom') as any),
+  ...jest.requireActual('react-router-dom'),
   useLocation: () => ({
     pathname: 'openmrs/spa/patient-registration',
   }),
@@ -99,6 +102,13 @@ jest.mock('./patient-registration.resource', () => ({
   savePatient: jest.fn(),
 }));
 
+jest.mock('./patient-registration-hooks', () => ({
+  ...jest.requireActual('./patient-registration-hooks'),
+  useInitialFormValues: jest.fn().mockReturnValue([{}, jest.fn()]),
+  useInitialAddressFieldValues: jest.fn().mockReturnValue([{}, jest.fn()]),
+  usePatientUuidMap: jest.fn().mockReturnValue([{}, jest.fn()]),
+}));
+
 mockOpenmrsDatePicker.mockImplementation(({ id, labelText, value, onChange }) => {
   return (
     <>
@@ -126,7 +136,7 @@ const mockResourcesContextValue = {
   identifierTypes: [],
 };
 
-let mockOpenmrsConfig: RegistrationConfig = {
+const mockOpenmrsConfig: RegistrationConfig = {
   sections: ['demographics', 'contact'],
   sectionDefinitions: [
     { id: 'demographics', name: 'Demographics', fields: ['name', 'gender', 'dob'] },
@@ -159,6 +169,10 @@ let mockOpenmrsConfig: RegistrationConfig = {
         value: 'male',
         label: 'Male',
       },
+      {
+        value: 'female',
+        label: 'Female',
+      },
     ],
     address: {
       useAddressHierarchy: {
@@ -180,11 +194,10 @@ let mockOpenmrsConfig: RegistrationConfig = {
     encounterProviderRoleUuid: 'asdf',
     registrationFormUuid: null,
   },
+  freeTextFieldConceptUuid: '',
 };
-
-const path = `/patient/:patientUuid/edit`;
-
 const configWithObs = JSON.parse(JSON.stringify(mockOpenmrsConfig));
+
 configWithObs.fieldDefinitions = [
   {
     id: 'weight',
@@ -217,7 +230,6 @@ configWithObs.fieldDefinitions = [
     customConceptAnswers: [],
   },
 ];
-
 configWithObs.sectionDefinitions?.push({
   id: 'custom',
   name: 'Custom',
@@ -238,16 +250,14 @@ const fillRequiredFields = async () => {
   await user.type(familyNameInput, 'Gaihre');
   await user.clear(dateOfBirthInput);
   await user.type(dateOfBirthInput, '02/08/1993');
-  user.click(genderInput);
+  await user.click(genderInput);
 };
 
-function Wrapper({ children }) {
-  return (
-    <ResourcesContext.Provider value={mockResourcesContextValue}>
-      <Router>{children}</Router>
-    </ResourcesContext.Provider>
-  );
-}
+const Wrapper = ({ children }) => (
+  <ResourcesContext.Provider value={mockResourcesContextValue}>
+    <Router>{children}</Router>
+  </ResourcesContext.Provider>
+);
 
 describe('Registering a new patient', () => {
   beforeEach(() => {
@@ -258,15 +268,30 @@ describe('Registering a new patient', () => {
     mockSavePatient.mockReturnValue({ data: { uuid: 'new-pt-uuid' }, ok: true });
   });
 
-  it('renders without crashing', () => {
+  it('should render all the required fields and sections', async () => {
     render(<PatientRegistration isOffline={false} savePatientForm={jest.fn()} />, { wrapper: Wrapper });
-  });
 
-  it('has the expected sections', async () => {
-    render(<PatientRegistration isOffline={false} savePatientForm={jest.fn()} />, { wrapper: Wrapper });
+    await screen.findByRole('heading', { name: /create new patient/i });
+
+    const demographicSection = screen.getByRole('region', { name: /demographics section/i });
+    const contactSection = screen.getByRole('region', { name: /contact info section/i });
+
+    expect(demographicSection).toBeInTheDocument();
+    expect(contactSection).toBeInTheDocument();
+    expect(screen.getByText(/jump to/i)).toBeInTheDocument();
+    expect(within(demographicSection).getByLabelText(/first name/i)).toBeInTheDocument();
+    expect(within(demographicSection).getByLabelText(/middle name \(optional\)/i)).toBeInTheDocument();
+    expect(within(demographicSection).getByLabelText(/family name/i)).toBeInTheDocument();
+    expect(within(demographicSection).getByLabelText(/date of birth/i)).toBeInTheDocument();
+    expect(within(demographicSection).getByRole('radio', { name: /^male$/i })).toBeInTheDocument();
+    expect(within(demographicSection).getByRole('radio', { name: /^female$/i })).toBeInTheDocument();
+    expect(within(demographicSection).getByText(/date of birth known\?/i)).toBeInTheDocument();
+    expect(within(demographicSection).getByLabelText(/date of birth/i)).toBeInTheDocument();
 
-    expect(screen.getByRole('region', { name: /demographics section/i })).toBeInTheDocument();
-    expect(screen.getByRole('region', { name: /contact info section/i })).toBeInTheDocument();
+    expect(within(contactSection).getByRole('heading', { name: /address/i })).toBeInTheDocument();
+
+    expect(screen.getByRole('button', { name: /register patient/i })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /cancel/i })).toBeInTheDocument();
   });
 
   // TODO O3-3482: Fix this test case when OpenmrsDatePicker gets fixed on core
@@ -300,14 +325,12 @@ describe('Registering a new patient', () => {
 
   it('should not save the patient if validation fails', async () => {
     const user = userEvent.setup();
-
     const mockSavePatientForm = jest.fn();
-    render(<PatientRegistration isOffline={false} savePatientForm={mockSavePatientForm} />, { wrapper: Wrapper });
 
-    const givenNameInput = (await screen.findByLabelText('First Name')) as HTMLInputElement;
+    render(<PatientRegistration isOffline={false} savePatientForm={mockSavePatientForm} />, { wrapper: Wrapper });
 
-    await user.type(givenNameInput, '5');
-    await user.click(screen.getByText(/Register Patient/i));
+    await screen.findByRole('heading', { name: /create new patient/i });
+    await user.click(screen.getByRole('button', { name: /register patient/i }));
 
     expect(mockSavePatientForm).not.toHaveBeenCalled();
   });
@@ -386,76 +409,149 @@ describe('Registering a new patient', () => {
 
 describe('Updating an existing patient record', () => {
   beforeEach(() => {
-    mockUseConfig.mockReturnValue(mockOpenmrsConfig);
+    mockUseConfig.mockReturnValue({
+      ...getDefaultsFromConfigSchema(esmPatientRegistrationSchema),
+      ...mockOpenmrsConfig,
+    });
+    mockUsePatient.mockImplementation(() => {
+      return {
+        error: null,
+        isLoading: false,
+        patient: mockPatient,
+        patientUuid: mockPatient.id,
+      };
+    });
     mockSavePatient.mockReturnValue({ data: { uuid: 'new-pt-uuid' }, ok: true });
+    mockUseParams.mockReturnValue({ patientUuid: mockPatient.id });
   });
 
   it('edits patient demographics', async () => {
     const user = userEvent.setup();
-    mockSavePatient.mockResolvedValue({} as FetchResponse);
+    const mockSavePatientForm = jest.fn();
 
-    const mockUseParams = useParams as jest.Mock;
+    mockUseInitialFormValues.mockReturnValue([
+      {
+        additionalFamilyName: '',
+        additionalGivenName: '',
+        additionalMiddleName: '',
+        addNameInLocalLanguage: false,
+        address: {},
+        birthdate: mockPatient.birthDate,
+        birthdateEstimated: false,
+        deathCause: '',
+        deathDate: undefined,
+        deathTime: undefined,
+        deathTimeFormat: 'AM',
+        familyName: mockPatient.name[0].family,
+        gender: mockPatient.gender,
+        givenName: mockPatient.name[0].given[0],
+        identifiers: {
+          openMrsId: {
+            autoGeneration: false,
+            identifierName: 'OpenMRS ID',
+            identifierTypeUuid: '05a29f94-c0ed-11e2-94be-8c13b969e334',
+            identifierUuid: '1f0ad7a1-430f-4397-b571-59ea654a52db',
+            identifierValue: '100GEJ',
+            initialValue: '100GEJ',
+            preferred: true,
+            required: true,
+            selectedSource: null,
+          },
+          idCard: {
+            autoGeneration: false,
+            identifierName: 'ID Card',
+            identifierTypeUuid: 'b4143563-16cd-4439-b288-f83d61670fc8',
+            identifierUuid: '346d09b1-8509-43c6-9697-3b4d1ce06ad6',
+            identifierValue: '1234567890',
+            initialValue: '1234567890',
+            preferred: false,
+            required: false,
+            selectedSource: null,
+          },
+        },
+        isDead: false,
+        middleName: '',
+        monthsEstimated: 0,
+        nonCodedCauseOfDeath: '',
+        patientUuid: mockPatient.id,
+        relationships: [],
+        telephoneNumber: '',
+        yearsEstimated: 0,
+      } as FormValues,
+      jest.fn(),
+    ]);
 
-    mockUseParams.mockReturnValue({ patientUuid: mockPatient.id });
+    render(<PatientRegistration isOffline={false} savePatientForm={mockSavePatientForm} />, { wrapper: Wrapper });
 
-    mockUsePatient.mockReturnValue({
-      isLoading: false,
-      patient: mockPatient,
-      patientUuid: mockPatient.id,
-      error: null,
-    });
+    await screen.findByRole('heading', { name: /edit patient details/i });
 
-    render(<PatientRegistration isOffline={false} savePatientForm={mockSavePatient} />, { wrapper: Wrapper });
-
-    const givenNameInput: HTMLInputElement = screen.getByLabelText(/First Name/);
-    const familyNameInput: HTMLInputElement = screen.getByLabelText(/Family Name/);
-    const middleNameInput: HTMLInputElement = screen.getByLabelText(/Middle Name/);
-    const dateOfBirthInput: HTMLInputElement = screen.getByLabelText(/Date of Birth/i);
-    const genderInput: HTMLInputElement = screen.getByLabelText(/Male/);
-
-    // assert initial values
-    expect(givenNameInput.value).toBe('John');
-    expect(familyNameInput.value).toBe('Wilson');
-    expect(middleNameInput.value).toBeFalsy();
-    expect(dateOfBirthInput.value).toBe('04/04/1972');
-    expect(genderInput.value).toBe('male');
-
-    // do some edits
-    await user.clear(givenNameInput);
-    await user.clear(middleNameInput);
-    await user.clear(familyNameInput);
-    await user.type(givenNameInput, 'Eric');
-    await user.type(middleNameInput, 'Johnson');
-    await user.type(familyNameInput, 'Smith');
-    await user.click(screen.getByText(/Update patient/i));
+    expect(screen.queryByRole('button', { name: /register patient/i })).not.toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /update patient/i })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /cancel/i })).toBeInTheDocument();
 
-    expect(mockSavePatient).toHaveBeenCalledWith(
+    expect(screen.getByLabelText(/first name/i)).toHaveValue(mockPatient.name[0].given[0]);
+    expect(screen.getByLabelText(/family name/i)).toHaveValue(mockPatient.name[0].family);
+    expect(screen.getByLabelText(/date of birth/i)).toHaveValue('04/04/1972');
+    expect(
+      screen.getByRole('radio', {
+        name: /^male$/i,
+      }),
+    ).toBeChecked();
+    expect(
+      screen.getByRole('radio', {
+        name: /^female$/i,
+      }),
+    ).not.toBeChecked();
+    expect(screen.getAllByRole('tab', { name: /yes/i })).toHaveLength(2);
+
+    await user.click(screen.getByRole('button', { name: /update patient/i }));
+
+    expect(mockSavePatientForm).toHaveBeenCalledWith(
       false,
       {
-        '0': {
-          oldIdentificationNumber: '100732HE',
-        },
-        '1': {
-          openMrsId: '100GEJ',
-        },
-        addNameInLocalLanguage: undefined,
+        addNameInLocalLanguage: false,
         additionalFamilyName: '',
         additionalGivenName: '',
         additionalMiddleName: '',
-        address: {},
-        birthdate: new Date('1972-04-04T00:00:00.000Z'),
+        address: {
+          country: 'កម្ពុជា (Cambodia)',
+        },
+        birthdate: '1972-04-04',
         birthdateEstimated: false,
         deathCause: '',
         nonCodedCauseOfDeath: '',
         deathDate: undefined,
         deathTime: undefined,
         deathTimeFormat: 'AM',
-        familyName: 'Smith',
-        gender: expect.stringMatching(/male/i),
-        givenName: 'Eric',
-        identifiers: {},
+        familyName: 'Wilson',
+        gender: 'male',
+        givenName: 'John',
+        identifiers: {
+          idCard: {
+            autoGeneration: false,
+            identifierName: 'ID Card',
+            identifierTypeUuid: 'b4143563-16cd-4439-b288-f83d61670fc8',
+            identifierUuid: '346d09b1-8509-43c6-9697-3b4d1ce06ad6',
+            identifierValue: '1234567890',
+            initialValue: '1234567890',
+            preferred: false,
+            required: false,
+            selectedSource: null,
+          },
+          openMrsId: {
+            autoGeneration: false,
+            identifierName: 'OpenMRS ID',
+            identifierTypeUuid: '05a29f94-c0ed-11e2-94be-8c13b969e334',
+            identifierUuid: '1f0ad7a1-430f-4397-b571-59ea654a52db',
+            identifierValue: '100GEJ',
+            initialValue: '100GEJ',
+            preferred: true,
+            required: true,
+            selectedSource: null,
+          },
+        },
         isDead: false,
-        middleName: 'Johnson',
+        middleName: '',
         monthsEstimated: 0,
         patientUuid: '8673ee4f-e2ab-4077-ba55-4980f408773e',
         relationships: [],
diff --git a/packages/esm-patient-registration-app/src/patient-registration/section/demographics/demographics-section.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/section/demographics/demographics-section.component.tsx
index 3ab1adb22..cf2e9074e 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/section/demographics/demographics-section.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/section/demographics/demographics-section.component.tsx
@@ -1,8 +1,8 @@
 import React, { useContext, useEffect } from 'react';
-import styles from './../section.scss';
 import { useField } from 'formik';
-import { PatientRegistrationContext } from '../../patient-registration-context';
 import { Field } from '../../field/field.component';
+import { PatientRegistrationContext } from '../../patient-registration-context';
+import styles from './../section.scss';
 
 export interface DemographicsSectionProps {
   fields: Array<string>;
@@ -18,7 +18,7 @@ export const DemographicsSection: React.FC<DemographicsSectionProps> = ({ fields
       setFieldValue('additionalMiddleName', '');
       setFieldValue('additionalFamilyName', '');
     }
-  }, [field.value, meta.touched]);
+  }, [field.value, meta.touched, setFieldValue]);
 
   return (
     <section className={styles.formSection} aria-label="Demographics Section">
diff --git a/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships-section.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships-section.component.tsx
index 5076a31e6..9162f1f58 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships-section.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships-section.component.tsx
@@ -40,7 +40,7 @@ const RelationshipView: React.FC<RelationshipViewProps> = ({
 }) => {
   const { t } = useTranslation();
   const { setFieldValue } = React.useContext(PatientRegistrationContext);
-  const [isInvalid, setIsInvalid] = useState<boolean>(false);
+  const [isInvalid, setIsInvalid] = useState(false);
   const newRelationship = !relationship.uuid;
 
   const handleRelationshipTypeChange = useCallback(
diff --git a/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships.resource.tsx b/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships.resource.tsx
index 643639167..810f374ac 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships.resource.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/section/patient-relationships/relationships.resource.tsx
@@ -4,6 +4,33 @@ import { type FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-fram
 import { type RelationshipValue } from '../../patient-registration.types';
 import { personRelationshipRepresentation } from '../../../constants';
 
+export interface Relationship {
+  display: string;
+  uuid: string;
+  personA: {
+    age: number;
+    display: string;
+    birthdate: string;
+    uuid: string;
+  };
+  personB: {
+    age: number;
+    display: string;
+    birthdate: string;
+    uuid: string;
+  };
+  relationshipType: {
+    uuid: string;
+    display: string;
+    aIsToB: string;
+    bIsToA: string;
+  };
+}
+
+interface RelationshipsResponse {
+  results: Array<Relationship>;
+}
+
 export function useInitialPatientRelationships(patientUuid: string): {
   data: Array<RelationshipValue>;
   isLoading: boolean;
@@ -45,34 +72,7 @@ export function useInitialPatientRelationships(patientUuid: string): {
       error,
       isLoading,
     };
-  }, [patientUuid, data, error]);
+  }, [data?.data?.results, error, isLoading, patientUuid]);
 
   return result;
 }
-
-export interface Relationship {
-  display: string;
-  uuid: string;
-  personA: {
-    age: number;
-    display: string;
-    birthdate: string;
-    uuid: string;
-  };
-  personB: {
-    age: number;
-    display: string;
-    birthdate: string;
-    uuid: string;
-  };
-  relationshipType: {
-    uuid: string;
-    display: string;
-    aIsToB: string;
-    bIsToA: string;
-  };
-}
-
-interface RelationshipsResponse {
-  results: Array<Relationship>;
-}
diff --git a/packages/esm-patient-registration-app/translations/ar.json b/packages/esm-patient-registration-app/translations/ar.json
index 845f8d14f..f4f8cc29c 100644
--- a/packages/esm-patient-registration-app/translations/ar.json
+++ b/packages/esm-patient-registration-app/translations/ar.json
@@ -20,12 +20,12 @@
   "confirmIdentifierDeletionText": "Are you sure you want to remove this identifier?",
   "contactSection": "تفاصيل الاتصال",
   "createNewPatient": "Create new patient",
-  "dateOfBirthLabelText": "Date of birth",
+  "dateOfBirthLabelText": "تاريخ الميلاد",
   "deathCauseRequired": "Cause of death is required",
   "deathDateInFuture": "Death date cannot be in future",
-  "deathDateInputLabel": "Date of death",
+  "deathDateInputLabel": "تاريخ الوفاة",
   "deathDateRequired": "Death date is required",
-  "deathdayInvalidDate": "Death date and time cannot be before the birthday",
+  "deathdayInvalidDate": "لا يمكن أن يكون تاريخ ووقت الوفاة قبل عيد الميلاد",
   "deathdayIsRequired": "Death date is required when the patient is marked as deceased.",
   "deathdayNotInTheFuture": "",
   "deathSection": "معلومات الوفاة",
@@ -82,7 +82,7 @@
   "patientNameKnown": "هل اسم المريض معروف؟",
   "patientRegistrationBreadcrumb": "Patient Registration",
   "refreshOrContactAdmin": "Try refreshing the page or contact your system administrator",
-  "registerPatient": "Register patient",
+  "registerPatient": "تسجيل المريض",
   "registerPatientSuccessSnackbarSubtitle": "The patient can now be found by searching for them using their name or ID number",
   "registerPatientSuccessSnackbarTitle": "New Patient Created",
   "registrationErrorSnackbarTitle": "Patient Registration Failed",
@@ -99,7 +99,7 @@
   "restoreRelationshipActionButton": "تراجع",
   "searchAddress": "ابحث عن العنوان",
   "searchIdentifierPlaceholder": "Search identifier",
-  "searchLocationPersonAttribute": "Search location",
+  "searchLocationPersonAttribute": "موقع البحث",
   "selectAnOption": "اختر خيارًا",
   "sexFieldLabelText": "الجنس",
   "source": "Source",
diff --git a/packages/esm-patient-registration-app/translations/es.json b/packages/esm-patient-registration-app/translations/es.json
index dda9f8b6a..7360c4b59 100644
--- a/packages/esm-patient-registration-app/translations/es.json
+++ b/packages/esm-patient-registration-app/translations/es.json
@@ -77,7 +77,7 @@
   "numberInNameDubious": "Número en nombre es dudoso",
   "obsFieldUnknownDatatype": "El concepto para el campo de observación '{{fieldDefinitionId}}' tiene un tipo de datos desconocido '{{datatypeName}}'",
   "optional": "Opcional",
-  "optionalIdentifierLabel": "{{identifierName}} (optional)",
+  "optionalIdentifierLabel": "{{identifierName}} (opcional)",
   "other": "Otro",
   "patientNameKnown": "¿Se sabe el nombre del paciente?",
   "patientRegistrationBreadcrumb": "Registro de Pacientes",
@@ -99,7 +99,7 @@
   "restoreRelationshipActionButton": "Deshacer",
   "searchAddress": "Buscar dirección",
   "searchIdentifierPlaceholder": "Buscar identificador",
-  "searchLocationPersonAttribute": "Search location",
+  "searchLocationPersonAttribute": "Ubicación de búsqueda",
   "selectAnOption": "Seleccionar una opción",
   "sexFieldLabelText": "Sexo",
   "source": "Fuente",
diff --git a/packages/esm-patient-registration-app/translations/he.json b/packages/esm-patient-registration-app/translations/he.json
index 33073dbb0..b80fc5cbf 100644
--- a/packages/esm-patient-registration-app/translations/he.json
+++ b/packages/esm-patient-registration-app/translations/he.json
@@ -77,7 +77,7 @@
   "numberInNameDubious": "מספר בשם חשוד",
   "obsFieldUnknownDatatype": "Concept for obs field '{{fieldDefinitionId}}' has unknown datatype '{{datatypeName}}'",
   "optional": "אופציונלי",
-  "optionalIdentifierLabel": "{{identifierName}} (optional)",
+  "optionalIdentifierLabel": "{{identifierName}} (רשות)",
   "other": "אחר",
   "patientNameKnown": "שם המטופל ידוע?",
   "patientRegistrationBreadcrumb": "רישום מטופל",
@@ -99,7 +99,7 @@
   "restoreRelationshipActionButton": "ביטול",
   "searchAddress": "חיפוש כתובת",
   "searchIdentifierPlaceholder": "חיפוש זיהוי",
-  "searchLocationPersonAttribute": "Search location",
+  "searchLocationPersonAttribute": "מקום חיפוש",
   "selectAnOption": "בחר אפשרות",
   "sexFieldLabelText": "מין",
   "source": "מקור",
diff --git a/packages/esm-patient-registration-app/translations/ne.json b/packages/esm-patient-registration-app/translations/ne.json
new file mode 100644
index 000000000..5c21d45fc
--- /dev/null
+++ b/packages/esm-patient-registration-app/translations/ne.json
@@ -0,0 +1,118 @@
+{
+  "addRelationshipButtonText": "Add Relationship",
+  "addressHeader": "Address",
+  "allFieldsRequiredText": "All fields are required unless marked optional",
+  "autoGeneratedPlaceholderText": "Auto-generated",
+  "birthdayNotInTheFuture": "Birthday cannot be in future",
+  "birthdayNotOver140YearsAgo": "Birthday cannot be more than 140 years ago",
+  "birthdayRequired": "Birthday is required",
+  "birthFieldLabelText": "Birth",
+  "cancel": "Cancel",
+  "causeOfDeathInputLabel": "Cause of death",
+  "closeOverlay": "Close overlay",
+  "codedPersonAttributeAnswerSetEmpty": "The coded person attribute field '{{codedPersonAttributeFieldId}}' has been defined with an answer concept set UUID '{{answerConceptSetUuid}}' that does not have any concept answers.",
+  "codedPersonAttributeAnswerSetInvalid": "The coded person attribute field '{{codedPersonAttributeFieldId}}' has been defined with an invalid answer concept set UUID '{{answerConceptSetUuid}}'.",
+  "codedPersonAttributeNoAnswerSet": "The person attribute field '{{codedPersonAttributeFieldId}}' is of type 'coded' but has been defined without an answer concept set UUID. The 'answerConceptSetUuid' key is required.",
+  "configure": "Configure",
+  "configureIdentifiers": "Configure identifiers",
+  "confirmDiscardChangesBody": "Your unsaved changes will be lost if you proceed to discard the form",
+  "confirmDiscardChangesTitle": "Are you sure you want to discard these changes?",
+  "confirmIdentifierDeletionText": "Are you sure you want to remove this identifier?",
+  "contactSection": "Contact Details",
+  "createNewPatient": "Create new patient",
+  "dateOfBirthLabelText": "Date of birth",
+  "deathCauseRequired": "Cause of death is required",
+  "deathDateInFuture": "Death date cannot be in future",
+  "deathDateInputLabel": "Date of death",
+  "deathDateRequired": "Death date is required",
+  "deathdayInvalidDate": "Death date and time cannot be before the birthday",
+  "deathdayIsRequired": "Death date is required when the patient is marked as deceased.",
+  "deathdayNotInTheFuture": "",
+  "deathSection": "Death Info",
+  "deathTimeFormatInvalid": "Time format is invalid",
+  "deathTimeFormatRequired": "Time format is required",
+  "deathTimeInvalid": "Time doesn't match the format 'hh:mm'",
+  "deathTimeRequired": "Death time is required",
+  "deleteIdentifierModalHeading": "Remove identifier?",
+  "deleteIdentifierModalText": " has a value of ",
+  "deleteIdentifierTooltip": "Delete",
+  "deleteRelationshipTooltipText": "Delete",
+  "demographicsSection": "Basic Info",
+  "discard": "Discard",
+  "dobToggleLabelText": "Date of Birth Known?",
+  "editIdentifierTooltip": "Edit",
+  "editPatientDetails": "Edit patient details",
+  "editPatientDetailsBreadcrumb": "Edit patient details",
+  "enterNonCodedCauseOfDeath": "Enter non-coded cause of death",
+  "error": "Error",
+  "errorFetchingCodedCausesOfDeath": "Error fetching coded causes of death",
+  "errorFetchingOrderedFields": "Error occured fetching ordered fields for address hierarchy",
+  "estimatedAgeInMonthsLabelText": "Estimated age in months",
+  "estimatedAgeInYearsLabelText": "Estimated age in years",
+  "familyNameLabelText": "Family Name",
+  "familyNameRequired": "Family name is required",
+  "female": "Female",
+  "fieldsWithErrors": "The following fields have errors: ",
+  "fullNameLabelText": "Full Name",
+  "genderLabelText": "Sex",
+  "genderRequired": "Gender is required",
+  "genderUnspecified": "Gender unspecified",
+  "givenNameLabelText": "First Name",
+  "givenNameRequired": "Given name is required",
+  "identifierValueRequired": "Identifier value is required",
+  "idFieldLabelText": "Identifiers",
+  "IDInstructions": "Select the identifiers you'd like to add for this patient:",
+  "invalidEmail": "Invalid email",
+  "invalidInput": "Invalid Input",
+  "isDeadInputLabel": "Is dead",
+  "jumpTo": "Jump to",
+  "male": "Male",
+  "middleNameLabelText": "Middle Name",
+  "negativeMonths": "Estimated months cannot be negative",
+  "negativeYears": "Estimated years cannot be negative",
+  "no": "No",
+  "nonCodedCauseOfDeath": "Non-coded cause of death",
+  "nonCodedCauseOfDeathRequired": "Cause of death is required",
+  "nonsensicalYears": "Estimated years cannot be more than 140",
+  "numberInNameDubious": "Number in name is dubious",
+  "obsFieldUnknownDatatype": "Concept for obs field '{{fieldDefinitionId}}' has unknown datatype '{{datatypeName}}'",
+  "optional": "optional",
+  "optionalIdentifierLabel": "{{identifierName}} (optional)",
+  "other": "Other",
+  "patientNameKnown": "Patient's Name is Known?",
+  "patientRegistrationBreadcrumb": "Patient Registration",
+  "refreshOrContactAdmin": "Try refreshing the page or contact your system administrator",
+  "registerPatient": "Register patient",
+  "registerPatientSuccessSnackbarSubtitle": "The patient can now be found by searching for them using their name or ID number",
+  "registerPatientSuccessSnackbarTitle": "New Patient Created",
+  "registrationErrorSnackbarTitle": "Patient Registration Failed",
+  "relationship": "Relationship",
+  "relationshipPersonMustExist": "Related person must be an existing person",
+  "relationshipPlaceholder": "Relationship",
+  "relationshipRemovedText": "Relationship removed",
+  "relationshipsSection": "Relationships",
+  "relationshipToPatient": "Relationship to patient",
+  "relativeFullNameLabelText": "Full name",
+  "relativeNamePlaceholder": "Firstname Familyname",
+  "removeIdentifierButton": "Remove identifier",
+  "resetIdentifierTooltip": "Reset",
+  "restoreRelationshipActionButton": "Undo",
+  "searchAddress": "Search address",
+  "searchIdentifierPlaceholder": "Search identifier",
+  "searchLocationPersonAttribute": "Search location",
+  "selectAnOption": "Select an option",
+  "sexFieldLabelText": "Sex",
+  "source": "Source",
+  "submitting": "Submitting",
+  "timeFormat": "Time Format",
+  "timeOfDeathInputLabel": "Time of death (hh:mm)",
+  "unableToFetch": "Unable to fetch person attribute type - {{personattributetype}}",
+  "unknown": "Unknown",
+  "unknownPatientAttributeType": "Patient attribute type has unknown format {{personAttributeTypeFormat}}",
+  "updatePatient": "Update patient",
+  "updatePatientErrorSnackbarTitle": "Patient Details Update Failed",
+  "updatePatientSuccessSnackbarSubtitle": "The patient's information has been successfully updated",
+  "updatePatientSuccessSnackbarTitle": "Patient Details Updated",
+  "yearsEstimateRequired": "Estimated years required",
+  "yes": "Yes"
+}
diff --git a/packages/esm-patient-registration-app/translations/pt.json b/packages/esm-patient-registration-app/translations/pt.json
index 80afecc6c..4516cb9c4 100644
--- a/packages/esm-patient-registration-app/translations/pt.json
+++ b/packages/esm-patient-registration-app/translations/pt.json
@@ -45,7 +45,7 @@
   "editPatientDetailsBreadcrumb": "Alterar detalhes do utente",
   "enterNonCodedCauseOfDeath": "Insira a causa de óbito não codificada",
   "error": "Erro",
-  "errorFetchingCodedCausesOfDeath": "Erro ao buscar causas de óbito",
+  "errorFetchingCodedCausesOfDeath": "Erro ao buscar causas de óbito codificadas.",
   "errorFetchingOrderedFields": "Ocorreu um erro ao buscar campos solicitados para hierarquia de endereços",
   "estimatedAgeInMonthsLabelText": "Idade estimada em meses",
   "estimatedAgeInYearsLabelText": "Idade estimada em anos",
diff --git a/packages/esm-patient-registration-app/translations/vi.json b/packages/esm-patient-registration-app/translations/vi.json
index 29113ebbb..c39daf1b7 100644
--- a/packages/esm-patient-registration-app/translations/vi.json
+++ b/packages/esm-patient-registration-app/translations/vi.json
@@ -14,35 +14,35 @@
   "codedPersonAttributeAnswerSetInvalid": "Trường thuộc tính người được mã hóa '{{codedPersonAttributeFieldId}}' đã được định nghĩa với tập khái niệm câu trả lời không hợp lệ UUID '{{answerConceptSetUuid}}'.",
   "codedPersonAttributeNoAnswerSet": "Trường thuộc tính người '{{codedPersonAttributeFieldId}}' thuộc loại 'coded' nhưng đã được định nghĩa mà không có UUID tập hợp khái niệm câu trả lời. Khóa 'answerConceptSetUuid' là bắt buộc.",
   "configure": "Cấu hình",
-  "configureIdentifiers": "Configure identifiers",
-  "confirmDiscardChangesBody": "Your unsaved changes will be lost if you proceed to discard the form",
-  "confirmDiscardChangesTitle": "Are you sure you want to discard these changes?",
-  "confirmIdentifierDeletionText": "Are you sure you want to remove this identifier?",
-  "contactSection": "Contact Details",
-  "createNewPatient": "Create new patient",
-  "dateOfBirthLabelText": "Date of birth",
+  "configureIdentifiers": "Cấu hình định danh",
+  "confirmDiscardChangesBody": "Những thay đổi chưa lưu của bạn sẽ bị mất nếu bạn tiếp tục hủy biểu mẫu",
+  "confirmDiscardChangesTitle": "Bạn có chắc chắn muốn hủy bỏ thay đổi này?",
+  "confirmIdentifierDeletionText": "Bạn có chắc chắn muốn xóa bỏ id này?",
+  "contactSection": "Chi tiết liên hệ",
+  "createNewPatient": "Thêm mới bệnh nhân",
+  "dateOfBirthLabelText": "Ngày sinh",
   "deathCauseRequired": "Cause of death is required",
   "deathDateInFuture": "Death date cannot be in future",
-  "deathDateInputLabel": "Date of death",
-  "deathDateRequired": "Death date is required",
+  "deathDateInputLabel": "Ngày tử vong",
+  "deathDateRequired": "Ngày tử vong là bắt buộc",
   "deathdayInvalidDate": "Death date and time cannot be before the birthday",
   "deathdayIsRequired": "Death date is required when the patient is marked as deceased.",
   "deathdayNotInTheFuture": "",
-  "deathSection": "Death Info",
+  "deathSection": "Thông tin tử vong",
   "deathTimeFormatInvalid": "Time format is invalid",
   "deathTimeFormatRequired": "Time format is required",
   "deathTimeInvalid": "Time doesn't match the format 'hh:mm'",
   "deathTimeRequired": "Death time is required",
   "deleteIdentifierModalHeading": "Remove identifier?",
-  "deleteIdentifierModalText": " has a value of ",
+  "deleteIdentifierModalText": "có một giá trị của",
   "deleteIdentifierTooltip": "Xóa",
   "deleteRelationshipTooltipText": "Xóa",
-  "demographicsSection": "Basic Info",
+  "demographicsSection": "Thông tin cơ bản",
   "discard": "Hủy bỏ",
   "dobToggleLabelText": "Date of Birth Known?",
   "editIdentifierTooltip": "Chỉnh sửa",
-  "editPatientDetails": "Edit patient details",
-  "editPatientDetailsBreadcrumb": "Edit patient details",
+  "editPatientDetails": "Chỉnh sửa thông tin bệnh nhân",
+  "editPatientDetailsBreadcrumb": "Chỉnh sửa thông tin bệnh nhân",
   "enterNonCodedCauseOfDeath": "Enter non-coded cause of death",
   "error": "Lỗi",
   "errorFetchingCodedCausesOfDeath": "Error fetching coded causes of death",
@@ -53,26 +53,26 @@
   "familyNameRequired": "Family name is required",
   "female": "Nữ giới",
   "fieldsWithErrors": "The following fields have errors: ",
-  "fullNameLabelText": "Full Name",
+  "fullNameLabelText": "Tên đầy đủ",
   "genderLabelText": "Giới tính",
-  "genderRequired": "Gender is required",
+  "genderRequired": "Giới tính là bắt buộc",
   "genderUnspecified": "Gender unspecified",
   "givenNameLabelText": "First Name",
   "givenNameRequired": "Given name is required",
   "identifierValueRequired": "Identifier value is required",
   "idFieldLabelText": "Identifiers",
   "IDInstructions": "Select the identifiers you'd like to add for this patient:",
-  "invalidEmail": "Invalid email",
+  "invalidEmail": "Email không hợp lệ",
   "invalidInput": "Invalid Input",
   "isDeadInputLabel": "Is dead",
   "jumpTo": "Jump to",
   "male": "Nam giới",
-  "middleNameLabelText": "Middle Name",
+  "middleNameLabelText": "Tên Đệm",
   "negativeMonths": "Estimated months cannot be negative",
   "negativeYears": "Estimated years cannot be negative",
   "no": "Không",
   "nonCodedCauseOfDeath": "Non-coded cause of death",
-  "nonCodedCauseOfDeathRequired": "Cause of death is required",
+  "nonCodedCauseOfDeathRequired": "Lý do tử vong là bắt buộc",
   "nonsensicalYears": "Estimated years cannot be more than 140",
   "numberInNameDubious": "Number in name is dubious",
   "obsFieldUnknownDatatype": "Concept for obs field '{{fieldDefinitionId}}' has unknown datatype '{{datatypeName}}'",
@@ -82,9 +82,9 @@
   "patientNameKnown": "Patient's Name is Known?",
   "patientRegistrationBreadcrumb": "Patient Registration",
   "refreshOrContactAdmin": "Try refreshing the page or contact your system administrator",
-  "registerPatient": "Register patient",
+  "registerPatient": "Đăng ký bệnh nhân",
   "registerPatientSuccessSnackbarSubtitle": "The patient can now be found by searching for them using their name or ID number",
-  "registerPatientSuccessSnackbarTitle": "New Patient Created",
+  "registerPatientSuccessSnackbarTitle": "Bệnh nhân mới đã được tạo",
   "registrationErrorSnackbarTitle": "Patient Registration Failed",
   "relationship": "Mối quan hệ",
   "relationshipPersonMustExist": "Related person must be an existing person",
@@ -92,19 +92,19 @@
   "relationshipRemovedText": "Relationship removed",
   "relationshipsSection": "Mối quan hệ",
   "relationshipToPatient": "Relationship to patient",
-  "relativeFullNameLabelText": "Full name",
+  "relativeFullNameLabelText": "Tên đầy đủ",
   "relativeNamePlaceholder": "Firstname Familyname",
   "removeIdentifierButton": "Remove identifier",
   "resetIdentifierTooltip": "Cài lại",
   "restoreRelationshipActionButton": "Hoàn tác",
-  "searchAddress": "Search address",
+  "searchAddress": "Tìm kiếm địa chỉ",
   "searchIdentifierPlaceholder": "Search identifier",
-  "searchLocationPersonAttribute": "Search location",
-  "selectAnOption": "Select an option",
+  "searchLocationPersonAttribute": "Tìm kiếm vị trí",
+  "selectAnOption": "Chọn một tùy chọn",
   "sexFieldLabelText": "Giới tính",
   "source": "Nguồn",
   "submitting": "Đang nộp",
-  "timeFormat": "Time Format",
+  "timeFormat": "Định dạng thời gian",
   "timeOfDeathInputLabel": "Time of death (hh:mm)",
   "unableToFetch": "Unable to fetch person attribute type - {{personattributetype}}",
   "unknown": "Unknown",
diff --git a/packages/esm-patient-registration-app/translations/zh.json b/packages/esm-patient-registration-app/translations/zh.json
index 61cca5fe9..7e8aeff59 100644
--- a/packages/esm-patient-registration-app/translations/zh.json
+++ b/packages/esm-patient-registration-app/translations/zh.json
@@ -60,7 +60,7 @@
   "givenNameLabelText": "名字",
   "givenNameRequired": "名字是必填项",
   "identifierValueRequired": "ID标识是必填项",
-  "idFieldLabelText": "ID",
+  "idFieldLabelText": "Identifiers",
   "IDInstructions": "选择您想为该患者添加的ID标识：",
   "invalidEmail": "Invalid email",
   "invalidInput": "输入无效",
diff --git a/packages/esm-patient-search-app/package.json b/packages/esm-patient-search-app/package.json
index e70177005..2f03061e9 100644
--- a/packages/esm-patient-search-app/package.json
+++ b/packages/esm-patient-search-app/package.json
@@ -37,7 +37,7 @@
     "url": "https://github.com/openmrs/openmrs-esm-patient-management/issues"
   },
   "dependencies": {
-    "@carbon/react": "~1.37.0",
+    "@carbon/react": "^1.71.0",
     "lodash-es": "^4.17.15"
   },
   "peerDependencies": {
diff --git a/packages/esm-patient-search-app/src/compact-patient-search/compact-patient-banner.component.tsx b/packages/esm-patient-search-app/src/compact-patient-search/compact-patient-banner.component.tsx
index 7cd9e425b..c64b8f3b0 100644
--- a/packages/esm-patient-search-app/src/compact-patient-search/compact-patient-banner.component.tsx
+++ b/packages/esm-patient-search-app/src/compact-patient-search/compact-patient-banner.component.tsx
@@ -1,6 +1,6 @@
 import React, { forwardRef, useContext, useMemo } from 'react';
-import classNames from 'classnames';
 import { v4 as uuidv4 } from 'uuid';
+import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 import { Tag } from '@carbon/react';
 import {
@@ -173,7 +173,7 @@ const ClickablePatientContainer = ({ patient, children }: ClickablePatientContai
 const IdentifierTag: React.FC<IdentifierTagProps> = ({ identifier }) => {
   return (
     <>
-      <Tag size="sm" className={styles.configuredTag} type="warm-gray" title={identifier.identifierType.display}>
+      <Tag size="sm" className={styles.configuredTag} type="warm-gray">
         {identifier.identifierType.display}
       </Tag>
       <span className={styles.configuredLabel}>{identifier.identifier}</span>
diff --git a/packages/esm-patient-search-app/src/compact-patient-search/compact-patient-search.component.tsx b/packages/esm-patient-search-app/src/compact-patient-search/compact-patient-search.component.tsx
index 7973a5bc9..8e74237d2 100644
--- a/packages/esm-patient-search-app/src/compact-patient-search/compact-patient-search.component.tsx
+++ b/packages/esm-patient-search-app/src/compact-patient-search/compact-patient-search.component.tsx
@@ -96,7 +96,7 @@ const CompactPatientSearchComponent: React.FC<CompactPatientSearchProps> = ({
         });
       }
     },
-    [config.search.patientChartUrl, user, currentLocation],
+    [addViewedPatientAndCloseSearchResults, config.search.patientChartUrl],
   );
   const focusedResult = useArrowNavigation(
     !recentPatients ? searchedPatients?.length ?? 0 : recentPatients?.length ?? 0,
@@ -134,7 +134,7 @@ const CompactPatientSearchComponent: React.FC<CompactPatientSearchProps> = ({
         subtitle: errorFetchingUserProperties?.message,
       });
     }
-  }, [fetchError, errorFetchingUserProperties]);
+  }, [fetchError, errorFetchingUserProperties, t]);
 
   const handleSubmit = useCallback(
     (debouncedSearchTerm) => {
diff --git a/packages/esm-patient-search-app/src/compact-patient-search/recently-searched-patients.component.tsx b/packages/esm-patient-search-app/src/compact-patient-search/recently-searched-patients.component.tsx
index aa5a18516..0b180219a 100644
--- a/packages/esm-patient-search-app/src/compact-patient-search/recently-searched-patients.component.tsx
+++ b/packages/esm-patient-search-app/src/compact-patient-search/recently-searched-patients.component.tsx
@@ -73,7 +73,7 @@ const RecentlySearchedPatients = React.forwardRef<HTMLDivElement, RecentPatientS
       return (
         <div className={styles.searchResultsContainer}>
           <div className={styles.searchResults}>
-            <p className={styles.resultsText}>
+            <div className={styles.resultsText}>
               <span className={styles.resultsTextCount}>
                 {t('recentSearchResultsCount', '{{count}} recent search result', {
                   count: searchResults.length,
@@ -84,7 +84,7 @@ const RecentlySearchedPatients = React.forwardRef<HTMLDivElement, RecentPatientS
                   <InlineLoading className={styles.spinner} />
                 </span>
               )}
-            </p>
+            </div>
             <CompactPatientBanner patients={searchResults} ref={ref} />
             {hasMore && (
               <div className={styles.loadingIcon} ref={loadingIconRef}>
diff --git a/packages/esm-patient-search-app/src/config-schema.ts b/packages/esm-patient-search-app/src/config-schema.ts
index 11d61ef71..f1c41ce7f 100644
--- a/packages/esm-patient-search-app/src/config-schema.ts
+++ b/packages/esm-patient-search-app/src/config-schema.ts
@@ -21,6 +21,111 @@ export const configSchema = {
       _description:
         'Disable the default "keyup search" for instant patient search as typing concludes on tablet devices',
     },
+    searchFilterFields: {
+      _type: Type.Object,
+      _description: 'Configuration for advanced search fields',
+      _default: {
+        gender: {
+          enabled: true,
+        },
+        dateOfBirth: {
+          enabled: true,
+        },
+        age: {
+          enabled: true,
+          min: 0,
+        },
+        postcode: {
+          enabled: true,
+        },
+        personAttributes: [
+          {
+            attributeTypeUuid: '14d4f066-15f5-102d-96e4-000c29c2a5d7',
+          },
+        ],
+      },
+      gender: {
+        _type: Type.Object,
+        _description: 'Configuration for gender field',
+        enabled: {
+          _type: Type.Boolean,
+          _description: 'Optional. If true, determines whether to display the gender field or not. Defaults to true',
+          _default: true,
+        },
+      },
+      dateOfBirth: {
+        _type: Type.Object,
+        _description: 'Configuration for the date of birth field',
+        enabled: {
+          _type: Type.Boolean,
+          _description:
+            'Optional. If true, determines whether to display the date of birth field or not. Defaults to true',
+          _default: true,
+        },
+      },
+      age: {
+        _type: Type.Object,
+        _description: 'Configuration for the age field',
+        enabled: {
+          _type: Type.Boolean,
+          _description: 'Optional. If true, determines whether to display the age field or not. Defaults to true',
+          _default: true,
+        },
+        min: {
+          _type: Type.Number,
+          _description: 'The minimum value for the age field',
+          _default: 0,
+        },
+        max: {
+          _type: Type.Number,
+          _description: 'The maximum value for the age field',
+          _default: 0,
+        },
+      },
+      postcode: {
+        _type: Type.Object,
+        _description: 'Configuration for the postcode field',
+        enabled: {
+          _type: Type.Boolean,
+          _description: 'Optional. If true, determines whether to display the postcode field or not. Defaults to true',
+          _default: true,
+        },
+      },
+      personAttributes: {
+        _type: Type.Array,
+        _description: 'Configuration for person attributes to display on advanced search',
+        _elements: {
+          _type: Type.Object,
+          placeholder: {
+            _type: Type.String,
+            _description: 'Placeholder text for the field',
+            _default: '',
+          },
+          attributeTypeUuid: {
+            _type: Type.UUID,
+            _description: 'UUID of the person attribute type',
+          },
+          answerConceptSetUuid: {
+            _type: Type.ConceptUuid,
+            _default: null,
+            _description:
+              'For coded questions only. A concept which has the possible responses either as answers or as set members.',
+          },
+          conceptAnswersUuids: {
+            _type: Type.Array,
+            _description: 'A list of UUIDs representing the possible answers for the associated concept question.',
+            _default: [],
+          },
+          locationTag: {
+            _type: Type.String,
+            _default: null,
+            _description:
+              'Only for fields with "person attribute" type `org.openmrs.Location`. This filters the list of location options in the dropdown based on their location tag.',
+          },
+        },
+        _default: [],
+      },
+    },
   },
   includeDead: {
     _type: Type.Boolean,
@@ -53,11 +158,34 @@ export const configSchema = {
   },
 };
 
+export type BuiltInFieldType = 'gender' | 'dateOfBirth' | 'age' | 'postcode';
+
+export interface PersonAttributeFieldConfig {
+  attributeTypeUuid: string;
+  placeholder?: string;
+  answerConceptSetUuid?: string;
+  conceptAnswersUuids?: Array<string>;
+  locationTag?: string;
+}
+
+export interface BuiltInFieldConfig {
+  enabled: boolean;
+  min?: number;
+  max?: number;
+}
+
 export type PatientSearchConfig = {
   search: {
     disableTabletSearchOnKeyUp: boolean;
     patientChartUrl: string;
     showRecentlySearchedPatients: boolean;
+    searchFilterFields: {
+      gender: BuiltInFieldConfig;
+      dateOfBirth: BuiltInFieldConfig;
+      age: BuiltInFieldConfig & { min?: number };
+      postcode: BuiltInFieldConfig;
+      personAttributes: Array<PersonAttributeFieldConfig>;
+    };
   };
   contactAttributeType: Array<string>;
   defaultIdentifier: string;
diff --git a/packages/esm-patient-search-app/src/patient-search-bar/patient-search-bar.component.tsx b/packages/esm-patient-search-app/src/patient-search-bar/patient-search-bar.component.tsx
index b6ad648b4..92c979edc 100644
--- a/packages/esm-patient-search-app/src/patient-search-bar/patient-search-bar.component.tsx
+++ b/packages/esm-patient-search-app/src/patient-search-bar/patient-search-bar.component.tsx
@@ -13,10 +13,10 @@ interface PatientSearchBarProps {
 }
 
 const PatientSearchBar = React.forwardRef<HTMLInputElement, React.PropsWithChildren<PatientSearchBarProps>>(
-  ({ buttonProps, initialSearchTerm, onChange, onClear, onSubmit, isCompact }, ref) => {
+  ({ buttonProps, initialSearchTerm = '', onChange, onClear, onSubmit, isCompact }, ref) => {
     const { t } = useTranslation();
-    const responsiveSize = isCompact ? 'sm' : 'lg';
     const [searchTerm, setSearchTerm] = useState(initialSearchTerm);
+    const responsiveSize = isCompact ? 'sm' : 'lg';
 
     const handleChange = useCallback(
       (value: string) => {
diff --git a/packages/esm-patient-search-app/src/patient-search-bar/patient-search-bar.test.tsx b/packages/esm-patient-search-app/src/patient-search-bar/patient-search-bar.test.tsx
index 6d4e854e3..64f32ed31 100644
--- a/packages/esm-patient-search-app/src/patient-search-bar/patient-search-bar.test.tsx
+++ b/packages/esm-patient-search-app/src/patient-search-bar/patient-search-bar.test.tsx
@@ -4,7 +4,7 @@ import { render, screen } from '@testing-library/react';
 import PatientSearchBar from './patient-search-bar.component';
 
 describe('PatientSearchBar', () => {
-  it('should render', () => {
+  it('renders a search input', () => {
     render(<PatientSearchBar onClear={jest.fn()} onSubmit={jest.fn()} />);
 
     const searchInput = screen.getByPlaceholderText('Search for a patient by name or identifier number');
@@ -12,7 +12,7 @@ describe('PatientSearchBar', () => {
     expect(searchInput).toBeInTheDocument();
   });
 
-  it('displays initial search term', () => {
+  it('displays the initial search term', () => {
     const initialSearchTerm = 'John Doe';
     render(<PatientSearchBar initialSearchTerm={initialSearchTerm} onClear={jest.fn()} onSubmit={jest.fn()} />);
 
@@ -23,7 +23,7 @@ describe('PatientSearchBar', () => {
     expect(searchInput.value).toBe(initialSearchTerm);
   });
 
-  it('calls onChange callback on input change', async () => {
+  it('calls the onChange callback on input change', async () => {
     const user = userEvent.setup();
     const onChangeMock = jest.fn();
 
@@ -36,7 +36,7 @@ describe('PatientSearchBar', () => {
     expect(onChangeMock).toHaveBeenCalledWith('New Value');
   });
 
-  it('calls onClear callback on clear button click', async () => {
+  it('calls the onClear callback on clear button click', async () => {
     const user = userEvent.setup();
     const onClearMock = jest.fn();
 
@@ -49,7 +49,7 @@ describe('PatientSearchBar', () => {
     expect(onClearMock).toHaveBeenCalled();
   });
 
-  it('calls onSubmit callback on form submission', async () => {
+  it('calls the onSubmit callback on form submission', async () => {
     const user = userEvent.setup();
     const onSubmitMock = jest.fn();
 
diff --git a/packages/esm-patient-search-app/src/patient-search-button/patient-search-button.component.tsx b/packages/esm-patient-search-app/src/patient-search-button/patient-search-button.component.tsx
index 5382abad5..23f63176a 100644
--- a/packages/esm-patient-search-app/src/patient-search-button/patient-search-button.component.tsx
+++ b/packages/esm-patient-search-app/src/patient-search-button/patient-search-button.component.tsx
@@ -1,7 +1,7 @@
+import React, { useCallback, useEffect } from 'react';
 import { Button } from '@carbon/react';
 import { Search } from '@carbon/react/icons';
 import { launchWorkspace } from '@openmrs/esm-framework';
-import React, { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { type PatientSearchWorkspaceProps } from '../patient-search-workspace/patient-search.workspace';
 
@@ -37,7 +37,7 @@ const PatientSearchButton: React.FC<PatientSearchButtonProps> = ({
 }) => {
   const { t } = useTranslation();
 
-  const launchPatientSearchWorkspace = () => {
+  const launchPatientSearchWorkspace = useCallback(() => {
     const workspaceProps: PatientSearchWorkspaceProps = {
       handleSearchTermUpdated: searchQueryUpdatedAction,
       initialQuery: searchQuery,
@@ -47,13 +47,13 @@ const PatientSearchButton: React.FC<PatientSearchButtonProps> = ({
       ...workspaceProps,
       workspaceTitle: overlayHeader,
     });
-  };
+  }, [overlayHeader, searchQuery, searchQueryUpdatedAction, selectPatientAction]);
 
   useEffect(() => {
     if (isOpen) {
       launchPatientSearchWorkspace();
     }
-  }, [isOpen]);
+  }, [isOpen, launchPatientSearchWorkspace]);
 
   return (
     <Button
diff --git a/packages/esm-patient-search-app/src/patient-search-page/advanced-patient-search.component.tsx b/packages/esm-patient-search-app/src/patient-search-page/advanced-patient-search.component.tsx
index 2c45f992e..1e2d6f968 100644
--- a/packages/esm-patient-search-app/src/patient-search-page/advanced-patient-search.component.tsx
+++ b/packages/esm-patient-search-app/src/patient-search-page/advanced-patient-search.component.tsx
@@ -2,10 +2,10 @@ import React, { useEffect, useMemo, useState } from 'react';
 import classNames from 'classnames';
 import { useInfinitePatientSearch } from '../patient-search.resource';
 import { type AdvancedPatientSearchState } from '../types';
-import { initialState } from './advanced-search-reducer';
 import PatientSearchComponent from './patient-search-lg.component';
-import RefineSearch from './refine-search.component';
+import RefineSearch, { initialFilters } from './refine-search/refine-search.component';
 import styles from './advanced-patient-search.scss';
+import type { OpenmrsResource } from '@openmrs/esm-framework';
 
 interface AdvancedPatientSearchProps {
   query: string;
@@ -18,14 +18,16 @@ const AdvancedPatientSearchComponent: React.FC<AdvancedPatientSearchProps> = ({
   stickyPagination,
   inTabletOrOverlay,
 }) => {
-  const [filters, setFilters] = useState<AdvancedPatientSearchState>(initialState);
+  const [filters, setFilters] = useState<AdvancedPatientSearchState>(initialFilters);
   const filtersApplied = useMemo(() => {
     let count = 0;
     Object.entries(filters).forEach(([key, value]) => {
-      if (value != initialState[key]) {
+      if (key !== 'attributes' && value !== initialFilters[key]) {
         count++;
       }
     });
+
+    count += Object.keys(filters.attributes).length ?? 0;
     return count;
   }, [filters]);
 
@@ -47,21 +49,20 @@ const AdvancedPatientSearchComponent: React.FC<AdvancedPatientSearchProps> = ({
   const filteredResults = useMemo(() => {
     if (searchResults && filtersApplied) {
       return searchResults.filter((patient) => {
+        // Gender filter
         if (filters.gender !== 'any') {
-          if (filters.gender === 'male' && patient.person.gender !== 'M') {
-            return false;
-          }
-          if (filters.gender === 'female' && patient.person.gender !== 'F') {
-            return false;
-          }
-          if (filters.gender === 'other' && patient.person.gender !== 'O') {
-            return false;
-          }
-          if (filters.gender === 'unknown' && patient.person.gender !== 'U') {
+          const genderMap = {
+            male: 'M',
+            female: 'F',
+            other: 'O',
+            unknown: 'U',
+          };
+          if (patient.person.gender !== genderMap[filters.gender]) {
             return false;
           }
         }
 
+        // Date of birth filters
         if (filters.dateOfBirth) {
           const dayOfBirth = new Date(patient.person.birthdate).getDate();
           if (dayOfBirth !== filters.dateOfBirth) {
@@ -83,26 +84,34 @@ const AdvancedPatientSearchComponent: React.FC<AdvancedPatientSearchProps> = ({
           }
         }
 
+        // Postcode filter
         if (filters.postcode) {
           if (!patient.person.addresses.some((address) => address.postalCode === filters.postcode)) {
             return false;
           }
         }
 
+        // Age filter
         if (filters.age) {
-          if (patient.person.age !== filters.age) {
+          if (Number(patient.person.age) !== Number(filters.age)) {
             return false;
           }
         }
 
-        if (filters.phoneNumber) {
-          if (
-            !(
-              patient.attributes.find((attr) => attr.attributeType.display === 'Telephone Number')?.value ===
-              filters.phoneNumber.toString()
-            )
-          ) {
-            return false;
+        // Person attributes filter
+        if (Object.keys(filters.attributes).length) {
+          for (const [attributeUuid, value] of Object.entries(filters.attributes)) {
+            const matchingAttribute = patient.attributes.find((attr) => attr.attributeType.uuid === attributeUuid);
+
+            if (!matchingAttribute) return false;
+
+            const isValueObj = typeof matchingAttribute.value === 'object';
+            const patientAttributeValue = isValueObj
+              ? (matchingAttribute.value as OpenmrsResource).uuid
+              : matchingAttribute.value;
+            if ((patientAttributeValue as string).toLowerCase() !== value.toLowerCase()) {
+              return false;
+            }
           }
         }
 
diff --git a/packages/esm-patient-search-app/src/patient-search-page/advanced-patient-search.test.tsx b/packages/esm-patient-search-app/src/patient-search-page/advanced-patient-search.test.tsx
new file mode 100644
index 000000000..7fcce1f6e
--- /dev/null
+++ b/packages/esm-patient-search-app/src/patient-search-page/advanced-patient-search.test.tsx
@@ -0,0 +1,220 @@
+import React from 'react';
+import { render, screen, within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { useInfinitePatientSearch } from '../patient-search.resource';
+import AdvancedPatientSearchComponent from './advanced-patient-search.component';
+import { getDefaultsFromConfigSchema, useConfig } from '@openmrs/esm-framework';
+import { configSchema, type PatientSearchConfig } from '../config-schema';
+import { type PatientSearchResponse } from '../types';
+import { mockAdvancedSearchResults } from '__mocks__';
+import { PatientSearchContext } from '../patient-search-context';
+import { usePersonAttributeType } from './refine-search/person-attributes.resource';
+
+const mockUseConfig = jest.mocked(useConfig<PatientSearchConfig>);
+const mockUseInfinitePatientSearch = jest.mocked(useInfinitePatientSearch);
+const mockUsePersonAttributeType = jest.mocked(usePersonAttributeType);
+
+jest.mock('../patient-search.resource', () => ({
+  useInfinitePatientSearch: jest.fn(),
+}));
+
+jest.mock('./refine-search/person-attributes.resource', () => ({
+  usePersonAttributeType: jest.fn(),
+}));
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useParams: jest.fn(() => ({
+    page: 1,
+  })),
+  useLocation: jest.fn(),
+  useSearchParams: jest.fn(() => [
+    {
+      get: jest.fn(() => 'Jos'),
+    },
+  ]),
+}));
+
+const mockPatientActionContextValue = {
+  nonNavigationSelectPatientAction: jest.fn(),
+  selectPatientAction: jest.fn(),
+};
+
+const mockSearchResults: PatientSearchResponse = {
+  isValidating: false,
+  totalResults: 2,
+  data: mockAdvancedSearchResults as unknown as PatientSearchResponse['data'],
+  currentPage: 1,
+  setPage: jest.fn(),
+  hasMore: false,
+  isLoading: false,
+  fetchError: null,
+};
+
+const Wrapper: React.FC<{ children: React.ReactNode }> = ({ children }) => (
+  <PatientSearchContext.Provider value={mockPatientActionContextValue}>{children}</PatientSearchContext.Provider>
+);
+
+describe('AdvancedPatientSearchComponent', () => {
+  const user = userEvent.setup();
+
+  beforeEach(() => {
+    mockUseInfinitePatientSearch.mockReturnValue(mockSearchResults);
+    mockUseConfig.mockReturnValue({
+      ...getDefaultsFromConfigSchema(configSchema),
+      search: {
+        disableTabletSearchOnKeyUp: false,
+        showRecentlySearchedPatients: false,
+        searchFilterFields: {
+          gender: {
+            enabled: true,
+          },
+          dateOfBirth: {
+            enabled: true,
+          },
+          age: {
+            enabled: true,
+            min: 0,
+          },
+          postcode: {
+            enabled: true,
+          },
+          personAttributes: [
+            {
+              attributeTypeUuid: '14d4f066-15f5-102d-96e4-000c29c2a5d7',
+            },
+          ],
+        },
+      } as PatientSearchConfig['search'],
+    });
+    mockUsePersonAttributeType.mockReturnValue({
+      isLoading: false,
+      error: null,
+      data: {
+        format: 'java.lang.String',
+        uuid: '14d4f066-15f5-102d-96e4-000c29c2a5d7',
+        display: 'Telephone Number',
+      },
+    });
+  });
+
+  const renderComponent = (props = {}) => {
+    return render(
+      <Wrapper>
+        <AdvancedPatientSearchComponent query="Jos" {...props} />
+      </Wrapper>,
+    );
+  };
+
+  it('renders without crashing', () => {
+    renderComponent();
+    expect(screen.getByText('Refine search')).toBeInTheDocument();
+  });
+
+  it('displays search results correctly', () => {
+    renderComponent();
+    expect(screen.getByText(/2 search result/)).toBeInTheDocument();
+  });
+
+  describe('Filtering', () => {
+    it('filters by gender correctly', async () => {
+      renderComponent();
+
+      await user.click(screen.getByRole('tab', { name: /female/i }));
+      await user.click(screen.getByRole('button', { name: /apply/i }));
+
+      // expect to have 0 search result
+      expect(screen.getByText(/0 search result/)).toBeInTheDocument();
+    });
+
+    it('filters by age correctly', async () => {
+      renderComponent();
+
+      // Set age filter
+      const ageInput = screen.getByRole('spinbutton', { name: /age/i });
+      await user.type(ageInput, '30');
+      await user.click(screen.getByRole('button', { name: /apply/i }));
+
+      // expect one patient Joseph Davis
+      const patientBanners = screen.getAllByRole('banner');
+      expect(patientBanners).toHaveLength(1);
+      expect(within(patientBanners[0]).getByText(/Joseph Davis/i)).toBeInTheDocument();
+      expect(within(patientBanners[0]).getByText(/30/)).toBeInTheDocument();
+    });
+
+    it('filters by postcode correctly', async () => {
+      renderComponent();
+
+      // Set postcode filter
+      const postcodeInput = screen.getByRole('textbox', { name: /postcode/i });
+      await user.type(postcodeInput, '46548');
+      await user.click(screen.getByRole('button', { name: /apply/i }));
+
+      // expect one patient Joseph Davis
+
+      const patientBanners = screen.getAllByRole('banner');
+      expect(patientBanners).toHaveLength(1);
+      expect(within(patientBanners[0]).getByText(/Joseph Davis/i)).toBeInTheDocument();
+    });
+
+    it('filters by person attribute correctly', async () => {
+      renderComponent();
+
+      // Set phone number attribute filter
+      const phoneInput = screen.getByLabelText(/phone number/i);
+      await user.type(phoneInput, '0785434125');
+      await user.click(screen.getByRole('button', { name: /apply/i }));
+
+      // expect one patient Joshua Johnson
+
+      const patientBanners = screen.getAllByRole('banner');
+      expect(patientBanners).toHaveLength(1);
+      expect(within(patientBanners[0]).getByText(/Joshua Johnson/)).toBeInTheDocument();
+    });
+
+    it('combines multiple filters correctly', async () => {
+      renderComponent();
+
+      // Set multiple filters
+      await user.click(screen.getByRole('tab', { name: /any/i }));
+      const ageInput = screen.getByRole('spinbutton', { name: /age/i });
+      await user.type(ageInput, '5');
+      await user.click(screen.getByRole('button', { name: /apply/i }));
+
+      // expect one patient Joshua Johnson
+
+      const patientBanners = screen.getAllByRole('banner');
+      expect(patientBanners).toHaveLength(1);
+      expect(within(patientBanners[0]).getByText(/Joshua Johnson/)).toBeInTheDocument();
+    });
+
+    it('resets filters correctly', async () => {
+      renderComponent();
+
+      // Set a filter
+      await user.click(screen.getByRole('tab', { name: /female/i }));
+      await user.click(screen.getByRole('button', { name: /apply/i }));
+
+      // Reset filters
+      await user.click(screen.getByRole('button', { name: /reset fields/i }));
+
+      // expects all search results 2 patients
+      const patientBanners = screen.getAllByRole('banner');
+      expect(patientBanners).toHaveLength(2);
+    });
+  });
+
+  describe('Layout', () => {
+    it('renders in desktop layout by default', () => {
+      renderComponent();
+      const container = screen.getByText(/Refine search/i);
+      expect(container).toBeInTheDocument();
+    });
+
+    it('renders in tablet layout when specified', () => {
+      renderComponent({ inTabletOrOverlay: true });
+      const container = screen.getByText(/Refine search/i);
+      expect(container).toBeInTheDocument();
+    });
+  });
+});
diff --git a/packages/esm-patient-search-app/src/patient-search-page/advanced-search-reducer.tsx b/packages/esm-patient-search-app/src/patient-search-page/advanced-search-reducer.tsx
deleted file mode 100644
index f04f8e534..000000000
--- a/packages/esm-patient-search-app/src/patient-search-page/advanced-search-reducer.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import {
-  type AdvancedPatientSearchAction,
-  AdvancedPatientSearchActionTypes,
-  type AdvancedPatientSearchState,
-} from '../types';
-
-export const initialState: AdvancedPatientSearchState = {
-  gender: 'any',
-  dateOfBirth: 0,
-  monthOfBirth: 0,
-  yearOfBirth: 0,
-  phoneNumber: 0,
-  postcode: '',
-  age: 0,
-};
-
-const reducer: (
-  state: AdvancedPatientSearchState,
-  action: AdvancedPatientSearchAction,
-) => AdvancedPatientSearchState = (state, action) => {
-  switch (action.type) {
-    case AdvancedPatientSearchActionTypes.SET_GENDER:
-      return {
-        ...state,
-        gender: action.gender,
-      };
-    case AdvancedPatientSearchActionTypes.SET_DATE_OF_BIRTH:
-      return {
-        ...state,
-        dateOfBirth: action.dateOfBirth,
-      };
-    case AdvancedPatientSearchActionTypes.SET_MONTH_OF_BIRTH:
-      return {
-        ...state,
-        monthOfBirth: action.monthOfBirth,
-      };
-    case AdvancedPatientSearchActionTypes.SET_YEAR_OF_BIRTH:
-      return {
-        ...state,
-        yearOfBirth: action.yearOfBirth,
-      };
-    case AdvancedPatientSearchActionTypes.SET_PHONE_NUMBER:
-      return {
-        ...state,
-        phoneNumber: action.phoneNumber,
-      };
-    case AdvancedPatientSearchActionTypes.SET_POSTCODE:
-      return {
-        ...state,
-        postcode: action.postcode,
-      };
-    case AdvancedPatientSearchActionTypes.SET_AGE:
-      return {
-        ...state,
-        age: action.age,
-      };
-    case AdvancedPatientSearchActionTypes.RESET_FIELDS:
-      return initialState;
-    default:
-      return state;
-  }
-};
-
-export default reducer;
diff --git a/packages/esm-patient-search-app/src/patient-search-page/patient-search-page.test.tsx b/packages/esm-patient-search-app/src/patient-search-page/patient-search-page.test.tsx
index ee99d68e8..f6b03a611 100644
--- a/packages/esm-patient-search-app/src/patient-search-page/patient-search-page.test.tsx
+++ b/packages/esm-patient-search-app/src/patient-search-page/patient-search-page.test.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { getDefaultsFromConfigSchema, isDesktop, useConfig } from '@openmrs/esm-framework';
-import { type PatientSearchConfig, configSchema } from '../config-schema';
+import { configSchema, type PatientSearchConfig } from '../config-schema';
 import PatientSearchPageComponent from './patient-search-page.component';
 
 const mockIsDesktop = jest.mocked(isDesktop);
@@ -27,6 +27,26 @@ describe('PatientSearchPageComponent', () => {
       search: {
         disableTabletSearchOnKeyUp: false,
         showRecentlySearchedPatients: false,
+        searchFilterFields: {
+          gender: {
+            enabled: true,
+          },
+          dateOfBirth: {
+            enabled: true,
+          },
+          age: {
+            enabled: true,
+            min: 0,
+          },
+          postcode: {
+            enabled: true,
+          },
+          personAttributes: [
+            {
+              attributeTypeUuid: '14d4f066-15f5-102d-96e4-000c29c2a5d7',
+            },
+          ],
+        },
       } as PatientSearchConfig['search'],
     });
   });
diff --git a/packages/esm-patient-search-app/src/patient-search-page/refine-search.component.tsx b/packages/esm-patient-search-app/src/patient-search-page/refine-search.component.tsx
deleted file mode 100644
index b18fb1347..000000000
--- a/packages/esm-patient-search-app/src/patient-search-page/refine-search.component.tsx
+++ /dev/null
@@ -1,422 +0,0 @@
-import React, { useCallback, useReducer, useState } from 'react';
-import classNames from 'classnames';
-import { useTranslation } from 'react-i18next';
-import { Button, ContentSwitcher, Layer, NumberInput, Switch, TextInput } from '@carbon/react';
-import { ChevronUp, ChevronDown } from '@carbon/react/icons';
-import reducer, { initialState } from './advanced-search-reducer';
-import { AdvancedPatientSearchActionTypes, type AdvancedPatientSearchState } from '../types';
-import { useLayoutType } from '@openmrs/esm-framework';
-import styles from './refine-search.scss';
-
-interface RefineSearchProps {
-  inTabletOrOverlay: boolean;
-  setFilters: React.Dispatch<React.SetStateAction<AdvancedPatientSearchState>>;
-  filtersApplied: number;
-}
-
-const RefineSearch: React.FC<RefineSearchProps> = ({ setFilters, inTabletOrOverlay, filtersApplied }) => {
-  const [formState, formDispatch] = useReducer(reducer, initialState);
-  const [showRefineSearchDialog, setShowRefineSearchDialog] = useState(false);
-  const { t } = useTranslation();
-  const isTablet = useLayoutType() === 'tablet';
-
-  const handleGenderChange = useCallback(
-    (evt: { name: 'any' | 'male' | 'female' }) => {
-      formDispatch({
-        type: AdvancedPatientSearchActionTypes.SET_GENDER,
-        gender: evt.name,
-      });
-    },
-    [formDispatch],
-  );
-
-  const handleDateOfBirthChange = useCallback(
-    (evt: { target: { value: string } }) => {
-      const date = parseInt(evt.target.value) || 0;
-      formDispatch({
-        type: AdvancedPatientSearchActionTypes.SET_DATE_OF_BIRTH,
-        dateOfBirth: date,
-      });
-    },
-    [formDispatch],
-  );
-
-  const handleMonthOfBirthChange = useCallback(
-    (evt: { target: { value: string } }) => {
-      const month = parseInt(evt.target.value) || 0;
-      formDispatch({
-        type: AdvancedPatientSearchActionTypes.SET_MONTH_OF_BIRTH,
-        monthOfBirth: month,
-      });
-    },
-    [formDispatch],
-  );
-
-  const handleYearOfBirthChange = useCallback(
-    (evt: { target: { value: string } }) => {
-      const year = parseInt(evt.target.value) || 0;
-      formDispatch({
-        type: AdvancedPatientSearchActionTypes.SET_YEAR_OF_BIRTH,
-        yearOfBirth: year,
-      });
-    },
-    [formDispatch],
-  );
-
-  const handlePhoneNumberChange = useCallback(
-    (evt: { target: { value: string } }) => {
-      const phoneNumber = parseInt(evt.target.value) || 0;
-      formDispatch({
-        type: AdvancedPatientSearchActionTypes.SET_PHONE_NUMBER,
-        phoneNumber,
-      });
-    },
-    [formDispatch],
-  );
-
-  const handlePostCodeChange = useCallback(
-    (evt: { target: { value: string } }) => {
-      formDispatch({
-        type: AdvancedPatientSearchActionTypes.SET_POSTCODE,
-        postcode: evt.target.value,
-      });
-    },
-    [formDispatch],
-  );
-
-  const handleAgeChange = useCallback(
-    (evt: { target: { value: string } }) => {
-      const age = parseInt(evt.target.value) || 0;
-      formDispatch({
-        type: AdvancedPatientSearchActionTypes.SET_AGE,
-        age: age,
-      });
-    },
-    [formDispatch],
-  );
-
-  const handleSubmit = useCallback(
-    (evt) => {
-      evt.preventDefault();
-      setFilters(formState);
-      setShowRefineSearchDialog(false);
-    },
-    [formState, setShowRefineSearchDialog, setFilters],
-  );
-
-  const handleResetFields = useCallback(() => {
-    formDispatch({
-      type: AdvancedPatientSearchActionTypes.RESET_FIELDS,
-    });
-    setFilters(initialState);
-    setShowRefineSearchDialog(false);
-  }, [formDispatch, setShowRefineSearchDialog, setFilters]);
-
-  const toggleShowRefineSearchDialog = useCallback(() => {
-    setShowRefineSearchDialog((prevState) => !prevState);
-  }, []);
-
-  if (inTabletOrOverlay) {
-    return (
-      <>
-        <div className={styles.refineSearchBanner}>
-          {!filtersApplied ? (
-            <p className={styles.bodyShort01}>
-              {t('refineSearchTabletBannerText', "Can't find who you're looking for?")}
-            </p>
-          ) : (
-            <div className={styles.refineSearchBannerFilterInfo}>
-              <span className={classNames(styles.filtersAppliedCount, styles.bodyShort01)}>{filtersApplied}</span>{' '}
-              <p className={styles.bodyShort01}>{t('filtersAppliedText', 'search queries added')}</p>
-              <Button kind="ghost" onClick={handleResetFields} className={styles.refineSearchDialogOpener} size="sm">
-                {t('clear', 'Clear')}
-              </Button>
-            </div>
-          )}
-          <Button
-            kind="ghost"
-            onClick={toggleShowRefineSearchDialog}
-            renderIcon={!showRefineSearchDialog ? ChevronUp : ChevronDown}
-            className={styles.refineSearchDialogOpener}
-            size="sm">
-            {t('refineSearch', 'Refine search')}
-          </Button>
-        </div>
-        {showRefineSearchDialog && (
-          <div className={styles.refineSearchDialogContainer}>
-            <div className={styles.refineSearchDialog}>
-              <div className={styles.refineSearchDialogHeader}>
-                <p className={styles.bodyShort01}>{t('refineSearchHeaderText', 'Add additional search criteria')}</p>
-                <Button
-                  kind="ghost"
-                  onClick={toggleShowRefineSearchDialog}
-                  renderIcon={ChevronDown}
-                  className={styles.refineSearchDialogOpener}
-                  size="sm">
-                  {t('refineSearch', 'Refine search')}
-                </Button>
-              </div>
-              <form onSubmit={handleSubmit}>
-                <div
-                  className={classNames(styles.padded, {
-                    [styles.refineSearchDialogGenderSexRow]: isTablet,
-                  })}>
-                  <div className={styles.fieldTabletOrOverlay}>
-                    <div className={styles.labelText}>
-                      <label className={classNames(styles.sexLabelText, styles.label01)} htmlFor="#gender">
-                        {t('sex', 'Sex')}
-                      </label>
-                    </div>
-                    <ContentSwitcher
-                      id="gender"
-                      size={isTablet ? 'lg' : 'md'}
-                      onChange={handleGenderChange}
-                      selectedIndex={['any', 'male', 'female'].indexOf(formState.gender)}>
-                      <Switch name="any" text={t('any', 'Any')} />
-                      <Switch name="male" text={t('male', 'Male')} />
-                      <Switch name="female" text={t('female', 'Female')} />
-                    </ContentSwitcher>
-                    <ContentSwitcher
-                      id="gender"
-                      size={isTablet ? 'lg' : 'md'}
-                      onChange={handleGenderChange}
-                      selectedIndex={['other', 'unknown'].indexOf(formState.gender)}>
-                      <Switch name="other" text={t('other', 'Other')} />
-                      <Switch name="unknown" text={t('unknown', 'Unknown')} />
-                    </ContentSwitcher>
-                  </div>
-                  <div className={classNames(styles.fieldTabletOrOverlay, styles.dobFields)}>
-                    <NumberInput
-                      id="dateOfBirth"
-                      placeholder="DD"
-                      value={formState.dateOfBirth || ''}
-                      onChange={handleDateOfBirthChange}
-                      className={styles.dobField}
-                      type="number"
-                      label={t('dayOfBirth', 'Day of Birth')}
-                      min={1}
-                      max={31}
-                      allowEmpty
-                      hideSteppers
-                      size={isTablet ? 'lg' : 'md'}
-                    />
-                    <NumberInput
-                      id="monthOfBirth"
-                      placeholder="MM"
-                      value={formState.monthOfBirth || ''}
-                      onChange={handleMonthOfBirthChange}
-                      className={styles.dobField}
-                      type="number"
-                      label={t('monthOfBirth', 'Month of Birth')}
-                      min={1}
-                      max={12}
-                      allowEmpty
-                      hideSteppers
-                      size={isTablet ? 'lg' : 'md'}
-                    />
-                    <NumberInput
-                      id="yearOfBirth"
-                      placeholder="YYYY"
-                      value={formState.yearOfBirth || ''}
-                      onChange={handleYearOfBirthChange}
-                      className={styles.dobField}
-                      type="number"
-                      label={t('yearOfBirth', 'Year of Birth')}
-                      allowEmpty
-                      hideSteppers
-                      min={1800}
-                      max={new Date().getFullYear()}
-                      size={isTablet ? 'lg' : 'md'}
-                    />
-                  </div>
-                </div>
-                <div
-                  className={classNames(styles.padded, {
-                    [styles.phoneLastVisitRow]: isTablet,
-                  })}>
-                  <div className={styles.phonePostcode}>
-                    <div className={styles.fieldTabletOrOverlay}>
-                      <NumberInput
-                        id="phoneNumber"
-                        label={t('phoneNumber', 'Phone number')}
-                        onChange={handlePhoneNumberChange}
-                        type="number"
-                        value={formState.phoneNumber || ''}
-                        size={isTablet ? 'lg' : 'md'}
-                        allowEmpty
-                        hideSteppers
-                        min={1}
-                      />
-                    </div>
-                    <div className={styles.fieldTabletOrOverlay}>
-                      <TextInput
-                        id="postcode"
-                        labelText={t('postcode', 'Postcode')}
-                        onChange={handlePostCodeChange}
-                        value={formState.postcode}
-                        size={isTablet ? 'lg' : 'md'}
-                      />
-                    </div>
-                  </div>
-                  <div className={styles.fieldTabletOrOverlay}>
-                    <NumberInput
-                      id="age"
-                      value={formState.age || ''}
-                      onChange={handleAgeChange}
-                      size={isTablet ? 'lg' : 'md'}
-                      label={t('age', 'Age')}
-                      min={0}
-                      allowEmpty
-                      hideSteppers
-                    />
-                  </div>
-                </div>
-                <div
-                  className={classNames(styles.buttonSet, {
-                    [styles.paddedButtons]: isTablet,
-                  })}>
-                  <Button kind="secondary" size="xl" onClick={handleResetFields} className={styles.button}>
-                    {t('resetFields', 'Reset fields')}
-                  </Button>
-                  <Button type="submit" kind="primary" size="xl" className={styles.button}>
-                    {t('apply', 'Apply')}{' '}
-                    {filtersApplied ? `(${filtersApplied} ${t('countOfFiltersApplied', 'filters applied')})` : null}
-                  </Button>
-                </div>
-              </form>
-            </div>
-          </div>
-        )}
-      </>
-    );
-  }
-
-  return (
-    <form onSubmit={handleSubmit} className={styles.refineSearchContainer} data-openmrs-role="Refine Search">
-      <h2 className={styles.productiveHeading02}>{t('refineSearch', 'Refine search')}</h2>
-      <div className={styles.field}>
-        <div className={styles.labelText}>
-          <label className={classNames(styles.sexLabelText, styles.label01)} htmlFor="#gender">
-            {t('sex', 'Sex')}
-          </label>
-        </div>
-        <ContentSwitcher
-          id="gender"
-          onChange={handleGenderChange}
-          selectedIndex={['any', 'male', 'female'].indexOf(formState.gender)}>
-          <Switch name="any" text={t('any', 'Any')} />
-          <Switch name="male" text={t('male', 'Male')} />
-          <Switch name="female" text={t('female', 'Female')} />
-        </ContentSwitcher>
-        <ContentSwitcher
-          id="gender"
-          onChange={handleGenderChange}
-          selectedIndex={['other', 'unknown'].indexOf(formState.gender)}>
-          <Switch name="other" text={t('other', 'Other')} />
-          <Switch name="unknown" text={t('unknown', 'Unknown')} />
-        </ContentSwitcher>
-      </div>
-      <div className={classNames(styles.field, styles.dobFields)}>
-        <Layer>
-          <NumberInput
-            id="dateOfBirth"
-            placeholder="DD"
-            value={formState.dateOfBirth || ''}
-            onChange={handleDateOfBirthChange}
-            className={styles.dobField}
-            type="number"
-            label={t('dayOfBirth', 'Day of Birth')}
-            min={1}
-            max={31}
-            allowEmpty
-            hideSteppers
-          />
-        </Layer>
-
-        <Layer>
-          <NumberInput
-            id="monthOfBirth"
-            placeholder="MM"
-            value={formState.monthOfBirth || ''}
-            onChange={handleMonthOfBirthChange}
-            className={styles.dobField}
-            type="number"
-            label={t('monthOfBirth', 'Month of Birth')}
-            min={1}
-            max={12}
-            allowEmpty
-            hideSteppers
-          />
-        </Layer>
-
-        <Layer>
-          <NumberInput
-            id="yearOfBirth"
-            placeholder="YYYY"
-            value={formState.yearOfBirth || ''}
-            onChange={handleYearOfBirthChange}
-            className={styles.dobField}
-            type="number"
-            label={t('yearOfBirth', 'Year of Birth')}
-            allowEmpty
-            hideSteppers
-            min={1800}
-            max={new Date().getFullYear()}
-          />
-        </Layer>
-      </div>
-      <div className={styles.field}>
-        <Layer>
-          <NumberInput
-            id="age"
-            value={formState.age || ''}
-            onChange={handleAgeChange}
-            size={isTablet ? 'lg' : 'md'}
-            label={t('age', 'Age')}
-            min={0}
-            allowEmpty
-            hideSteppers
-          />
-        </Layer>
-      </div>
-      <div className={styles.field}>
-        <Layer>
-          <NumberInput
-            id="phoneNumber"
-            label={t('phoneNumber', 'Phone number')}
-            onChange={handlePhoneNumberChange}
-            type="number"
-            value={formState.phoneNumber || ''}
-            allowEmpty
-            hideSteppers
-            min={1}
-          />
-        </Layer>
-      </div>
-      <div className={styles.field}>
-        <Layer>
-          <TextInput
-            id="postcode"
-            labelText={t('postcode', 'Postcode')}
-            onChange={handlePostCodeChange}
-            value={formState.postcode}
-          />
-        </Layer>
-      </div>
-      <hr className={classNames(styles.field, styles.horizontalDivider)} />
-      <Button type="submit" kind="primary" size="md" className={classNames(styles.field, styles.button)}>
-        {t('apply', 'Apply')}{' '}
-        {filtersApplied ? `(${filtersApplied} ${t('countOfFiltersApplied', 'filters applied')})` : null}
-      </Button>
-      <Button
-        kind="secondary"
-        size="md"
-        onClick={handleResetFields}
-        className={classNames(styles.field, styles.button)}>
-        {t('resetFields', 'Reset fields')}
-      </Button>
-    </form>
-  );
-};
-
-export default RefineSearch;
diff --git a/packages/esm-patient-search-app/src/patient-search-page/refine-search/person-attribute-field.component.tsx b/packages/esm-patient-search-app/src/patient-search-page/refine-search/person-attribute-field.component.tsx
new file mode 100644
index 000000000..eac7462b0
--- /dev/null
+++ b/packages/esm-patient-search-app/src/patient-search-page/refine-search/person-attribute-field.component.tsx
@@ -0,0 +1,233 @@
+import React, { useMemo, useRef, useState } from 'react';
+import { ComboBox, InlineLoading, InlineNotification, TextInput, TextInputSkeleton } from '@carbon/react';
+import { useTranslation } from 'react-i18next';
+import { type Control, Controller } from 'react-hook-form';
+import {
+  useAttributeConceptAnswers,
+  useConfiguredAnswerConcepts,
+  useLocations,
+  usePersonAttributeType,
+} from './person-attributes.resource';
+import { type AdvancedPatientSearchState, type SearchFieldConfig } from '../../types';
+import styles from './search-field.scss';
+import { type OpenmrsResource } from '@openmrs/esm-framework';
+
+export interface PersonAttributeFieldProps {
+  field: SearchFieldConfig;
+  control: Control<AdvancedPatientSearchState>;
+  inTabletOrOverlay: boolean;
+  isTablet: boolean;
+}
+
+export function PersonAttributeField({ field, control, isTablet }: PersonAttributeFieldProps) {
+  const { t } = useTranslation();
+  const { data: personAttributeType, isLoading, error } = usePersonAttributeType(field.attributeTypeUuid || '');
+
+  const formatField = useMemo(() => {
+    if (!personAttributeType || isLoading) {
+      return <TextInputSkeleton />;
+    }
+
+    switch (personAttributeType.format) {
+      case 'java.lang.String':
+        return (
+          <Controller
+            name={`attributes.${field.name}`}
+            control={control}
+            defaultValue=""
+            render={({ field: { onChange, value } }) => (
+              <TextInput
+                id={field.name}
+                labelText={t(personAttributeType.display)}
+                value={value || ''}
+                onChange={(e) => onChange(e.target.value)}
+                placeholder={field.placeholder}
+                size={isTablet ? 'lg' : 'md'}
+              />
+            )}
+          />
+        );
+
+      case 'org.openmrs.Concept':
+        return (
+          <ConceptAttributeField
+            field={field}
+            control={control}
+            isTablet={isTablet}
+            attributeDisplay={personAttributeType.display}
+          />
+        );
+
+      case 'org.openmrs.Location':
+        return (
+          <LocationAttributeField
+            field={field}
+            control={control}
+            isTablet={isTablet}
+            attributeDisplay={personAttributeType.display}
+          />
+        );
+
+      default:
+        return (
+          <InlineNotification kind="error" title={t('error', 'Error')}>
+            {t('unsupportedAttributeFormat', 'Unsupported attribute format: {{format}}', {
+              format: personAttributeType.format,
+            })}
+          </InlineNotification>
+        );
+    }
+  }, [personAttributeType, isLoading, field, control, t, isTablet]);
+
+  if (error) {
+    return (
+      <InlineNotification kind="error" title={t('error', 'Error')}>
+        {t('errorLoadingAttribute', 'Error loading attribute type {{attributeUuid}}', {
+          attributeUuid: field.attributeTypeUuid,
+        })}
+      </InlineNotification>
+    );
+  }
+
+  return formatField;
+}
+
+interface ConceptAttributeFieldProps {
+  field: SearchFieldConfig;
+  control: Control<AdvancedPatientSearchState>;
+  isTablet: boolean;
+  attributeDisplay: string;
+}
+
+const ConceptAttributeField: React.FC<ConceptAttributeFieldProps> = ({
+  field,
+  control,
+  isTablet,
+  attributeDisplay,
+}) => {
+  const { t } = useTranslation();
+  const { configuredConceptAnswers, isLoadingConfiguredAnswers } = useConfiguredAnswerConcepts(
+    field.conceptAnswersUuids ?? [],
+  );
+  const { conceptAnswers, isLoadingConceptAnswers, errorFetchingConceptAnswers } = useAttributeConceptAnswers(
+    field.conceptAnswersUuids?.length ? '' : field.answerConceptSetUuid,
+  );
+
+  const items = useMemo(() => {
+    if (isLoadingConceptAnswers || isLoadingConfiguredAnswers) return [];
+    if (field.conceptAnswersUuids?.length) return configuredConceptAnswers || [];
+    return conceptAnswers || [];
+  }, [
+    isLoadingConceptAnswers,
+    isLoadingConfiguredAnswers,
+    field.conceptAnswersUuids,
+    configuredConceptAnswers,
+    conceptAnswers,
+  ]);
+
+  if (isLoadingConceptAnswers || isLoadingConfiguredAnswers) {
+    return <TextInputSkeleton />;
+  }
+
+  if (errorFetchingConceptAnswers) {
+    return (
+      <InlineNotification kind="error" title={t('error', 'Error')}>
+        {t('errorLoadingConceptAttributeAnswers', 'Error loading concept attribute answers')}
+      </InlineNotification>
+    );
+  }
+
+  return (
+    <Controller
+      name={`attributes.${field.name}`}
+      control={control}
+      defaultValue=""
+      render={({ field: { onChange, value } }) => (
+        <ComboBox
+          id={field.name}
+          titleText={t(attributeDisplay)}
+          items={items}
+          itemToString={(item: OpenmrsResource) => item?.display}
+          selectedItem={items.sort((a, b) => a.display.localeCompare(b.display)).find((item) => item.uuid === value)}
+          onChange={({ selectedItem }) => onChange(selectedItem?.uuid)}
+          placeholder={t('selectOption', 'Select an option')}
+          size={isTablet ? 'lg' : 'md'}
+        />
+      )}
+    />
+  );
+};
+
+interface LocationAttributeFieldProps {
+  field: SearchFieldConfig;
+  control: Control<AdvancedPatientSearchState>;
+  isTablet: boolean;
+  attributeDisplay: string;
+}
+
+const LocationAttributeField: React.FC<LocationAttributeFieldProps> = ({
+  field,
+  control,
+  isTablet,
+  attributeDisplay,
+}) => {
+  const { t } = useTranslation();
+  const [searchQuery, setSearchQuery] = useState<string>('');
+  const { locations, isLoading, loadingNewData, error } = useLocations(field.locationTag || null, searchQuery);
+  const prevLocationOptions = useRef([]);
+
+  const locationOptions = useMemo(() => {
+    if (!(isLoading && loadingNewData)) {
+      const newOptions = locations.map(({ resource }) => ({
+        value: resource.id,
+        label: resource.name,
+      }));
+      prevLocationOptions.current = newOptions;
+      return newOptions;
+    }
+    return prevLocationOptions.current;
+  }, [locations, isLoading, loadingNewData]);
+
+  if (error) {
+    return (
+      <InlineNotification kind="error" title={t('error', 'Error')}>
+        {t('errorLoadingLocationsForAttribute', 'Error loading locations for person attribute {{attributeName}}', {
+          attributeName: attributeDisplay,
+        })}
+      </InlineNotification>
+    );
+  }
+
+  return (
+    <div className={styles.locationAttributeFieldContainer}>
+      <Controller
+        name={`attributes.${field.name}`}
+        control={control}
+        defaultValue=""
+        render={({ field: { onChange, value } }) => (
+          <ComboBox
+            id={field.name}
+            titleText={t(attributeDisplay)}
+            items={locationOptions}
+            selectedItem={locationOptions.find((option) => option.value === value)}
+            onChange={({ selectedItem }) => onChange(selectedItem?.value)}
+            onInputChange={(inputValue) => {
+              if (inputValue && !locationOptions.find(({ label }) => label === inputValue)) {
+                setSearchQuery(inputValue);
+                onChange('');
+              }
+            }}
+            placeholder={t('searchLocationPersonAttribute', 'Search location')}
+            size={isTablet ? 'lg' : 'md'}
+            typeahead
+          />
+        )}
+      />
+      {loadingNewData && (
+        <div className={styles.loadingContainer}>
+          <InlineLoading />
+        </div>
+      )}
+    </div>
+  );
+};
diff --git a/packages/esm-patient-search-app/src/patient-search-page/refine-search/person-attribute-field.test.tsx b/packages/esm-patient-search-app/src/patient-search-page/refine-search/person-attribute-field.test.tsx
new file mode 100644
index 000000000..843840a15
--- /dev/null
+++ b/packages/esm-patient-search-app/src/patient-search-page/refine-search/person-attribute-field.test.tsx
@@ -0,0 +1,273 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { PersonAttributeField, type PersonAttributeFieldProps } from './person-attribute-field.component';
+import {
+  useAttributeConceptAnswers,
+  useConfiguredAnswerConcepts,
+  useLocations,
+  usePersonAttributeType,
+} from './person-attributes.resource';
+import {
+  type AdvancedPatientSearchState,
+  type LocationEntry,
+  type PersonAttributeTypeResponse,
+  type SearchFieldConfig,
+} from '../../types';
+import { useForm } from 'react-hook-form';
+
+jest.mock('react-hook-form', () => ({
+  ...jest.requireActual('react-hook-form'),
+  useForm: jest.fn().mockReturnValue({
+    handleSubmit: jest.fn(),
+    control: {
+      register: jest.fn(),
+      unregister: jest.fn(),
+      getFieldState: jest.fn(),
+      _names: {
+        array: new Set(['test']),
+        mount: new Set(['test']),
+        unMount: new Set(['test']),
+        watch: new Set(['test']),
+        focus: 'test',
+        watchAll: false,
+      },
+      _subjects: {
+        watch: jest.fn(),
+        array: jest.fn(),
+        state: jest.fn(),
+      },
+      _getWatch: jest.fn(),
+      _formValues: {},
+      _defaultValues: {},
+    },
+    getValues: jest.fn((str) => (str === 'recurringPatternDaysOfWeek' ? [] : null)),
+    setValue: jest.fn(),
+    formState: { errors: {} },
+    watch: jest.fn(),
+  }),
+  Controller: ({ render }) =>
+    render({
+      field: {
+        onChange: jest.fn(),
+        onBlur: jest.fn(),
+        value: '',
+        name: 'test',
+        ref: jest.fn(),
+      },
+      formState: {
+        isSubmitted: false,
+        errors: {},
+      },
+      fieldState: {
+        isTouched: false,
+        error: undefined,
+      },
+    }),
+}));
+
+jest.mock('./person-attributes.resource', () => ({
+  usePersonAttributeType: jest.fn(),
+  useAttributeConceptAnswers: jest.fn(),
+  useConfiguredAnswerConcepts: jest.fn(),
+  useLocations: jest.fn(),
+}));
+
+const mockUsePersonAttributeType = jest.mocked(usePersonAttributeType);
+const mockUseAttributeConceptAnswers = jest.mocked(useAttributeConceptAnswers);
+const mockUseConfiguredAnswerConcepts = jest.mocked(useConfiguredAnswerConcepts);
+const mockUseLocations = jest.mocked(useLocations);
+
+describe('PersonAttributeField', () => {
+  const user = userEvent.setup();
+
+  const defaultProps: PersonAttributeFieldProps = {
+    field: {
+      name: 'testAttribute',
+      type: 'personAttribute',
+      label: 'Test Attribute',
+      attributeTypeUuid: 'test-uuid',
+    } as SearchFieldConfig,
+    inTabletOrOverlay: false,
+    isTablet: false,
+    control: useForm<AdvancedPatientSearchState>().control,
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('String Attribute Type', () => {
+    beforeEach(() => {
+      mockUsePersonAttributeType.mockReturnValue({
+        data: { format: 'java.lang.String', display: 'Test String Attribute' } as PersonAttributeTypeResponse,
+        isLoading: false,
+        error: null,
+      });
+    });
+
+    it('renders text input for string attribute type', () => {
+      render(<PersonAttributeField {...defaultProps} />);
+      expect(screen.getByLabelText('Test String Attribute')).toBeInTheDocument();
+      expect(screen.getByRole('textbox')).toBeInTheDocument();
+    });
+  });
+
+  describe('Concept Attribute Type', () => {
+    beforeEach(() => {
+      mockUsePersonAttributeType.mockReturnValue({
+        data: { format: 'org.openmrs.Concept', display: 'Test Concept Attribute' } as PersonAttributeTypeResponse,
+        isLoading: false,
+        error: null,
+      });
+
+      mockUseConfiguredAnswerConcepts.mockReturnValue({
+        configuredConceptAnswers: [],
+        isLoadingConfiguredAnswers: false,
+      });
+
+      mockUseAttributeConceptAnswers.mockReturnValue({
+        conceptAnswers: [
+          { uuid: 'concept-answer-uuid-1', display: 'concept-answer-1' },
+          { uuid: 'concept-answer-uuid-2', display: 'concept-answer-2' },
+        ],
+        isLoadingConceptAnswers: false,
+        errorFetchingConceptAnswers: null,
+      });
+    });
+
+    it('renders a combobox for concept attribute type', async () => {
+      render(<PersonAttributeField {...defaultProps} />);
+      const combobox = screen.getByRole('combobox');
+
+      expect(combobox).toBeInTheDocument();
+      expect(screen.getByText('Test Concept Attribute')).toBeInTheDocument();
+      await user.click(combobox);
+      expect(screen.getByText('concept-answer-1')).toBeInTheDocument();
+      expect(screen.getByText('concept-answer-2')).toBeInTheDocument();
+    });
+
+    it('handles custom concept answers', async () => {
+      mockUsePersonAttributeType.mockReturnValue({
+        data: {
+          format: 'org.openmrs.Concept',
+          display: 'Test Concept Attribute',
+        } as PersonAttributeTypeResponse,
+        isLoading: false,
+        error: null,
+      });
+
+      mockUseConfiguredAnswerConcepts.mockReturnValue({
+        configuredConceptAnswers: [
+          { uuid: 'concept-answer-1-uuid', display: 'concept-answer-1' },
+          { uuid: 'concept-answer-2-uuid', display: 'concept-answer-2' },
+        ],
+        isLoadingConfiguredAnswers: false,
+      });
+
+      const propsWithCustomConcepts: PersonAttributeFieldProps = {
+        ...defaultProps,
+        field: {
+          ...defaultProps.field,
+          answerConceptSetUuid: 'test-concept-set-uuid',
+          conceptAnswersUuids: ['concept-answer-1-uuid', 'concept-answer-2-uuid'],
+        },
+      };
+
+      render(<PersonAttributeField {...propsWithCustomConcepts} />);
+      const combobox = screen.getByRole('combobox');
+      await user.click(combobox);
+      expect(screen.getByText('concept-answer-1')).toBeInTheDocument();
+      expect(screen.getByText('concept-answer-2')).toBeInTheDocument();
+    });
+
+    it('handles concept selection', async () => {
+      mockUsePersonAttributeType.mockReturnValue({
+        data: {
+          format: 'org.openmrs.Concept',
+          display: 'Test Concept Attribute',
+        } as PersonAttributeTypeResponse,
+        isLoading: false,
+        error: null,
+      });
+      mockUseConfiguredAnswerConcepts.mockReturnValue({
+        configuredConceptAnswers: [
+          { uuid: 'concept-answer-1-uuid', display: 'concept-answer-1' },
+          { uuid: 'concept-answer-2-uuid', display: 'concept-answer-2' },
+        ],
+        isLoadingConfiguredAnswers: false,
+      });
+      const propsWithAnswerConceptUuidAndCustomAnswers: PersonAttributeFieldProps = {
+        ...defaultProps,
+        field: {
+          ...defaultProps.field,
+          answerConceptSetUuid: 'test-concept-set-uuid',
+          conceptAnswersUuids: ['concept-answer-1-uuid', 'concept-answer-2-uuid'],
+        },
+      };
+
+      render(<PersonAttributeField {...propsWithAnswerConceptUuidAndCustomAnswers} />);
+
+      const combobox = screen.getByRole('combobox');
+      await user.click(combobox);
+      expect(screen.getByText('concept-answer-1')).toBeInTheDocument();
+      expect(screen.getByText('concept-answer-2')).toBeInTheDocument();
+    });
+  });
+
+  describe('Location Attribute Type', () => {
+    beforeEach(() => {
+      mockUsePersonAttributeType.mockReturnValue({
+        data: { format: 'org.openmrs.Location', display: 'Test Location Attribute' } as PersonAttributeTypeResponse,
+        isLoading: false,
+        error: null,
+      });
+      mockUseLocations.mockReturnValue({
+        locations: [
+          { resource: { id: 'location-1-uuid', name: 'Location 1' } },
+          { resource: { id: 'location-2-uuid', name: 'Location 2' } },
+        ] as LocationEntry[],
+        isLoading: false,
+        loadingNewData: false,
+        error: undefined,
+      });
+    });
+
+    it('renders location combobox', () => {
+      render(<PersonAttributeField {...defaultProps} />);
+      expect(screen.getByRole('combobox')).toBeInTheDocument();
+      expect(screen.getByText('Test Location Attribute')).toBeInTheDocument();
+    });
+
+    it('handles location search input', async () => {
+      render(<PersonAttributeField {...defaultProps} />);
+      const combobox = screen.getByRole('combobox');
+      await user.type(combobox, 'Loc');
+      expect(mockUseLocations).toHaveBeenCalledWith(null, 'Loc');
+    });
+  });
+
+  describe('Error Handling', () => {
+    it('shows an error notification when loading attribute type fails', () => {
+      mockUsePersonAttributeType.mockReturnValue({
+        data: null,
+        isLoading: false,
+        error: new Error('Failed to load attribute type'),
+      });
+      render(<PersonAttributeField {...defaultProps} />);
+      expect(screen.getByText('Error loading attribute type test-uuid')).toBeInTheDocument();
+    });
+  });
+
+  describe('Unsupported Attribute Format', () => {
+    it('shows an error for unsupported formats', () => {
+      mockUsePersonAttributeType.mockReturnValue({
+        data: { format: 'unsupported.format', display: 'Unsupported Attribute' } as PersonAttributeTypeResponse,
+        isLoading: false,
+        error: null,
+      });
+      render(<PersonAttributeField {...defaultProps} />);
+      expect(screen.getByText('Unsupported attribute format: unsupported.format')).toBeInTheDocument();
+    });
+  });
+});
diff --git a/packages/esm-patient-search-app/src/patient-search-page/refine-search/person-attributes.resource.ts b/packages/esm-patient-search-app/src/patient-search-page/refine-search/person-attributes.resource.ts
new file mode 100644
index 000000000..c11279d72
--- /dev/null
+++ b/packages/esm-patient-search-app/src/patient-search-page/refine-search/person-attributes.resource.ts
@@ -0,0 +1,144 @@
+import useSWRImmutable from 'swr/immutable';
+import {
+  type FetchResponse,
+  fhirBaseUrl,
+  openmrsFetch,
+  type OpenmrsResource,
+  restBaseUrl,
+  useDebounce,
+} from '@openmrs/esm-framework';
+import { useEffect, useMemo } from 'react';
+import useSWR from 'swr';
+import {
+  type ConceptResponse,
+  type LocationEntry,
+  type LocationResponse,
+  type PersonAttributeTypeResponse,
+} from '../../types';
+
+export function useAttributeConceptAnswers(conceptUuid: string | undefined): {
+  conceptAnswers: Array<OpenmrsResource>;
+  isLoadingConceptAnswers: boolean;
+  errorFetchingConceptAnswers: Error | undefined;
+} {
+  const shouldFetch = Boolean(conceptUuid);
+
+  const { data, error, isLoading } = useSWRImmutable<FetchResponse<ConceptResponse>, Error>(
+    shouldFetch ? `${restBaseUrl}/concept/${conceptUuid}` : null,
+    openmrsFetch,
+  );
+
+  useEffect(() => {
+    if (error) {
+      console.error(`Error loading concept answers for conceptUuid: ${conceptUuid}`, error);
+    }
+  }, [conceptUuid, error]);
+
+  const conceptAnswers = useMemo(() => {
+    if (!data?.data) {
+      return [];
+    }
+    return data.data.answers?.length > 0 ? data.data.answers : data.data.setMembers ?? [];
+  }, [data]);
+
+  return {
+    conceptAnswers,
+    isLoadingConceptAnswers: isLoading,
+    errorFetchingConceptAnswers: error,
+  };
+}
+
+export function useLocations(
+  locationTag: string | null,
+  searchQuery: string = '',
+): {
+  locations: Array<LocationEntry>;
+  isLoading: boolean;
+  loadingNewData: boolean;
+  error: any;
+} {
+  const debouncedQuery = useDebounce(searchQuery);
+
+  const constructUrl = useMemo(() => {
+    let url = `${fhirBaseUrl}/Location?`;
+    let urlSearchParameters = new URLSearchParams();
+    urlSearchParameters.append('_summary', 'data');
+
+    if (!debouncedQuery) {
+      urlSearchParameters.append('_count', '10');
+    }
+
+    if (locationTag) {
+      urlSearchParameters.append('_tag', locationTag);
+    }
+
+    if (typeof debouncedQuery === 'string' && debouncedQuery != '') {
+      urlSearchParameters.append('name:contains', debouncedQuery);
+    }
+
+    return url + urlSearchParameters.toString();
+  }, [locationTag, debouncedQuery]);
+
+  const { data, error, isLoading, isValidating } = useSWR<FetchResponse<LocationResponse>, Error>(
+    constructUrl,
+    openmrsFetch,
+  );
+
+  return useMemo(
+    () => ({
+      locations: data?.data?.entry || [],
+      isLoading,
+      loadingNewData: isValidating,
+      error,
+    }),
+    [data?.data?.entry, error, isLoading, isValidating],
+  );
+}
+
+export function usePersonAttributeType(personAttributeTypeUuid: string): {
+  data: PersonAttributeTypeResponse | undefined;
+  isLoading: boolean;
+  error: any;
+} {
+  const { data, error, isLoading } = useSWRImmutable<FetchResponse<PersonAttributeTypeResponse>>(
+    `${restBaseUrl}/personattributetype/${personAttributeTypeUuid}`,
+    openmrsFetch,
+  );
+
+  return useMemo(
+    () => ({
+      data: data?.data,
+      isLoading,
+      error,
+    }),
+    [data, isLoading, error],
+  );
+}
+
+export function useConfiguredAnswerConcepts(uuids: Array<string>): {
+  configuredConceptAnswers: Array<OpenmrsResource>;
+  isLoadingConfiguredAnswers: boolean;
+} {
+  const fetchConcept = async (uuid: string): Promise<OpenmrsResource | null> => {
+    try {
+      const response = await openmrsFetch(`${restBaseUrl}/concept/${uuid}?v=custom:(uuid,display)`);
+      return response?.data;
+    } catch (error) {
+      console.error(`Error fetching concept for UUID: ${uuid}`, error);
+      return null;
+    }
+  };
+
+  const { data, isLoading } = useSWR(uuids.length > 0 ? ['answer-concepts', uuids] : null, async () => {
+    const results = await Promise.all(uuids.map(fetchConcept));
+    return results.filter((concept) => concept !== null);
+  });
+
+  return useMemo(
+    () => ({
+      configuredConceptAnswers: data ?? [],
+      isLoadingConfiguredAnswers: isLoading,
+    }),
+    [data, isLoading],
+  );
+}
diff --git a/packages/esm-patient-search-app/src/patient-search-page/refine-search/refine-search-tablet.component.tsx b/packages/esm-patient-search-app/src/patient-search-page/refine-search/refine-search-tablet.component.tsx
new file mode 100644
index 000000000..243372c67
--- /dev/null
+++ b/packages/esm-patient-search-app/src/patient-search-page/refine-search/refine-search-tablet.component.tsx
@@ -0,0 +1,161 @@
+import React, { useMemo } from 'react';
+import classNames from 'classnames';
+import { useTranslation } from 'react-i18next';
+import { Button } from '@carbon/react';
+import { ChevronDownIcon, ChevronUpIcon } from '@openmrs/esm-framework';
+import { type Control } from 'react-hook-form';
+import { type AdvancedPatientSearchState, type SearchFieldConfig, type SearchFieldType } from '../../types';
+import {
+  type BuiltInFieldConfig,
+  type PatientSearchConfig,
+  type PersonAttributeFieldConfig,
+} from '../../config-schema';
+import { SearchField } from './search-field.component';
+import styles from './refine-search-tablet.scss';
+
+interface RefineSearchTabletProps {
+  showRefineSearchDialog: boolean;
+  filtersApplied: number;
+  control: Control<AdvancedPatientSearchState>;
+  config: PatientSearchConfig;
+  isTablet: boolean;
+  onResetFields: () => void;
+  onToggleDialog: () => void;
+  onSubmit: (evt: React.FormEvent) => void;
+}
+
+export const RefineSearchTablet: React.FC<RefineSearchTabletProps> = ({
+  showRefineSearchDialog,
+  filtersApplied,
+  control,
+  config,
+  isTablet,
+  onResetFields,
+  onToggleDialog,
+  onSubmit,
+}) => {
+  const { t } = useTranslation();
+
+  const renderSearchFields = useMemo(() => {
+    const fields: Array<SearchFieldConfig> = [];
+
+    Object.entries(config.search.searchFilterFields).forEach(([fieldName, fieldConfig]) => {
+      if (fieldName !== 'personAttributes' && (fieldConfig as BuiltInFieldConfig).enabled) {
+        fields.push({
+          name: fieldName,
+          type: fieldName as SearchFieldType,
+        });
+      }
+    });
+
+    config.search.searchFilterFields.personAttributes?.forEach((attribute: PersonAttributeFieldConfig) => {
+      fields.push({
+        name: attribute.attributeTypeUuid,
+        type: 'personAttribute',
+        ...attribute,
+      });
+    });
+
+    const genderField = fields.find((field) => field.type === 'gender');
+    const dobField = fields.find((field) => field.type === 'dateOfBirth');
+    const otherFields = fields.filter((field) => !['gender', 'dateOfBirth'].includes(field.type));
+
+    const otherFieldsRows = otherFields
+      .reduce((rows, field, index) => {
+        const rowIndex = Math.floor(index / 3);
+        rows[rowIndex] = rows[rowIndex] || [];
+        rows[rowIndex].push(field);
+        return rows;
+      }, [] as SearchFieldConfig[][])
+      .map((row, index) => (
+        <div key={index} className={styles.otherFieldsRow}>
+          {row.map((field) => (
+            <div key={field.name} className={styles.fieldTabletOrOverlay}>
+              <SearchField field={field} control={control} inTabletOrOverlay={true} isTablet={isTablet} />
+            </div>
+          ))}
+        </div>
+      ));
+
+    return (
+      <>
+        {Boolean(genderField || dobField) && (
+          <div className={classNames(styles.padded, styles.refineSearchDialogGenderSexRow)}>
+            {genderField && (
+              <div className={styles.fieldTabletOrOverlay}>
+                <SearchField field={genderField} control={control} inTabletOrOverlay={true} isTablet={isTablet} />
+              </div>
+            )}
+            {dobField && (
+              <div className={styles.fieldTabletOrOverlay}>
+                <SearchField field={dobField} control={control} inTabletOrOverlay={true} isTablet={isTablet} />
+              </div>
+            )}
+          </div>
+        )}
+        {otherFields.length > 0 && (
+          <div className={classNames(styles.padded, styles.otherFieldsContainer)}>{otherFieldsRows}</div>
+        )}
+      </>
+    );
+  }, [config, control, isTablet]);
+
+  return (
+    <>
+      <div className={styles.refineSearchBanner}>
+        {!filtersApplied ? (
+          <p className={styles.bodyShort01}>
+            {t('refineSearchTabletBannerText', "Can't find who you're looking for?")}
+          </p>
+        ) : (
+          <div className={styles.refineSearchBannerFilterInfo}>
+            <span className={classNames(styles.filtersAppliedCount, styles.bodyShort01)}>{filtersApplied}</span>{' '}
+            <p className={styles.bodyShort01}>{t('filtersAppliedText', 'search queries added')}</p>
+            <Button kind="ghost" onClick={onResetFields} className={styles.refineSearchDialogOpener} size="sm">
+              {t('clear', 'Clear')}
+            </Button>
+          </div>
+        )}
+        <Button
+          kind="ghost"
+          onClick={onToggleDialog}
+          renderIcon={!showRefineSearchDialog ? ChevronUpIcon : ChevronDownIcon}
+          className={styles.refineSearchDialogOpener}
+          size="sm">
+          {t('refineSearch', 'Refine search')}
+        </Button>
+      </div>
+      {showRefineSearchDialog && (
+        <div className={styles.refineSearchDialogContainer}>
+          <div className={styles.refineSearchDialog}>
+            <div className={styles.refineSearchDialogHeader}>
+              <p className={styles.bodyShort01}>{t('refineSearchHeaderText', 'Add additional search criteria')}</p>
+              <Button
+                kind="ghost"
+                onClick={onToggleDialog}
+                renderIcon={ChevronDownIcon}
+                className={styles.refineSearchDialogOpener}
+                size="sm">
+                {t('refineSearch', 'Refine search')}
+              </Button>
+            </div>
+            <form onSubmit={onSubmit} role="refine-search-tablet">
+              {renderSearchFields}
+              <div className={classNames(styles.buttonSet, styles.paddedButtons)}>
+                <Button kind="secondary" size="xl" onClick={onResetFields} className={styles.button}>
+                  {t('resetFields', 'Reset fields')}
+                </Button>
+                <Button type="submit" kind="primary" size="xl" className={styles.button}>
+                  {t('apply', 'Apply')}{' '}
+                  {filtersApplied
+                    ? `(${t('countOfFiltersApplied', '{{count}} filters applied', { count: filtersApplied })})`
+                    : null}
+                </Button>
+              </div>
+            </form>
+          </div>
+        </div>
+      )}
+    </>
+  );
+};
diff --git a/packages/esm-patient-search-app/src/patient-search-page/refine-search.scss b/packages/esm-patient-search-app/src/patient-search-page/refine-search/refine-search-tablet.scss
similarity index 63%
rename from packages/esm-patient-search-app/src/patient-search-page/refine-search.scss
rename to packages/esm-patient-search-app/src/patient-search-page/refine-search/refine-search-tablet.scss
index cb18a8b5e..a92393428 100644
--- a/packages/esm-patient-search-app/src/patient-search-page/refine-search.scss
+++ b/packages/esm-patient-search-app/src/patient-search-page/refine-search/refine-search-tablet.scss
@@ -1,43 +1,6 @@
 @use '@carbon/layout';
 @use '@carbon/type';
-@use '@openmrs/esm-styleguide/src/vars' as *;
-
-.refineSearchContainer {
-  h2 {
-    margin: layout.$spacing-03 0;
-  }
-}
-
-.field {
-  margin-bottom: layout.$spacing-05;
-
-  input {
-    min-width: unset !important;
-  }
-}
-
-.fieldTabletOrOverlay {
-  margin-bottom: layout.$spacing-07;
-
-  input {
-    min-width: unset !important;
-  }
-}
-
-.dobFields {
-  display: grid;
-  grid-template-columns: 1fr 1fr 1.25fr;
-  grid-gap: layout.$spacing-03;
-  input {
-    min-width: unset !important;
-    padding-right: layout.$spacing-02 !important;
-  }
-}
-
-.button {
-  width: 100%;
-  max-width: unset;
-}
+@use '~@openmrs/esm-styleguide/src/vars' as *;
 
 .refineSearchBanner {
   padding: layout.$spacing-03 layout.$spacing-05;
@@ -51,12 +14,15 @@
   }
 }
 
-.padded {
-  padding: 0 layout.$spacing-05;
-}
+.refineSearchBannerFilterInfo {
+  display: flex;
+  justify-items: center;
+  align-items: center;
+  color: $ui-02;
 
-.refineSearchDialogOpener {
-  color: $inverse-link;
+  p {
+    margin-left: layout.$spacing-03;
+  }
 }
 
 .refineSearchDialogContainer {
@@ -85,6 +51,10 @@
   margin-bottom: layout.$spacing-05;
 }
 
+.padded {
+  padding: 0 layout.$spacing-05;
+}
+
 .refineSearchDialogGenderSexRow {
   display: grid;
   grid-template-columns: 1.25fr 1fr;
@@ -92,21 +62,28 @@
   padding: 0 layout.$spacing-05;
 }
 
-.labelText {
-  margin-bottom: layout.$spacing-03;
+.otherFieldsContainer {
+  display: flex;
+  flex-direction: column;
+  gap: layout.$spacing-05;
 }
 
-.phoneLastVisitRow {
+.otherFieldsRow {
   display: grid;
-  grid-template-columns: 1fr auto;
-  grid-gap: layout.$spacing-11;
-  padding: 0 layout.$spacing-05;
-}
+  grid-template-columns: repeat(auto-fit, minmax(0, 1fr));
+  gap: layout.$spacing-05;
 
-.phonePostcode {
-  display: grid;
-  grid-template-columns: 1.5fr 1fr;
-  grid-gap: layout.$spacing-05;
+  &:has(:only-child) {
+    grid-template-columns: 1fr;
+  }
+
+  &:has(:nth-child(2)):not(:has(:nth-child(3))) {
+    grid-template-columns: repeat(2, 1fr);
+  }
+
+  &:has(:nth-child(3)) {
+    grid-template-columns: repeat(3, 1fr);
+  }
 }
 
 .buttonSet {
@@ -119,31 +96,21 @@
   margin: layout.$spacing-07 layout.$spacing-05;
 }
 
-.filtersAppliedCount {
-  padding: 0 layout.$spacing-03;
-  background-color: $color-blue-60-2;
-  color: $ui-01;
-}
-
-.refineSearchBannerFilterInfo {
-  display: flex;
-  justify-items: center;
-  align-items: center;
-  color: $ui-02;
-
-  p {
-    margin-left: layout.$spacing-03;
-  }
+.button {
+  width: 100%;
+  max-width: unset;
 }
 
 .bodyShort01 {
   @include type.type-style('body-compact-01');
 }
 
-.label01 {
-  @include type.type-style('label-01');
+.filtersAppliedCount {
+  padding: 0 layout.$spacing-03;
+  background-color: $color-blue-60-2;
+  color: $ui-01;
 }
 
-.productiveHeading02 {
-  @include type.type-style('heading-compact-02');
+.refineSearchDialogOpener {
+  color: $inverse-link;
 }
diff --git a/packages/esm-patient-search-app/src/patient-search-page/refine-search/refine-search.component.tsx b/packages/esm-patient-search-app/src/patient-search-page/refine-search/refine-search.component.tsx
new file mode 100644
index 000000000..5a35f1328
--- /dev/null
+++ b/packages/esm-patient-search-app/src/patient-search-page/refine-search/refine-search.component.tsx
@@ -0,0 +1,153 @@
+import React, { useCallback, useMemo, useState } from 'react';
+import classNames from 'classnames';
+import { useTranslation } from 'react-i18next';
+import { Button, Layer } from '@carbon/react';
+import { useForm } from 'react-hook-form';
+import { type AdvancedPatientSearchState, type SearchFieldConfig, type SearchFieldType } from '../../types';
+import { useConfig, useLayoutType } from '@openmrs/esm-framework';
+import {
+  type BuiltInFieldConfig,
+  type PatientSearchConfig,
+  type PersonAttributeFieldConfig,
+} from '../../config-schema';
+import { RefineSearchTablet } from './refine-search-tablet.component';
+import styles from './refine-search.scss';
+import { SearchField } from './search-field.component';
+
+export const initialFilters: AdvancedPatientSearchState = {
+  gender: 'any',
+  dateOfBirth: 0,
+  monthOfBirth: 0,
+  yearOfBirth: 0,
+  postcode: '',
+  age: 0,
+  attributes: {},
+};
+
+interface RefineSearchProps {
+  inTabletOrOverlay: boolean;
+  setFilters: React.Dispatch<React.SetStateAction<AdvancedPatientSearchState>>;
+  filtersApplied: number;
+}
+
+const RefineSearch: React.FC<RefineSearchProps> = ({ setFilters, inTabletOrOverlay, filtersApplied }) => {
+  const [showRefineSearchDialog, setShowRefineSearchDialog] = useState(false);
+  const { t } = useTranslation();
+  const isTablet = useLayoutType() === 'tablet';
+  const config = useConfig<PatientSearchConfig>();
+
+  const { control, handleSubmit, reset, formState } = useForm<AdvancedPatientSearchState>({
+    defaultValues: {
+      gender: 'any',
+      dateOfBirth: 0,
+      monthOfBirth: 0,
+      yearOfBirth: 0,
+      age: 0,
+      postcode: '',
+      attributes: {},
+    },
+  });
+
+  const onSubmit = useCallback(
+    (data: AdvancedPatientSearchState) => {
+      const cleanedAttributes = Object.entries(data.attributes || {}).reduce(
+        (acc, [key, value]) => {
+          if (value) {
+            acc[key] = value;
+          }
+          return acc;
+        },
+        {} as Record<string, string>,
+      );
+
+      const cleanedData = {
+        ...data,
+        attributes: cleanedAttributes,
+      };
+
+      setFilters(cleanedData);
+      setShowRefineSearchDialog(false);
+    },
+    [setFilters],
+  );
+  const handleResetFields = useCallback(() => {
+    reset({ ...initialFilters, attributes: {} });
+    setFilters(initialFilters);
+    setShowRefineSearchDialog(false);
+  }, [reset, setFilters]);
+
+  const toggleShowRefineSearchDialog = useCallback(() => {
+    setShowRefineSearchDialog((prevState) => !prevState);
+  }, []);
+
+  const renderSearchFields = useMemo(() => {
+    const fields: Array<SearchFieldConfig> = [];
+
+    Object.entries(config.search.searchFilterFields).forEach(([fieldName, fieldConfig]) => {
+      if (fieldName !== 'personAttributes' && (fieldConfig as BuiltInFieldConfig).enabled) {
+        fields.push({
+          name: fieldName,
+          type: fieldName as SearchFieldType,
+        });
+      }
+    });
+
+    config.search.searchFilterFields.personAttributes?.forEach((attribute: PersonAttributeFieldConfig) => {
+      fields.push({
+        name: attribute.attributeTypeUuid,
+        type: 'personAttribute',
+        ...attribute,
+      });
+    });
+
+    return fields.map((field) => (
+      <Layer key={field.name}>
+        <div className={styles.field}>
+          <SearchField field={field} control={control} inTabletOrOverlay={inTabletOrOverlay} isTablet={isTablet} />
+        </div>
+      </Layer>
+    ));
+  }, [config, inTabletOrOverlay, isTablet, control]);
+
+  if (inTabletOrOverlay) {
+    return (
+      <RefineSearchTablet
+        showRefineSearchDialog={showRefineSearchDialog}
+        filtersApplied={filtersApplied}
+        control={control}
+        config={config}
+        isTablet={isTablet}
+        onResetFields={handleResetFields}
+        onToggleDialog={toggleShowRefineSearchDialog}
+        onSubmit={handleSubmit(onSubmit)}
+      />
+    );
+  }
+
+  return (
+    <form
+      onSubmit={handleSubmit(onSubmit)}
+      className={styles.refineSearchContainer}
+      data-openmrs-role="Refine Search"
+      role="refine-search">
+      <h2 className={styles.productiveHeading02}>{t('refineSearch', 'Refine search')}</h2>
+      {renderSearchFields}
+      <hr className={classNames(styles.field, styles.horizontalDivider)} />
+      <Button type="submit" kind="primary" size="md" className={classNames(styles.field, styles.button)}>
+        {t('apply', 'Apply')}{' '}
+        {filtersApplied
+          ? `(${t('countOfFiltersApplied', '{{count}} filters applied', { count: filtersApplied })})`
+          : null}
+      </Button>
+      <Button
+        kind="secondary"
+        size="md"
+        onClick={handleResetFields}
+        className={classNames(styles.field, styles.button)}>
+        {t('resetFields', 'Reset fields')}
+      </Button>
+    </form>
+  );
+};
+
+export default RefineSearch;
diff --git a/packages/esm-patient-search-app/src/patient-search-page/refine-search/refine-search.scss b/packages/esm-patient-search-app/src/patient-search-page/refine-search/refine-search.scss
new file mode 100644
index 000000000..067244755
--- /dev/null
+++ b/packages/esm-patient-search-app/src/patient-search-page/refine-search/refine-search.scss
@@ -0,0 +1,25 @@
+@use '@carbon/layout';
+@use '@carbon/type';
+
+.refineSearchContainer {
+  h2 {
+    margin: layout.$spacing-03 0;
+  }
+}
+
+.field {
+  margin-bottom: layout.$spacing-05;
+
+  input {
+    min-width: unset !important;
+  }
+}
+
+.button {
+  width: 100%;
+  max-width: unset;
+}
+
+.productiveHeading02 {
+  @include type.type-style('heading-compact-02');
+}
diff --git a/packages/esm-patient-search-app/src/patient-search-page/refine-search/refine-search.test.tsx b/packages/esm-patient-search-app/src/patient-search-page/refine-search/refine-search.test.tsx
new file mode 100644
index 000000000..17d7660a0
--- /dev/null
+++ b/packages/esm-patient-search-app/src/patient-search-page/refine-search/refine-search.test.tsx
@@ -0,0 +1,191 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { useConfig, useLayoutType } from '@openmrs/esm-framework';
+import RefineSearch from './refine-search.component';
+import { type PatientSearchConfig } from '../../config-schema';
+import { usePersonAttributeType } from './person-attributes.resource';
+
+const mockUseConfig = jest.mocked(useConfig);
+const mockUseLayoutType = jest.mocked(useLayoutType);
+const mockUsePersonAttributeType = jest.mocked(usePersonAttributeType);
+
+jest.mock('./person-attributes.resource', () => ({
+  usePersonAttributeType: jest.fn(),
+}));
+
+describe('RefineSearch', () => {
+  const user = userEvent.setup();
+
+  const mockSetFilters = jest.fn();
+  const mockConfig = {
+    search: {
+      searchFilterFields: {
+        gender: {
+          enabled: true,
+        },
+        dateOfBirth: {
+          enabled: true,
+        },
+        age: {
+          enabled: true,
+          min: 0,
+        },
+        postcode: {
+          enabled: true,
+        },
+        personAttributes: [
+          {
+            attributeTypeUuid: '14d4f066-15f5-102d-96e4-000c29c2a5d7',
+          },
+        ],
+      },
+    },
+  } as PatientSearchConfig;
+
+  beforeEach(() => {
+    mockUseConfig.mockReturnValue(mockConfig);
+    mockUseLayoutType.mockReturnValue('tablet');
+    mockUsePersonAttributeType.mockReturnValue({
+      isLoading: false,
+      error: null,
+      data: {
+        format: 'java.lang.String',
+        uuid: '14d4f066-15f5-102d-96e4-000c29c2a5d7',
+        display: 'Telephone Number',
+      },
+    });
+  });
+
+  const renderComponent = (props = {}) => {
+    return render(<RefineSearch setFilters={mockSetFilters} inTabletOrOverlay={false} filtersApplied={0} {...props} />);
+  };
+
+  it('renders all enabled search fields', () => {
+    renderComponent();
+
+    expect(screen.getByText('Sex')).toBeInTheDocument();
+    expect(screen.getByText('Day of Birth')).toBeInTheDocument();
+    expect(screen.getByText('Month of Birth')).toBeInTheDocument();
+    expect(screen.getByText('Year of Birth')).toBeInTheDocument();
+    expect(screen.getByLabelText('Age')).toBeInTheDocument();
+    expect(screen.getByLabelText('Postcode')).toBeInTheDocument();
+  });
+
+  it('shows number of filters applied in Apply button when filters are active', () => {
+    renderComponent({ filtersApplied: 2 });
+
+    const applyButton = screen.getByRole('button', { name: /apply/i });
+    expect(applyButton).toHaveTextContent('Apply (2 filters applied)');
+  });
+
+  it('calls setFilters with initial state when Reset Fields is clicked', async () => {
+    renderComponent();
+
+    await user.click(screen.getByRole('button', { name: /reset fields/i }));
+
+    expect(mockSetFilters).toHaveBeenCalledWith({
+      gender: 'any',
+      dateOfBirth: 0,
+      monthOfBirth: 0,
+      yearOfBirth: 0,
+      postcode: '',
+      age: 0,
+      attributes: {},
+    });
+  });
+
+  it('submits form with current state when Apply is clicked', async () => {
+    renderComponent();
+
+    const ageInput = screen.getByRole('spinbutton', { name: /age/i });
+    await user.type(ageInput, '30');
+    await user.click(screen.getByRole('button', { name: /apply/i }));
+
+    expect(mockSetFilters).toHaveBeenCalledWith(
+      expect.objectContaining({
+        gender: 'any',
+        dateOfBirth: 0,
+        monthOfBirth: 0,
+        yearOfBirth: 0,
+        postcode: '',
+        attributes: {},
+        age: 30,
+      }),
+    );
+  });
+
+  describe('Layout rendering', () => {
+    it('renders desktop layout by default', () => {
+      renderComponent();
+
+      expect(screen.getByRole('refine-search')).toHaveClass('refineSearchContainer');
+      expect(screen.queryByRole('button', { name: /refine search/i })).not.toBeInTheDocument();
+    });
+
+    it('renders tablet layout when inTabletOrOverlay is true', () => {
+      mockUseLayoutType.mockReturnValue('tablet');
+      renderComponent({ inTabletOrOverlay: true });
+
+      expect(screen.queryByRole('form')).not.toBeInTheDocument();
+      expect(screen.getByRole('button', { name: /refine search/i })).toBeInTheDocument();
+    });
+
+    it('updates filter count in tablet mode', async () => {
+      mockUseLayoutType.mockReturnValue('tablet');
+      renderComponent({ inTabletOrOverlay: true, filtersApplied: 2 });
+
+      expect(screen.getByText('2')).toBeInTheDocument();
+      expect(screen.getByText(/search queries added/i)).toBeInTheDocument();
+    });
+  });
+
+  describe('Input handling', () => {
+    it('handles gender selection correctly', async () => {
+      renderComponent();
+
+      await user.click(screen.getByRole('tab', { name: 'Male' }));
+      await user.click(screen.getByRole('button', { name: /apply/i }));
+
+      expect(mockSetFilters).toHaveBeenCalledWith(
+        expect.objectContaining({
+          gender: 'male',
+        }),
+      );
+    });
+
+    it('handles date of birth inputs correctly', async () => {
+      renderComponent();
+
+      const dayInput = screen.getByRole('spinbutton', { name: /day of birth/i });
+      const monthInput = screen.getByRole('spinbutton', { name: /month of birth/i });
+      const yearInput = screen.getByRole('spinbutton', { name: /year of birth/i });
+
+      await user.type(dayInput, '15');
+      await user.type(monthInput, '03');
+      await user.type(yearInput, '1990');
+      await user.click(screen.getByRole('button', { name: /apply/i }));
+
+      expect(mockSetFilters).toHaveBeenCalledWith(
+        expect.objectContaining({
+          dateOfBirth: 15,
+          monthOfBirth: 3,
+          yearOfBirth: 1990,
+        }),
+      );
+    });
+
+    it('validates date of birth inputs', async () => {
+      renderComponent();
+
+      const dayInput = screen.getByRole('spinbutton', { name: /day of birth/i });
+      const monthInput = screen.getByRole('spinbutton', { name: /month of birth/i });
+
+      await user.type(dayInput, '32');
+      expect(dayInput).toHaveAttribute('max', '31');
+
+      await user.type(monthInput, '13');
+      expect(monthInput).toHaveAttribute('max', '12');
+    });
+  });
+});
diff --git a/packages/esm-patient-search-app/src/patient-search-page/refine-search/search-field.component.tsx b/packages/esm-patient-search-app/src/patient-search-page/refine-search/search-field.component.tsx
new file mode 100644
index 000000000..f677a214e
--- /dev/null
+++ b/packages/esm-patient-search-app/src/patient-search-page/refine-search/search-field.component.tsx
@@ -0,0 +1,180 @@
+import React from 'react';
+import classNames from 'classnames';
+import { useTranslation } from 'react-i18next';
+import { ContentSwitcher, NumberInput, Switch, TextInput } from '@carbon/react';
+import { type Control, Controller } from 'react-hook-form';
+import styles from './search-field.scss';
+import { PersonAttributeField } from './person-attribute-field.component';
+import { type AdvancedPatientSearchState, type SearchFieldConfig } from '../../types';
+
+interface SearchFieldProps {
+  field: SearchFieldConfig;
+  control: Control<AdvancedPatientSearchState>;
+  inTabletOrOverlay: boolean;
+  isTablet: boolean;
+}
+
+export const SearchField: React.FC<SearchFieldProps> = ({ field, control, inTabletOrOverlay, isTablet }) => {
+  const { t } = useTranslation();
+
+  switch (field.type) {
+    case 'gender':
+      return (
+        <div className={classNames({ [styles.fieldTabletOrOverlay]: inTabletOrOverlay })}>
+          <div className={styles.labelText}>
+            <label className={classNames(styles.sexLabelText, styles.label01)} htmlFor="gender">
+              {t('sex', 'Sex')}
+            </label>
+          </div>
+          <Controller
+            name="gender"
+            control={control}
+            render={({ field: { onChange, value } }) => (
+              <>
+                <ContentSwitcher
+                  id="gender"
+                  size={isTablet ? 'lg' : 'md'}
+                  onChange={({ name }) => onChange(name)}
+                  selectedIndex={['any', 'male', 'female'].indexOf(value)}>
+                  <Switch name="any" text={t('any', 'Any')} />
+                  <Switch name="male" text={t('male', 'Male')} />
+                  <Switch name="female" text={t('female', 'Female')} />
+                </ContentSwitcher>
+                <ContentSwitcher
+                  id="gender"
+                  size={isTablet ? 'lg' : 'md'}
+                  onChange={({ name }) => onChange(name)}
+                  selectedIndex={['other', 'unknown'].indexOf(value)}>
+                  <Switch name="other" text={t('other', 'Other')} />
+                  <Switch name="unknown" text={t('unknown', 'Unknown')} />
+                </ContentSwitcher>
+              </>
+            )}
+          />
+        </div>
+      );
+
+    case 'dateOfBirth':
+      return (
+        <div className={classNames(styles.dobFields, { [styles.fieldTabletOrOverlay]: inTabletOrOverlay })}>
+          <Controller
+            name="dateOfBirth"
+            control={control}
+            render={({ field: { onChange, value } }) => (
+              <NumberInput
+                id="dateOfBirth"
+                placeholder="DD"
+                value={value || ''}
+                onChange={(e) => onChange(parseInt(e.target.value) || 0)}
+                className={styles.dobField}
+                type="number"
+                label={t('dayOfBirth', 'Day of Birth')}
+                min={1}
+                max={31}
+                allowEmpty
+                hideSteppers
+                size={isTablet ? 'lg' : 'md'}
+              />
+            )}
+          />
+          <Controller
+            name="monthOfBirth"
+            control={control}
+            render={({ field: { onChange, value } }) => (
+              <NumberInput
+                id="monthOfBirth"
+                placeholder="MM"
+                value={value || ''}
+                onChange={(e) => onChange(parseInt(e.target.value) || 0)}
+                className={styles.dobField}
+                type="number"
+                label={t('monthOfBirth', 'Month of Birth')}
+                min={1}
+                max={12}
+                allowEmpty
+                hideSteppers
+                size={isTablet ? 'lg' : 'md'}
+              />
+            )}
+          />
+          <Controller
+            name="yearOfBirth"
+            control={control}
+            render={({ field: { onChange, value } }) => (
+              <NumberInput
+                id="yearOfBirth"
+                placeholder="YYYY"
+                value={value || ''}
+                onChange={(e) => onChange(parseInt(e.target.value) || 0)}
+                className={styles.dobField}
+                type="number"
+                label={t('yearOfBirth', 'Year of Birth')}
+                allowEmpty
+                hideSteppers
+                min={1800}
+                max={new Date().getFullYear()}
+                size={isTablet ? 'lg' : 'md'}
+              />
+            )}
+          />
+        </div>
+      );
+
+    case 'age':
+      return (
+        <div className={classNames({ [styles.fieldTabletOrOverlay]: inTabletOrOverlay })}>
+          <Controller
+            name="age"
+            control={control}
+            render={({ field: { onChange, value } }) => (
+              <NumberInput
+                id={field.name}
+                value={value || ''}
+                onChange={(e) => onChange(parseInt(e.target.value) || 0)}
+                type="number"
+                label={t('age', 'Age')}
+                min={field.min}
+                max={field.max}
+                allowEmpty
+                hideSteppers
+                size={isTablet ? 'lg' : 'md'}
+                placeholder={field.placeholder}
+              />
+            )}
+          />
+        </div>
+      );
+
+    case 'postcode':
+      return (
+        <div className={classNames({ [styles.fieldTabletOrOverlay]: inTabletOrOverlay })}>
+          <Controller
+            name="postcode"
+            control={control}
+            render={({ field: { onChange, value } }) => (
+              <TextInput
+                id={field.name}
+                labelText={t('postcode', 'Postcode')}
+                onChange={(e) => onChange(e.target.value)}
+                value={value}
+                size={isTablet ? 'lg' : 'md'}
+                placeholder={field.placeholder}
+              />
+            )}
+          />
+        </div>
+      );
+
+    case 'personAttribute':
+      return (
+        <div className={classNames({ [styles.fieldTabletOrOverlay]: inTabletOrOverlay })}>
+          <PersonAttributeField
+            field={field}
+            control={control}
+            inTabletOrOverlay={inTabletOrOverlay}
+            isTablet={isTablet}
+          />
+        </div>
+      );
+  }
+};
diff --git a/packages/esm-patient-search-app/src/patient-search-page/refine-search/search-field.scss b/packages/esm-patient-search-app/src/patient-search-page/refine-search/search-field.scss
new file mode 100644
index 000000000..44605fe3d
--- /dev/null
+++ b/packages/esm-patient-search-app/src/patient-search-page/refine-search/search-field.scss
@@ -0,0 +1,41 @@
+@use '@carbon/layout';
+@use '@carbon/type';
+@use '@carbon/colors';
+
+.fieldTabletOrOverlay {
+  margin-bottom: layout.$spacing-07;
+
+  input {
+    min-width: unset !important;
+  }
+}
+
+.dobFields {
+  display: grid;
+  grid-template-columns: 1fr 1fr 1.25fr;
+  grid-gap: layout.$spacing-03;
+
+  input {
+    min-width: unset !important;
+    padding-right: layout.$spacing-02 !important;
+  }
+}
+
+.labelText {
+  margin-bottom: layout.$spacing-03;
+}
+
+.label01 {
+  @include type.type-style('label-01');
+}
+
+.locationAttributeFieldContainer {
+  position: relative;
+
+  .loadingContainer {
+    background-color: colors.$white;
+    position: absolute;
+    right: layout.$spacing-07;
+    bottom: layout.$spacing-02;
+  }
+}
diff --git a/packages/esm-patient-search-app/src/patient-search-page/refine-search/search-field.test.tsx b/packages/esm-patient-search-app/src/patient-search-page/refine-search/search-field.test.tsx
new file mode 100644
index 000000000..cfe6578c5
--- /dev/null
+++ b/packages/esm-patient-search-app/src/patient-search-page/refine-search/search-field.test.tsx
@@ -0,0 +1,197 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { SearchField } from './search-field.component';
+import { usePersonAttributeType } from './person-attributes.resource';
+import { type AdvancedPatientSearchState, type SearchFieldConfig } from '../../types';
+import { useForm } from 'react-hook-form';
+import { renderWithSwr } from 'tools';
+
+jest.mock('./person-attributes.resource', () => ({
+  usePersonAttributeType: jest.fn(),
+}));
+
+const mockUsePersonAttributeType = jest.mocked(usePersonAttributeType);
+
+jest.mock('react-hook-form', () => ({
+  ...jest.requireActual('react-hook-form'),
+  useForm: jest.fn().mockReturnValue({
+    control: {
+      register: jest.fn(),
+      unregister: jest.fn(),
+      getFieldState: jest.fn(),
+      _names: {
+        array: new Set(['test']),
+        mount: new Set(['test']),
+        unMount: new Set(['test']),
+        watch: new Set(['test']),
+        focus: 'test',
+        watchAll: false,
+      },
+      _subjects: {
+        watch: jest.fn(),
+        array: jest.fn(),
+        state: jest.fn(),
+      },
+      _getWatch: jest.fn(),
+      _formValues: {},
+      _defaultValues: {},
+    },
+    getValues: jest.fn(),
+    setValue: jest.fn(),
+    formState: { errors: {} },
+  }),
+  Controller: ({ render, name, control }) =>
+    render({
+      field: {
+        onChange: jest.fn(),
+        onBlur: jest.fn(),
+        value: '',
+        name,
+        ref: jest.fn(),
+      },
+      formState: { errors: {} },
+      fieldState: { error: undefined },
+    }),
+}));
+it;
+
+describe('SearchField', () => {
+  const defaultProps = {
+    control: useForm<AdvancedPatientSearchState>().control,
+    inTabletOrOverlay: false,
+    isTablet: false,
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('Gender field', () => {
+    const genderField: SearchFieldConfig = {
+      name: 'gender',
+      type: 'gender',
+    };
+
+    it('renders all gender options', () => {
+      render(<SearchField field={genderField} {...defaultProps} />);
+
+      expect(screen.getByText('Any')).toBeInTheDocument();
+      expect(screen.getByText('Male')).toBeInTheDocument();
+      expect(screen.getByText('Female')).toBeInTheDocument();
+      expect(screen.getByText('Other')).toBeInTheDocument();
+      expect(screen.getByText('Unknown')).toBeInTheDocument();
+    });
+
+    it('groups gender options into two content switchers', () => {
+      render(<SearchField field={genderField} {...defaultProps} />);
+      const switchers = screen.getAllByRole('tablist');
+      expect(switchers).toHaveLength(2);
+    });
+  });
+
+  describe('Date of Birth field', () => {
+    const dobField: SearchFieldConfig = {
+      name: 'dateOfBirth',
+      type: 'dateOfBirth',
+    };
+
+    it('renders three number inputs for day, month, and year', () => {
+      render(<SearchField field={dobField} {...defaultProps} />);
+
+      expect(screen.getByLabelText('Day of Birth')).toBeInTheDocument();
+      expect(screen.getByLabelText('Month of Birth')).toBeInTheDocument();
+      expect(screen.getByLabelText('Year of Birth')).toBeInTheDocument();
+    });
+
+    it('applies correct validation constraints to date inputs', () => {
+      render(<SearchField field={dobField} {...defaultProps} />);
+
+      const dayInput = screen.getByLabelText('Day of Birth');
+      const monthInput = screen.getByLabelText('Month of Birth');
+      const yearInput = screen.getByLabelText('Year of Birth');
+
+      expect(dayInput).toHaveAttribute('min', '1');
+      expect(dayInput).toHaveAttribute('max', '31');
+      expect(monthInput).toHaveAttribute('min', '1');
+      expect(monthInput).toHaveAttribute('max', '12');
+      expect(yearInput).toHaveAttribute('min', '1800');
+      expect(yearInput).toHaveAttribute('max', new Date().getFullYear().toString());
+    });
+  });
+
+  describe('Age field', () => {
+    const ageField: SearchFieldConfig = {
+      name: 'age',
+      type: 'age',
+      min: 0,
+      max: 120,
+    };
+
+    it('renders number input with correct constraints', () => {
+      render(<SearchField field={ageField} {...defaultProps} />);
+
+      const ageInput = screen.getByLabelText('Age');
+      expect(ageInput).toBeInTheDocument();
+      expect(ageInput).toHaveAttribute('type', 'number');
+      expect(ageInput).toHaveAttribute('min', '0');
+      expect(ageInput).toHaveAttribute('max', '120');
+    });
+  });
+
+  describe('Postcode field', () => {
+    const postcodeField: SearchFieldConfig = {
+      name: 'postcode',
+      type: 'postcode',
+      placeholder: 'Enter postcode',
+    };
+
+    it('renders text input with correct attributes', () => {
+      render(<SearchField field={postcodeField} {...defaultProps} />);
+      const input = screen.getByLabelText('Postcode');
+      expect(input).toBeInTheDocument();
+      expect(input).toHaveAttribute('type', 'text');
+    });
+  });
+
+  describe('Person Attribute field', () => {
+    const personAttributeField: SearchFieldConfig = {
+      name: 'test-uuid',
+      type: 'personAttribute',
+      attributeTypeUuid: 'test-uuid',
+    };
+
+    beforeEach(() => {
+      mockUsePersonAttributeType.mockReturnValue({
+        data: {
+          format: 'java.lang.String',
+          display: 'Phone Number',
+          uuid: 'test-uuid',
+        },
+        isLoading: false,
+        error: null,
+      });
+    });
+
+    it('renders person attribute field with correct props', () => {
+      renderWithSwr(<SearchField field={personAttributeField} {...defaultProps} />);
+      expect(screen.getByText('Phone Number')).toBeInTheDocument();
+    });
+  });
+
+  describe('Responsive behavior', () => {
+    const ageField: SearchFieldConfig = {
+      name: 'age',
+      type: 'age',
+    };
+
+    it('applies tablet styles when in tablet mode', () => {
+      render(<SearchField field={ageField} {...defaultProps} isTablet={true} />);
+      expect(screen.getByLabelText('Age')).toBeInTheDocument();
+    });
+
+    it('applies overlay styles when in overlay mode', () => {
+      render(<SearchField field={ageField} {...defaultProps} inTabletOrOverlay={true} />);
+      expect(screen.getByLabelText('Age')).toBeInTheDocument();
+    });
+  });
+});
diff --git a/packages/esm-patient-search-app/src/patient-search-workspace/patient-search.workspace.tsx b/packages/esm-patient-search-app/src/patient-search-workspace/patient-search.workspace.tsx
index c8419cfa2..4ec629ede 100644
--- a/packages/esm-patient-search-app/src/patient-search-workspace/patient-search.workspace.tsx
+++ b/packages/esm-patient-search-app/src/patient-search-workspace/patient-search.workspace.tsx
@@ -1,8 +1,8 @@
-import { useConfig, useDebounce } from '@openmrs/esm-framework';
 import React, { useCallback, useState } from 'react';
+import { useConfig, useDebounce } from '@openmrs/esm-framework';
 import { type PatientSearchConfig } from '../config-schema';
-import PatientSearchBar from '../patient-search-bar/patient-search-bar.component';
 import { PatientSearchContext, type PatientSearchContextProps } from '../patient-search-context';
+import PatientSearchBar from '../patient-search-bar/patient-search-bar.component';
 import AdvancedPatientSearchComponent from '../patient-search-page/advanced-patient-search.component';
 
 export interface PatientSearchWorkspaceProps extends PatientSearchContextProps {
@@ -28,10 +28,13 @@ const PatientSearchWorkspace: React.FC<PatientSearchWorkspaceProps> = ({
 
   const handleClearSearchTerm = useCallback(() => setSearchTerm(''), [setSearchTerm]);
 
-  const onSearchTermChange = useCallback((value: string) => {
-    setSearchTerm(value);
-    handleSearchTermUpdated && handleSearchTermUpdated(value);
-  }, []);
+  const onSearchTermChange = useCallback(
+    (value: string) => {
+      setSearchTerm(value);
+      handleSearchTermUpdated && handleSearchTermUpdated(value);
+    },
+    [handleSearchTermUpdated],
+  );
 
   return (
     <PatientSearchContext.Provider value={{ nonNavigationSelectPatientAction, patientClickSideEffect }}>
diff --git a/packages/esm-patient-search-app/src/patient-search.resource.tsx b/packages/esm-patient-search-app/src/patient-search.resource.tsx
index bda4ccc82..e7ceb67bd 100644
--- a/packages/esm-patient-search-app/src/patient-search.resource.tsx
+++ b/packages/esm-patient-search-app/src/patient-search.resource.tsx
@@ -92,7 +92,7 @@ export function useInfinitePatientSearch(
       currentPage: size,
       totalResults: data?.[0]?.data?.totalCount ?? 0,
     }),
-    [data, isLoading, isValidating, error, setSize, size],
+    [mappedData, isLoading, error, data, isValidating, setSize, size],
   );
 }
 
@@ -120,7 +120,10 @@ export function useRecentlyViewedPatients(showRecentlySearchedPatients: boolean
   );
 
   const userProperties = data?.data?.userProperties;
-  const patientsVisited = userProperties?.patientsVisited?.split(',').filter(Boolean) ?? [];
+  const patientsVisited = useMemo(
+    () => userProperties?.patientsVisited?.split(',').filter(Boolean) ?? [],
+    [userProperties],
+  );
 
   const updateRecentlyViewedPatients = useCallback(
     (patientUuid: string) => {
@@ -138,7 +141,7 @@ export function useRecentlyViewedPatients(showRecentlySearchedPatients: boolean
         },
       });
     },
-    [patientsVisited, userProperties],
+    [patientsVisited, url, userProperties],
   );
 
   return useMemo(
@@ -149,7 +152,7 @@ export function useRecentlyViewedPatients(showRecentlySearchedPatients: boolean
       updateRecentlyViewedPatients,
       mutateUserProperties: mutate,
     }),
-    [data, error, mutate],
+    [error, isLoading, mutate, patientsVisited, updateRecentlyViewedPatients],
   );
 }
 
@@ -213,6 +216,6 @@ export function useRestPatients(
       currentPage: size,
       totalResults: patientUuids?.length ?? 0,
     }),
-    [data, isLoading, isValidating, error, setSize, size, patientUuids],
+    [mappedData, isLoading, error, patientUuids, size, isValidating, setSize],
   );
 }
diff --git a/packages/esm-patient-search-app/src/types/index.ts b/packages/esm-patient-search-app/src/types/index.ts
index ad7507831..eb32cdf4f 100644
--- a/packages/esm-patient-search-app/src/types/index.ts
+++ b/packages/esm-patient-search-app/src/types/index.ts
@@ -17,7 +17,10 @@ export interface SearchedPatient {
       middleName: string;
     };
   };
-  attributes: Array<{ value: string; attributeType: { uuid: string; display: string } }>;
+  attributes: Array<{
+    value: OpenmrsResource | string;
+    attributeType: { uuid: string; display: string };
+  }>;
 }
 
 export interface Identifier {
@@ -97,31 +100,11 @@ export interface AdvancedPatientSearchState {
   dateOfBirth: number;
   monthOfBirth: number;
   yearOfBirth: number;
-  phoneNumber: number;
   postcode: string;
   age: number;
-}
-
-export enum AdvancedPatientSearchActionTypes {
-  SET_GENDER,
-  SET_DATE_OF_BIRTH,
-  SET_MONTH_OF_BIRTH,
-  SET_YEAR_OF_BIRTH,
-  SET_PHONE_NUMBER,
-  SET_POSTCODE,
-  SET_AGE,
-  RESET_FIELDS,
-}
-
-export interface AdvancedPatientSearchAction {
-  type: AdvancedPatientSearchActionTypes;
-  gender?: 'any' | 'male' | 'female' | 'other' | 'unknown';
-  dateOfBirth?: number;
-  monthOfBirth?: number;
-  yearOfBirth?: number;
-  phoneNumber?: number;
-  postcode?: string;
-  age?: number;
+  attributes: {
+    [key: string]: string;
+  };
 }
 
 export interface User {
@@ -132,3 +115,67 @@ export interface User {
     defaultLocation: string;
   };
 }
+
+export interface PersonAttributeTypeResponse {
+  uuid: string;
+  display: string;
+  name?: string;
+  description?: string;
+  format: string;
+}
+
+export interface ConceptResponse {
+  uuid: string;
+  display: string;
+  datatype: {
+    uuid: string;
+    display: string;
+  };
+  answers: Array<OpenmrsResource>;
+  setMembers: Array<OpenmrsResource>;
+}
+
+export interface LocationEntry {
+  resource: {
+    id: string;
+    name: string;
+    resourceType: string;
+    status: 'active' | 'inactive';
+    meta?: {
+      tag?: Array<{
+        code: string;
+        display: string;
+        system: string;
+      }>;
+    };
+  };
+}
+
+export interface LocationResponse {
+  type: string;
+  total: number;
+  resourceType: string;
+  meta: {
+    lastUpdated: string;
+  };
+  link: Array<{
+    relation: string;
+    url: string;
+  }>;
+  id: string;
+  entry: Array<LocationEntry>;
+}
+
+export type SearchFieldType = 'age' | 'dateOfBirth' | 'gender' | 'personAttribute' | 'postcode';
+
+export interface SearchFieldConfig {
+  name: string;
+  type: SearchFieldType;
+  placeholder?: string;
+  answerConceptSetUuid?: string;
+  conceptAnswersUuids?: Array<string>;
+  locationTag?: string;
+  attributeTypeUuid?: string;
+  min?: number;
+  max?: number;
+}
diff --git a/packages/esm-patient-search-app/translations/am.json b/packages/esm-patient-search-app/translations/am.json
index 434eee3ba..8d0248173 100644
--- a/packages/esm-patient-search-app/translations/am.json
+++ b/packages/esm-patient-search-app/translations/am.json
@@ -5,12 +5,16 @@
   "clear": "Clear",
   "clearSearch": "Clear",
   "closeSearch": "Close Search Panel",
-  "countOfFiltersApplied": "filters applied",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
   "dayOfBirth": "Day of Birth",
   "error": "Error",
   "errorCopy": "Sorry, there was an error. You can try to reload this page, or contact the site administrator and quote the error code above.",
   "errorFetchingPatients": "Error fetching patients",
   "errorFetchingUserProperties": "Error fetching user properties",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
   "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
   "female": "Female",
   "filtersAppliedText": "search queries added",
@@ -19,7 +23,6 @@
   "nextPage": "Next page",
   "noPatientChartsFoundMessage": "Sorry, no patient charts were found",
   "other": "Other",
-  "phoneNumber": "Phone number",
   "postcode": "Postcode",
   "previousPage": "Previous page",
   "recentSearchResultsCount_one": "{{count}} recent search result",
@@ -31,12 +34,15 @@
   "search": "Search",
   "searchForPatient": "Search for a patient by name or identifier number",
   "searchingText": "Searching...",
+  "searchLocationPersonAttribute": "Search location",
   "searchPatient": "Search patient",
   "searchResults": "Search results",
   "searchResultsCount_one": "{{count}} search result",
   "searchResultsCount_other": "{{count}} search results",
+  "selectOption": "Select an option",
   "sex": "Sex",
   "trySearchWithPatientUniqueID": "Try to search again using the patient's unique ID number",
   "unknown": "Unknown",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
   "yearOfBirth": "Year of Birth"
 }
diff --git a/packages/esm-patient-search-app/translations/ar.json b/packages/esm-patient-search-app/translations/ar.json
index a624bf2ef..037f52262 100644
--- a/packages/esm-patient-search-app/translations/ar.json
+++ b/packages/esm-patient-search-app/translations/ar.json
@@ -5,12 +5,16 @@
   "clear": "مسح",
   "clearSearch": "مسح البحث",
   "closeSearch": "Close Search Panel",
-  "countOfFiltersApplied": "تم تطبيق الفلاتر",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
   "dayOfBirth": "يوم الميلاد",
   "error": "خطأ",
   "errorCopy": "عذرًا، حدث خطأ. يمكنك محاولة إعادة تحميل هذه الصفحة، أو الاتصال بمسؤول الموقع وذكر رمز الخطأ أعلاه.",
   "errorFetchingPatients": "Error fetching patients",
   "errorFetchingUserProperties": "Error fetching user properties",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
   "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
   "female": "أنثى",
   "filtersAppliedText": "تمت إضافة استعلامات البحث",
@@ -19,7 +23,6 @@
   "nextPage": "الصفحة التالية",
   "noPatientChartsFoundMessage": "عذرًا، لم يتم العثور على سجلات المرضى",
   "other": "آخر",
-  "phoneNumber": "رقم الهاتف",
   "postcode": "الرمز البريدي",
   "previousPage": "الصفحة السابقة",
   "recentSearchResultsCount_one": "{{count}} نتيجة بحث حديثة",
@@ -31,12 +34,15 @@
   "search": "بحث",
   "searchForPatient": "ابحث عن مريض بالاسم أو رقم التعريف",
   "searchingText": "جاري البحث...",
-  "searchPatient": "Search patient",
-  "searchResults": "Search results",
+  "searchLocationPersonAttribute": "Search location",
+  "searchPatient": "Search Patient",
+  "searchResults": "نتائج البحث",
   "searchResultsCount_one": "{{count}} نتيجة بحث",
   "searchResultsCount_other": "{{count}} نتيجة بحث",
+  "selectOption": "Select an option",
   "sex": "الجنس",
   "trySearchWithPatientUniqueID": "حاول البحث مرة أخرى باستخدام رقم التعريف الفريد للمريض",
   "unknown": "غير معروف",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
   "yearOfBirth": "سنة الميلاد"
 }
diff --git a/packages/esm-patient-search-app/translations/de.json b/packages/esm-patient-search-app/translations/de.json
index 6ab1b0c7b..72761ca8a 100644
--- a/packages/esm-patient-search-app/translations/de.json
+++ b/packages/esm-patient-search-app/translations/de.json
@@ -5,12 +5,16 @@
   "clear": "Clear",
   "clearSearch": "Clear",
   "closeSearch": "Close Search Panel",
-  "countOfFiltersApplied": "filters applied",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
   "dayOfBirth": "Day of Birth",
   "error": "Error",
   "errorCopy": "Sorry, there was a an error. You can try to reload this page, or contact the site administrator and quote the error code above.",
   "errorFetchingPatients": "Error fetching patients",
   "errorFetchingUserProperties": "Error fetching user properties",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
   "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
   "female": "Female",
   "filtersAppliedText": "search queries added",
@@ -19,7 +23,6 @@
   "nextPage": "Next page",
   "noPatientChartsFoundMessage": "Sorry, no patient charts were found",
   "other": "Other",
-  "phoneNumber": "Phone number",
   "postcode": "Postcode",
   "previousPage": "Previous page",
   "recentSearchResultsCount_one": "{{count}} recent search result",
@@ -31,12 +34,15 @@
   "search": "Search",
   "searchForPatient": "Search for a patient by name or identifier number",
   "searchingText": "Searching...",
+  "searchLocationPersonAttribute": "Search location",
   "searchPatient": "Search patient",
   "searchResults": "Search results",
   "searchResultsCount_one": "{{count}} search result",
   "searchResultsCount_other": "{{count}} search results",
+  "selectOption": "Select an option",
   "sex": "Sex",
   "trySearchWithPatientUniqueID": "Try to search again using the patient's unique ID number",
   "unknown": "Unknown",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
   "yearOfBirth": "Year of Birth"
 }
diff --git a/packages/esm-patient-search-app/translations/en.json b/packages/esm-patient-search-app/translations/en.json
index 6ab1b0c7b..72761ca8a 100644
--- a/packages/esm-patient-search-app/translations/en.json
+++ b/packages/esm-patient-search-app/translations/en.json
@@ -5,12 +5,16 @@
   "clear": "Clear",
   "clearSearch": "Clear",
   "closeSearch": "Close Search Panel",
-  "countOfFiltersApplied": "filters applied",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
   "dayOfBirth": "Day of Birth",
   "error": "Error",
   "errorCopy": "Sorry, there was a an error. You can try to reload this page, or contact the site administrator and quote the error code above.",
   "errorFetchingPatients": "Error fetching patients",
   "errorFetchingUserProperties": "Error fetching user properties",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
   "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
   "female": "Female",
   "filtersAppliedText": "search queries added",
@@ -19,7 +23,6 @@
   "nextPage": "Next page",
   "noPatientChartsFoundMessage": "Sorry, no patient charts were found",
   "other": "Other",
-  "phoneNumber": "Phone number",
   "postcode": "Postcode",
   "previousPage": "Previous page",
   "recentSearchResultsCount_one": "{{count}} recent search result",
@@ -31,12 +34,15 @@
   "search": "Search",
   "searchForPatient": "Search for a patient by name or identifier number",
   "searchingText": "Searching...",
+  "searchLocationPersonAttribute": "Search location",
   "searchPatient": "Search patient",
   "searchResults": "Search results",
   "searchResultsCount_one": "{{count}} search result",
   "searchResultsCount_other": "{{count}} search results",
+  "selectOption": "Select an option",
   "sex": "Sex",
   "trySearchWithPatientUniqueID": "Try to search again using the patient's unique ID number",
   "unknown": "Unknown",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
   "yearOfBirth": "Year of Birth"
 }
diff --git a/packages/esm-patient-search-app/translations/es.json b/packages/esm-patient-search-app/translations/es.json
index 7e73e7391..968c5d352 100644
--- a/packages/esm-patient-search-app/translations/es.json
+++ b/packages/esm-patient-search-app/translations/es.json
@@ -1,42 +1,48 @@
 {
   "age": "Edad",
-  "any": "Cualquier/a",
+  "any": "Cualquier",
   "apply": "Aplicar",
   "clear": "Borrar",
   "clearSearch": "Borrar",
-  "closeSearch": "Close Search Panel",
-  "countOfFiltersApplied": "filtros utilizados",
+  "closeSearch": "Cerrar Panel de Búsqueda",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
   "dayOfBirth": "Día de Nacimiento",
   "error": "Error",
-  "errorCopy": "Lo sentimos, se ha producido un error. Puede intentar recargar esta página o ponerse en contacto con el administrador del sitio y especificar el código de error.",
-  "errorFetchingPatients": "Error fetching patients",
-  "errorFetchingUserProperties": "Error fetching user properties",
-  "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
+  "errorCopy": "Lo sentimos, hubo un error. Puede intentar recargar esta página o contactar al administrador del sitio y hacer referencia al código de error que aparece arriba.",
+  "errorFetchingPatients": "Error al obtener pacientes",
+  "errorFetchingUserProperties": "Error al obtener propiedades del usuario",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
+  "errorUpdatingRecentlyViewedPatients": "Error al actualizar pacientes recientemente vistos",
   "female": "Femenino",
-  "filtersAppliedText": "búsquedas añadidas",
+  "filtersAppliedText": "búsquedas agregadas",
   "male": "Masculino",
   "monthOfBirth": "Mes de Nacimiento",
-  "nextPage": "Página siguiente",
-  "noPatientChartsFoundMessage": "Lo sentimos, no se han encontrado historiales de pacientes",
+  "nextPage": "Siguiente página",
+  "noPatientChartsFoundMessage": "Lo sentimos, no se han encontrado historias clínicas de pacientes",
   "other": "Otro",
-  "phoneNumber": "Número de teléfono",
   "postcode": "Código postal",
   "previousPage": "Página anterior",
   "recentSearchResultsCount_one": "{{count}} resultado de búsqueda reciente",
   "recentSearchResultsCount_other": "{{count}} resultados de búsqueda reciente",
-  "refineSearch": "Afinar búsqueda",
-  "refineSearchHeaderText": "Añadir criterios de búsqueda adicionales",
-  "refineSearchTabletBannerText": "¿No encuentra lo que está buscando?",
+  "refineSearch": "Refinar búsqueda",
+  "refineSearchHeaderText": "Agregar criterios de búsqueda adicionales",
+  "refineSearchTabletBannerText": "¿No puede encontrar a la persona que está buscando?",
   "resetFields": "Restablecer campos",
   "search": "Buscar",
   "searchForPatient": "Buscar un paciente por nombre o número de identificación",
   "searchingText": "Buscando...",
-  "searchPatient": "Search patient",
-  "searchResults": "Search results",
+  "searchLocationPersonAttribute": "Search location",
+  "searchPatient": "Buscar paciente",
+  "searchResults": "Buscar resultados",
   "searchResultsCount_one": "{{count}} resultado de búsqueda",
   "searchResultsCount_other": "{{count}} resultados de búsqueda",
+  "selectOption": "Select an option",
   "sex": "Sexo",
-  "trySearchWithPatientUniqueID": "Intente buscar con el número de identificación único del paciente",
+  "trySearchWithPatientUniqueID": "Intente buscar nuevamente usando el número de identificación único del paciente",
   "unknown": "Desconocido",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
   "yearOfBirth": "Año de Nacimiento"
 }
diff --git a/packages/esm-patient-search-app/translations/fr.json b/packages/esm-patient-search-app/translations/fr.json
index 758a5d7c9..6b7bffac5 100644
--- a/packages/esm-patient-search-app/translations/fr.json
+++ b/packages/esm-patient-search-app/translations/fr.json
@@ -1,17 +1,21 @@
 {
   "age": "Âge",
-  "any": "N'importe quel",
+  "any": "N'importe lequel",
   "apply": "Appliquer",
   "clear": "Effacer",
   "clearSearch": "Effacer",
   "closeSearch": "Fermer le Panneau de Recherche",
-  "countOfFiltersApplied": "filtres appliqués",
+  "countOfFiltersApplied_one": "{{count}} filtre(s) appliqué(s)",
+  "countOfFiltersApplied_other": "{{count}} filtre(s) appliqué(s)",
   "dayOfBirth": "Jour de Naissance",
   "error": "Erreur",
   "errorCopy": "Désolé, une erreur s'est produite. Vous pouvez tenter de rafraîchir la page, ou bien contacter l'administrateur du site et transmettre le message d'erreur ci-dessus.",
-  "errorFetchingPatients": "Error fetching patients",
-  "errorFetchingUserProperties": "Error fetching user properties",
-  "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
+  "errorFetchingPatients": "Erreur lors de la récupération des données",
+  "errorFetchingUserProperties": "Erreur lors de la récupération des propriétés d'utilisateur",
+  "errorLoadingAttribute": "Erreur lors du chargement du type d'attribut : {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Erreur lors du chargement des réponses aux attributs de concept",
+  "errorLoadingLocationsForAttribute": "Erreur lors du chargement des emplacements pour l'attribut de personne {{attributeName}}",
+  "errorUpdatingRecentlyViewedPatients": "Erreur lors de la mise à jour des patients reçus récemment",
   "female": "Féminin",
   "filtersAppliedText": "Rechercher les requêtes ajoutées",
   "male": "Masculin",
@@ -19,7 +23,6 @@
   "nextPage": "Page suivante",
   "noPatientChartsFoundMessage": "Désolé, aucun dossier de patient n'a été trouvé",
   "other": "Autre",
-  "phoneNumber": "Numéro de téléphone",
   "postcode": "Code postal",
   "previousPage": "Page précédente",
   "recentSearchResultsCount_one": "{{count}} résultat de recherche récent",
@@ -31,12 +34,15 @@
   "search": "Recherche",
   "searchForPatient": "Trouver un patient par nom ou identifiant",
   "searchingText": "Recherche",
-  "searchPatient": "Search patient",
-  "searchResults": "Search results",
+  "searchLocationPersonAttribute": "Search location",
+  "searchPatient": "Rechercher Patient",
+  "searchResults": "Rechercher les résultats",
   "searchResultsCount_one": "{{count}} résultat de recherche",
   "searchResultsCount_other": "{{count}} résultats de recherche",
+  "selectOption": "Choisir une option",
   "sex": "Sexe",
   "trySearchWithPatientUniqueID": "Essayez de chercher par l'identifiant unique du patient",
   "unknown": "Inconnu",
+  "unsupportedAttributeFormat": "Format d'attribut non supporté: {{format}}",
   "yearOfBirth": "Année de Naissance"
 }
diff --git a/packages/esm-patient-search-app/translations/he.json b/packages/esm-patient-search-app/translations/he.json
index 84565f62d..869acaabc 100644
--- a/packages/esm-patient-search-app/translations/he.json
+++ b/packages/esm-patient-search-app/translations/he.json
@@ -5,13 +5,17 @@
   "clear": "נקה",
   "clearSearch": "נקה",
   "closeSearch": "Close Search Panel",
-  "countOfFiltersApplied": "מספר מסננים שהוחלו",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
   "dayOfBirth": "יום הלידה",
   "error": "שגיאה",
   "errorCopy": "מצטערים, אירעה שגיאה. ניתן לנסות לטעון מחדש את הדף או ליצור קשר עם מנהל האתר ולציין את קוד השגיאה שמופיע למעלה.",
-  "errorFetchingPatients": "Error fetching patients",
-  "errorFetchingUserProperties": "Error fetching user properties",
-  "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
+  "errorFetchingPatients": "שגיאה במשיכת מטופלים",
+  "errorFetchingUserProperties": "שגיאה במשיכת מאפייני משתמש",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
+  "errorUpdatingRecentlyViewedPatients": "שגיאה בעדכון מטופלים שנצפו לאחרונה",
   "female": "נקבה",
   "filtersAppliedText": "תוספו שאילתות חיפוש",
   "male": "זכר",
@@ -19,7 +23,6 @@
   "nextPage": "הדף הבא",
   "noPatientChartsFoundMessage": "מצטערים, לא נמצאו כרטיסי מטופלים",
   "other": "אחר",
-  "phoneNumber": "מספר טלפון",
   "postcode": "מיקוד",
   "previousPage": "הדף הקודם",
   "recentSearchResultsCount_one": "{{count}} תוצאת חיפוש אחרונה",
@@ -31,12 +34,15 @@
   "search": "חיפוש",
   "searchForPatient": "חפש מטופל לפי שם או מספר זיהוי",
   "searchingText": "...מחפש",
-  "searchPatient": "Search patient",
-  "searchResults": "Search results",
+  "searchLocationPersonAttribute": "Search location",
+  "searchPatient": "חיפוש מטופל/",
+  "searchResults": "תוצאות חיפוש",
   "searchResultsCount_one": "{{count}} תוצאת חיפוש",
   "searchResultsCount_other": "{{count}} תוצאות חיפוש",
+  "selectOption": "Select an option",
   "sex": "מין",
   "trySearchWithPatientUniqueID": "נסה לחפש עם מספר הזיהוי הייחודי של המטופל",
   "unknown": "לא ידוע",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
   "yearOfBirth": "שנת הלידה"
 }
diff --git a/packages/esm-patient-search-app/translations/hi.json b/packages/esm-patient-search-app/translations/hi.json
index 6ab1b0c7b..72761ca8a 100644
--- a/packages/esm-patient-search-app/translations/hi.json
+++ b/packages/esm-patient-search-app/translations/hi.json
@@ -5,12 +5,16 @@
   "clear": "Clear",
   "clearSearch": "Clear",
   "closeSearch": "Close Search Panel",
-  "countOfFiltersApplied": "filters applied",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
   "dayOfBirth": "Day of Birth",
   "error": "Error",
   "errorCopy": "Sorry, there was a an error. You can try to reload this page, or contact the site administrator and quote the error code above.",
   "errorFetchingPatients": "Error fetching patients",
   "errorFetchingUserProperties": "Error fetching user properties",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
   "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
   "female": "Female",
   "filtersAppliedText": "search queries added",
@@ -19,7 +23,6 @@
   "nextPage": "Next page",
   "noPatientChartsFoundMessage": "Sorry, no patient charts were found",
   "other": "Other",
-  "phoneNumber": "Phone number",
   "postcode": "Postcode",
   "previousPage": "Previous page",
   "recentSearchResultsCount_one": "{{count}} recent search result",
@@ -31,12 +34,15 @@
   "search": "Search",
   "searchForPatient": "Search for a patient by name or identifier number",
   "searchingText": "Searching...",
+  "searchLocationPersonAttribute": "Search location",
   "searchPatient": "Search patient",
   "searchResults": "Search results",
   "searchResultsCount_one": "{{count}} search result",
   "searchResultsCount_other": "{{count}} search results",
+  "selectOption": "Select an option",
   "sex": "Sex",
   "trySearchWithPatientUniqueID": "Try to search again using the patient's unique ID number",
   "unknown": "Unknown",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
   "yearOfBirth": "Year of Birth"
 }
diff --git a/packages/esm-patient-search-app/translations/hi_IN.json b/packages/esm-patient-search-app/translations/hi_IN.json
index 6ab1b0c7b..72761ca8a 100644
--- a/packages/esm-patient-search-app/translations/hi_IN.json
+++ b/packages/esm-patient-search-app/translations/hi_IN.json
@@ -5,12 +5,16 @@
   "clear": "Clear",
   "clearSearch": "Clear",
   "closeSearch": "Close Search Panel",
-  "countOfFiltersApplied": "filters applied",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
   "dayOfBirth": "Day of Birth",
   "error": "Error",
   "errorCopy": "Sorry, there was a an error. You can try to reload this page, or contact the site administrator and quote the error code above.",
   "errorFetchingPatients": "Error fetching patients",
   "errorFetchingUserProperties": "Error fetching user properties",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
   "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
   "female": "Female",
   "filtersAppliedText": "search queries added",
@@ -19,7 +23,6 @@
   "nextPage": "Next page",
   "noPatientChartsFoundMessage": "Sorry, no patient charts were found",
   "other": "Other",
-  "phoneNumber": "Phone number",
   "postcode": "Postcode",
   "previousPage": "Previous page",
   "recentSearchResultsCount_one": "{{count}} recent search result",
@@ -31,12 +34,15 @@
   "search": "Search",
   "searchForPatient": "Search for a patient by name or identifier number",
   "searchingText": "Searching...",
+  "searchLocationPersonAttribute": "Search location",
   "searchPatient": "Search patient",
   "searchResults": "Search results",
   "searchResultsCount_one": "{{count}} search result",
   "searchResultsCount_other": "{{count}} search results",
+  "selectOption": "Select an option",
   "sex": "Sex",
   "trySearchWithPatientUniqueID": "Try to search again using the patient's unique ID number",
   "unknown": "Unknown",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
   "yearOfBirth": "Year of Birth"
 }
diff --git a/packages/esm-patient-search-app/translations/id.json b/packages/esm-patient-search-app/translations/id.json
index 6ab1b0c7b..72761ca8a 100644
--- a/packages/esm-patient-search-app/translations/id.json
+++ b/packages/esm-patient-search-app/translations/id.json
@@ -5,12 +5,16 @@
   "clear": "Clear",
   "clearSearch": "Clear",
   "closeSearch": "Close Search Panel",
-  "countOfFiltersApplied": "filters applied",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
   "dayOfBirth": "Day of Birth",
   "error": "Error",
   "errorCopy": "Sorry, there was a an error. You can try to reload this page, or contact the site administrator and quote the error code above.",
   "errorFetchingPatients": "Error fetching patients",
   "errorFetchingUserProperties": "Error fetching user properties",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
   "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
   "female": "Female",
   "filtersAppliedText": "search queries added",
@@ -19,7 +23,6 @@
   "nextPage": "Next page",
   "noPatientChartsFoundMessage": "Sorry, no patient charts were found",
   "other": "Other",
-  "phoneNumber": "Phone number",
   "postcode": "Postcode",
   "previousPage": "Previous page",
   "recentSearchResultsCount_one": "{{count}} recent search result",
@@ -31,12 +34,15 @@
   "search": "Search",
   "searchForPatient": "Search for a patient by name or identifier number",
   "searchingText": "Searching...",
+  "searchLocationPersonAttribute": "Search location",
   "searchPatient": "Search patient",
   "searchResults": "Search results",
   "searchResultsCount_one": "{{count}} search result",
   "searchResultsCount_other": "{{count}} search results",
+  "selectOption": "Select an option",
   "sex": "Sex",
   "trySearchWithPatientUniqueID": "Try to search again using the patient's unique ID number",
   "unknown": "Unknown",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
   "yearOfBirth": "Year of Birth"
 }
diff --git a/packages/esm-patient-search-app/translations/it.json b/packages/esm-patient-search-app/translations/it.json
index 6ab1b0c7b..72761ca8a 100644
--- a/packages/esm-patient-search-app/translations/it.json
+++ b/packages/esm-patient-search-app/translations/it.json
@@ -5,12 +5,16 @@
   "clear": "Clear",
   "clearSearch": "Clear",
   "closeSearch": "Close Search Panel",
-  "countOfFiltersApplied": "filters applied",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
   "dayOfBirth": "Day of Birth",
   "error": "Error",
   "errorCopy": "Sorry, there was a an error. You can try to reload this page, or contact the site administrator and quote the error code above.",
   "errorFetchingPatients": "Error fetching patients",
   "errorFetchingUserProperties": "Error fetching user properties",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
   "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
   "female": "Female",
   "filtersAppliedText": "search queries added",
@@ -19,7 +23,6 @@
   "nextPage": "Next page",
   "noPatientChartsFoundMessage": "Sorry, no patient charts were found",
   "other": "Other",
-  "phoneNumber": "Phone number",
   "postcode": "Postcode",
   "previousPage": "Previous page",
   "recentSearchResultsCount_one": "{{count}} recent search result",
@@ -31,12 +34,15 @@
   "search": "Search",
   "searchForPatient": "Search for a patient by name or identifier number",
   "searchingText": "Searching...",
+  "searchLocationPersonAttribute": "Search location",
   "searchPatient": "Search patient",
   "searchResults": "Search results",
   "searchResultsCount_one": "{{count}} search result",
   "searchResultsCount_other": "{{count}} search results",
+  "selectOption": "Select an option",
   "sex": "Sex",
   "trySearchWithPatientUniqueID": "Try to search again using the patient's unique ID number",
   "unknown": "Unknown",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
   "yearOfBirth": "Year of Birth"
 }
diff --git a/packages/esm-patient-search-app/translations/km.json b/packages/esm-patient-search-app/translations/km.json
index 1da2d634e..8d6a9a90e 100644
--- a/packages/esm-patient-search-app/translations/km.json
+++ b/packages/esm-patient-search-app/translations/km.json
@@ -5,12 +5,16 @@
   "clear": "ជម្រះ លុបចោល",
   "clearSearch": "ជម្រះ លុបចោល",
   "closeSearch": "Close Search Panel",
-  "countOfFiltersApplied": "បានអនុវត្តតម្រង ( ចុចតម្រង)",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
   "dayOfBirth": "Day of Birth",
   "error": "កំហុស",
   "errorCopy": "សូមអភ័យទោស មានកំហុសមួយ។ អ្នកអាចព្យាយាមផ្ទុកទំព័រនេះឡើងវិញ ឬទាក់ទងអ្នកគ្រប់គ្រងគេហទំព័រ ហើយដកស្រង់កូដកំហុសខាងលើ។",
   "errorFetchingPatients": "Error fetching patients",
   "errorFetchingUserProperties": "Error fetching user properties",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
   "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
   "female": "ស្រី",
   "filtersAppliedText": "សំណួរស្វែងរកបានបន្ថែម",
@@ -19,7 +23,6 @@
   "nextPage": "ទំbពbរ័bបន្ទាប់",
   "noPatientChartsFoundMessage": "សូមអភ័យទោស រកមិនឃើញតារាងអ្នកជំងឺទេ។",
   "other": "ផ្សេងទៀត",
-  "phoneNumber": "លេខទូរស័ព្ទ",
   "postcode": "លេខកូដប្រៃសណីយ៍",
   "previousPage": "ទំព័រbមុន",
   "recentSearchResultsCount_one": "{{count}} recent search result",
@@ -31,12 +34,15 @@
   "search": "ស្វែងរក",
   "searchForPatient": "ស្វែងរកអ្នកជំងឺតាមឈ្មោះ ឬអត្តលេខអ្នកជំងឺ",
   "searchingText": "កំពុងស្វែងរក...",
+  "searchLocationPersonAttribute": "Search location",
   "searchPatient": "Search patient",
   "searchResults": "Search results",
   "searchResultsCount_one": "{{count}} search result",
   "searchResultsCount_other": "{{count}} search results",
+  "selectOption": "Select an option",
   "sex": "ភេទ",
   "trySearchWithPatientUniqueID": "ព្យាយាមស្វែងរកដោយប្រើអត្តលេខតែមួយគត់របស់អ្នកជំងឺ",
   "unknown": "មិនដឹង",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
   "yearOfBirth": "Year of Birth"
 }
diff --git a/packages/esm-patient-search-app/translations/ne.json b/packages/esm-patient-search-app/translations/ne.json
new file mode 100644
index 000000000..72761ca8a
--- /dev/null
+++ b/packages/esm-patient-search-app/translations/ne.json
@@ -0,0 +1,48 @@
+{
+  "age": "Age",
+  "any": "Any",
+  "apply": "Apply",
+  "clear": "Clear",
+  "clearSearch": "Clear",
+  "closeSearch": "Close Search Panel",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
+  "dayOfBirth": "Day of Birth",
+  "error": "Error",
+  "errorCopy": "Sorry, there was a an error. You can try to reload this page, or contact the site administrator and quote the error code above.",
+  "errorFetchingPatients": "Error fetching patients",
+  "errorFetchingUserProperties": "Error fetching user properties",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
+  "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
+  "female": "Female",
+  "filtersAppliedText": "search queries added",
+  "male": "Male",
+  "monthOfBirth": "Month of Birth",
+  "nextPage": "Next page",
+  "noPatientChartsFoundMessage": "Sorry, no patient charts were found",
+  "other": "Other",
+  "postcode": "Postcode",
+  "previousPage": "Previous page",
+  "recentSearchResultsCount_one": "{{count}} recent search result",
+  "recentSearchResultsCount_other": "{{count}} recent search results",
+  "refineSearch": "Refine search",
+  "refineSearchHeaderText": "Add additional search criteria",
+  "refineSearchTabletBannerText": "Can't find who you're looking for?",
+  "resetFields": "Reset fields",
+  "search": "Search",
+  "searchForPatient": "Search for a patient by name or identifier number",
+  "searchingText": "Searching...",
+  "searchLocationPersonAttribute": "Search location",
+  "searchPatient": "Search patient",
+  "searchResults": "Search results",
+  "searchResultsCount_one": "{{count}} search result",
+  "searchResultsCount_other": "{{count}} search results",
+  "selectOption": "Select an option",
+  "sex": "Sex",
+  "trySearchWithPatientUniqueID": "Try to search again using the patient's unique ID number",
+  "unknown": "Unknown",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
+  "yearOfBirth": "Year of Birth"
+}
diff --git a/packages/esm-patient-search-app/translations/pt.json b/packages/esm-patient-search-app/translations/pt.json
index 4c26db793..5b4811508 100644
--- a/packages/esm-patient-search-app/translations/pt.json
+++ b/packages/esm-patient-search-app/translations/pt.json
@@ -5,12 +5,16 @@
   "clear": "Limpar",
   "clearSearch": "Limpar",
   "closeSearch": "Fechar painel de pesquisa",
-  "countOfFiltersApplied": "filtros aplicados",
+  "countOfFiltersApplied_one": "{{count}} filtros aplicados",
+  "countOfFiltersApplied_other": "{{count}} filtros aplicados",
   "dayOfBirth": "Dia de Nascimento",
   "error": "Erro",
   "errorCopy": "Desculpe, ocorreu um erro. Você pode tentar recarregar esta página ou entrar em contato com o administrador do sistema providenciando o código de erro acima",
   "errorFetchingPatients": "Erro ao buscar utentes",
   "errorFetchingUserProperties": "Erro ao buscar propriedades dos utilizadores",
+  "errorLoadingAttribute": "Erro ao carregar tipo de atributo {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Erro ao carregar respostas de atributos de conceito",
+  "errorLoadingLocationsForAttribute": "Erro ao carregar localizações para o atributo pessoa {{attributeName}}",
   "errorUpdatingRecentlyViewedPatients": "Erro ao atualizar utentes visualizados recentemente",
   "female": "Feminino",
   "filtersAppliedText": "pesquisas adicionadas",
@@ -19,24 +23,26 @@
   "nextPage": "Próxima página",
   "noPatientChartsFoundMessage": "Desculpe, nenhum prontuário de utente foi encontrado",
   "other": "Outro",
-  "phoneNumber": "Número de Telefone",
   "postcode": "Caixa Postal",
   "previousPage": "Página anterior",
   "recentSearchResultsCount_one": "{{count}} resultado de pesquisa recente",
   "recentSearchResultsCount_other": "{{count}} resultados de pesquisa recente",
   "refineSearch": "Refinar a pesquisa",
   "refineSearchHeaderText": "Adicionar mais critérios de pesqusa",
-  "refineSearchTabletBannerText": "Não consegue encontrar a quem você está a procurar?",
+  "refineSearchTabletBannerText": "Não consegue encontrar a quem você procura?",
   "resetFields": "Redefinir campos",
   "search": "Pesquisar",
   "searchForPatient": "Pesquise um utente por nome ou identificador",
   "searchingText": "Pesquisando...",
+  "searchLocationPersonAttribute": "Procurar localização",
   "searchPatient": "Pesquisar Utente",
   "searchResults": "Resultados da pesquisa",
   "searchResultsCount_one": "{{count}} resultado da pesquisa",
   "searchResultsCount_other": "{{count}} resultados da pesquisa",
+  "selectOption": "Selecione uma opção",
   "sex": "Sexo",
   "trySearchWithPatientUniqueID": "Tente pesquisar novamente usando o número único de identificação do utente",
   "unknown": "Desconhecido",
+  "unsupportedAttributeFormat": "Formato de atributo não compatível: {{format}}",
   "yearOfBirth": "Ano de Nascimento"
 }
diff --git a/packages/esm-patient-search-app/translations/qu.json b/packages/esm-patient-search-app/translations/qu.json
index 6ab1b0c7b..72761ca8a 100644
--- a/packages/esm-patient-search-app/translations/qu.json
+++ b/packages/esm-patient-search-app/translations/qu.json
@@ -5,12 +5,16 @@
   "clear": "Clear",
   "clearSearch": "Clear",
   "closeSearch": "Close Search Panel",
-  "countOfFiltersApplied": "filters applied",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
   "dayOfBirth": "Day of Birth",
   "error": "Error",
   "errorCopy": "Sorry, there was a an error. You can try to reload this page, or contact the site administrator and quote the error code above.",
   "errorFetchingPatients": "Error fetching patients",
   "errorFetchingUserProperties": "Error fetching user properties",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
   "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
   "female": "Female",
   "filtersAppliedText": "search queries added",
@@ -19,7 +23,6 @@
   "nextPage": "Next page",
   "noPatientChartsFoundMessage": "Sorry, no patient charts were found",
   "other": "Other",
-  "phoneNumber": "Phone number",
   "postcode": "Postcode",
   "previousPage": "Previous page",
   "recentSearchResultsCount_one": "{{count}} recent search result",
@@ -31,12 +34,15 @@
   "search": "Search",
   "searchForPatient": "Search for a patient by name or identifier number",
   "searchingText": "Searching...",
+  "searchLocationPersonAttribute": "Search location",
   "searchPatient": "Search patient",
   "searchResults": "Search results",
   "searchResultsCount_one": "{{count}} search result",
   "searchResultsCount_other": "{{count}} search results",
+  "selectOption": "Select an option",
   "sex": "Sex",
   "trySearchWithPatientUniqueID": "Try to search again using the patient's unique ID number",
   "unknown": "Unknown",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
   "yearOfBirth": "Year of Birth"
 }
diff --git a/packages/esm-patient-search-app/translations/si.json b/packages/esm-patient-search-app/translations/si.json
index 6ab1b0c7b..72761ca8a 100644
--- a/packages/esm-patient-search-app/translations/si.json
+++ b/packages/esm-patient-search-app/translations/si.json
@@ -5,12 +5,16 @@
   "clear": "Clear",
   "clearSearch": "Clear",
   "closeSearch": "Close Search Panel",
-  "countOfFiltersApplied": "filters applied",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
   "dayOfBirth": "Day of Birth",
   "error": "Error",
   "errorCopy": "Sorry, there was a an error. You can try to reload this page, or contact the site administrator and quote the error code above.",
   "errorFetchingPatients": "Error fetching patients",
   "errorFetchingUserProperties": "Error fetching user properties",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
   "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
   "female": "Female",
   "filtersAppliedText": "search queries added",
@@ -19,7 +23,6 @@
   "nextPage": "Next page",
   "noPatientChartsFoundMessage": "Sorry, no patient charts were found",
   "other": "Other",
-  "phoneNumber": "Phone number",
   "postcode": "Postcode",
   "previousPage": "Previous page",
   "recentSearchResultsCount_one": "{{count}} recent search result",
@@ -31,12 +34,15 @@
   "search": "Search",
   "searchForPatient": "Search for a patient by name or identifier number",
   "searchingText": "Searching...",
+  "searchLocationPersonAttribute": "Search location",
   "searchPatient": "Search patient",
   "searchResults": "Search results",
   "searchResultsCount_one": "{{count}} search result",
   "searchResultsCount_other": "{{count}} search results",
+  "selectOption": "Select an option",
   "sex": "Sex",
   "trySearchWithPatientUniqueID": "Try to search again using the patient's unique ID number",
   "unknown": "Unknown",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
   "yearOfBirth": "Year of Birth"
 }
diff --git a/packages/esm-patient-search-app/translations/sw.json b/packages/esm-patient-search-app/translations/sw.json
index 6ab1b0c7b..72761ca8a 100644
--- a/packages/esm-patient-search-app/translations/sw.json
+++ b/packages/esm-patient-search-app/translations/sw.json
@@ -5,12 +5,16 @@
   "clear": "Clear",
   "clearSearch": "Clear",
   "closeSearch": "Close Search Panel",
-  "countOfFiltersApplied": "filters applied",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
   "dayOfBirth": "Day of Birth",
   "error": "Error",
   "errorCopy": "Sorry, there was a an error. You can try to reload this page, or contact the site administrator and quote the error code above.",
   "errorFetchingPatients": "Error fetching patients",
   "errorFetchingUserProperties": "Error fetching user properties",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
   "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
   "female": "Female",
   "filtersAppliedText": "search queries added",
@@ -19,7 +23,6 @@
   "nextPage": "Next page",
   "noPatientChartsFoundMessage": "Sorry, no patient charts were found",
   "other": "Other",
-  "phoneNumber": "Phone number",
   "postcode": "Postcode",
   "previousPage": "Previous page",
   "recentSearchResultsCount_one": "{{count}} recent search result",
@@ -31,12 +34,15 @@
   "search": "Search",
   "searchForPatient": "Search for a patient by name or identifier number",
   "searchingText": "Searching...",
+  "searchLocationPersonAttribute": "Search location",
   "searchPatient": "Search patient",
   "searchResults": "Search results",
   "searchResultsCount_one": "{{count}} search result",
   "searchResultsCount_other": "{{count}} search results",
+  "selectOption": "Select an option",
   "sex": "Sex",
   "trySearchWithPatientUniqueID": "Try to search again using the patient's unique ID number",
   "unknown": "Unknown",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
   "yearOfBirth": "Year of Birth"
 }
diff --git a/packages/esm-patient-search-app/translations/sw_KE.json b/packages/esm-patient-search-app/translations/sw_KE.json
index 6ab1b0c7b..72761ca8a 100644
--- a/packages/esm-patient-search-app/translations/sw_KE.json
+++ b/packages/esm-patient-search-app/translations/sw_KE.json
@@ -5,12 +5,16 @@
   "clear": "Clear",
   "clearSearch": "Clear",
   "closeSearch": "Close Search Panel",
-  "countOfFiltersApplied": "filters applied",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
   "dayOfBirth": "Day of Birth",
   "error": "Error",
   "errorCopy": "Sorry, there was a an error. You can try to reload this page, or contact the site administrator and quote the error code above.",
   "errorFetchingPatients": "Error fetching patients",
   "errorFetchingUserProperties": "Error fetching user properties",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
   "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
   "female": "Female",
   "filtersAppliedText": "search queries added",
@@ -19,7 +23,6 @@
   "nextPage": "Next page",
   "noPatientChartsFoundMessage": "Sorry, no patient charts were found",
   "other": "Other",
-  "phoneNumber": "Phone number",
   "postcode": "Postcode",
   "previousPage": "Previous page",
   "recentSearchResultsCount_one": "{{count}} recent search result",
@@ -31,12 +34,15 @@
   "search": "Search",
   "searchForPatient": "Search for a patient by name or identifier number",
   "searchingText": "Searching...",
+  "searchLocationPersonAttribute": "Search location",
   "searchPatient": "Search patient",
   "searchResults": "Search results",
   "searchResultsCount_one": "{{count}} search result",
   "searchResultsCount_other": "{{count}} search results",
+  "selectOption": "Select an option",
   "sex": "Sex",
   "trySearchWithPatientUniqueID": "Try to search again using the patient's unique ID number",
   "unknown": "Unknown",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
   "yearOfBirth": "Year of Birth"
 }
diff --git a/packages/esm-patient-search-app/translations/tr.json b/packages/esm-patient-search-app/translations/tr.json
index 6ab1b0c7b..72761ca8a 100644
--- a/packages/esm-patient-search-app/translations/tr.json
+++ b/packages/esm-patient-search-app/translations/tr.json
@@ -5,12 +5,16 @@
   "clear": "Clear",
   "clearSearch": "Clear",
   "closeSearch": "Close Search Panel",
-  "countOfFiltersApplied": "filters applied",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
   "dayOfBirth": "Day of Birth",
   "error": "Error",
   "errorCopy": "Sorry, there was a an error. You can try to reload this page, or contact the site administrator and quote the error code above.",
   "errorFetchingPatients": "Error fetching patients",
   "errorFetchingUserProperties": "Error fetching user properties",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
   "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
   "female": "Female",
   "filtersAppliedText": "search queries added",
@@ -19,7 +23,6 @@
   "nextPage": "Next page",
   "noPatientChartsFoundMessage": "Sorry, no patient charts were found",
   "other": "Other",
-  "phoneNumber": "Phone number",
   "postcode": "Postcode",
   "previousPage": "Previous page",
   "recentSearchResultsCount_one": "{{count}} recent search result",
@@ -31,12 +34,15 @@
   "search": "Search",
   "searchForPatient": "Search for a patient by name or identifier number",
   "searchingText": "Searching...",
+  "searchLocationPersonAttribute": "Search location",
   "searchPatient": "Search patient",
   "searchResults": "Search results",
   "searchResultsCount_one": "{{count}} search result",
   "searchResultsCount_other": "{{count}} search results",
+  "selectOption": "Select an option",
   "sex": "Sex",
   "trySearchWithPatientUniqueID": "Try to search again using the patient's unique ID number",
   "unknown": "Unknown",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
   "yearOfBirth": "Year of Birth"
 }
diff --git a/packages/esm-patient-search-app/translations/tr_TR.json b/packages/esm-patient-search-app/translations/tr_TR.json
index 6ab1b0c7b..72761ca8a 100644
--- a/packages/esm-patient-search-app/translations/tr_TR.json
+++ b/packages/esm-patient-search-app/translations/tr_TR.json
@@ -5,12 +5,16 @@
   "clear": "Clear",
   "clearSearch": "Clear",
   "closeSearch": "Close Search Panel",
-  "countOfFiltersApplied": "filters applied",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
   "dayOfBirth": "Day of Birth",
   "error": "Error",
   "errorCopy": "Sorry, there was a an error. You can try to reload this page, or contact the site administrator and quote the error code above.",
   "errorFetchingPatients": "Error fetching patients",
   "errorFetchingUserProperties": "Error fetching user properties",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
   "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
   "female": "Female",
   "filtersAppliedText": "search queries added",
@@ -19,7 +23,6 @@
   "nextPage": "Next page",
   "noPatientChartsFoundMessage": "Sorry, no patient charts were found",
   "other": "Other",
-  "phoneNumber": "Phone number",
   "postcode": "Postcode",
   "previousPage": "Previous page",
   "recentSearchResultsCount_one": "{{count}} recent search result",
@@ -31,12 +34,15 @@
   "search": "Search",
   "searchForPatient": "Search for a patient by name or identifier number",
   "searchingText": "Searching...",
+  "searchLocationPersonAttribute": "Search location",
   "searchPatient": "Search patient",
   "searchResults": "Search results",
   "searchResultsCount_one": "{{count}} search result",
   "searchResultsCount_other": "{{count}} search results",
+  "selectOption": "Select an option",
   "sex": "Sex",
   "trySearchWithPatientUniqueID": "Try to search again using the patient's unique ID number",
   "unknown": "Unknown",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
   "yearOfBirth": "Year of Birth"
 }
diff --git a/packages/esm-patient-search-app/translations/uk.json b/packages/esm-patient-search-app/translations/uk.json
index 6ab1b0c7b..72761ca8a 100644
--- a/packages/esm-patient-search-app/translations/uk.json
+++ b/packages/esm-patient-search-app/translations/uk.json
@@ -5,12 +5,16 @@
   "clear": "Clear",
   "clearSearch": "Clear",
   "closeSearch": "Close Search Panel",
-  "countOfFiltersApplied": "filters applied",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
   "dayOfBirth": "Day of Birth",
   "error": "Error",
   "errorCopy": "Sorry, there was a an error. You can try to reload this page, or contact the site administrator and quote the error code above.",
   "errorFetchingPatients": "Error fetching patients",
   "errorFetchingUserProperties": "Error fetching user properties",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
   "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
   "female": "Female",
   "filtersAppliedText": "search queries added",
@@ -19,7 +23,6 @@
   "nextPage": "Next page",
   "noPatientChartsFoundMessage": "Sorry, no patient charts were found",
   "other": "Other",
-  "phoneNumber": "Phone number",
   "postcode": "Postcode",
   "previousPage": "Previous page",
   "recentSearchResultsCount_one": "{{count}} recent search result",
@@ -31,12 +34,15 @@
   "search": "Search",
   "searchForPatient": "Search for a patient by name or identifier number",
   "searchingText": "Searching...",
+  "searchLocationPersonAttribute": "Search location",
   "searchPatient": "Search patient",
   "searchResults": "Search results",
   "searchResultsCount_one": "{{count}} search result",
   "searchResultsCount_other": "{{count}} search results",
+  "selectOption": "Select an option",
   "sex": "Sex",
   "trySearchWithPatientUniqueID": "Try to search again using the patient's unique ID number",
   "unknown": "Unknown",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
   "yearOfBirth": "Year of Birth"
 }
diff --git a/packages/esm-patient-search-app/translations/vi.json b/packages/esm-patient-search-app/translations/vi.json
index 2a7d57777..211157c1d 100644
--- a/packages/esm-patient-search-app/translations/vi.json
+++ b/packages/esm-patient-search-app/translations/vi.json
@@ -5,12 +5,16 @@
   "clear": "Xóa",
   "clearSearch": "Xóa",
   "closeSearch": "Đóng bảng điều khiển",
-  "countOfFiltersApplied": "bộ lọc được áp dụng",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
   "dayOfBirth": "Ngày sinh",
   "error": "Lỗi",
   "errorCopy": "Xin lỗi, đã xảy ra lỗi. Bạn có thể thử tải lại trang này hoặc liên hệ với quản trị viên trang web và trích dẫn mã lỗi ở trên.",
   "errorFetchingPatients": "Lỗi khi lấy danh sách bệnh nhân",
   "errorFetchingUserProperties": "Lỗi khi tìm nạp thuộc tính người dùng",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
   "errorUpdatingRecentlyViewedPatients": "Lỗi khi cập nhật bệnh nhân đã xem gần đây",
   "female": "Nữ",
   "filtersAppliedText": "truy vấn tìm kiếm được thêm vào",
@@ -19,7 +23,6 @@
   "nextPage": "Trang tiếp theo",
   "noPatientChartsFoundMessage": "Xin lỗi, không tìm thấy biểu đồ bệnh nhân",
   "other": "Khác",
-  "phoneNumber": "Số điện thoại",
   "postcode": "Mã bưu chính",
   "previousPage": "Trang trước",
   "recentSearchResultsCount_one": "{{count}} kết quả tìm kiếm gần đây",
@@ -31,12 +34,15 @@
   "search": "Tìm kiếm",
   "searchForPatient": "Tìm kiếm bệnh nhân theo tên hoặc số định danh",
   "searchingText": "Đang tìm kiếm",
+  "searchLocationPersonAttribute": "Search location",
   "searchPatient": "Tìm kiếm bệnh nhân",
   "searchResults": "Kết quả tìm kiếm",
   "searchResultsCount_one": "{{count}} kết quả tìm kiếm",
   "searchResultsCount_other": "{{count}} kết quả tìm kiếm",
+  "selectOption": "Select an option",
   "sex": "Giới tính",
   "trySearchWithPatientUniqueID": "Hãy thử tìm kiếm lại bằng cách sử dụng số ID duy nhất của bệnh nhân",
   "unknown": "Không rõ",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
   "yearOfBirth": "Năm sinh"
 }
diff --git a/packages/esm-patient-search-app/translations/zh.json b/packages/esm-patient-search-app/translations/zh.json
index f10dc1371..6ffb7dd50 100644
--- a/packages/esm-patient-search-app/translations/zh.json
+++ b/packages/esm-patient-search-app/translations/zh.json
@@ -5,12 +5,16 @@
   "clear": "清除",
   "clearSearch": "清除",
   "closeSearch": "关闭搜索面板",
-  "countOfFiltersApplied": "已应用筛选器",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
   "dayOfBirth": "出生日期",
   "error": "错误",
   "errorCopy": "抱歉，发生了一个错误。您可以尝试重新加载此页面，或联系网站管理员并引用上面的错误代码。",
   "errorFetchingPatients": "Error fetching patients",
   "errorFetchingUserProperties": "Error fetching user properties",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
   "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
   "female": "女性",
   "filtersAppliedText": "搜索查询已添加",
@@ -19,7 +23,6 @@
   "nextPage": "下一页",
   "noPatientChartsFoundMessage": "抱歉，未找到患者记录。",
   "other": "其他",
-  "phoneNumber": "电话号码",
   "postcode": "邮政编码",
   "previousPage": "上一页",
   "recentSearchResultsCount_one": "{{count}}最近的搜索结果",
@@ -31,12 +34,15 @@
   "search": "搜索",
   "searchForPatient": "按照姓名或ID标识搜索患者",
   "searchingText": "搜索中...",
+  "searchLocationPersonAttribute": "Search location",
   "searchPatient": "Search patient",
   "searchResults": "Search results",
   "searchResultsCount_one": "{{count}}搜索结果",
   "searchResultsCount_other": "{{count}}搜索结果",
+  "selectOption": "Select an option",
   "sex": "性别",
   "trySearchWithPatientUniqueID": "尝试使用患者的唯一ID再次进行搜索",
   "unknown": "未知",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
   "yearOfBirth": "出生年份"
 }
diff --git a/packages/esm-patient-search-app/translations/zh_CN.json b/packages/esm-patient-search-app/translations/zh_CN.json
index f10dc1371..6ffb7dd50 100644
--- a/packages/esm-patient-search-app/translations/zh_CN.json
+++ b/packages/esm-patient-search-app/translations/zh_CN.json
@@ -5,12 +5,16 @@
   "clear": "清除",
   "clearSearch": "清除",
   "closeSearch": "关闭搜索面板",
-  "countOfFiltersApplied": "已应用筛选器",
+  "countOfFiltersApplied_one": "{{count}} filters applied",
+  "countOfFiltersApplied_other": "{{count}} filters applied",
   "dayOfBirth": "出生日期",
   "error": "错误",
   "errorCopy": "抱歉，发生了一个错误。您可以尝试重新加载此页面，或联系网站管理员并引用上面的错误代码。",
   "errorFetchingPatients": "Error fetching patients",
   "errorFetchingUserProperties": "Error fetching user properties",
+  "errorLoadingAttribute": "Error loading attribute type {{attributeUuid}}",
+  "errorLoadingConceptAttributeAnswers": "Error loading concept attribute answers",
+  "errorLoadingLocationsForAttribute": "Error loading locations for person attribute {{attributeName}}",
   "errorUpdatingRecentlyViewedPatients": "Error updating recently viewed patients",
   "female": "女性",
   "filtersAppliedText": "搜索查询已添加",
@@ -19,7 +23,6 @@
   "nextPage": "下一页",
   "noPatientChartsFoundMessage": "抱歉，未找到患者记录。",
   "other": "其他",
-  "phoneNumber": "电话号码",
   "postcode": "邮政编码",
   "previousPage": "上一页",
   "recentSearchResultsCount_one": "{{count}}最近的搜索结果",
@@ -31,12 +34,15 @@
   "search": "搜索",
   "searchForPatient": "按照姓名或ID标识搜索患者",
   "searchingText": "搜索中...",
+  "searchLocationPersonAttribute": "Search location",
   "searchPatient": "Search patient",
   "searchResults": "Search results",
   "searchResultsCount_one": "{{count}}搜索结果",
   "searchResultsCount_other": "{{count}}搜索结果",
+  "selectOption": "Select an option",
   "sex": "性别",
   "trySearchWithPatientUniqueID": "尝试使用患者的唯一ID再次进行搜索",
   "unknown": "未知",
+  "unsupportedAttributeFormat": "Unsupported attribute format: {{format}}",
   "yearOfBirth": "出生年份"
 }
diff --git a/packages/esm-service-queues-app/package.json b/packages/esm-service-queues-app/package.json
index 949e986e4..6650bad2e 100644
--- a/packages/esm-service-queues-app/package.json
+++ b/packages/esm-service-queues-app/package.json
@@ -37,7 +37,7 @@
     "url": "https://github.com/openmrs/openmrs-esm-patient-management/issues"
   },
   "dependencies": {
-    "@carbon/react": "~1.37.0",
+    "@carbon/react": "^1.71.0",
     "lodash-es": "^4.17.15"
   },
   "peerDependencies": {
diff --git a/packages/esm-service-queues-app/src/active-visits/active-visits-table.resource.ts b/packages/esm-service-queues-app/src/active-visits/active-visits-table.resource.ts
index 587096787..d87634b57 100644
--- a/packages/esm-service-queues-app/src/active-visits/active-visits-table.resource.ts
+++ b/packages/esm-service-queues-app/src/active-visits/active-visits-table.resource.ts
@@ -193,68 +193,6 @@ export function useServiceQueueEntries(service: string, locationUuid: string) {
   };
 }
 
-export async function postQueueEntry(
-  visitUuid: string,
-  queueUuid: string,
-  patientUuid: string,
-  priority: string,
-  status: string,
-  sortWeight: number,
-  locationUuid: string,
-  visitQueueNumberAttributeUuid: string,
-) {
-  const abortController = new AbortController();
-
-  await Promise.all([generateVisitQueueNumber(locationUuid, visitUuid, queueUuid, visitQueueNumberAttributeUuid)]);
-
-  return openmrsFetch(`${restBaseUrl}/visit-queue-entry`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    signal: abortController.signal,
-    body: {
-      visit: { uuid: visitUuid },
-      queueEntry: {
-        status: {
-          uuid: status,
-        },
-        priority: {
-          uuid: priority,
-        },
-        queue: {
-          uuid: queueUuid,
-        },
-        patient: {
-          uuid: patientUuid,
-        },
-        startedAt: new Date(),
-        sortWeight: sortWeight,
-      },
-    },
-  });
-}
-
-export async function generateVisitQueueNumber(
-  location: string,
-  visitUuid: string,
-  queueUuid: string,
-  visitQueueNumberAttributeUuid: string,
-) {
-  const abortController = new AbortController();
-
-  await openmrsFetch(
-    `${restBaseUrl}/queue-entry-number?location=${location}&queue=${queueUuid}&visit=${visitUuid}&visitAttributeType=${visitQueueNumberAttributeUuid}`,
-    {
-      method: 'GET',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      signal: abortController.signal,
-    },
-  );
-}
-
 export function serveQueueEntry(servicePointName: string, ticketNumber: string, status: string) {
   const abortController = new AbortController();
 
diff --git a/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx b/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx
index e9d9bad2a..6477d75ed 100644
--- a/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx
+++ b/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx
@@ -25,7 +25,7 @@ import { type ConfigObject } from '../config-schema';
 import { useQueues } from '../hooks/useQueues';
 import { updateQueueEntry } from './active-visits-table.resource';
 import { useMutateQueueEntries } from '../hooks/useQueueEntries';
-import { useQueueLocations } from '../patient-search/hooks/useQueueLocations';
+import { useQueueLocations } from '../create-queue-entry/hooks/useQueueLocations';
 import styles from './change-status-dialog.scss';
 
 interface ChangeStatusDialogProps {
@@ -46,7 +46,7 @@ const ChangeStatus: React.FC<ChangeStatusDialogProps> = ({ queueEntry, closeModa
         service: z.string({ required_error: t('serviceIsRequired', 'Service is required') }),
         status: z.string({ required_error: t('statusIsRequired', 'Status is required') }),
       }),
-    [],
+    [t],
   );
 
   type ChangeStatusForm = z.infer<typeof schema>;
diff --git a/packages/esm-service-queues-app/src/active-visits/change-status-dialog.test.tsx b/packages/esm-service-queues-app/src/active-visits/change-status-dialog.test.tsx
index 917411b60..4f0063a93 100644
--- a/packages/esm-service-queues-app/src/active-visits/change-status-dialog.test.tsx
+++ b/packages/esm-service-queues-app/src/active-visits/change-status-dialog.test.tsx
@@ -14,18 +14,18 @@ import { configSchema, type ConfigObject } from '../config-schema';
 import { updateQueueEntry } from './active-visits-table.resource';
 import ChangeStatus from './change-status-dialog.component';
 
-const mockUseConfig = jest.mocked(useConfig<ConfigObject>);
 const mockShowSnackbar = jest.mocked(showSnackbar);
 const mockUpdateQueueEntry = jest.mocked(updateQueueEntry);
-const mockUseSession = jest.mocked(useSession);
+const mockUseConfig = jest.mocked(useConfig<ConfigObject>);
 const mockUseLocations = jest.mocked(useLocations);
+const mockUseSession = jest.mocked(useSession);
 
 jest.mock('./active-visits-table.resource', () => ({
   ...jest.requireActual('./active-visits-table.resource'),
   updateQueueEntry: jest.fn(),
 }));
 
-jest.mock('../patient-search/hooks/useQueueLocations', () => {
+jest.mock('../create-queue-entry/hooks/useQueueLocations', () => {
   return {
     useQueueLocations: jest.fn().mockReturnValue({
       queueLocations: mockLocations.data?.results.map((location) => ({ ...location, id: location.uuid })),
@@ -40,6 +40,8 @@ jest.mock('../hooks/useQueues', () => {
 });
 
 describe('ChangeStatusDialog', () => {
+  let consoleSpy: jest.SpyInstance;
+
   beforeEach(() => {
     mockUseConfig.mockReturnValue({
       ...getDefaultsFromConfigSchema(configSchema),
@@ -47,6 +49,12 @@ describe('ChangeStatusDialog', () => {
     } as ConfigObject);
     mockUseLocations.mockReturnValue(mockLocations.data.results);
     mockUseSession.mockReturnValue(mockSession.data);
+
+    consoleSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
+  });
+
+  afterEach(() => {
+    consoleSpy.mockRestore();
   });
 
   it('should update a queue entry and display toast message', async () => {
diff --git a/packages/esm-service-queues-app/src/add-patient-toqueue/add-patient-toqueue-dialog.component.tsx b/packages/esm-service-queues-app/src/add-patient-toqueue/add-patient-toqueue-dialog.component.tsx
deleted file mode 100644
index 9aa866a0f..000000000
--- a/packages/esm-service-queues-app/src/add-patient-toqueue/add-patient-toqueue-dialog.component.tsx
+++ /dev/null
@@ -1,228 +0,0 @@
-import React, { useCallback, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  Button,
-  Form,
-  InlineNotification,
-  ModalBody,
-  ModalFooter,
-  ModalHeader,
-  Select,
-  SelectItem,
-  RadioButtonGroup,
-  RadioButton,
-  RadioButtonSkeleton,
-  SelectSkeleton,
-} from '@carbon/react';
-import { showSnackbar, useConfig } from '@openmrs/esm-framework';
-import { postQueueEntry } from '../active-visits/active-visits-table.resource';
-import { type ActiveVisit } from '../visits-missing-inqueue/visits-missing-inqueue.resource';
-import { useQueueLocations } from '../patient-search/hooks/useQueueLocations';
-import { useQueues } from '../hooks/useQueues';
-import { useMutateQueueEntries } from '../hooks/useQueueEntries';
-import { type ConfigObject } from '../config-schema';
-import styles from './add-patient-toqueue-dialog.scss';
-
-interface AddVisitToQueueDialogProps {
-  visitDetails: ActiveVisit;
-  closeModal: () => void;
-}
-
-const AddVisitToQueue: React.FC<AddVisitToQueueDialogProps> = ({ visitDetails, closeModal }) => {
-  const { t } = useTranslation();
-
-  const visitUuid = visitDetails?.visitUuid;
-  const [queueUuid, setQueueUuid] = useState('');
-  const patientUuid = visitDetails?.patientUuid;
-  const patientName = visitDetails?.name;
-  const patientAge = visitDetails?.age;
-  const patientSex = visitDetails?.gender;
-  const [selectedQueueLocation, setSelectedQueueLocation] = useState('');
-  const { queues, isLoading: isLoadingQueues } = useQueues(selectedQueueLocation);
-  const { queueLocations, isLoading: isLoadingQueueLocations } = useQueueLocations();
-  const [isMissingPriority, setIsMissingPriority] = useState(false);
-  const [isMissingService, setIsMissingService] = useState(false);
-  const config = useConfig<ConfigObject>();
-  const { mutateQueueEntries } = useMutateQueueEntries();
-  const [priority, setPriority] = useState(config.concepts.defaultPriorityConceptUuid);
-  const priorities = queues.find((q) => q.uuid === queueUuid)?.allowedPriorities ?? [];
-
-  const addVisitToQueue = useCallback(() => {
-    if (!queueUuid) {
-      setIsMissingService(true);
-      return;
-    }
-    setIsMissingService(false);
-
-    if (!priority) {
-      setIsMissingPriority(true);
-      return;
-    }
-    setIsMissingPriority(false);
-    const emergencyPriorityConceptUuid = config.concepts.emergencyPriorityConceptUuid;
-    const sortWeight = priority === emergencyPriorityConceptUuid ? 1.0 : 0.0;
-    const status = config.concepts.defaultStatusConceptUuid;
-    const visitQueueNumberAttributeUuid = config.visitQueueNumberAttributeUuid;
-
-    postQueueEntry(
-      visitUuid,
-      queueUuid,
-      patientUuid,
-      priority,
-      status,
-      sortWeight,
-      selectedQueueLocation,
-      visitQueueNumberAttributeUuid,
-    ).then(
-      ({ status }) => {
-        if (status === 201) {
-          showSnackbar({
-            isLowContrast: true,
-            title: t('addEntry', 'Add entry'),
-            kind: 'success',
-            subtitle: t('queueEntryAddedSuccessfully', 'Queue entry added successfully'),
-          });
-          closeModal();
-          mutateQueueEntries();
-        }
-      },
-      (error) => {
-        showSnackbar({
-          title: t('queueEntryAddFailed', 'Error adding queue entry status'),
-          kind: 'error',
-          isLowContrast: false,
-          subtitle: error?.message,
-        });
-      },
-    );
-  }, [
-    queueUuid,
-    priority,
-    config.concepts.emergencyPriorityConceptUuid,
-    config.concepts.defaultStatusConceptUuid,
-    config.visitQueueNumberAttributeUuid,
-    visitUuid,
-    patientUuid,
-    selectedQueueLocation,
-    t,
-    closeModal,
-    mutateQueueEntries,
-  ]);
-
-  return (
-    <div>
-      <ModalHeader closeModal={closeModal} title={t('addVisitToQueue', 'Add Visit To Queue?')} />
-      <ModalBody>
-        <Form onSubmit={addVisitToQueue}>
-          <div className={styles.modalBody}>
-            <h5>
-              {patientName} &nbsp; · &nbsp;{patientSex} &nbsp; · &nbsp;{patientAge}&nbsp;{t('years', 'Years')}
-            </h5>
-          </div>
-          <section>
-            {isLoadingQueueLocations ? (
-              <SelectSkeleton />
-            ) : (
-              <Select
-                labelText={t('selectQueueLocation', 'Select a queue location')}
-                id="location"
-                invalidText="Required"
-                value={selectedQueueLocation}
-                onChange={(event) => setSelectedQueueLocation(event.target.value)}>
-                {!selectedQueueLocation ? (
-                  <SelectItem text={t('selectQueueLocation', 'Select a queue location')} value="" />
-                ) : null}
-                {queueLocations?.length > 0 &&
-                  queueLocations.map((location) => (
-                    <SelectItem key={location.id} text={location.name} value={location.id}>
-                      {location.name}
-                    </SelectItem>
-                  ))}
-              </Select>
-            )}
-          </section>
-
-          <section className={styles.section}>
-            <div className={styles.sectionTitle}>{t('queueService', 'Queue service')}</div>
-            {isLoadingQueues ? (
-              <SelectSkeleton />
-            ) : (
-              <Select
-                labelText={t('selectService', 'Select a service')}
-                id="service"
-                invalidText="Required"
-                value={queueUuid}
-                onChange={(event) => setQueueUuid(event.target.value)}>
-                {!queueUuid ? <SelectItem text={t('chooseService', 'Select a service')} value="" /> : null}
-                {queues?.length > 0 &&
-                  queues.map((service) => (
-                    <SelectItem key={service.uuid} text={service.display} value={service.uuid}>
-                      {service.display}
-                    </SelectItem>
-                  ))}
-              </Select>
-            )}
-          </section>
-          {isMissingService && (
-            <section>
-              <InlineNotification
-                style={{ margin: '0', minWidth: '100%' }}
-                kind="error"
-                lowContrast={true}
-                title={t('pleaseSelectService', 'Please select a service')}
-              />
-            </section>
-          )}
-
-          <section className={styles.section}>
-            <div className={styles.sectionTitle}>{t('queueStatus', 'Queue status')}</div>
-            {isLoadingQueues ? (
-              <RadioButtonGroup>
-                <RadioButtonSkeleton />
-                <RadioButtonSkeleton />
-                <RadioButtonSkeleton />
-              </RadioButtonGroup>
-            ) : !priorities?.length ? (
-              <InlineNotification
-                className={styles.inlineNotification}
-                kind={'error'}
-                lowContrast
-                subtitle={t('configurePriorities', 'Please configure priorities to continue.')}
-                title={t('noPriorityFound', 'No priority found')}
-              />
-            ) : (
-              <RadioButtonGroup
-                className={styles.radioButtonWrapper}
-                name="priority"
-                defaultSelected={priority}
-                onChange={(uuid) => {
-                  setPriority(uuid);
-                }}>
-                {priorities?.length > 0 &&
-                  priorities.map(({ uuid, display }) => <RadioButton key={uuid} labelText={display} value={uuid} />)}
-              </RadioButtonGroup>
-            )}
-          </section>
-          {isMissingPriority && (
-            <section>
-              <InlineNotification
-                style={{ margin: '0', minWidth: '100%' }}
-                kind="error"
-                lowContrast={true}
-                title={t('missingPriority', 'Please select a priority')}
-              />
-            </section>
-          )}
-        </Form>
-      </ModalBody>
-      <ModalFooter>
-        <Button kind="secondary" onClick={closeModal}>
-          {t('cancel', 'Cancel')}
-        </Button>
-        <Button onClick={addVisitToQueue}>{t('save', 'Save')}</Button>
-      </ModalFooter>
-    </div>
-  );
-};
-
-export default AddVisitToQueue;
diff --git a/packages/esm-service-queues-app/src/add-patient-toqueue/add-patient-toqueue-dialog.scss b/packages/esm-service-queues-app/src/add-patient-toqueue/add-patient-toqueue-dialog.scss
deleted file mode 100644
index 467a0557e..000000000
--- a/packages/esm-service-queues-app/src/add-patient-toqueue/add-patient-toqueue-dialog.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-@use '@carbon/layout';
-@use '@carbon/type';
-@use '@openmrs/esm-styleguide/src/vars' as *;
-
-.radioButtonGroup {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  margin-top: layout.$spacing-03;
-  min-height: layout.$spacing-10;
-  width: 100%;
-  @include type.type-style('body-compact-01');
-}
-
-.radioButton {
-  padding: layout.$spacing-02 layout.$spacing-02;
-  margin: layout.$spacing-03 0;
-}
-
-section {
-  margin: layout.$spacing-03;
-}
-
-.sectionTitle {
-  @include type.type-style('heading-compact-02');
-  color: $text-02;
-  margin-bottom: layout.$spacing-04;
-}
-
-.modalBody {
-  padding-bottom: layout.$spacing-05;
-}
diff --git a/packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.component.tsx b/packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.component.tsx
index 8496ab5ba..8b3bd0698 100644
--- a/packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.component.tsx
+++ b/packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.component.tsx
@@ -13,7 +13,7 @@ import {
   SelectItem,
 } from '@carbon/react';
 import { showSnackbar } from '@openmrs/esm-framework';
-import { useQueueLocations } from '../patient-search/hooks/useQueueLocations';
+import { useQueueLocations } from '../create-queue-entry/hooks/useQueueLocations';
 import {
   addProviderToQueueRoom,
   updateProviderToQueueRoom,
@@ -35,20 +35,21 @@ import useQueueServices from '../hooks/useQueueService';
 import styles from './add-provider-queue-room.scss';
 
 interface AddProviderQueueRoomProps {
-  providerUuid: string;
   closeModal: () => void;
+  providerUuid: string;
 }
 
-const AddProviderQueueRoom: React.FC<AddProviderQueueRoomProps> = ({ providerUuid, closeModal }) => {
+const AddProviderQueueRoom: React.FC<AddProviderQueueRoomProps> = ({ closeModal, providerUuid }) => {
   const { t } = useTranslation();
-
+  const { providerRoom } = useProvidersQueueRoom(providerUuid);
+  const currentIsPermanentProviderQueueRoom = useIsPermanentProviderQueueRoom() ?? false;
   const currentLocationName = useSelectedQueueLocationName();
   const currentLocationUuid = useSelectedQueueLocationUuid();
   const currentService = useSelectedService();
-  const currentIsPermanentProviderQueueRoom = useIsPermanentProviderQueueRoom();
-  const { providerRoom } = useProvidersQueueRoom(providerUuid);
-  const [queueRoomUuid, setQueueRoomUuid] = useState('');
+
+  const [isMissingQueueRoom, setIsMissingQueueRoom] = useState(false);
   const [queueProviderMapUuid, setQueueProviderMapUuid] = useState('');
+  const [queueRoomUuid, setQueueRoomUuid] = useState('');
 
   useEffect(() => {
     if (providerRoom?.length > 0) {
@@ -58,10 +59,9 @@ const AddProviderQueueRoom: React.FC<AddProviderQueueRoomProps> = ({ providerUui
   }, [providerRoom]);
 
   const { mutate } = useProvidersQueueRoom(providerUuid);
-  const { services } = useQueueServices();
-  const { rooms } = useQueueRooms(currentLocationUuid, currentService?.serviceUuid);
   const { queueLocations } = useQueueLocations();
-  const [isMissingQueueRoom, setIsMissingQueueRoom] = useState(false);
+  const { rooms } = useQueueRooms(currentLocationUuid, currentService?.serviceUuid);
+  const { services } = useQueueServices();
 
   const handleServiceChange = ({ selectedItem }) => {
     localStorage.setItem('queueServiceName', selectedItem.name);
@@ -90,19 +90,17 @@ const AddProviderQueueRoom: React.FC<AddProviderQueueRoomProps> = ({ providerUui
 
     if (providerRoom?.length > 0) {
       updateProviderToQueueRoom(queueProviderMapUuid, queueRoomUuid, providerUuid).then(
-        ({ status }) => {
-          if (status === 200) {
-            showSnackbar({
-              isLowContrast: true,
-              title: t('updateRoom', 'Update room'),
-              kind: 'success',
-              subtitle: t('queueRoomUpdatedSuccessfully', 'Queue room updated successfully'),
-            });
-            closeModal();
-            localStorage.setItem('lastUpdatedQueueRoomTimestamp', new Date().toString());
-            updatedSelectedQueueRoomTimestamp(new Date());
-            mutate();
-          }
+        () => {
+          showSnackbar({
+            isLowContrast: true,
+            title: t('updateRoom', 'Update room'),
+            kind: 'success',
+            subtitle: t('queueRoomUpdatedSuccessfully', 'Queue room updated successfully'),
+          });
+          closeModal();
+          localStorage.setItem('lastUpdatedQueueRoomTimestamp', new Date().toString());
+          updatedSelectedQueueRoomTimestamp(new Date());
+          mutate();
         },
         (error) => {
           showSnackbar({
@@ -116,19 +114,17 @@ const AddProviderQueueRoom: React.FC<AddProviderQueueRoomProps> = ({ providerUui
       );
     } else {
       addProviderToQueueRoom(queueRoomUuid, providerUuid).then(
-        ({ status }) => {
-          if (status === 201) {
-            showSnackbar({
-              isLowContrast: true,
-              title: t('addRoom', 'Add room'),
-              kind: 'success',
-              subtitle: t('queueRoomAddedSuccessfully', 'Queue room added successfully'),
-            });
-            closeModal();
-            localStorage.setItem('lastUpdatedQueueRoomTimestamp', new Date().toString());
-            updatedSelectedQueueRoomTimestamp(new Date());
-            mutate();
-          }
+        () => {
+          showSnackbar({
+            isLowContrast: true,
+            title: t('addRoom', 'Add room'),
+            kind: 'success',
+            subtitle: t('queueRoomAddedSuccessfully', 'Queue room added successfully'),
+          });
+          closeModal();
+          localStorage.setItem('lastUpdatedQueueRoomTimestamp', new Date().toString());
+          updatedSelectedQueueRoomTimestamp(new Date());
+          mutate();
         },
         (error) => {
           showSnackbar({
@@ -149,31 +145,31 @@ const AddProviderQueueRoom: React.FC<AddProviderQueueRoomProps> = ({ providerUui
         <Form onSubmit={onSubmit}>
           <section className={styles.section}>
             <Dropdown
-              id="queueLocation"
               aria-label={t('selectQueueLocation', 'Select a queue location')}
-              label=""
-              titleText={t('queueLocation', 'Queue location')}
-              type="default"
+              id="queueLocation"
+              initialSelectedItem={{ uuid: currentLocationUuid, name: currentLocationName }}
               items={queueLocations}
               itemToString={(item) => (item ? item.name : '')}
+              label=""
               onChange={handleQueueLocationChange}
               size="md"
-              initialSelectedItem={{ uuid: currentLocationUuid, name: currentLocationName }}
+              titleText={t('queueLocation', 'Queue location')}
+              type="default"
             />
           </section>
 
           <section className={styles.section}>
             <Dropdown
-              id="service"
               aria-label={t('selectService', 'Select a service')}
-              type="default"
-              label=""
-              titleText={t('queueService', 'Queue service')}
+              id="service"
+              initialSelectedItem={{ uuid: currentService?.serviceUuid, display: currentService?.serviceDisplay }}
               items={services ?? []}
               itemToString={(item) => (item ? item.display : '')}
+              label=""
               onChange={handleServiceChange}
               size="md"
-              initialSelectedItem={{ uuid: currentService?.serviceUuid, display: currentService?.serviceDisplay }}
+              titleText={t('queueService', 'Queue service')}
+              type="default"
             />
           </section>
 
@@ -181,15 +177,14 @@ const AddProviderQueueRoom: React.FC<AddProviderQueueRoomProps> = ({ providerUui
             <div className={styles.sectionTitle}>{t('queueRoom', 'Queue room')}</div>
             <div className={styles.filterContainer}>
               <Select
-                labelText={t('selectRoom', 'Select a room')}
                 id="service"
                 invalidText="Required"
-                value={queueRoomUuid}
-                defaultValue={queueRoomUuid}
+                labelText={t('selectRoom', 'Select a room')}
                 onChange={(event) => {
                   setQueueRoomUuid(event.target.value);
                   localStorage.setItem('lastUpdatedQueueRoomTimestamp', new Date().toString());
-                }}>
+                }}
+                value={queueRoomUuid}>
                 {!queueRoomUuid ? <SelectItem text={t('chooseRoom', 'Select a room')} value="" /> : null}
                 {rooms?.length > 0 &&
                   rooms.map((room) => (
@@ -213,11 +208,11 @@ const AddProviderQueueRoom: React.FC<AddProviderQueueRoomProps> = ({ providerUui
 
           <section className={styles.section}>
             <Checkbox
-              onChange={handleRetainLocation}
               checked={currentIsPermanentProviderQueueRoom}
-              labelText={t('retainLocation', 'Retain location')}
-              id="retianLocation"
               className={styles.checkbox}
+              id="retainLocation"
+              labelText={t('retainLocation', 'Retain location')}
+              onChange={handleRetainLocation}
             />
           </section>
         </Form>
diff --git a/packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.test.tsx b/packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.test.tsx
index 13a09c8e0..5afe9b3fa 100644
--- a/packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.test.tsx
+++ b/packages/esm-service-queues-app/src/add-provider-queue-room/add-provider-queue-room.test.tsx
@@ -39,7 +39,7 @@ jest.mock('../hooks/useQueues', () => {
   };
 });
 
-jest.mock('../patient-search/hooks/useQueueLocations', () => ({
+jest.mock('../create-queue-entry/hooks/useQueueLocations', () => ({
   useQueueLocations: jest.fn().mockReturnValue({
     queueLocations: [
       { id: '1GHI12', name: 'Location 1' },
diff --git a/packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.test.tsx b/packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.test.tsx
index 5c00a3c1a..5cb350c2b 100644
--- a/packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.test.tsx
+++ b/packages/esm-service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.test.tsx
@@ -12,7 +12,10 @@ const defaultProps = {
   closeModal: mockCloseModal,
 };
 
-jest.mock('./clear-queue-entries-dialog.resource');
+jest.mock('./clear-queue-entries-dialog.resource', () => ({
+  batchClearQueueEntries: jest.fn(),
+}));
+
 jest.mock('../hooks/useQueueEntries', () => ({
   useMutateQueueEntries: () => ({ mutateQueueEntries: jest.fn() }),
 }));
diff --git a/packages/esm-service-queues-app/src/config-schema.ts b/packages/esm-service-queues-app/src/config-schema.ts
index 35fcf0dde..f90120433 100644
--- a/packages/esm-service-queues-app/src/config-schema.ts
+++ b/packages/esm-service-queues-app/src/config-schema.ts
@@ -23,8 +23,8 @@ type ColumnType = (typeof columnTypes)[number];
 const statusIcons = ['Group', 'InProgress'] as const;
 type StatusIcon = (typeof statusIcons)[number];
 
-// Options from https://react.carbondesignsystem.com/?path=/docs/components-tag--overview
-const carbonTagColors = [
+// Options from https://react.carbondesignsystem.com/?path=/docs/components-tag--overview plus orange for priority tags
+const priorityTagColors = [
   'red',
   'magenta',
   'purple',
@@ -32,13 +32,14 @@ const carbonTagColors = [
   'teal',
   'cyan',
   'gray',
+  'orange',
   'green',
   'warm-gray',
   'cool-gray',
   'high-contrast',
   'outline',
 ] as const;
-type CarbonTagColor = (typeof carbonTagColors)[number];
+type PriorityTagColor = (typeof priorityTagColors)[number];
 
 const tagStyles = ['bold'] as const;
 type TagStyle = (typeof tagStyles)[number];
@@ -46,10 +47,29 @@ type TagStyle = (typeof tagStyles)[number];
 // equal to columnTypes but without extension
 export const builtInColumns = columnTypes.filter((columnType) => columnType !== 'extension');
 const defaultIdentifierTypeUuid = '05a29f94-c0ed-11e2-94be-8c13b969e334'; // OpenMRS ID
+const defaultPriorityUuid = 'f4620bfa-3625-4883-bd3f-84c2cce14470';
+const defaultEmergencyPriorityUuid = '04f6f7e0-e3cb-4e13-a133-4479f759574e';
+const defaultUrgentPriorityUuid = 'dc3492ef-24a5-4fd9-b58d-4fd2acf7071f';
 
 export const defaultColumnConfig: ColumnConfig = {
   identifierTypeUuid: defaultIdentifierTypeUuid,
-  priorityConfigs: [],
+  priorityConfigs: [
+    {
+      conceptUuid: defaultEmergencyPriorityUuid,
+      style: null,
+      color: 'red',
+    },
+    {
+      conceptUuid: defaultPriorityUuid,
+      style: null,
+      color: 'green',
+    },
+    {
+      conceptUuid: defaultUrgentPriorityUuid,
+      style: null,
+      color: 'orange',
+    },
+  ],
   statusConfigs: [],
   visitQueueNumberAttributeUuid: null,
 };
@@ -70,7 +90,7 @@ export const configSchema = {
     defaultPriorityConceptUuid: {
       _type: Type.ConceptUuid,
       _description: 'The UUID of the default priority for the queues eg Not urgent.',
-      _default: 'f4620bfa-3625-4883-bd3f-84c2cce14470',
+      _default: defaultPriorityUuid,
     },
     defaultStatusConceptUuid: {
       _type: Type.ConceptUuid,
@@ -93,7 +113,7 @@ export const configSchema = {
     emergencyPriorityConceptUuid: {
       _type: Type.ConceptUuid,
       _description: 'The UUID of the priority with the highest sort weight for the queues eg Emergency.',
-      _default: '04f6f7e0-e3cb-4e13-a133-4479f759574e',
+      _default: defaultEmergencyPriorityUuid,
     },
     heightUuid: {
       _type: Type.ConceptUuid,
@@ -262,7 +282,7 @@ export const configSchema = {
                 _type: Type.String,
                 _description:
                   'The color of the tag. This is based on the "type" field of the Carbon Design System "Tag" component.',
-                _validators: [validators.oneOf(carbonTagColors)],
+                _validators: [validators.oneOf(priorityTagColors)],
                 _default: 'gray',
               },
               style: {
@@ -447,7 +467,7 @@ export interface PatientIdentifierColumnConfig {
 }
 export interface PriorityConfig {
   conceptUuid: string;
-  color: CarbonTagColor;
+  color: PriorityTagColor;
   style: TagStyle;
 }
 
diff --git a/packages/esm-service-queues-app/src/patient-search/patient-search.scss b/packages/esm-service-queues-app/src/create-queue-entry/create-queue-entry.scss
similarity index 100%
rename from packages/esm-service-queues-app/src/patient-search/patient-search.scss
rename to packages/esm-service-queues-app/src/create-queue-entry/create-queue-entry.scss
diff --git a/packages/esm-service-queues-app/src/create-queue-entry/create-queue-entry.workspace.tsx b/packages/esm-service-queues-app/src/create-queue-entry/create-queue-entry.workspace.tsx
new file mode 100644
index 000000000..ebd376e7c
--- /dev/null
+++ b/packages/esm-service-queues-app/src/create-queue-entry/create-queue-entry.workspace.tsx
@@ -0,0 +1,99 @@
+import { Button, DataTableSkeleton } from '@carbon/react';
+import {
+  ArrowLeftIcon,
+  ErrorState,
+  ExtensionSlot,
+  getPatientName,
+  PatientBannerContactDetails,
+  PatientBannerPatientInfo,
+  PatientBannerToggleContactDetailsButton,
+  PatientPhoto,
+  usePatient,
+  useVisit,
+  type DefaultWorkspaceProps,
+} from '@openmrs/esm-framework';
+import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import styles from './create-queue-entry.scss';
+import ExistingVisitFormComponent from './existing-visit-form/existing-visit-form.component';
+
+interface PatientSearchProps extends DefaultWorkspaceProps {
+  selectedPatientUuid: string;
+  currentServiceQueueUuid?: string;
+  handleBackToSearchList?: () => void;
+}
+
+export const AddPatientToQueueContext = React.createContext({
+  currentServiceQueueUuid: '',
+});
+
+/**
+ *
+ * This is the component that appears when clicking on a search result in the "Add patient to queue" workspace,
+ */
+const CreateQueueEntryWorkspace: React.FC<PatientSearchProps> = ({
+  closeWorkspace,
+  promptBeforeClosing,
+  selectedPatientUuid,
+  currentServiceQueueUuid,
+  handleBackToSearchList,
+}) => {
+  const { t } = useTranslation();
+  const { patient } = usePatient(selectedPatientUuid);
+  const { activeVisit, isLoading, error } = useVisit(selectedPatientUuid);
+
+  const [showContactDetails, setContactDetails] = useState(false);
+
+  const patientName = patient && getPatientName(patient);
+
+  return patient ? (
+    <div className={styles.patientSearchContainer}>
+      <AddPatientToQueueContext.Provider value={{ currentServiceQueueUuid }}>
+        <div className={styles.patientBannerContainer}>
+          <div className={styles.patientBanner}>
+            <div className={styles.patientPhoto}>
+              <PatientPhoto patientUuid={patient.id} patientName={patientName} />
+            </div>
+            <PatientBannerPatientInfo patient={patient} />
+            <PatientBannerToggleContactDetailsButton
+              showContactDetails={showContactDetails}
+              toggleContactDetails={() => setContactDetails(!showContactDetails)}
+            />
+          </div>
+          {showContactDetails ? (
+            <PatientBannerContactDetails patientId={patient.id} deceased={patient.deceasedBoolean} />
+          ) : null}
+        </div>
+        <div className={styles.backButton}>
+          <Button
+            kind="ghost"
+            renderIcon={(props) => <ArrowLeftIcon size={24} {...props} />}
+            iconDescription={t('backToSearchResults', 'Back to search results')}
+            size="sm"
+            onClick={() => handleBackToSearchList?.()}>
+            <span>{t('backToSearchResults', 'Back to search results')}</span>
+          </Button>
+        </div>
+        {isLoading ? (
+          <DataTableSkeleton role="progressbar" />
+        ) : error ? (
+          <ErrorState headerTitle={t('errorFetchingVisit', 'Error fetching patient visit')} error={error} />
+        ) : activeVisit ? (
+          <ExistingVisitFormComponent visit={activeVisit} closeWorkspace={closeWorkspace} />
+        ) : (
+          <ExtensionSlot
+            name="start-visit-workspace-form-slot"
+            state={{
+              patientUuid: selectedPatientUuid,
+              closeWorkspace,
+              promptBeforeClosing,
+              openedFrom: 'service-queues-add-patient',
+            }}
+          />
+        )}
+      </AddPatientToQueueContext.Provider>
+    </div>
+  ) : null;
+};
+
+export default CreateQueueEntryWorkspace;
diff --git a/packages/esm-service-queues-app/src/create-queue-entry/existing-visit-form/existing-visit-form.component.tsx b/packages/esm-service-queues-app/src/create-queue-entry/existing-visit-form/existing-visit-form.component.tsx
new file mode 100644
index 000000000..ec0a27e2b
--- /dev/null
+++ b/packages/esm-service-queues-app/src/create-queue-entry/existing-visit-form/existing-visit-form.component.tsx
@@ -0,0 +1,73 @@
+import { Button, ButtonSet, Form, Row } from '@carbon/react';
+import { ExtensionSlot, useLayoutType, type Visit } from '@openmrs/esm-framework';
+import classNames from 'classnames';
+import React, { useCallback, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useMutateQueueEntries } from '../../hooks/useQueueEntries';
+import QueueFields from '../queue-fields/queue-fields.component';
+import styles from './existing-visit-form.scss';
+
+interface ExistingVisitFormProps {
+  closeWorkspace: () => void;
+  visit: Visit;
+}
+
+/**
+ * This is the form that appears when clicking on a search result in the "Add patient to queue" workspace,
+ * when the patient already has an active visit.
+ */
+const ExistingVisitForm: React.FC<ExistingVisitFormProps> = ({ visit, closeWorkspace }) => {
+  const { t } = useTranslation();
+  const isTablet = useLayoutType() === 'tablet';
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  const { mutateQueueEntries } = useMutateQueueEntries();
+  const [callback, setCallback] = useState<{
+    submitQueueEntry: (visit: Visit) => Promise<any>;
+  }>(null);
+
+  const handleSubmit = useCallback(
+    (event) => {
+      event.preventDefault();
+      setIsSubmitting(true);
+
+      callback
+        ?.submitQueueEntry?.(visit)
+        ?.then(() => {
+          closeWorkspace();
+          mutateQueueEntries();
+        })
+        ?.finally(() => {
+          setIsSubmitting(false);
+        });
+    },
+    [closeWorkspace, callback, visit, mutateQueueEntries],
+  );
+
+  return visit ? (
+    <>
+      {isTablet && (
+        <Row className={styles.headerGridRow}>
+          <ExtensionSlot
+            name="visit-form-header-slot"
+            className={styles.dataGridRow}
+            state={{ patientUuid: visit.patient.uuid }}
+          />
+        </Row>
+      )}
+      <Form className={classNames(styles.form, styles.container)} onSubmit={handleSubmit}>
+        <QueueFields setOnSubmit={(onSubmit) => setCallback({ submitQueueEntry: onSubmit })} />
+        <ButtonSet className={isTablet ? styles.tablet : styles.desktop}>
+          <Button className={styles.button} kind="secondary" onClick={closeWorkspace}>
+            {t('discard', 'Discard')}
+          </Button>
+          <Button className={styles.button} disabled={isSubmitting} kind="primary" type="submit">
+            {t('addPatientToQueue', 'Add patient to queue')}
+          </Button>
+        </ButtonSet>
+      </Form>
+    </>
+  ) : null;
+};
+
+export default ExistingVisitForm;
diff --git a/packages/esm-service-queues-app/src/patient-search/visit-form/visit-form.scss b/packages/esm-service-queues-app/src/create-queue-entry/existing-visit-form/existing-visit-form.scss
similarity index 100%
rename from packages/esm-service-queues-app/src/patient-search/visit-form/visit-form.scss
rename to packages/esm-service-queues-app/src/create-queue-entry/existing-visit-form/existing-visit-form.scss
diff --git a/packages/esm-service-queues-app/src/patient-search/hooks/useQueueLocations.tsx b/packages/esm-service-queues-app/src/create-queue-entry/hooks/useQueueLocations.tsx
similarity index 100%
rename from packages/esm-service-queues-app/src/patient-search/hooks/useQueueLocations.tsx
rename to packages/esm-service-queues-app/src/create-queue-entry/hooks/useQueueLocations.tsx
diff --git a/packages/esm-service-queues-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.component.tsx b/packages/esm-service-queues-app/src/create-queue-entry/queue-fields/queue-fields.component.tsx
similarity index 66%
rename from packages/esm-service-queues-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.component.tsx
rename to packages/esm-service-queues-app/src/create-queue-entry/queue-fields/queue-fields.component.tsx
index 192277d79..9ad6d2c79 100644
--- a/packages/esm-service-queues-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.component.tsx
+++ b/packages/esm-service-queues-app/src/create-queue-entry/queue-fields/queue-fields.component.tsx
@@ -1,6 +1,3 @@
-import React, { useContext, useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import classNames from 'classnames';
 import {
   InlineNotification,
   RadioButton,
@@ -9,67 +6,106 @@ import {
   Select,
   SelectItem,
   SelectSkeleton,
-  TextInput,
 } from '@carbon/react';
-import { useConfig, ResponsiveWrapper, useSession } from '@openmrs/esm-framework';
+import { ResponsiveWrapper, showSnackbar, useConfig, useSession, type Visit } from '@openmrs/esm-framework';
+import React, { useCallback, useContext, useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { type ConfigObject } from '../../config-schema';
+import { useMutateQueueEntries } from '../../hooks/useQueueEntries';
 import { useQueues } from '../../hooks/useQueues';
+import { AddPatientToQueueContext } from '../create-queue-entry.workspace';
 import { useQueueLocations } from '../hooks/useQueueLocations';
-import { type ConfigObject } from '../../config-schema';
-import { AddPatientToQueueContext } from '../patient-search.workspace';
-import styles from './visit-form-queue-fields.scss';
+import { postQueueEntry } from './queue-fields.resource';
+import styles from './queue-fields.scss';
 
-export interface VisitFormQueueFieldsProps {
-  setFormFields: (fields: {
-    queueLocation: string;
-    service: string;
-    status: string;
-    priority: string;
-    sortWeight: number;
-  }) => void;
+export interface QueueFieldsProps {
+  setOnSubmit(onSubmit: (visit: Visit) => Promise<any>);
 }
 
-const VisitFormQueueFields: React.FC<VisitFormQueueFieldsProps> = (props) => {
-  const { setFormFields } = props;
+/**
+ * This component contains form fields for starting a patient's queue entry.
+ */
+const QueueFields: React.FC<QueueFieldsProps> = ({ setOnSubmit }) => {
   const { t } = useTranslation();
   const { queueLocations, isLoading: isLoadingQueueLocations } = useQueueLocations();
   const { sessionLocation } = useSession();
-  const config = useConfig<ConfigObject>();
+  const {
+    visitQueueNumberAttributeUuid,
+    concepts: { defaultStatusConceptUuid, defaultPriorityConceptUuid, emergencyPriorityConceptUuid },
+  } = useConfig<ConfigObject>();
   const [selectedQueueLocation, setSelectedQueueLocation] = useState(queueLocations[0]?.id);
   const { queues, isLoading: isLoadingQueues } = useQueues(selectedQueueLocation);
-  const defaultStatus = config.concepts.defaultStatusConceptUuid;
   const [selectedService, setSelectedService] = useState('');
   const { currentServiceQueueUuid } = useContext(AddPatientToQueueContext);
-  const [priority, setPriority] = useState(config.concepts.defaultPriorityConceptUuid);
+  const [priority, setPriority] = useState(defaultPriorityConceptUuid);
   const priorities = queues.find((q) => q.uuid === selectedService)?.allowedPriorities ?? [];
-  const [sortWeight, setSortWeight] = useState(0);
+  const { mutateQueueEntries } = useMutateQueueEntries();
+  const memoMutateQueueEntries = useCallback(mutateQueueEntries, [mutateQueueEntries]);
+
+  const sortWeight = priority === emergencyPriorityConceptUuid ? 1 : 0;
+
+  const onSubmit = useCallback(
+    (visit: Visit) => {
+      if (selectedQueueLocation && selectedService && priority) {
+        return postQueueEntry(
+          visit.uuid,
+          selectedService,
+          visit.patient.uuid,
+          priority,
+          defaultStatusConceptUuid,
+          sortWeight,
+          selectedQueueLocation,
+          visitQueueNumberAttributeUuid,
+        )
+          .then(() => {
+            showSnackbar({
+              kind: 'success',
+              isLowContrast: true,
+              title: t('addedPatientToQueue', 'Added patient to queue'),
+              subtitle: t('queueEntryAddedSuccessfully', 'Queue entry added successfully'),
+            });
+            memoMutateQueueEntries();
+          })
+          .catch((error) => {
+            showSnackbar({
+              title: t('queueEntryError', 'Error adding patient to the queue'),
+              kind: 'error',
+              isLowContrast: false,
+              subtitle: error?.message,
+            });
+            throw error;
+          });
+      } else {
+        return Promise.resolve();
+      }
+    },
+    [
+      selectedQueueLocation,
+      selectedService,
+      priority,
+      sortWeight,
+      defaultStatusConceptUuid,
+      visitQueueNumberAttributeUuid,
+      memoMutateQueueEntries,
+      t,
+    ],
+  );
 
   useEffect(() => {
-    if (priority === config.concepts.emergencyPriorityConceptUuid) {
-      setSortWeight(1);
-    }
-  }, [priority]);
+    setOnSubmit?.(onSubmit);
+  }, [onSubmit, setOnSubmit]);
 
   useEffect(() => {
     if (currentServiceQueueUuid) {
       setSelectedService(currentServiceQueueUuid);
     }
-  }, [queues]);
+  }, [currentServiceQueueUuid, queues]);
 
   useEffect(() => {
     if (queueLocations.map((l) => l.id).includes(sessionLocation.uuid)) {
       setSelectedQueueLocation(sessionLocation.uuid);
     }
-  }, [queueLocations]);
-
-  useEffect(() => {
-    setFormFields({
-      queueLocation: selectedQueueLocation,
-      service: selectedService,
-      status: defaultStatus,
-      priority,
-      sortWeight,
-    });
-  }, [selectedQueueLocation, selectedService, defaultStatus, priority, sortWeight]);
+  }, [queueLocations, sessionLocation.uuid]);
 
   return (
     <div>
@@ -159,7 +195,7 @@ const VisitFormQueueFields: React.FC<VisitFormQueueFieldsProps> = (props) => {
               className={styles.radioButtonWrapper}
               name="priority"
               id="priority"
-              defaultSelected={config.concepts.defaultPriorityConceptUuid}
+              defaultSelected={defaultPriorityConceptUuid}
               onChange={(uuid) => setPriority(uuid)}>
               {priorities.map(({ uuid, display }) => (
                 <RadioButton key={uuid} labelText={display} value={uuid} />
@@ -168,18 +204,8 @@ const VisitFormQueueFields: React.FC<VisitFormQueueFieldsProps> = (props) => {
           ) : null}
         </section>
       ) : null}
-
-      <section className={classNames(styles.section, styles.sectionHidden)}>
-        <TextInput
-          type="number"
-          id="sortWeight"
-          name="sortWeight"
-          labelText={t('sortWeight', 'Sort weight')}
-          value={sortWeight}
-        />
-      </section>
     </div>
   );
 };
 
-export default VisitFormQueueFields;
+export default QueueFields;
diff --git a/packages/esm-service-queues-app/src/create-queue-entry/queue-fields/queue-fields.resource.ts b/packages/esm-service-queues-app/src/create-queue-entry/queue-fields/queue-fields.resource.ts
new file mode 100644
index 000000000..897547360
--- /dev/null
+++ b/packages/esm-service-queues-app/src/create-queue-entry/queue-fields/queue-fields.resource.ts
@@ -0,0 +1,63 @@
+import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
+
+export async function generateVisitQueueNumber(
+  location: string,
+  visitUuid: string,
+  queueUuid: string,
+  visitQueueNumberAttributeUuid: string,
+) {
+  const abortController = new AbortController();
+
+  await openmrsFetch(
+    `${restBaseUrl}/queue-entry-number?location=${location}&queue=${queueUuid}&visit=${visitUuid}&visitAttributeType=${visitQueueNumberAttributeUuid}`,
+    {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      signal: abortController.signal,
+    },
+  );
+}
+
+export async function postQueueEntry(
+  visitUuid: string,
+  queueUuid: string,
+  patientUuid: string,
+  priority: string,
+  status: string,
+  sortWeight: number,
+  locationUuid: string,
+  visitQueueNumberAttributeUuid: string,
+) {
+  const abortController = new AbortController();
+
+  await Promise.all([generateVisitQueueNumber(locationUuid, visitUuid, queueUuid, visitQueueNumberAttributeUuid)]);
+
+  return openmrsFetch(`${restBaseUrl}/visit-queue-entry`, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    signal: abortController.signal,
+    body: {
+      visit: { uuid: visitUuid },
+      queueEntry: {
+        status: {
+          uuid: status,
+        },
+        priority: {
+          uuid: priority,
+        },
+        queue: {
+          uuid: queueUuid,
+        },
+        patient: {
+          uuid: patientUuid,
+        },
+        startedAt: new Date(),
+        sortWeight: sortWeight,
+      },
+    },
+  });
+}
diff --git a/packages/esm-service-queues-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.scss b/packages/esm-service-queues-app/src/create-queue-entry/queue-fields/queue-fields.scss
similarity index 88%
rename from packages/esm-service-queues-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.scss
rename to packages/esm-service-queues-app/src/create-queue-entry/queue-fields/queue-fields.scss
index 9a0e81ee5..d4768a431 100644
--- a/packages/esm-service-queues-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.scss
+++ b/packages/esm-service-queues-app/src/create-queue-entry/queue-fields/queue-fields.scss
@@ -11,7 +11,3 @@
 .section {
   margin: layout.$spacing-07 layout.$spacing-05 0;
 }
-
-.sectionHidden {
-  display: none;
-}
diff --git a/packages/esm-service-queues-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.test.tsx b/packages/esm-service-queues-app/src/create-queue-entry/queue-fields/queue-fields.test.tsx
similarity index 58%
rename from packages/esm-service-queues-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.test.tsx
rename to packages/esm-service-queues-app/src/create-queue-entry/queue-fields/queue-fields.test.tsx
index 8cada9c8a..4b3815164 100644
--- a/packages/esm-service-queues-app/src/patient-search/visit-form-queue-fields/visit-form-queue-fields.test.tsx
+++ b/packages/esm-service-queues-app/src/create-queue-entry/queue-fields/queue-fields.test.tsx
@@ -2,10 +2,18 @@
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { render, screen } from '@testing-library/react';
-import { getDefaultsFromConfigSchema, useConfig, useLayoutType, useSession } from '@openmrs/esm-framework';
+import {
+  type FetchResponse,
+  getDefaultsFromConfigSchema,
+  useConfig,
+  useLayoutType,
+  useSession,
+  type Visit,
+} from '@openmrs/esm-framework';
 import { configSchema, type ConfigObject } from '../../config-schema';
-import { mockSession } from '__mocks__';
-import VisitFormQueueFields from './visit-form-queue-fields.component';
+import { mockSession, mockVisitAlice } from '__mocks__';
+import QueueFields from './queue-fields.component';
+import { postQueueEntry } from './queue-fields.resource';
 
 const mockUseConfig = jest.mocked(useConfig<ConfigObject>);
 const mockUseLayoutType = jest.mocked(useLayoutType);
@@ -32,7 +40,14 @@ jest.mock('../../hooks/useQueues', () => {
   };
 });
 
-describe('VisitFormQueueFields', () => {
+jest.mock('./queue-fields.resource', () => {
+  return {
+    postQueueEntry: jest.fn(),
+  };
+});
+const mockPostQueueEntry = jest.mocked(postQueueEntry).mockResolvedValue({} as FetchResponse);
+
+describe('QueueFields', () => {
   beforeEach(() => {
     mockUseLayoutType.mockReturnValue('small-desktop');
     mockUseSession.mockReturnValue(mockSession.data);
@@ -43,27 +58,32 @@ describe('VisitFormQueueFields', () => {
 
   it('renders the form fields and returns the set values', async () => {
     const user = userEvent.setup();
-    const setFormFields = jest.fn();
-    render(<VisitFormQueueFields setFormFields={setFormFields} />);
+    let onSubmit: (visit: Visit) => Promise<any> = null;
+    const setOnSubmit = (callback) => {
+      onSubmit = callback;
+    };
+    render(<QueueFields setOnSubmit={setOnSubmit} />);
 
     expect(screen.getByLabelText('Select a queue location')).toBeInTheDocument();
     expect(screen.getByLabelText('Select a service')).toBeInTheDocument();
-    expect(screen.getByLabelText('Sort weight')).toBeInTheDocument();
 
+    const queueUuid = 'e2ec9cf0-ec38-4d2b-af6c-59c82fa30b90';
     const serviceSelect = screen.getByLabelText('Select a service').closest('select');
-    await user.selectOptions(serviceSelect, 'e2ec9cf0-ec38-4d2b-af6c-59c82fa30b90');
+    await user.selectOptions(serviceSelect, queueUuid);
 
     expect(screen.getByText('Priority')).toBeInTheDocument();
     expect(screen.getByText('High')).toBeInTheDocument();
 
-    expect(setFormFields).toHaveBeenCalledWith({
-      queueLocation: '1',
-      service: 'e2ec9cf0-ec38-4d2b-af6c-59c82fa30b90',
-      // The status and priority are the defaults that come from the config schema.
-      // They are selected even though they are not 'allowed' for the queue.
-      status: '51ae5e4d-b72b-4912-bf31-a17efb690aeb',
-      priority: 'f4620bfa-3625-4883-bd3f-84c2cce14470',
-      sortWeight: 0,
-    });
+    await onSubmit(mockVisitAlice);
+    expect(mockPostQueueEntry).toHaveBeenCalledWith(
+      mockVisitAlice.uuid,
+      queueUuid, // queueUuid
+      mockVisitAlice.patient.uuid,
+      'f4620bfa-3625-4883-bd3f-84c2cce14470', // priority
+      '51ae5e4d-b72b-4912-bf31-a17efb690aeb', // status
+      0, // sortWeight
+      '1', // locationUuid
+      null, // visitQueueNumberAttributeUuid
+    );
   });
 });
diff --git a/packages/esm-service-queues-app/src/create-queue-entry/queue-fields/visit-form-queue-fields.extension.tsx b/packages/esm-service-queues-app/src/create-queue-entry/queue-fields/visit-form-queue-fields.extension.tsx
new file mode 100644
index 000000000..523661026
--- /dev/null
+++ b/packages/esm-service-queues-app/src/create-queue-entry/queue-fields/visit-form-queue-fields.extension.tsx
@@ -0,0 +1,31 @@
+import { type Visit } from '@openmrs/esm-framework';
+import React from 'react';
+import QueueFields from './queue-fields.component';
+
+interface VisitFormCallbacks {
+  onVisitCreatedOrUpdated: (visit: Visit) => Promise<any>;
+}
+// See VisitFormExtensionState in esm-patient-chart-app
+export interface VisitFormQueueFieldsProps {
+  setVisitFormCallbacks: (callbacks: VisitFormCallbacks) => void;
+  visitFormOpenedFrom: string;
+  patientChartConfig?: {
+    showServiceQueueFields: boolean;
+  };
+  patientUuid: string;
+}
+
+/**
+ * This extension contains form fields for starting a patient's queue entry.
+ * It is used slotted into the patient-chart's start visit form
+ */
+const VisitFormQueueFields: React.FC<VisitFormQueueFieldsProps> = (props) => {
+  const { setVisitFormCallbacks, visitFormOpenedFrom, patientChartConfig } = props;
+  if (patientChartConfig.showServiceQueueFields || visitFormOpenedFrom == 'service-queues-add-patient') {
+    return <QueueFields setOnSubmit={(onSubmit) => setVisitFormCallbacks({ onVisitCreatedOrUpdated: onSubmit })} />;
+  } else {
+    return <></>;
+  }
+};
+
+export default VisitFormQueueFields;
diff --git a/packages/esm-service-queues-app/src/hooks/useQueueEntries.ts b/packages/esm-service-queues-app/src/hooks/useQueueEntries.ts
index 688e92ee9..6b163a63c 100644
--- a/packages/esm-service-queues-app/src/hooks/useQueueEntries.ts
+++ b/packages/esm-service-queues-app/src/hooks/useQueueEntries.ts
@@ -1,9 +1,9 @@
-import { type FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import { type QueueEntry, type QueueEntrySearchCriteria } from '../types';
-import useSWR from 'swr';
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import { useSWRConfig } from 'swr/_internal';
 import isEqual from 'lodash-es/isEqual';
+import useSWR from 'swr';
+import { useSWRConfig } from 'swr/_internal';
+import { type FetchResponse, openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
+import { type QueueEntry, type QueueEntrySearchCriteria } from '../types';
 
 type QueueEntryResponse = FetchResponse<{
   results: Array<QueueEntry>;
@@ -79,14 +79,15 @@ export function useQueueEntries(searchCriteria?: QueueEntrySearchCriteria, rep:
   // for it yet. Next it returns stale data again, this time with `isValidating` set to true. At this
   // point we say we are no longer waiting for mutate. Finally, it returns fresh data with `isValidating`
   // again set to false. We may then update the data array and move on to the next page.
-  const [data, setData] = useState<Array<Array<QueueEntry>>>([]);
-  const [totalCount, setTotalCount] = useState<number>();
-  const [currentPage, setCurrentPage] = useState<number>(0);
-  const [currentSearchCriteria, setCurrentSearchCriteria] = useState(searchCriteria);
-  const [currentRep, setCurrentRep] = useState(rep);
-  const [pageUrl, setPageUrl] = useState<string>(getInitialUrl(currentRep, currentSearchCriteria));
-  const [error, setError] = useState<Error>();
   const { mutateQueueEntries } = useMutateQueueEntries();
+
+  const [currentPage, setCurrentPage] = useState(0);
+  const [currentRep, setCurrentRep] = useState(rep);
+  const [currentSearchCriteria, setCurrentSearchCriteria] = useState(searchCriteria);
+  const [data, setData] = useState<Array<Array<QueueEntry>>>([]);
+  const [error, setError] = useState<Error | undefined>(undefined);
+  const [pageUrl, setPageUrl] = useState(getInitialUrl(currentRep, currentSearchCriteria));
+  const [totalCount, setTotalCount] = useState(0);
   const [waitingForMutate, setWaitingForMutate] = useState(false);
 
   const refetchAllData = useCallback(
@@ -111,7 +112,7 @@ export function useQueueEntries(searchCriteria?: QueueEntrySearchCriteria, rep:
       }
       refetchAllData(rep, searchCriteria);
     }
-  }, [searchCriteria, currentSearchCriteria, setCurrentSearchCriteria, currentRep, rep]);
+  }, [currentRep, currentSearchCriteria, refetchAllData, rep, searchCriteria, setCurrentSearchCriteria]);
 
   const { data: pageData, isValidating, error: pageError } = useSWR<QueueEntryResponse, Error>(pageUrl, openmrsFetch);
 
diff --git a/packages/esm-service-queues-app/src/index.ts b/packages/esm-service-queues-app/src/index.ts
index 1568d0f06..48857a0dd 100644
--- a/packages/esm-service-queues-app/src/index.ts
+++ b/packages/esm-service-queues-app/src/index.ts
@@ -10,7 +10,7 @@ import outpatientSideNavComponent from './side-menu/side-menu.component';
 import homeDashboardComponent from './home.component';
 import patientInfoBannerSlotComponent from './patient-info/patient-info.component';
 import pastVisitSummaryComponent from './past-visit/past-visit.component';
-import VisitFormQueueFields from './patient-search/visit-form-queue-fields/visit-form-queue-fields.component';
+import VisitFormQueueFields from './create-queue-entry/queue-fields/visit-form-queue-fields.extension';
 
 export const importTranslation = require.context('../translations', false, /.json$/, 'lazy');
 
@@ -64,14 +64,6 @@ export const clearAllQueueEntries = getAsyncLifecycle(
   },
 );
 
-export const addVisitToQueueModal = getAsyncLifecycle(
-  () => import('./add-patient-toqueue/add-patient-toqueue-dialog.component'),
-  {
-    featureName: 'add visit to queue',
-    moduleName,
-  },
-);
-
 export const transitionQueueEntryStatusModal = getAsyncLifecycle(
   () => import('./transition-queue-entry/transition-queue-entry-dialog.component'),
   {
@@ -157,11 +149,13 @@ export const addNewQueueServiceRoomWorkspace = getAsyncLifecycle(
 
 export const visitFormQueueFields = getSyncLifecycle(VisitFormQueueFields, options);
 
-// t('searchPatient', 'Search Patient')
-export const patientSearchWorkspace = getAsyncLifecycle(() => import('./patient-search/patient-search.workspace'), {
-  featureName: 'service-queues-patient-search',
-  moduleName,
-});
+export const createQueueEntryWorkspace = getAsyncLifecycle(
+  () => import('./create-queue-entry/create-queue-entry.workspace'),
+  {
+    featureName: 'create-queue-entry-workspace',
+    moduleName,
+  },
+);
 
 export const activeVisitsRowActions = getAsyncLifecycle(
   () => import('./active-visits/active-visits-row-actions.component'),
diff --git a/packages/esm-service-queues-app/src/patient-info/patient-info.component.tsx b/packages/esm-service-queues-app/src/patient-info/patient-info.component.tsx
index 69a331aba..798cb6c52 100644
--- a/packages/esm-service-queues-app/src/patient-info/patient-info.component.tsx
+++ b/packages/esm-service-queues-app/src/patient-info/patient-info.component.tsx
@@ -1,18 +1,18 @@
+import React, { useState } from 'react';
+import classNames from 'classnames';
+import { useTranslation } from 'react-i18next';
 import { ClickableTile } from '@carbon/react';
 import { Edit } from '@carbon/react/icons';
 import {
-  ConfigurableLink,
-  PatientBannerContactDetails,
-  PatientBannerToggleContactDetailsButton,
-  PatientPhoto,
   age,
+  ConfigurableLink,
   formatDate,
   getPatientName,
   parseDate,
+  PatientBannerContactDetails,
+  PatientBannerToggleContactDetailsButton,
+  PatientPhoto,
 } from '@openmrs/esm-framework';
-import classNames from 'classnames';
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
 import AppointmentDetails from './appointment-details.component';
 import styles from './patient-info.scss';
 
@@ -23,8 +23,8 @@ interface PatientInfoProps {
 
 const PatientInfo: React.FC<PatientInfoProps> = ({ patient, handlePatientInfoClick }) => {
   const { t } = useTranslation();
-  const [showContactDetails, setShowContactDetails] = useState<boolean>(false);
   const patientName = getPatientName(patient);
+  const [showContactDetails, setShowContactDetails] = useState(false);
 
   const toggleShowMore = (e: React.MouseEvent) => {
     e.stopPropagation();
@@ -32,6 +32,8 @@ const PatientInfo: React.FC<PatientInfoProps> = ({ patient, handlePatientInfoCli
   };
 
   return (
+    // TODO: Fix this warning: validateDOMNesting(...): <a> cannot appear as a descendant of <a>.
+    // This is because the ConfigurableLink is inside a ClickableTile.
     <ClickableTile className={styles.container} onClick={handlePatientInfoClick}>
       <div
         className={classNames({
diff --git a/packages/esm-service-queues-app/src/patient-queue-header/patient-queue-header.component.tsx b/packages/esm-service-queues-app/src/patient-queue-header/patient-queue-header.component.tsx
index 4b47c05d0..b79f8bb98 100644
--- a/packages/esm-service-queues-app/src/patient-queue-header/patient-queue-header.component.tsx
+++ b/packages/esm-service-queues-app/src/patient-queue-header/patient-queue-header.component.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Dropdown } from '@carbon/react';
 import { useConfig, useSession, PageHeader, PageHeaderContent, ServiceQueuesPictogram } from '@openmrs/esm-framework';
-import { useQueueLocations } from '../patient-search/hooks/useQueueLocations';
+import { useQueueLocations } from '../create-queue-entry/hooks/useQueueLocations';
 import {
   updateSelectedQueueLocationUuid,
   updateSelectedQueueLocationName,
@@ -27,16 +27,19 @@ const PatientQueueHeader: React.FC<PatientQueueHeaderProps> = ({ title, showLoca
   const currentQueueLocationName = useSelectedQueueLocationName();
   const currentQueueLocationUuid = useSelectedQueueLocationUuid();
 
-  const handleQueueLocationChange = useCallback(({ selectedItem }) => {
-    if (selectedItem.id === 'all') {
-      updateSelectedQueueLocationUuid(null);
-      updateSelectedQueueLocationName(null);
-    } else {
-      updateSelectedQueueLocationUuid(selectedItem.id);
-      updateSelectedQueueLocationName(selectedItem.name);
-      updateSelectedService(null, t('all', 'All'));
-    }
-  }, []);
+  const handleQueueLocationChange = useCallback(
+    ({ selectedItem }) => {
+      if (selectedItem.id === 'all') {
+        updateSelectedQueueLocationUuid(null);
+        updateSelectedQueueLocationName(null);
+      } else {
+        updateSelectedQueueLocationUuid(selectedItem.id);
+        updateSelectedQueueLocationName(selectedItem.name);
+        updateSelectedService(null, t('all', 'All'));
+      }
+    },
+    [t],
+  );
 
   useEffect(() => {
     if (!isLoading && !error && !currentQueueLocationUuid) {
@@ -56,11 +59,13 @@ const PatientQueueHeader: React.FC<PatientQueueHeaderProps> = ({ title, showLoca
       }
     }
   }, [
-    queueLocations,
     currentQueueLocationName,
     currentQueueLocationUuid,
-    isLoading,
     error,
+    handleQueueLocationChange,
+    isLoading,
+    queueLocations,
+    userSession?.sessionLocation?.display,
     userSession?.sessionLocation?.uuid,
   ]);
 
diff --git a/packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.component.tsx b/packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.component.tsx
index 30747b368..ec1599e92 100644
--- a/packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.component.tsx
+++ b/packages/esm-service-queues-app/src/patient-queue-metrics/clinic-metrics.component.tsx
@@ -70,6 +70,7 @@ function ClinicMetrics() {
             label=""
             onChange={handleServiceChange}
             size={isDesktop(layout) ? 'sm' : 'lg'}
+            titleText=""
             type="inline"
           />
         </MetricsCard>
diff --git a/packages/esm-service-queues-app/src/patient-queue-metrics/metrics-header.component.tsx b/packages/esm-service-queues-app/src/patient-queue-metrics/metrics-header.component.tsx
index c37499f12..96f590afd 100644
--- a/packages/esm-service-queues-app/src/patient-queue-metrics/metrics-header.component.tsx
+++ b/packages/esm-service-queues-app/src/patient-queue-metrics/metrics-header.component.tsx
@@ -37,12 +37,12 @@ const MetricsHeader = () => {
     <div className={styles.metricsContainer}>
       <span className={styles.metricsTitle}>{metricsTitle}</span>
       <ComboButton
+        className={styles.comboBtn}
         label={queueScreenText}
-        size={isDesktop(layout) ? 'sm' : 'lg'}
         menuAlignment="bottom-end"
-        className={styles.comboBtn}
-        tooltipAlignment="top-right"
-        onClick={navigateToQueueScreen}>
+        onClick={navigateToQueueScreen}
+        size={isDesktop(layout) ? 'sm' : 'lg'}
+        tooltipAlignment="top-end">
         <UserHasAccess privilege="Emr: View Legacy Interface">
           <MenuItem
             label={t('addNewService', 'Add new service')}
diff --git a/packages/esm-service-queues-app/src/patient-search/advanced-search.component.tsx b/packages/esm-service-queues-app/src/patient-search/advanced-search.component.tsx
deleted file mode 100644
index f2075afb3..000000000
--- a/packages/esm-service-queues-app/src/patient-search/advanced-search.component.tsx
+++ /dev/null
@@ -1,191 +0,0 @@
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  Button,
-  ButtonSet,
-  Column,
-  ContentSwitcher,
-  DatePicker,
-  DatePickerInput,
-  Form,
-  FormGroup,
-  Layer,
-  Stack,
-  Switch,
-  TextInput,
-} from '@carbon/react';
-import { ArrowLeft } from '@carbon/react/icons';
-import { useLayoutType } from '@openmrs/esm-framework';
-import { SearchTypes } from '../types';
-import styles from './advanced-search.scss';
-import { datePickerFormat, datePickerPlaceHolder } from '../constants';
-
-interface PatientSearchProps {
-  toggleSearchType: (searchMode: SearchTypes) => void;
-}
-
-enum fieldMatcherRange {
-  ANY = 'any',
-  ALL = 'all',
-}
-
-enum genders {
-  ANY = 'any',
-  MALE = 'male',
-  FEMALE = 'female',
-}
-
-const AdvancedSearch: React.FC<PatientSearchProps> = ({ toggleSearchType }) => {
-  const { t } = useTranslation();
-  const isTablet = useLayoutType() === 'tablet';
-  const [firstName, setFirstName] = useState('');
-  const [middleName, setMiddleName] = useState('');
-  const [lastName, setLastName] = useState('');
-  const [gender, setGender] = useState('');
-  const [dateOfBirth, setDateOfBirth] = useState('');
-  const [phoneNumber, setPhoneNumber] = useState('');
-  const [postCode, setPostCode] = useState('');
-  const [lastVisitDate, setLastVisitDate] = useState('');
-  const [fieldMatcherRangeSwitcherValue, setFieldMatcherRangeSwitcherValue] = useState(0);
-  const [genderSwitcherValue, setGenderSwitcherValue] = useState(0);
-  const [searchParams, setSearchParams] = useState([]);
-  const [open, setOpen] = useState(false);
-
-  const handleSearch = () => {
-    setSearchParams([firstName, middleName, lastName, gender, dateOfBirth, phoneNumber, postCode, lastVisitDate]);
-  };
-
-  return (
-    <Form onSubmit={handleSearch} className={styles.form}>
-      <div>
-        <div className={styles.backButton}>
-          <Button
-            kind="ghost"
-            renderIcon={(props) => <ArrowLeft size={24} {...props} />}
-            iconDescription="Back to simple search"
-            size="sm"
-            onClick={() => toggleSearchType(SearchTypes.BASIC)}>
-            <span>{t('backToSimpleSearch', 'Back to simple search')}</span>
-          </Button>
-        </div>
-        <Stack gap={4} className={styles.grid}>
-          <Column>
-            <div className={styles.contentSwitcherContainer}>
-              <span>{t('match', 'Match')}</span>
-              <ContentSwitcher
-                size="sm"
-                className={styles.fieldRangeSwitcher}
-                onChange={({ index }) => setFieldMatcherRangeSwitcherValue(index)}>
-                <Switch name={fieldMatcherRange.ANY} text={t('any', 'Any')} />
-                <Switch name={fieldMatcherRange.ALL} text={t('all', 'All')} />
-              </ContentSwitcher>
-              <span>{t('fields', 'of the following fields')}:</span>
-            </div>
-          </Column>
-
-          <Column>
-            <h3 className={styles.heading}>{t('name', 'Name')}</h3>
-            <Layer>
-              <TextInput
-                className={styles.input}
-                id="firstName"
-                labelText={t('firstName', 'First name')}
-                onChange={(event) => setFirstName(event.target.value)}
-                value={firstName}
-              />
-            </Layer>
-            <Layer>
-              <TextInput
-                className={styles.input}
-                id="middleName"
-                labelText={t('middleName', 'Middle name')}
-                onChange={(event) => setMiddleName(event.target.value)}
-                value={middleName}
-              />
-            </Layer>
-            <Layer>
-              <TextInput
-                className={styles.input}
-                id="lastName"
-                labelText={t('lastName', 'Last name')}
-                onChange={(event) => setLastName(event.target.value)}
-                value={lastName}
-              />
-            </Layer>
-          </Column>
-          <span className={styles.spacer} />
-
-          <Column>
-            <h3 className={styles.heading}>{t('personalDetails', 'Personal details')}</h3>
-            <FormGroup legendText={t('sex', 'Sex')}>
-              <ContentSwitcher
-                size="sm"
-                className={styles.genderSwitcher}
-                onChange={({ index }) => setGenderSwitcherValue(index)}>
-                <Switch name={genders.ANY} text={t('any', 'Any')} />
-                <Switch name={genders.MALE} text={t('male', 'Male')} />
-                <Switch name={genders.FEMALE} text={t('female', 'Female')} />
-              </ContentSwitcher>
-            </FormGroup>
-            <Layer>
-              <DatePicker datePickerType="single" dateFormat={datePickerFormat}>
-                <DatePickerInput
-                  id="dateOfBirth"
-                  placeholder={datePickerPlaceHolder}
-                  labelText={t('dateOfBirth', 'Date of birth')}
-                  onChange={(event) => setDateOfBirth(event.target.value)}
-                  type="date"
-                />
-              </DatePicker>
-            </Layer>
-            <Layer>
-              <TextInput
-                className={styles.input}
-                id="phoneNumber"
-                labelText={t('phoneNumber', 'Phone number')}
-                onChange={(event) => setPhoneNumber(event.target.value)}
-                value={phoneNumber}
-              />
-            </Layer>
-            <Layer>
-              <TextInput
-                className={styles.input}
-                id="postCode"
-                labelText={t('postCode', 'Post code')}
-                onChange={(event) => setPostCode(event.target.value)}
-                value={postCode}
-              />
-            </Layer>
-          </Column>
-          <span className={styles.spacer} />
-
-          <Column>
-            <h3 className={styles.heading}>{t('lastVisit', 'Last visit')}</h3>
-            <Layer>
-              <DatePicker datePickerType="single" dateFormat={datePickerFormat}>
-                <DatePickerInput
-                  id="lastVisitDate"
-                  placeholder={datePickerPlaceHolder}
-                  labelText={t('lastVisitDate', 'Date')}
-                  onChange={(event) => setLastVisitDate(event.target.value)}
-                  type="date"
-                  width={'120px'}
-                />
-              </DatePicker>
-            </Layer>
-          </Column>
-        </Stack>
-      </div>
-      <ButtonSet className={isTablet ? styles.tablet : styles.desktop}>
-        <Button className={styles.button} kind="secondary" onClick={() => toggleSearchType(SearchTypes.BASIC)}>
-          {t('cancel', 'Cancel')}
-        </Button>
-        <Button className={styles.button} kind="primary" type="submit">
-          {t('search', 'Search')}
-        </Button>
-      </ButtonSet>
-    </Form>
-  );
-};
-
-export default AdvancedSearch;
diff --git a/packages/esm-service-queues-app/src/patient-search/advanced-search.scss b/packages/esm-service-queues-app/src/patient-search/advanced-search.scss
deleted file mode 100644
index 6e1cf396c..000000000
--- a/packages/esm-service-queues-app/src/patient-search/advanced-search.scss
+++ /dev/null
@@ -1,154 +0,0 @@
-@use '@carbon/layout';
-@use '@carbon/type';
-@use '@openmrs/esm-styleguide/src/vars' as *;
-
-.form {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  height: calc(100vh - layout.$spacing-11);
-}
-
-.grid {
-  margin: 0 layout.$spacing-05;
-  padding: 0;
-}
-
-.row {
-  margin: 0;
-
-  :global(.cds--col) {
-    :global(.cds--form-item) {
-      &:not(:first-of-type):not(:last-of-type) {
-        margin: layout.$spacing-05 0;
-      }
-    }
-
-    :global(.cds--fieldset) {
-      margin: 0;
-    }
-
-    :global(.cds--date-picker.cds--date-picker--single .cds--date-picker__input) {
-      width: layout.$spacing-13;
-    }
-  }
-}
-
-.heading {
-  @include type.type-style('heading-compact-02');
-  margin-bottom: layout.$spacing-03;
-}
-
-.spacer {
-  margin-top: layout.$spacing-07;
-  display: inline-block;
-}
-
-.backButton {
-  align-items: center;
-  display: flex;
-  justify-content: flex-start;
-  margin: layout.$spacing-03 0;
-  padding: 0;
-  @include type.type-style('body-compact-01');
-
-  button {
-    display: flex;
-
-    svg {
-      order: 1;
-      margin-right: layout.$spacing-03;
-      margin-left: 0 !important;
-    }
-
-    span {
-      order: 2;
-    }
-  }
-}
-
-.advancePatientSearchContainer {
-  margin: 0 layout.$spacing-05;
-
-  & .backButton {
-    margin: 0;
-  }
-
-  & > button {
-    padding-left: 0;
-  }
-}
-
-.label01 {
-  @include type.type-style('label-01');
-  color: $text-02;
-  margin: layout.$spacing-03 0;
-}
-
-.formTextInput {
-  margin-bottom: layout.$spacing-04;
-}
-
-.contentSwitcherContainer {
-  display: flex;
-  align-items: center;
-  height: layout.$spacing-09;
-  margin-bottom: layout.$spacing-05;
-
-  & > span {
-    @include type.type-style('heading-compact-01');
-    color: $text-02;
-  }
-}
-
-.formTitle {
-  font-weight: bold;
-  @include type.type-style('heading-compact-02');
-  margin-bottom: layout.$spacing-02;
-}
-
-.fieldRangeSwitcher {
-  width: 8rem;
-  margin: 0 layout.$spacing-03 0;
-}
-
-.genderSwitcher {
-  width: 18rem;
-  margin: layout.$spacing-02 0 layout.$spacing-05;
-}
-
-.button {
-  height: layout.$spacing-10;
-  display: flex;
-  align-content: flex-start;
-  align-items: baseline;
-  min-width: 50%;
-}
-
-.tablet {
-  padding: layout.$spacing-06 layout.$spacing-05;
-  background-color: $ui-02;
-}
-
-.desktop {
-  padding: 0;
-  margin-top: layout.$spacing-05;
-}
-
-/* Desktop */
-:global(.omrs-breakpoint-gt-tablet) {
-  .form {
-    height: calc(100vh - layout.$spacing-11);
-  }
-}
-
-/* Tablet */
-:global(.omrs-breakpoint-lt-desktop) {
-  .form {
-    height: calc(100vh - layout.$spacing-09);
-  }
-}
-
-.input {
-  width: 13.5rem;
-}
diff --git a/packages/esm-service-queues-app/src/patient-search/advanced-search.test.tsx b/packages/esm-service-queues-app/src/patient-search/advanced-search.test.tsx
deleted file mode 100644
index 9479dcba5..000000000
--- a/packages/esm-service-queues-app/src/patient-search/advanced-search.test.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import AdvancedSearch from './advanced-search.component';
-
-describe('AdvancedSearch', () => {
-  test('renders the advanced patient search in an overlay', async () => {
-    render(<AdvancedSearch toggleSearchType={jest.fn()} />);
-
-    expect(screen.getByRole('button', { name: /back to simple search/i })).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: /cancel/i })).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: /^search$/i })).toBeInTheDocument();
-
-    await screen.findAllByText(/any/i);
-
-    expect(screen.getByRole('tab', { name: /^male$/i })).toBeInTheDocument();
-    expect(screen.getByRole('tab', { name: /^female$/i })).toBeInTheDocument();
-    expect(screen.getByRole('heading', { name: /name/i })).toBeInTheDocument();
-    expect(screen.getByRole('heading', { name: /personal details/i })).toBeInTheDocument();
-    expect(screen.getByRole('heading', { name: /last visit/i })).toBeInTheDocument();
-    expect(screen.getByRole('textbox', { name: /first name/i })).toBeInTheDocument();
-    expect(screen.getByRole('textbox', { name: /middle name/i })).toBeInTheDocument();
-    expect(screen.getByRole('textbox', { name: /last name/i })).toBeInTheDocument();
-    expect(screen.getByRole('textbox', { name: /phone number/i })).toBeInTheDocument();
-    expect(screen.getByRole('textbox', { name: /post code/i })).toBeInTheDocument();
-  });
-});
diff --git a/packages/esm-service-queues-app/src/patient-search/basic-search.component.tsx b/packages/esm-service-queues-app/src/patient-search/basic-search.component.tsx
deleted file mode 100644
index ee20ca58c..000000000
--- a/packages/esm-service-queues-app/src/patient-search/basic-search.component.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-import React, { useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import debounce from 'lodash-es/debounce';
-import { Search, Button, InlineLoading, Layer, Tile } from '@carbon/react';
-import { Search as SearchIcon } from '@carbon/react/icons';
-import EmptyDataIllustration from './empty-data-illustration.component';
-import SearchIllustration from './search-illustration.component';
-import SearchResults from './search-results.component';
-import usePatients from './hooks/usePatients';
-import { SearchTypes } from '../types';
-import styles from './basic-search.scss';
-
-interface BasicSearchProps {
-  toggleSearchType: (searchMode: SearchTypes) => void;
-}
-
-const searchTimeoutInMs = 300;
-
-const BasicSearch: React.FC<BasicSearchProps> = ({ toggleSearchType }) => {
-  const { t } = useTranslation();
-  const [searchTerm, setSearchTerm] = useState('');
-  const [query, setQuery] = useState<string>(null);
-  const { patients, isLoading } = usePatients(query);
-
-  const handleSearch = useMemo(() => debounce((searchTerm) => setSearchTerm(searchTerm), searchTimeoutInMs), []);
-
-  const performSearch = () => setQuery(searchTerm);
-
-  return (
-    <div className={patients?.length ? styles.lightBackground : styles.resultsContainer}>
-      <div className={styles.searchboxContainer}>
-        <Layer className={styles.searchboxLayer}>
-          <Search
-            autoFocus
-            className={styles.searchInput}
-            labelText={t('searchForPatient', 'Search for a patient')}
-            placeholder={t('searchboxPlaceholder', 'Search for a patient name or ID number')}
-            onChange={(event) => handleSearch(event.target.value)}
-            onClear={() => setQuery(null)}
-          />
-        </Layer>
-        <Button onClick={performSearch} iconDescription="Basic search" size="md" kind="secondary">
-          {t('search', 'Search')}
-        </Button>
-      </div>
-      {
-        <>
-          {query === null && (
-            <div>
-              <div className={styles.tileContainer}>
-                <Layer>
-                  <Tile className={styles.tile}>
-                    <SearchIllustration />
-                    <div className={styles.helperText}>
-                      <p className={styles.primaryText}>{t('primaryHelperText', 'Search for a patient')}</p>
-                      <p className={styles.secondaryText}>
-                        {t('secondaryHelperText', "Type the patient's name or unique ID number")}
-                      </p>
-                    </div>
-                  </Tile>
-                </Layer>
-              </div>
-              <p className={styles.separator}>{t('or', 'or')}</p>
-              <div className={styles.buttonContainer}>
-                <Button
-                  kind="ghost"
-                  disabled
-                  iconDescription="Advanced search"
-                  renderIcon={(props) => <SearchIcon size={16} {...props} />}
-                  onClick={() => toggleSearchType(SearchTypes.ADVANCED)}>
-                  {t('advancedSearch', 'Advanced search')}
-                </Button>
-              </div>
-            </div>
-          )}
-          {isLoading && (
-            <div className={styles.loadingContainer}>
-              <InlineLoading description={t('loading', 'Loading...')} />
-            </div>
-          )}
-
-          {patients.length > 0 && <SearchResults toggleSearchType={toggleSearchType} patients={patients} />}
-
-          {patients.length === 0 && query !== null && !isLoading && (
-            <div className={styles.resultsContainer}>
-              <div style={{ margin: '1rem' }}>
-                <p className={styles.resultsText}>{t('noResultsFound', 'No results found')}</p>
-                <Layer>
-                  <Tile className={styles.emptySearchResultsTile}>
-                    <EmptyDataIllustration />
-                    <p className={styles.emptyResultText}>
-                      {t('noPatientFoundMessage', 'Sorry, no patient has been found')}
-                    </p>
-                    <p className={styles.actionText}>
-                      <span>
-                        {t('trySearchWithPatientUniqueID', "Try searching with the patient's unique ID number")}
-                      </span>
-                      <br />
-                      <span>{t('orPatientName', "OR the patient's name(s)")}</span>
-                    </p>
-                  </Tile>
-                </Layer>
-              </div>
-            </div>
-          )}
-        </>
-      }
-    </div>
-  );
-};
-
-export default BasicSearch;
diff --git a/packages/esm-service-queues-app/src/patient-search/basic-search.scss b/packages/esm-service-queues-app/src/patient-search/basic-search.scss
deleted file mode 100644
index 5d28bfb2c..000000000
--- a/packages/esm-service-queues-app/src/patient-search/basic-search.scss
+++ /dev/null
@@ -1,139 +0,0 @@
-@use '@carbon/layout';
-@use '@carbon/type';
-@use '@openmrs/esm-styleguide/src/vars' as *;
-
-.searchboxContainer {
-  display: flex;
-  align-items: center;
-  margin-bottom: layout.$spacing-05;
-}
-
-.searchboxLayer {
-  flex-grow: 1;
-}
-
-.tileContainer {
-  :global(.omrs-breakpoint-gt-tablet) & {
-    margin: 0 layout.$spacing-06 0;
-  }
-
-  :global(.omrs-breakpoint-lt-desktop) & {
-    width: 60%;
-    margin: auto;
-  }
-}
-
-.tile {
-  display: flex;
-  flex-flow: column wrap;
-  align-items: center;
-  justify-content: center;
-  padding: layout.$spacing-07 0 layout.$spacing-06;
-  text-align: center;
-  border: 1px solid $ui-03;
-}
-
-.helperText {
-  margin-top: 1.25rem;
-  color: $text-02;
-
-  .primaryText {
-    @include type.type-style('heading-compact-01');
-  }
-
-  .secondaryText {
-    width: 12rem;
-    margin-top: layout.$spacing-02;
-    @include type.type-style('body-01');
-  }
-}
-
-.separator {
-  @include type.type-style('heading-03');
-  color: $text-02;
-  width: 12rem;
-  margin: layout.$spacing-09 auto;
-  overflow: hidden;
-  text-align: center;
-
-  &::before,
-  &::after {
-    background-color: $text-03;
-    content: '';
-    display: inline-block;
-    height: 1px;
-    position: relative;
-    vertical-align: middle;
-    width: 50%;
-  }
-
-  &::before {
-    right: layout.$spacing-05;
-    margin-left: -50%;
-  }
-
-  &::after {
-    left: layout.$spacing-05;
-    margin-right: -50%;
-  }
-}
-
-.buttonContainer {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.resultsContainer {
-  height: 100vh;
-}
-
-.lightBackground {
-  @extend .resultsContainer;
-  background-color: white;
-}
-
-.loadingContainer {
-  height: 80vh;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-
-  & > div {
-    width: fit-content !important;
-  }
-}
-
-.helperText {
-  color: var(--omrs-color-ink-medium-contrast);
-  margin-left: 2.375rem;
-}
-
-.resultsText {
-  @include type.type-style('label-01');
-  color: $text-02;
-  border-bottom: 0.063rem solid $ui-03;
-  padding: layout.$spacing-03 0;
-}
-
-.emptyResultText {
-  @include type.type-style('heading-compact-01');
-  color: $text-02;
-  margin-top: layout.$spacing-05;
-  margin-bottom: 0.313rem;
-}
-
-.actionText {
-  @include type.type-style('body-01');
-  color: $text-02;
-}
-
-.emptySearchResultsTile {
-  text-align: center;
-  margin-top: layout.$spacing-05;
-  padding: layout.$spacing-09 0;
-}
-
-:global(.omrs-breakpoint-gt-tablet) .emptySearchResultsTile {
-  background-color: $ui-02;
-}
diff --git a/packages/esm-service-queues-app/src/patient-search/basic-search.test.tsx b/packages/esm-service-queues-app/src/patient-search/basic-search.test.tsx
deleted file mode 100644
index 8027cf221..000000000
--- a/packages/esm-service-queues-app/src/patient-search/basic-search.test.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import BasicSearch from './basic-search.component';
-
-describe('BasicSearch', () => {
-  test('renders the basic patient search in an overlay', () => {
-    render(<BasicSearch toggleSearchType={jest.fn()} />);
-
-    const searchbox = screen.getByRole('searchbox', { name: /search for a patient/i });
-    const searchButton = screen.getByRole('button', { name: /^search$/i });
-    expect(searchbox).toBeInTheDocument();
-    expect(searchButton).toBeInTheDocument();
-    expect(screen.getByPlaceholderText(/search for a patient name or id number/i)).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: /advanced search/i })).toBeDisabled();
-    expect(screen.getByText('or')).toBeInTheDocument();
-    expect(screen.getByText(/type the patient's name or unique id number/i)).toBeInTheDocument();
-  });
-});
diff --git a/packages/esm-service-queues-app/src/patient-search/empty-data-illustration.component.tsx b/packages/esm-service-queues-app/src/patient-search/empty-data-illustration.component.tsx
deleted file mode 100644
index 42e93e03e..000000000
--- a/packages/esm-service-queues-app/src/patient-search/empty-data-illustration.component.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import * as React from 'react';
-
-const EmptyDataIllustration = ({ width = '61', height = '59' }) => {
-  return (
-    <svg width={width} height={height} viewBox="0 0 61 59">
-      <title>Empty data illustration</title>
-      <g fill="none" fillRule="evenodd">
-        <path
-          d="M38.133 13.186H21.947c-.768.001-1.39.623-1.39 1.391V50.55l-.186.057-3.97 1.216a.743.743 0 01-.927-.493L3.664 12.751a.742.742 0 01.492-.926l6.118-1.874 17.738-5.43 6.119-1.873a.741.741 0 01.926.492L38.076 13l.057.186z"
-          fill="#E0E0E0"
-        />
-        <path
-          d="M41.664 13L38.026 1.117A1.576 1.576 0 0036.056.07l-8.601 2.633-17.737 5.43-8.603 2.634a1.578 1.578 0 00-1.046 1.97l12.436 40.616a1.58 1.58 0 001.969 1.046l5.897-1.805.185-.057v-.194l-.185.057-5.952 1.822a1.393 1.393 0 01-1.737-.923L.247 12.682a1.39 1.39 0 01.923-1.738L9.772 8.31 27.51 2.881 36.112.247a1.393 1.393 0 011.737.923L41.47 13l.057.186h.193l-.057-.185z"
-          fill="#8D8D8D"
-        />
-        <path
-          d="M11.378 11.855a.836.836 0 01-.798-.59L9.385 7.361a.835.835 0 01.554-1.042l16.318-4.996a.836.836 0 011.042.554l1.195 3.902a.836.836 0 01-.554 1.043l-16.318 4.995a.831.831 0 01-.244.037z"
-          fill="#C6C6C6"
-        />
-        <circle fill="#C6C6C6" cx={17.636} cy={2.314} r={1.855} />
-        <circle fill="#FFF" fillRule="nonzero" cx={17.636} cy={2.314} r={1.175} />
-        <path
-          d="M55.893 53.995H24.544a.79.79 0 01-.788-.789V15.644a.79.79 0 01.788-.788h31.349a.79.79 0 01.788.788v37.562a.79.79 0 01-.788.789z"
-          fill="#E0E0E0"
-        />
-        <path
-          d="M41.47 13H21.948a1.579 1.579 0 00-1.576 1.577V52.4l.185-.057V14.577c.001-.768.623-1.39 1.391-1.39h19.581L41.471 13zm17.02 0H21.947a1.579 1.579 0 00-1.576 1.577v42.478c0 .87.706 1.576 1.576 1.577H58.49a1.579 1.579 0 001.576-1.577V14.577a1.579 1.579 0 00-1.576-1.576zm1.39 44.055c0 .768-.622 1.39-1.39 1.392H21.947c-.768-.001-1.39-.624-1.39-1.392V14.577c0-.768.622-1.39 1.39-1.39H58.49c.768 0 1.39.622 1.39 1.39v42.478z"
-          fill="#8D8D8D"
-        />
-        <path
-          d="M48.751 17.082H31.686a.836.836 0 01-.835-.835v-4.081c0-.46.374-.834.835-.835H48.75c.461 0 .834.374.835.835v4.08c0 .462-.374.835-.835.836z"
-          fill="#C6C6C6"
-        />
-        <circle fill="#C6C6C6" cx={40.218} cy={9.755} r={1.855} />
-        <circle fill="#FFF" fillRule="nonzero" cx={40.218} cy={9.755} r={1.13} />
-      </g>
-    </svg>
-  );
-};
-
-export default EmptyDataIllustration;
diff --git a/packages/esm-service-queues-app/src/patient-search/hooks/useActivePatientEnrollment.tsx b/packages/esm-service-queues-app/src/patient-search/hooks/useActivePatientEnrollment.tsx
deleted file mode 100644
index b76887ab5..000000000
--- a/packages/esm-service-queues-app/src/patient-search/hooks/useActivePatientEnrollment.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { useMemo } from 'react';
-import useSWR from 'swr';
-import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import { type PatientProgram } from '../../types';
-import uniqBy from 'lodash-es/uniqBy';
-
-export const useActivePatientEnrollment = (patientUuid: string) => {
-  const customRepresentation = `custom:(uuid,display,program,dateEnrolled,dateCompleted,location:(uuid,display))`;
-  const apiUrl = `${restBaseUrl}/programenrollment?patient=${patientUuid}&v=${customRepresentation}`;
-
-  const { data, error, isLoading } = useSWR<{ data: { results: Array<PatientProgram> } }>(
-    patientUuid ? apiUrl : null,
-    openmrsFetch,
-  );
-
-  const activePatientEnrollment = useMemo(
-    () =>
-      data?.data.results
-        .sort((a, b) => (b.dateEnrolled > a.dateEnrolled ? 1 : -1))
-        .filter((enrollment) => enrollment.dateCompleted === null) ?? [],
-    [data?.data.results],
-  );
-
-  return {
-    activePatientEnrollment: uniqBy(activePatientEnrollment, (program) => program?.program?.uuid),
-    error,
-    isLoading,
-  };
-};
diff --git a/packages/esm-service-queues-app/src/patient-search/hooks/useDefaultLocation.ts b/packages/esm-service-queues-app/src/patient-search/hooks/useDefaultLocation.ts
deleted file mode 100644
index 59be7209c..000000000
--- a/packages/esm-service-queues-app/src/patient-search/hooks/useDefaultLocation.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { type FetchResponse, openmrsFetch, useConfig } from '@openmrs/esm-framework';
-import useSWRImmutable from 'swr/immutable';
-
-export const useDefaultLoginLocation = () => {
-  const config = useConfig();
-  const apiUrl = config.defaultFacilityUrl;
-  const { data, error, isLoading } = useSWRImmutable<FetchResponse>(apiUrl, openmrsFetch);
-
-  return {
-    defaultFacility: data ? data?.data : null,
-    isLoading: isLoading,
-    error,
-  };
-};
diff --git a/packages/esm-service-queues-app/src/patient-search/hooks/usePatients.tsx b/packages/esm-service-queues-app/src/patient-search/hooks/usePatients.tsx
deleted file mode 100644
index 990e95f8b..000000000
--- a/packages/esm-service-queues-app/src/patient-search/hooks/usePatients.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { useMemo } from 'react';
-import useSWR from 'swr';
-import { fhirBaseUrl, openmrsFetch } from '@openmrs/esm-framework';
-
-interface FHIRResponse {
-  entry: Array<{ resource: fhir.Patient }>;
-  total: number;
-  type: string;
-  resourceType: string;
-}
-
-const usePatients = (searchTerm: string) => {
-  const apiUrl = `${fhirBaseUrl}/Patient?name=${searchTerm}&_summary=data`;
-
-  const { data, error, isLoading } = useSWR<{ data: FHIRResponse }>(searchTerm !== null ? apiUrl : null, openmrsFetch);
-
-  const searchedPatients = useMemo(
-    () => data?.data?.entry?.map((response) => response.resource) ?? [],
-    [data?.data?.entry],
-  );
-
-  return { patients: searchedPatients, isLoading: isLoading && searchTerm !== null, error };
-};
-
-export default usePatients;
diff --git a/packages/esm-service-queues-app/src/patient-search/hooks/useRecommendedVisitTypes.tsx b/packages/esm-service-queues-app/src/patient-search/hooks/useRecommendedVisitTypes.tsx
deleted file mode 100644
index 9adaaa99e..000000000
--- a/packages/esm-service-queues-app/src/patient-search/hooks/useRecommendedVisitTypes.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import useSWR from 'swr';
-import { openmrsFetch, useConfig } from '@openmrs/esm-framework';
-import { type ConfigObject } from '../../config-schema';
-import { useMemo } from 'react';
-
-interface EnrollmentVisitType {
-  dataDependencies: Array<string>;
-  enrollmentOptions: object;
-  incompatibleWith: Array<string>;
-  name: string;
-  visitTypes: { allowed: Array<EnrollmentVisitType>; disallowed: Array<EnrollmentVisitType> };
-}
-
-export const useRecommendedVisitTypes = (
-  patientUuid: string,
-  enrollmentUuid: string,
-  programUuid: string,
-  locationUuid: string,
-) => {
-  const { visitTypeResourceUrl, showRecommendedVisitTypeTab } = useConfig<ConfigObject>();
-
-  const apiUrl = `${visitTypeResourceUrl}${patientUuid}/program/${programUuid}/enrollment/${enrollmentUuid}?intendedLocationUuid=${locationUuid}`;
-
-  const { data, error, isLoading } = useSWR<{ data: EnrollmentVisitType }>(
-    showRecommendedVisitTypeTab && patientUuid && enrollmentUuid && programUuid ? apiUrl : null,
-    openmrsFetch,
-  );
-
-  const recommendedVisitTypes = useMemo(() => data?.data?.visitTypes?.allowed.map(mapToVisitType) ?? [], [data]);
-  return { recommendedVisitTypes, error, isLoading };
-};
-
-const mapToVisitType = (visitType) => {
-  return { ...visitType, display: visitType.name };
-};
diff --git a/packages/esm-service-queues-app/src/patient-search/hooks/useScheduledVisits.ts b/packages/esm-service-queues-app/src/patient-search/hooks/useScheduledVisits.ts
deleted file mode 100644
index 161b5ffe4..000000000
--- a/packages/esm-service-queues-app/src/patient-search/hooks/useScheduledVisits.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import useSWR from 'swr';
-import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import dayjs from 'dayjs';
-import { type AppointmentsFetchResponse } from '../../types';
-
-const fetcher = (appointmentsSearchUrl: string, patientUuid: string) => {
-  const abortController = new AbortController();
-  let startDate = dayjs(new Date().toISOString()).subtract(6, 'month').toISOString();
-
-  return openmrsFetch(appointmentsSearchUrl, {
-    method: 'POST',
-    signal: abortController.signal,
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: {
-      patientUuid: patientUuid,
-      startDate: startDate,
-    },
-  });
-};
-
-export function useScheduledVisits(patientUuid: string) {
-  const appointmentsSearchUrl = `${restBaseUrl}/appointments/search`;
-
-  const { data, error, isLoading } = useSWR<AppointmentsFetchResponse, Error>(
-    patientUuid ? [appointmentsSearchUrl, patientUuid] : null,
-    ([appointmentsSearchUrl, patientUuid]) => fetcher(appointmentsSearchUrl, patientUuid as string),
-  );
-
-  const appointments = data?.data?.length
-    ? data.data.sort((a, b) => (b.startDateTime > a.startDateTime ? 1 : -1))
-    : null;
-
-  // visits + or - 7 days before visit date
-  const recentVisits = appointments?.filter(
-    (appointment) =>
-      dayjs((appointment.startDateTime / 1000) * 1000).isBefore(dayjs().add(7, 'day')) ||
-      dayjs((appointment.startDateTime / 1000) * 1000).isBefore(dayjs().subtract(7, 'day')),
-  );
-
-  // visits past 7 days
-  const futureVisits = appointments?.filter((appointment) =>
-    dayjs((appointment.startDateTime / 1000) * 1000).isAfter(dayjs().add(7, 'day')),
-  );
-
-  return {
-    appointments: data ? { recentVisits, futureVisits } : null,
-    error,
-    isLoading,
-  };
-}
diff --git a/packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.component.tsx b/packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.component.tsx
deleted file mode 100644
index 87423f481..000000000
--- a/packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.component.tsx
+++ /dev/null
@@ -1,315 +0,0 @@
-import React, { useCallback, useEffect, useState } from 'react';
-import dayjs from 'dayjs';
-import head from 'lodash-es/head';
-import { useTranslation } from 'react-i18next';
-import {
-  Button,
-  ButtonSet,
-  ContentSwitcher,
-  DataTableSkeleton,
-  InlineLoading,
-  InlineNotification,
-  RadioTile,
-  Switch,
-  TileGroup,
-} from '@carbon/react';
-import {
-  formatDatetime,
-  type NewVisitPayload,
-  parseDate,
-  saveVisit,
-  showSnackbar,
-  toDateObjectStrict,
-  toOmrsIsoString,
-  useConfig,
-  useLayoutType,
-  useLocations,
-  useSession,
-  useVisit,
-  useVisitTypes,
-} from '@openmrs/esm-framework';
-import { type Appointment, SearchTypes } from '../types';
-import { postQueueEntry } from './visit-form/queue.resource';
-import { convertTime12to24 } from '../helpers/time-helpers';
-import { useQueueLocations } from './hooks/useQueueLocations';
-import { useQueues } from '../hooks/useQueues';
-import { useMutateQueueEntries } from '../hooks/useQueueEntries';
-import { type ConfigObject } from '../config-schema';
-import styles from './patient-scheduled-visits.scss';
-
-enum visitType {
-  RECENT = 'Recent',
-  FUTURE = 'Future',
-}
-
-const ScheduledVisitsForVisitType: React.FC<{
-  visits;
-  visitType;
-  scheduledVisitHeader;
-  patientUuid;
-  closeWorkspace: () => void;
-}> = ({ visits, scheduledVisitHeader, patientUuid, closeWorkspace }) => {
-  const { t } = useTranslation();
-  const [visitsIndex, setVisitsIndex] = useState(0);
-  const [hasPriority, setHasPriority] = useState(false);
-  const [userLocation, setUserLocation] = useState('');
-  const locations = useLocations();
-  const session = useSession();
-  const { queues, isLoading: isLoadingQueues } = useQueues(userLocation);
-  const { mutateQueueEntries } = useMutateQueueEntries();
-  const [isSubmitting, setIsSubmitting] = useState(false);
-  const timeFormat = new Date().getHours() >= 12 ? 'PM' : 'AM';
-  const visitDate = new Date();
-  const visitTime = dayjs(new Date()).format('hh:mm');
-  const [appointment, setAppointment] = useState<Appointment>();
-  const [patientId, setPatientId] = useState('');
-  const allVisitTypes = useVisitTypes();
-  const { currentVisit } = useVisit(patientUuid);
-  const config = useConfig<ConfigObject>();
-  const visitQueueNumberAttributeUuid = config.visitQueueNumberAttributeUuid;
-  const { queueLocations } = useQueueLocations();
-  const selectedQueueLocation = queueLocations[0]?.id;
-
-  // TODO: This needs fixing, we cannot just take the first queue and assume that is what is wanted
-  const service = head(queues)?.uuid;
-  const defaultStatus = config.concepts.defaultStatusConceptUuid;
-  const priorities = queues.find((q) => q.uuid === service)?.allowedPriorities ?? [];
-
-  useEffect(() => {
-    if (!userLocation && session?.sessionLocation !== null) {
-      setUserLocation(session?.sessionLocation?.uuid);
-    } else if (!userLocation && locations) {
-      setUserLocation(head(locations)?.uuid);
-    }
-  }, [session, locations, userLocation]);
-
-  const handleSubmit = useCallback(
-    (priority) => {
-      setIsSubmitting(true);
-      const [hours, minutes] = convertTime12to24(visitTime, timeFormat);
-      const visitType = [...allVisitTypes].shift().uuid;
-
-      const payload: NewVisitPayload = {
-        patient: patientId,
-        startDatetime: toDateObjectStrict(
-          toOmrsIsoString(
-            new Date(dayjs(visitDate).year(), dayjs(visitDate).month(), dayjs(visitDate).date(), hours, minutes),
-          ),
-        ),
-        visitType: visitType,
-        location: userLocation,
-      };
-
-      if (currentVisit) {
-        showSnackbar({
-          title: t('startVisitError', 'Error starting visit'),
-          kind: 'error',
-          isLowContrast: false,
-          subtitle: t('patientHasActiveVisit', 'The patient already has an active visit'),
-        });
-        setIsSubmitting(false);
-      } else {
-        const abortController = new AbortController();
-
-        saveVisit(payload, abortController)
-          .then((response) => {
-            postQueueEntry(
-              response.data.uuid,
-              patientId,
-              priority,
-              defaultStatus,
-              service,
-              appointment,
-              selectedQueueLocation,
-              visitQueueNumberAttributeUuid,
-            )
-              .then(() => {
-                showSnackbar({
-                  kind: 'success',
-                  title: t('startAVisit', 'Start a visit'),
-                  subtitle: t(
-                    'startVisitQueueSuccessfully',
-                    'Patient has been added to active visits list and queue.',
-                    `${hours} : ${minutes}`,
-                  ),
-                });
-                closeWorkspace();
-                setIsSubmitting(false);
-                mutateQueueEntries();
-              })
-              .catch((error) => {
-                showSnackbar({
-                  title: t('queueEntryError', 'Error adding patient to the queue'),
-                  kind: 'error',
-                  isLowContrast: false,
-                  subtitle: error?.message,
-                });
-                setIsSubmitting(false);
-              });
-          })
-          .catch((error) => {
-            showSnackbar({
-              title: t('startVisitError', 'Error starting visit'),
-              kind: 'error',
-              isLowContrast: false,
-              subtitle: error?.message,
-            });
-            setIsSubmitting(false);
-          });
-      }
-    },
-    [
-      visitTime,
-      timeFormat,
-      allVisitTypes,
-      patientId,
-      visitDate,
-      userLocation,
-      queues,
-      config.concepts.defaultStatusConceptUuid,
-      config.concepts.defaultPriorityConceptUuid,
-      currentVisit,
-      t,
-      priorities,
-      appointment,
-      selectedQueueLocation,
-      visitQueueNumberAttributeUuid,
-      closeWorkspace,
-      mutateQueueEntries,
-    ],
-  );
-
-  if (visits) {
-    return (
-      <div className={styles.row}>
-        <p className={styles.heading}>{scheduledVisitHeader} </p>
-        {visits?.length > 0 ? (
-          <TileGroup name="tile-group" defaultSelected="default-selected">
-            {visits?.map((visit, ind) => {
-              return (
-                <RadioTile
-                  value={visit.uuid}
-                  key={visit.uuid}
-                  className={styles.visitTile}
-                  onClick={(e) => {
-                    setHasPriority(true);
-                    setVisitsIndex(ind);
-                    setPatientId(visit?.patient?.uuid);
-                    setAppointment(visit);
-                  }}>
-                  <div className={styles.helperText}>
-                    <p className={styles.primaryText}>{visit.service?.name}</p>
-                    <p className={styles.secondaryText}>
-                      {' '}
-                      {formatDatetime(parseDate(visit?.startDateTime))} · {visit.location?.name}{' '}
-                    </p>
-
-                    {!visit.service ? (
-                      <DataTableSkeleton />
-                    ) : isLoadingQueues ? null : !priorities?.length ? (
-                      <InlineNotification
-                        className={styles.inlineNotification}
-                        kind={'error'}
-                        lowContrast
-                        subtitle={t('configurePriorities', 'Please configure priorities to continue.')}
-                        title={t('noPrioritiesConfigured', 'No priorities configured')}
-                      />
-                    ) : hasPriority && ind == visitsIndex ? (
-                      <ContentSwitcher
-                        size="sm"
-                        selectedIndex={null}
-                        className={styles.prioritySwitcher}
-                        onChange={(e) => {
-                          handleSubmit(e.name);
-                        }}>
-                        {priorities?.length > 0
-                          ? priorities.map(({ uuid, display }) => {
-                              return <Switch name={uuid} text={display} />;
-                            })
-                          : null}
-                      </ContentSwitcher>
-                    ) : null}
-                    {hasPriority && ind == visitsIndex && isSubmitting ? (
-                      <InlineLoading description={t('loading', 'Loading...')} />
-                    ) : null}
-                  </div>
-                </RadioTile>
-              );
-            })}
-          </TileGroup>
-        ) : (
-          <div className={styles.emptyAppointment}>
-            <p>{t('noAppointmentsFound', 'No appointments found')} </p>
-          </div>
-        )}
-      </div>
-    );
-  }
-  return (
-    <div className={styles.emptyAppointment}>
-      <p className={styles.heading}> {scheduledVisitHeader} </p>
-    </div>
-  );
-};
-
-interface PatientScheduledVisitsProps {
-  appointments: { recentVisits: Appointment[]; futureVisits: Appointment[] };
-  toggleSearchType: (searchMode: SearchTypes) => void;
-  patientUuid: string;
-  closeWorkspace: () => void;
-}
-
-const PatientScheduledVisits: React.FC<PatientScheduledVisitsProps> = ({
-  appointments,
-  toggleSearchType,
-  patientUuid,
-  closeWorkspace,
-}) => {
-  const { t } = useTranslation();
-  const isTablet = useLayoutType() === 'tablet';
-
-  return (
-    <div className={styles.container}>
-      <ScheduledVisitsForVisitType
-        visitType={visitType.RECENT}
-        visits={appointments?.recentVisits}
-        scheduledVisitHeader={t('recentScheduledVisits', '{{count}} visit(s) scheduled for +/- 7 days', {
-          count: appointments?.recentVisits?.length,
-        })}
-        patientUuid={patientUuid}
-        closeWorkspace={closeWorkspace}
-      />
-      <ScheduledVisitsForVisitType
-        visitType={visitType.FUTURE}
-        visits={appointments?.futureVisits}
-        scheduledVisitHeader={t('futureScheduledVisits', '{{count}} visit(s) scheduled for dates in the future', {
-          count: appointments?.futureVisits?.length,
-        })}
-        patientUuid={patientUuid}
-        closeWorkspace={closeWorkspace}
-      />
-
-      <div className={styles['text-divider']}>{t('orInProperFormat', 'Or')}</div>
-
-      <div className={styles.buttonContainer}>
-        <Button
-          kind="ghost"
-          iconDescription="Start another visit type"
-          onClick={() => toggleSearchType(SearchTypes.VISIT_FORM)}>
-          {t('anotherVisitType', 'Start another visit type')}
-        </Button>
-      </div>
-
-      <ButtonSet className={isTablet ? styles.tablet : styles.desktop}>
-        <Button className={styles.button} kind="secondary" onClick={() => toggleSearchType(SearchTypes.SEARCH_RESULTS)}>
-          {t('cancel', 'Cancel')}
-        </Button>
-        <Button className={styles.button} kind="primary" type="submit">
-          {t('search', 'Search')}
-        </Button>
-      </ButtonSet>
-    </div>
-  );
-};
-
-export default PatientScheduledVisits;
diff --git a/packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.scss b/packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.scss
deleted file mode 100644
index c906a48ff..000000000
--- a/packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.scss
+++ /dev/null
@@ -1,131 +0,0 @@
-@use '@carbon/layout';
-@use '@carbon/type';
-@use '@openmrs/esm-styleguide/src/vars' as *;
-
-.container {
-  background-color: $ui-background;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  height: 100%;
-}
-
-.grid {
-  padding: 0;
-}
-
-.visitTile {
-  margin: layout.$spacing-05 0;
-
-  &:global(.cds--tile--is-selected:focus) {
-    background-color: $color-blue-10;
-    color: $color-blue-10;
-    border: 1px solid $color-blue-60-2;
-    outline: none;
-  }
-
-  &:global(.cds--tile--is-selected:hover) {
-    background-color: $color-blue-10;
-    color: $color-blue-10;
-    border: 1px solid $color-blue-60-2;
-    outline: none;
-  }
-
-  &:global(.cds--tile--is-selected:hover .cds--tile__checkmark svg) {
-    fill: $color-blue-60-2;
-  }
-}
-
-.recentlyScheduledVisitsContainer {
-  margin-top: layout.$spacing-06;
-  margin-bottom: layout.$spacing-10;
-}
-
-.row {
-  margin: 0 layout.$spacing-05 layout.$spacing-05 layout.$spacing-05;
-}
-
-.backButton {
-  align-items: center;
-  display: flex;
-  justify-content: flex-start;
-  margin: layout.$spacing-03 0;
-  padding: 0;
-  @include type.type-style('body-compact-01');
-
-  button {
-    display: flex;
-
-    svg {
-      order: 1;
-      margin-right: layout.$spacing-03;
-      margin-left: 0 !important;
-    }
-
-    span {
-      order: 2;
-    }
-  }
-}
-
-.heading {
-  @include type.type-style('body-02');
-  color: $text-02;
-  margin-left: 1.2rem;
-}
-
-.primaryText {
-  @include type.type-style('heading-compact-02');
-}
-
-.secondaryText {
-  @include type.type-style('body-01');
-  color: $text-02;
-}
-
-.button {
-  height: layout.$spacing-10;
-  display: flex;
-  align-content: flex-start;
-  align-items: baseline;
-  min-width: 50%;
-}
-
-.text-divider {
-  display: flex;
-  align-items: center;
-  margin: layout.$spacing-08 25%;
-  @include type.type-style('heading-03');
-  color: $text-02;
-}
-
-.text-divider::before,
-.text-divider::after {
-  content: '';
-  height: 1px;
-  background-color: $text-03;
-  flex-grow: 1;
-}
-
-.text-divider::before {
-  margin-right: layout.$spacing-05;
-}
-
-.text-divider::after {
-  margin-left: layout.$spacing-05;
-}
-
-.buttonContainer {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-bottom: layout.$spacing-03;
-}
-
-.prioritySwitcher {
-  margin: layout.$spacing-03 0 layout.$spacing-03;
-}
-
-.emptyAppointment {
-  margin: layout.$spacing-05;
-}
diff --git a/packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.test.tsx b/packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.test.tsx
deleted file mode 100644
index 0f8f771f6..000000000
--- a/packages/esm-service-queues-app/src/patient-search/patient-scheduled-visits.test.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-import { screen } from '@testing-library/react';
-import { getDefaultsFromConfigSchema, useConfig, useLocations, useSession } from '@openmrs/esm-framework';
-import { renderWithSwr } from 'tools';
-import { type ConfigObject, configSchema } from '../config-schema';
-import { mockLocations, mockPatient, mockPatientsVisits, mockSession } from '__mocks__';
-import PatientScheduledVisits from './patient-scheduled-visits.component';
-
-const mockUseConfig = jest.mocked(useConfig<ConfigObject>);
-const mockToggleSearchType = jest.fn();
-const mockUseLocations = useLocations as jest.Mock;
-const mockUseSession = jest.mocked(useSession);
-
-const defaultProps = {
-  appointments: { recentVisits: mockPatientsVisits.recentVisits, futureVisits: [] },
-  closePanel: () => false,
-  closeWorkspace: jest.fn(),
-  patientUuid: mockPatient.uuid,
-  toggleSearchType: mockToggleSearchType,
-};
-
-describe('ScheduledVisits', () => {
-  beforeEach(() => {
-    mockUseConfig.mockReturnValue({
-      ...getDefaultsFromConfigSchema(configSchema),
-      concepts: {},
-    } as ConfigObject);
-    mockUseLocations.mockReturnValue(mockLocations.data.results);
-    mockUseSession.mockReturnValue(mockSession.data);
-  });
-
-  it('should display recent and future scheduled visits', async () => {
-    renderWithSwr(<PatientScheduledVisits {...defaultProps} />);
-
-    expect(screen.getByText(/Cardiology Consultation 1/i)).toBeInTheDocument();
-    expect(screen.getByText(/08-Aug-2022, 02:56 PM · 10 Engineer VCT/i)).toBeInTheDocument();
-    expect(screen.getByText(/No appointments found/i)).toBeInTheDocument();
-  });
-});
diff --git a/packages/esm-service-queues-app/src/patient-search/patient-search.workspace.tsx b/packages/esm-service-queues-app/src/patient-search/patient-search.workspace.tsx
deleted file mode 100644
index 3a1f194c3..000000000
--- a/packages/esm-service-queues-app/src/patient-search/patient-search.workspace.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-import React, { useEffect, useState } from 'react';
-
-import { SearchTypes } from '../types';
-import PatientScheduledVisits from './patient-scheduled-visits.component';
-import VisitForm from './visit-form/visit-form.component';
-import {
-  type DefaultWorkspaceProps,
-  ArrowLeftIcon,
-  ErrorState,
-  getPatientName,
-  PatientBannerContactDetails,
-  PatientBannerPatientInfo,
-  PatientBannerToggleContactDetailsButton,
-  PatientPhoto,
-  usePatient,
-  useVisit,
-} from '@openmrs/esm-framework';
-import ExistingVisitFormComponent from './visit-form/existing-visit-form.component';
-import styles from './patient-search.scss';
-import { Button, DataTableSkeleton } from '@carbon/react';
-import { useScheduledVisits } from './hooks/useScheduledVisits';
-import isNil from 'lodash-es/isNil';
-import { useTranslation } from 'react-i18next';
-
-interface PatientSearchProps extends DefaultWorkspaceProps {
-  selectedPatientUuid: string;
-  currentServiceQueueUuid?: string;
-  handleBackToSearchList?: () => void;
-}
-
-export const AddPatientToQueueContext = React.createContext({
-  currentServiceQueueUuid: '',
-});
-
-const PatientSearch: React.FC<PatientSearchProps> = ({
-  closeWorkspace,
-  selectedPatientUuid,
-  currentServiceQueueUuid,
-  handleBackToSearchList,
-}) => {
-  const { t } = useTranslation();
-  const { patient } = usePatient(selectedPatientUuid);
-  const { activeVisit } = useVisit(selectedPatientUuid);
-  const [searchType, setSearchType] = useState<SearchTypes>(SearchTypes.SCHEDULED_VISITS);
-  const [showContactDetails, setContactDetails] = useState(false);
-  const { appointments, isLoading, error } = useScheduledVisits(selectedPatientUuid);
-
-  const hasAppointments = !(isNil(appointments?.futureVisits) && isNil(appointments?.recentVisits));
-
-  const backButtonDescription =
-    searchType === SearchTypes.VISIT_FORM && hasAppointments
-      ? t('backToScheduledVisits', 'Back to scheduled visits')
-      : t('backToSearchResults', 'Back to search results');
-
-  const toggleSearchType = (searchType: SearchTypes) => {
-    setSearchType(searchType);
-  };
-
-  const handleBackToAction = () => {
-    if (searchType === SearchTypes.VISIT_FORM && hasAppointments) {
-      setSearchType(SearchTypes.SCHEDULED_VISITS);
-    } else {
-      setSearchType(SearchTypes.SEARCH_RESULTS);
-    }
-  };
-
-  useEffect(() => {
-    if (searchType === SearchTypes.SCHEDULED_VISITS && appointments && !hasAppointments) {
-      setSearchType(SearchTypes.VISIT_FORM);
-    }
-  }, [hasAppointments, appointments]);
-
-  useEffect(() => {
-    if (searchType === SearchTypes.SEARCH_RESULTS) {
-      handleBackToSearchList && handleBackToSearchList();
-    }
-  }, [searchType, handleBackToSearchList]);
-
-  const patientName = patient && getPatientName(patient);
-  return patient ? (
-    <div className={styles.patientSearchContainer}>
-      <AddPatientToQueueContext.Provider value={{ currentServiceQueueUuid }}>
-        <div className={styles.patientBannerContainer}>
-          <div className={styles.patientBanner}>
-            <div className={styles.patientPhoto}>
-              <PatientPhoto patientUuid={patient.id} patientName={patientName} />
-            </div>
-            <PatientBannerPatientInfo patient={patient} />
-            <PatientBannerToggleContactDetailsButton
-              showContactDetails={showContactDetails}
-              toggleContactDetails={() => setContactDetails(!showContactDetails)}
-            />
-          </div>
-          {showContactDetails ? (
-            <PatientBannerContactDetails patientId={patient.id} deceased={patient.deceasedBoolean} />
-          ) : null}
-        </div>
-        <div className={styles.backButton}>
-          <Button
-            kind="ghost"
-            renderIcon={(props) => <ArrowLeftIcon size={24} {...props} />}
-            iconDescription={backButtonDescription}
-            size="sm"
-            onClick={handleBackToAction}>
-            <span>{backButtonDescription}</span>
-          </Button>
-        </div>
-        {activeVisit ? (
-          <ExistingVisitFormComponent visit={activeVisit} closeWorkspace={closeWorkspace} />
-        ) : (
-          <>
-            {error ? (
-              <ErrorState headerTitle={t('errorFetchingAppointments', 'Error fetching appointments')} error={error} />
-            ) : null}
-
-            {isLoading && !error ? (
-              <DataTableSkeleton role="progressbar" />
-            ) : searchType === SearchTypes.SCHEDULED_VISITS && hasAppointments ? (
-              <PatientScheduledVisits
-                appointments={appointments}
-                patientUuid={selectedPatientUuid}
-                toggleSearchType={toggleSearchType}
-                closeWorkspace={closeWorkspace}
-              />
-            ) : searchType === SearchTypes.VISIT_FORM ? (
-              <VisitForm patientUuid={selectedPatientUuid} closeWorkspace={closeWorkspace} />
-            ) : null}
-          </>
-        )}
-      </AddPatientToQueueContext.Provider>
-    </div>
-  ) : null;
-};
-
-export default PatientSearch;
diff --git a/packages/esm-service-queues-app/src/patient-search/search-illustration.component.tsx b/packages/esm-service-queues-app/src/patient-search/search-illustration.component.tsx
deleted file mode 100644
index a838cae71..000000000
--- a/packages/esm-service-queues-app/src/patient-search/search-illustration.component.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import React from 'react';
-
-export default function SearchIllustration({ width = '62', height = '48' }) {
-  return (
-    <svg width={width} height={height} xmlns="http://www.w3.org/2000/svg" xmlnsXlink="http://www.w3.org/1999/xlink">
-      <defs>
-        <path
-          d="M36.001 3.218C47.482 9.838 51.403 24.52 44.782 36 38.162 47.482 23.48 51.403 12 44.782.518 38.162-3.403 23.48 3.218 12 9.838.518 24.52-3.403 36 3.218z"
-          id="a"
-        />
-      </defs>
-      <g fill="none" fillRule="evenodd">
-        <path d="M36.001 3.218C47.482 9.838 51.403 24.52 44.782 36 38.162 47.482 23.48 51.403 12 44.782.518 38.162-3.403 23.48 3.218 12 9.838.518 24.52-3.403 36 3.218z" />
-        <mask id="b" fill="#fff">
-          <use xlinkHref="#a" />
-        </mask>
-        <use fill="#CEE6E5" xlinkHref="#a" />
-        <path
-          d="M38 48v-2.618c0-6.696-4.58-12.296-10.72-13.798a8.159 8.159 0 0 0 4.76-7.427C32.04 19.653 28.44 16 24 16c-4.44 0-8.04 3.653-8.04 8.157a8.159 8.159 0 0 0 4.76 7.427C14.58 33.086 10 38.686 10 45.382v2.598"
-          fill="#9ACBCA"
-          mask="url(#b)"
-        />
-        <path fill="#9ACBCA" d="m45.34 35 17.124 10.33-1.55 2.57L43.79 37.568z" />
-      </g>
-    </svg>
-  );
-}
diff --git a/packages/esm-service-queues-app/src/patient-search/search-results.component.tsx b/packages/esm-service-queues-app/src/patient-search/search-results.component.tsx
deleted file mode 100644
index 96ef7af84..000000000
--- a/packages/esm-service-queues-app/src/patient-search/search-results.component.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import React, { useMemo, useState } from 'react';
-import { Dropdown } from '@carbon/react';
-import { useTranslation } from 'react-i18next';
-import { SearchTypes } from '../types';
-import PatientInfo from '../patient-info/patient-info.component';
-import styles from './search-results.scss';
-
-interface SearchResultsProps {
-  patients: Array<fhir.Patient>;
-  hidePanel?: any;
-  toggleSearchType: (searchMode: SearchTypes, patientUuid: string) => void;
-}
-
-type SortingCriteria = 'firstNameFirst' | 'lastNameFirst' | 'oldest' | 'youngest';
-
-const SearchResults: React.FC<SearchResultsProps> = ({ patients, toggleSearchType }) => {
-  const { t } = useTranslation();
-  const [selectedSortingCriteria, setSelectedSortingCriteria] = useState<SortingCriteria>('firstNameFirst');
-
-  const sortedPatient = useMemo(() => {
-    return patients.sort((patientA, patientB) => {
-      if (selectedSortingCriteria === 'oldest') {
-        return new Date(patientA.birthDate).getTime() - new Date(patientB.birthDate).getTime();
-      }
-      if (selectedSortingCriteria === 'youngest') {
-        return new Date(patientB.birthDate).getTime() - new Date(patientA.birthDate).getTime();
-      }
-      if (selectedSortingCriteria === 'firstNameFirst') {
-        return patientA.name?.[0].given?.join('') < patientB.name?.[0].given?.join('') ? -1 : 0;
-      }
-      if (selectedSortingCriteria === 'lastNameFirst') {
-        return patientA?.name?.[0].family < patientB?.name?.[0].family ? -1 : 0;
-      }
-    });
-  }, [patients, selectedSortingCriteria]);
-
-  const sortingCriteria = [
-    { id: 'firstNameFirst', label: t('firstNameSort', 'First name (a-z)') },
-    { id: 'lastNameFirst', label: t('lastNameSort', 'Last name (a-z)') },
-    { id: 'oldest', label: t('oldest', 'Oldest first') },
-    { id: 'youngest', label: t('youngest', 'Youngest first') },
-  ];
-
-  return (
-    <>
-      <div className={styles.sortingCriteriaSelect}>
-        <Dropdown
-          aria-label="sortBy"
-          id="sortingCriteriaDropdown"
-          items={sortingCriteria}
-          initialSelectedItem={sortingCriteria[0]}
-          label={`${t('sortBy', 'Sort by')}:`}
-          titleText={`${t('sortBy', 'Sort by')}:`}
-          type="inline"
-          size="sm"
-          onChange={({ selectedItem }) => setSelectedSortingCriteria(selectedItem.id as SortingCriteria)}
-        />
-      </div>
-      {sortedPatient.map((patient, index) => (
-        <div key={`search-result-${index}`} className={styles.patientChart}>
-          <div className={styles.container}>
-            <PatientInfo
-              patient={patient}
-              handlePatientInfoClick={() => {
-                toggleSearchType(SearchTypes.SCHEDULED_VISITS, patient.id);
-              }}
-            />
-          </div>
-        </div>
-      ))}
-    </>
-  );
-};
-
-export default SearchResults;
diff --git a/packages/esm-service-queues-app/src/patient-search/search-results.scss b/packages/esm-service-queues-app/src/patient-search/search-results.scss
deleted file mode 100644
index d30566b08..000000000
--- a/packages/esm-service-queues-app/src/patient-search/search-results.scss
+++ /dev/null
@@ -1,80 +0,0 @@
-@use '@carbon/layout';
-@use '@carbon/type';
-@use '@openmrs/esm-styleguide/src/vars' as *;
-
-.patientChart {
-  text-decoration: none;
-}
-
-:global(.omrs-breakpoint-gt-tablet) .patientChart {
-  background-color: $ui-02;
-}
-
-.container {
-  & .patientBanner {
-    background-color: red !important;
-  }
-}
-
-.patientBanner {
-  display: flex;
-}
-
-.patientName {
-  @include type.type-style('heading-03');
-}
-
-.patientAvatar {
-  width: layout.$spacing-11;
-  height: layout.$spacing-11;
-  margin: layout.$spacing-05 layout.$spacing-05 0;
-  border-radius: 1px;
-}
-
-.patientInfo {
-  width: 100%;
-  display: flex;
-  flex-flow: column wrap;
-  margin: layout.$spacing-05 0;
-  cursor: pointer;
-}
-
-.demographics {
-  @include type.type-style('body-compact-02');
-  color: $text-02;
-  margin: 0.3rem 0;
-}
-
-.identifiers {
-  @include type.type-style('body-compact-02');
-  color: $ui-04;
-}
-
-.actionsContainer {
-  padding-top: layout.$spacing-03;
-  margin-top: layout.$spacing-05;
-}
-
-.sortingCriteriaSelect {
-  display: flex;
-  width: 100%;
-  justify-content: flex-end;
-  @include type.type-style('body-compact-02');
-  width: 100%;
-
-  :global(.cds--dropdown__wrapper--inline) {
-    gap: 0;
-  }
-
-  :global(.cds--list-box__menu-icon) {
-    height: layout.$spacing-05;
-  }
-
-  :global(.cds--list-box__menu) {
-    left: -7.5rem;
-  }
-
-  :global(.cds--label) {
-    margin-right: layout.$spacing-02;
-  }
-}
diff --git a/packages/esm-service-queues-app/src/patient-search/search-results.test.tsx b/packages/esm-service-queues-app/src/patient-search/search-results.test.tsx
deleted file mode 100644
index 927aac5b4..000000000
--- a/packages/esm-service-queues-app/src/patient-search/search-results.test.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import React from 'react';
-import { screen, render } from '@testing-library/react';
-import { age } from '@openmrs/esm-framework';
-import SearchResults from './search-results.component';
-
-const mockAge = jest.mocked(age);
-
-const patients = [
-  {
-    id: 'b73bee73-7bf0-4872-9657-ba9de0d93478',
-    name: [{ given: ['John'], family: 'Smith' }],
-    person: {
-      gender: 'Male',
-      age: 2,
-      birthdate: '2020-02-01T00:00:00.000+0000',
-      birthdateEstimated: true,
-      personName: {
-        display: 'John Smith',
-        uuid: '27698bff-4056-430c-824c-cb18cf9329d8',
-        givenName: 'John',
-        middleName: null,
-        familyName: 'Smith',
-        familyName2: null,
-        voided: false,
-      },
-      addresses: [
-        {
-          display: 'Bom Jesus Street',
-          uuid: '7eab94da-4b33-4da9-b352-da21a571221a',
-          preferred: true,
-          address1: 'Bom Jesus Street',
-          address2: null,
-          cityVillage: 'Recife',
-          stateProvince: 'Pernambuco',
-          country: 'Brazil',
-          postalCode: '50030-310',
-          countyDistrict: null,
-        },
-      ],
-      display: 'John Smith',
-      dead: false,
-      deathDate: null,
-    },
-    gender: 'Male',
-    birthDate: '2020-02-01T00:00:00.000+0000',
-    deceasedDateTime: null,
-    identifier: [{ value: '10001F0' }],
-    address: [{ city: 'Recife', country: 'Brazil', postalCode: '50030-310', state: 'Pernambuco', use: 'home' }],
-    telecom: [],
-    patientIdentifier: { identifier: [{ value: '10001F0' }] },
-  },
-];
-
-const mockToggleSearchType = jest.fn();
-
-describe('Search Results', () => {
-  it('should search results page', () => {
-    mockAge.mockReturnValue('35');
-    renderSearchResults();
-    expect(screen.getByText(/John Smith/)).toBeInTheDocument();
-    expect(screen.getByText(/35/)).toBeInTheDocument();
-    expect(screen.getByText(/Male/)).toBeInTheDocument();
-    expect(screen.getByText(/01 — Feb — 2020/i)).toBeInTheDocument();
-  });
-});
-
-const renderSearchResults = () => {
-  render(<SearchResults patients={patients} toggleSearchType={mockToggleSearchType} />);
-};
diff --git a/packages/esm-service-queues-app/src/patient-search/search.resource.ts b/packages/esm-service-queues-app/src/patient-search/search.resource.ts
deleted file mode 100644
index f0af94b76..000000000
--- a/packages/esm-service-queues-app/src/patient-search/search.resource.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-
-export function findPatients(query: string, objectVersion: string, controller: AbortController, includeDead: boolean) {
-  const url = `${restBaseUrl}/patient?q=${query}&v=${objectVersion}&includeDead=${includeDead}`;
-
-  return openmrsFetch(url, {
-    method: 'GET',
-    signal: controller.signal,
-  });
-}
diff --git a/packages/esm-service-queues-app/src/patient-search/visit-form/existing-visit-form.component.tsx b/packages/esm-service-queues-app/src/patient-search/visit-form/existing-visit-form.component.tsx
deleted file mode 100644
index a2a342891..000000000
--- a/packages/esm-service-queues-app/src/patient-search/visit-form/existing-visit-form.component.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-import React, { useCallback, useState } from 'react';
-import { Button, ButtonSet, Form, Row } from '@carbon/react';
-import { useTranslation } from 'react-i18next';
-import {
-  type ConfigObject,
-  ExtensionSlot,
-  showSnackbar,
-  useConfig,
-  useLayoutType,
-  type Visit,
-} from '@openmrs/esm-framework';
-import { postQueueEntry } from '../../active-visits/active-visits-table.resource';
-import { useMutateQueueEntries } from '../../hooks/useQueueEntries';
-import styles from './visit-form.scss';
-import classNames from 'classnames';
-import VisitFormQueueFields from '../visit-form-queue-fields/visit-form-queue-fields.component';
-
-interface ExistingVisitFormProps {
-  closeWorkspace: () => void;
-  visit: Visit;
-}
-
-const ExistingVisitForm: React.FC<ExistingVisitFormProps> = ({ visit, closeWorkspace }) => {
-  const { t } = useTranslation();
-  const isTablet = useLayoutType() === 'tablet';
-  const [isSubmitting, setIsSubmitting] = useState(false);
-
-  const config = useConfig<ConfigObject>();
-  const visitQueueNumberAttributeUuid = config.visitQueueNumberAttributeUuid;
-  const { mutateQueueEntries } = useMutateQueueEntries();
-  const [{ service, priority, status, sortWeight, queueLocation }, setVisitFormFields] = useState({
-    service: null,
-    priority: null,
-    status: null,
-    sortWeight: null,
-    queueLocation: null,
-  });
-
-  const handleSubmit = useCallback(
-    (event) => {
-      event.preventDefault();
-
-      setIsSubmitting(true);
-
-      postQueueEntry(
-        visit.uuid,
-        service,
-        visit.patient.uuid,
-        priority,
-        status,
-        sortWeight,
-        queueLocation,
-        visitQueueNumberAttributeUuid,
-      ).then(
-        ({ status }) => {
-          if (status === 201) {
-            showSnackbar({
-              kind: 'success',
-              isLowContrast: true,
-              title: t('addPatientToQueue', 'Add patient to queue'),
-              subtitle: t('queueEntryAddedSuccessfully', 'Queue entry added successfully'),
-            });
-            closeWorkspace();
-            setIsSubmitting(false);
-            mutateQueueEntries();
-          }
-        },
-        (error) => {
-          let subtitle = error?.message;
-          const err = error?.responseBody?.error?.message;
-          if (err && err === '[queue.entry.duplicate.patient]') {
-            subtitle = t('patientAlreadyInQueue', 'Patient is already in the queue');
-          }
-          showSnackbar({
-            title: t('queueEntryError', 'Error adding patient to the queue'),
-            kind: 'error',
-            subtitle,
-          });
-          setIsSubmitting(false);
-        },
-      );
-    },
-    [closeWorkspace, mutateQueueEntries, visit, t, visitQueueNumberAttributeUuid],
-  );
-
-  return visit ? (
-    <>
-      {isTablet && (
-        <Row className={styles.headerGridRow}>
-          <ExtensionSlot
-            name="visit-form-header-slot"
-            className={styles.dataGridRow}
-            state={{ patientUuid: visit.patient.uuid }}
-          />
-        </Row>
-      )}
-      <Form className={classNames(styles.form, styles.container)} onSubmit={handleSubmit}>
-        <VisitFormQueueFields setFormFields={setVisitFormFields} />
-        <ButtonSet className={isTablet ? styles.tablet : styles.desktop}>
-          <Button className={styles.button} kind="secondary" onClick={closeWorkspace}>
-            {t('discard', 'Discard')}
-          </Button>
-          <Button className={styles.button} disabled={isSubmitting} kind="primary" type="submit">
-            {t('addPatientToQueue', 'Add patient to queue')}
-          </Button>
-        </ButtonSet>
-      </Form>
-    </>
-  ) : null;
-};
-
-export default ExistingVisitForm;
diff --git a/packages/esm-service-queues-app/src/patient-search/visit-form/queue.resource.ts b/packages/esm-service-queues-app/src/patient-search/visit-form/queue.resource.ts
deleted file mode 100644
index a976d93be..000000000
--- a/packages/esm-service-queues-app/src/patient-search/visit-form/queue.resource.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { openmrsFetch, restBaseUrl, toDateObjectStrict, toOmrsIsoString } from '@openmrs/esm-framework';
-import { generateVisitQueueNumber } from '../../active-visits/active-visits-table.resource';
-import { type Appointment } from '../../types';
-
-export async function postQueueEntry(
-  visitUuid: string,
-  patientUuid: string,
-  priority: string,
-  status: string,
-  queueServiceUuid: string,
-  appointment: Appointment,
-  locationUuid: string,
-  visitQueueNumberAttributeUuid: string,
-) {
-  const abortController = new AbortController();
-
-  await Promise.all([
-    saveAppointment(appointment),
-    generateVisitQueueNumber(locationUuid, visitUuid, queueServiceUuid, visitQueueNumberAttributeUuid),
-  ]);
-
-  return openmrsFetch(`${restBaseUrl}/visit-queue-entry`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    signal: abortController.signal,
-    body: {
-      visit: visitUuid,
-      queueEntry: {
-        status: status,
-        priority: priority,
-        queue: queueServiceUuid,
-        patient: patientUuid,
-        startedAt: new Date(),
-      },
-    },
-  });
-}
-
-export async function saveAppointment(appointment: Appointment) {
-  const abortController = new AbortController();
-
-  await openmrsFetch(`${restBaseUrl}/appointment`, {
-    method: 'POST',
-    signal: abortController.signal,
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: {
-      patientUuid: appointment?.patient.uuid,
-      serviceUuid: appointment?.service?.uuid,
-      startDateTime: appointment?.startDateTime,
-      endDateTime: appointment?.endDateTime,
-      appointmentKind: appointment?.appointmentKind,
-      locationUuid: appointment?.location?.uuid,
-      comments: appointment?.comments,
-      status: 'CheckedIn',
-      appointmentNumber: appointment?.appointmentNumber,
-      uuid: appointment?.uuid,
-      providerUuid: appointment?.provider?.uuid,
-    },
-  });
-}
diff --git a/packages/esm-service-queues-app/src/patient-search/visit-form/visit-form.component.tsx b/packages/esm-service-queues-app/src/patient-search/visit-form/visit-form.component.tsx
deleted file mode 100644
index 81f72fe85..000000000
--- a/packages/esm-service-queues-app/src/patient-search/visit-form/visit-form.component.tsx
+++ /dev/null
@@ -1,337 +0,0 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import dayjs from 'dayjs';
-import {
-  Button,
-  ButtonSet,
-  ContentSwitcher,
-  DatePicker,
-  DatePickerInput,
-  Form,
-  FormGroup,
-  InlineNotification,
-  RadioButton,
-  RadioButtonGroup,
-  Row,
-  Select,
-  SelectItem,
-  Stack,
-  Switch,
-  TimePicker,
-  TimePickerSelect,
-} from '@carbon/react';
-import { useTranslation } from 'react-i18next';
-import {
-  ExtensionSlot,
-  ResponsiveWrapper,
-  saveVisit,
-  showSnackbar,
-  toDateObjectStrict,
-  toOmrsIsoString,
-  useConfig,
-  useLayoutType,
-  useLocations,
-  useSession,
-} from '@openmrs/esm-framework';
-import { RecommendedVisitTypeSelector, VisitTypeSelector } from './visit-type-selector.component';
-import { postQueueEntry } from '../../active-visits/active-visits-table.resource';
-import { type amPm, convertTime12to24 } from '../../helpers/time-helpers';
-import { useActivePatientEnrollment } from '../hooks/useActivePatientEnrollment';
-import { type NewVisitPayload, type PatientProgram } from '../../types';
-import styles from './visit-form.scss';
-import { useDefaultLoginLocation } from '../hooks/useDefaultLocation';
-import isEmpty from 'lodash-es/isEmpty';
-import { useMutateQueueEntries } from '../../hooks/useQueueEntries';
-import { type ConfigObject } from '../../config-schema';
-import { datePickerFormat, datePickerPlaceHolder } from '../../constants';
-import VisitFormQueueFields from '../visit-form-queue-fields/visit-form-queue-fields.component';
-
-interface VisitFormProps {
-  patientUuid: string;
-  closeWorkspace: () => void;
-}
-
-const VisitForm: React.FC<VisitFormProps> = ({ patientUuid, closeWorkspace }) => {
-  const { t } = useTranslation();
-  const isTablet = useLayoutType() === 'tablet';
-  const locations = useLocations();
-  const sessionUser = useSession();
-  const { defaultFacility, isLoading: loadingDefaultFacility } = useDefaultLoginLocation();
-
-  const config = useConfig<ConfigObject>();
-  const [contentSwitcherIndex, setContentSwitcherIndex] = useState(config.showRecommendedVisitTypeTab ? 0 : 1);
-  const [isMissingVisitType, setIsMissingVisitType] = useState(false);
-  const [isSubmitting, setIsSubmitting] = useState(false);
-  const [timeFormat, setTimeFormat] = useState<amPm>(new Date().getHours() >= 12 ? 'PM' : 'AM');
-  const [visitDate, setVisitDate] = useState(new Date());
-  const [visitTime, setVisitTime] = useState(dayjs(new Date()).format('hh:mm'));
-  const state = useMemo(() => ({ patientUuid }), [patientUuid]);
-  const [ignoreChanges, setIgnoreChanges] = useState(true);
-  const { activePatientEnrollment } = useActivePatientEnrollment(patientUuid);
-  const [enrollment, setEnrollment] = useState<PatientProgram>(activePatientEnrollment[0]);
-  const { mutateQueueEntries } = useMutateQueueEntries();
-  const visitQueueNumberAttributeUuid = config.visitQueueNumberAttributeUuid;
-  const [selectedLocation, setSelectedLocation] = useState('');
-  const [visitType, setVisitType] = useState('');
-  const [{ service, priority, status, sortWeight, queueLocation }, setVisitFormFields] = useState({
-    service: null,
-    priority: null,
-    status: null,
-    sortWeight: null,
-    queueLocation: null,
-  });
-
-  useEffect(() => {
-    if (locations?.length && sessionUser) {
-      setSelectedLocation(sessionUser?.sessionLocation?.uuid);
-    } else if (!loadingDefaultFacility && defaultFacility) {
-      setSelectedLocation(defaultFacility?.uuid);
-    }
-  }, [locations, sessionUser, loadingDefaultFacility]);
-
-  const handleSubmit = useCallback(
-    (event) => {
-      event.preventDefault();
-
-      if (!visitType) {
-        setIsMissingVisitType(true);
-        return;
-      }
-
-      setIsSubmitting(true);
-
-      const [hours, minutes] = convertTime12to24(visitTime, timeFormat);
-
-      const payload: NewVisitPayload = {
-        patient: patientUuid,
-        startDatetime: toDateObjectStrict(
-          toOmrsIsoString(
-            new Date(dayjs(visitDate).year(), dayjs(visitDate).month(), dayjs(visitDate).date(), hours, minutes),
-          ),
-        ),
-        visitType: visitType,
-        location: selectedLocation,
-        attributes: [],
-      };
-
-      const abortController = new AbortController();
-
-      saveVisit(payload, abortController).then((response) => {
-        // add new queue entry if visit created successfully
-        postQueueEntry(
-          response.data.uuid,
-          service,
-          patientUuid,
-          priority,
-          status,
-          sortWeight,
-          queueLocation,
-          visitQueueNumberAttributeUuid,
-        )
-          .then(() => {
-            showSnackbar({
-              kind: 'success',
-              isLowContrast: true,
-              title: t('startAVisit', 'Start a visit'),
-              subtitle: t(
-                'startVisitQueueSuccessfully',
-                'Patient has been added to active visits list and queue.',
-                `${hours} : ${minutes}`,
-              ),
-            });
-            closeWorkspace();
-            setIsSubmitting(false);
-            mutateQueueEntries();
-          })
-          .catch((error) => {
-            showSnackbar({
-              title: t('queueEntryError', 'Error adding patient to the queue'),
-              kind: 'error',
-              subtitle: error?.message,
-            });
-            setIsSubmitting(false);
-          })
-          .catch((error) => {
-            showSnackbar({
-              title: t('startVisitError', 'Error starting visit'),
-              kind: 'error',
-              subtitle: error?.message,
-            });
-            setIsSubmitting(false);
-          });
-      });
-    },
-    [
-      closeWorkspace,
-      mutateQueueEntries,
-      patientUuid,
-      selectedLocation,
-      t,
-      timeFormat,
-      visitDate,
-      visitQueueNumberAttributeUuid,
-      visitTime,
-      visitType,
-    ],
-  );
-
-  const handleOnChange = useCallback(() => {
-    setIgnoreChanges((prevState) => !prevState);
-  }, []);
-
-  return (
-    <Form className={styles.form} onChange={handleOnChange} onSubmit={handleSubmit}>
-      <div>
-        {isTablet && (
-          <Row className={styles.headerGridRow}>
-            <ExtensionSlot name="visit-form-header-slot" className={styles.dataGridRow} state={state} />
-          </Row>
-        )}
-        <Stack gap={8} className={styles.container}>
-          <section className={styles.section}>
-            <div className={styles.sectionTitle}>{t('dateAndTimeOfVisit', 'Date and time of visit')}</div>
-            <div className={styles.dateTimeSection}>
-              <DatePicker
-                dateFormat={datePickerFormat}
-                datePickerType="single"
-                id="visitDate"
-                style={{ paddingBottom: '1rem' }}
-                maxDate={new Date().toISOString()}
-                onChange={([date]) => setVisitDate(date)}
-                value={visitDate}>
-                <DatePickerInput
-                  id="visitStartDateInput"
-                  labelText={t('date', 'Date')}
-                  placeholder={datePickerPlaceHolder}
-                  style={{ width: '100%' }}
-                />
-              </DatePicker>
-              <ResponsiveWrapper>
-                <TimePicker
-                  id="visitStartTime"
-                  labelText={t('time', 'Time')}
-                  onChange={(event) => setVisitTime(event.target.value as amPm)}
-                  pattern="^(1[0-2]|0?[1-9]):([0-5]?[0-9])$"
-                  style={{ marginLeft: '0.125rem', flex: 'none' }}
-                  value={visitTime}>
-                  <TimePickerSelect
-                    id="visitStartTimeSelect"
-                    onChange={(event) => setTimeFormat(event.target.value as amPm)}
-                    value={timeFormat}
-                    labelText={t('time', 'Time')}
-                    aria-label={t('time', 'Time')}>
-                    <SelectItem value="AM" text="AM" />
-                    <SelectItem value="PM" text="PM" />
-                  </TimePickerSelect>
-                </TimePicker>
-              </ResponsiveWrapper>
-            </div>
-          </section>
-
-          <section className={styles.section}>
-            <div className={styles.sectionTitle}>{t('facility', 'Facility')}</div>
-            <Select
-              labelText={t('selectFacility', 'Select a facility')}
-              id="location"
-              invalidText="Required"
-              value={selectedLocation}
-              defaultSelected={selectedLocation}
-              onChange={(event) => setSelectedLocation(event.target.value)}>
-              {!selectedLocation ? <SelectItem text={t('selectOption', 'Select an option')} value="" /> : null}
-              {!isEmpty(defaultFacility) ? (
-                <SelectItem key={defaultFacility?.uuid} text={defaultFacility?.display} value={defaultFacility?.uuid}>
-                  {defaultFacility?.display}
-                </SelectItem>
-              ) : locations?.length > 0 ? (
-                locations.map((location) => (
-                  <SelectItem key={location.uuid} text={location.display} value={location.uuid}>
-                    {location.display}
-                  </SelectItem>
-                ))
-              ) : null}
-            </Select>
-          </section>
-
-          {config.showRecommendedVisitTypeTab && (
-            <section>
-              <div className={styles.sectionTitle}>{t('program', 'Program')}</div>
-              <FormGroup legendText={t('selectProgramType', 'Select program type')}>
-                <RadioButtonGroup
-                  defaultSelected={enrollment?.program?.uuid}
-                  orientation="vertical"
-                  onChange={(uuid) =>
-                    setEnrollment(activePatientEnrollment.find(({ program }) => program.uuid === uuid))
-                  }
-                  name="program-type-radio-group"
-                  valueSelected="default-selected">
-                  {activePatientEnrollment.map(({ uuid, display, program }) => (
-                    <RadioButton
-                      key={uuid}
-                      className={styles.radioButton}
-                      id={uuid}
-                      labelText={display}
-                      value={program.uuid}
-                    />
-                  ))}
-                </RadioButtonGroup>
-              </FormGroup>
-            </section>
-          )}
-          <section>
-            <div className={styles.sectionTitle}>{t('visitType', 'Visit Type')}</div>
-            {config.showRecommendedVisitTypeTab && (
-              <ContentSwitcher
-                selectedIndex={contentSwitcherIndex}
-                className={styles.contentSwitcher}
-                onChange={({ index }) => setContentSwitcherIndex(index)}>
-                <Switch name="recommended" text={t('recommended', 'Recommended')} />
-                <Switch name="all" text={t('all', 'All')} />
-              </ContentSwitcher>
-            )}
-            {config.showRecommendedVisitTypeTab && contentSwitcherIndex === 0 && (
-              <RecommendedVisitTypeSelector
-                onChange={(visitType) => {
-                  setVisitType(visitType);
-                  setIsMissingVisitType(false);
-                }}
-                patientUuid={patientUuid}
-                patientProgram={enrollment}
-                locationUuid={selectedLocation}
-              />
-            )}
-            {(!config.showRecommendedVisitTypeTab || contentSwitcherIndex === 1) && (
-              <VisitTypeSelector
-                onChange={(visitType) => {
-                  setVisitType(visitType);
-                  setIsMissingVisitType(false);
-                }}
-              />
-            )}
-          </section>
-          {isMissingVisitType && (
-            <section>
-              <InlineNotification
-                style={{ margin: '0', minWidth: '100%' }}
-                kind="error"
-                lowContrast={true}
-                title={t('missingVisitType', 'Missing visit type')}
-                subtitle={t('selectVisitType', 'Please select a Visit Type')}
-              />
-            </section>
-          )}
-
-          <VisitFormQueueFields setFormFields={setVisitFormFields} />
-        </Stack>
-      </div>
-      <ButtonSet className={isTablet ? styles.tabletButtons : styles.desktopButtons}>
-        <Button className={styles.button} kind="secondary" onClick={closeWorkspace}>
-          {t('discard', 'Discard')}
-        </Button>
-        <Button className={styles.button} disabled={isSubmitting} kind="primary" type="submit">
-          {t('startVisit', 'Start visit')}
-        </Button>
-      </ButtonSet>
-    </Form>
-  );
-};
-
-export default VisitForm;
diff --git a/packages/esm-service-queues-app/src/patient-search/visit-form/visit-type-selector.component.tsx b/packages/esm-service-queues-app/src/patient-search/visit-form/visit-type-selector.component.tsx
deleted file mode 100644
index 9e7ef26cf..000000000
--- a/packages/esm-service-queues-app/src/patient-search/visit-form/visit-type-selector.component.tsx
+++ /dev/null
@@ -1,153 +0,0 @@
-import React, { useState, useMemo, useEffect } from 'react';
-import classNames from 'classnames';
-import isEmpty from 'lodash-es/isEmpty';
-import { useTranslation } from 'react-i18next';
-import {
-  InlineNotification,
-  Layer,
-  RadioButton,
-  RadioButtonGroup,
-  Search,
-  StructuredListSkeleton,
-  Tile,
-} from '@carbon/react';
-import { ResponsiveWrapper, useDebounce, useLayoutType, useVisitTypes, type VisitType } from '@openmrs/esm-framework';
-import EmptyDataIllustration from '../empty-data-illustration.component';
-import styles from './visit-type-selector.scss';
-import { useRecommendedVisitTypes } from '../hooks/useRecommendedVisitTypes';
-import { type PatientProgram } from '../../types';
-
-export interface VisitTypeSelectorProps {
-  onChange: (event) => void;
-}
-
-export const VisitTypeSelector: React.FC<VisitTypeSelectorProps> = ({ onChange }) => {
-  const allVisitTypes = useVisitTypes();
-
-  return (
-    <div>
-      {allVisitTypes.length == 0 ? (
-        <StructuredListSkeleton />
-      ) : (
-        <VisitTypeSelectorPresentation visitTypes={allVisitTypes} onChange={onChange} />
-      )}
-    </div>
-  );
-};
-
-export interface RecommendedVisitTypeSelectorProps {
-  onChange: (event) => void;
-  patientUuid: string;
-  patientProgram: PatientProgram;
-  locationUuid: string;
-}
-
-/** Recommended visits are specfic to a patient, patient program, and location. */
-export const RecommendedVisitTypeSelector: React.FC<RecommendedVisitTypeSelectorProps> = ({
-  onChange,
-  patientUuid,
-  patientProgram,
-  locationUuid,
-}) => {
-  const { t } = useTranslation();
-  const { recommendedVisitTypes, error, isLoading } = useRecommendedVisitTypes(
-    patientUuid,
-    patientProgram?.uuid,
-    patientProgram?.program?.uuid,
-    locationUuid,
-  );
-
-  return (
-    <div style={{ marginTop: '0.625rem' }}>
-      {isLoading ? (
-        <StructuredListSkeleton />
-      ) : (
-        <VisitTypeSelectorPresentation onChange={onChange} visitTypes={recommendedVisitTypes} />
-      )}
-      {error && (
-        <InlineNotification
-          kind="error"
-          title={t('failedToLoadRecommendedVisitTypes', 'Failed to load recommended visit types')}></InlineNotification>
-      )}
-    </div>
-  );
-};
-
-interface VisitTypeSelectorPresentationProps {
-  onChange: (event) => void;
-  visitTypes: VisitType[];
-}
-
-const MAX_RESULTS = 5;
-
-const VisitTypeSelectorPresentation: React.FC<VisitTypeSelectorPresentationProps> = ({ visitTypes, onChange }) => {
-  const { t } = useTranslation();
-  const isTablet = useLayoutType() === 'tablet';
-  const [searchTerm, setSearchTerm] = useState<string>('');
-  const debouncedSearchTerm = useDebounce(searchTerm);
-  const [selectedVisitType, setSelectedVisitType] = useState<string>();
-
-  const results = useMemo(() => {
-    if (!isEmpty(debouncedSearchTerm)) {
-      return visitTypes.filter(
-        (visitType) => visitType.display.toLowerCase().search(debouncedSearchTerm.toLowerCase()) !== -1,
-      );
-    } else {
-      return visitTypes;
-    }
-  }, [debouncedSearchTerm, visitTypes]);
-
-  const truncatedResults = results.slice(0, MAX_RESULTS);
-
-  useEffect(() => {
-    if (results.length > 0) {
-      onChange(results[0].uuid);
-      setSelectedVisitType(results[0].uuid);
-    }
-  }, [results]);
-
-  return (
-    <div
-      className={classNames(styles.visitTypeOverviewWrapper, {
-        [styles.tablet]: isTablet,
-        [styles.desktop]: !isTablet,
-      })}>
-      {truncatedResults.length < visitTypes.length ? (
-        <ResponsiveWrapper>
-          <Search
-            onChange={(event) => setSearchTerm(event.target.value)}
-            placeholder={t('searchForAVisitType', 'Search for a visit type')}
-            labelText=""
-          />
-        </ResponsiveWrapper>
-      ) : null}
-      {truncatedResults.length ? (
-        <RadioButtonGroup
-          className={styles.radioButtonGroup}
-          defaultSelected={results[0].uuid}
-          orientation="vertical"
-          onChange={(visitType) => {
-            setSelectedVisitType(visitType);
-            onChange(visitType);
-          }}
-          name="radio-button-group"
-          valueSelected={selectedVisitType}>
-          {truncatedResults.map(({ uuid, display, name }) => (
-            <RadioButton key={uuid} className={styles.radioButton} id={name} labelText={display} value={uuid} />
-          ))}
-          {/* TODO: This is supposed to paginate. Right now it just shows the user a truncated list
-                with no indication that the list is truncated. */}
-        </RadioButtonGroup>
-      ) : (
-        <Layer>
-          <Tile className={styles.tile}>
-            <EmptyDataIllustration />
-            <p className={styles.content}>
-              {t('noVisitTypesMatchingSearch', 'There are no visit types matching this search text')}
-            </p>
-          </Tile>
-        </Layer>
-      )}
-    </div>
-  );
-};
diff --git a/packages/esm-service-queues-app/src/patient-search/visit-form/visit-type-selector.scss b/packages/esm-service-queues-app/src/patient-search/visit-form/visit-type-selector.scss
deleted file mode 100644
index f93b62baf..000000000
--- a/packages/esm-service-queues-app/src/patient-search/visit-form/visit-type-selector.scss
+++ /dev/null
@@ -1,100 +0,0 @@
-@use '@carbon/layout';
-@use '@carbon/type';
-@use '@openmrs/esm-styleguide/src/vars' as *;
-
-.visitTypeOverviewWrapper {
-  margin: layout.$spacing-05 0;
-  border: 0.0625rem solid $grey-2;
-}
-
-.tablet {
-  background-color: $ui-02;
-}
-
-.desktop {
-  background-color: $ui-01;
-
-  .paginationContainer div {
-    background-color: $ui-01;
-  }
-}
-
-.visitTypeOverviewWrapper div:nth-child(3) > div:nth-child(2) {
-  position: relative;
-}
-
-.visitTypeOverviewWrapper div:nth-child(3) span * {
-  display: none;
-}
-
-.radioButtonGroup {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  margin-top: layout.$spacing-03;
-  min-height: layout.$spacing-10;
-  width: 100%;
-  @include type.type-style('body-compact-01');
-}
-
-.radioButton {
-  padding: layout.$spacing-02 layout.$spacing-05;
-  margin: layout.$spacing-03 0;
-}
-
-.content {
-  @include type.type-style('heading-compact-01');
-  color: $text-02;
-  margin-top: layout.$spacing-05;
-  margin-bottom: layout.$spacing-03;
-}
-
-.desktopHeading {
-  h4 {
-    @include type.type-style('heading-compact-02');
-    color: $text-02;
-  }
-}
-
-.tabletHeading {
-  h4 {
-    @include type.type-style('heading-03');
-    color: $text-02;
-  }
-}
-
-.desktopHeading,
-.tabletHeading {
-  text-align: left;
-  text-transform: capitalize;
-  margin-bottom: layout.$spacing-05;
-
-  h4:after {
-    content: '';
-    display: block;
-    width: layout.$spacing-07;
-    padding-top: 0.188rem;
-    border-bottom: 0.375rem solid var(--brand-03);
-  }
-}
-
-.heading:after {
-  content: '';
-  display: block;
-  width: layout.$spacing-07;
-  padding-top: 0.188rem;
-  border-bottom: 0.375rem solid var(--brand-03);
-}
-
-.tile {
-  text-align: center;
-  border: 1px solid $ui-03;
-}
-
-// Overriding styles for RTL support
-html[dir='rtl'] {
-  .desktopHeading,
-  .tabletHeading {
-    text-align: right;
-  }
-}
diff --git a/packages/esm-service-queues-app/src/patient-search/visit-form/visit-type-selector.test.tsx b/packages/esm-service-queues-app/src/patient-search/visit-form/visit-type-selector.test.tsx
deleted file mode 100644
index f94105bce..000000000
--- a/packages/esm-service-queues-app/src/patient-search/visit-form/visit-type-selector.test.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-/* eslint-disable testing-library/no-node-access */
-import React from 'react';
-import userEvent from '@testing-library/user-event';
-import { render, screen } from '@testing-library/react';
-import { mockVisitTypes } from '__mocks__';
-import { useVisitTypes } from '@openmrs/esm-framework';
-import { VisitTypeSelector } from './visit-type-selector.component';
-
-const mockUseVisitTypes = jest.mocked(useVisitTypes);
-
-describe('VisitTypeSelector', () => {
-  beforeEach(() => {
-    mockUseVisitTypes.mockReturnValue(mockVisitTypes);
-  });
-
-  it('renders visit types with no search bar if there are 5 or fewer', () => {
-    const fewVisitTypes = mockVisitTypes.slice(0, 3);
-    mockUseVisitTypes.mockReturnValue(fewVisitTypes);
-    render(<VisitTypeSelector onChange={() => {}} />);
-
-    expect(screen.queryByRole('searchbox')).not.toBeInTheDocument();
-
-    fewVisitTypes.forEach((visitType) => {
-      const radioButton = screen.getByLabelText(visitType.display);
-      expect(radioButton).toBeInTheDocument();
-    });
-  });
-
-  it('renders the first 5 visit types with a search bar if there are more than 5', () => {
-    render(<VisitTypeSelector onChange={() => {}} />);
-
-    expect(screen.getByRole('searchbox')).toBeInTheDocument();
-
-    mockVisitTypes.slice(0, 5).forEach((visitType) => {
-      const radioButton = screen.getByLabelText(visitType.display);
-      expect(radioButton).toBeInTheDocument();
-    });
-  });
-
-  it('filters by search input and calls onChange', async () => {
-    const user = userEvent.setup();
-
-    const mockOnChange = jest.fn();
-    render(<VisitTypeSelector onChange={mockOnChange} />);
-
-    const searchInput = screen.getByRole('searchbox').closest('input');
-    await user.type(searchInput, 'hiv');
-
-    expect(searchInput.value).toBe('hiv');
-    expect(screen.getByLabelText('HIV Return Visit')).toBeInTheDocument();
-    expect(screen.getByLabelText('HIV Initial Visit')).toBeInTheDocument();
-    expect(screen.queryByLabelText('Outpatient Visit')).not.toBeInTheDocument();
-    expect(screen.queryByLabelText('Diabetes Clinic Visit')).not.toBeInTheDocument();
-
-    expect(mockOnChange).toHaveBeenLastCalledWith(
-      mockVisitTypes.filter((vt) => vt.display == 'HIV Return Visit')[0].uuid,
-    );
-  });
-
-  it('calls onChange when a visit type is selected', async () => {
-    const user = userEvent.setup();
-
-    const mockOnChange = jest.fn();
-    render(<VisitTypeSelector onChange={mockOnChange} />);
-
-    const radioButton = screen.getByLabelText(mockVisitTypes[1].display).closest('input');
-    await user.click(radioButton);
-    expect(radioButton).toBeChecked();
-    expect(mockOnChange).toHaveBeenLastCalledWith(mockVisitTypes[1].uuid);
-  });
-
-  it('allows changing the search input if no results are returned from a search', async () => {
-    const user = userEvent.setup();
-
-    render(<VisitTypeSelector onChange={() => {}} />);
-
-    const searchInput: HTMLInputElement = screen.getByRole('searchbox');
-    await user.type(searchInput, 'asdfasdf');
-
-    const searchInputAfter: HTMLInputElement = screen.getByRole('searchbox');
-    expect(searchInputAfter).toBeInTheDocument();
-    expect(screen.getByText(/no visit types/i)).toBeInTheDocument();
-  });
-});
diff --git a/packages/esm-service-queues-app/src/queue-entry-table-components/queue-priority.component.tsx b/packages/esm-service-queues-app/src/queue-entry-table-components/queue-priority.component.tsx
index e5b1fed52..31de60b15 100644
--- a/packages/esm-service-queues-app/src/queue-entry-table-components/queue-priority.component.tsx
+++ b/packages/esm-service-queues-app/src/queue-entry-table-components/queue-priority.component.tsx
@@ -13,23 +13,28 @@ interface QueuePriorityProps {
 
 const QueuePriority: React.FC<QueuePriorityProps> = ({ priority, priorityComment, priorityConfigs }) => {
   const priorityConfig = priorityConfigs.find((c) => c.conceptUuid === priority.uuid);
+
+  const tag = (
+    <Tag
+      role={priorityComment ? 'tooltip' : null}
+      className={classNames(
+        styles.tag,
+        priorityConfig?.style === 'bold' && styles.bold,
+        priorityConfig?.color === 'orange' && styles.orange,
+      )}
+      type={priorityConfig?.color !== 'orange' ? priorityConfig?.color : null}>
+      {priority.display}
+    </Tag>
+  );
+
   return (
     <>
       {priorityComment ? (
         <DefinitionTooltip className={styles.tooltip} align="bottom-left" definition={priorityComment}>
-          <Tag
-            role="tooltip"
-            className={classNames(styles.tag, priorityConfig?.style === 'bold' && styles.bold)}
-            type={priorityConfig?.color}>
-            {priority.display}
-          </Tag>
+          {tag}
         </DefinitionTooltip>
       ) : (
-        <Tag
-          className={classNames(styles.tag, priorityConfig?.style === 'bold' && styles.bold)}
-          type={priorityConfig?.color}>
-          {priority.display}
-        </Tag>
+        tag
       )}
     </>
   );
diff --git a/packages/esm-service-queues-app/src/queue-entry-table-components/queue-priority.scss b/packages/esm-service-queues-app/src/queue-entry-table-components/queue-priority.scss
index 575843c7d..e3c5a4585 100644
--- a/packages/esm-service-queues-app/src/queue-entry-table-components/queue-priority.scss
+++ b/packages/esm-service-queues-app/src/queue-entry-table-components/queue-priority.scss
@@ -1,5 +1,6 @@
 @use '@carbon/layout';
 @use '@openmrs/esm-styleguide/src/vars' as *;
+@use '@carbon/colors';
 
 .tag {
   margin: layout.$spacing-02 0;
@@ -9,3 +10,7 @@
 .bold {
   font-weight: bold;
 }
+
+.orange {
+  background-color: colors.$orange-20;
+}
diff --git a/packages/esm-service-queues-app/src/queue-entry-table-components/transition-entry.component.tsx b/packages/esm-service-queues-app/src/queue-entry-table-components/transition-entry.component.tsx
index 81b65ee21..a1cfbc069 100644
--- a/packages/esm-service-queues-app/src/queue-entry-table-components/transition-entry.component.tsx
+++ b/packages/esm-service-queues-app/src/queue-entry-table-components/transition-entry.component.tsx
@@ -35,7 +35,7 @@ const TransitionMenu: React.FC<TransitionMenuProps> = ({ queueEntry }) => {
       closeModal: () => dispose(),
       queueEntry,
     });
-  }, [queueEntry]);
+  }, [queueEntry, t]);
 
   return (
     <Button
diff --git a/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-base-table.component.tsx b/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-base-table.component.tsx
index 1a79a8ddf..56627aa8b 100644
--- a/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-base-table.component.tsx
+++ b/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-base-table.component.tsx
@@ -148,7 +148,7 @@ const QueuePatientBaseTable: React.FC<QueuePatientTableProps> = ({
 
       <Layer>
         <Tile className={styles.filterTile}>
-          <Tag size="md" title="Clear Filter" type="blue">
+          <Tag size="md" type="blue">
             {t('today', 'Today')}
           </Tag>
 
diff --git a/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-filter.workspace.tsx b/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-filter.workspace.tsx
index a69b5fea2..e625aadad 100644
--- a/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-filter.workspace.tsx
+++ b/packages/esm-service-queues-app/src/queue-patient-linelists/queue-linelist-filter.workspace.tsx
@@ -1,18 +1,18 @@
 import React, { useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
+  Button,
+  ButtonSet,
+  Column,
   DatePicker,
   DatePickerInput,
+  Dropdown,
   Form,
   Layer,
-  Stack,
-  RadioButtonGroup,
-  RadioButton,
-  Dropdown,
-  Column,
-  Button,
-  ButtonSet,
   NumberInput,
+  RadioButton,
+  RadioButtonGroup,
+  Stack,
   Toggle,
 } from '@carbon/react';
 import dayjs from 'dayjs';
@@ -23,18 +23,19 @@ import {
   useLayoutType,
   useVisitTypes,
 } from '@openmrs/esm-framework';
-import styles from './queue-linelist-filter.scss';
 import { datePickerFormat, datePickerPlaceHolder } from '../constants';
+import styles from './queue-linelist-filter.scss';
 
 const QueueLinelistFilter: React.FC<DefaultWorkspaceProps> = ({ closeWorkspace }) => {
   const { t } = useTranslation();
+  const allVisitTypes = useVisitTypes();
+  const isTablet = useLayoutType() === 'tablet';
+
+  const [endAge, setEndAge] = useState();
   const [gender, setGender] = useState('');
-  const [startAge, setStartAge] = useState<number>();
-  const [endAge, setEndAge] = useState<number>();
   const [returnDate, setReturnDate] = useState(new Date());
+  const [startAge, setStartAge] = useState();
   const [visitType, setVisitType] = useState('');
-  const isTablet = useLayoutType() === 'tablet';
-  const allVisitTypes = useVisitTypes();
 
   const handleFilter = useCallback(
     (event) => {
diff --git a/packages/esm-service-queues-app/src/queue-patient-linelists/scheduled-appointments-table.component.tsx b/packages/esm-service-queues-app/src/queue-patient-linelists/scheduled-appointments-table.component.tsx
index ec0f5f50b..ff2b6cb23 100644
--- a/packages/esm-service-queues-app/src/queue-patient-linelists/scheduled-appointments-table.component.tsx
+++ b/packages/esm-service-queues-app/src/queue-patient-linelists/scheduled-appointments-table.component.tsx
@@ -193,7 +193,7 @@ const AppointmentsTable: React.FC = () => {
 
       <Layer>
         <Tile className={styles.filterTile}>
-          <Tag size="md" title="Clear Filter" type="blue">
+          <Tag size="md" type="blue">
             {t('today', 'Today')}
           </Tag>
 
diff --git a/packages/esm-service-queues-app/src/queue-rooms/queue-room-form.test.tsx b/packages/esm-service-queues-app/src/queue-rooms/queue-room-form.test.tsx
index ba3d6b4b2..033a735ea 100644
--- a/packages/esm-service-queues-app/src/queue-rooms/queue-room-form.test.tsx
+++ b/packages/esm-service-queues-app/src/queue-rooms/queue-room-form.test.tsx
@@ -6,8 +6,8 @@ import QueueRoomForm from './queue-room-form.workspace';
 
 const mockUseLayoutType = jest.mocked(useLayoutType);
 
-jest.mock('../patient-search/hooks/useQueueLocations', () => ({
-  ...jest.requireActual('../patient-search/hooks/useQueueLocations'),
+jest.mock('../create-queue-entry/hooks/useQueueLocations', () => ({
+  ...jest.requireActual('../create-queue-entry/hooks/useQueueLocations'),
   useQueueLocations: jest.fn(() => ({
     queueLocations: { uuid: 'e7786d9a-ab62-11ec-b909-0242ac120002', display: 'Location Test' },
   })),
diff --git a/packages/esm-service-queues-app/src/queue-rooms/queue-room-form.workspace.tsx b/packages/esm-service-queues-app/src/queue-rooms/queue-room-form.workspace.tsx
index 378cb5831..f0a03994e 100644
--- a/packages/esm-service-queues-app/src/queue-rooms/queue-room-form.workspace.tsx
+++ b/packages/esm-service-queues-app/src/queue-rooms/queue-room-form.workspace.tsx
@@ -14,7 +14,7 @@ import {
 } from '@carbon/react';
 import { type DefaultWorkspaceProps, restBaseUrl, showSnackbar, useLayoutType } from '@openmrs/esm-framework';
 import { mutate } from 'swr';
-import { useQueueLocations } from '../patient-search/hooks/useQueueLocations';
+import { useQueueLocations } from '../create-queue-entry/hooks/useQueueLocations';
 import { saveQueueRoom } from './queue-room.resource';
 import styles from './queue-room-form.scss';
 import { useQueues } from '../hooks/useQueues';
diff --git a/packages/esm-service-queues-app/src/queue-screen/queue-screen.test.tsx b/packages/esm-service-queues-app/src/queue-screen/queue-screen.test.tsx
index cfcaf76aa..29b012a70 100644
--- a/packages/esm-service-queues-app/src/queue-screen/queue-screen.test.tsx
+++ b/packages/esm-service-queues-app/src/queue-screen/queue-screen.test.tsx
@@ -3,7 +3,12 @@ import { render, screen } from '@testing-library/react';
 import { useActiveTickets } from './useActiveTickets';
 import QueueScreen from './queue-screen.component';
 
-jest.mock('./useActiveTickets');
+const mockUseActiveTickets = jest.mocked(useActiveTickets);
+
+jest.mock('./useActiveTickets', () => ({
+  useActiveTickets: jest.fn(),
+}));
+
 jest.mock('../helpers/helpers', () => ({
   useSelectedQueueLocationName: jest.fn().mockReturnValue('Room A'),
   useSelectedQueueLocationUuid: jest.fn().mockReturnValue(''),
@@ -11,26 +16,27 @@ jest.mock('../helpers/helpers', () => ({
 
 describe('QueueScreen component', () => {
   test('renders loading skeleton when data is loading', () => {
-    const mockUseActiveTickets = useActiveTickets as jest.MockedFunction<typeof useActiveTickets>;
     mockUseActiveTickets.mockReturnValue({ isLoading: true, activeTickets: [], error: undefined, mutate: jest.fn() });
+
     render(<QueueScreen />);
+
     expect(screen.getByRole('progressbar')).toBeInTheDocument();
   });
 
   test('renders error message when there is an error fetching data', () => {
-    const mockUseActiveTickets = useActiveTickets as jest.MockedFunction<typeof useActiveTickets>;
     mockUseActiveTickets.mockReturnValue({
       error: new Error('Error'),
       isLoading: false,
       activeTickets: [],
       mutate: jest.fn(),
     });
+
     render(<QueueScreen />);
+
     expect(screen.getByText('Error')).toBeInTheDocument();
   });
 
   test('renders table with active tickets when data is loaded', () => {
-    const mockUseActiveTickets = useActiveTickets as jest.MockedFunction<typeof useActiveTickets>;
     mockUseActiveTickets.mockReturnValue({
       activeTickets: [
         {
@@ -43,7 +49,9 @@ describe('QueueScreen component', () => {
       error: undefined,
       mutate: jest.fn(),
     });
+
     render(<QueueScreen />);
+
     expect(screen.getByText('Room : Room A')).toBeInTheDocument();
     expect(screen.getByText('Ticket number')).toBeInTheDocument();
     expect(screen.getByText('123')).toBeInTheDocument();
diff --git a/packages/esm-service-queues-app/src/queue-services/queue-service-form.test.tsx b/packages/esm-service-queues-app/src/queue-services/queue-service-form.test.tsx
index d908398da..94b43689d 100644
--- a/packages/esm-service-queues-app/src/queue-services/queue-service-form.test.tsx
+++ b/packages/esm-service-queues-app/src/queue-services/queue-service-form.test.tsx
@@ -23,7 +23,7 @@ jest.mock('./queue-service.resource', () => ({
   saveQueue: jest.fn(() => Promise.resolve({ status: 201 })),
 }));
 
-jest.mock('../patient-search/hooks/useQueueLocations', () => ({
+jest.mock('../create-queue-entry/hooks/useQueueLocations', () => ({
   useQueueLocations: () => ({
     queueLocations: [
       { id: '34567eb0-b035-4acd-b284-da45f5067502', name: 'Location 1' },
diff --git a/packages/esm-service-queues-app/src/queue-services/queue-service-form.workspace.tsx b/packages/esm-service-queues-app/src/queue-services/queue-service-form.workspace.tsx
index d40f0cf8a..36e995bb3 100644
--- a/packages/esm-service-queues-app/src/queue-services/queue-service-form.workspace.tsx
+++ b/packages/esm-service-queues-app/src/queue-services/queue-service-form.workspace.tsx
@@ -1,33 +1,33 @@
 import React, { useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
+  Button,
+  ButtonSet,
   Column,
   Form,
+  InlineNotification,
   Layer,
-  Stack,
-  TextInput,
   Select,
   SelectItem,
-  ButtonSet,
-  Button,
-  InlineNotification,
+  Stack,
+  TextInput,
 } from '@carbon/react';
 import { mutate } from 'swr';
 import { type DefaultWorkspaceProps, restBaseUrl, showSnackbar } from '@openmrs/esm-framework';
 import { saveQueue, useServiceConcepts } from './queue-service.resource';
-import { useQueueLocations } from '../patient-search/hooks/useQueueLocations';
+import { useQueueLocations } from '../create-queue-entry/hooks/useQueueLocations';
 import styles from './queue-service-form.scss';
 
 const QueueServiceForm: React.FC<DefaultWorkspaceProps> = ({ closeWorkspace }) => {
   const { t } = useTranslation();
   const { queueConcepts } = useServiceConcepts();
+  const { queueLocations } = useQueueLocations();
   const [queueName, setQueueName] = useState('');
   const [queueConcept, setQueueConcept] = useState('');
   const [isMissingName, setMissingName] = useState(false);
   const [isMissingQueue, setMissingQueue] = useState(false);
   const [isMissingLocation, setMissingLocation] = useState(false);
   const [userLocation, setUserLocation] = useState('');
-  const { queueLocations } = useQueueLocations();
 
   const createQueue = useCallback(
     (event) => {
@@ -90,10 +90,11 @@ const QueueServiceForm: React.FC<DefaultWorkspaceProps> = ({ closeWorkspace }) =
             />
             {isMissingName && (
               <section>
+                {/* TODO: Use a zod schema instead of this */}
                 <InlineNotification
                   style={{ margin: '0', minWidth: '100%' }}
                   kind="error"
-                  lowContrast={true}
+                  lowContrast
                   title={t('missingQueueName', 'Missing queue name')}
                   subtitle={t('addQueueName', 'Please add a queue name')}
                 />
@@ -108,10 +109,12 @@ const QueueServiceForm: React.FC<DefaultWorkspaceProps> = ({ closeWorkspace }) =
               labelText={t('selectServiceType', 'Select a service type')}
               id="queueConcept"
               invalidText="Required"
-              value={queueConcept}
-              onChange={(event) => setQueueConcept(event.target.value)}>
-              {!queueConcept && <SelectItem text={t('selectServiceType', 'Select a service type')} />}
-              {queueConcepts.length === 0 && <SelectItem text={t('noServicesAvailable', 'No services available')} />}
+              onChange={(event) => setQueueConcept(event.target.value)}
+              value={queueConcept}>
+              {!queueConcept && <SelectItem text={t('selectServiceType', 'Select a service type')} value="" />}
+              {queueConcepts.length === 0 && (
+                <SelectItem text={t('noServicesAvailable', 'No services available')} value="" />
+              )}
               {queueConcepts?.length > 0 &&
                 queueConcepts.map((concept) => (
                   <SelectItem key={concept.uuid} text={concept.display} value={concept.uuid}>
@@ -124,7 +127,7 @@ const QueueServiceForm: React.FC<DefaultWorkspaceProps> = ({ closeWorkspace }) =
                 <InlineNotification
                   style={{ margin: '0', minWidth: '100%' }}
                   kind="error"
-                  lowContrast={true}
+                  lowContrast
                   title={t('missingService', 'Missing service')}
                   subtitle={t('selectServiceType', 'Select a service type')}
                 />
@@ -136,13 +139,15 @@ const QueueServiceForm: React.FC<DefaultWorkspaceProps> = ({ closeWorkspace }) =
         <Column>
           <Layer className={styles.input}>
             <Select
-              labelText={t('selectALocation', 'Select a location')}
               id="location"
               invalidText="Required"
-              value={userLocation}
-              onChange={(event) => setUserLocation(event.target.value)}>
-              {!userLocation && <SelectItem text={t('selectALocation', 'Select a location')} />}
-              {queueLocations.length === 0 && <SelectItem text={t('noLocationsAvailable', 'No locations available')} />}
+              labelText={t('selectALocation', 'Select a location')}
+              onChange={(event) => setUserLocation(event.target.value)}
+              value={userLocation}>
+              {!userLocation && <SelectItem text={t('selectALocation', 'Select a location')} value="" />}
+              {queueLocations.length === 0 && (
+                <SelectItem text={t('noLocationsAvailable', 'No locations available')} value="" />
+              )}
               {queueLocations?.length > 0 &&
                 queueLocations.map((location) => (
                   <SelectItem key={location.id} text={location.name} value={location.id}>
@@ -155,7 +160,7 @@ const QueueServiceForm: React.FC<DefaultWorkspaceProps> = ({ closeWorkspace }) =
                 <InlineNotification
                   style={{ margin: '0', minWidth: '100%' }}
                   kind="error"
-                  lowContrast={true}
+                  lowContrast
                   title={t('missingLocation', 'Missing location')}
                   subtitle={t('pleaseSelectLocation', 'Please select a location')}
                 />
diff --git a/packages/esm-service-queues-app/src/queue-table/cells/columns.resource.ts b/packages/esm-service-queues-app/src/queue-table/cells/columns.resource.ts
index 1343052b6..54363c320 100644
--- a/packages/esm-service-queues-app/src/queue-table/cells/columns.resource.ts
+++ b/packages/esm-service-queues-app/src/queue-table/cells/columns.resource.ts
@@ -1,5 +1,5 @@
-import { showToast, translateFrom, useConfig } from '@openmrs/esm-framework';
 import { useMemo } from 'react';
+import { showToast, useConfig } from '@openmrs/esm-framework';
 import { useTranslation, type TFunction } from 'react-i18next';
 import {
   builtInColumns,
@@ -30,11 +30,14 @@ export function useColumns(queue: string, status: string): QueueTableColumn[] {
   const config = useConfig<ConfigObject>();
   const { queueTables, visitQueueNumberAttributeUuid } = config;
   const { columnDefinitions } = queueTables;
-  const tableDefinitions = [...queueTables.tableDefinitions, defaultQueueTable];
-  const globalColumnConfig = {
-    ...defaultColumnConfig,
-    visitQueueNumberAttributeUuid,
-  };
+  const tableDefinitions = useMemo(() => [...queueTables.tableDefinitions, defaultQueueTable], [queueTables]);
+  const globalColumnConfig = useMemo(
+    () => ({
+      ...defaultColumnConfig,
+      visitQueueNumberAttributeUuid,
+    }),
+    [visitQueueNumberAttributeUuid],
+  );
 
   const columnsMap = useMemo(() => {
     const map = new Map<string, QueueTableColumn>();
@@ -49,7 +52,7 @@ export function useColumns(queue: string, status: string): QueueTableColumn[] {
       map.set(columnDef.id, getColumnFromDefinition(t, columnDef));
     }
     return map;
-  }, [columnDefinitions, t]);
+  }, [columnDefinitions, globalColumnConfig, t, visitQueueNumberAttributeUuid]);
 
   const tableDefinition = useMemo(
     () =>
diff --git a/packages/esm-service-queues-app/src/queue-table/default-queue-table.component.tsx b/packages/esm-service-queues-app/src/queue-table/default-queue-table.component.tsx
index 2b2fa127f..969b838e3 100644
--- a/packages/esm-service-queues-app/src/queue-table/default-queue-table.component.tsx
+++ b/packages/esm-service-queues-app/src/queue-table/default-queue-table.component.tsx
@@ -27,13 +27,15 @@ import QueueTableExpandedRow from './queue-table-expanded-row.component';
 import QueueTable from './queue-table.component';
 import styles from './queue-table.scss';
 
-const serviceQueuesPatientSearchWorkspace = 'service-queues-patient-search';
+const serviceQueuesPatientSearchWorkspace = 'create-queue-entry-workspace';
 
 /*
 Component with default values / sub-components passed into the more generic QueueTable.
 This is used in the main dashboard of the queues app. (Currently behind a feature flag)
 */
 function DefaultQueueTable() {
+  const { t } = useTranslation();
+  const layout = useLayoutType();
   const selectedService = useSelectedService();
   const currentLocationUuid = useSelectedQueueLocationUuid();
   const selectedQueueStatus = useSelectedQueueStatus();
@@ -48,8 +50,6 @@ function DefaultQueueTable() {
   );
   const { queueEntries, isLoading, error, isValidating } = useQueueEntries(searchCriteria);
 
-  const { t } = useTranslation();
-
   useEffect(() => {
     if (error?.message) {
       showSnackbar({
@@ -58,11 +58,10 @@ function DefaultQueueTable() {
         subtitle: error?.message,
       });
     }
-  }, [error?.message]);
-  const layout = useLayoutType();
+  }, [error?.message, t]);
 
   const [isPatientSearchOpen, setIsPatientSearchOpen] = useState(false);
-  const [patientSearchQuery, setPatientSearchQuery] = useState<string>('');
+  const [patientSearchQuery, setPatientSearchQuery] = useState('');
 
   const handleBackToSearchList = useCallback(() => {
     setIsPatientSearchOpen(true);
@@ -88,7 +87,7 @@ function DefaultQueueTable() {
         return columnSearchTerm?.includes(searchTermLowercase);
       });
     });
-  }, [queueEntries, searchTerm]);
+  }, [columns, queueEntries, searchTerm]);
 
   return (
     <div className={styles.defaultQueueTable}>
@@ -170,13 +169,13 @@ function QueueDropdownFilter() {
       <div className={styles.filterContainer}>
         <Dropdown
           id="serviceFilter"
-          titleText={t('filterByService', 'Filter by service:')}
-          label={selectedService?.serviceDisplay ?? t('all', 'All')}
-          type="inline"
           items={[{ display: `${t('all', 'All')}` }, ...(services ?? [])]}
           itemToString={(item) => (item ? item.display : '')}
+          label={selectedService?.serviceDisplay ?? t('all', 'All')}
           onChange={handleServiceChange}
           size={isDesktop(layout) ? 'sm' : 'lg'}
+          titleText={t('filterByService', 'Filter by service:')}
+          type="inline"
         />
       </div>
     </>
@@ -197,13 +196,13 @@ function StatusDropdownFilter() {
       <div className={styles.filterContainer}>
         <Dropdown
           id="statusFilter"
-          titleText={t('filterByStatus', 'Filter by status:')}
-          label={queueStatus?.statusDisplay ?? t('all', 'All')}
-          type="inline"
           items={[{ display: `${t('all', 'All')}` }, ...(statuses ?? [])]}
           itemToString={(item) => (item ? item.display : '')}
+          label={queueStatus?.statusDisplay ?? t('all', 'All')}
           onChange={handleServiceChange}
           size={isDesktop(layout) ? 'sm' : 'lg'}
+          titleText={t('filterByStatus', 'Filter by status:')}
+          type="inline"
         />
       </div>
     </>
diff --git a/packages/esm-service-queues-app/src/queue-table/default-queue-table.test.tsx b/packages/esm-service-queues-app/src/queue-table/default-queue-table.test.tsx
index 1eaa9d4c6..328105a8f 100644
--- a/packages/esm-service-queues-app/src/queue-table/default-queue-table.test.tsx
+++ b/packages/esm-service-queues-app/src/queue-table/default-queue-table.test.tsx
@@ -13,7 +13,7 @@ import {
 import { renderWithSwr } from 'tools';
 import { useQueueEntries } from '../hooks/useQueueEntries';
 import { useQueueRooms } from '../add-provider-queue-room/add-provider-queue-room.resource';
-import { useQueueLocations } from '../patient-search/hooks/useQueueLocations';
+import { useQueueLocations } from '../create-queue-entry/hooks/useQueueLocations';
 import { type ConfigObject, configSchema } from '../config-schema';
 import DefaultQueueTable from '../queue-table/default-queue-table.component';
 
@@ -29,8 +29,8 @@ jest.mock('../hooks/useQueues', () => {
   };
 });
 
-jest.mock('../patient-search/hooks/useQueueLocations', () => ({
-  ...jest.requireActual('../patient-search/hooks/useQueueLocations'),
+jest.mock('../create-queue-entry/hooks/useQueueLocations', () => ({
+  ...jest.requireActual('../create-queue-entry/hooks/useQueueLocations'),
   useQueueLocations: jest.fn(),
 }));
 
diff --git a/packages/esm-service-queues-app/src/queue-table/queue-entry-actions/queue-entry-actions.modal.tsx b/packages/esm-service-queues-app/src/queue-table/queue-entry-actions/queue-entry-actions.modal.tsx
index 4e95344a9..47cac0227 100644
--- a/packages/esm-service-queues-app/src/queue-table/queue-entry-actions/queue-entry-actions.modal.tsx
+++ b/packages/esm-service-queues-app/src/queue-table/queue-entry-actions/queue-entry-actions.modal.tsx
@@ -198,7 +198,13 @@ export const QueueEntryActionModal: React.FC<QueueEntryActionModalProps> = ({
       );
     }
     return null;
-  }, [formState.transitionDate, formState.transitionTime, formState.transitionTimeFormat, t]);
+  }, [
+    formState.transitionDate,
+    formState.transitionTime,
+    formState.transitionTimeFormat,
+    queueEntry.previousQueueEntry?.startedAt,
+    t,
+  ]);
 
   const selectedPriorityIndex = priorities?.findIndex((p) => p.uuid == formState.selectedPriority);
 
diff --git a/packages/esm-service-queues-app/src/queue-table/queue-table.component.tsx b/packages/esm-service-queues-app/src/queue-table/queue-table.component.tsx
index 7a8f14025..789436866 100644
--- a/packages/esm-service-queues-app/src/queue-table/queue-table.component.tsx
+++ b/packages/esm-service-queues-app/src/queue-table/queue-table.component.tsx
@@ -74,7 +74,7 @@ function QueueTable({
 
   useEffect(() => {
     goTo(1);
-  }, [queueEntries]);
+  }, [goTo, queueEntries]);
 
   const rowsData =
     paginatedQueueEntries?.map((queueEntry) => {
diff --git a/packages/esm-service-queues-app/src/queue-table/queue-table.scss b/packages/esm-service-queues-app/src/queue-table/queue-table.scss
index cb2b9f257..f2c1174dc 100644
--- a/packages/esm-service-queues-app/src/queue-table/queue-table.scss
+++ b/packages/esm-service-queues-app/src/queue-table/queue-table.scss
@@ -192,13 +192,12 @@ html[dir='rtl'] {
 }
 
 .tileContainer {
-  background-color: $ui-02;
   border-top: 1px solid $ui-03;
   padding: layout.$spacing-07 0;
-  // margin: 0 layout.$spacing-05;
 }
 
 .tile {
+  background-color: $ui-01;
   margin: auto;
   width: fit-content;
 }
@@ -209,3 +208,14 @@ html[dir='rtl'] {
   justify-content: center;
   align-items: center;
 }
+
+.content {
+  @include type.type-style('heading-compact-02');
+  color: $text-02;
+  margin-bottom: layout.$spacing-03;
+}
+
+.helper {
+  @include type.type-style('body-compact-01');
+  color: $text-02;
+}
diff --git a/packages/esm-service-queues-app/src/queue-table/queue-table.test.tsx b/packages/esm-service-queues-app/src/queue-table/queue-table.test.tsx
index 797ac7e79..69a027e6b 100644
--- a/packages/esm-service-queues-app/src/queue-table/queue-table.test.tsx
+++ b/packages/esm-service-queues-app/src/queue-table/queue-table.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { getDefaultsFromConfigSchema, useConfig, useSession } from '@openmrs/esm-framework';
 import { screen, within } from '@testing-library/react';
 import { type ConfigObject, configSchema } from '../config-schema';
-import { mockPriorityNonUrgent, mockQueueEntries, mockSession } from '__mocks__';
+import { mockPriorityNonUrgent, mockPriorityUrgent, mockQueueEntries, mockSession } from '__mocks__';
 import { renderWithSwr } from 'tools';
 import QueueTable from './queue-table.component';
 
@@ -176,6 +176,11 @@ describe('QueueTable', () => {
                   color: 'blue',
                   style: 'bold',
                 },
+                {
+                  conceptUuid: mockPriorityUrgent.uuid,
+                  color: 'orange',
+                  style: null,
+                },
               ],
               statusConfigs: [],
               visitQueueNumberAttributeUuid: 'queue-number-visit-attr-uuid',
@@ -200,6 +205,10 @@ describe('QueueTable', () => {
     const firstRow = rows[1];
     const cells = within(firstRow).getAllByRole('cell');
     expect(cells[1].childNodes[0]).toHaveClass('bold');
+
+    const secondRow = rows[2];
+    const secondCells = within(secondRow).getAllByRole('cell');
+    expect(secondCells[1].childNodes[0]).toHaveClass('orange');
   });
 
   it('uses the visitQueueNumberAttributeUuid defined at the top level', () => {
diff --git a/packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.component.tsx b/packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.component.tsx
index 6ae6ebd81..1a7b255ce 100644
--- a/packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.component.tsx
+++ b/packages/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.component.tsx
@@ -56,7 +56,18 @@ const RemoveQueueEntryDialog: React.FC<RemoveQueueEntryDialogProps> = ({ queueEn
           subtitle: error?.message,
         });
       });
-  }, [appointments, currentVisit, queueEntry]);
+  }, [
+    appointments,
+    closeModal,
+    currentVisit?.location?.uuid,
+    currentVisit?.startDatetime,
+    currentVisit?.visitType?.uuid,
+    mutateQueueEntries,
+    queueEntry?.queue?.uuid,
+    queueEntry?.queueEntryUuid,
+    queueEntry?.visitUuid,
+    t,
+  ]);
 
   return (
     <div>
diff --git a/packages/esm-service-queues-app/src/routes.json b/packages/esm-service-queues-app/src/routes.json
index 4d92a7168..2358464d3 100644
--- a/packages/esm-service-queues-app/src/routes.json
+++ b/packages/esm-service-queues-app/src/routes.json
@@ -66,14 +66,10 @@
     {
       "name": "visit-form-queue-fields",
       "component": "visitFormQueueFields",
-      "slot":"visit-form-queue-slot"
+      "slot":"visit-form-bottom-slot"
     }
   ],
   "modals": [
-    {
-      "name": "add-visit-to-queue-modal",
-      "component": "addVisitToQueueModal"
-    },
     {
       "name": "add-provider-to-room-modal",
       "component": "addProviderToRoomModal"
@@ -131,9 +127,9 @@
       "type": "service-queues"
     },
     {
-      "name": "service-queues-patient-search",
-      "title": "searchPatient",
-      "component": "patientSearchWorkspace",
+      "name": "create-queue-entry-workspace",
+      "title": "addPatientToQueue",
+      "component": "createQueueEntryWorkspace",
       "type": "service-queues"
     }
   ]
diff --git a/packages/esm-service-queues-app/src/transition-queue-entry/transition-queue-entry-dialog.component.tsx b/packages/esm-service-queues-app/src/transition-queue-entry/transition-queue-entry-dialog.component.tsx
index cfa556221..6203f677a 100644
--- a/packages/esm-service-queues-app/src/transition-queue-entry/transition-queue-entry-dialog.component.tsx
+++ b/packages/esm-service-queues-app/src/transition-queue-entry/transition-queue-entry-dialog.component.tsx
@@ -2,6 +2,7 @@ import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Button, ModalBody, ModalFooter, ModalHeader, Tag } from '@carbon/react';
 import { navigate, showSnackbar, useConfig } from '@openmrs/esm-framework';
+import { type ConfigObject } from '../config-schema';
 import {
   type MappedVisitQueueEntry,
   serveQueueEntry,
@@ -9,19 +10,18 @@ import {
 } from '../active-visits/active-visits-table.resource';
 import { requeueQueueEntry } from './transition-queue-entry.resource';
 import { useMutateQueueEntries } from '../hooks/useQueueEntries';
-import { type ConfigObject } from '../config-schema';
 import styles from './transition-queue-entry-dialog.scss';
 
 interface TransitionQueueEntryModalProps {
-  queueEntry: MappedVisitQueueEntry;
   closeModal: () => void;
+  queueEntry: MappedVisitQueueEntry;
 }
 
 enum priorityComment {
   REQUEUED = 'Requeued',
 }
 
-const TransitionQueueEntryModal: React.FC<TransitionQueueEntryModalProps> = ({ queueEntry, closeModal }) => {
+const TransitionQueueEntryModal: React.FC<TransitionQueueEntryModalProps> = ({ closeModal, queueEntry }) => {
   const { t } = useTranslation();
   const config = useConfig<ConfigObject>();
   const defaultTransitionStatus = config.concepts.defaultTransitionStatus;
@@ -46,21 +46,17 @@ const TransitionQueueEntryModal: React.FC<TransitionQueueEntryModalProps> = ({ q
       queueEntry?.sortWeight,
     ).then(
       ({ status }) => {
-        if (status === 201) {
-          serveQueueEntry(queueEntry?.queue.name, queueEntry?.visitQueueNumber, 'serving').then(({ status }) => {
-            if (status === 200) {
-              showSnackbar({
-                isLowContrast: true,
-                title: t('success', 'Success'),
-                kind: 'success',
-                subtitle: t('patientAttendingService', 'Patient attending service'),
-              });
-              closeModal();
-              mutateQueueEntries();
-              navigate({ to: `\${openmrsSpaBase}/patient/${queueEntry?.patientUuid}/chart` });
-            }
+        serveQueueEntry(queueEntry?.queue.name, queueEntry?.visitQueueNumber, 'serving').then(({ status }) => {
+          showSnackbar({
+            isLowContrast: true,
+            title: t('success', 'Success'),
+            kind: 'success',
+            subtitle: t('patientAttendingService', 'Patient attending service'),
           });
-        }
+          closeModal();
+          mutateQueueEntries();
+          navigate({ to: `\${openmrsSpaBase}/patient/${queueEntry?.patientUuid}/chart` });
+        });
       },
       (error) => {
         showSnackbar({
@@ -71,21 +67,32 @@ const TransitionQueueEntryModal: React.FC<TransitionQueueEntryModalProps> = ({ q
         });
       },
     );
-  }, [queueEntry]);
+  }, [
+    closeModal,
+    defaultTransitionStatus,
+    mutateQueueEntries,
+    queueEntry?.patientUuid,
+    queueEntry?.priority?.uuid,
+    queueEntry?.queue.name,
+    queueEntry?.queueEntryUuid,
+    queueEntry?.queueUuid,
+    queueEntry?.sortWeight,
+    queueEntry?.visitQueueNumber,
+    queueEntry?.visitUuid,
+    t,
+  ]);
 
   const handleRequeuePatient = useCallback(() => {
     requeueQueueEntry(priorityComment.REQUEUED, queueEntry?.queueUuid, queueEntry?.queueEntryUuid).then(
-      ({ status }) => {
-        if (status === 200) {
-          showSnackbar({
-            isLowContrast: true,
-            title: t('success', 'Success'),
-            kind: 'success',
-            subtitle: t('patientRequeued', 'Patient has been requeued'),
-          });
-          closeModal();
-          mutateQueueEntries();
-        }
+      () => {
+        showSnackbar({
+          isLowContrast: true,
+          title: t('success', 'Success'),
+          kind: 'success',
+          subtitle: t('patientRequeued', 'Patient has been requeued'),
+        });
+        closeModal();
+        mutateQueueEntries();
       },
       (error) => {
         showSnackbar({
@@ -96,7 +103,7 @@ const TransitionQueueEntryModal: React.FC<TransitionQueueEntryModalProps> = ({ q
         });
       },
     );
-  }, []);
+  }, [closeModal, mutateQueueEntries, queueEntry?.queueEntryUuid, queueEntry?.queueUuid, t]);
 
   return (
     <div>
@@ -117,7 +124,9 @@ const TransitionQueueEntryModal: React.FC<TransitionQueueEntryModalProps> = ({ q
             <p className={styles.p}>
               {t('patientAge', 'Age')} : &nbsp; {queueEntry?.patientAge}
             </p>
-            <p>{queueEntry.identifiers?.map((identifier) => <Tag key={identifier.uuid}>{identifier.display}</Tag>)}</p>
+            <div>
+              {queueEntry.identifiers?.map((identifier) => <Tag key={identifier.uuid}>{identifier.display}</Tag>)}
+            </div>
           </section>
         </div>
       </ModalBody>
diff --git a/packages/esm-service-queues-app/src/types/index.ts b/packages/esm-service-queues-app/src/types/index.ts
index f725066c0..7b36f6167 100644
--- a/packages/esm-service-queues-app/src/types/index.ts
+++ b/packages/esm-service-queues-app/src/types/index.ts
@@ -2,14 +2,6 @@ import { type Visit, type OpenmrsResource, type Location, type Patient } from '@
 import type React from 'react';
 import { type ColumnConfig } from '../config-schema';
 
-export enum SearchTypes {
-  BASIC = 'basic',
-  ADVANCED = 'advanced',
-  SEARCH_RESULTS = 'search_results',
-  SCHEDULED_VISITS = 'scheduled-visits',
-  VISIT_FORM = 'visit_form',
-}
-
 export interface Attribute {
   attributeType: OpenmrsResource;
   display: string;
diff --git a/packages/esm-service-queues-app/src/views/queue-tables-for-all-statuses.component.tsx b/packages/esm-service-queues-app/src/views/queue-tables-for-all-statuses.component.tsx
index e747b0b3c..3ef30ad7d 100644
--- a/packages/esm-service-queues-app/src/views/queue-tables-for-all-statuses.component.tsx
+++ b/packages/esm-service-queues-app/src/views/queue-tables-for-all-statuses.component.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import React, { useState } from 'react';
 import { InlineNotification, Search, SkeletonText } from '@carbon/react';
 import { Add } from '@carbon/react/icons';
 import { useTranslation } from 'react-i18next';
@@ -7,9 +7,9 @@ import type { Concept, Queue, QueueEntry } from '../types';
 import { useQueueEntries } from '../hooks/useQueueEntries';
 import { useColumns } from '../queue-table/cells/columns.resource';
 import { QueueTableByStatusSkeleton } from '../queue-table/queue-table-by-status-skeleton.component';
+import PatientQueueHeader from '../patient-queue-header/patient-queue-header.component';
 import QueueTable from '../queue-table/queue-table.component';
 import QueueTableMetrics from '../queue-table/queue-table-metrics.component';
-import PatientQueueHeader from '../patient-queue-header/patient-queue-header.component';
 import styles from '../queue-table/queue-table.scss';
 
 interface QueueTablesForAllStatusesProps {
@@ -58,7 +58,7 @@ const QueueTablesForAllStatuses: React.FC<QueueTablesForAllStatusesProps> = ({
                   size: isDesktop(layout) ? 'sm' : 'lg',
                 },
                 selectPatientAction: (selectedPatientUuid) => {
-                  launchWorkspace('service-queues-patient-search', {
+                  launchWorkspace('create-queue-entry-workspace', {
                     selectedPatientUuid,
                     currentServiceQueueUuid: selectedQueue.uuid,
                   });
@@ -154,19 +154,16 @@ function QueueTableForQueueAndStatus({
   }
 
   // filters queue entries based on which status table we want to show and search term inputted by user
-  const filterQueueEntries = useCallback(
-    (queueEntries: QueueEntry[], searchTerm: string, statucUuid: string) => {
-      const searchTermLowercase = searchTerm.toLowerCase();
-      return queueEntries.filter((queueEntry) => {
-        const match = columns.some((column) => {
-          const columnSearchTerm = column.getFilterableValue?.(queueEntry)?.toLocaleLowerCase();
-          return columnSearchTerm?.includes(searchTermLowercase);
-        });
-        return queueEntry.status.uuid == statucUuid && match;
+  const filterQueueEntries = (queueEntries: QueueEntry[], searchTerm: string, statusUuid: string) => {
+    const searchTermLowercase = searchTerm.toLowerCase();
+    return queueEntries.filter((queueEntry) => {
+      const match = columns?.some((column) => {
+        const columnSearchTerm = column.getFilterableValue?.(queueEntry)?.toLocaleLowerCase();
+        return columnSearchTerm?.includes(searchTermLowercase);
       });
-    },
-    [queueEntries, searchTerm, columns],
-  );
+      return queueEntry.status.uuid == statusUuid && match;
+    });
+  };
 
   const filteredQueueEntries = filterQueueEntries(queueEntries, searchTerm, statusUuid);
   return (
diff --git a/packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.component.tsx b/packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.component.tsx
deleted file mode 100644
index c0e8210fd..000000000
--- a/packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.component.tsx
+++ /dev/null
@@ -1,277 +0,0 @@
-import React, { useMemo, useEffect, useState, useCallback, type AnchorHTMLAttributes } from 'react';
-import classNames from 'classnames';
-import {
-  DataTable,
-  DataTableSkeleton,
-  InlineLoading,
-  Layer,
-  Pagination,
-  Search,
-  Table,
-  TableContainer,
-  TableHead,
-  TableRow,
-  TableHeader,
-  TableBody,
-  TableCell,
-  TableToolbar,
-  TableToolbarContent,
-  TableExpandRow,
-  TableExpandHeader,
-  TableExpandedRow,
-  Tile,
-  Button,
-} from '@carbon/react';
-import {
-  useLayoutType,
-  isDesktop,
-  useConfig,
-  usePagination,
-  ExtensionSlot,
-  formatDatetime,
-  parseDate,
-  showModal,
-  ConfigurableLink,
-} from '@openmrs/esm-framework';
-import { useTranslation } from 'react-i18next';
-import { type ActiveVisit, useMissingQueueEntries } from './visits-missing-inqueue.resource';
-import { Add } from '@carbon/react/icons';
-import { type ConfigObject } from '../config-schema';
-import styles from './visits-missing-inqueue.scss';
-
-interface PaginationData {
-  goTo: (page: number) => void;
-  results: Array<ActiveVisit>;
-  currentPage: number;
-}
-
-function AddMenu({ visitDetails }: { visitDetails: ActiveVisit }) {
-  const { t } = useTranslation();
-  const launchAddVisitToQueueModal = useCallback(() => {
-    const dispose = showModal('add-visit-to-queue-modal', {
-      closeModal: () => dispose(),
-      visitDetails,
-    });
-  }, [visitDetails]);
-
-  return (
-    <Button
-      kind="ghost"
-      onClick={launchAddVisitToQueueModal}
-      iconDescription={t('addisitToQueueTooltip', 'Add to queue')}
-      renderIcon={(props) => <Add size={16} {...props} />}>
-      {t('addToQueue', 'Add to queue')}
-    </Button>
-  );
-}
-
-const MissingQueueEntries = () => {
-  const { t } = useTranslation();
-  const config = useConfig<ConfigObject>();
-  const layout = useLayoutType();
-  const { activeVisits, isLoading, visitsIsValidating } = useMissingQueueEntries();
-  const pageSizes = [10, 20, 30, 40, 50];
-  const [currentPageSize, setPageSize] = useState(10);
-  const [searchString, setSearchString] = useState('');
-
-  const headerData = useMemo(
-    () => [
-      {
-        id: 0,
-        header: t('visitStartTime', 'Visit Time'),
-        key: 'visitStartTime',
-      },
-      {
-        id: 1,
-        header: t('idNumber', 'ID Number'),
-        key: 'idNumber',
-      },
-      {
-        id: 2,
-        header: t('name', 'Name'),
-        key: 'name',
-      },
-      {
-        id: 3,
-        header: t('gender', 'Gender'),
-        key: 'gender',
-      },
-      {
-        id: 4,
-        header: t('age', 'Age'),
-        key: 'age',
-      },
-      {
-        id: 5,
-        header: t('visitType', 'Visit Type'),
-        key: 'visitType',
-      },
-    ],
-    [t],
-  );
-
-  const rowData = activeVisits.map((visit) => ({
-    ...visit,
-    visitStartTime: formatDatetime(parseDate(visit.visitStartTime)),
-  }));
-
-  const searchResults = useMemo(() => {
-    if (searchString && searchString.trim() !== '') {
-      const search = searchString.toLowerCase();
-      return rowData.filter((activeVisitRow) =>
-        Object.keys(activeVisitRow).some((header) => {
-          if (header === 'patientUuid') {
-            return false;
-          }
-          return `${activeVisitRow[header]}`.toLowerCase().includes(search);
-        }),
-      );
-    } else {
-      return rowData;
-    }
-  }, [searchString, rowData]);
-
-  const {
-    goTo,
-    results: paginatedActiveVisits,
-    currentPage,
-  }: PaginationData = usePagination(searchResults, currentPageSize);
-
-  const handleSearch = useCallback((e) => setSearchString(e.target.value), []);
-
-  useEffect(() => {
-    if (currentPage !== 1) {
-      goTo(1);
-    }
-  }, [searchString, currentPage, goTo]);
-
-  if (isLoading) {
-    return <DataTableSkeleton role="progressbar" />;
-  }
-  if (activeVisits?.length) {
-    return (
-      <div className={styles.activeVisitsContainer}>
-        <div className={styles.activeVisitsDetailHeaderContainer}>
-          <div className={!isDesktop(layout) ? styles.tabletHeading : styles.desktopHeading}>
-            <h4>{t('activeVisitsNotInQueue', 'Active visits not in queue')}</h4>
-          </div>
-          <div className={styles.backgroundDataFetchingIndicator}>
-            <span>{visitsIsValidating ? <InlineLoading /> : null}</span>
-          </div>
-        </div>
-        <DataTable
-          rows={paginatedActiveVisits}
-          headers={headerData}
-          size={isDesktop(layout) ? 'xs' : 'md'}
-          useZebraStyles={activeVisits?.length > 1 ? true : false}>
-          {({ rows, headers, getHeaderProps, getTableProps, getBatchActionProps, getRowProps }) => (
-            <TableContainer className={styles.tableContainer}>
-              <TableToolbar>
-                <TableToolbarContent>
-                  <Search
-                    tabIndex={getBatchActionProps().shouldShowBatchActions ? -1 : 0}
-                    labelText=""
-                    placeholder={t('filterTable', 'Filter table')}
-                    onChange={handleSearch}
-                  />
-                </TableToolbarContent>
-              </TableToolbar>
-              <Table className={styles.activeVisitsTable} {...getTableProps()}>
-                <TableHead>
-                  <TableRow>
-                    <TableExpandHeader />
-                    {headers.map((header) => (
-                      <TableHeader {...getHeaderProps({ header })}>{header.header}</TableHeader>
-                    ))}
-                  </TableRow>
-                </TableHead>
-                <TableBody>
-                  {rows.map((row, index) => (
-                    <React.Fragment key={index}>
-                      <TableExpandRow {...getRowProps({ row })}>
-                        {row.cells.map((cell) => (
-                          <TableCell key={cell.id}>
-                            {cell.info.header === 'name' ? (
-                              <ConfigurableLink
-                                to={`\${openmrsSpaBase}/patient/${paginatedActiveVisits?.[index]?.patientUuid}/chart/`}>
-                                {cell.value}
-                              </ConfigurableLink>
-                            ) : (
-                              cell.value
-                            )}
-                          </TableCell>
-                        ))}
-                        <TableCell className="cds--table-column-menu">
-                          <AddMenu visitDetails={paginatedActiveVisits?.[index]} />
-                        </TableCell>
-                      </TableExpandRow>
-                      {row.isExpanded ? (
-                        <TableRow className={styles.expandedActiveVisitRow}>
-                          <th colSpan={headers.length + 2}>
-                            <ExtensionSlot
-                              className={styles.visitSummaryContainer}
-                              name="visit-summary-slot"
-                              state={{
-                                visitUuid: paginatedActiveVisits[index]?.visitUuid,
-                                patientUuid: paginatedActiveVisits[index]?.patientUuid,
-                              }}
-                            />
-                          </th>
-                        </TableRow>
-                      ) : (
-                        <TableExpandedRow className={styles.hiddenRow} colSpan={headers.length + 2} />
-                      )}
-                    </React.Fragment>
-                  ))}
-                </TableBody>
-              </Table>
-              {rows.length === 0 && (
-                <p
-                  style={{
-                    height: isDesktop(layout) ? '2rem' : '3rem',
-                    margin: '1rem 1.5rem',
-                  }}
-                  className={classNames(styles.emptyRow, styles.bodyLong01)}>
-                  {t('noVisitsNotInQueueFound', 'No visits currently not in queue found')}
-                </p>
-              )}
-              <Pagination
-                forwardText="Next page"
-                backwardText="Previous page"
-                page={currentPage}
-                pageSize={currentPageSize}
-                pageSizes={pageSizes}
-                totalItems={searchResults.length}
-                className={styles.pagination}
-                onChange={({ pageSize, page }) => {
-                  if (pageSize !== currentPageSize) {
-                    setPageSize(pageSize);
-                  }
-                  if (page !== currentPage) {
-                    goTo(page);
-                  }
-                }}
-              />
-            </TableContainer>
-          )}
-        </DataTable>
-      </div>
-    );
-  }
-  return (
-    <div className={styles.activeVisitsContainer}>
-      <Layer>
-        <Tile className={styles.tile}>
-          <div className={!isDesktop(layout) ? styles.tabletHeading : styles.desktopHeading}>
-            <h4>{t('activeVisits', 'Active Visits')}</h4>
-          </div>
-          <p className={styles.content}>
-            {t('noActiveVisitsForLocation', 'There are no active visits to display for this location.')}
-          </p>
-        </Tile>
-      </Layer>
-    </div>
-  );
-};
-
-export default MissingQueueEntries;
diff --git a/packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.resource.ts b/packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.resource.ts
deleted file mode 100644
index 3e2c55612..000000000
--- a/packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.resource.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import useSWR from 'swr';
-import dayjs from 'dayjs';
-import isToday from 'dayjs/plugin/isToday';
-import last from 'lodash-es/last';
-import { openmrsFetch, type Visit, useSession, restBaseUrl } from '@openmrs/esm-framework';
-import { type VisitQueueEntry } from '../active-visits/active-visits-table.resource';
-
-dayjs.extend(isToday);
-
-export interface ActiveVisit {
-  age: string;
-  id: string;
-  idNumber: string;
-  gender: string;
-  location: string;
-  name: string;
-  patientUuid: string;
-  visitStartTime: string;
-  visitType: string;
-  visitUuid: string;
-}
-
-export function useMissingQueueEntries() {
-  const currentUserSession = useSession();
-  const startDate = dayjs().format('YYYY-MM-DD');
-  const sessionLocation = currentUserSession?.sessionLocation?.uuid;
-
-  const customRepresentation =
-    'custom:(uuid,patient:(uuid,identifiers:(identifier,uuid),person:(age,display,gender,uuid)),' +
-    'visitType:(uuid,name,display),location:(uuid,name,display),startDatetime,' +
-    'stopDatetime)&fromStartDate=' +
-    startDate +
-    '&location=' +
-    sessionLocation;
-  const url = `${restBaseUrl}/visit?includeInactive=false&v=${customRepresentation}`;
-  const {
-    data: visitsData,
-    error: visitsError,
-    isValidating: visitsIsValidating,
-  } = useSWR<{ data: { results: Array<Visit> } }, Error>(sessionLocation ? url : null, openmrsFetch);
-
-  const apiUrl = `${restBaseUrl}/visit-queue-entry`;
-  const {
-    data: queueData,
-    error: queueError,
-    isValidating: queueIsValidating,
-    mutate: mutateQueueEntries,
-  } = useSWR<{ data: { results: Array<VisitQueueEntry> } }, Error>(apiUrl, openmrsFetch);
-
-  const byId = {};
-  queueData?.data?.results.forEach((item) => {
-    if (item?.queueEntry.patient?.uuid) {
-      byId[item?.queueEntry.patient?.uuid] = true;
-    }
-  });
-
-  const data = visitsData?.data?.results?.filter((item) => {
-    if (byId[item?.patient?.uuid]) {
-      return false;
-    }
-    return true;
-  });
-
-  const mapVisitProperties = (visit: Visit): ActiveVisit => ({
-    age: visit?.patient?.person?.age,
-    id: visit.uuid,
-    idNumber: visit?.patient?.identifiers[0]?.identifier,
-    gender: visit?.patient?.person?.gender,
-    location: visit?.location?.uuid,
-    name: visit?.patient?.person?.display,
-    patientUuid: visit?.patient?.uuid,
-    visitStartTime: visit?.startDatetime,
-    visitType: visit?.visitType?.display,
-    visitUuid: visit.uuid,
-  });
-
-  const formattedActiveVisits = data?.length
-    ? data.map(mapVisitProperties).filter(({ visitStartTime }) => dayjs(visitStartTime).isToday())
-    : [];
-
-  return {
-    activeVisits: formattedActiveVisits,
-    isLoading: !data && !visitsError && !queueError,
-    error: !visitsError && !queueError,
-    visitsIsValidating,
-    mutateQueueEntries,
-  };
-}
-
-export const getOriginFromPathName = (pathname = '') => {
-  const from = pathname.split('/');
-  return last(from);
-};
diff --git a/packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.scss b/packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.scss
deleted file mode 100644
index edc432c43..000000000
--- a/packages/esm-service-queues-app/src/visits-missing-inqueue/visits-missing-inqueue.scss
+++ /dev/null
@@ -1,111 +0,0 @@
-@use '@carbon/layout';
-@use '@carbon/type';
-
-.activeVisitsContainer {
-  background-color: $ui-background;
-  border: 1px solid $ui-03;
-  width: 100%;
-  margin: 0 auto;
-  max-width: 95vw;
-}
-
-.activeVisitsDetailHeaderContainer {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: layout.$spacing-04 0 layout.$spacing-04 layout.$spacing-05;
-  background-color: $ui-background;
-}
-
-.backgroundDataFetchingIndicator {
-  align-items: center;
-  display: flex;
-  flex: 1 1 0%;
-  justify-content: center;
-}
-
-.tableContainer section {
-  position: relative;
-}
-
-.tableContainer a {
-  text-decoration: none;
-}
-
-.tableContainer {
-  :global(.cds--data-table) {
-    background-color: $ui-03;
-  }
-}
-
-.pagination {
-  overflow: hidden;
-}
-
-.hiddenRow {
-  display: none;
-}
-
-.emptyRow {
-  padding: 0 layout.$spacing-05;
-  display: flex;
-  align-items: center;
-}
-
-.visitSummaryContainer {
-  width: 100%;
-  max-width: 48rem;
-  margin: layout.$spacing-05 auto;
-}
-
-.expandedActiveVisitRow > td > div {
-  max-height: max-content !important;
-}
-
-.expandedActiveVisitRow td {
-  padding: 0 layout.$spacing-07;
-}
-
-.expandedActiveVisitRow th[colspan] td[colspan] > div:first-child {
-  padding: 0 layout.$spacing-05;
-}
-
-.action {
-  margin-bottom: layout.$spacing-03;
-}
-
-.content {
-  @include type.type-style('heading-compact-01');
-  color: $text-02;
-  margin-top: layout.$spacing-05;
-  margin-bottom: layout.$spacing-03;
-}
-
-.desktopHeading,
-.tabletHeading {
-  text-align: left;
-  text-transform: capitalize;
-  margin-bottom: layout.$spacing-05;
-
-  h4 {
-    @include type.type-style('heading-compact-02');
-    color: $text-02;
-
-    &:after {
-      content: '';
-      display: block;
-      width: layout.$spacing-07;
-      padding-top: 3px;
-      border-bottom: 0.375rem solid;
-      @include brand-03(border-bottom-color);
-    }
-  }
-}
-
-.tile {
-  text-align: center;
-}
-
-.bodyLong01 {
-  @include type.type-style('body-01');
-}
diff --git a/packages/esm-service-queues-app/translations/am.json b/packages/esm-service-queues-app/translations/am.json
index da827d944..6c80e34f7 100644
--- a/packages/esm-service-queues-app/translations/am.json
+++ b/packages/esm-service-queues-app/translations/am.json
@@ -1,10 +1,7 @@
 {
   "actions": "Actions",
-  "activeVisits": "Active Visits",
-  "activeVisitsNotInQueue": "Active visits not in queue",
   "addAProviderQueueRoom": "Add a provider queue room?",
-  "addEntry": "Add entry",
-  "addisitToQueueTooltip": "Add to queue",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "Add New Queue Service",
   "addNewQueueServiceRoom": "Add new queue service room",
   "addNewService": "Add new service",
@@ -17,20 +14,13 @@
   "addQueueRoomName": "Please add a queue room name",
   "addQueueRoomService": "Please add a queue room service",
   "addRoom": "Add room",
-  "addToQueue": "Add to queue",
-  "addVisitToQueue": "Add Visit To Queue?",
-  "advancedSearch": "Advanced search",
   "age": "Age",
   "alistOfClients": "A list of clients waiting for ",
   "all": "All",
   "and": "And",
-  "anotherVisitType": "Start another visit type",
-  "any": "Any",
   "applyFilters": "Apply filters",
   "averageWaitTime": "Average wait time today",
-  "backToScheduledVisits": "Back to scheduled visits",
   "backToSearchResults": "Back to search results",
-  "backToSimpleSearch": "Back to simple search",
   "between": "Between",
   "bmi": "Bmi",
   "bp": "Bp",
@@ -39,7 +29,6 @@
   "checkedInPatients": "Checked in patients",
   "checkFilters": "Check the filters above",
   "chooseRoom": "Select a room",
-  "chooseService": "Select a service",
   "clearAllQueueEntries": "Clear all queue entries?",
   "clearAllQueueEntriesWarningMessage": "Clearing all queue entries will remove  all the patients from the queues",
   "clearQueue": "Clear queue",
@@ -55,8 +44,6 @@
   "currentVisit": "Current visit",
   "date": "Date",
   "date&Time": "Date & time",
-  "dateAndTimeOfVisit": "Date and time of visit",
-  "dateOfBirth": "Date of birth",
   "delete": "Delete",
   "deleteQueueEntry": "Delete queue entry",
   "discard": "Discard",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "Error adding queue",
   "errorAddingQueueRoom": "Error adding queue room",
   "errorClearingQueues": "Error clearing queues",
-  "errorFetchingAppointments": "Error fetching appointments",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "Error loading queue entries",
   "errorPostingToScreen": "Error posting to screen",
-  "facility": "Facility",
-  "failedToLoadRecommendedVisitTypes": "Failed to load recommended visit types",
-  "female": "Female",
   "femaleLabelText": "Female",
-  "fields": "of the following fields",
   "filter": "Filter (1)",
   "filterByService": "Filter by service:",
   "filterByStatus": "Filter by status:",
   "filterTable": "Filter table",
-  "firstName": "First name",
-  "firstNameSort": "First name (a-z)",
-  "futureScheduledVisits_one": "{{count}} visit scheduled for dates in the future",
-  "futureScheduledVisits_other": "{{count}} visits scheduled for dates in the future",
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
-  "idNumber": "ID Number",
   "indication": "Indication",
   "invalidQueue": "Invalid Queue",
   "invalidtableConfig": "Invalid table configuration",
   "lastEncounter": "Last encounter",
-  "lastName": "Last name",
-  "lastNameSort": "Last name (a-z)",
-  "lastVisit": "Last visit",
-  "lastVisitDate": "Date",
   "loading": "Loading...",
   "location": "Location",
-  "male": "Male",
   "maleLabelText": "Male",
-  "match": "Match",
   "medications": "Medications",
-  "middleName": "Middle name",
   "minuteFormatted": "{{minutes}} minute(s)",
   "minutes": "Minutes",
   "missingLocation": "Missing location",
-  "missingPriority": "Please select a priority",
   "missingQueueName": "Missing queue name",
   "missingQueueRoom": "Please select a queue room",
   "missingQueueRoomName": "Missing queue room name",
   "missingQueueRoomService": "Missing queue room service",
   "missingService": "Missing service",
-  "missingVisitType": "Missing visit type",
   "modifyDefaultValue": "Modify default value",
   "movePatientToNextService": "Move patient to the next service?",
   "moveToNextService": "Move to next service",
   "name": "Name",
   "nextPage": "Next page",
-  "noActiveVisitsForLocation": "There are no active visits to display for this location.",
-  "noAppointmentsFound": "No appointments found",
   "noColumnsDefined": "No table columns defined. Check Configuration",
   "noEncountersFound": "No encounters found",
   "noLastEncounter": "There is no last encounter to display for this patient",
   "noLocationsAvailable": "No locations available",
   "noMedicationsFound": "No medications found",
   "noNotesFound": "No notes found",
-  "noPatientFoundMessage": "Sorry, no patient has been found",
   "noPatientsToDisplay": "No patients to display",
   "noPreviousVisitFound": "No previous visit found",
   "noPrioritiesConfigured": "No priorities configured",
   "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
   "noPrioritiesForServiceTitle": "No priorities available",
   "noPriorityFound": "No priority found",
-  "noResultsFound": "No results found",
   "noReturnDate": "There is no return date to display for this patient",
   "noServicesAvailable": "No services available",
   "noServicesConfigured": "No services configured",
   "noStatusConfigured": "No status configured",
   "notableConfig": "No table configuration",
   "notes": "Notes",
-  "noVisitsNotInQueueFound": "No visits currently not in queue found",
-  "noVisitTypesMatchingSearch": "There are no visit types matching this search text",
   "noVitalsFound": "No vitals found",
-  "oldest": "Oldest first",
   "onTime": "On time",
-  "or": "Or",
   "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Indefinite duration",
-  "orInProperFormat": "Or",
-  "orPatientName": "OR the patient's name(s)",
   "patientAge": "Age",
-  "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
-  "patientHasActiveVisit": "The patient already has an active visit",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
@@ -171,23 +128,17 @@
   "patientRequeued": "Patient has been requeued",
   "patients": "Patients",
   "patientsCurrentlyInQueue": "Patients currently in queue",
-  "personalDetails": "Personal details",
   "phoneNumber": "Phone Number",
   "pleaseSelectLocation": "Please select a location",
-  "pleaseSelectService": "Please select a service",
-  "postCode": "Post code",
   "previousPage": "Previous page",
   "previousVisit": "Previous visit",
-  "primaryHelperText": "Search for a patient",
   "priority": "Priority",
   "priorityComment": "Priority comment",
   "priorityIsRequired": "Priority is required",
-  "program": "Program",
   "provider": "Provider",
   "quantity": "Quantity",
   "queueAddedSuccessfully": "Queue added successfully",
   "queueEntryAddedSuccessfully": "Queue entry added successfully",
-  "queueEntryAddFailed": "Error adding queue entry status",
   "queueEntryDeleteFailed": "Error deleting queue entry",
   "queueEntryDeleteSuccessful": "Queue entry deleted successfully",
   "queueEntryEdited": "Queue entry edited",
@@ -217,9 +168,6 @@
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
-  "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
-  "recentScheduledVisits_other": "{{count}} visits scheduled for +/- 7 days",
-  "recommended": "Recommended",
   "refills": "Refills",
   "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit?",
   "removePatient": "Remove patient",
@@ -233,40 +181,24 @@
   "save": "Save",
   "scheduledAppointmentsList": "Scheduled appointments patient list",
   "scheduledToday": "Scheduled for today",
-  "search": "Search",
-  "searchboxPlaceholder": "Search for a patient name or ID number",
-  "searchForAVisitType": "Search for a visit type",
-  "searchForPatient": "Search for a patient",
-  "searchPatient": "Search Patient",
   "searchThisList": "Search this list",
-  "secondaryHelperText": "Type the patient's name or unique ID number",
   "selectALocation": "Select a location",
   "selectAVisitType": "Select visit type",
-  "selectFacility": "Select a facility",
-  "selectOption": "Select an option",
-  "selectProgramType": "Select program type",
   "selectQueue": "Select a queue",
   "selectQueueLocation": "Select a queue location",
   "selectQueueService": "Select a queue service",
   "selectRoom": "Select a room",
   "selectService": "Select a service",
   "selectServiceType": "Select a service type",
-  "selectVisitType": "Please select a Visit Type",
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
   "serviceIsRequired": "Service is required",
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
-  "sex": "Sex",
-  "sortBy": "Sort by",
   "sortWeight": "Sort weight",
   "sp02": "Sp02",
   "startAgeRangeInvalid": "Start age range is not valid",
-  "startAVisit": "Start a visit",
-  "startVisit": "Start visit",
-  "startVisitError": "Error starting visit",
-  "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
   "status": "Status",
   "statusIsRequired": "Status is required",
   "submitting": "Submitting...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "Triage form",
   "triageNote": "Triage note",
-  "trySearchWithPatientUniqueID": "Try searching with the patient's unique ID number",
   "undoQueueEntryTransitionSuccess": "Undo transition success",
   "undoTransition": "Undo transition",
   "unexpectedServerResponse": "Unexpected Server Response",
@@ -295,14 +226,11 @@
   "updateRoom": "Update room",
   "useTodaysDate": "Use today's date",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
-  "visitStartTime": "Visit Time",
   "visitTabs": "Visit tabs",
   "visitType": "Visit Type",
   "vitals": "Vitals",
   "vitalsForm": "Vitals form",
   "vitalsNotRecordedForVisit": "Vitals has not been recorded for this patient for this visit",
   "waitingFor": "Waiting for",
-  "weight": "Weight",
-  "years": "Years",
-  "youngest": "Youngest first"
+  "weight": "Weight"
 }
diff --git a/packages/esm-service-queues-app/translations/ar.json b/packages/esm-service-queues-app/translations/ar.json
index 9eca11a46..564cd7a3a 100644
--- a/packages/esm-service-queues-app/translations/ar.json
+++ b/packages/esm-service-queues-app/translations/ar.json
@@ -1,10 +1,7 @@
 {
   "actions": "الإجراءات",
-  "activeVisits": "الزيارات النشطة",
-  "activeVisitsNotInQueue": "الزيارات النشطة التي ليست في الطابور",
   "addAProviderQueueRoom": "Add a provider queue room?",
-  "addEntry": "أضف مدخل",
-  "addisitToQueueTooltip": "أضف إلى الطابور",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "Add New Queue Service",
   "addNewQueueServiceRoom": "أضف غرفة خدمة طابور جديدة",
   "addNewService": "أضف خدمة جديدة",
@@ -17,20 +14,13 @@
   "addQueueRoomName": "يرجى إضافة اسم غرفة الطابور",
   "addQueueRoomService": "يرجى إضافة خدمة غرفة الطابور",
   "addRoom": "أضف غرفة",
-  "addToQueue": "أضف إلى الطابور",
-  "addVisitToQueue": "أضف الزيارة إلى الطابور؟",
-  "advancedSearch": "بحث متقدم",
   "age": "العمر",
   "alistOfClients": "قائمة بالعملاء في انتظار",
   "all": "الكل",
   "and": "و",
-  "anotherVisitType": "ابدأ نوع زيارة آخر",
-  "any": "أي",
   "applyFilters": "Apply filters",
   "averageWaitTime": "متوسط وقت الانتظار اليوم",
-  "backToScheduledVisits": "العودة إلى الزيارات المجدولة",
   "backToSearchResults": "Back to search results",
-  "backToSimpleSearch": "العودة إلى البحث البسيط",
   "between": "بين",
   "bmi": "مؤشر كتلة الجسم",
   "bp": "ضغط الدم",
@@ -39,7 +29,6 @@
   "checkedInPatients": "المرضى المسجلين",
   "checkFilters": "تحقق من الفلاتر أعلاه",
   "chooseRoom": "اختر غرفة",
-  "chooseService": "اختر خدمة",
   "clearAllQueueEntries": "مسح جميع مدخلات الطابور؟",
   "clearAllQueueEntriesWarningMessage": "Clearing all queue entries will remove  all the patients from the queues",
   "clearQueue": "مسح الطابور",
@@ -55,8 +44,6 @@
   "currentVisit": "الزيارة الحالية",
   "date": "التاريخ",
   "date&Time": "Date & time",
-  "dateAndTimeOfVisit": "تاريخ ووقت الزيارة",
-  "dateOfBirth": "تاريخ الميلاد",
   "delete": "Delete",
   "deleteQueueEntry": "Delete queue entry",
   "discard": "تجاهل",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "خطأ في إضافة الطابور",
   "errorAddingQueueRoom": "خطأ في إضافة غرفة الطابور",
   "errorClearingQueues": "خطأ في مسح الطوابير",
-  "errorFetchingAppointments": "Error fetching appointments",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "Error loading queue entries",
   "errorPostingToScreen": "خطأ في النشر على الشاشة",
-  "facility": "المنشأة",
-  "failedToLoadRecommendedVisitTypes": "Failed to load recommended visit types",
-  "female": "أنثى",
   "femaleLabelText": "أنثى",
-  "fields": "من الحقول التالية",
   "filter": "تصفية (1)",
-  "filterByService": "Filter by service:",
-  "filterByStatus": "Filter by status:",
+  "filterByService": "التصفية حسب الخدمة",
+  "filterByStatus": "التصفية حسب الحالة",
   "filterTable": "جدول التصفية",
-  "firstName": "الاسم الأول",
-  "firstNameSort": "الاسم الأول (أ-ي)",
-  "futureScheduledVisits_one": "{{count}} زيارة/زيارات مجدولة لتواريخ في المستقبل",
-  "futureScheduledVisits_other": "{{count}} زيارة/زيارات مجدولة لتواريخ في المستقبل",
   "gender": "الجنس",
   "heartRate": "معدل ضربات القلب",
   "height": "الطول",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
-  "idNumber": "رقم الهوية",
   "indication": "الدلالة",
   "invalidQueue": "Invalid Queue",
   "invalidtableConfig": "Invalid table configuration",
   "lastEncounter": "آخر مواجهة",
-  "lastName": "اسم العائلة",
-  "lastNameSort": "اسم العائلة (أ-ي)",
-  "lastVisit": "آخر زيارة",
-  "lastVisitDate": "التاريخ",
   "loading": "جار التحميل...",
   "location": "Location",
-  "male": "ذكر",
   "maleLabelText": "ذكر",
-  "match": "مطابقة",
   "medications": "الأدوية",
-  "middleName": "الاسم الأوسط",
   "minuteFormatted": "{{minutes}} minute(s)",
   "minutes": "دقائق",
   "missingLocation": "الموقع مفقود",
-  "missingPriority": "يرجى اختيار الأولوية",
   "missingQueueName": "اسم الطابور مفقود",
   "missingQueueRoom": "يرجى اختيار غرفة الطابور",
   "missingQueueRoomName": "اسم غرفة الطابور مفقود",
   "missingQueueRoomService": "خدمة غرفة الطابور مفقودة",
   "missingService": "Missing service",
-  "missingVisitType": "نوع الزيارة مفقود",
   "modifyDefaultValue": "Modify default value",
   "movePatientToNextService": "نقل المريض إلى الخدمة التالية؟",
   "moveToNextService": "الانتقال إلى الخدمة التالية",
   "name": "الاسم",
   "nextPage": "Next page",
-  "noActiveVisitsForLocation": "لا توجد زيارات نشطة لعرضها لهذا الموقع.",
-  "noAppointmentsFound": "لم يتم العثور على مواعيد",
   "noColumnsDefined": "No table columns defined. Check Configuration",
   "noEncountersFound": "لم يتم العثور على مواجهات",
   "noLastEncounter": "لا توجد آخر مواجهة لعرضها لهذا المريض",
   "noLocationsAvailable": "لا توجد مواقع متاحة",
   "noMedicationsFound": "لم يتم العثور على أدوية",
   "noNotesFound": "لم يتم العثور على ملاحظات",
-  "noPatientFoundMessage": "عذرًا، لم يتم العثور على المريض",
   "noPatientsToDisplay": "لا يوجد مرضى للعرض",
   "noPreviousVisitFound": "لم يتم العثور على زيارة سابقة",
   "noPrioritiesConfigured": "لم يتم تكوين أولويات",
   "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
   "noPrioritiesForServiceTitle": "No priorities available",
   "noPriorityFound": "لم يتم العثور على الأولوية",
-  "noResultsFound": "لم يتم العثور على نتائج",
   "noReturnDate": "لا يوجد تاريخ عودة لعرضه لهذا المريض",
   "noServicesAvailable": "لا توجد خدمات متاحة",
   "noServicesConfigured": "لم يتم تكوين الخدمات",
   "noStatusConfigured": "لم يتم تكوين الحالة",
   "notableConfig": "No table configuration",
   "notes": "ملاحظات",
-  "noVisitsNotInQueueFound": "لم يتم العثور على زيارات حالياً خارج الطابور",
-  "noVisitTypesMatchingSearch": "There are no visit types matching this search text",
   "noVitalsFound": "لم يتم العثور على العلامات الحيوية",
-  "oldest": "الأقدم أولاً",
   "onTime": "في الوقت المحدد",
-  "or": "أو",
   "orderDurationAndUnit": "لمدة {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "مدة غير محددة",
-  "orInProperFormat": "Or",
-  "orPatientName": "أو اسم المريض/الأسماء",
   "patientAge": "Age",
-  "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "المريض الذي يحضر الخدمة",
-  "patientHasActiveVisit": "لدى المريض زيارة نشطة بالفعل",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "قائمة المرضى",
   "patientName": "اسم المريض",
@@ -171,23 +128,17 @@
   "patientRequeued": "تمت إعادة المريض إلى الطابور",
   "patients": "المرضى",
   "patientsCurrentlyInQueue": "المرضى الموجودين حاليًا في الطابور",
-  "personalDetails": "التفاصيل الشخصية",
   "phoneNumber": "رقم الهاتف",
   "pleaseSelectLocation": "Please select a location",
-  "pleaseSelectService": "Please select a service",
-  "postCode": "الرمز البريدي",
   "previousPage": "Previous page",
   "previousVisit": "الزيارة السابقة",
-  "primaryHelperText": "ابحث عن مريض",
   "priority": "الأولوية",
   "priorityComment": "Priority comment",
   "priorityIsRequired": "Priority is required",
-  "program": "البرنامج",
   "provider": "مقدم الخدمة",
   "quantity": "الكمية",
   "queueAddedSuccessfully": "Queue added successfully",
   "queueEntryAddedSuccessfully": "Queue entry added successfully",
-  "queueEntryAddFailed": "خطأ في إضافة حالة دخول الطابور",
   "queueEntryDeleteFailed": "Error deleting queue entry",
   "queueEntryDeleteSuccessful": "Queue entry deleted successfully",
   "queueEntryEdited": "Queue entry edited",
@@ -217,9 +168,6 @@
   "queueScreen": "شاشة الطابور",
   "queueService": "خدمة الطابور",
   "queueStatus": "حالة الطابور",
-  "recentScheduledVisits_one": "{{count}} زيارة/زيارات مجدولة لمدة +/- 7 أيام",
-  "recentScheduledVisits_other": "{{count}} زيارة/زيارات مجدولة لمدة +/- 7 أيام",
-  "recommended": "موصى به",
   "refills": "إعادة التعبئة",
   "removeFromQueueAndEndVisit": "هل تريد إزالة المريض من الطابور وإنهاء الزيارة النشطة؟",
   "removePatient": "Remove patient",
@@ -233,40 +181,24 @@
   "save": "حفظ",
   "scheduledAppointmentsList": "قائمة المواعيد المجدولة للمرضى",
   "scheduledToday": "مجدول لليوم",
-  "search": "بحث",
-  "searchboxPlaceholder": "ابحث عن اسم المريض أو رقم الهوية",
-  "searchForAVisitType": "ابحث عن نوع الزيارة",
-  "searchForPatient": "ابحث عن مريض",
-  "searchPatient": "Search Patient",
   "searchThisList": "ابحث في هذه القائمة",
-  "secondaryHelperText": "اكتب اسم المريض أو رقم الهوية الفريد",
   "selectALocation": "Select a location",
   "selectAVisitType": "اختر نوع الزيارة",
-  "selectFacility": "اختر المنشأة",
-  "selectOption": "اختر خيارًا",
-  "selectProgramType": "اختر نوع البرنامج",
   "selectQueue": "Select a queue",
   "selectQueueLocation": "اختر موقع الطابور",
   "selectQueueService": "Select a queue service",
   "selectRoom": "اختر غرفة",
   "selectService": "اختر خدمة",
   "selectServiceType": "اختر نوع الخدمة",
-  "selectVisitType": "يرجى اختيار نوع الزيارة",
   "serve": "خدمة",
   "servePatient": "خدمة المريض",
   "service": "خدمة",
   "serviceIsRequired": "Service is required",
   "serviceQueue": "طابور الخدمة",
   "serviceQueues": "طوابير الخدمة",
-  "sex": "الجنس",
-  "sortBy": "ترتيب حسب",
   "sortWeight": "ترتيب حسب الوزن",
   "sp02": "Sp02",
   "startAgeRangeInvalid": "نطاق العمر الابتدائي غير صالح",
-  "startAVisit": "Start a visit",
-  "startVisit": "بدء الزيارة",
-  "startVisitError": "خطأ أثناء بدء الزيارة",
-  "startVisitQueueSuccessfully": "تمت إضافة المريض إلى قائمة الزيارات النشطة والطابور.",
   "status": "الحالة",
   "statusIsRequired": "Status is required",
   "submitting": "Submitting...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "نموذج الترياج",
   "triageNote": "ملاحظة الترياج",
-  "trySearchWithPatientUniqueID": "حاول البحث باستخدام رقم المريض المميز",
   "undoQueueEntryTransitionSuccess": "Undo transition success",
   "undoTransition": "Undo transition",
   "unexpectedServerResponse": "Unexpected Server Response",
@@ -295,14 +226,11 @@
   "updateRoom": "تحديث الغرفة",
   "useTodaysDate": "استخدم تاريخ اليوم",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
-  "visitStartTime": "وقت الزيارة",
   "visitTabs": "Visit tabs",
   "visitType": "نوع الزيارة",
   "vitals": "العلامات الحيوية",
   "vitalsForm": "نموذج العلامات الحيوية",
   "vitalsNotRecordedForVisit": "لم يتم تسجيل العلامات الحيوية لهذا المريض خلال هذه الزيارة",
   "waitingFor": "في انتظار",
-  "weight": "الوزن",
-  "years": "سنوات",
-  "youngest": "الأصغر سنًا أولاً"
+  "weight": "الوزن"
 }
diff --git a/packages/esm-service-queues-app/translations/de.json b/packages/esm-service-queues-app/translations/de.json
index c93179b3a..918d1b4ea 100644
--- a/packages/esm-service-queues-app/translations/de.json
+++ b/packages/esm-service-queues-app/translations/de.json
@@ -1,10 +1,7 @@
 {
   "actions": "Actions",
-  "activeVisits": "Active Visits",
-  "activeVisitsNotInQueue": "Active visits not in queue",
   "addAProviderQueueRoom": "Add a provider queue room?",
-  "addEntry": "Add entry",
-  "addisitToQueueTooltip": "Add",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "Add New Queue Service",
   "addNewQueueServiceRoom": "Add new queue service room",
   "addNewService": "Add new service",
@@ -17,20 +14,13 @@
   "addQueueRoomName": "Please add a queue room name",
   "addQueueRoomService": "Please add a queue room service",
   "addRoom": "Add room",
-  "addToQueue": "Add to queue",
-  "addVisitToQueue": "Add Visit To Queue?",
-  "advancedSearch": "Advanced search",
   "age": "Age",
   "alistOfClients": "A list of clients waiting for ",
   "all": "All",
   "and": "And",
-  "anotherVisitType": "Start another visit type",
-  "any": "Any",
   "applyFilters": "Apply filters",
   "averageWaitTime": "Average wait time today",
-  "backToScheduledVisits": "Back To Scheduled Visits",
   "backToSearchResults": "Back to search results",
-  "backToSimpleSearch": "Back to simple search",
   "between": "Between",
   "bmi": "Bmi",
   "bp": "Bp",
@@ -39,7 +29,6 @@
   "checkedInPatients": "Checked in patients",
   "checkFilters": "Check the filters above",
   "chooseRoom": "Select a room",
-  "chooseService": "Select a service",
   "clearAllQueueEntries": "Clear all queue entries?",
   "clearAllQueueEntriesWarningMessage": "Clearing all queue entries will remove  all the patients from the queues",
   "clearQueue": "Clear queue",
@@ -55,8 +44,6 @@
   "currentVisit": "Current visit",
   "date": "Date",
   "date&Time": "Date & time",
-  "dateAndTimeOfVisit": "Date and time of visit",
-  "dateOfBirth": "Date of birth",
   "delete": "Delete",
   "deleteQueueEntry": "Delete queue entry",
   "discard": "Discard",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "Error adding queue",
   "errorAddingQueueRoom": "Error adding queue room",
   "errorClearingQueues": "Error clearing queues",
-  "errorFetchingAppointments": "Error fetching appointments",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "Error loading queue entries",
   "errorPostingToScreen": "Error posting to screen",
-  "facility": "Facility",
-  "failedToLoadRecommendedVisitTypes": "Failed to load recommended visit types",
-  "female": "Female",
   "femaleLabelText": "Female",
-  "fields": "of the following fields",
   "filter": "Filter",
   "filterByService": "Filter by service:",
   "filterByStatus": "Filter by status:",
   "filterTable": "Filter table",
-  "firstName": "First name",
-  "firstNameSort": "First name (a-z)",
-  "futureScheduledVisits_one": "{{count}} visit scheduled for dates in the future",
-  "futureScheduledVisits_other": "{{count}} visits scheduled for dates in the future",
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
-  "idNumber": "ID Number",
   "indication": "Indication",
   "invalidQueue": "Invalid Queue",
   "invalidtableConfig": "Invalid table configuration",
   "lastEncounter": "Last encounter",
-  "lastName": "Last name",
-  "lastNameSort": "Last name (a-z)",
-  "lastVisit": "Last Visit",
-  "lastVisitDate": "Date",
   "loading": "Loading...",
   "location": "Location",
-  "male": "Male",
   "maleLabelText": "Male",
-  "match": "Match",
   "medications": "Medications",
-  "middleName": "Middle name",
   "minuteFormatted": "{{minutes}} minute(s)",
   "minutes": "Minutes",
   "missingLocation": "Missing location",
-  "missingPriority": "Please select a priority",
   "missingQueueName": "Missing queue name",
   "missingQueueRoom": "Please select a queue room",
   "missingQueueRoomName": "Missing queue room name",
   "missingQueueRoomService": "Missing queue room service",
   "missingService": "Missing service",
-  "missingVisitType": "Missing visit type",
   "modifyDefaultValue": "Modify default value",
   "movePatientToNextService": "Move patient to the next service?",
   "moveToNextService": "Move to next service",
   "name": "Name",
   "nextPage": "Next page",
-  "noActiveVisitsForLocation": "There are no active visits to display for this location.",
-  "noAppointmentsFound": "No appointments found",
   "noColumnsDefined": "No table columns defined. Check Configuration",
   "noEncountersFound": "No encounters found",
   "noLastEncounter": "There is no last encounter to display for this patient",
   "noLocationsAvailable": "No locations available",
   "noMedicationsFound": "No medications found",
   "noNotesFound": "No notes found",
-  "noPatientFoundMessage": "Sorry, no patient has been found",
   "noPatientsToDisplay": "No patients to display",
   "noPreviousVisitFound": "No previous visit found",
   "noPrioritiesConfigured": "No priorities configured",
   "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
   "noPrioritiesForServiceTitle": "No priorities available",
   "noPriorityFound": "No priority found",
-  "noResultsFound": "No results found",
   "noReturnDate": "There is no return date to display for this patient",
   "noServicesAvailable": "No services available",
   "noServicesConfigured": "No services configured",
   "noStatusConfigured": "No status configured",
   "notableConfig": "No table configuration",
   "notes": "Notes",
-  "noVisitsNotInQueueFound": "No visits currently not in queue found",
-  "noVisitTypesMatchingSearch": "There are no visit types matching this search text",
   "noVitalsFound": "No vitals found",
-  "oldest": "Oldest first",
   "onTime": "On time",
-  "or": "or",
   "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Indefinite duration",
-  "orInProperFormat": "Or",
-  "orPatientName": "OR the patient's name(s)",
   "patientAge": "Age",
-  "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
-  "patientHasActiveVisit": "The patient already has an active visit",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
@@ -171,23 +128,17 @@
   "patientRequeued": "Patient has been requeued",
   "patients": "Patients",
   "patientsCurrentlyInQueue": "Patients currently in queue",
-  "personalDetails": "Personal Details",
   "phoneNumber": "Phone number",
   "pleaseSelectLocation": "Please select a location",
-  "pleaseSelectService": "Please select a service",
-  "postCode": "Post code",
   "previousPage": "Previous page",
   "previousVisit": "Previous visit",
-  "primaryHelperText": "Search for a patient",
   "priority": "Priority",
   "priorityComment": "Priority comment",
   "priorityIsRequired": "Priority is required",
-  "program": "Program",
   "provider": "Provider",
   "quantity": "Quantity",
   "queueAddedSuccessfully": "Queue added successfully",
   "queueEntryAddedSuccessfully": "Queue entry added successfully",
-  "queueEntryAddFailed": "Error adding queue entry status",
   "queueEntryDeleteFailed": "Error deleting queue entry",
   "queueEntryDeleteSuccessful": "Queue entry deleted successfully",
   "queueEntryEdited": "Queue entry edited",
@@ -217,9 +168,6 @@
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
-  "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
-  "recentScheduledVisits_other": "{{count}} visits scheduled for +/- 7 days",
-  "recommended": "Recommended",
   "refills": "Refills",
   "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit",
   "removePatient": "Remove patient",
@@ -233,40 +181,24 @@
   "save": "Save",
   "scheduledAppointmentsList": "Scheduled appointments patient list",
   "scheduledToday": "Scheduled for today",
-  "search": "Search",
-  "searchboxPlaceholder": "Search for a patient name or ID number",
-  "searchForAVisitType": "Search for a visit type",
-  "searchForPatient": "Search for a patient",
-  "searchPatient": "Search Patient",
   "searchThisList": "Search this list",
-  "secondaryHelperText": "Type the patient's name or unique ID number",
   "selectALocation": "Select a location",
   "selectAVisitType": "Select visit type",
-  "selectFacility": "Select a facility",
-  "selectOption": "Select an option",
-  "selectProgramType": "Select program type",
   "selectQueue": "Select a queue",
   "selectQueueLocation": "Select a queue location",
   "selectQueueService": "Select a queue service",
   "selectRoom": "Select a room",
   "selectService": "Select a service",
   "selectServiceType": "Select a service type",
-  "selectVisitType": "Please select a Visit Type",
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
   "serviceIsRequired": "Service is required",
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
-  "sex": "Sex",
-  "sortBy": "Sort by",
   "sortWeight": "Sort weight",
   "sp02": "Sp02",
   "startAgeRangeInvalid": "Start age range is not valid",
-  "startAVisit": "Start a visit",
-  "startVisit": "Start visit",
-  "startVisitError": "Error starting visit",
-  "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
   "status": "Status",
   "statusIsRequired": "Status is required",
   "submitting": "Submitting...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "Triage form",
   "triageNote": "Triage note",
-  "trySearchWithPatientUniqueID": "Try searching with the patient's unique ID number",
   "undoQueueEntryTransitionSuccess": "Undo transition success",
   "undoTransition": "Undo transition",
   "unexpectedServerResponse": "Unexpected Server Response",
@@ -295,14 +226,11 @@
   "updateRoom": "Update room",
   "useTodaysDate": "Use today's date",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
-  "visitStartTime": "Visit Time",
   "visitTabs": "Visit tabs",
   "visitType": "Visit Type",
   "vitals": "Vitals",
   "vitalsForm": "Vitals form",
   "vitalsNotRecordedForVisit": "Vitals has not been recorded for this patient for this visit",
   "waitingFor": "Waiting for",
-  "weight": "Weight",
-  "years": "Years",
-  "youngest": "Youngest first"
+  "weight": "Weight"
 }
diff --git a/packages/esm-service-queues-app/translations/en.json b/packages/esm-service-queues-app/translations/en.json
index c93179b3a..1ac2df614 100644
--- a/packages/esm-service-queues-app/translations/en.json
+++ b/packages/esm-service-queues-app/translations/en.json
@@ -1,10 +1,7 @@
 {
   "actions": "Actions",
-  "activeVisits": "Active Visits",
-  "activeVisitsNotInQueue": "Active visits not in queue",
   "addAProviderQueueRoom": "Add a provider queue room?",
-  "addEntry": "Add entry",
-  "addisitToQueueTooltip": "Add",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "Add New Queue Service",
   "addNewQueueServiceRoom": "Add new queue service room",
   "addNewService": "Add new service",
@@ -17,20 +14,13 @@
   "addQueueRoomName": "Please add a queue room name",
   "addQueueRoomService": "Please add a queue room service",
   "addRoom": "Add room",
-  "addToQueue": "Add to queue",
-  "addVisitToQueue": "Add Visit To Queue?",
-  "advancedSearch": "Advanced search",
   "age": "Age",
   "alistOfClients": "A list of clients waiting for ",
   "all": "All",
   "and": "And",
-  "anotherVisitType": "Start another visit type",
-  "any": "Any",
   "applyFilters": "Apply filters",
   "averageWaitTime": "Average wait time today",
-  "backToScheduledVisits": "Back To Scheduled Visits",
   "backToSearchResults": "Back to search results",
-  "backToSimpleSearch": "Back to simple search",
   "between": "Between",
   "bmi": "Bmi",
   "bp": "Bp",
@@ -39,7 +29,6 @@
   "checkedInPatients": "Checked in patients",
   "checkFilters": "Check the filters above",
   "chooseRoom": "Select a room",
-  "chooseService": "Select a service",
   "clearAllQueueEntries": "Clear all queue entries?",
   "clearAllQueueEntriesWarningMessage": "Clearing all queue entries will remove  all the patients from the queues",
   "clearQueue": "Clear queue",
@@ -55,8 +44,6 @@
   "currentVisit": "Current visit",
   "date": "Date",
   "date&Time": "Date & time",
-  "dateAndTimeOfVisit": "Date and time of visit",
-  "dateOfBirth": "Date of birth",
   "delete": "Delete",
   "deleteQueueEntry": "Delete queue entry",
   "discard": "Discard",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "Error adding queue",
   "errorAddingQueueRoom": "Error adding queue room",
   "errorClearingQueues": "Error clearing queues",
-  "errorFetchingAppointments": "Error fetching appointments",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "Error loading queue entries",
   "errorPostingToScreen": "Error posting to screen",
-  "facility": "Facility",
-  "failedToLoadRecommendedVisitTypes": "Failed to load recommended visit types",
-  "female": "Female",
   "femaleLabelText": "Female",
-  "fields": "of the following fields",
   "filter": "Filter",
   "filterByService": "Filter by service:",
   "filterByStatus": "Filter by status:",
   "filterTable": "Filter table",
-  "firstName": "First name",
-  "firstNameSort": "First name (a-z)",
-  "futureScheduledVisits_one": "{{count}} visit scheduled for dates in the future",
-  "futureScheduledVisits_other": "{{count}} visits scheduled for dates in the future",
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
-  "idNumber": "ID Number",
   "indication": "Indication",
   "invalidQueue": "Invalid Queue",
   "invalidtableConfig": "Invalid table configuration",
   "lastEncounter": "Last encounter",
-  "lastName": "Last name",
-  "lastNameSort": "Last name (a-z)",
-  "lastVisit": "Last Visit",
-  "lastVisitDate": "Date",
   "loading": "Loading...",
   "location": "Location",
-  "male": "Male",
   "maleLabelText": "Male",
-  "match": "Match",
   "medications": "Medications",
-  "middleName": "Middle name",
   "minuteFormatted": "{{minutes}} minute(s)",
   "minutes": "Minutes",
   "missingLocation": "Missing location",
-  "missingPriority": "Please select a priority",
   "missingQueueName": "Missing queue name",
   "missingQueueRoom": "Please select a queue room",
   "missingQueueRoomName": "Missing queue room name",
   "missingQueueRoomService": "Missing queue room service",
   "missingService": "Missing service",
-  "missingVisitType": "Missing visit type",
   "modifyDefaultValue": "Modify default value",
   "movePatientToNextService": "Move patient to the next service?",
   "moveToNextService": "Move to next service",
   "name": "Name",
   "nextPage": "Next page",
-  "noActiveVisitsForLocation": "There are no active visits to display for this location.",
-  "noAppointmentsFound": "No appointments found",
   "noColumnsDefined": "No table columns defined. Check Configuration",
   "noEncountersFound": "No encounters found",
   "noLastEncounter": "There is no last encounter to display for this patient",
   "noLocationsAvailable": "No locations available",
   "noMedicationsFound": "No medications found",
   "noNotesFound": "No notes found",
-  "noPatientFoundMessage": "Sorry, no patient has been found",
   "noPatientsToDisplay": "No patients to display",
   "noPreviousVisitFound": "No previous visit found",
   "noPrioritiesConfigured": "No priorities configured",
   "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
   "noPrioritiesForServiceTitle": "No priorities available",
   "noPriorityFound": "No priority found",
-  "noResultsFound": "No results found",
   "noReturnDate": "There is no return date to display for this patient",
   "noServicesAvailable": "No services available",
   "noServicesConfigured": "No services configured",
   "noStatusConfigured": "No status configured",
   "notableConfig": "No table configuration",
   "notes": "Notes",
-  "noVisitsNotInQueueFound": "No visits currently not in queue found",
-  "noVisitTypesMatchingSearch": "There are no visit types matching this search text",
   "noVitalsFound": "No vitals found",
-  "oldest": "Oldest first",
   "onTime": "On time",
-  "or": "or",
   "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Indefinite duration",
-  "orInProperFormat": "Or",
-  "orPatientName": "OR the patient's name(s)",
   "patientAge": "Age",
-  "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
-  "patientHasActiveVisit": "The patient already has an active visit",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
@@ -171,23 +128,17 @@
   "patientRequeued": "Patient has been requeued",
   "patients": "Patients",
   "patientsCurrentlyInQueue": "Patients currently in queue",
-  "personalDetails": "Personal Details",
   "phoneNumber": "Phone number",
   "pleaseSelectLocation": "Please select a location",
-  "pleaseSelectService": "Please select a service",
-  "postCode": "Post code",
   "previousPage": "Previous page",
   "previousVisit": "Previous visit",
-  "primaryHelperText": "Search for a patient",
   "priority": "Priority",
   "priorityComment": "Priority comment",
   "priorityIsRequired": "Priority is required",
-  "program": "Program",
   "provider": "Provider",
   "quantity": "Quantity",
   "queueAddedSuccessfully": "Queue added successfully",
   "queueEntryAddedSuccessfully": "Queue entry added successfully",
-  "queueEntryAddFailed": "Error adding queue entry status",
   "queueEntryDeleteFailed": "Error deleting queue entry",
   "queueEntryDeleteSuccessful": "Queue entry deleted successfully",
   "queueEntryEdited": "Queue entry edited",
@@ -217,9 +168,6 @@
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
-  "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
-  "recentScheduledVisits_other": "{{count}} visits scheduled for +/- 7 days",
-  "recommended": "Recommended",
   "refills": "Refills",
   "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit",
   "removePatient": "Remove patient",
@@ -233,40 +181,23 @@
   "save": "Save",
   "scheduledAppointmentsList": "Scheduled appointments patient list",
   "scheduledToday": "Scheduled for today",
-  "search": "Search",
-  "searchboxPlaceholder": "Search for a patient name or ID number",
-  "searchForAVisitType": "Search for a visit type",
-  "searchForPatient": "Search for a patient",
-  "searchPatient": "Search Patient",
   "searchThisList": "Search this list",
-  "secondaryHelperText": "Type the patient's name or unique ID number",
   "selectALocation": "Select a location",
   "selectAVisitType": "Select visit type",
-  "selectFacility": "Select a facility",
-  "selectOption": "Select an option",
-  "selectProgramType": "Select program type",
   "selectQueue": "Select a queue",
   "selectQueueLocation": "Select a queue location",
   "selectQueueService": "Select a queue service",
   "selectRoom": "Select a room",
   "selectService": "Select a service",
   "selectServiceType": "Select a service type",
-  "selectVisitType": "Please select a Visit Type",
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
   "serviceIsRequired": "Service is required",
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
-  "sex": "Sex",
-  "sortBy": "Sort by",
-  "sortWeight": "Sort weight",
   "sp02": "Sp02",
   "startAgeRangeInvalid": "Start age range is not valid",
-  "startAVisit": "Start a visit",
-  "startVisit": "Start visit",
-  "startVisitError": "Error starting visit",
-  "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
   "status": "Status",
   "statusIsRequired": "Status is required",
   "submitting": "Submitting...",
@@ -286,7 +217,6 @@
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "Triage form",
   "triageNote": "Triage note",
-  "trySearchWithPatientUniqueID": "Try searching with the patient's unique ID number",
   "undoQueueEntryTransitionSuccess": "Undo transition success",
   "undoTransition": "Undo transition",
   "unexpectedServerResponse": "Unexpected Server Response",
@@ -295,14 +225,11 @@
   "updateRoom": "Update room",
   "useTodaysDate": "Use today's date",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
-  "visitStartTime": "Visit Time",
   "visitTabs": "Visit tabs",
   "visitType": "Visit Type",
   "vitals": "Vitals",
   "vitalsForm": "Vitals form",
   "vitalsNotRecordedForVisit": "Vitals has not been recorded for this patient for this visit",
   "waitingFor": "Waiting for",
-  "weight": "Weight",
-  "years": "Years",
-  "youngest": "Youngest first"
+  "weight": "Weight"
 }
diff --git a/packages/esm-service-queues-app/translations/es.json b/packages/esm-service-queues-app/translations/es.json
index fc47f2694..a80cd6f22 100644
--- a/packages/esm-service-queues-app/translations/es.json
+++ b/packages/esm-service-queues-app/translations/es.json
@@ -1,10 +1,7 @@
 {
   "actions": "Actions",
-  "activeVisits": "Active Visits",
-  "activeVisitsNotInQueue": "Active visits not in queue",
   "addAProviderQueueRoom": "¿Agregar una sala de espera para el proveedor?",
-  "addEntry": "Add entry",
-  "addisitToQueueTooltip": "Add to queue",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "Añadir Nuevo Servicio de Cola",
   "addNewQueueServiceRoom": "Add new queue service room",
   "addNewService": "Add new service",
@@ -17,20 +14,13 @@
   "addQueueRoomName": "Please add a queue room name",
   "addQueueRoomService": "Please add a queue room service",
   "addRoom": "Add room",
-  "addToQueue": "Add to queue",
-  "addVisitToQueue": "Add Visit To Queue?",
-  "advancedSearch": "Advanced search",
   "age": "Age",
   "alistOfClients": "A list of clients waiting for ",
   "all": "All",
   "and": "And",
-  "anotherVisitType": "Start another visit type",
-  "any": "Any",
   "applyFilters": "Aplicar filtros",
   "averageWaitTime": "Average wait time today",
-  "backToScheduledVisits": "Back to scheduled visits",
   "backToSearchResults": "Volver a los resultados de búsqueda",
-  "backToSimpleSearch": "Back to simple search",
   "between": "Between",
   "bmi": "Bmi",
   "bp": "Bp",
@@ -39,7 +29,6 @@
   "checkedInPatients": "Checked in patients",
   "checkFilters": "Check the filters above",
   "chooseRoom": "Select a room",
-  "chooseService": "Select a service",
   "clearAllQueueEntries": "Clear all queue entries?",
   "clearAllQueueEntriesWarningMessage": "Limpiar todas las entradas en la cola eliminará todos los pacientes de las colas",
   "clearQueue": "Clear queue",
@@ -55,8 +44,6 @@
   "currentVisit": "Current visit",
   "date": "Date",
   "date&Time": "Date & time",
-  "dateAndTimeOfVisit": "Date and time of visit",
-  "dateOfBirth": "Date of birth",
   "delete": "Eliminar",
   "deleteQueueEntry": "Eliminar entrada de la cola",
   "discard": "Discard",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "Error adding queue",
   "errorAddingQueueRoom": "Error adding queue room",
   "errorClearingQueues": "Error clearing queues",
-  "errorFetchingAppointments": "Error al obtener las citas",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "Error al cargar las entradas de la cola",
   "errorPostingToScreen": "Error posting to screen",
-  "facility": "Facility",
-  "failedToLoadRecommendedVisitTypes": "Fallo al cargar tipos de visita recomendados",
-  "female": "Female",
   "femaleLabelText": "Female",
-  "fields": "of the following fields",
   "filter": "Filter (1)",
-  "filterByService": "Filter by service:",
-  "filterByStatus": "Filter by status:",
+  "filterByService": "Filtrar por servicio:",
+  "filterByStatus": "Filtrar por estado:",
   "filterTable": "Filter table",
-  "firstName": "First name",
-  "firstNameSort": "First name (a-z)",
-  "futureScheduledVisits_one": "{{count}} visit scheduled for dates in the future",
-  "futureScheduledVisits_other": "{{count}} visits scheduled for dates in the future",
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
   "hourAndMinuteFormatted": "{{hours}} hora(s) y {{minutes}} minutos)",
-  "idNumber": "ID Number",
   "indication": "Indication",
   "invalidQueue": "Cola Inválida",
   "invalidtableConfig": "Tabla de configuración inválida",
   "lastEncounter": "Last encounter",
-  "lastName": "Last name",
-  "lastNameSort": "Last name (a-z)",
-  "lastVisit": "Last visit",
-  "lastVisitDate": "Date",
   "loading": "Loading...",
   "location": "Ubicación",
-  "male": "Male",
   "maleLabelText": "Male",
-  "match": "Match",
   "medications": "Medications",
-  "middleName": "Middle name",
   "minuteFormatted": "{{minutes}} minuto(s)",
   "minutes": "Minutes",
   "missingLocation": "Missing location",
-  "missingPriority": "Please select a priority",
   "missingQueueName": "Missing queue name",
   "missingQueueRoom": "Please select a queue room",
   "missingQueueRoomName": "Missing queue room name",
   "missingQueueRoomService": "Missing queue room service",
   "missingService": "Servicio faltante",
-  "missingVisitType": "Missing visit type",
   "modifyDefaultValue": "Modificar valor por defecto",
   "movePatientToNextService": "Move patient to the next service?",
   "moveToNextService": "Move to next service",
   "name": "Name",
   "nextPage": "Siguiente página",
-  "noActiveVisitsForLocation": "There are no active visits to display for this location.",
-  "noAppointmentsFound": "No appointments found",
   "noColumnsDefined": "No hay columnas de la tabla definidas. Revisar Configuración",
   "noEncountersFound": "No encounters found",
   "noLastEncounter": "There is no last encounter to display for this patient",
   "noLocationsAvailable": "No locations available",
   "noMedicationsFound": "No medications found",
   "noNotesFound": "No notes found",
-  "noPatientFoundMessage": "Sorry, no patient has been found",
   "noPatientsToDisplay": "No patients to display",
   "noPreviousVisitFound": "No previous visit found",
   "noPrioritiesConfigured": "No priorities configured",
   "noPrioritiesForService": "El servicio seleccionado no tiene prioridades permitidas. Este es un error de configuración. Por favor, contacte a su administrador del sistema.",
   "noPrioritiesForServiceTitle": "No hay prioridades disponibles",
   "noPriorityFound": "No priority found",
-  "noResultsFound": "No results found",
   "noReturnDate": "There is no return date to display for this patient",
   "noServicesAvailable": "No services available",
   "noServicesConfigured": "No services configured",
   "noStatusConfigured": "No status configured",
   "notableConfig": "No hay tabla de configuración",
   "notes": "Notes",
-  "noVisitsNotInQueueFound": "No visits currently not in queue found",
-  "noVisitTypesMatchingSearch": "No existen tipos de visita que coincidan con el texto a buscar",
   "noVitalsFound": "No vitals found",
-  "oldest": "Oldest first",
   "onTime": "On time",
-  "or": "Or",
   "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Indefinite duration",
-  "orInProperFormat": "Or",
-  "orPatientName": "OR the patient's name(s)",
   "patientAge": "Edad",
-  "patientAlreadyInQueue": "El paciente ya está en la cola",
   "patientAttendingService": "Patient attending service",
-  "patientHasActiveVisit": "The patient already has an active visit",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
@@ -171,23 +128,17 @@
   "patientRequeued": "Patient has been requeued",
   "patients": "Patients",
   "patientsCurrentlyInQueue": "Patients currently in queue",
-  "personalDetails": "Personal details",
   "phoneNumber": "Phone Number",
   "pleaseSelectLocation": "Please select a location",
-  "pleaseSelectService": "Please select a service",
-  "postCode": "Post code",
   "previousPage": "Página anterior",
   "previousVisit": "Previous visit",
-  "primaryHelperText": "Search for a patient",
   "priority": "Priority",
   "priorityComment": "Comentario de prioridad",
   "priorityIsRequired": "La prioridad es obligatoria",
-  "program": "Program",
   "provider": "Provider",
   "quantity": "Quantity",
   "queueAddedSuccessfully": "La cola fue añadida con éxito",
   "queueEntryAddedSuccessfully": "La entrada en la cola fue añadida con éxito",
-  "queueEntryAddFailed": "Error adding queue entry status",
   "queueEntryDeleteFailed": "Error al eliminar la entrada de la cola",
   "queueEntryDeleteSuccessful": "La entrada de la cola fue eliminada con éxito",
   "queueEntryEdited": "Entrada de la cola editada",
@@ -217,9 +168,6 @@
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
-  "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
-  "recentScheduledVisits_other": "{{count}} visits scheduled for +/- 7 days",
-  "recommended": "Recommended",
   "refills": "Refills",
   "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit?",
   "removePatient": "Eliminar paciente",
@@ -233,40 +181,24 @@
   "save": "Save",
   "scheduledAppointmentsList": "Scheduled appointments patient list",
   "scheduledToday": "Scheduled for today",
-  "search": "Search",
-  "searchboxPlaceholder": "Search for a patient name or ID number",
-  "searchForAVisitType": "Search for a visit type",
-  "searchForPatient": "Search for a patient",
-  "searchPatient": "Buscar Paciente",
   "searchThisList": "Search this list",
-  "secondaryHelperText": "Type the patient's name or unique ID number",
   "selectALocation": "Seleccionar una ubicación",
   "selectAVisitType": "Select visit type",
-  "selectFacility": "Select a facility",
-  "selectOption": "Select an option",
-  "selectProgramType": "Select program type",
   "selectQueue": "Seleccionar una cola",
   "selectQueueLocation": "Select a queue location",
   "selectQueueService": "Select a queue service",
   "selectRoom": "Select a room",
   "selectService": "Select a service",
   "selectServiceType": "Select a service type",
-  "selectVisitType": "Please select a Visit Type",
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
   "serviceIsRequired": "El servicio es obligatorio",
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
-  "sex": "Sex",
-  "sortBy": "Sort by",
   "sortWeight": "Sort weight",
   "sp02": "Sp02",
   "startAgeRangeInvalid": "Start age range is not valid",
-  "startAVisit": "Start a visit",
-  "startVisit": "Start visit",
-  "startVisitError": "Error starting visit",
-  "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
   "status": "Status",
   "statusIsRequired": "El estado es obligatorio",
   "submitting": "Enviando...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "Seleccione un nuevo estado o cola para el paciente a trasladar",
   "triageForm": "Triage form",
   "triageNote": "Triage note",
-  "trySearchWithPatientUniqueID": "Try searching with the patient's unique ID number",
   "undoQueueEntryTransitionSuccess": "Traslado deshecho con éxito",
   "undoTransition": "Deshacer traslado",
   "unexpectedServerResponse": "Respuesta del servidor no esperada",
@@ -295,14 +226,11 @@
   "updateRoom": "Update room",
   "useTodaysDate": "Use today's date",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid no configurado",
-  "visitStartTime": "Visit Time",
   "visitTabs": "Pestañas de visita",
   "visitType": "Visit Type",
   "vitals": "Vitals",
   "vitalsForm": "Vitals form",
   "vitalsNotRecordedForVisit": "Vitals has not been recorded for this patient for this visit",
   "waitingFor": "Waiting for",
-  "weight": "Weight",
-  "years": "Years",
-  "youngest": "Youngest first"
+  "weight": "Weight"
 }
diff --git a/packages/esm-service-queues-app/translations/fr.json b/packages/esm-service-queues-app/translations/fr.json
index c6feffe5d..688ab925a 100644
--- a/packages/esm-service-queues-app/translations/fr.json
+++ b/packages/esm-service-queues-app/translations/fr.json
@@ -1,10 +1,7 @@
 {
   "actions": "Actions",
-  "activeVisits": "Visites Actives",
-  "activeVisitsNotInQueue": "Visites actives non dans la file d'attente",
   "addAProviderQueueRoom": "Ajouter une salle d'attente pour les prestataires de service?",
-  "addEntry": "Ajouter une entrée",
-  "addisitToQueueTooltip": "Ajouter",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "Ajouter un nouveau service de file d'attente",
   "addNewQueueServiceRoom": "Ajouter une nouvelle salle de service de file d'attente",
   "addNewService": "Ajouter un nouveau service",
@@ -17,20 +14,13 @@
   "addQueueRoomName": "Veuillez ajouter un nom de salle de file d'attente",
   "addQueueRoomService": "Veuillez ajouter un service de salle de file d'attente",
   "addRoom": "Ajouter une salle",
-  "addToQueue": "Ajouter à la file d'attente",
-  "addVisitToQueue": " Ajouter une visite à la file d’attente?",
-  "advancedSearch": "Recherche avancée",
   "age": "Âge",
   "alistOfClients": "Liste de patients attendus",
   "all": "Tout",
   "and": "Et",
-  "anotherVisitType": "Commencer un autre type de visite",
-  "any": "N'importe quel",
   "applyFilters": "Appliquer les filtres",
   "averageWaitTime": "Temps moyen d'attente du jour",
-  "backToScheduledVisits": "Retour aux visites programmées",
   "backToSearchResults": "Retour aux résultats de recherche",
-  "backToSimpleSearch": "Retour à la recherche simple",
   "between": "Entre",
   "bmi": "IMC",
   "bp": "TA",
@@ -39,7 +29,6 @@
   "checkedInPatients": "Patients arrivés",
   "checkFilters": "Vérifiez les filtres ci-dessus",
   "chooseRoom": "Selectionner une salle",
-  "chooseService": "Sélectionner un service",
   "clearAllQueueEntries": "Effacer toutes les entrées de la file d'attente ?",
   "clearAllQueueEntriesWarningMessage": "L'effacement de toutes les entrées de la file d'attente supprimera tous les patients de la file d'attente.",
   "clearQueue": "Effacer la file d'attente",
@@ -55,8 +44,6 @@
   "currentVisit": "Visite en cours",
   "date": "Date",
   "date&Time": "Date et heure",
-  "dateAndTimeOfVisit": "Date et heure de la visite",
-  "dateOfBirth": "Date de naissance",
   "delete": "Supprimer",
   "deleteQueueEntry": "Supprimer l'entrée dans la file d'attente.",
   "discard": "Abandonner",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "Erreur lors de l'ajout de la file d'attente",
   "errorAddingQueueRoom": "Erreur lors de l'ajout d'une salle d'attente",
   "errorClearingQueues": "Erreur lors de la suppression des files d'attente",
-  "errorFetchingAppointments": " Erreur lors de la récupération des rendez-vous",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": " Erreur lors du chargement des files d'attente",
   "errorPostingToScreen": " Erreur lors de l'affichage sur l'écran",
-  "facility": "Facilité",
-  "failedToLoadRecommendedVisitTypes": " Échec du chargement des types de visites recommandées",
-  "female": "Féminin",
   "femaleLabelText": "Féminin",
-  "fields": "des champs suivants",
   "filter": "Filtre",
   "filterByService": "Filter by service:",
   "filterByStatus": "Filter by status:",
   "filterTable": "Filter table",
-  "firstName": "Prénom",
-  "firstNameSort": "Prénom (a-z)",
-  "futureScheduledVisits_one": "{{count}} visites prévues à des dates ultérieures",
-  "futureScheduledVisits_other": "{{count}} visites prévues à des dates ultérieures",
   "gender": "Genre",
   "heartRate": "Fréquence cardiaque",
   "height": "Hauteur",
   "hourAndMinuteFormatted": " {{hours}} heure(s) et {{minutes}} minute(s)",
-  "idNumber": "ID Number",
   "indication": "Indication",
   "invalidQueue": "File d'attente non valide",
   "invalidtableConfig": "Configuration de table non valide",
   "lastEncounter": "Dernière rencontre",
-  "lastName": "Nom de famille",
-  "lastNameSort": "Nom de famille (a-z)",
-  "lastVisit": "Dernière visite",
-  "lastVisitDate": "Date",
   "loading": "Chargement...",
   "location": "Emplacement",
-  "male": "Masculin",
   "maleLabelText": "Masculin",
-  "match": "Match",
   "medications": "Médicaments",
-  "middleName": "Deuxième prénom",
   "minuteFormatted": "{{minutes}} minute(s)",
   "minutes": "Minutes",
   "missingLocation": "L'emplacement est manquant",
-  "missingPriority": "Veuillez sélectionner une priorité",
   "missingQueueName": "Nom de file d'attente manquant",
   "missingQueueRoom": "Veuillez sélectionner une salle de file d'attente",
   "missingQueueRoomName": "Nom de salle de file d'attente manquant",
   "missingQueueRoomService": "Service de salle de file d'attente manquant",
   "missingService": "Service manquant",
-  "missingVisitType": " Type de visite manquant",
   "modifyDefaultValue": "Modifier la valeur par défaut",
   "movePatientToNextService": "Déplacer le patient vers le service suivant?",
   "moveToNextService": "Déplacer vers le service suivant",
   "name": "Nom",
   "nextPage": "Page suivante",
-  "noActiveVisitsForLocation": "Il n'y a pas de visite en cours pour cet emplacement",
-  "noAppointmentsFound": "Aucun rendez-vous trouvé",
   "noColumnsDefined": "Aucune colonne de tableau définie. Vérifier la configuration",
   "noEncountersFound": "Aucune rencontre trouvée",
   "noLastEncounter": "Il n'y a pas de dernier rendez-vous à afficher pour ce patient",
   "noLocationsAvailable": "Aucun emplacement disponible",
   "noMedicationsFound": "Aucun médicament trouvé",
   "noNotesFound": "Aucune note trouvée",
-  "noPatientFoundMessage": "Désolé, aucun patient n'a été trouvé",
   "noPatientsToDisplay": "Aucun patient affiché",
   "noPreviousVisitFound": "Aucune visite précédente trouvée",
   "noPrioritiesConfigured": "Aucune priorité n'est configurée",
   "noPrioritiesForService": "Le service sélectionné n'a aucune priorité autorisée. Il s'agit d'une erreur de configuration. Veuillez contacter votre administrateur système.",
   "noPrioritiesForServiceTitle": "Aucunes priorités disponible",
   "noPriorityFound": " Aucune priorité trouvée",
-  "noResultsFound": "Aucun résultat trouvé",
   "noReturnDate": "There is no return date to display for this patient",
   "noServicesAvailable": "Aucun services disponibles",
   "noServicesConfigured": "Aucun service configuré",
   "noStatusConfigured": "No status configured",
   "notableConfig": "Aucune configuration de table",
   "notes": "Notes",
-  "noVisitsNotInQueueFound": "No visits currently not in queue found",
-  "noVisitTypesMatchingSearch": "Il n'y a pas de visite correspondante à cette recherche",
   "noVitalsFound": "Aucune donnée vitale n'a été trouvée",
-  "oldest": "Le plus ancien en premier",
   "onTime": "À temps",
-  "or": "ou",
   "orderDurationAndUnit": "Pour {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Durée indéfinie",
-  "orInProperFormat": "Ou",
-  "orPatientName": "OU le nom(s) du patient",
   "patientAge": "Âge",
-  "patientAlreadyInQueue": "Patient déjà dans la file d'attente",
   "patientAttendingService": "Patient en attente de service",
-  "patientHasActiveVisit": "Le patient a déjà une visite active",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Liste de patients",
   "patientName": "Nom du patient",
@@ -171,23 +128,17 @@
   "patientRequeued": "Le patient a été remis dans la file d'attente",
   "patients": "Les patients",
   "patientsCurrentlyInQueue": "Patients actuellement en file d'attente",
-  "personalDetails": "Détails personnels",
   "phoneNumber": "Numéro de téléphone",
   "pleaseSelectLocation": "Veuillez sélectionner un emplacement",
-  "pleaseSelectService": "Veuillez sélectionner un service",
-  "postCode": "Code postal",
   "previousPage": "Page précédente",
   "previousVisit": "Visite précédente",
-  "primaryHelperText": "Recherche d'un patient",
   "priority": "Priorité",
   "priorityComment": "Commentaire sur la priorité",
   "priorityIsRequired": "La priorité est requise",
-  "program": "Programme",
   "provider": "Prestataire",
   "quantity": "Quantité",
   "queueAddedSuccessfully": "File d'attente ajoutée avec succès",
   "queueEntryAddedSuccessfully": "Entrée dans la file d'attente ajoutée avec succès",
-  "queueEntryAddFailed": " Erreur lors de l'ajout du statut de la file d'attente ",
   "queueEntryDeleteFailed": "Erreur lors de la suppression de l'entrée de la file d'attente",
   "queueEntryDeleteSuccessful": "Entrée de la file d'attente supprimée avec succès ",
   "queueEntryEdited": "Entrée de la file d'attente affichée",
@@ -217,9 +168,6 @@
   "queueScreen": "Ecran de file d'attente",
   "queueService": "Service d'attente",
   "queueStatus": "Statut de la file d'attente",
-  "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
-  "recentScheduledVisits_other": "{{count}} visits scheduled for +/- 7 days",
-  "recommended": "Recommandée",
   "refills": "Recharges",
   "removeFromQueueAndEndVisit": "Retirer le patient de la file d'attente et mettre fin à la visite active",
   "removePatient": "Retirer le patient",
@@ -233,40 +181,24 @@
   "save": "Sauvegarder",
   "scheduledAppointmentsList": "Liste des patients avec un rendez-vous planifié",
   "scheduledToday": "Programmé(s) pour aujourd'hui",
-  "search": "Recherche",
-  "searchboxPlaceholder": "Rechercher un nom ou un numéro d'identification de patient",
-  "searchForAVisitType": "Recherche d'un type de visite",
-  "searchForPatient": "Recherche d'un patient",
-  "searchPatient": "Rechercher un patient",
   "searchThisList": "Rechercher dans cette liste",
-  "secondaryHelperText": "Tapez le nom ou le numéro d'identification unique du patient.",
   "selectALocation": "Sélectionnez un emplacement",
   "selectAVisitType": "Sélectionnez le type de visite",
-  "selectFacility": "Sélectionner un établissement",
-  "selectOption": "Sélectionner une option",
-  "selectProgramType": "Sélectionner le type de programme",
   "selectQueue": "Sélectionner une file d'attente",
   "selectQueueLocation": "Sélectionnez un emplacement de file d'attente",
   "selectQueueService": "Sélectionner un service de file d'attente",
   "selectRoom": "Selectionner une salle",
   "selectService": "Sélectionner un service",
   "selectServiceType": "Sélectionner un type de service",
-  "selectVisitType": "Veuillez sélectionner un type de visite",
   "serve": "Servir",
   "servePatient": "Servir le patient",
   "service": "Service",
   "serviceIsRequired": "Le service est requis",
   "serviceQueue": "File d'attente",
   "serviceQueues": "Files d'attente",
-  "sex": "Sexe",
-  "sortBy": "Trier par",
   "sortWeight": "Trier le poids",
   "sp02": "Sp02",
   "startAgeRangeInvalid": "La tranche d'âge de départ n'est pas valide",
-  "startAVisit": "Commencer une visite",
-  "startVisit": "Commencer une visite",
-  "startVisitError": "Erreur lors du démarrage de la visite",
-  "startVisitQueueSuccessfully": "Le patient a été ajouté à la liste des visites actives et à la file d'attente.",
   "status": "Statut",
   "statusIsRequired": "Le statut est requis",
   "submitting": "Envoi en cours...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "Sélectionnez un nouveau statut ou une file d'attente vers laquelle le patient doit être transféré.",
   "triageForm": "Formulaire de triage",
   "triageNote": "Note de triage",
-  "trySearchWithPatientUniqueID": "Essayez de faire une recherche avec le numéro d'identification unique du patient.",
   "undoQueueEntryTransitionSuccess": "Annuler la transition réussie",
   "undoTransition": "Annuler la transition",
   "unexpectedServerResponse": "Réponse du serveur inattendue",
@@ -295,14 +226,11 @@
   "updateRoom": "Mettre à jour la salle",
   "useTodaysDate": "Utiliser la date d'aujourd'hui",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid non configuré",
-  "visitStartTime": "Heure de la consultation",
   "visitTabs": "Onglets de visite",
   "visitType": "Type de Consultation",
   "vitals": "Signes Vitaux",
   "vitalsForm": "Formulaire de signes vitaux",
   "vitalsNotRecordedForVisit": "Les constantes pas encore enregistrées pour ce patient à cette visite",
   "waitingFor": "En attente de",
-  "weight": "Poids",
-  "years": "Années",
-  "youngest": "Le plus jeune en premier"
+  "weight": "Poids"
 }
diff --git a/packages/esm-service-queues-app/translations/he.json b/packages/esm-service-queues-app/translations/he.json
index 4ff9688da..927cf7e80 100644
--- a/packages/esm-service-queues-app/translations/he.json
+++ b/packages/esm-service-queues-app/translations/he.json
@@ -1,10 +1,7 @@
 {
   "actions": "פעולות",
-  "activeVisits": "ביקורים פעילים",
-  "activeVisitsNotInQueue": "ביקורים פעילים לא בתור",
   "addAProviderQueueRoom": "Add a provider queue room?",
-  "addEntry": "הוסף רשומה",
-  "addisitToQueueTooltip": "הוסף לתור",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "Add New Queue Service",
   "addNewQueueServiceRoom": "הוסף שירות חדר תור חדש",
   "addNewService": "הוסף שירות חדש",
@@ -17,20 +14,13 @@
   "addQueueRoomName": "אנא הוסף שם חדר תור",
   "addQueueRoomService": "אנא הוסף שירות חדר תור",
   "addRoom": "הוסף חדר",
-  "addToQueue": "הוסף לתור",
-  "addVisitToQueue": "הוסף ביקור לתור?",
-  "advancedSearch": "חיפוש מתקדם",
   "age": "גיל",
   "alistOfClients": "רשימת לקוחות מחכים ל",
   "all": "הכל",
   "and": "ו",
-  "anotherVisitType": "התחל סוג ביקור נוסף",
-  "any": "כל",
   "applyFilters": "Apply filters",
   "averageWaitTime": "זמן המתנה הממוצע היום",
-  "backToScheduledVisits": "חזור לביקורים מתוזמנים",
   "backToSearchResults": "Back to search results",
-  "backToSimpleSearch": "חזור לחיפוש פשוט",
   "between": "בין",
   "bmi": "מסדר גוף",
   "bp": "לחץ דם",
@@ -39,7 +29,6 @@
   "checkedInPatients": "מטופלים שנצפו",
   "checkFilters": "בדוק את הפילטרים לעיל",
   "chooseRoom": "בחר חדר",
-  "chooseService": "בחר שירות",
   "clearAllQueueEntries": "נקה את כל רשומות התור?",
   "clearAllQueueEntriesWarningMessage": "Clearing all queue entries will remove  all the patients from the queues",
   "clearQueue": "נקה תור",
@@ -55,8 +44,6 @@
   "currentVisit": "הביקור הנוכחי",
   "date": "תאריך",
   "date&Time": "תאריך ושעה",
-  "dateAndTimeOfVisit": "תאריך ושעת הביקור",
-  "dateOfBirth": "תאריך לידה",
   "delete": "Delete",
   "deleteQueueEntry": "Delete queue entry",
   "discard": "בטל",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "אירעה שגיאה בעת הוספת התור",
   "errorAddingQueueRoom": "שגיאה בהוספת חדר תור",
   "errorClearingQueues": "אירעה שגיאה בעת ניקוי התורים",
-  "errorFetchingAppointments": "Error fetching appointments",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "Error loading queue entries",
   "errorPostingToScreen": "שגיאה בפרסום למסך",
-  "facility": "מוסד",
-  "failedToLoadRecommendedVisitTypes": "Failed to load recommended visit types",
-  "female": "נקבה",
   "femaleLabelText": "נקבה",
-  "fields": "מהשדות הבאים",
   "filter": "סנן",
-  "filterByService": "Filter by service:",
-  "filterByStatus": "Filter by status:",
+  "filterByService": "סינון לפי שירות:",
+  "filterByStatus": "סינון לפי מצב:",
   "filterTable": "סנן טבלה",
-  "firstName": "שם פרטי",
-  "firstNameSort": "שם פרטי (א-ת)",
-  "futureScheduledVisits_one": "{{count}} ביקור מתוזמן לתאריכים בעתיד",
-  "futureScheduledVisits_other": "{{count}} ביקורים מתוזמנים לתאריכים בעתיד",
   "gender": "מגדר",
   "heartRate": "קצב לב",
   "height": "גובה",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
-  "idNumber": "מספר זיהוי",
   "indication": "סימון",
   "invalidQueue": "Invalid Queue",
   "invalidtableConfig": "Invalid table configuration",
   "lastEncounter": "הפגישה האחרונה",
-  "lastName": "שם משפחה",
-  "lastNameSort": "שם משפחה (א-ת)",
-  "lastVisit": "הביקור האחרון",
-  "lastVisitDate": "תאריך",
   "loading": "טוען...",
   "location": "Location",
-  "male": "זכר",
   "maleLabelText": "זכר",
-  "match": "התאמה",
   "medications": "תרופות",
-  "middleName": "שם פרטי שני",
   "minuteFormatted": "{{minutes}} minute(s)",
   "minutes": "דקות",
   "missingLocation": "מיקום חסר",
-  "missingPriority": "בחר עדיפות",
   "missingQueueName": "שם תור חסר",
   "missingQueueRoom": "בחר חדר תור",
   "missingQueueRoomName": "שם חדר תור חסר",
   "missingQueueRoomService": "שירות חדר תור חסר",
   "missingService": "Missing service",
-  "missingVisitType": "סוג הביקור חסר",
   "modifyDefaultValue": "Modify default value",
   "movePatientToNextService": "העבר את המטופל לשירות הבא?",
   "moveToNextService": "העבר לשירות הבא",
   "name": "שם",
   "nextPage": "Next page",
-  "noActiveVisitsForLocation": "אין ביקורים פעילים להצגה עבור מיקום זה.",
-  "noAppointmentsFound": "לא נמצאו תורים",
   "noColumnsDefined": "No table columns defined. Check Configuration",
   "noEncountersFound": "לא נמצאו פגישות",
   "noLastEncounter": "אין פגישה אחרונה להצגה עבור מטופל זה",
   "noLocationsAvailable": "אין מיקומים זמינים",
   "noMedicationsFound": "לא נמצאו תרופות",
   "noNotesFound": "לא נמצאו הערות",
-  "noPatientFoundMessage": "מצטערים, לא נמצא מטופל",
   "noPatientsToDisplay": "אין מטופלים להצגה",
   "noPreviousVisitFound": "לא נמצא ביקור קודם",
   "noPrioritiesConfigured": "לא הוגדרו עדיפויות",
   "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
   "noPrioritiesForServiceTitle": "No priorities available",
   "noPriorityFound": "לא נמצאה עדיפות",
-  "noResultsFound": "לא נמצאו תוצאות",
   "noReturnDate": "אין תאריך החזרה להצגה עבור מטופל זה",
   "noServicesAvailable": "אין שירותים זמינים",
   "noServicesConfigured": "אין שירותים מוגדרים",
   "noStatusConfigured": "אין מצבים מוגדרים",
   "notableConfig": "No table configuration",
   "notes": "הערות",
-  "noVisitsNotInQueueFound": "אין ביקורים שאינם בתור בהווה",
-  "noVisitTypesMatchingSearch": "There are no visit types matching this search text",
   "noVitalsFound": "לא נמצאו נתונים חיוניים",
-  "oldest": "הישן ביותר קודם",
   "onTime": "בזמן",
-  "or": "או",
   "orderDurationAndUnit": "למשך {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "משך לא מוגבל",
-  "orInProperFormat": "או",
-  "orPatientName": "או שמות המטופל",
   "patientAge": "Age",
-  "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "המטופל משתתף בשירות",
-  "patientHasActiveVisit": "למטופל כבר יש ביקור פעיל",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "רשימת המטופלים",
   "patientName": "שם המטופל",
@@ -171,23 +128,17 @@
   "patientRequeued": "המטופל הוסר מהתור מחדש",
   "patients": "מטופלים",
   "patientsCurrentlyInQueue": "מטופלים שנמצאים כעת בתור",
-  "personalDetails": "פרטים אישיים",
   "phoneNumber": "מספר טלפון",
   "pleaseSelectLocation": "בחר מיקום",
-  "pleaseSelectService": "בחר שירות",
-  "postCode": "מיקוד",
   "previousPage": "Previous page",
   "previousVisit": "ביקור קודם",
-  "primaryHelperText": "חפש מטופל",
   "priority": "עדיפות",
   "priorityComment": "Priority comment",
   "priorityIsRequired": "Priority is required",
-  "program": "תכנית",
   "provider": "ספק",
   "quantity": "כמות",
   "queueAddedSuccessfully": "Queue added successfully",
   "queueEntryAddedSuccessfully": "Queue entry added successfully",
-  "queueEntryAddFailed": "שגיאה בהוספת סטטוס רשומת תור",
   "queueEntryDeleteFailed": "Error deleting queue entry",
   "queueEntryDeleteSuccessful": "Queue entry deleted successfully",
   "queueEntryEdited": "Queue entry edited",
@@ -217,9 +168,6 @@
   "queueScreen": "מסך התור",
   "queueService": "שירות התור",
   "queueStatus": "מצב התור",
-  "recentScheduledVisits_one": "{{count}} ביקור מתוזמן ל+/- 7 ימים",
-  "recentScheduledVisits_other": "{{count}} ביקורים מתוזמנים ל+/- 7 ימים",
-  "recommended": "מומלץ",
   "refills": "חידושים",
   "removeFromQueueAndEndVisit": "הסר מטופל מהתור וסיים ביקור פעיל",
   "removePatient": "Remove patient",
@@ -233,40 +181,24 @@
   "save": "שמירה",
   "scheduledAppointmentsList": "רשימת מטופלים עם תורים מתוזמנים",
   "scheduledToday": "מתוזמן להיום",
-  "search": "חיפוש",
-  "searchboxPlaceholder": "חפש לפי שם מטופל או מספר זיהוי יחודי",
-  "searchForAVisitType": "חיפוש לפי סוג ביקור",
-  "searchForPatient": "חיפוש לפי מטופל",
-  "searchPatient": "Search Patient",
   "searchThisList": "חיפוש ברשימה זו",
-  "secondaryHelperText": "הקלד את שם המטופל או מספר הזיהוי הייחודי",
   "selectALocation": "Select a location",
   "selectAVisitType": "בחר סוג ביקור",
-  "selectFacility": "בחר מתקן",
-  "selectOption": "בחר אפשרות",
-  "selectProgramType": "בחר סוג תכנית",
   "selectQueue": "Select a queue",
   "selectQueueLocation": "בחר מיקום התור",
   "selectQueueService": "בחר שירות התור",
   "selectRoom": "בחר חדר",
   "selectService": "בחר שירות",
   "selectServiceType": "בחר סוג שירות",
-  "selectVisitType": "בחר סוג ביקור",
   "serve": "שרת",
   "servePatient": "שרת מטופל",
   "service": "שירות",
   "serviceIsRequired": "Service is required",
   "serviceQueue": "תור השירות",
   "serviceQueues": "תורי השירות",
-  "sex": "מגדר",
-  "sortBy": "מיין לפי",
   "sortWeight": "מיון לפי חוזק",
   "sp02": "רמת חמצן",
   "startAgeRangeInvalid": "טווח הגיל ההתחלתי אינו חוקי",
-  "startAVisit": "התחל ביקור",
-  "startVisit": "התחל ביקור",
-  "startVisitError": "שגיאה בהתחלת הביקור",
-  "startVisitQueueSuccessfully": "המטופל הוסף לרשימת הביקורים הפעילים ולתור בהצלחה",
   "status": "מצב",
   "statusIsRequired": "Status is required",
   "submitting": "Submitting...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "טופס טריאז'",
   "triageNote": "הערת טריאז'",
-  "trySearchWithPatientUniqueID": "נסה לחפש לפי מספר זיהוי יחודי של המטופל",
   "undoQueueEntryTransitionSuccess": "Undo transition success",
   "undoTransition": "Undo transition",
   "unexpectedServerResponse": "Unexpected Server Response",
@@ -295,14 +226,11 @@
   "updateRoom": "עדכון חדר",
   "useTodaysDate": "השתמש בתאריך היום",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
-  "visitStartTime": "זמן התחלת הביקור",
   "visitTabs": "Visit tabs",
   "visitType": "סוג הביקור",
   "vitals": "מדדים בסיסיים",
   "vitalsForm": "טופס מדדים בסיסיים",
   "vitalsNotRecordedForVisit": "מדדים בסיסיים לא נרשמו עבור המטופל לביקור זה",
   "waitingFor": "ממתין ל",
-  "weight": "משקל",
-  "years": "שנים",
-  "youngest": "הצעיר ביותר תחילה"
+  "weight": "משקל"
 }
diff --git a/packages/esm-service-queues-app/translations/hi.json b/packages/esm-service-queues-app/translations/hi.json
index c93179b3a..918d1b4ea 100644
--- a/packages/esm-service-queues-app/translations/hi.json
+++ b/packages/esm-service-queues-app/translations/hi.json
@@ -1,10 +1,7 @@
 {
   "actions": "Actions",
-  "activeVisits": "Active Visits",
-  "activeVisitsNotInQueue": "Active visits not in queue",
   "addAProviderQueueRoom": "Add a provider queue room?",
-  "addEntry": "Add entry",
-  "addisitToQueueTooltip": "Add",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "Add New Queue Service",
   "addNewQueueServiceRoom": "Add new queue service room",
   "addNewService": "Add new service",
@@ -17,20 +14,13 @@
   "addQueueRoomName": "Please add a queue room name",
   "addQueueRoomService": "Please add a queue room service",
   "addRoom": "Add room",
-  "addToQueue": "Add to queue",
-  "addVisitToQueue": "Add Visit To Queue?",
-  "advancedSearch": "Advanced search",
   "age": "Age",
   "alistOfClients": "A list of clients waiting for ",
   "all": "All",
   "and": "And",
-  "anotherVisitType": "Start another visit type",
-  "any": "Any",
   "applyFilters": "Apply filters",
   "averageWaitTime": "Average wait time today",
-  "backToScheduledVisits": "Back To Scheduled Visits",
   "backToSearchResults": "Back to search results",
-  "backToSimpleSearch": "Back to simple search",
   "between": "Between",
   "bmi": "Bmi",
   "bp": "Bp",
@@ -39,7 +29,6 @@
   "checkedInPatients": "Checked in patients",
   "checkFilters": "Check the filters above",
   "chooseRoom": "Select a room",
-  "chooseService": "Select a service",
   "clearAllQueueEntries": "Clear all queue entries?",
   "clearAllQueueEntriesWarningMessage": "Clearing all queue entries will remove  all the patients from the queues",
   "clearQueue": "Clear queue",
@@ -55,8 +44,6 @@
   "currentVisit": "Current visit",
   "date": "Date",
   "date&Time": "Date & time",
-  "dateAndTimeOfVisit": "Date and time of visit",
-  "dateOfBirth": "Date of birth",
   "delete": "Delete",
   "deleteQueueEntry": "Delete queue entry",
   "discard": "Discard",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "Error adding queue",
   "errorAddingQueueRoom": "Error adding queue room",
   "errorClearingQueues": "Error clearing queues",
-  "errorFetchingAppointments": "Error fetching appointments",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "Error loading queue entries",
   "errorPostingToScreen": "Error posting to screen",
-  "facility": "Facility",
-  "failedToLoadRecommendedVisitTypes": "Failed to load recommended visit types",
-  "female": "Female",
   "femaleLabelText": "Female",
-  "fields": "of the following fields",
   "filter": "Filter",
   "filterByService": "Filter by service:",
   "filterByStatus": "Filter by status:",
   "filterTable": "Filter table",
-  "firstName": "First name",
-  "firstNameSort": "First name (a-z)",
-  "futureScheduledVisits_one": "{{count}} visit scheduled for dates in the future",
-  "futureScheduledVisits_other": "{{count}} visits scheduled for dates in the future",
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
-  "idNumber": "ID Number",
   "indication": "Indication",
   "invalidQueue": "Invalid Queue",
   "invalidtableConfig": "Invalid table configuration",
   "lastEncounter": "Last encounter",
-  "lastName": "Last name",
-  "lastNameSort": "Last name (a-z)",
-  "lastVisit": "Last Visit",
-  "lastVisitDate": "Date",
   "loading": "Loading...",
   "location": "Location",
-  "male": "Male",
   "maleLabelText": "Male",
-  "match": "Match",
   "medications": "Medications",
-  "middleName": "Middle name",
   "minuteFormatted": "{{minutes}} minute(s)",
   "minutes": "Minutes",
   "missingLocation": "Missing location",
-  "missingPriority": "Please select a priority",
   "missingQueueName": "Missing queue name",
   "missingQueueRoom": "Please select a queue room",
   "missingQueueRoomName": "Missing queue room name",
   "missingQueueRoomService": "Missing queue room service",
   "missingService": "Missing service",
-  "missingVisitType": "Missing visit type",
   "modifyDefaultValue": "Modify default value",
   "movePatientToNextService": "Move patient to the next service?",
   "moveToNextService": "Move to next service",
   "name": "Name",
   "nextPage": "Next page",
-  "noActiveVisitsForLocation": "There are no active visits to display for this location.",
-  "noAppointmentsFound": "No appointments found",
   "noColumnsDefined": "No table columns defined. Check Configuration",
   "noEncountersFound": "No encounters found",
   "noLastEncounter": "There is no last encounter to display for this patient",
   "noLocationsAvailable": "No locations available",
   "noMedicationsFound": "No medications found",
   "noNotesFound": "No notes found",
-  "noPatientFoundMessage": "Sorry, no patient has been found",
   "noPatientsToDisplay": "No patients to display",
   "noPreviousVisitFound": "No previous visit found",
   "noPrioritiesConfigured": "No priorities configured",
   "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
   "noPrioritiesForServiceTitle": "No priorities available",
   "noPriorityFound": "No priority found",
-  "noResultsFound": "No results found",
   "noReturnDate": "There is no return date to display for this patient",
   "noServicesAvailable": "No services available",
   "noServicesConfigured": "No services configured",
   "noStatusConfigured": "No status configured",
   "notableConfig": "No table configuration",
   "notes": "Notes",
-  "noVisitsNotInQueueFound": "No visits currently not in queue found",
-  "noVisitTypesMatchingSearch": "There are no visit types matching this search text",
   "noVitalsFound": "No vitals found",
-  "oldest": "Oldest first",
   "onTime": "On time",
-  "or": "or",
   "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Indefinite duration",
-  "orInProperFormat": "Or",
-  "orPatientName": "OR the patient's name(s)",
   "patientAge": "Age",
-  "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
-  "patientHasActiveVisit": "The patient already has an active visit",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
@@ -171,23 +128,17 @@
   "patientRequeued": "Patient has been requeued",
   "patients": "Patients",
   "patientsCurrentlyInQueue": "Patients currently in queue",
-  "personalDetails": "Personal Details",
   "phoneNumber": "Phone number",
   "pleaseSelectLocation": "Please select a location",
-  "pleaseSelectService": "Please select a service",
-  "postCode": "Post code",
   "previousPage": "Previous page",
   "previousVisit": "Previous visit",
-  "primaryHelperText": "Search for a patient",
   "priority": "Priority",
   "priorityComment": "Priority comment",
   "priorityIsRequired": "Priority is required",
-  "program": "Program",
   "provider": "Provider",
   "quantity": "Quantity",
   "queueAddedSuccessfully": "Queue added successfully",
   "queueEntryAddedSuccessfully": "Queue entry added successfully",
-  "queueEntryAddFailed": "Error adding queue entry status",
   "queueEntryDeleteFailed": "Error deleting queue entry",
   "queueEntryDeleteSuccessful": "Queue entry deleted successfully",
   "queueEntryEdited": "Queue entry edited",
@@ -217,9 +168,6 @@
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
-  "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
-  "recentScheduledVisits_other": "{{count}} visits scheduled for +/- 7 days",
-  "recommended": "Recommended",
   "refills": "Refills",
   "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit",
   "removePatient": "Remove patient",
@@ -233,40 +181,24 @@
   "save": "Save",
   "scheduledAppointmentsList": "Scheduled appointments patient list",
   "scheduledToday": "Scheduled for today",
-  "search": "Search",
-  "searchboxPlaceholder": "Search for a patient name or ID number",
-  "searchForAVisitType": "Search for a visit type",
-  "searchForPatient": "Search for a patient",
-  "searchPatient": "Search Patient",
   "searchThisList": "Search this list",
-  "secondaryHelperText": "Type the patient's name or unique ID number",
   "selectALocation": "Select a location",
   "selectAVisitType": "Select visit type",
-  "selectFacility": "Select a facility",
-  "selectOption": "Select an option",
-  "selectProgramType": "Select program type",
   "selectQueue": "Select a queue",
   "selectQueueLocation": "Select a queue location",
   "selectQueueService": "Select a queue service",
   "selectRoom": "Select a room",
   "selectService": "Select a service",
   "selectServiceType": "Select a service type",
-  "selectVisitType": "Please select a Visit Type",
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
   "serviceIsRequired": "Service is required",
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
-  "sex": "Sex",
-  "sortBy": "Sort by",
   "sortWeight": "Sort weight",
   "sp02": "Sp02",
   "startAgeRangeInvalid": "Start age range is not valid",
-  "startAVisit": "Start a visit",
-  "startVisit": "Start visit",
-  "startVisitError": "Error starting visit",
-  "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
   "status": "Status",
   "statusIsRequired": "Status is required",
   "submitting": "Submitting...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "Triage form",
   "triageNote": "Triage note",
-  "trySearchWithPatientUniqueID": "Try searching with the patient's unique ID number",
   "undoQueueEntryTransitionSuccess": "Undo transition success",
   "undoTransition": "Undo transition",
   "unexpectedServerResponse": "Unexpected Server Response",
@@ -295,14 +226,11 @@
   "updateRoom": "Update room",
   "useTodaysDate": "Use today's date",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
-  "visitStartTime": "Visit Time",
   "visitTabs": "Visit tabs",
   "visitType": "Visit Type",
   "vitals": "Vitals",
   "vitalsForm": "Vitals form",
   "vitalsNotRecordedForVisit": "Vitals has not been recorded for this patient for this visit",
   "waitingFor": "Waiting for",
-  "weight": "Weight",
-  "years": "Years",
-  "youngest": "Youngest first"
+  "weight": "Weight"
 }
diff --git a/packages/esm-service-queues-app/translations/hi_IN.json b/packages/esm-service-queues-app/translations/hi_IN.json
index c93179b3a..918d1b4ea 100644
--- a/packages/esm-service-queues-app/translations/hi_IN.json
+++ b/packages/esm-service-queues-app/translations/hi_IN.json
@@ -1,10 +1,7 @@
 {
   "actions": "Actions",
-  "activeVisits": "Active Visits",
-  "activeVisitsNotInQueue": "Active visits not in queue",
   "addAProviderQueueRoom": "Add a provider queue room?",
-  "addEntry": "Add entry",
-  "addisitToQueueTooltip": "Add",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "Add New Queue Service",
   "addNewQueueServiceRoom": "Add new queue service room",
   "addNewService": "Add new service",
@@ -17,20 +14,13 @@
   "addQueueRoomName": "Please add a queue room name",
   "addQueueRoomService": "Please add a queue room service",
   "addRoom": "Add room",
-  "addToQueue": "Add to queue",
-  "addVisitToQueue": "Add Visit To Queue?",
-  "advancedSearch": "Advanced search",
   "age": "Age",
   "alistOfClients": "A list of clients waiting for ",
   "all": "All",
   "and": "And",
-  "anotherVisitType": "Start another visit type",
-  "any": "Any",
   "applyFilters": "Apply filters",
   "averageWaitTime": "Average wait time today",
-  "backToScheduledVisits": "Back To Scheduled Visits",
   "backToSearchResults": "Back to search results",
-  "backToSimpleSearch": "Back to simple search",
   "between": "Between",
   "bmi": "Bmi",
   "bp": "Bp",
@@ -39,7 +29,6 @@
   "checkedInPatients": "Checked in patients",
   "checkFilters": "Check the filters above",
   "chooseRoom": "Select a room",
-  "chooseService": "Select a service",
   "clearAllQueueEntries": "Clear all queue entries?",
   "clearAllQueueEntriesWarningMessage": "Clearing all queue entries will remove  all the patients from the queues",
   "clearQueue": "Clear queue",
@@ -55,8 +44,6 @@
   "currentVisit": "Current visit",
   "date": "Date",
   "date&Time": "Date & time",
-  "dateAndTimeOfVisit": "Date and time of visit",
-  "dateOfBirth": "Date of birth",
   "delete": "Delete",
   "deleteQueueEntry": "Delete queue entry",
   "discard": "Discard",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "Error adding queue",
   "errorAddingQueueRoom": "Error adding queue room",
   "errorClearingQueues": "Error clearing queues",
-  "errorFetchingAppointments": "Error fetching appointments",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "Error loading queue entries",
   "errorPostingToScreen": "Error posting to screen",
-  "facility": "Facility",
-  "failedToLoadRecommendedVisitTypes": "Failed to load recommended visit types",
-  "female": "Female",
   "femaleLabelText": "Female",
-  "fields": "of the following fields",
   "filter": "Filter",
   "filterByService": "Filter by service:",
   "filterByStatus": "Filter by status:",
   "filterTable": "Filter table",
-  "firstName": "First name",
-  "firstNameSort": "First name (a-z)",
-  "futureScheduledVisits_one": "{{count}} visit scheduled for dates in the future",
-  "futureScheduledVisits_other": "{{count}} visits scheduled for dates in the future",
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
-  "idNumber": "ID Number",
   "indication": "Indication",
   "invalidQueue": "Invalid Queue",
   "invalidtableConfig": "Invalid table configuration",
   "lastEncounter": "Last encounter",
-  "lastName": "Last name",
-  "lastNameSort": "Last name (a-z)",
-  "lastVisit": "Last Visit",
-  "lastVisitDate": "Date",
   "loading": "Loading...",
   "location": "Location",
-  "male": "Male",
   "maleLabelText": "Male",
-  "match": "Match",
   "medications": "Medications",
-  "middleName": "Middle name",
   "minuteFormatted": "{{minutes}} minute(s)",
   "minutes": "Minutes",
   "missingLocation": "Missing location",
-  "missingPriority": "Please select a priority",
   "missingQueueName": "Missing queue name",
   "missingQueueRoom": "Please select a queue room",
   "missingQueueRoomName": "Missing queue room name",
   "missingQueueRoomService": "Missing queue room service",
   "missingService": "Missing service",
-  "missingVisitType": "Missing visit type",
   "modifyDefaultValue": "Modify default value",
   "movePatientToNextService": "Move patient to the next service?",
   "moveToNextService": "Move to next service",
   "name": "Name",
   "nextPage": "Next page",
-  "noActiveVisitsForLocation": "There are no active visits to display for this location.",
-  "noAppointmentsFound": "No appointments found",
   "noColumnsDefined": "No table columns defined. Check Configuration",
   "noEncountersFound": "No encounters found",
   "noLastEncounter": "There is no last encounter to display for this patient",
   "noLocationsAvailable": "No locations available",
   "noMedicationsFound": "No medications found",
   "noNotesFound": "No notes found",
-  "noPatientFoundMessage": "Sorry, no patient has been found",
   "noPatientsToDisplay": "No patients to display",
   "noPreviousVisitFound": "No previous visit found",
   "noPrioritiesConfigured": "No priorities configured",
   "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
   "noPrioritiesForServiceTitle": "No priorities available",
   "noPriorityFound": "No priority found",
-  "noResultsFound": "No results found",
   "noReturnDate": "There is no return date to display for this patient",
   "noServicesAvailable": "No services available",
   "noServicesConfigured": "No services configured",
   "noStatusConfigured": "No status configured",
   "notableConfig": "No table configuration",
   "notes": "Notes",
-  "noVisitsNotInQueueFound": "No visits currently not in queue found",
-  "noVisitTypesMatchingSearch": "There are no visit types matching this search text",
   "noVitalsFound": "No vitals found",
-  "oldest": "Oldest first",
   "onTime": "On time",
-  "or": "or",
   "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Indefinite duration",
-  "orInProperFormat": "Or",
-  "orPatientName": "OR the patient's name(s)",
   "patientAge": "Age",
-  "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
-  "patientHasActiveVisit": "The patient already has an active visit",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
@@ -171,23 +128,17 @@
   "patientRequeued": "Patient has been requeued",
   "patients": "Patients",
   "patientsCurrentlyInQueue": "Patients currently in queue",
-  "personalDetails": "Personal Details",
   "phoneNumber": "Phone number",
   "pleaseSelectLocation": "Please select a location",
-  "pleaseSelectService": "Please select a service",
-  "postCode": "Post code",
   "previousPage": "Previous page",
   "previousVisit": "Previous visit",
-  "primaryHelperText": "Search for a patient",
   "priority": "Priority",
   "priorityComment": "Priority comment",
   "priorityIsRequired": "Priority is required",
-  "program": "Program",
   "provider": "Provider",
   "quantity": "Quantity",
   "queueAddedSuccessfully": "Queue added successfully",
   "queueEntryAddedSuccessfully": "Queue entry added successfully",
-  "queueEntryAddFailed": "Error adding queue entry status",
   "queueEntryDeleteFailed": "Error deleting queue entry",
   "queueEntryDeleteSuccessful": "Queue entry deleted successfully",
   "queueEntryEdited": "Queue entry edited",
@@ -217,9 +168,6 @@
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
-  "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
-  "recentScheduledVisits_other": "{{count}} visits scheduled for +/- 7 days",
-  "recommended": "Recommended",
   "refills": "Refills",
   "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit",
   "removePatient": "Remove patient",
@@ -233,40 +181,24 @@
   "save": "Save",
   "scheduledAppointmentsList": "Scheduled appointments patient list",
   "scheduledToday": "Scheduled for today",
-  "search": "Search",
-  "searchboxPlaceholder": "Search for a patient name or ID number",
-  "searchForAVisitType": "Search for a visit type",
-  "searchForPatient": "Search for a patient",
-  "searchPatient": "Search Patient",
   "searchThisList": "Search this list",
-  "secondaryHelperText": "Type the patient's name or unique ID number",
   "selectALocation": "Select a location",
   "selectAVisitType": "Select visit type",
-  "selectFacility": "Select a facility",
-  "selectOption": "Select an option",
-  "selectProgramType": "Select program type",
   "selectQueue": "Select a queue",
   "selectQueueLocation": "Select a queue location",
   "selectQueueService": "Select a queue service",
   "selectRoom": "Select a room",
   "selectService": "Select a service",
   "selectServiceType": "Select a service type",
-  "selectVisitType": "Please select a Visit Type",
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
   "serviceIsRequired": "Service is required",
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
-  "sex": "Sex",
-  "sortBy": "Sort by",
   "sortWeight": "Sort weight",
   "sp02": "Sp02",
   "startAgeRangeInvalid": "Start age range is not valid",
-  "startAVisit": "Start a visit",
-  "startVisit": "Start visit",
-  "startVisitError": "Error starting visit",
-  "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
   "status": "Status",
   "statusIsRequired": "Status is required",
   "submitting": "Submitting...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "Triage form",
   "triageNote": "Triage note",
-  "trySearchWithPatientUniqueID": "Try searching with the patient's unique ID number",
   "undoQueueEntryTransitionSuccess": "Undo transition success",
   "undoTransition": "Undo transition",
   "unexpectedServerResponse": "Unexpected Server Response",
@@ -295,14 +226,11 @@
   "updateRoom": "Update room",
   "useTodaysDate": "Use today's date",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
-  "visitStartTime": "Visit Time",
   "visitTabs": "Visit tabs",
   "visitType": "Visit Type",
   "vitals": "Vitals",
   "vitalsForm": "Vitals form",
   "vitalsNotRecordedForVisit": "Vitals has not been recorded for this patient for this visit",
   "waitingFor": "Waiting for",
-  "weight": "Weight",
-  "years": "Years",
-  "youngest": "Youngest first"
+  "weight": "Weight"
 }
diff --git a/packages/esm-service-queues-app/translations/id.json b/packages/esm-service-queues-app/translations/id.json
index c93179b3a..918d1b4ea 100644
--- a/packages/esm-service-queues-app/translations/id.json
+++ b/packages/esm-service-queues-app/translations/id.json
@@ -1,10 +1,7 @@
 {
   "actions": "Actions",
-  "activeVisits": "Active Visits",
-  "activeVisitsNotInQueue": "Active visits not in queue",
   "addAProviderQueueRoom": "Add a provider queue room?",
-  "addEntry": "Add entry",
-  "addisitToQueueTooltip": "Add",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "Add New Queue Service",
   "addNewQueueServiceRoom": "Add new queue service room",
   "addNewService": "Add new service",
@@ -17,20 +14,13 @@
   "addQueueRoomName": "Please add a queue room name",
   "addQueueRoomService": "Please add a queue room service",
   "addRoom": "Add room",
-  "addToQueue": "Add to queue",
-  "addVisitToQueue": "Add Visit To Queue?",
-  "advancedSearch": "Advanced search",
   "age": "Age",
   "alistOfClients": "A list of clients waiting for ",
   "all": "All",
   "and": "And",
-  "anotherVisitType": "Start another visit type",
-  "any": "Any",
   "applyFilters": "Apply filters",
   "averageWaitTime": "Average wait time today",
-  "backToScheduledVisits": "Back To Scheduled Visits",
   "backToSearchResults": "Back to search results",
-  "backToSimpleSearch": "Back to simple search",
   "between": "Between",
   "bmi": "Bmi",
   "bp": "Bp",
@@ -39,7 +29,6 @@
   "checkedInPatients": "Checked in patients",
   "checkFilters": "Check the filters above",
   "chooseRoom": "Select a room",
-  "chooseService": "Select a service",
   "clearAllQueueEntries": "Clear all queue entries?",
   "clearAllQueueEntriesWarningMessage": "Clearing all queue entries will remove  all the patients from the queues",
   "clearQueue": "Clear queue",
@@ -55,8 +44,6 @@
   "currentVisit": "Current visit",
   "date": "Date",
   "date&Time": "Date & time",
-  "dateAndTimeOfVisit": "Date and time of visit",
-  "dateOfBirth": "Date of birth",
   "delete": "Delete",
   "deleteQueueEntry": "Delete queue entry",
   "discard": "Discard",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "Error adding queue",
   "errorAddingQueueRoom": "Error adding queue room",
   "errorClearingQueues": "Error clearing queues",
-  "errorFetchingAppointments": "Error fetching appointments",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "Error loading queue entries",
   "errorPostingToScreen": "Error posting to screen",
-  "facility": "Facility",
-  "failedToLoadRecommendedVisitTypes": "Failed to load recommended visit types",
-  "female": "Female",
   "femaleLabelText": "Female",
-  "fields": "of the following fields",
   "filter": "Filter",
   "filterByService": "Filter by service:",
   "filterByStatus": "Filter by status:",
   "filterTable": "Filter table",
-  "firstName": "First name",
-  "firstNameSort": "First name (a-z)",
-  "futureScheduledVisits_one": "{{count}} visit scheduled for dates in the future",
-  "futureScheduledVisits_other": "{{count}} visits scheduled for dates in the future",
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
-  "idNumber": "ID Number",
   "indication": "Indication",
   "invalidQueue": "Invalid Queue",
   "invalidtableConfig": "Invalid table configuration",
   "lastEncounter": "Last encounter",
-  "lastName": "Last name",
-  "lastNameSort": "Last name (a-z)",
-  "lastVisit": "Last Visit",
-  "lastVisitDate": "Date",
   "loading": "Loading...",
   "location": "Location",
-  "male": "Male",
   "maleLabelText": "Male",
-  "match": "Match",
   "medications": "Medications",
-  "middleName": "Middle name",
   "minuteFormatted": "{{minutes}} minute(s)",
   "minutes": "Minutes",
   "missingLocation": "Missing location",
-  "missingPriority": "Please select a priority",
   "missingQueueName": "Missing queue name",
   "missingQueueRoom": "Please select a queue room",
   "missingQueueRoomName": "Missing queue room name",
   "missingQueueRoomService": "Missing queue room service",
   "missingService": "Missing service",
-  "missingVisitType": "Missing visit type",
   "modifyDefaultValue": "Modify default value",
   "movePatientToNextService": "Move patient to the next service?",
   "moveToNextService": "Move to next service",
   "name": "Name",
   "nextPage": "Next page",
-  "noActiveVisitsForLocation": "There are no active visits to display for this location.",
-  "noAppointmentsFound": "No appointments found",
   "noColumnsDefined": "No table columns defined. Check Configuration",
   "noEncountersFound": "No encounters found",
   "noLastEncounter": "There is no last encounter to display for this patient",
   "noLocationsAvailable": "No locations available",
   "noMedicationsFound": "No medications found",
   "noNotesFound": "No notes found",
-  "noPatientFoundMessage": "Sorry, no patient has been found",
   "noPatientsToDisplay": "No patients to display",
   "noPreviousVisitFound": "No previous visit found",
   "noPrioritiesConfigured": "No priorities configured",
   "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
   "noPrioritiesForServiceTitle": "No priorities available",
   "noPriorityFound": "No priority found",
-  "noResultsFound": "No results found",
   "noReturnDate": "There is no return date to display for this patient",
   "noServicesAvailable": "No services available",
   "noServicesConfigured": "No services configured",
   "noStatusConfigured": "No status configured",
   "notableConfig": "No table configuration",
   "notes": "Notes",
-  "noVisitsNotInQueueFound": "No visits currently not in queue found",
-  "noVisitTypesMatchingSearch": "There are no visit types matching this search text",
   "noVitalsFound": "No vitals found",
-  "oldest": "Oldest first",
   "onTime": "On time",
-  "or": "or",
   "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Indefinite duration",
-  "orInProperFormat": "Or",
-  "orPatientName": "OR the patient's name(s)",
   "patientAge": "Age",
-  "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
-  "patientHasActiveVisit": "The patient already has an active visit",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
@@ -171,23 +128,17 @@
   "patientRequeued": "Patient has been requeued",
   "patients": "Patients",
   "patientsCurrentlyInQueue": "Patients currently in queue",
-  "personalDetails": "Personal Details",
   "phoneNumber": "Phone number",
   "pleaseSelectLocation": "Please select a location",
-  "pleaseSelectService": "Please select a service",
-  "postCode": "Post code",
   "previousPage": "Previous page",
   "previousVisit": "Previous visit",
-  "primaryHelperText": "Search for a patient",
   "priority": "Priority",
   "priorityComment": "Priority comment",
   "priorityIsRequired": "Priority is required",
-  "program": "Program",
   "provider": "Provider",
   "quantity": "Quantity",
   "queueAddedSuccessfully": "Queue added successfully",
   "queueEntryAddedSuccessfully": "Queue entry added successfully",
-  "queueEntryAddFailed": "Error adding queue entry status",
   "queueEntryDeleteFailed": "Error deleting queue entry",
   "queueEntryDeleteSuccessful": "Queue entry deleted successfully",
   "queueEntryEdited": "Queue entry edited",
@@ -217,9 +168,6 @@
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
-  "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
-  "recentScheduledVisits_other": "{{count}} visits scheduled for +/- 7 days",
-  "recommended": "Recommended",
   "refills": "Refills",
   "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit",
   "removePatient": "Remove patient",
@@ -233,40 +181,24 @@
   "save": "Save",
   "scheduledAppointmentsList": "Scheduled appointments patient list",
   "scheduledToday": "Scheduled for today",
-  "search": "Search",
-  "searchboxPlaceholder": "Search for a patient name or ID number",
-  "searchForAVisitType": "Search for a visit type",
-  "searchForPatient": "Search for a patient",
-  "searchPatient": "Search Patient",
   "searchThisList": "Search this list",
-  "secondaryHelperText": "Type the patient's name or unique ID number",
   "selectALocation": "Select a location",
   "selectAVisitType": "Select visit type",
-  "selectFacility": "Select a facility",
-  "selectOption": "Select an option",
-  "selectProgramType": "Select program type",
   "selectQueue": "Select a queue",
   "selectQueueLocation": "Select a queue location",
   "selectQueueService": "Select a queue service",
   "selectRoom": "Select a room",
   "selectService": "Select a service",
   "selectServiceType": "Select a service type",
-  "selectVisitType": "Please select a Visit Type",
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
   "serviceIsRequired": "Service is required",
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
-  "sex": "Sex",
-  "sortBy": "Sort by",
   "sortWeight": "Sort weight",
   "sp02": "Sp02",
   "startAgeRangeInvalid": "Start age range is not valid",
-  "startAVisit": "Start a visit",
-  "startVisit": "Start visit",
-  "startVisitError": "Error starting visit",
-  "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
   "status": "Status",
   "statusIsRequired": "Status is required",
   "submitting": "Submitting...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "Triage form",
   "triageNote": "Triage note",
-  "trySearchWithPatientUniqueID": "Try searching with the patient's unique ID number",
   "undoQueueEntryTransitionSuccess": "Undo transition success",
   "undoTransition": "Undo transition",
   "unexpectedServerResponse": "Unexpected Server Response",
@@ -295,14 +226,11 @@
   "updateRoom": "Update room",
   "useTodaysDate": "Use today's date",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
-  "visitStartTime": "Visit Time",
   "visitTabs": "Visit tabs",
   "visitType": "Visit Type",
   "vitals": "Vitals",
   "vitalsForm": "Vitals form",
   "vitalsNotRecordedForVisit": "Vitals has not been recorded for this patient for this visit",
   "waitingFor": "Waiting for",
-  "weight": "Weight",
-  "years": "Years",
-  "youngest": "Youngest first"
+  "weight": "Weight"
 }
diff --git a/packages/esm-service-queues-app/translations/it.json b/packages/esm-service-queues-app/translations/it.json
index c93179b3a..918d1b4ea 100644
--- a/packages/esm-service-queues-app/translations/it.json
+++ b/packages/esm-service-queues-app/translations/it.json
@@ -1,10 +1,7 @@
 {
   "actions": "Actions",
-  "activeVisits": "Active Visits",
-  "activeVisitsNotInQueue": "Active visits not in queue",
   "addAProviderQueueRoom": "Add a provider queue room?",
-  "addEntry": "Add entry",
-  "addisitToQueueTooltip": "Add",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "Add New Queue Service",
   "addNewQueueServiceRoom": "Add new queue service room",
   "addNewService": "Add new service",
@@ -17,20 +14,13 @@
   "addQueueRoomName": "Please add a queue room name",
   "addQueueRoomService": "Please add a queue room service",
   "addRoom": "Add room",
-  "addToQueue": "Add to queue",
-  "addVisitToQueue": "Add Visit To Queue?",
-  "advancedSearch": "Advanced search",
   "age": "Age",
   "alistOfClients": "A list of clients waiting for ",
   "all": "All",
   "and": "And",
-  "anotherVisitType": "Start another visit type",
-  "any": "Any",
   "applyFilters": "Apply filters",
   "averageWaitTime": "Average wait time today",
-  "backToScheduledVisits": "Back To Scheduled Visits",
   "backToSearchResults": "Back to search results",
-  "backToSimpleSearch": "Back to simple search",
   "between": "Between",
   "bmi": "Bmi",
   "bp": "Bp",
@@ -39,7 +29,6 @@
   "checkedInPatients": "Checked in patients",
   "checkFilters": "Check the filters above",
   "chooseRoom": "Select a room",
-  "chooseService": "Select a service",
   "clearAllQueueEntries": "Clear all queue entries?",
   "clearAllQueueEntriesWarningMessage": "Clearing all queue entries will remove  all the patients from the queues",
   "clearQueue": "Clear queue",
@@ -55,8 +44,6 @@
   "currentVisit": "Current visit",
   "date": "Date",
   "date&Time": "Date & time",
-  "dateAndTimeOfVisit": "Date and time of visit",
-  "dateOfBirth": "Date of birth",
   "delete": "Delete",
   "deleteQueueEntry": "Delete queue entry",
   "discard": "Discard",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "Error adding queue",
   "errorAddingQueueRoom": "Error adding queue room",
   "errorClearingQueues": "Error clearing queues",
-  "errorFetchingAppointments": "Error fetching appointments",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "Error loading queue entries",
   "errorPostingToScreen": "Error posting to screen",
-  "facility": "Facility",
-  "failedToLoadRecommendedVisitTypes": "Failed to load recommended visit types",
-  "female": "Female",
   "femaleLabelText": "Female",
-  "fields": "of the following fields",
   "filter": "Filter",
   "filterByService": "Filter by service:",
   "filterByStatus": "Filter by status:",
   "filterTable": "Filter table",
-  "firstName": "First name",
-  "firstNameSort": "First name (a-z)",
-  "futureScheduledVisits_one": "{{count}} visit scheduled for dates in the future",
-  "futureScheduledVisits_other": "{{count}} visits scheduled for dates in the future",
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
-  "idNumber": "ID Number",
   "indication": "Indication",
   "invalidQueue": "Invalid Queue",
   "invalidtableConfig": "Invalid table configuration",
   "lastEncounter": "Last encounter",
-  "lastName": "Last name",
-  "lastNameSort": "Last name (a-z)",
-  "lastVisit": "Last Visit",
-  "lastVisitDate": "Date",
   "loading": "Loading...",
   "location": "Location",
-  "male": "Male",
   "maleLabelText": "Male",
-  "match": "Match",
   "medications": "Medications",
-  "middleName": "Middle name",
   "minuteFormatted": "{{minutes}} minute(s)",
   "minutes": "Minutes",
   "missingLocation": "Missing location",
-  "missingPriority": "Please select a priority",
   "missingQueueName": "Missing queue name",
   "missingQueueRoom": "Please select a queue room",
   "missingQueueRoomName": "Missing queue room name",
   "missingQueueRoomService": "Missing queue room service",
   "missingService": "Missing service",
-  "missingVisitType": "Missing visit type",
   "modifyDefaultValue": "Modify default value",
   "movePatientToNextService": "Move patient to the next service?",
   "moveToNextService": "Move to next service",
   "name": "Name",
   "nextPage": "Next page",
-  "noActiveVisitsForLocation": "There are no active visits to display for this location.",
-  "noAppointmentsFound": "No appointments found",
   "noColumnsDefined": "No table columns defined. Check Configuration",
   "noEncountersFound": "No encounters found",
   "noLastEncounter": "There is no last encounter to display for this patient",
   "noLocationsAvailable": "No locations available",
   "noMedicationsFound": "No medications found",
   "noNotesFound": "No notes found",
-  "noPatientFoundMessage": "Sorry, no patient has been found",
   "noPatientsToDisplay": "No patients to display",
   "noPreviousVisitFound": "No previous visit found",
   "noPrioritiesConfigured": "No priorities configured",
   "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
   "noPrioritiesForServiceTitle": "No priorities available",
   "noPriorityFound": "No priority found",
-  "noResultsFound": "No results found",
   "noReturnDate": "There is no return date to display for this patient",
   "noServicesAvailable": "No services available",
   "noServicesConfigured": "No services configured",
   "noStatusConfigured": "No status configured",
   "notableConfig": "No table configuration",
   "notes": "Notes",
-  "noVisitsNotInQueueFound": "No visits currently not in queue found",
-  "noVisitTypesMatchingSearch": "There are no visit types matching this search text",
   "noVitalsFound": "No vitals found",
-  "oldest": "Oldest first",
   "onTime": "On time",
-  "or": "or",
   "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Indefinite duration",
-  "orInProperFormat": "Or",
-  "orPatientName": "OR the patient's name(s)",
   "patientAge": "Age",
-  "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
-  "patientHasActiveVisit": "The patient already has an active visit",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
@@ -171,23 +128,17 @@
   "patientRequeued": "Patient has been requeued",
   "patients": "Patients",
   "patientsCurrentlyInQueue": "Patients currently in queue",
-  "personalDetails": "Personal Details",
   "phoneNumber": "Phone number",
   "pleaseSelectLocation": "Please select a location",
-  "pleaseSelectService": "Please select a service",
-  "postCode": "Post code",
   "previousPage": "Previous page",
   "previousVisit": "Previous visit",
-  "primaryHelperText": "Search for a patient",
   "priority": "Priority",
   "priorityComment": "Priority comment",
   "priorityIsRequired": "Priority is required",
-  "program": "Program",
   "provider": "Provider",
   "quantity": "Quantity",
   "queueAddedSuccessfully": "Queue added successfully",
   "queueEntryAddedSuccessfully": "Queue entry added successfully",
-  "queueEntryAddFailed": "Error adding queue entry status",
   "queueEntryDeleteFailed": "Error deleting queue entry",
   "queueEntryDeleteSuccessful": "Queue entry deleted successfully",
   "queueEntryEdited": "Queue entry edited",
@@ -217,9 +168,6 @@
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
-  "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
-  "recentScheduledVisits_other": "{{count}} visits scheduled for +/- 7 days",
-  "recommended": "Recommended",
   "refills": "Refills",
   "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit",
   "removePatient": "Remove patient",
@@ -233,40 +181,24 @@
   "save": "Save",
   "scheduledAppointmentsList": "Scheduled appointments patient list",
   "scheduledToday": "Scheduled for today",
-  "search": "Search",
-  "searchboxPlaceholder": "Search for a patient name or ID number",
-  "searchForAVisitType": "Search for a visit type",
-  "searchForPatient": "Search for a patient",
-  "searchPatient": "Search Patient",
   "searchThisList": "Search this list",
-  "secondaryHelperText": "Type the patient's name or unique ID number",
   "selectALocation": "Select a location",
   "selectAVisitType": "Select visit type",
-  "selectFacility": "Select a facility",
-  "selectOption": "Select an option",
-  "selectProgramType": "Select program type",
   "selectQueue": "Select a queue",
   "selectQueueLocation": "Select a queue location",
   "selectQueueService": "Select a queue service",
   "selectRoom": "Select a room",
   "selectService": "Select a service",
   "selectServiceType": "Select a service type",
-  "selectVisitType": "Please select a Visit Type",
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
   "serviceIsRequired": "Service is required",
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
-  "sex": "Sex",
-  "sortBy": "Sort by",
   "sortWeight": "Sort weight",
   "sp02": "Sp02",
   "startAgeRangeInvalid": "Start age range is not valid",
-  "startAVisit": "Start a visit",
-  "startVisit": "Start visit",
-  "startVisitError": "Error starting visit",
-  "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
   "status": "Status",
   "statusIsRequired": "Status is required",
   "submitting": "Submitting...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "Triage form",
   "triageNote": "Triage note",
-  "trySearchWithPatientUniqueID": "Try searching with the patient's unique ID number",
   "undoQueueEntryTransitionSuccess": "Undo transition success",
   "undoTransition": "Undo transition",
   "unexpectedServerResponse": "Unexpected Server Response",
@@ -295,14 +226,11 @@
   "updateRoom": "Update room",
   "useTodaysDate": "Use today's date",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
-  "visitStartTime": "Visit Time",
   "visitTabs": "Visit tabs",
   "visitType": "Visit Type",
   "vitals": "Vitals",
   "vitalsForm": "Vitals form",
   "vitalsNotRecordedForVisit": "Vitals has not been recorded for this patient for this visit",
   "waitingFor": "Waiting for",
-  "weight": "Weight",
-  "years": "Years",
-  "youngest": "Youngest first"
+  "weight": "Weight"
 }
diff --git a/packages/esm-service-queues-app/translations/km.json b/packages/esm-service-queues-app/translations/km.json
index 32de47fd1..14c3230f7 100644
--- a/packages/esm-service-queues-app/translations/km.json
+++ b/packages/esm-service-queues-app/translations/km.json
@@ -1,10 +1,7 @@
 {
   "actions": "សកម្មភាព",
-  "activeVisits": "Active Visits",
-  "activeVisitsNotInQueue": "Active visits not in queue",
   "addAProviderQueueRoom": "Add a provider queue room?",
-  "addEntry": "Add entry",
-  "addisitToQueueTooltip": "Add to queue",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "Add New Queue Service",
   "addNewQueueServiceRoom": "Add new queue service room",
   "addNewService": "បន្ថែមសេវាថ្មី",
@@ -17,20 +14,13 @@
   "addQueueRoomName": "Please add a queue room name",
   "addQueueRoomService": "Please add a queue room service",
   "addRoom": "Add room",
-  "addToQueue": "Add to queue",
-  "addVisitToQueue": "Add Visit To Queue?",
-  "advancedSearch": "ការស្វែងរកកម្រិតខ្ពស់",
   "age": "អាយុ",
   "alistOfClients": "បញ្ជីរាយនាមអតិថិជនកំពុងរង់ចាំ",
   "all": "ទាំងអស់",
   "and": "និង",
-  "anotherVisitType": "ចាប់ផ្តើមប្រភេទនៃការមកពិនិត្យជំងឺផ្សេងទៀត",
-  "any": "ណាមួយ",
   "applyFilters": "Apply filters",
   "averageWaitTime": "ពេលវេលារង់ចាំជាមធ្យមនៅថ្ងៃនេះ",
-  "backToScheduledVisits": "ត្រឡប់ទៅរកកាលណាត់ជួបពិនិត្យជំងឺ",
   "backToSearchResults": "Back to search results",
-  "backToSimpleSearch": "ត្រលប់ទៅការស្វែងរកគម្រូ",
   "between": "រវាង",
   "bmi": "សន្ទស្សន៍ម៉ាសរាងកាយ BMI",
   "bp": "សម្ពាធឈាម",
@@ -39,7 +29,6 @@
   "checkedInPatients": "Checked in patients",
   "checkFilters": "ពិនិត្យតម្រងខាងលើ",
   "chooseRoom": "Select a room",
-  "chooseService": "ជ្រើសរើសសេវាកម្ម",
   "clearAllQueueEntries": "សម្អាតbធាតុbចូលទាំងអស់?",
   "clearAllQueueEntriesWarningMessage": "Clearing all queue entries will remove  all the patients from the queues",
   "clearQueue": "ជម្រះជួរ",
@@ -55,8 +44,6 @@
   "currentVisit": "ការមកពិនិត្យជំងឺបច្ចុប្បន្ន",
   "date": "កាលបរិច្ឆេទ",
   "date&Time": "Date & time",
-  "dateAndTimeOfVisit": "កាលបរិច្ឆេទនិងពេលវេលានៃការមកពិនិត្យជំងឺ",
-  "dateOfBirth": "ថ្ងៃខែឆ្នាំកំណើត",
   "delete": "Delete",
   "deleteQueueEntry": "Delete queue entry",
   "discard": "បោះបង់",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "កំហុសក្នុងការបន្ថែមជួរ",
   "errorAddingQueueRoom": "Error adding queue room",
   "errorClearingQueues": "កំហុសក្នុងការសម្អាតជួរ",
-  "errorFetchingAppointments": "Error fetching appointments",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "Error loading queue entries",
   "errorPostingToScreen": "Error posting to screen",
-  "facility": "Facility",
-  "failedToLoadRecommendedVisitTypes": "Failed to load recommended visit types",
-  "female": "ស្រី",
   "femaleLabelText": "ស្រី",
-  "fields": "នៃផ្នែកខាងក្រោម",
   "filter": "តម្រង",
   "filterByService": "Filter by service:",
   "filterByStatus": "Filter by status:",
   "filterTable": "Filter table",
-  "firstName": "នាមខ្លួន",
-  "firstNameSort": "នាមខ្លួន (ពីa ដល់ z ) ",
-  "futureScheduledVisits_one": "{{count}} visit scheduled for dates in the future",
-  "futureScheduledVisits_other": "{{count}} visits scheduled for dates in the future",
   "gender": "ភេទ",
   "heartRate": "ចង្វាក់bបេះbដូង",
   "height": "កម្ពស់",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
-  "idNumber": "ID Number",
   "indication": "ការចង្អុលបង្ហាញ",
   "invalidQueue": "Invalid Queue",
   "invalidtableConfig": "Invalid table configuration",
   "lastEncounter": "ការជួបចុងក្រោយ",
-  "lastName": "នាមត្រកូល",
-  "lastNameSort": "នាមត្រកូល (ពីa ដល់ z)",
-  "lastVisit": "ការមកពិនិត្យជំងឺចុងក្រោយ",
-  "lastVisitDate": "កាលបរិច្ឆេទ",
   "loading": "កំពុងbផ្ទុក...",
   "location": "Location",
-  "male": "ប្រុស",
   "maleLabelText": "ប្រុស",
-  "match": "ធ្វើឱ្យស៊ីគ្នា",
   "medications": "ឱសថព្យាបាល",
-  "middleName": "ជាbឈ្មោះbកbណ្តាbល",
   "minuteFormatted": "{{minutes}} minute(s)",
   "minutes": "នាទី",
   "missingLocation": "Missing location",
-  "missingPriority": "Please select a priority",
   "missingQueueName": "Missing queue name",
   "missingQueueRoom": "Please select a queue room",
   "missingQueueRoomName": "Missing queue room name",
   "missingQueueRoomService": "Missing queue room service",
   "missingService": "Missing service",
-  "missingVisitType": "បាត់ប្រភេទនៃការមកពិនិត្យជំងឺ",
   "modifyDefaultValue": "Modify default value",
   "movePatientToNextService": "Move patient to the next service?",
   "moveToNextService": "Move to next service",
   "name": "នាមខ្លួន",
   "nextPage": "Next page",
-  "noActiveVisitsForLocation": "There are no active visits to display for this location.",
-  "noAppointmentsFound": "រកមិនឃើញការណាត់ជួបទេ",
   "noColumnsDefined": "No table columns defined. Check Configuration",
   "noEncountersFound": "រកមិនឃើញការជួបគ្នាទេ",
   "noLastEncounter": "មិនមានការជួបគ្នាចុងក្រោយដើម្បីបង្ហាញសម្រាប់អ្នកជំងឺនេះទេ",
   "noLocationsAvailable": "មិនមានទីតាំងទេ",
   "noMedicationsFound": "រកមិនឃើញឱ្យសថព្យាបាលទេ",
   "noNotesFound": "រកមិនឃើញកំណត់សម្គាល់ទេ",
-  "noPatientFoundMessage": "សូមទោស រកមិនឃើញអ្នកជំងឺទេ",
   "noPatientsToDisplay": "គ្មានអ្នកជំងឺត្រូវបង្ហាញទេ",
   "noPreviousVisitFound": "រកមិនឃើញការមកពិនិត្យជំងឺពីលើកមុនទេ",
   "noPrioritiesConfigured": "No priorities configured",
   "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
   "noPrioritiesForServiceTitle": "No priorities available",
   "noPriorityFound": "រកមិនឃើញអាទិភាពទេ",
-  "noResultsFound": "រកមិនឃើញលទ្ធផលទេ",
   "noReturnDate": "មិនមានកាលបរិច្ឆេទត្រឡប់មកជួបវិញដើម្បីបង្ហាញសម្រាប់អ្នកជំងឺនេះទេ",
   "noServicesAvailable": "No services available",
   "noServicesConfigured": "No services configured",
   "noStatusConfigured": "No status configured",
   "notableConfig": "No table configuration",
   "notes": "កំណត់សម្គាល់",
-  "noVisitsNotInQueueFound": "No visits currently not in queue found",
-  "noVisitTypesMatchingSearch": "There are no visit types matching this search text",
   "noVitalsFound": "រកមិនឃើញសញ្ញាជីវិតទេ",
-  "oldest": "ចាស់ជាងគេដំបូង",
   "onTime": "ទាន់bពេលវេលា",
-  "or": "ឬ",
   "orderDurationAndUnit": "សម្រាប់ {រយៈពេល} {ឯកតារយៈពេល}",
   "orderIndefiniteDuration": "រយៈពេលមិនកំណត់",
-  "orInProperFormat": "Or",
-  "orPatientName": "ឬឈ្មោះអ្នកជំងឺ",
   "patientAge": "Age",
-  "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
-  "patientHasActiveVisit": "អ្នកជំងឺបានមកពិនិត្យជំងឺសកម្មរួចហើយ",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "បញ្ជីអ្នកជំងឺ",
   "patientName": "Patient name",
@@ -171,23 +128,17 @@
   "patientRequeued": "Patient has been requeued",
   "patients": "អ្នកជំងឺ",
   "patientsCurrentlyInQueue": "បច្ចុប្បន្នអ្នកជំងឺកំពុងស្ថិតក្នុងជួរ",
-  "personalDetails": "ព័ត៌មានលម្អិតផ្ទាល់ខ្លួន",
   "phoneNumber": "លេខទូរស័ព្ទ",
   "pleaseSelectLocation": "Please select a location",
-  "pleaseSelectService": "Please select a service",
-  "postCode": "លេខកូដប្រៃសណីយ៍",
   "previousPage": "Previous page",
   "previousVisit": "ការពិនិត្យជំងឺលើកមុន",
-  "primaryHelperText": "ស្វែងរកអ្នកជំងឺ",
   "priority": "អាទិភាព",
   "priorityComment": "Priority comment",
   "priorityIsRequired": "Priority is required",
-  "program": "កម្មវិធី",
   "provider": "អ្នកផ្តល់សេវា",
   "quantity": "បរិមាណ",
   "queueAddedSuccessfully": "Queue added successfully",
   "queueEntryAddedSuccessfully": "Queue entry added successfully",
-  "queueEntryAddFailed": "Error adding queue entry status",
   "queueEntryDeleteFailed": "Error deleting queue entry",
   "queueEntryDeleteSuccessful": "Queue entry deleted successfully",
   "queueEntryEdited": "Queue entry edited",
@@ -217,9 +168,6 @@
   "queueScreen": "Queue screen",
   "queueService": "សេវាកម្មជួរ",
   "queueStatus": "ស្ថានភាពជួរ",
-  "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
-  "recentScheduledVisits_other": "{{count}} visits scheduled for +/- 7 days",
-  "recommended": "អនុសាសន៏",
   "refills": "ការបំពេញបន្ថែម",
   "removeFromQueueAndEndVisit": "ដកអ្នកជំងឺចេញពីជួរ ហើយបញ្ចប់ការមកពិនិត្យសកម្ម",
   "removePatient": "Remove patient",
@@ -233,40 +181,24 @@
   "save": "រក្សាទុក",
   "scheduledAppointmentsList": "បញ្ជីអ្នកជំងឺណាត់ជួបតាមកាលវិភាគ",
   "scheduledToday": "កាលវិភាគសម្រាប់ការពិនិត្យជំងឺថ្ងៃនេះ",
-  "search": "ស្វែងរក",
-  "searchboxPlaceholder": "ស្វែងរកឈ្មោះអ្នកជំងឺ ឬលេខសម្គាល់",
-  "searchForAVisitType": "ស្វែងរកប្រភេទជំងឺមកពិនិត្យ",
-  "searchForPatient": "ស្វែងរកអ្នកជំងឺ",
-  "searchPatient": "Search Patient",
   "searchThisList": "ស្វែងរកបញ្ជីនេះ",
-  "secondaryHelperText": "វាយបញ្ចូលឈ្មោះអ្នកជំងឺ ឬលេខសម្គាល់តែមួយគត់",
   "selectALocation": "Select a location",
   "selectAVisitType": "ជ្រើសរើសប្រភេទការមកពិនិត្យជំងឺ",
-  "selectFacility": "Select a facility",
-  "selectOption": "Select an option",
-  "selectProgramType": "ជ្រើសរើសប្រភេទកម្មវិធី",
   "selectQueue": "Select a queue",
   "selectQueueLocation": "Select a queue location",
   "selectQueueService": "Select a queue service",
   "selectRoom": "Select a room",
   "selectService": "ជ្រើសរើសសេវា",
   "selectServiceType": "Select a service type",
-  "selectVisitType": "សូមជ្រើសរើសប្រភេទជំងឺសំរាប់ការពិនិត្យ",
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "សេវា",
   "serviceIsRequired": "Service is required",
   "serviceQueue": "ជួរសេវាកម្ម",
   "serviceQueues": "ជួរនៃសេវា",
-  "sex": "ភេទ",
-  "sortBy": "តម្រៀបតាម",
   "sortWeight": "Sort weight",
   "sp02": "រកមើល បរិមាណកំហាប់អុកស៊ីសែន",
   "startAgeRangeInvalid": "ចន្លោះអាយុចាប់ផ្តើមមិនត្រឹមត្រូវទេ",
-  "startAVisit": "Start a visit",
-  "startVisit": "Start visit",
-  "startVisitError": "កំហុសក្នុងការចាប់ផ្តើមការចូលមកពិនិត្យជំងឺ",
-  "startVisitQueueSuccessfully": "អ្នកជំងឺត្រូវបានបន្ថែមទៅបញ្ជីមកពិនិត្យជំងឺសកម្ម និងតាមជួរ",
   "status": "ស្ថានភាព",
   "statusIsRequired": "Status is required",
   "submitting": "Submitting...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "ទម្រង់បែងចែកជំងឺដំបូង",
   "triageNote": "កំណត់ចំណាំរបស់ការបែងចែកជំងឺដំបូង",
-  "trySearchWithPatientUniqueID": "ព្យាយាមស្វែងរកដោយប្រើលេខសំគាល់តែមួយគត់របស់អ្នកជំងឺ",
   "undoQueueEntryTransitionSuccess": "Undo transition success",
   "undoTransition": "Undo transition",
   "unexpectedServerResponse": "Unexpected Server Response",
@@ -295,14 +226,11 @@
   "updateRoom": "Update room",
   "useTodaysDate": "ប្រើកាលបរិច្ឆេទថ្ងៃនេះ",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
-  "visitStartTime": "Visit Time",
   "visitTabs": "Visit tabs",
   "visitType": "ប្រភេទជំងឺមកពិនិត្យ",
   "vitals": "សញ្ញាជីវិត",
   "vitalsForm": "ទម្រង់សញ្ញាជីវិត",
   "vitalsNotRecordedForVisit": "សញ្ញាជីវិតមិនbបានbកត់ត្រាbសម្រាប់bអ្នកbជំងឺbនេះbសម្រាប់bការbមកbជួបពិនិត្យលើកbនេះbទេ",
   "waitingFor": "កំពុងរង់ចាំ",
-  "weight": "ទម្ងន់",
-  "years": "ឆ្នាំ",
-  "youngest": "អាយុក្មេងជាងគេដំបូង"
+  "weight": "ទម្ងន់"
 }
diff --git a/packages/esm-service-queues-app/translations/ne.json b/packages/esm-service-queues-app/translations/ne.json
new file mode 100644
index 000000000..918d1b4ea
--- /dev/null
+++ b/packages/esm-service-queues-app/translations/ne.json
@@ -0,0 +1,236 @@
+{
+  "actions": "Actions",
+  "addAProviderQueueRoom": "Add a provider queue room?",
+  "addedPatientToQueue": "Added patient to queue",
+  "addNewQueueService": "Add New Queue Service",
+  "addNewQueueServiceRoom": "Add new queue service room",
+  "addNewService": "Add new service",
+  "addNewServiceRoom": "Add new service room",
+  "addPatientToQueue": "Add patient to queue",
+  "addProviderQueueRoom": "Add provider queue room",
+  "addQueue": "Add queue",
+  "addQueueName": "Please add a queue name",
+  "addQueueRoom": "Add queue room",
+  "addQueueRoomName": "Please add a queue room name",
+  "addQueueRoomService": "Please add a queue room service",
+  "addRoom": "Add room",
+  "age": "Age",
+  "alistOfClients": "A list of clients waiting for ",
+  "all": "All",
+  "and": "And",
+  "applyFilters": "Apply filters",
+  "averageWaitTime": "Average wait time today",
+  "backToSearchResults": "Back to search results",
+  "between": "Between",
+  "bmi": "Bmi",
+  "bp": "Bp",
+  "call": "Call",
+  "cancel": "Cancel",
+  "checkedInPatients": "Checked in patients",
+  "checkFilters": "Check the filters above",
+  "chooseRoom": "Select a room",
+  "clearAllQueueEntries": "Clear all queue entries?",
+  "clearAllQueueEntriesWarningMessage": "Clearing all queue entries will remove  all the patients from the queues",
+  "clearQueue": "Clear queue",
+  "clinicMetrics": "Clinic metrics",
+  "configurePriorities": "Please configure priorities to continue.",
+  "configureServices": "Please configure services to continue.",
+  "configureStatus": "Please configure status to continue.",
+  "confirmDeleteQueueEntry": "Are you sure you want to delete this queue entry?",
+  "confirmMoveBackQueueAndStatus": "Are you sure you want to move patient back to queue \"{{queue}}\" with status \"{{status}}\"?",
+  "confirmMoveBackStatus": "Are you sure you want to move patient back to status \"{{status}}\"?",
+  "confirmRemovePatientFromQueue": "Are you sure you want to remove this patient from this queue?",
+  "currentValueFormatted": "{{value}} (Current)",
+  "currentVisit": "Current visit",
+  "date": "Date",
+  "date&Time": "Date & time",
+  "delete": "Delete",
+  "deleteQueueEntry": "Delete queue entry",
+  "discard": "Discard",
+  "dose": "Dose",
+  "edit": "Edit",
+  "editPatientDetails": "Edit patient details",
+  "editQueueEntry": "Edit queue entry",
+  "editQueueEntryInstruction": "Edit fields of existing queue entry",
+  "encounterType": "Encounter type",
+  "endAgeRangeInvalid": "End age range is not valid",
+  "endDate": "End date",
+  "endVisit": "End visit",
+  "endVisitWarningMessage": "Ending this visit will not allow you to fill another encounter form for this patient",
+  "enterCommentHere": "Enter Comment here",
+  "errorAddingQueue": "Error adding queue",
+  "errorAddingQueueRoom": "Error adding queue room",
+  "errorClearingQueues": "Error clearing queues",
+  "errorFetchingVisit": "Error fetching patient visit",
+  "errorLoadingQueueEntries": "Error loading queue entries",
+  "errorPostingToScreen": "Error posting to screen",
+  "femaleLabelText": "Female",
+  "filter": "Filter",
+  "filterByService": "Filter by service:",
+  "filterByStatus": "Filter by status:",
+  "filterTable": "Filter table",
+  "gender": "Gender",
+  "heartRate": "Heart rate",
+  "height": "Height",
+  "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
+  "indication": "Indication",
+  "invalidQueue": "Invalid Queue",
+  "invalidtableConfig": "Invalid table configuration",
+  "lastEncounter": "Last encounter",
+  "loading": "Loading...",
+  "location": "Location",
+  "maleLabelText": "Male",
+  "medications": "Medications",
+  "minuteFormatted": "{{minutes}} minute(s)",
+  "minutes": "Minutes",
+  "missingLocation": "Missing location",
+  "missingQueueName": "Missing queue name",
+  "missingQueueRoom": "Please select a queue room",
+  "missingQueueRoomName": "Missing queue room name",
+  "missingQueueRoomService": "Missing queue room service",
+  "missingService": "Missing service",
+  "modifyDefaultValue": "Modify default value",
+  "movePatientToNextService": "Move patient to the next service?",
+  "moveToNextService": "Move to next service",
+  "name": "Name",
+  "nextPage": "Next page",
+  "noColumnsDefined": "No table columns defined. Check Configuration",
+  "noEncountersFound": "No encounters found",
+  "noLastEncounter": "There is no last encounter to display for this patient",
+  "noLocationsAvailable": "No locations available",
+  "noMedicationsFound": "No medications found",
+  "noNotesFound": "No notes found",
+  "noPatientsToDisplay": "No patients to display",
+  "noPreviousVisitFound": "No previous visit found",
+  "noPrioritiesConfigured": "No priorities configured",
+  "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
+  "noPrioritiesForServiceTitle": "No priorities available",
+  "noPriorityFound": "No priority found",
+  "noReturnDate": "There is no return date to display for this patient",
+  "noServicesAvailable": "No services available",
+  "noServicesConfigured": "No services configured",
+  "noStatusConfigured": "No status configured",
+  "notableConfig": "No table configuration",
+  "notes": "Notes",
+  "noVitalsFound": "No vitals found",
+  "onTime": "On time",
+  "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
+  "orderIndefiniteDuration": "Indefinite duration",
+  "patientAge": "Age",
+  "patientAttendingService": "Patient attending service",
+  "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
+  "patientList": "Patient list",
+  "patientName": "Patient name",
+  "patientNotInQueue": "The patient is not in the queue",
+  "patientRemoved": "Patient removed",
+  "patientRemovedFailed": "Error removing patient from queue",
+  "patientRemovedSuccessfully": "Paient removed from queue successfully",
+  "patientRequeued": "Patient has been requeued",
+  "patients": "Patients",
+  "patientsCurrentlyInQueue": "Patients currently in queue",
+  "phoneNumber": "Phone number",
+  "pleaseSelectLocation": "Please select a location",
+  "previousPage": "Previous page",
+  "previousVisit": "Previous visit",
+  "priority": "Priority",
+  "priorityComment": "Priority comment",
+  "priorityIsRequired": "Priority is required",
+  "provider": "Provider",
+  "quantity": "Quantity",
+  "queueAddedSuccessfully": "Queue added successfully",
+  "queueEntryAddedSuccessfully": "Queue entry added successfully",
+  "queueEntryDeleteFailed": "Error deleting queue entry",
+  "queueEntryDeleteSuccessful": "Queue entry deleted successfully",
+  "queueEntryEdited": "Queue entry edited",
+  "queueEntryEditedSuccessfully": "Queue entry edited successfully",
+  "queueEntryEditingFailed": "Error editing queue entry",
+  "queueEntryError": "Error adding patient to the queue",
+  "queueEntryRemoved": "Queue entry removed",
+  "queueEntryRemovedSuccessfully": "",
+  "queueEntryStatusUpdateFailed": "Error updating queue entry status",
+  "queueEntryTransitioned": "Queue entry transitioned",
+  "queueEntryTransitionedSuccessfully": "Queue entry transitioned successfully",
+  "queueEntryTransitionFailed": "Error transitioning queue entry",
+  "queueEntryTransitionUndoFailed": "Error undoing transition",
+  "queueEntryTransitionUndoSuccessful": "Queue entry transition undo success",
+  "queueEntryUpdateFailed": "Error updating queue entry status",
+  "queueEntryUpdateSuccessfully": "Queue Entry Updated Successfully",
+  "queueLocation": "Queue location",
+  "queueLocationRequired": "Queue location is required",
+  "queueName": "Queue name",
+  "queuePriority": "Queue priority",
+  "queueRoom": "Queue room",
+  "queueRoomAddedSuccessfully": "Queue room added successfully",
+  "queueRoomAddFailed": "Error adding queue room",
+  "queueRoomName": "Queue room name",
+  "queueRoomUpdatedSuccessfully": "Queue room updated successfully",
+  "queuesClearedSuccessfully": "Queues cleared successfully",
+  "queueScreen": "Queue screen",
+  "queueService": "Queue service",
+  "queueStatus": "Queue status",
+  "refills": "Refills",
+  "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit",
+  "removePatient": "Remove patient",
+  "removePatientFromQueue": "Remove patient from queue",
+  "removeQueueEntryError": "Error removing queue entry",
+  "requeue": "Requeue",
+  "retainLocation": "Retain location",
+  "returnDate": "Return date",
+  "room": "Room",
+  "rRate": "R. Rate",
+  "save": "Save",
+  "scheduledAppointmentsList": "Scheduled appointments patient list",
+  "scheduledToday": "Scheduled for today",
+  "searchThisList": "Search this list",
+  "selectALocation": "Select a location",
+  "selectAVisitType": "Select visit type",
+  "selectQueue": "Select a queue",
+  "selectQueueLocation": "Select a queue location",
+  "selectQueueService": "Select a queue service",
+  "selectRoom": "Select a room",
+  "selectService": "Select a service",
+  "selectServiceType": "Select a service type",
+  "serve": "Serve",
+  "servePatient": "Serve patient",
+  "service": "Service",
+  "serviceIsRequired": "Service is required",
+  "serviceQueue": "Service queue",
+  "serviceQueues": "Service queues",
+  "sortWeight": "Sort weight",
+  "sp02": "Sp02",
+  "startAgeRangeInvalid": "Start age range is not valid",
+  "status": "Status",
+  "statusIsRequired": "Status is required",
+  "submitting": "Submitting...",
+  "success": "Success",
+  "temperature": "Temperature",
+  "ticketNumber": "Ticket Number",
+  "time": "Time",
+  "timeCannotBeInFuture": "Time cannot be in the future",
+  "timeCannotBePriorToPreviousQueueEntry": "Time cannot be before start of previous queue entry: {{time}}",
+  "timeOfTransition": "Time of transition",
+  "tirageNotYetCompleted": "Triage has not yet been completed",
+  "today": "Today",
+  "totalPatients": "Total Patients",
+  "transition": "Transition",
+  "TransitionLatestQueueEntry": "Transition patient to latest queue",
+  "transitionPatient": "Transition patient",
+  "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
+  "triageForm": "Triage form",
+  "triageNote": "Triage note",
+  "undoQueueEntryTransitionSuccess": "Undo transition success",
+  "undoTransition": "Undo transition",
+  "unexpectedServerResponse": "Unexpected Server Response",
+  "unknown": "Unknown",
+  "updateEntry": "Update entry",
+  "updateRoom": "Update room",
+  "useTodaysDate": "Use today's date",
+  "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
+  "visitTabs": "Visit tabs",
+  "visitType": "Visit Type",
+  "vitals": "Vitals",
+  "vitalsForm": "Vitals form",
+  "vitalsNotRecordedForVisit": "Vitals has not been recorded for this patient for this visit",
+  "waitingFor": "Waiting for",
+  "weight": "Weight"
+}
diff --git a/packages/esm-service-queues-app/translations/pt.json b/packages/esm-service-queues-app/translations/pt.json
index c40507dcb..4b3726493 100644
--- a/packages/esm-service-queues-app/translations/pt.json
+++ b/packages/esm-service-queues-app/translations/pt.json
@@ -1,36 +1,26 @@
 {
   "actions": "Ações",
-  "activeVisits": "Visitas Ativas",
-  "activeVisitsNotInQueue": "Visitas ativas não estão na fila",
-  "addAProviderQueueRoom": "Adicionar um provedor na sala de espera?",
-  "addEntry": "Adicionar entrada",
-  "addisitToQueueTooltip": "Adicionar",
+  "addAProviderQueueRoom": "Adicionar uma sala de fila/espera de provedor?",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "Adicionar Novo Serviço de Espera",
   "addNewQueueServiceRoom": "Adicionar nova sala de espera de atendimento",
   "addNewService": "Adicionar novo serviço",
   "addNewServiceRoom": "Adicionar nova sala de atendimento",
   "addPatientToQueue": "Adicionar utente à fila",
-  "addProviderQueueRoom": "Adicionar provedor na sala de espera?",
+  "addProviderQueueRoom": "Adicionar sala de fila/espera de provedor?",
   "addQueue": "Adicionar fila",
   "addQueueName": "Favor de providenciar o nome da fila",
   "addQueueRoom": "Adicionar sala de espera",
   "addQueueRoomName": "Favor de providenciar o nome da sala de espera",
   "addQueueRoomService": "Favor de providenciar o serviço da sala de espera",
   "addRoom": "Adicionar quarto",
-  "addToQueue": "Adicionar à fila",
-  "addVisitToQueue": "Adicionar Visita à Fila?",
-  "advancedSearch": "Pesquisa avançada",
   "age": "Idade",
   "alistOfClients": "A lista de utentes em espera",
   "all": "Todos",
   "and": "E",
-  "anotherVisitType": "Iniciar outro tipo de visita",
-  "any": "Qualquer",
   "applyFilters": "Aplicar filtros",
   "averageWaitTime": "Tempo médio de espera hoje",
-  "backToScheduledVisits": "Voltar às Visitas Marcadas",
   "backToSearchResults": "Voltar aos resultados da pesquisa",
-  "backToSimpleSearch": "Voltar à pesquisa simples",
   "between": "Entre",
   "bmi": "IMC",
   "bp": "Pb",
@@ -39,7 +29,6 @@
   "checkedInPatients": "Utentes admitidos",
   "checkFilters": "Verifique os filtros acima",
   "chooseRoom": "Selecione a sala",
-  "chooseService": "Selecione um serviço",
   "clearAllQueueEntries": "Limpar todas as entradas da fila?",
   "clearAllQueueEntriesWarningMessage": "Limpar todas as entradas da fila removerá todos os utentes das filas",
   "clearQueue": "Limpar fila ",
@@ -55,8 +44,6 @@
   "currentVisit": "Visita actual",
   "date": "Data",
   "date&Time": "Data e hora",
-  "dateAndTimeOfVisit": "Data e hora da visita",
-  "dateOfBirth": "Data de nascimento",
   "delete": "Apagar",
   "deleteQueueEntry": "Apagar entrada da fila",
   "discard": "Descartar",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "Erro ao adicionar fila",
   "errorAddingQueueRoom": "Erro ao adicionar sala de espera",
   "errorClearingQueues": "Erro ao limpar filas",
-  "errorFetchingAppointments": "Erro ao buscar consultas marcadas",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "Erro ao carregar entradas da fila",
   "errorPostingToScreen": "Erro ao mostrar no ecrã",
-  "facility": "Unidade de Saúde",
-  "failedToLoadRecommendedVisitTypes": "Falha ao carregar os tipos de visita recomendados",
-  "female": "Feminino",
   "femaleLabelText": "Feminino",
-  "fields": "dos seguintes campos",
   "filter": "Filtro",
   "filterByService": "Filtrar por serviço:",
   "filterByStatus": "Filtrar por estado:",
   "filterTable": "Tabela de filtro",
-  "firstName": "Primeiro nome",
-  "firstNameSort": "Primeiro nome (a-z)",
-  "futureScheduledVisits_one": "{{count}} visita marcada para datas futuras",
-  "futureScheduledVisits_other": "{{count}} visitas marcadas para datas futuras",
   "gender": "Sexo",
   "heartRate": "Frequência cardíaca",
   "height": "Altura",
   "hourAndMinuteFormatted": "{{hours}} hora(s) e {{minutes}} minuto(s)",
-  "idNumber": "Número de Identificação",
   "indication": "Indicação",
   "invalidQueue": "Fila inválida",
   "invalidtableConfig": "Configuração de tabela inválida",
   "lastEncounter": "Última consulta",
-  "lastName": "Último nome",
-  "lastNameSort": "Último nome (a-z)",
-  "lastVisit": "Última visita",
-  "lastVisitDate": "Data",
   "loading": "Carregando...",
   "location": "Local",
-  "male": "Masculino",
   "maleLabelText": "Masculino",
-  "match": "Corresponder",
   "medications": "Medicamentos",
-  "middleName": "Sobrenome",
   "minuteFormatted": "{{minutes}} minuto(s)",
   "minutes": "Minutos",
   "missingLocation": "Falta o local ",
-  "missingPriority": "Favor, selecione uma prioridade",
   "missingQueueName": "Falta nome da fila",
   "missingQueueRoom": "Favor, selecione a sala de espera",
   "missingQueueRoomName": "Falta o nome da sala de espera",
   "missingQueueRoomService": "Falta o serviço da sala de espera",
-  "missingService": "Falta o seviço",
-  "missingVisitType": "Falta o tipo de visita",
+  "missingService": "Falta o serviço",
   "modifyDefaultValue": "Modificar valor padrão",
   "movePatientToNextService": "Mover o utente para o próximo serviço?",
   "moveToNextService": "Mover para o próximo serviço",
   "name": "Nome",
   "nextPage": "Próxima página",
-  "noActiveVisitsForLocation": "Não há visitas ativas por visualizar para este local.",
-  "noAppointmentsFound": "Nenhumas marcações encontradas",
   "noColumnsDefined": "Nenhuma coluna de tabela definida. Verifique a configuração",
   "noEncountersFound": "Nenhuma consulta encontrada",
   "noLastEncounter": "Não há última consulta para mostrar para este utente",
-  "noLocationsAvailable": "Nenhuns locais disponível",
+  "noLocationsAvailable": "Nenhum local disponível",
   "noMedicationsFound": "Nenhuma medicação encontrada",
   "noNotesFound": "Não foi encontrada nenhuma nota",
-  "noPatientFoundMessage": "Desculpe, nenhum utente foi encontrado",
   "noPatientsToDisplay": "Nenhum utente para exibir",
   "noPreviousVisitFound": "Nenhuma visita anterior encontrada",
   "noPrioritiesConfigured": "Nenhuma prioridade configurada",
   "noPrioritiesForService": "O serviço selecionado não possui prioridades permitidas. Este é um erro na configuração. Entre em contacto com o administrador do sistema.",
   "noPrioritiesForServiceTitle": "Nenhuma prioridade disponível",
   "noPriorityFound": "Nenhuma prioridade encontrada",
-  "noResultsFound": "Nenhuma resultado encontrado",
   "noReturnDate": "Não há data de retorno por mostrar para este utente",
   "noServicesAvailable": "Nenhum serviço disponível",
   "noServicesConfigured": "Não exitem serviços configutados",
   "noStatusConfigured": "Nenhuma estado configurado",
   "notableConfig": "Nenhuma configuração de tabela",
   "notes": "Notas",
-  "noVisitsNotInQueueFound": "No momento não existem visitas que não estejam numa fila",
-  "noVisitTypesMatchingSearch": "Não há tipos de visita correspondentes a este texto de pesquisa",
   "noVitalsFound": "Nenhum sinal vital encontrado",
-  "oldest": "Mais antigo primeiro",
   "onTime": "Na hora",
-  "or": "ou",
   "orderDurationAndUnit": "para {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Duração indefinida",
-  "orInProperFormat": "Ou",
-  "orPatientName": "OU o(s) nome(s) do(s) utente(s)",
   "patientAge": "Idade",
-  "patientAlreadyInQueue": "Utente já está na fila",
   "patientAttendingService": "Serviço de atendimento ao utente",
-  "patientHasActiveVisit": "O utente já tem alguma visita activa",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Lista de utente",
   "patientName": "Nome do utente",
@@ -171,23 +128,17 @@
   "patientRequeued": "O utente foi recolocado na fila",
   "patients": "Utentes",
   "patientsCurrentlyInQueue": "Utentes actualmente na fila",
-  "personalDetails": "Detalhes pessoais",
   "phoneNumber": "Número de Telefone",
   "pleaseSelectLocation": "Favor, selecione o local",
-  "pleaseSelectService": "Favor, selecione o serviço",
-  "postCode": "Caixa postal",
   "previousPage": "Página anterior",
   "previousVisit": "Visita anterior",
-  "primaryHelperText": "Pesquise um utente",
   "priority": "Prioridade",
   "priorityComment": "Comentário da prioridade",
   "priorityIsRequired": "Prioridade é obrigatória",
-  "program": "Programa",
   "provider": "Provedor",
   "quantity": "Quantidade",
   "queueAddedSuccessfully": "Fila adicionada com sucesso",
   "queueEntryAddedSuccessfully": "Entrada de fila adicionada com sucesso",
-  "queueEntryAddFailed": "Erro ao adicionar estado de entrada na fila",
   "queueEntryDeleteFailed": "Erro ao apagar entrada na fila",
   "queueEntryDeleteSuccessful": "Entrada na fila excluída com sucesso",
   "queueEntryEdited": "Entrada na fila editada",
@@ -208,18 +159,15 @@
   "queueLocationRequired": "Local da fila é obrigatório",
   "queueName": "Nome da fila",
   "queuePriority": "Prioridade da fila",
-  "queueRoom": "Fila da sala",
-  "queueRoomAddedSuccessfully": "Fila da sala adicionada com sucesso",
-  "queueRoomAddFailed": "Erro ao adicionar fila da sala",
-  "queueRoomName": "Nome da fila da sala",
-  "queueRoomUpdatedSuccessfully": "Fila da sala actualizada com sucesso",
+  "queueRoom": "Sala de Fila",
+  "queueRoomAddedSuccessfully": "Sala de fila adicionada com sucesso",
+  "queueRoomAddFailed": "Erro ao adicionar sala de fila",
+  "queueRoomName": "Nome da sala de fila",
+  "queueRoomUpdatedSuccessfully": "Sala de fila actualizada com sucesso",
   "queuesClearedSuccessfully": "Filas limpas com sucesso",
   "queueScreen": "Tela de fila",
   "queueService": "Serviço de fila",
   "queueStatus": "Estado da fila",
-  "recentScheduledVisits_one": "{{count}} visita marcada para +/- 7 dias",
-  "recentScheduledVisits_other": "{{count}} visitas marcadas para +/- 7 dias",
-  "recommended": "Recomendado",
   "refills": "Recargas",
   "removeFromQueueAndEndVisit": "Remover o utente da fila e terminar a visita activa",
   "removePatient": "Remover utente",
@@ -233,40 +181,24 @@
   "save": "Salvar",
   "scheduledAppointmentsList": "Lista de pacientes com consultas marcadas",
   "scheduledToday": "Marcada para hoje",
-  "search": "Pesquisar",
-  "searchboxPlaceholder": "Pesquise um utente por nome ou identificador",
-  "searchForAVisitType": "Pesquise um tipo de visita",
-  "searchForPatient": "Pesquise um utente",
-  "searchPatient": "Pesquisar Utente",
   "searchThisList": "Pesquisar esta lista",
-  "secondaryHelperText": "Digite o nome do utente ou o número único de identificação ",
   "selectALocation": "Selecione um local",
   "selectAVisitType": "Selecione tipo de visita",
-  "selectFacility": "Selecione a US",
-  "selectOption": "Selecione uma opção",
-  "selectProgramType": "Selecione tipo de programa",
   "selectQueue": "Selecione a fila",
   "selectQueueLocation": "Selecione o local da fila",
   "selectQueueService": "Selecione o serviço da fila",
   "selectRoom": "Selecione a sala",
   "selectService": "Selecione um serviço",
   "selectServiceType": "Selecione o tipo de serviço",
-  "selectVisitType": "Favor, selecionar o Tipo de Visita",
   "serve": "Servir",
   "servePatient": "Servir utente",
   "service": "Serviço",
   "serviceIsRequired": "Serviço é obrigatório",
-  "serviceQueue": "Seviço da fila",
-  "serviceQueues": "Seviço das filas",
-  "sex": "Sexo",
-  "sortBy": "Ordenar por",
-  "sortWeight": "Peso de ordem",
+  "serviceQueue": "Fila de serviço",
+  "serviceQueues": "Filas de serviço",
+  "sortWeight": "Classificar/ordenar peso",
   "sp02": "Sp02",
   "startAgeRangeInvalid": "A faixa etária inicial não é válida",
-  "startAVisit": "Iniciar uma visita",
-  "startVisit": "Iniciar visita",
-  "startVisitError": "Erro ao iniciar visita",
-  "startVisitQueueSuccessfully": "O utente foi adicionado à lista  de fila e visitas ativas.",
   "status": "Estado",
   "statusIsRequired": "Estado é obrigatório",
   "submitting": "Submetendo...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "Selecione um novo estado ou fila para o utente fazer a transição.",
   "triageForm": "Formulário de triagem",
   "triageNote": "Nota de triagem",
-  "trySearchWithPatientUniqueID": "Tente pesquisar com o número único de identificação do utente",
   "undoQueueEntryTransitionSuccess": "Transição desfeita com sucesso",
   "undoTransition": "Desfazer transição",
   "unexpectedServerResponse": "Resposta inesperada do servidor",
@@ -295,14 +226,11 @@
   "updateRoom": "Actualizar sala",
   "useTodaysDate": "Usar a data de hoje",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid não está configurado",
-  "visitStartTime": "Horário da visita",
   "visitTabs": "Guia de visitas",
   "visitType": "Tipo de Visita",
   "vitals": "Sinais Vitais",
   "vitalsForm": "Formulário de Sinais Vitais",
   "vitalsNotRecordedForVisit": "Os sinais vitais não foram registados para este utente nesta visita",
   "waitingFor": "Esperando por",
-  "weight": "Peso",
-  "years": "Anos",
-  "youngest": "O mais novo primeiro"
+  "weight": "Peso"
 }
diff --git a/packages/esm-service-queues-app/translations/qu.json b/packages/esm-service-queues-app/translations/qu.json
index c93179b3a..918d1b4ea 100644
--- a/packages/esm-service-queues-app/translations/qu.json
+++ b/packages/esm-service-queues-app/translations/qu.json
@@ -1,10 +1,7 @@
 {
   "actions": "Actions",
-  "activeVisits": "Active Visits",
-  "activeVisitsNotInQueue": "Active visits not in queue",
   "addAProviderQueueRoom": "Add a provider queue room?",
-  "addEntry": "Add entry",
-  "addisitToQueueTooltip": "Add",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "Add New Queue Service",
   "addNewQueueServiceRoom": "Add new queue service room",
   "addNewService": "Add new service",
@@ -17,20 +14,13 @@
   "addQueueRoomName": "Please add a queue room name",
   "addQueueRoomService": "Please add a queue room service",
   "addRoom": "Add room",
-  "addToQueue": "Add to queue",
-  "addVisitToQueue": "Add Visit To Queue?",
-  "advancedSearch": "Advanced search",
   "age": "Age",
   "alistOfClients": "A list of clients waiting for ",
   "all": "All",
   "and": "And",
-  "anotherVisitType": "Start another visit type",
-  "any": "Any",
   "applyFilters": "Apply filters",
   "averageWaitTime": "Average wait time today",
-  "backToScheduledVisits": "Back To Scheduled Visits",
   "backToSearchResults": "Back to search results",
-  "backToSimpleSearch": "Back to simple search",
   "between": "Between",
   "bmi": "Bmi",
   "bp": "Bp",
@@ -39,7 +29,6 @@
   "checkedInPatients": "Checked in patients",
   "checkFilters": "Check the filters above",
   "chooseRoom": "Select a room",
-  "chooseService": "Select a service",
   "clearAllQueueEntries": "Clear all queue entries?",
   "clearAllQueueEntriesWarningMessage": "Clearing all queue entries will remove  all the patients from the queues",
   "clearQueue": "Clear queue",
@@ -55,8 +44,6 @@
   "currentVisit": "Current visit",
   "date": "Date",
   "date&Time": "Date & time",
-  "dateAndTimeOfVisit": "Date and time of visit",
-  "dateOfBirth": "Date of birth",
   "delete": "Delete",
   "deleteQueueEntry": "Delete queue entry",
   "discard": "Discard",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "Error adding queue",
   "errorAddingQueueRoom": "Error adding queue room",
   "errorClearingQueues": "Error clearing queues",
-  "errorFetchingAppointments": "Error fetching appointments",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "Error loading queue entries",
   "errorPostingToScreen": "Error posting to screen",
-  "facility": "Facility",
-  "failedToLoadRecommendedVisitTypes": "Failed to load recommended visit types",
-  "female": "Female",
   "femaleLabelText": "Female",
-  "fields": "of the following fields",
   "filter": "Filter",
   "filterByService": "Filter by service:",
   "filterByStatus": "Filter by status:",
   "filterTable": "Filter table",
-  "firstName": "First name",
-  "firstNameSort": "First name (a-z)",
-  "futureScheduledVisits_one": "{{count}} visit scheduled for dates in the future",
-  "futureScheduledVisits_other": "{{count}} visits scheduled for dates in the future",
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
-  "idNumber": "ID Number",
   "indication": "Indication",
   "invalidQueue": "Invalid Queue",
   "invalidtableConfig": "Invalid table configuration",
   "lastEncounter": "Last encounter",
-  "lastName": "Last name",
-  "lastNameSort": "Last name (a-z)",
-  "lastVisit": "Last Visit",
-  "lastVisitDate": "Date",
   "loading": "Loading...",
   "location": "Location",
-  "male": "Male",
   "maleLabelText": "Male",
-  "match": "Match",
   "medications": "Medications",
-  "middleName": "Middle name",
   "minuteFormatted": "{{minutes}} minute(s)",
   "minutes": "Minutes",
   "missingLocation": "Missing location",
-  "missingPriority": "Please select a priority",
   "missingQueueName": "Missing queue name",
   "missingQueueRoom": "Please select a queue room",
   "missingQueueRoomName": "Missing queue room name",
   "missingQueueRoomService": "Missing queue room service",
   "missingService": "Missing service",
-  "missingVisitType": "Missing visit type",
   "modifyDefaultValue": "Modify default value",
   "movePatientToNextService": "Move patient to the next service?",
   "moveToNextService": "Move to next service",
   "name": "Name",
   "nextPage": "Next page",
-  "noActiveVisitsForLocation": "There are no active visits to display for this location.",
-  "noAppointmentsFound": "No appointments found",
   "noColumnsDefined": "No table columns defined. Check Configuration",
   "noEncountersFound": "No encounters found",
   "noLastEncounter": "There is no last encounter to display for this patient",
   "noLocationsAvailable": "No locations available",
   "noMedicationsFound": "No medications found",
   "noNotesFound": "No notes found",
-  "noPatientFoundMessage": "Sorry, no patient has been found",
   "noPatientsToDisplay": "No patients to display",
   "noPreviousVisitFound": "No previous visit found",
   "noPrioritiesConfigured": "No priorities configured",
   "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
   "noPrioritiesForServiceTitle": "No priorities available",
   "noPriorityFound": "No priority found",
-  "noResultsFound": "No results found",
   "noReturnDate": "There is no return date to display for this patient",
   "noServicesAvailable": "No services available",
   "noServicesConfigured": "No services configured",
   "noStatusConfigured": "No status configured",
   "notableConfig": "No table configuration",
   "notes": "Notes",
-  "noVisitsNotInQueueFound": "No visits currently not in queue found",
-  "noVisitTypesMatchingSearch": "There are no visit types matching this search text",
   "noVitalsFound": "No vitals found",
-  "oldest": "Oldest first",
   "onTime": "On time",
-  "or": "or",
   "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Indefinite duration",
-  "orInProperFormat": "Or",
-  "orPatientName": "OR the patient's name(s)",
   "patientAge": "Age",
-  "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
-  "patientHasActiveVisit": "The patient already has an active visit",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
@@ -171,23 +128,17 @@
   "patientRequeued": "Patient has been requeued",
   "patients": "Patients",
   "patientsCurrentlyInQueue": "Patients currently in queue",
-  "personalDetails": "Personal Details",
   "phoneNumber": "Phone number",
   "pleaseSelectLocation": "Please select a location",
-  "pleaseSelectService": "Please select a service",
-  "postCode": "Post code",
   "previousPage": "Previous page",
   "previousVisit": "Previous visit",
-  "primaryHelperText": "Search for a patient",
   "priority": "Priority",
   "priorityComment": "Priority comment",
   "priorityIsRequired": "Priority is required",
-  "program": "Program",
   "provider": "Provider",
   "quantity": "Quantity",
   "queueAddedSuccessfully": "Queue added successfully",
   "queueEntryAddedSuccessfully": "Queue entry added successfully",
-  "queueEntryAddFailed": "Error adding queue entry status",
   "queueEntryDeleteFailed": "Error deleting queue entry",
   "queueEntryDeleteSuccessful": "Queue entry deleted successfully",
   "queueEntryEdited": "Queue entry edited",
@@ -217,9 +168,6 @@
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
-  "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
-  "recentScheduledVisits_other": "{{count}} visits scheduled for +/- 7 days",
-  "recommended": "Recommended",
   "refills": "Refills",
   "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit",
   "removePatient": "Remove patient",
@@ -233,40 +181,24 @@
   "save": "Save",
   "scheduledAppointmentsList": "Scheduled appointments patient list",
   "scheduledToday": "Scheduled for today",
-  "search": "Search",
-  "searchboxPlaceholder": "Search for a patient name or ID number",
-  "searchForAVisitType": "Search for a visit type",
-  "searchForPatient": "Search for a patient",
-  "searchPatient": "Search Patient",
   "searchThisList": "Search this list",
-  "secondaryHelperText": "Type the patient's name or unique ID number",
   "selectALocation": "Select a location",
   "selectAVisitType": "Select visit type",
-  "selectFacility": "Select a facility",
-  "selectOption": "Select an option",
-  "selectProgramType": "Select program type",
   "selectQueue": "Select a queue",
   "selectQueueLocation": "Select a queue location",
   "selectQueueService": "Select a queue service",
   "selectRoom": "Select a room",
   "selectService": "Select a service",
   "selectServiceType": "Select a service type",
-  "selectVisitType": "Please select a Visit Type",
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
   "serviceIsRequired": "Service is required",
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
-  "sex": "Sex",
-  "sortBy": "Sort by",
   "sortWeight": "Sort weight",
   "sp02": "Sp02",
   "startAgeRangeInvalid": "Start age range is not valid",
-  "startAVisit": "Start a visit",
-  "startVisit": "Start visit",
-  "startVisitError": "Error starting visit",
-  "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
   "status": "Status",
   "statusIsRequired": "Status is required",
   "submitting": "Submitting...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "Triage form",
   "triageNote": "Triage note",
-  "trySearchWithPatientUniqueID": "Try searching with the patient's unique ID number",
   "undoQueueEntryTransitionSuccess": "Undo transition success",
   "undoTransition": "Undo transition",
   "unexpectedServerResponse": "Unexpected Server Response",
@@ -295,14 +226,11 @@
   "updateRoom": "Update room",
   "useTodaysDate": "Use today's date",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
-  "visitStartTime": "Visit Time",
   "visitTabs": "Visit tabs",
   "visitType": "Visit Type",
   "vitals": "Vitals",
   "vitalsForm": "Vitals form",
   "vitalsNotRecordedForVisit": "Vitals has not been recorded for this patient for this visit",
   "waitingFor": "Waiting for",
-  "weight": "Weight",
-  "years": "Years",
-  "youngest": "Youngest first"
+  "weight": "Weight"
 }
diff --git a/packages/esm-service-queues-app/translations/si.json b/packages/esm-service-queues-app/translations/si.json
index c93179b3a..918d1b4ea 100644
--- a/packages/esm-service-queues-app/translations/si.json
+++ b/packages/esm-service-queues-app/translations/si.json
@@ -1,10 +1,7 @@
 {
   "actions": "Actions",
-  "activeVisits": "Active Visits",
-  "activeVisitsNotInQueue": "Active visits not in queue",
   "addAProviderQueueRoom": "Add a provider queue room?",
-  "addEntry": "Add entry",
-  "addisitToQueueTooltip": "Add",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "Add New Queue Service",
   "addNewQueueServiceRoom": "Add new queue service room",
   "addNewService": "Add new service",
@@ -17,20 +14,13 @@
   "addQueueRoomName": "Please add a queue room name",
   "addQueueRoomService": "Please add a queue room service",
   "addRoom": "Add room",
-  "addToQueue": "Add to queue",
-  "addVisitToQueue": "Add Visit To Queue?",
-  "advancedSearch": "Advanced search",
   "age": "Age",
   "alistOfClients": "A list of clients waiting for ",
   "all": "All",
   "and": "And",
-  "anotherVisitType": "Start another visit type",
-  "any": "Any",
   "applyFilters": "Apply filters",
   "averageWaitTime": "Average wait time today",
-  "backToScheduledVisits": "Back To Scheduled Visits",
   "backToSearchResults": "Back to search results",
-  "backToSimpleSearch": "Back to simple search",
   "between": "Between",
   "bmi": "Bmi",
   "bp": "Bp",
@@ -39,7 +29,6 @@
   "checkedInPatients": "Checked in patients",
   "checkFilters": "Check the filters above",
   "chooseRoom": "Select a room",
-  "chooseService": "Select a service",
   "clearAllQueueEntries": "Clear all queue entries?",
   "clearAllQueueEntriesWarningMessage": "Clearing all queue entries will remove  all the patients from the queues",
   "clearQueue": "Clear queue",
@@ -55,8 +44,6 @@
   "currentVisit": "Current visit",
   "date": "Date",
   "date&Time": "Date & time",
-  "dateAndTimeOfVisit": "Date and time of visit",
-  "dateOfBirth": "Date of birth",
   "delete": "Delete",
   "deleteQueueEntry": "Delete queue entry",
   "discard": "Discard",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "Error adding queue",
   "errorAddingQueueRoom": "Error adding queue room",
   "errorClearingQueues": "Error clearing queues",
-  "errorFetchingAppointments": "Error fetching appointments",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "Error loading queue entries",
   "errorPostingToScreen": "Error posting to screen",
-  "facility": "Facility",
-  "failedToLoadRecommendedVisitTypes": "Failed to load recommended visit types",
-  "female": "Female",
   "femaleLabelText": "Female",
-  "fields": "of the following fields",
   "filter": "Filter",
   "filterByService": "Filter by service:",
   "filterByStatus": "Filter by status:",
   "filterTable": "Filter table",
-  "firstName": "First name",
-  "firstNameSort": "First name (a-z)",
-  "futureScheduledVisits_one": "{{count}} visit scheduled for dates in the future",
-  "futureScheduledVisits_other": "{{count}} visits scheduled for dates in the future",
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
-  "idNumber": "ID Number",
   "indication": "Indication",
   "invalidQueue": "Invalid Queue",
   "invalidtableConfig": "Invalid table configuration",
   "lastEncounter": "Last encounter",
-  "lastName": "Last name",
-  "lastNameSort": "Last name (a-z)",
-  "lastVisit": "Last Visit",
-  "lastVisitDate": "Date",
   "loading": "Loading...",
   "location": "Location",
-  "male": "Male",
   "maleLabelText": "Male",
-  "match": "Match",
   "medications": "Medications",
-  "middleName": "Middle name",
   "minuteFormatted": "{{minutes}} minute(s)",
   "minutes": "Minutes",
   "missingLocation": "Missing location",
-  "missingPriority": "Please select a priority",
   "missingQueueName": "Missing queue name",
   "missingQueueRoom": "Please select a queue room",
   "missingQueueRoomName": "Missing queue room name",
   "missingQueueRoomService": "Missing queue room service",
   "missingService": "Missing service",
-  "missingVisitType": "Missing visit type",
   "modifyDefaultValue": "Modify default value",
   "movePatientToNextService": "Move patient to the next service?",
   "moveToNextService": "Move to next service",
   "name": "Name",
   "nextPage": "Next page",
-  "noActiveVisitsForLocation": "There are no active visits to display for this location.",
-  "noAppointmentsFound": "No appointments found",
   "noColumnsDefined": "No table columns defined. Check Configuration",
   "noEncountersFound": "No encounters found",
   "noLastEncounter": "There is no last encounter to display for this patient",
   "noLocationsAvailable": "No locations available",
   "noMedicationsFound": "No medications found",
   "noNotesFound": "No notes found",
-  "noPatientFoundMessage": "Sorry, no patient has been found",
   "noPatientsToDisplay": "No patients to display",
   "noPreviousVisitFound": "No previous visit found",
   "noPrioritiesConfigured": "No priorities configured",
   "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
   "noPrioritiesForServiceTitle": "No priorities available",
   "noPriorityFound": "No priority found",
-  "noResultsFound": "No results found",
   "noReturnDate": "There is no return date to display for this patient",
   "noServicesAvailable": "No services available",
   "noServicesConfigured": "No services configured",
   "noStatusConfigured": "No status configured",
   "notableConfig": "No table configuration",
   "notes": "Notes",
-  "noVisitsNotInQueueFound": "No visits currently not in queue found",
-  "noVisitTypesMatchingSearch": "There are no visit types matching this search text",
   "noVitalsFound": "No vitals found",
-  "oldest": "Oldest first",
   "onTime": "On time",
-  "or": "or",
   "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Indefinite duration",
-  "orInProperFormat": "Or",
-  "orPatientName": "OR the patient's name(s)",
   "patientAge": "Age",
-  "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
-  "patientHasActiveVisit": "The patient already has an active visit",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
@@ -171,23 +128,17 @@
   "patientRequeued": "Patient has been requeued",
   "patients": "Patients",
   "patientsCurrentlyInQueue": "Patients currently in queue",
-  "personalDetails": "Personal Details",
   "phoneNumber": "Phone number",
   "pleaseSelectLocation": "Please select a location",
-  "pleaseSelectService": "Please select a service",
-  "postCode": "Post code",
   "previousPage": "Previous page",
   "previousVisit": "Previous visit",
-  "primaryHelperText": "Search for a patient",
   "priority": "Priority",
   "priorityComment": "Priority comment",
   "priorityIsRequired": "Priority is required",
-  "program": "Program",
   "provider": "Provider",
   "quantity": "Quantity",
   "queueAddedSuccessfully": "Queue added successfully",
   "queueEntryAddedSuccessfully": "Queue entry added successfully",
-  "queueEntryAddFailed": "Error adding queue entry status",
   "queueEntryDeleteFailed": "Error deleting queue entry",
   "queueEntryDeleteSuccessful": "Queue entry deleted successfully",
   "queueEntryEdited": "Queue entry edited",
@@ -217,9 +168,6 @@
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
-  "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
-  "recentScheduledVisits_other": "{{count}} visits scheduled for +/- 7 days",
-  "recommended": "Recommended",
   "refills": "Refills",
   "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit",
   "removePatient": "Remove patient",
@@ -233,40 +181,24 @@
   "save": "Save",
   "scheduledAppointmentsList": "Scheduled appointments patient list",
   "scheduledToday": "Scheduled for today",
-  "search": "Search",
-  "searchboxPlaceholder": "Search for a patient name or ID number",
-  "searchForAVisitType": "Search for a visit type",
-  "searchForPatient": "Search for a patient",
-  "searchPatient": "Search Patient",
   "searchThisList": "Search this list",
-  "secondaryHelperText": "Type the patient's name or unique ID number",
   "selectALocation": "Select a location",
   "selectAVisitType": "Select visit type",
-  "selectFacility": "Select a facility",
-  "selectOption": "Select an option",
-  "selectProgramType": "Select program type",
   "selectQueue": "Select a queue",
   "selectQueueLocation": "Select a queue location",
   "selectQueueService": "Select a queue service",
   "selectRoom": "Select a room",
   "selectService": "Select a service",
   "selectServiceType": "Select a service type",
-  "selectVisitType": "Please select a Visit Type",
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
   "serviceIsRequired": "Service is required",
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
-  "sex": "Sex",
-  "sortBy": "Sort by",
   "sortWeight": "Sort weight",
   "sp02": "Sp02",
   "startAgeRangeInvalid": "Start age range is not valid",
-  "startAVisit": "Start a visit",
-  "startVisit": "Start visit",
-  "startVisitError": "Error starting visit",
-  "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
   "status": "Status",
   "statusIsRequired": "Status is required",
   "submitting": "Submitting...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "Triage form",
   "triageNote": "Triage note",
-  "trySearchWithPatientUniqueID": "Try searching with the patient's unique ID number",
   "undoQueueEntryTransitionSuccess": "Undo transition success",
   "undoTransition": "Undo transition",
   "unexpectedServerResponse": "Unexpected Server Response",
@@ -295,14 +226,11 @@
   "updateRoom": "Update room",
   "useTodaysDate": "Use today's date",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
-  "visitStartTime": "Visit Time",
   "visitTabs": "Visit tabs",
   "visitType": "Visit Type",
   "vitals": "Vitals",
   "vitalsForm": "Vitals form",
   "vitalsNotRecordedForVisit": "Vitals has not been recorded for this patient for this visit",
   "waitingFor": "Waiting for",
-  "weight": "Weight",
-  "years": "Years",
-  "youngest": "Youngest first"
+  "weight": "Weight"
 }
diff --git a/packages/esm-service-queues-app/translations/sw.json b/packages/esm-service-queues-app/translations/sw.json
index c93179b3a..918d1b4ea 100644
--- a/packages/esm-service-queues-app/translations/sw.json
+++ b/packages/esm-service-queues-app/translations/sw.json
@@ -1,10 +1,7 @@
 {
   "actions": "Actions",
-  "activeVisits": "Active Visits",
-  "activeVisitsNotInQueue": "Active visits not in queue",
   "addAProviderQueueRoom": "Add a provider queue room?",
-  "addEntry": "Add entry",
-  "addisitToQueueTooltip": "Add",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "Add New Queue Service",
   "addNewQueueServiceRoom": "Add new queue service room",
   "addNewService": "Add new service",
@@ -17,20 +14,13 @@
   "addQueueRoomName": "Please add a queue room name",
   "addQueueRoomService": "Please add a queue room service",
   "addRoom": "Add room",
-  "addToQueue": "Add to queue",
-  "addVisitToQueue": "Add Visit To Queue?",
-  "advancedSearch": "Advanced search",
   "age": "Age",
   "alistOfClients": "A list of clients waiting for ",
   "all": "All",
   "and": "And",
-  "anotherVisitType": "Start another visit type",
-  "any": "Any",
   "applyFilters": "Apply filters",
   "averageWaitTime": "Average wait time today",
-  "backToScheduledVisits": "Back To Scheduled Visits",
   "backToSearchResults": "Back to search results",
-  "backToSimpleSearch": "Back to simple search",
   "between": "Between",
   "bmi": "Bmi",
   "bp": "Bp",
@@ -39,7 +29,6 @@
   "checkedInPatients": "Checked in patients",
   "checkFilters": "Check the filters above",
   "chooseRoom": "Select a room",
-  "chooseService": "Select a service",
   "clearAllQueueEntries": "Clear all queue entries?",
   "clearAllQueueEntriesWarningMessage": "Clearing all queue entries will remove  all the patients from the queues",
   "clearQueue": "Clear queue",
@@ -55,8 +44,6 @@
   "currentVisit": "Current visit",
   "date": "Date",
   "date&Time": "Date & time",
-  "dateAndTimeOfVisit": "Date and time of visit",
-  "dateOfBirth": "Date of birth",
   "delete": "Delete",
   "deleteQueueEntry": "Delete queue entry",
   "discard": "Discard",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "Error adding queue",
   "errorAddingQueueRoom": "Error adding queue room",
   "errorClearingQueues": "Error clearing queues",
-  "errorFetchingAppointments": "Error fetching appointments",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "Error loading queue entries",
   "errorPostingToScreen": "Error posting to screen",
-  "facility": "Facility",
-  "failedToLoadRecommendedVisitTypes": "Failed to load recommended visit types",
-  "female": "Female",
   "femaleLabelText": "Female",
-  "fields": "of the following fields",
   "filter": "Filter",
   "filterByService": "Filter by service:",
   "filterByStatus": "Filter by status:",
   "filterTable": "Filter table",
-  "firstName": "First name",
-  "firstNameSort": "First name (a-z)",
-  "futureScheduledVisits_one": "{{count}} visit scheduled for dates in the future",
-  "futureScheduledVisits_other": "{{count}} visits scheduled for dates in the future",
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
-  "idNumber": "ID Number",
   "indication": "Indication",
   "invalidQueue": "Invalid Queue",
   "invalidtableConfig": "Invalid table configuration",
   "lastEncounter": "Last encounter",
-  "lastName": "Last name",
-  "lastNameSort": "Last name (a-z)",
-  "lastVisit": "Last Visit",
-  "lastVisitDate": "Date",
   "loading": "Loading...",
   "location": "Location",
-  "male": "Male",
   "maleLabelText": "Male",
-  "match": "Match",
   "medications": "Medications",
-  "middleName": "Middle name",
   "minuteFormatted": "{{minutes}} minute(s)",
   "minutes": "Minutes",
   "missingLocation": "Missing location",
-  "missingPriority": "Please select a priority",
   "missingQueueName": "Missing queue name",
   "missingQueueRoom": "Please select a queue room",
   "missingQueueRoomName": "Missing queue room name",
   "missingQueueRoomService": "Missing queue room service",
   "missingService": "Missing service",
-  "missingVisitType": "Missing visit type",
   "modifyDefaultValue": "Modify default value",
   "movePatientToNextService": "Move patient to the next service?",
   "moveToNextService": "Move to next service",
   "name": "Name",
   "nextPage": "Next page",
-  "noActiveVisitsForLocation": "There are no active visits to display for this location.",
-  "noAppointmentsFound": "No appointments found",
   "noColumnsDefined": "No table columns defined. Check Configuration",
   "noEncountersFound": "No encounters found",
   "noLastEncounter": "There is no last encounter to display for this patient",
   "noLocationsAvailable": "No locations available",
   "noMedicationsFound": "No medications found",
   "noNotesFound": "No notes found",
-  "noPatientFoundMessage": "Sorry, no patient has been found",
   "noPatientsToDisplay": "No patients to display",
   "noPreviousVisitFound": "No previous visit found",
   "noPrioritiesConfigured": "No priorities configured",
   "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
   "noPrioritiesForServiceTitle": "No priorities available",
   "noPriorityFound": "No priority found",
-  "noResultsFound": "No results found",
   "noReturnDate": "There is no return date to display for this patient",
   "noServicesAvailable": "No services available",
   "noServicesConfigured": "No services configured",
   "noStatusConfigured": "No status configured",
   "notableConfig": "No table configuration",
   "notes": "Notes",
-  "noVisitsNotInQueueFound": "No visits currently not in queue found",
-  "noVisitTypesMatchingSearch": "There are no visit types matching this search text",
   "noVitalsFound": "No vitals found",
-  "oldest": "Oldest first",
   "onTime": "On time",
-  "or": "or",
   "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Indefinite duration",
-  "orInProperFormat": "Or",
-  "orPatientName": "OR the patient's name(s)",
   "patientAge": "Age",
-  "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
-  "patientHasActiveVisit": "The patient already has an active visit",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
@@ -171,23 +128,17 @@
   "patientRequeued": "Patient has been requeued",
   "patients": "Patients",
   "patientsCurrentlyInQueue": "Patients currently in queue",
-  "personalDetails": "Personal Details",
   "phoneNumber": "Phone number",
   "pleaseSelectLocation": "Please select a location",
-  "pleaseSelectService": "Please select a service",
-  "postCode": "Post code",
   "previousPage": "Previous page",
   "previousVisit": "Previous visit",
-  "primaryHelperText": "Search for a patient",
   "priority": "Priority",
   "priorityComment": "Priority comment",
   "priorityIsRequired": "Priority is required",
-  "program": "Program",
   "provider": "Provider",
   "quantity": "Quantity",
   "queueAddedSuccessfully": "Queue added successfully",
   "queueEntryAddedSuccessfully": "Queue entry added successfully",
-  "queueEntryAddFailed": "Error adding queue entry status",
   "queueEntryDeleteFailed": "Error deleting queue entry",
   "queueEntryDeleteSuccessful": "Queue entry deleted successfully",
   "queueEntryEdited": "Queue entry edited",
@@ -217,9 +168,6 @@
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
-  "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
-  "recentScheduledVisits_other": "{{count}} visits scheduled for +/- 7 days",
-  "recommended": "Recommended",
   "refills": "Refills",
   "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit",
   "removePatient": "Remove patient",
@@ -233,40 +181,24 @@
   "save": "Save",
   "scheduledAppointmentsList": "Scheduled appointments patient list",
   "scheduledToday": "Scheduled for today",
-  "search": "Search",
-  "searchboxPlaceholder": "Search for a patient name or ID number",
-  "searchForAVisitType": "Search for a visit type",
-  "searchForPatient": "Search for a patient",
-  "searchPatient": "Search Patient",
   "searchThisList": "Search this list",
-  "secondaryHelperText": "Type the patient's name or unique ID number",
   "selectALocation": "Select a location",
   "selectAVisitType": "Select visit type",
-  "selectFacility": "Select a facility",
-  "selectOption": "Select an option",
-  "selectProgramType": "Select program type",
   "selectQueue": "Select a queue",
   "selectQueueLocation": "Select a queue location",
   "selectQueueService": "Select a queue service",
   "selectRoom": "Select a room",
   "selectService": "Select a service",
   "selectServiceType": "Select a service type",
-  "selectVisitType": "Please select a Visit Type",
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
   "serviceIsRequired": "Service is required",
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
-  "sex": "Sex",
-  "sortBy": "Sort by",
   "sortWeight": "Sort weight",
   "sp02": "Sp02",
   "startAgeRangeInvalid": "Start age range is not valid",
-  "startAVisit": "Start a visit",
-  "startVisit": "Start visit",
-  "startVisitError": "Error starting visit",
-  "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
   "status": "Status",
   "statusIsRequired": "Status is required",
   "submitting": "Submitting...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "Triage form",
   "triageNote": "Triage note",
-  "trySearchWithPatientUniqueID": "Try searching with the patient's unique ID number",
   "undoQueueEntryTransitionSuccess": "Undo transition success",
   "undoTransition": "Undo transition",
   "unexpectedServerResponse": "Unexpected Server Response",
@@ -295,14 +226,11 @@
   "updateRoom": "Update room",
   "useTodaysDate": "Use today's date",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
-  "visitStartTime": "Visit Time",
   "visitTabs": "Visit tabs",
   "visitType": "Visit Type",
   "vitals": "Vitals",
   "vitalsForm": "Vitals form",
   "vitalsNotRecordedForVisit": "Vitals has not been recorded for this patient for this visit",
   "waitingFor": "Waiting for",
-  "weight": "Weight",
-  "years": "Years",
-  "youngest": "Youngest first"
+  "weight": "Weight"
 }
diff --git a/packages/esm-service-queues-app/translations/sw_KE.json b/packages/esm-service-queues-app/translations/sw_KE.json
index c93179b3a..918d1b4ea 100644
--- a/packages/esm-service-queues-app/translations/sw_KE.json
+++ b/packages/esm-service-queues-app/translations/sw_KE.json
@@ -1,10 +1,7 @@
 {
   "actions": "Actions",
-  "activeVisits": "Active Visits",
-  "activeVisitsNotInQueue": "Active visits not in queue",
   "addAProviderQueueRoom": "Add a provider queue room?",
-  "addEntry": "Add entry",
-  "addisitToQueueTooltip": "Add",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "Add New Queue Service",
   "addNewQueueServiceRoom": "Add new queue service room",
   "addNewService": "Add new service",
@@ -17,20 +14,13 @@
   "addQueueRoomName": "Please add a queue room name",
   "addQueueRoomService": "Please add a queue room service",
   "addRoom": "Add room",
-  "addToQueue": "Add to queue",
-  "addVisitToQueue": "Add Visit To Queue?",
-  "advancedSearch": "Advanced search",
   "age": "Age",
   "alistOfClients": "A list of clients waiting for ",
   "all": "All",
   "and": "And",
-  "anotherVisitType": "Start another visit type",
-  "any": "Any",
   "applyFilters": "Apply filters",
   "averageWaitTime": "Average wait time today",
-  "backToScheduledVisits": "Back To Scheduled Visits",
   "backToSearchResults": "Back to search results",
-  "backToSimpleSearch": "Back to simple search",
   "between": "Between",
   "bmi": "Bmi",
   "bp": "Bp",
@@ -39,7 +29,6 @@
   "checkedInPatients": "Checked in patients",
   "checkFilters": "Check the filters above",
   "chooseRoom": "Select a room",
-  "chooseService": "Select a service",
   "clearAllQueueEntries": "Clear all queue entries?",
   "clearAllQueueEntriesWarningMessage": "Clearing all queue entries will remove  all the patients from the queues",
   "clearQueue": "Clear queue",
@@ -55,8 +44,6 @@
   "currentVisit": "Current visit",
   "date": "Date",
   "date&Time": "Date & time",
-  "dateAndTimeOfVisit": "Date and time of visit",
-  "dateOfBirth": "Date of birth",
   "delete": "Delete",
   "deleteQueueEntry": "Delete queue entry",
   "discard": "Discard",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "Error adding queue",
   "errorAddingQueueRoom": "Error adding queue room",
   "errorClearingQueues": "Error clearing queues",
-  "errorFetchingAppointments": "Error fetching appointments",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "Error loading queue entries",
   "errorPostingToScreen": "Error posting to screen",
-  "facility": "Facility",
-  "failedToLoadRecommendedVisitTypes": "Failed to load recommended visit types",
-  "female": "Female",
   "femaleLabelText": "Female",
-  "fields": "of the following fields",
   "filter": "Filter",
   "filterByService": "Filter by service:",
   "filterByStatus": "Filter by status:",
   "filterTable": "Filter table",
-  "firstName": "First name",
-  "firstNameSort": "First name (a-z)",
-  "futureScheduledVisits_one": "{{count}} visit scheduled for dates in the future",
-  "futureScheduledVisits_other": "{{count}} visits scheduled for dates in the future",
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
-  "idNumber": "ID Number",
   "indication": "Indication",
   "invalidQueue": "Invalid Queue",
   "invalidtableConfig": "Invalid table configuration",
   "lastEncounter": "Last encounter",
-  "lastName": "Last name",
-  "lastNameSort": "Last name (a-z)",
-  "lastVisit": "Last Visit",
-  "lastVisitDate": "Date",
   "loading": "Loading...",
   "location": "Location",
-  "male": "Male",
   "maleLabelText": "Male",
-  "match": "Match",
   "medications": "Medications",
-  "middleName": "Middle name",
   "minuteFormatted": "{{minutes}} minute(s)",
   "minutes": "Minutes",
   "missingLocation": "Missing location",
-  "missingPriority": "Please select a priority",
   "missingQueueName": "Missing queue name",
   "missingQueueRoom": "Please select a queue room",
   "missingQueueRoomName": "Missing queue room name",
   "missingQueueRoomService": "Missing queue room service",
   "missingService": "Missing service",
-  "missingVisitType": "Missing visit type",
   "modifyDefaultValue": "Modify default value",
   "movePatientToNextService": "Move patient to the next service?",
   "moveToNextService": "Move to next service",
   "name": "Name",
   "nextPage": "Next page",
-  "noActiveVisitsForLocation": "There are no active visits to display for this location.",
-  "noAppointmentsFound": "No appointments found",
   "noColumnsDefined": "No table columns defined. Check Configuration",
   "noEncountersFound": "No encounters found",
   "noLastEncounter": "There is no last encounter to display for this patient",
   "noLocationsAvailable": "No locations available",
   "noMedicationsFound": "No medications found",
   "noNotesFound": "No notes found",
-  "noPatientFoundMessage": "Sorry, no patient has been found",
   "noPatientsToDisplay": "No patients to display",
   "noPreviousVisitFound": "No previous visit found",
   "noPrioritiesConfigured": "No priorities configured",
   "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
   "noPrioritiesForServiceTitle": "No priorities available",
   "noPriorityFound": "No priority found",
-  "noResultsFound": "No results found",
   "noReturnDate": "There is no return date to display for this patient",
   "noServicesAvailable": "No services available",
   "noServicesConfigured": "No services configured",
   "noStatusConfigured": "No status configured",
   "notableConfig": "No table configuration",
   "notes": "Notes",
-  "noVisitsNotInQueueFound": "No visits currently not in queue found",
-  "noVisitTypesMatchingSearch": "There are no visit types matching this search text",
   "noVitalsFound": "No vitals found",
-  "oldest": "Oldest first",
   "onTime": "On time",
-  "or": "or",
   "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Indefinite duration",
-  "orInProperFormat": "Or",
-  "orPatientName": "OR the patient's name(s)",
   "patientAge": "Age",
-  "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
-  "patientHasActiveVisit": "The patient already has an active visit",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
@@ -171,23 +128,17 @@
   "patientRequeued": "Patient has been requeued",
   "patients": "Patients",
   "patientsCurrentlyInQueue": "Patients currently in queue",
-  "personalDetails": "Personal Details",
   "phoneNumber": "Phone number",
   "pleaseSelectLocation": "Please select a location",
-  "pleaseSelectService": "Please select a service",
-  "postCode": "Post code",
   "previousPage": "Previous page",
   "previousVisit": "Previous visit",
-  "primaryHelperText": "Search for a patient",
   "priority": "Priority",
   "priorityComment": "Priority comment",
   "priorityIsRequired": "Priority is required",
-  "program": "Program",
   "provider": "Provider",
   "quantity": "Quantity",
   "queueAddedSuccessfully": "Queue added successfully",
   "queueEntryAddedSuccessfully": "Queue entry added successfully",
-  "queueEntryAddFailed": "Error adding queue entry status",
   "queueEntryDeleteFailed": "Error deleting queue entry",
   "queueEntryDeleteSuccessful": "Queue entry deleted successfully",
   "queueEntryEdited": "Queue entry edited",
@@ -217,9 +168,6 @@
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
-  "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
-  "recentScheduledVisits_other": "{{count}} visits scheduled for +/- 7 days",
-  "recommended": "Recommended",
   "refills": "Refills",
   "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit",
   "removePatient": "Remove patient",
@@ -233,40 +181,24 @@
   "save": "Save",
   "scheduledAppointmentsList": "Scheduled appointments patient list",
   "scheduledToday": "Scheduled for today",
-  "search": "Search",
-  "searchboxPlaceholder": "Search for a patient name or ID number",
-  "searchForAVisitType": "Search for a visit type",
-  "searchForPatient": "Search for a patient",
-  "searchPatient": "Search Patient",
   "searchThisList": "Search this list",
-  "secondaryHelperText": "Type the patient's name or unique ID number",
   "selectALocation": "Select a location",
   "selectAVisitType": "Select visit type",
-  "selectFacility": "Select a facility",
-  "selectOption": "Select an option",
-  "selectProgramType": "Select program type",
   "selectQueue": "Select a queue",
   "selectQueueLocation": "Select a queue location",
   "selectQueueService": "Select a queue service",
   "selectRoom": "Select a room",
   "selectService": "Select a service",
   "selectServiceType": "Select a service type",
-  "selectVisitType": "Please select a Visit Type",
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
   "serviceIsRequired": "Service is required",
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
-  "sex": "Sex",
-  "sortBy": "Sort by",
   "sortWeight": "Sort weight",
   "sp02": "Sp02",
   "startAgeRangeInvalid": "Start age range is not valid",
-  "startAVisit": "Start a visit",
-  "startVisit": "Start visit",
-  "startVisitError": "Error starting visit",
-  "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
   "status": "Status",
   "statusIsRequired": "Status is required",
   "submitting": "Submitting...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "Triage form",
   "triageNote": "Triage note",
-  "trySearchWithPatientUniqueID": "Try searching with the patient's unique ID number",
   "undoQueueEntryTransitionSuccess": "Undo transition success",
   "undoTransition": "Undo transition",
   "unexpectedServerResponse": "Unexpected Server Response",
@@ -295,14 +226,11 @@
   "updateRoom": "Update room",
   "useTodaysDate": "Use today's date",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
-  "visitStartTime": "Visit Time",
   "visitTabs": "Visit tabs",
   "visitType": "Visit Type",
   "vitals": "Vitals",
   "vitalsForm": "Vitals form",
   "vitalsNotRecordedForVisit": "Vitals has not been recorded for this patient for this visit",
   "waitingFor": "Waiting for",
-  "weight": "Weight",
-  "years": "Years",
-  "youngest": "Youngest first"
+  "weight": "Weight"
 }
diff --git a/packages/esm-service-queues-app/translations/tr.json b/packages/esm-service-queues-app/translations/tr.json
index c93179b3a..918d1b4ea 100644
--- a/packages/esm-service-queues-app/translations/tr.json
+++ b/packages/esm-service-queues-app/translations/tr.json
@@ -1,10 +1,7 @@
 {
   "actions": "Actions",
-  "activeVisits": "Active Visits",
-  "activeVisitsNotInQueue": "Active visits not in queue",
   "addAProviderQueueRoom": "Add a provider queue room?",
-  "addEntry": "Add entry",
-  "addisitToQueueTooltip": "Add",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "Add New Queue Service",
   "addNewQueueServiceRoom": "Add new queue service room",
   "addNewService": "Add new service",
@@ -17,20 +14,13 @@
   "addQueueRoomName": "Please add a queue room name",
   "addQueueRoomService": "Please add a queue room service",
   "addRoom": "Add room",
-  "addToQueue": "Add to queue",
-  "addVisitToQueue": "Add Visit To Queue?",
-  "advancedSearch": "Advanced search",
   "age": "Age",
   "alistOfClients": "A list of clients waiting for ",
   "all": "All",
   "and": "And",
-  "anotherVisitType": "Start another visit type",
-  "any": "Any",
   "applyFilters": "Apply filters",
   "averageWaitTime": "Average wait time today",
-  "backToScheduledVisits": "Back To Scheduled Visits",
   "backToSearchResults": "Back to search results",
-  "backToSimpleSearch": "Back to simple search",
   "between": "Between",
   "bmi": "Bmi",
   "bp": "Bp",
@@ -39,7 +29,6 @@
   "checkedInPatients": "Checked in patients",
   "checkFilters": "Check the filters above",
   "chooseRoom": "Select a room",
-  "chooseService": "Select a service",
   "clearAllQueueEntries": "Clear all queue entries?",
   "clearAllQueueEntriesWarningMessage": "Clearing all queue entries will remove  all the patients from the queues",
   "clearQueue": "Clear queue",
@@ -55,8 +44,6 @@
   "currentVisit": "Current visit",
   "date": "Date",
   "date&Time": "Date & time",
-  "dateAndTimeOfVisit": "Date and time of visit",
-  "dateOfBirth": "Date of birth",
   "delete": "Delete",
   "deleteQueueEntry": "Delete queue entry",
   "discard": "Discard",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "Error adding queue",
   "errorAddingQueueRoom": "Error adding queue room",
   "errorClearingQueues": "Error clearing queues",
-  "errorFetchingAppointments": "Error fetching appointments",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "Error loading queue entries",
   "errorPostingToScreen": "Error posting to screen",
-  "facility": "Facility",
-  "failedToLoadRecommendedVisitTypes": "Failed to load recommended visit types",
-  "female": "Female",
   "femaleLabelText": "Female",
-  "fields": "of the following fields",
   "filter": "Filter",
   "filterByService": "Filter by service:",
   "filterByStatus": "Filter by status:",
   "filterTable": "Filter table",
-  "firstName": "First name",
-  "firstNameSort": "First name (a-z)",
-  "futureScheduledVisits_one": "{{count}} visit scheduled for dates in the future",
-  "futureScheduledVisits_other": "{{count}} visits scheduled for dates in the future",
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
-  "idNumber": "ID Number",
   "indication": "Indication",
   "invalidQueue": "Invalid Queue",
   "invalidtableConfig": "Invalid table configuration",
   "lastEncounter": "Last encounter",
-  "lastName": "Last name",
-  "lastNameSort": "Last name (a-z)",
-  "lastVisit": "Last Visit",
-  "lastVisitDate": "Date",
   "loading": "Loading...",
   "location": "Location",
-  "male": "Male",
   "maleLabelText": "Male",
-  "match": "Match",
   "medications": "Medications",
-  "middleName": "Middle name",
   "minuteFormatted": "{{minutes}} minute(s)",
   "minutes": "Minutes",
   "missingLocation": "Missing location",
-  "missingPriority": "Please select a priority",
   "missingQueueName": "Missing queue name",
   "missingQueueRoom": "Please select a queue room",
   "missingQueueRoomName": "Missing queue room name",
   "missingQueueRoomService": "Missing queue room service",
   "missingService": "Missing service",
-  "missingVisitType": "Missing visit type",
   "modifyDefaultValue": "Modify default value",
   "movePatientToNextService": "Move patient to the next service?",
   "moveToNextService": "Move to next service",
   "name": "Name",
   "nextPage": "Next page",
-  "noActiveVisitsForLocation": "There are no active visits to display for this location.",
-  "noAppointmentsFound": "No appointments found",
   "noColumnsDefined": "No table columns defined. Check Configuration",
   "noEncountersFound": "No encounters found",
   "noLastEncounter": "There is no last encounter to display for this patient",
   "noLocationsAvailable": "No locations available",
   "noMedicationsFound": "No medications found",
   "noNotesFound": "No notes found",
-  "noPatientFoundMessage": "Sorry, no patient has been found",
   "noPatientsToDisplay": "No patients to display",
   "noPreviousVisitFound": "No previous visit found",
   "noPrioritiesConfigured": "No priorities configured",
   "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
   "noPrioritiesForServiceTitle": "No priorities available",
   "noPriorityFound": "No priority found",
-  "noResultsFound": "No results found",
   "noReturnDate": "There is no return date to display for this patient",
   "noServicesAvailable": "No services available",
   "noServicesConfigured": "No services configured",
   "noStatusConfigured": "No status configured",
   "notableConfig": "No table configuration",
   "notes": "Notes",
-  "noVisitsNotInQueueFound": "No visits currently not in queue found",
-  "noVisitTypesMatchingSearch": "There are no visit types matching this search text",
   "noVitalsFound": "No vitals found",
-  "oldest": "Oldest first",
   "onTime": "On time",
-  "or": "or",
   "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Indefinite duration",
-  "orInProperFormat": "Or",
-  "orPatientName": "OR the patient's name(s)",
   "patientAge": "Age",
-  "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
-  "patientHasActiveVisit": "The patient already has an active visit",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
@@ -171,23 +128,17 @@
   "patientRequeued": "Patient has been requeued",
   "patients": "Patients",
   "patientsCurrentlyInQueue": "Patients currently in queue",
-  "personalDetails": "Personal Details",
   "phoneNumber": "Phone number",
   "pleaseSelectLocation": "Please select a location",
-  "pleaseSelectService": "Please select a service",
-  "postCode": "Post code",
   "previousPage": "Previous page",
   "previousVisit": "Previous visit",
-  "primaryHelperText": "Search for a patient",
   "priority": "Priority",
   "priorityComment": "Priority comment",
   "priorityIsRequired": "Priority is required",
-  "program": "Program",
   "provider": "Provider",
   "quantity": "Quantity",
   "queueAddedSuccessfully": "Queue added successfully",
   "queueEntryAddedSuccessfully": "Queue entry added successfully",
-  "queueEntryAddFailed": "Error adding queue entry status",
   "queueEntryDeleteFailed": "Error deleting queue entry",
   "queueEntryDeleteSuccessful": "Queue entry deleted successfully",
   "queueEntryEdited": "Queue entry edited",
@@ -217,9 +168,6 @@
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
-  "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
-  "recentScheduledVisits_other": "{{count}} visits scheduled for +/- 7 days",
-  "recommended": "Recommended",
   "refills": "Refills",
   "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit",
   "removePatient": "Remove patient",
@@ -233,40 +181,24 @@
   "save": "Save",
   "scheduledAppointmentsList": "Scheduled appointments patient list",
   "scheduledToday": "Scheduled for today",
-  "search": "Search",
-  "searchboxPlaceholder": "Search for a patient name or ID number",
-  "searchForAVisitType": "Search for a visit type",
-  "searchForPatient": "Search for a patient",
-  "searchPatient": "Search Patient",
   "searchThisList": "Search this list",
-  "secondaryHelperText": "Type the patient's name or unique ID number",
   "selectALocation": "Select a location",
   "selectAVisitType": "Select visit type",
-  "selectFacility": "Select a facility",
-  "selectOption": "Select an option",
-  "selectProgramType": "Select program type",
   "selectQueue": "Select a queue",
   "selectQueueLocation": "Select a queue location",
   "selectQueueService": "Select a queue service",
   "selectRoom": "Select a room",
   "selectService": "Select a service",
   "selectServiceType": "Select a service type",
-  "selectVisitType": "Please select a Visit Type",
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
   "serviceIsRequired": "Service is required",
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
-  "sex": "Sex",
-  "sortBy": "Sort by",
   "sortWeight": "Sort weight",
   "sp02": "Sp02",
   "startAgeRangeInvalid": "Start age range is not valid",
-  "startAVisit": "Start a visit",
-  "startVisit": "Start visit",
-  "startVisitError": "Error starting visit",
-  "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
   "status": "Status",
   "statusIsRequired": "Status is required",
   "submitting": "Submitting...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "Triage form",
   "triageNote": "Triage note",
-  "trySearchWithPatientUniqueID": "Try searching with the patient's unique ID number",
   "undoQueueEntryTransitionSuccess": "Undo transition success",
   "undoTransition": "Undo transition",
   "unexpectedServerResponse": "Unexpected Server Response",
@@ -295,14 +226,11 @@
   "updateRoom": "Update room",
   "useTodaysDate": "Use today's date",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
-  "visitStartTime": "Visit Time",
   "visitTabs": "Visit tabs",
   "visitType": "Visit Type",
   "vitals": "Vitals",
   "vitalsForm": "Vitals form",
   "vitalsNotRecordedForVisit": "Vitals has not been recorded for this patient for this visit",
   "waitingFor": "Waiting for",
-  "weight": "Weight",
-  "years": "Years",
-  "youngest": "Youngest first"
+  "weight": "Weight"
 }
diff --git a/packages/esm-service-queues-app/translations/tr_TR.json b/packages/esm-service-queues-app/translations/tr_TR.json
index c93179b3a..918d1b4ea 100644
--- a/packages/esm-service-queues-app/translations/tr_TR.json
+++ b/packages/esm-service-queues-app/translations/tr_TR.json
@@ -1,10 +1,7 @@
 {
   "actions": "Actions",
-  "activeVisits": "Active Visits",
-  "activeVisitsNotInQueue": "Active visits not in queue",
   "addAProviderQueueRoom": "Add a provider queue room?",
-  "addEntry": "Add entry",
-  "addisitToQueueTooltip": "Add",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "Add New Queue Service",
   "addNewQueueServiceRoom": "Add new queue service room",
   "addNewService": "Add new service",
@@ -17,20 +14,13 @@
   "addQueueRoomName": "Please add a queue room name",
   "addQueueRoomService": "Please add a queue room service",
   "addRoom": "Add room",
-  "addToQueue": "Add to queue",
-  "addVisitToQueue": "Add Visit To Queue?",
-  "advancedSearch": "Advanced search",
   "age": "Age",
   "alistOfClients": "A list of clients waiting for ",
   "all": "All",
   "and": "And",
-  "anotherVisitType": "Start another visit type",
-  "any": "Any",
   "applyFilters": "Apply filters",
   "averageWaitTime": "Average wait time today",
-  "backToScheduledVisits": "Back To Scheduled Visits",
   "backToSearchResults": "Back to search results",
-  "backToSimpleSearch": "Back to simple search",
   "between": "Between",
   "bmi": "Bmi",
   "bp": "Bp",
@@ -39,7 +29,6 @@
   "checkedInPatients": "Checked in patients",
   "checkFilters": "Check the filters above",
   "chooseRoom": "Select a room",
-  "chooseService": "Select a service",
   "clearAllQueueEntries": "Clear all queue entries?",
   "clearAllQueueEntriesWarningMessage": "Clearing all queue entries will remove  all the patients from the queues",
   "clearQueue": "Clear queue",
@@ -55,8 +44,6 @@
   "currentVisit": "Current visit",
   "date": "Date",
   "date&Time": "Date & time",
-  "dateAndTimeOfVisit": "Date and time of visit",
-  "dateOfBirth": "Date of birth",
   "delete": "Delete",
   "deleteQueueEntry": "Delete queue entry",
   "discard": "Discard",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "Error adding queue",
   "errorAddingQueueRoom": "Error adding queue room",
   "errorClearingQueues": "Error clearing queues",
-  "errorFetchingAppointments": "Error fetching appointments",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "Error loading queue entries",
   "errorPostingToScreen": "Error posting to screen",
-  "facility": "Facility",
-  "failedToLoadRecommendedVisitTypes": "Failed to load recommended visit types",
-  "female": "Female",
   "femaleLabelText": "Female",
-  "fields": "of the following fields",
   "filter": "Filter",
   "filterByService": "Filter by service:",
   "filterByStatus": "Filter by status:",
   "filterTable": "Filter table",
-  "firstName": "First name",
-  "firstNameSort": "First name (a-z)",
-  "futureScheduledVisits_one": "{{count}} visit scheduled for dates in the future",
-  "futureScheduledVisits_other": "{{count}} visits scheduled for dates in the future",
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
-  "idNumber": "ID Number",
   "indication": "Indication",
   "invalidQueue": "Invalid Queue",
   "invalidtableConfig": "Invalid table configuration",
   "lastEncounter": "Last encounter",
-  "lastName": "Last name",
-  "lastNameSort": "Last name (a-z)",
-  "lastVisit": "Last Visit",
-  "lastVisitDate": "Date",
   "loading": "Loading...",
   "location": "Location",
-  "male": "Male",
   "maleLabelText": "Male",
-  "match": "Match",
   "medications": "Medications",
-  "middleName": "Middle name",
   "minuteFormatted": "{{minutes}} minute(s)",
   "minutes": "Minutes",
   "missingLocation": "Missing location",
-  "missingPriority": "Please select a priority",
   "missingQueueName": "Missing queue name",
   "missingQueueRoom": "Please select a queue room",
   "missingQueueRoomName": "Missing queue room name",
   "missingQueueRoomService": "Missing queue room service",
   "missingService": "Missing service",
-  "missingVisitType": "Missing visit type",
   "modifyDefaultValue": "Modify default value",
   "movePatientToNextService": "Move patient to the next service?",
   "moveToNextService": "Move to next service",
   "name": "Name",
   "nextPage": "Next page",
-  "noActiveVisitsForLocation": "There are no active visits to display for this location.",
-  "noAppointmentsFound": "No appointments found",
   "noColumnsDefined": "No table columns defined. Check Configuration",
   "noEncountersFound": "No encounters found",
   "noLastEncounter": "There is no last encounter to display for this patient",
   "noLocationsAvailable": "No locations available",
   "noMedicationsFound": "No medications found",
   "noNotesFound": "No notes found",
-  "noPatientFoundMessage": "Sorry, no patient has been found",
   "noPatientsToDisplay": "No patients to display",
   "noPreviousVisitFound": "No previous visit found",
   "noPrioritiesConfigured": "No priorities configured",
   "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
   "noPrioritiesForServiceTitle": "No priorities available",
   "noPriorityFound": "No priority found",
-  "noResultsFound": "No results found",
   "noReturnDate": "There is no return date to display for this patient",
   "noServicesAvailable": "No services available",
   "noServicesConfigured": "No services configured",
   "noStatusConfigured": "No status configured",
   "notableConfig": "No table configuration",
   "notes": "Notes",
-  "noVisitsNotInQueueFound": "No visits currently not in queue found",
-  "noVisitTypesMatchingSearch": "There are no visit types matching this search text",
   "noVitalsFound": "No vitals found",
-  "oldest": "Oldest first",
   "onTime": "On time",
-  "or": "or",
   "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Indefinite duration",
-  "orInProperFormat": "Or",
-  "orPatientName": "OR the patient's name(s)",
   "patientAge": "Age",
-  "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
-  "patientHasActiveVisit": "The patient already has an active visit",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
@@ -171,23 +128,17 @@
   "patientRequeued": "Patient has been requeued",
   "patients": "Patients",
   "patientsCurrentlyInQueue": "Patients currently in queue",
-  "personalDetails": "Personal Details",
   "phoneNumber": "Phone number",
   "pleaseSelectLocation": "Please select a location",
-  "pleaseSelectService": "Please select a service",
-  "postCode": "Post code",
   "previousPage": "Previous page",
   "previousVisit": "Previous visit",
-  "primaryHelperText": "Search for a patient",
   "priority": "Priority",
   "priorityComment": "Priority comment",
   "priorityIsRequired": "Priority is required",
-  "program": "Program",
   "provider": "Provider",
   "quantity": "Quantity",
   "queueAddedSuccessfully": "Queue added successfully",
   "queueEntryAddedSuccessfully": "Queue entry added successfully",
-  "queueEntryAddFailed": "Error adding queue entry status",
   "queueEntryDeleteFailed": "Error deleting queue entry",
   "queueEntryDeleteSuccessful": "Queue entry deleted successfully",
   "queueEntryEdited": "Queue entry edited",
@@ -217,9 +168,6 @@
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
-  "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
-  "recentScheduledVisits_other": "{{count}} visits scheduled for +/- 7 days",
-  "recommended": "Recommended",
   "refills": "Refills",
   "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit",
   "removePatient": "Remove patient",
@@ -233,40 +181,24 @@
   "save": "Save",
   "scheduledAppointmentsList": "Scheduled appointments patient list",
   "scheduledToday": "Scheduled for today",
-  "search": "Search",
-  "searchboxPlaceholder": "Search for a patient name or ID number",
-  "searchForAVisitType": "Search for a visit type",
-  "searchForPatient": "Search for a patient",
-  "searchPatient": "Search Patient",
   "searchThisList": "Search this list",
-  "secondaryHelperText": "Type the patient's name or unique ID number",
   "selectALocation": "Select a location",
   "selectAVisitType": "Select visit type",
-  "selectFacility": "Select a facility",
-  "selectOption": "Select an option",
-  "selectProgramType": "Select program type",
   "selectQueue": "Select a queue",
   "selectQueueLocation": "Select a queue location",
   "selectQueueService": "Select a queue service",
   "selectRoom": "Select a room",
   "selectService": "Select a service",
   "selectServiceType": "Select a service type",
-  "selectVisitType": "Please select a Visit Type",
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
   "serviceIsRequired": "Service is required",
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
-  "sex": "Sex",
-  "sortBy": "Sort by",
   "sortWeight": "Sort weight",
   "sp02": "Sp02",
   "startAgeRangeInvalid": "Start age range is not valid",
-  "startAVisit": "Start a visit",
-  "startVisit": "Start visit",
-  "startVisitError": "Error starting visit",
-  "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
   "status": "Status",
   "statusIsRequired": "Status is required",
   "submitting": "Submitting...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "Triage form",
   "triageNote": "Triage note",
-  "trySearchWithPatientUniqueID": "Try searching with the patient's unique ID number",
   "undoQueueEntryTransitionSuccess": "Undo transition success",
   "undoTransition": "Undo transition",
   "unexpectedServerResponse": "Unexpected Server Response",
@@ -295,14 +226,11 @@
   "updateRoom": "Update room",
   "useTodaysDate": "Use today's date",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
-  "visitStartTime": "Visit Time",
   "visitTabs": "Visit tabs",
   "visitType": "Visit Type",
   "vitals": "Vitals",
   "vitalsForm": "Vitals form",
   "vitalsNotRecordedForVisit": "Vitals has not been recorded for this patient for this visit",
   "waitingFor": "Waiting for",
-  "weight": "Weight",
-  "years": "Years",
-  "youngest": "Youngest first"
+  "weight": "Weight"
 }
diff --git a/packages/esm-service-queues-app/translations/uk.json b/packages/esm-service-queues-app/translations/uk.json
index c93179b3a..918d1b4ea 100644
--- a/packages/esm-service-queues-app/translations/uk.json
+++ b/packages/esm-service-queues-app/translations/uk.json
@@ -1,10 +1,7 @@
 {
   "actions": "Actions",
-  "activeVisits": "Active Visits",
-  "activeVisitsNotInQueue": "Active visits not in queue",
   "addAProviderQueueRoom": "Add a provider queue room?",
-  "addEntry": "Add entry",
-  "addisitToQueueTooltip": "Add",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "Add New Queue Service",
   "addNewQueueServiceRoom": "Add new queue service room",
   "addNewService": "Add new service",
@@ -17,20 +14,13 @@
   "addQueueRoomName": "Please add a queue room name",
   "addQueueRoomService": "Please add a queue room service",
   "addRoom": "Add room",
-  "addToQueue": "Add to queue",
-  "addVisitToQueue": "Add Visit To Queue?",
-  "advancedSearch": "Advanced search",
   "age": "Age",
   "alistOfClients": "A list of clients waiting for ",
   "all": "All",
   "and": "And",
-  "anotherVisitType": "Start another visit type",
-  "any": "Any",
   "applyFilters": "Apply filters",
   "averageWaitTime": "Average wait time today",
-  "backToScheduledVisits": "Back To Scheduled Visits",
   "backToSearchResults": "Back to search results",
-  "backToSimpleSearch": "Back to simple search",
   "between": "Between",
   "bmi": "Bmi",
   "bp": "Bp",
@@ -39,7 +29,6 @@
   "checkedInPatients": "Checked in patients",
   "checkFilters": "Check the filters above",
   "chooseRoom": "Select a room",
-  "chooseService": "Select a service",
   "clearAllQueueEntries": "Clear all queue entries?",
   "clearAllQueueEntriesWarningMessage": "Clearing all queue entries will remove  all the patients from the queues",
   "clearQueue": "Clear queue",
@@ -55,8 +44,6 @@
   "currentVisit": "Current visit",
   "date": "Date",
   "date&Time": "Date & time",
-  "dateAndTimeOfVisit": "Date and time of visit",
-  "dateOfBirth": "Date of birth",
   "delete": "Delete",
   "deleteQueueEntry": "Delete queue entry",
   "discard": "Discard",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "Error adding queue",
   "errorAddingQueueRoom": "Error adding queue room",
   "errorClearingQueues": "Error clearing queues",
-  "errorFetchingAppointments": "Error fetching appointments",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "Error loading queue entries",
   "errorPostingToScreen": "Error posting to screen",
-  "facility": "Facility",
-  "failedToLoadRecommendedVisitTypes": "Failed to load recommended visit types",
-  "female": "Female",
   "femaleLabelText": "Female",
-  "fields": "of the following fields",
   "filter": "Filter",
   "filterByService": "Filter by service:",
   "filterByStatus": "Filter by status:",
   "filterTable": "Filter table",
-  "firstName": "First name",
-  "firstNameSort": "First name (a-z)",
-  "futureScheduledVisits_one": "{{count}} visit scheduled for dates in the future",
-  "futureScheduledVisits_other": "{{count}} visits scheduled for dates in the future",
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
-  "idNumber": "ID Number",
   "indication": "Indication",
   "invalidQueue": "Invalid Queue",
   "invalidtableConfig": "Invalid table configuration",
   "lastEncounter": "Last encounter",
-  "lastName": "Last name",
-  "lastNameSort": "Last name (a-z)",
-  "lastVisit": "Last Visit",
-  "lastVisitDate": "Date",
   "loading": "Loading...",
   "location": "Location",
-  "male": "Male",
   "maleLabelText": "Male",
-  "match": "Match",
   "medications": "Medications",
-  "middleName": "Middle name",
   "minuteFormatted": "{{minutes}} minute(s)",
   "minutes": "Minutes",
   "missingLocation": "Missing location",
-  "missingPriority": "Please select a priority",
   "missingQueueName": "Missing queue name",
   "missingQueueRoom": "Please select a queue room",
   "missingQueueRoomName": "Missing queue room name",
   "missingQueueRoomService": "Missing queue room service",
   "missingService": "Missing service",
-  "missingVisitType": "Missing visit type",
   "modifyDefaultValue": "Modify default value",
   "movePatientToNextService": "Move patient to the next service?",
   "moveToNextService": "Move to next service",
   "name": "Name",
   "nextPage": "Next page",
-  "noActiveVisitsForLocation": "There are no active visits to display for this location.",
-  "noAppointmentsFound": "No appointments found",
   "noColumnsDefined": "No table columns defined. Check Configuration",
   "noEncountersFound": "No encounters found",
   "noLastEncounter": "There is no last encounter to display for this patient",
   "noLocationsAvailable": "No locations available",
   "noMedicationsFound": "No medications found",
   "noNotesFound": "No notes found",
-  "noPatientFoundMessage": "Sorry, no patient has been found",
   "noPatientsToDisplay": "No patients to display",
   "noPreviousVisitFound": "No previous visit found",
   "noPrioritiesConfigured": "No priorities configured",
   "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
   "noPrioritiesForServiceTitle": "No priorities available",
   "noPriorityFound": "No priority found",
-  "noResultsFound": "No results found",
   "noReturnDate": "There is no return date to display for this patient",
   "noServicesAvailable": "No services available",
   "noServicesConfigured": "No services configured",
   "noStatusConfigured": "No status configured",
   "notableConfig": "No table configuration",
   "notes": "Notes",
-  "noVisitsNotInQueueFound": "No visits currently not in queue found",
-  "noVisitTypesMatchingSearch": "There are no visit types matching this search text",
   "noVitalsFound": "No vitals found",
-  "oldest": "Oldest first",
   "onTime": "On time",
-  "or": "or",
   "orderDurationAndUnit": "for {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Indefinite duration",
-  "orInProperFormat": "Or",
-  "orPatientName": "OR the patient's name(s)",
   "patientAge": "Age",
-  "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
-  "patientHasActiveVisit": "The patient already has an active visit",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
@@ -171,23 +128,17 @@
   "patientRequeued": "Patient has been requeued",
   "patients": "Patients",
   "patientsCurrentlyInQueue": "Patients currently in queue",
-  "personalDetails": "Personal Details",
   "phoneNumber": "Phone number",
   "pleaseSelectLocation": "Please select a location",
-  "pleaseSelectService": "Please select a service",
-  "postCode": "Post code",
   "previousPage": "Previous page",
   "previousVisit": "Previous visit",
-  "primaryHelperText": "Search for a patient",
   "priority": "Priority",
   "priorityComment": "Priority comment",
   "priorityIsRequired": "Priority is required",
-  "program": "Program",
   "provider": "Provider",
   "quantity": "Quantity",
   "queueAddedSuccessfully": "Queue added successfully",
   "queueEntryAddedSuccessfully": "Queue entry added successfully",
-  "queueEntryAddFailed": "Error adding queue entry status",
   "queueEntryDeleteFailed": "Error deleting queue entry",
   "queueEntryDeleteSuccessful": "Queue entry deleted successfully",
   "queueEntryEdited": "Queue entry edited",
@@ -217,9 +168,6 @@
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
-  "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
-  "recentScheduledVisits_other": "{{count}} visits scheduled for +/- 7 days",
-  "recommended": "Recommended",
   "refills": "Refills",
   "removeFromQueueAndEndVisit": "Remove patient from queue and end active visit",
   "removePatient": "Remove patient",
@@ -233,40 +181,24 @@
   "save": "Save",
   "scheduledAppointmentsList": "Scheduled appointments patient list",
   "scheduledToday": "Scheduled for today",
-  "search": "Search",
-  "searchboxPlaceholder": "Search for a patient name or ID number",
-  "searchForAVisitType": "Search for a visit type",
-  "searchForPatient": "Search for a patient",
-  "searchPatient": "Search Patient",
   "searchThisList": "Search this list",
-  "secondaryHelperText": "Type the patient's name or unique ID number",
   "selectALocation": "Select a location",
   "selectAVisitType": "Select visit type",
-  "selectFacility": "Select a facility",
-  "selectOption": "Select an option",
-  "selectProgramType": "Select program type",
   "selectQueue": "Select a queue",
   "selectQueueLocation": "Select a queue location",
   "selectQueueService": "Select a queue service",
   "selectRoom": "Select a room",
   "selectService": "Select a service",
   "selectServiceType": "Select a service type",
-  "selectVisitType": "Please select a Visit Type",
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
   "serviceIsRequired": "Service is required",
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
-  "sex": "Sex",
-  "sortBy": "Sort by",
   "sortWeight": "Sort weight",
   "sp02": "Sp02",
   "startAgeRangeInvalid": "Start age range is not valid",
-  "startAVisit": "Start a visit",
-  "startVisit": "Start visit",
-  "startVisitError": "Error starting visit",
-  "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
   "status": "Status",
   "statusIsRequired": "Status is required",
   "submitting": "Submitting...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "Triage form",
   "triageNote": "Triage note",
-  "trySearchWithPatientUniqueID": "Try searching with the patient's unique ID number",
   "undoQueueEntryTransitionSuccess": "Undo transition success",
   "undoTransition": "Undo transition",
   "unexpectedServerResponse": "Unexpected Server Response",
@@ -295,14 +226,11 @@
   "updateRoom": "Update room",
   "useTodaysDate": "Use today's date",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
-  "visitStartTime": "Visit Time",
   "visitTabs": "Visit tabs",
   "visitType": "Visit Type",
   "vitals": "Vitals",
   "vitalsForm": "Vitals form",
   "vitalsNotRecordedForVisit": "Vitals has not been recorded for this patient for this visit",
   "waitingFor": "Waiting for",
-  "weight": "Weight",
-  "years": "Years",
-  "youngest": "Youngest first"
+  "weight": "Weight"
 }
diff --git a/packages/esm-service-queues-app/translations/vi.json b/packages/esm-service-queues-app/translations/vi.json
index c9b4b3c83..0c736af0c 100644
--- a/packages/esm-service-queues-app/translations/vi.json
+++ b/packages/esm-service-queues-app/translations/vi.json
@@ -1,10 +1,7 @@
 {
   "actions": "Hành động",
-  "activeVisits": "Những lượt khám đang hoạt động",
-  "activeVisitsNotInQueue": "Các lượt thăm khám đang hoạt động không có trong hàng đợi",
   "addAProviderQueueRoom": "Thêm phòng chờ của nhà cung cấp?",
-  "addEntry": "Thêm mục nhập",
-  "addisitToQueueTooltip": "Thêm",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "Thêm dịch vụ hàng đợi mới",
   "addNewQueueServiceRoom": "Thêm phòng dịch vụ xếp hàng mới",
   "addNewService": "Thêm dịch vụ mới",
@@ -17,20 +14,13 @@
   "addQueueRoomName": "Vui lòng thêm tên phòng chờ",
   "addQueueRoomService": "Vui lòng thêm dịch vụ phòng chờ",
   "addRoom": "Thêm phòng",
-  "addToQueue": "Thêm vào hàng đợi",
-  "addVisitToQueue": "Thêm lượt khám vào hàng đợi?",
-  "advancedSearch": "Tìm kiếm nâng cao",
   "age": "Tuổi",
   "alistOfClients": "Danh sách khách hàng đang chờ",
   "all": "Tất cả",
   "and": "Và",
-  "anotherVisitType": "Bắt đầu một loại thăm khám khác",
-  "any": "Bất kỳ",
   "applyFilters": "Áp dụng bộ lọc",
   "averageWaitTime": "Thời gian chờ trung bình ngày hôm nay",
-  "backToScheduledVisits": "Quay lại Lịch Thăm Khám",
   "backToSearchResults": "Quay lại kết quả tìm kiếm",
-  "backToSimpleSearch": "Quay lại tìm kiếm đơn giản",
   "between": "Khoảng Giữa",
   "bmi": "Bmi",
   "bp": "Bp",
@@ -39,7 +29,6 @@
   "checkedInPatients": "Đã kiểm tra bệnh nhân",
   "checkFilters": "Kiểm tra các bộ lọc ở trên",
   "chooseRoom": "Chọn một phòng",
-  "chooseService": "Chọn một dịch vụ",
   "clearAllQueueEntries": "Xóa tất cả các mục trong hàng đợi?",
   "clearAllQueueEntriesWarningMessage": "Xóa tất cả các mục nhập hàng đợi sẽ xóa tất cả bệnh nhân khỏi hàng đợi",
   "clearQueue": "Xóa hàng đợi",
@@ -55,8 +44,6 @@
   "currentVisit": "Lượt khám hiện tại",
   "date": "Ngày",
   "date&Time": "Ngày & giờ",
-  "dateAndTimeOfVisit": "Ngày và giờ thăm khám",
-  "dateOfBirth": "Ngày sinh",
   "delete": "Xóa",
   "deleteQueueEntry": "Xóa mục nhập hàng đợi",
   "discard": "Hủy",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "Lỗi khi thêm hàng đợi",
   "errorAddingQueueRoom": "Lỗi khi thêm phòng chờ",
   "errorClearingQueues": "Lỗi khi xóa hàng đợi",
-  "errorFetchingAppointments": "Lỗi khi tìm kiếm cuộc hẹn",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "Lỗi khi tải mục nhập hàng đợi",
   "errorPostingToScreen": "Lỗi khi đăng lên màn hình",
-  "facility": "Cơ sở",
-  "failedToLoadRecommendedVisitTypes": "Không tải được các loại chuyến thăm được đề xuất",
-  "female": "Nữ giới",
   "femaleLabelText": "Nữ giới",
-  "fields": "của các trường sau",
   "filter": "Lọc",
   "filterByService": "Lọc theo dịch vụ:",
   "filterByStatus": "Lọc theo trạng thái:",
   "filterTable": "Bảng lọc",
-  "firstName": "Tên đầu tiên",
-  "firstNameSort": "Tên (a-z)",
-  "futureScheduledVisits_one": "{{count}} lượt thăm khám được lên lịch cho những ngày trong tương lai",
-  "futureScheduledVisits_other": "{{count}} lượt thăm khám được lên lịch cho các ngày trong tương lai",
   "gender": "Giới tính",
   "heartRate": "Nhịp tim",
   "height": "Chiều cao",
   "hourAndMinuteFormatted": "{{hours}} giờ(s) và {{minutes}} phút(s)",
-  "idNumber": "Số CCCD",
   "indication": "Chỉnh định",
   "invalidQueue": "Hàng đợi không hợp lệ",
   "invalidtableConfig": "Cấu hình bảng không hợp lệ",
   "lastEncounter": "Cuộc gặp gỡ cuối cùng",
-  "lastName": "Họ",
-  "lastNameSort": "Họ (a-z)",
-  "lastVisit": "Chuyến thăm cuối",
-  "lastVisitDate": "Ngày",
   "loading": "Đang tải...",
   "location": "Vị trí",
-  "male": "Nam giới",
   "maleLabelText": "Nam giới",
-  "match": "Match",
   "medications": "Thuốc",
-  "middleName": "Tên đệm",
   "minuteFormatted": "{{minutes}} phút(s)",
   "minutes": "Phút",
   "missingLocation": "Vị trí bị thiếu",
-  "missingPriority": "Vui lòng chọn một mức ưu tiên",
   "missingQueueName": "Tên hàng đợi bị thiếu",
   "missingQueueRoom": "Vui lòng chọn phòng chờ",
   "missingQueueRoomName": "Thiếu tên phòng xếp hàng",
   "missingQueueRoomService": "Thiếu dịch vụ phòng chờ",
   "missingService": "Thiếu dịch vụ",
-  "missingVisitType": "Loại lượt thăm khám bị thiếu",
   "modifyDefaultValue": "Sửa đổi giá trị mặc định",
   "movePatientToNextService": "Chuyển bệnh nhân sang dịch vụ tiếp theo?",
   "moveToNextService": "Chuyển sang dịch vụ tiếp theo",
   "name": "Tên",
   "nextPage": "Trang tiếp theo",
-  "noActiveVisitsForLocation": "Không có lượt khám nào đang hoạt động để hiển thị cho vị trí này.",
-  "noAppointmentsFound": "Không tìm thấy cuộc hẹn nào",
   "noColumnsDefined": "Không có cột bảng nào được xác định. Kiểm tra cấu hình",
   "noEncountersFound": "Không tìm thấy cuộc gặp gỡ nào",
   "noLastEncounter": "Không có cuộc gặp gỡ cuối cùng nào được hiển thị cho bệnh nhân này",
   "noLocationsAvailable": "Không có vị trí nào có sẵn",
   "noMedicationsFound": "Không tìm thấy thuốc",
   "noNotesFound": "Không tìm thấy ghi chú",
-  "noPatientFoundMessage": "Xin lỗi, không có bệnh nhân nào được tìm thấy",
   "noPatientsToDisplay": "Không có bệnh nhân để hiển thị",
   "noPreviousVisitFound": "Không tìm thấy lượt thăm khám trước",
   "noPrioritiesConfigured": "Không có ưu tiên nào được cấu hình",
   "noPrioritiesForService": "Dịch vụ đã chọn không có bất kỳ ưu tiên nào được phép. Đây là lỗi trong cấu hình. Vui lòng liên hệ với quản trị viên hệ thống của bạn.",
   "noPrioritiesForServiceTitle": "Không có ưu tiên nào có sẵn",
   "noPriorityFound": "Không tìm thấy ưu tiên",
-  "noResultsFound": "Không tìm thấy kết quả nào",
   "noReturnDate": "Không có ngày trở lại để hiển thị cho bệnh nhân này",
   "noServicesAvailable": "Không có dịch vụ nào có sẵn",
   "noServicesConfigured": "Không có dịch vụ nào được cấu hình",
   "noStatusConfigured": "Không có trạng thái nào được cấu hình",
   "notableConfig": "Không có cấu hình bảng",
   "notes": "Ghi chú",
-  "noVisitsNotInQueueFound": "Không có lượt khám nào hiện không có trong hàng đợi",
-  "noVisitTypesMatchingSearch": "Không có loại thăm khám nào khớp với văn bản tìm kiếm này",
   "noVitalsFound": "Không tìm thấy dấu hiệu sinh tồn",
-  "oldest": "Cũ nhất trước",
   "onTime": "Đúng giờ",
-  "or": "hoặc",
   "orderDurationAndUnit": "cho {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "Thời hạn không xác định",
-  "orInProperFormat": "Hoặc",
-  "orPatientName": "HOẶC tên bệnh nhân (s)",
   "patientAge": "Tuổi",
-  "patientAlreadyInQueue": "Bệnh nhân đã có trong hàng đợi",
   "patientAttendingService": "Dịch vụ chăm sóc bệnh nhân",
-  "patientHasActiveVisit": "Bệnh nhân đã có một lượt thăm khám đang hoạt động",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Danh sách bệnh nhân",
   "patientName": "Tên bệnh nhân",
@@ -171,23 +128,17 @@
   "patientRequeued": "Bệnh nhân đã được xếp hàng lại",
   "patients": "Bệnh nhân",
   "patientsCurrentlyInQueue": "Bệnh nhân hiện đang xếp hàng",
-  "personalDetails": "Chi tiết cá nhân",
   "phoneNumber": "Số điện thoại",
   "pleaseSelectLocation": "Vui lòng chọn một vị trí",
-  "pleaseSelectService": "Vui lòng chọn một dịch vụ",
-  "postCode": "Mã bưu chính",
   "previousPage": "Trang trước",
   "previousVisit": "Lần khám trước",
-  "primaryHelperText": "Tìm kiếm bệnh nhân",
   "priority": "Ưu tiên",
   "priorityComment": "Bình luận ưu tiên",
   "priorityIsRequired": "Ưu tiên là bắt buộc",
-  "program": "Chương trình",
   "provider": "Nhà cung cấp",
   "quantity": "Số lượng",
   "queueAddedSuccessfully": "Đã thêm hàng đợi thành công",
   "queueEntryAddedSuccessfully": "Đã thêm mục nhập hàng đợi thành công",
-  "queueEntryAddFailed": "Lỗi khi thêm trạng thái mục nhập hàng đợi",
   "queueEntryDeleteFailed": "Lỗi khi xóa mục nhập hàng đợi",
   "queueEntryDeleteSuccessful": "Đã xóa thành công mục nhập hàng đợi",
   "queueEntryEdited": "Đã chỉnh sửa mục nhập hàng đợi",
@@ -217,9 +168,6 @@
   "queueScreen": "Màn hình hàng đợi",
   "queueService": "Dịch vụ hàng đợi",
   "queueStatus": "Trạng thái hàng đợi",
-  "recentScheduledVisits_one": "{{count}} lượt thăm khám được lên lịch trong +/- 7 ngày",
-  "recentScheduledVisits_other": "{{count}} lượt thăm khám được lên lịch trong +/- 7 ngày",
-  "recommended": "Khuyến nghị",
   "refills": "Nạp lại",
   "removeFromQueueAndEndVisit": "Xóa bệnh nhân khỏi hàng đợi và kết thúc lượt khám đang hoạt động",
   "removePatient": "Xóa bệnh nhân",
@@ -233,40 +181,24 @@
   "save": "Lưu",
   "scheduledAppointmentsList": "Danh sách bệnh nhân đã lên lịch hẹn",
   "scheduledToday": "Đã lên lịch cho hôm nay",
-  "search": "Tìm kiếm",
-  "searchboxPlaceholder": "Tìm kiếm tên bệnh nhân hoặc số ID",
-  "searchForAVisitType": "Tìm kiếm loại chuyến thăm",
-  "searchForPatient": "Tìm kiếm bệnh nhân",
-  "searchPatient": "Tìm kiếm bệnh nhân",
   "searchThisList": "Tìm kiếm danh sách này",
-  "secondaryHelperText": "Nhập tên bệnh nhân hoặc số ID duy nhất",
   "selectALocation": "Chọn một vị trí",
   "selectAVisitType": "Chọn loại thăm quan",
-  "selectFacility": "Chọn một cơ sở",
-  "selectOption": "Chọn một tùy chọn",
-  "selectProgramType": "Chọn loại chương trình",
   "selectQueue": "Chọn một hàng đợi",
   "selectQueueLocation": "Chọn vị trí hàng đợi",
   "selectQueueService": "Chọn dịch vụ xếp hàng",
   "selectRoom": "Chọn một phòng",
   "selectService": "Chọn một dịch vụ",
   "selectServiceType": "Chọn loại dịch vụ",
-  "selectVisitType": "Vui lòng chọn Loại thăm khám",
   "serve": "Phục vụ",
   "servePatient": "Phục vụ bệnh nhân",
   "service": "Dịch vụ",
   "serviceIsRequired": "Dịch vụ được yêu cầu",
   "serviceQueue": "Hàng đợi dịch vụ",
   "serviceQueues": "Hàng đợi dịch vụ",
-  "sex": "Giới tính",
-  "sortBy": "Sắp xếp theo",
   "sortWeight": "Sắp xếp trọng lượng",
   "sp02": "Sp02",
   "startAgeRangeInvalid": "Độ tuổi bắt đầu không hợp lệ",
-  "startAVisit": "Bắt đầu một chuyến thăm",
-  "startVisit": "Bắt đầu chuyến thăm",
-  "startVisitError": "Lỗi khi bắt đầu lượt khám",
-  "startVisitQueueSuccessfully": "Bệnh nhân đã được thêm vào danh sách khám đang hoạt động và hàng đợi.",
   "status": "Trạng thái",
   "statusIsRequired": "Trạng thái là bắt buộc",
   "submitting": "Đang nộp...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "Chọn trạng thái hoặc hàng đợi mới để bệnh nhân chuyển sang.",
   "triageForm": "Biểu mẫu phân loại",
   "triageNote": "Ghi chú phân loại",
-  "trySearchWithPatientUniqueID": "Hãy thử tìm kiếm bằng số ID duy nhất của bệnh nhân",
   "undoQueueEntryTransitionSuccess": "Hoàn tác chuyển đổi thành công",
   "undoTransition": "Hoàn tác chuyển đổi",
   "unexpectedServerResponse": "Phản hồi máy chủ không mong đợi",
@@ -295,14 +226,11 @@
   "updateRoom": "Cập nhật phòng",
   "useTodaysDate": "Sử dụng ngày hôm nay",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
-  "visitStartTime": "Thời gian khám",
   "visitTabs": "Thẻ khám",
   "visitType": "Loại khám",
   "vitals": "Các yếu tố quan trọng",
   "vitalsForm": "Hình thức quan trọng",
   "vitalsNotRecordedForVisit": "Các dấu hiệu sinh tồn chưa được ghi lại cho bệnh nhân này trong lần khám này",
   "waitingFor": "Đang chờ đợi",
-  "weight": "Cân nặng",
-  "years": "Năm",
-  "youngest": "Trẻ nhất trước"
+  "weight": "Cân nặng"
 }
diff --git a/packages/esm-service-queues-app/translations/zh.json b/packages/esm-service-queues-app/translations/zh.json
index 39b26c545..7fcb1e26e 100644
--- a/packages/esm-service-queues-app/translations/zh.json
+++ b/packages/esm-service-queues-app/translations/zh.json
@@ -1,10 +1,7 @@
 {
   "actions": "操作",
-  "activeVisits": "活动就诊",
-  "activeVisitsNotInQueue": "活动就诊不在队列中",
   "addAProviderQueueRoom": "Add a provider queue room?",
-  "addEntry": "添加条目",
-  "addisitToQueueTooltip": "添加",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "添加新队列服务",
   "addNewQueueServiceRoom": "添加新队列诊室",
   "addNewService": "添加新服务",
@@ -17,29 +14,21 @@
   "addQueueRoomName": "请添加一个候诊室名称",
   "addQueueRoomService": "请添加一个候诊室服务",
   "addRoom": "添加诊室",
-  "addToQueue": "加入队列",
-  "addVisitToQueue": "将就诊加入队列？",
-  "advancedSearch": "高级搜索",
   "age": "年龄",
   "alistOfClients": "等待名单",
   "all": "全部",
   "and": "And",
-  "anotherVisitType": "开始另一种就诊类型",
-  "any": "Any",
   "applyFilters": "应用筛选条件",
   "averageWaitTime": "今日平均等待时间。",
-  "backToScheduledVisits": "返回到已安排的就诊",
   "backToSearchResults": "Back to search results",
-  "backToSimpleSearch": "返回到简单搜索",
   "between": "Between",
-  "bmi": "BMI",
+  "bmi": "Bmi",
   "bp": "血压",
   "call": "呼叫",
   "cancel": "取消",
   "checkedInPatients": "已签到患者",
   "checkFilters": "检查上方的筛选条件",
   "chooseRoom": "选择一个诊室",
-  "chooseService": "选择一个服务",
   "clearAllQueueEntries": "清除所有队列条目？",
   "clearAllQueueEntriesWarningMessage": "清空所有队列条目会将所有患者从队列中移除",
   "clearQueue": "清除队列",
@@ -55,8 +44,6 @@
   "currentVisit": "当前就诊",
   "date": "日期",
   "date&Time": "日期&时间",
-  "dateAndTimeOfVisit": "就诊日期和时间",
-  "dateOfBirth": "出生日期",
   "delete": "删除",
   "deleteQueueEntry": "删除队列条目",
   "discard": "放弃",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "清除队列时出现错误",
   "errorAddingQueueRoom": "添加候诊室时出现错误",
   "errorClearingQueues": "清除队列时出现错误",
-  "errorFetchingAppointments": "Error fetching appointments",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "加载队列条目时出现错误",
   "errorPostingToScreen": "发布至大屏时出现错误",
-  "facility": "机构",
-  "failedToLoadRecommendedVisitTypes": "无法加载推荐的就诊类型",
-  "female": "女性",
   "femaleLabelText": "女性",
-  "fields": "of the following fields",
   "filter": "筛选",
   "filterByService": "Filter by service:",
   "filterByStatus": "Filter by status:",
   "filterTable": "筛选表格",
-  "firstName": "名字",
-  "firstNameSort": "名字（a-z）",
-  "futureScheduledVisits_one": "{{count}} visit scheduled for dates in the future",
-  "futureScheduledVisits_other": "{{count}} visits scheduled for dates in the future",
   "gender": "性别",
   "heartRate": "心率",
   "height": "身高",
   "hourAndMinuteFormatted": "{{hours}}小时{{minutes}}分钟",
-  "idNumber": "ID",
   "indication": "适应症",
   "invalidQueue": "无效队列",
   "invalidtableConfig": "表格配置无效",
   "lastEncounter": "上次问诊",
-  "lastName": "姓氏",
-  "lastNameSort": "姓氏（a-z）",
-  "lastVisit": "上次就诊",
-  "lastVisitDate": "日期",
   "loading": "加载中...",
   "location": "Location",
-  "male": "男性",
   "maleLabelText": "男性",
-  "match": "匹配",
   "medications": "药物",
-  "middleName": "中间名",
   "minuteFormatted": "{{分钟}}分钟",
   "minutes": "分钟",
   "missingLocation": "地点缺失",
-  "missingPriority": "请选择一个优先级",
   "missingQueueName": "队列名称缺失",
   "missingQueueRoom": "请选择一个候诊室",
   "missingQueueRoomName": "候诊室名称缺失",
   "missingQueueRoomService": "候诊室服务缺失",
   "missingService": "服务缺失",
-  "missingVisitType": "就诊类型缺失",
   "modifyDefaultValue": "修改默认值",
   "movePatientToNextService": "将患者转移到下一个服务？",
   "moveToNextService": "转移到下一个服务",
   "name": "姓名",
   "nextPage": "下一页",
-  "noActiveVisitsForLocation": "在这个地点没有活动的就诊记录可供显示。",
-  "noAppointmentsFound": "未找到预约",
   "noColumnsDefined": "未定义表格列，请检查配置。",
   "noEncountersFound": "未找到问诊记录",
   "noLastEncounter": "该患者没有可显示的最近问诊记录",
   "noLocationsAvailable": "没有可用的地点",
   "noMedicationsFound": "未找到药物",
   "noNotesFound": "未找到备注",
-  "noPatientFoundMessage": "抱歉，未找到任何患者。",
   "noPatientsToDisplay": "没有患者可显示",
   "noPreviousVisitFound": "未找到先前的就诊",
   "noPrioritiesConfigured": "未配置优先级",
   "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
   "noPrioritiesForServiceTitle": "No priorities available",
   "noPriorityFound": "未找到优先级",
-  "noResultsFound": "未找到结果",
   "noReturnDate": "该患者没有可显示的最近回访日期",
   "noServicesAvailable": "没有可用的服务",
   "noServicesConfigured": "未配置服务",
   "noStatusConfigured": "未配置状态",
   "notableConfig": "没有表格配置",
   "notes": "备注",
-  "noVisitsNotInQueueFound": "当前没有找到不在队列中的就诊",
-  "noVisitTypesMatchingSearch": "没有与此搜索文本匹配的就诊类型",
   "noVitalsFound": "未找到就诊记录",
-  "oldest": "老人优先",
   "onTime": "准时",
-  "or": "或者",
   "orderDurationAndUnit": "持续 {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "无限期",
-  "orInProperFormat": "或者",
-  "orPatientName": "或者患者的姓名",
   "patientAge": "Age",
-  "patientAlreadyInQueue": "患者已在队列中",
   "patientAttendingService": "患者就诊服务",
-  "patientHasActiveVisit": "该患者已经有一个进行中的就诊",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "患者列表",
   "patientName": "患者姓名",
@@ -171,23 +128,17 @@
   "patientRequeued": "患者已重新加入队列",
   "patients": "患者",
   "patientsCurrentlyInQueue": "当前排队的患者",
-  "personalDetails": "个人详情",
   "phoneNumber": "电话号码",
   "pleaseSelectLocation": "请选择一个地点",
-  "pleaseSelectService": "请选择一个服务",
-  "postCode": "邮政编码",
   "previousPage": "上一页",
   "previousVisit": "上次就诊",
-  "primaryHelperText": "搜索患者",
   "priority": "优先级",
   "priorityComment": "优先级注释",
   "priorityIsRequired": "优先级是必填项",
-  "program": "项目",
   "provider": "提供者",
   "quantity": "数量",
   "queueAddedSuccessfully": "队列成功添加",
   "queueEntryAddedSuccessfully": "队列条目添加成功",
-  "queueEntryAddFailed": "添加队列条目状态时出现错误",
   "queueEntryDeleteFailed": "删除队列条目时出现错误",
   "queueEntryDeleteSuccessful": "队列条目删除成功",
   "queueEntryEdited": "队列条目已编辑",
@@ -217,9 +168,6 @@
   "queueScreen": "队列显示屏",
   "queueService": "队列服务",
   "queueStatus": "队列状态",
-  "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
-  "recentScheduledVisits_other": "{{count}} visits scheduled for +/- 7 days",
-  "recommended": "推荐",
   "refills": "补充处方",
   "removeFromQueueAndEndVisit": "将患者从队列中移除并结束当前的就诊",
   "removePatient": "移除患者",
@@ -233,40 +181,24 @@
   "save": "保存",
   "scheduledAppointmentsList": "预约患者名单",
   "scheduledToday": "今日安排",
-  "search": "搜索",
-  "searchboxPlaceholder": "搜索患者姓名或ID标识",
-  "searchForAVisitType": "搜索就诊类型",
-  "searchForPatient": "搜索患者",
-  "searchPatient": "搜索患者",
   "searchThisList": "搜索此列表",
-  "secondaryHelperText": "输入患者姓名或唯一ID编号",
   "selectALocation": "Select a location",
   "selectAVisitType": "选择就诊类型",
-  "selectFacility": "选择一个机构",
-  "selectOption": "选择一个选项",
-  "selectProgramType": "选择项目类型",
   "selectQueue": "选择一个队列",
   "selectQueueLocation": "选择一个队列地点",
   "selectQueueService": "选择一个队列服务",
   "selectRoom": "选择一个诊室",
   "selectService": "选择一个服务",
   "selectServiceType": "选择一个服务类型",
-  "selectVisitType": "请选择就诊类型",
   "serve": "接待",
   "servePatient": "接待患者",
   "service": "服务",
   "serviceIsRequired": "Service is required",
   "serviceQueue": "服务队列",
   "serviceQueues": "服务队列",
-  "sex": "性别",
-  "sortBy": "排序方式",
   "sortWeight": "排序权重",
   "sp02": "血氧",
   "startAgeRangeInvalid": "起始年龄范围无效",
-  "startAVisit": "开始就诊",
-  "startVisit": "开始就诊",
-  "startVisitError": "开始就诊时出现错误",
-  "startVisitQueueSuccessfully": "患者已添加到活动就诊列表和队列中。",
   "status": "状态",
   "statusIsRequired": "Status is required",
   "submitting": "Submitting...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "选择一个新的状态或队列用于患者的转诊。",
   "triageForm": "分诊表",
   "triageNote": "分诊记录",
-  "trySearchWithPatientUniqueID": "尝试使用患者的唯一ID进行搜索",
   "undoQueueEntryTransitionSuccess": "Undo transition success",
   "undoTransition": "Undo transition",
   "unexpectedServerResponse": "意外的服务器响应",
@@ -295,14 +226,11 @@
   "updateRoom": "更新诊室",
   "useTodaysDate": "使用今天的日期",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
-  "visitStartTime": "就诊时间",
   "visitTabs": "Visit tabs",
   "visitType": "就诊类型",
   "vitals": "生命体征",
   "vitalsForm": "生命体征表单",
   "vitalsNotRecordedForVisit": "此次就诊未记录该患者的生命体征",
   "waitingFor": "等待中",
-  "weight": "体重",
-  "years": "Years",
-  "youngest": "儿童优先"
+  "weight": "体重"
 }
diff --git a/packages/esm-service-queues-app/translations/zh_CN.json b/packages/esm-service-queues-app/translations/zh_CN.json
index 39b26c545..492649ad5 100644
--- a/packages/esm-service-queues-app/translations/zh_CN.json
+++ b/packages/esm-service-queues-app/translations/zh_CN.json
@@ -1,10 +1,7 @@
 {
   "actions": "操作",
-  "activeVisits": "活动就诊",
-  "activeVisitsNotInQueue": "活动就诊不在队列中",
   "addAProviderQueueRoom": "Add a provider queue room?",
-  "addEntry": "添加条目",
-  "addisitToQueueTooltip": "添加",
+  "addedPatientToQueue": "Added patient to queue",
   "addNewQueueService": "添加新队列服务",
   "addNewQueueServiceRoom": "添加新队列诊室",
   "addNewService": "添加新服务",
@@ -17,20 +14,13 @@
   "addQueueRoomName": "请添加一个候诊室名称",
   "addQueueRoomService": "请添加一个候诊室服务",
   "addRoom": "添加诊室",
-  "addToQueue": "加入队列",
-  "addVisitToQueue": "将就诊加入队列？",
-  "advancedSearch": "高级搜索",
   "age": "年龄",
   "alistOfClients": "等待名单",
   "all": "全部",
   "and": "And",
-  "anotherVisitType": "开始另一种就诊类型",
-  "any": "Any",
   "applyFilters": "应用筛选条件",
   "averageWaitTime": "今日平均等待时间。",
-  "backToScheduledVisits": "返回到已安排的就诊",
   "backToSearchResults": "Back to search results",
-  "backToSimpleSearch": "返回到简单搜索",
   "between": "Between",
   "bmi": "BMI",
   "bp": "血压",
@@ -39,7 +29,6 @@
   "checkedInPatients": "已签到患者",
   "checkFilters": "检查上方的筛选条件",
   "chooseRoom": "选择一个诊室",
-  "chooseService": "选择一个服务",
   "clearAllQueueEntries": "清除所有队列条目？",
   "clearAllQueueEntriesWarningMessage": "清空所有队列条目会将所有患者从队列中移除",
   "clearQueue": "清除队列",
@@ -55,8 +44,6 @@
   "currentVisit": "当前就诊",
   "date": "日期",
   "date&Time": "日期&时间",
-  "dateAndTimeOfVisit": "就诊日期和时间",
-  "dateOfBirth": "出生日期",
   "delete": "删除",
   "deleteQueueEntry": "删除队列条目",
   "discard": "放弃",
@@ -74,93 +61,63 @@
   "errorAddingQueue": "清除队列时出现错误",
   "errorAddingQueueRoom": "添加候诊室时出现错误",
   "errorClearingQueues": "清除队列时出现错误",
-  "errorFetchingAppointments": "Error fetching appointments",
+  "errorFetchingVisit": "Error fetching patient visit",
   "errorLoadingQueueEntries": "加载队列条目时出现错误",
   "errorPostingToScreen": "发布至大屏时出现错误",
-  "facility": "机构",
-  "failedToLoadRecommendedVisitTypes": "无法加载推荐的就诊类型",
-  "female": "女性",
   "femaleLabelText": "女性",
-  "fields": "of the following fields",
   "filter": "筛选",
   "filterByService": "Filter by service:",
   "filterByStatus": "Filter by status:",
   "filterTable": "筛选表格",
-  "firstName": "名字",
-  "firstNameSort": "名字（a-z）",
-  "futureScheduledVisits_one": "{{count}} visit scheduled for dates in the future",
-  "futureScheduledVisits_other": "{{count}} visits scheduled for dates in the future",
   "gender": "性别",
   "heartRate": "心率",
   "height": "身高",
   "hourAndMinuteFormatted": "{{hours}}小时{{minutes}}分钟",
-  "idNumber": "ID",
   "indication": "适应症",
   "invalidQueue": "无效队列",
   "invalidtableConfig": "表格配置无效",
   "lastEncounter": "上次问诊",
-  "lastName": "姓氏",
-  "lastNameSort": "姓氏（a-z）",
-  "lastVisit": "上次就诊",
-  "lastVisitDate": "日期",
   "loading": "加载中...",
   "location": "Location",
-  "male": "男性",
   "maleLabelText": "男性",
-  "match": "匹配",
   "medications": "药物",
-  "middleName": "中间名",
   "minuteFormatted": "{{分钟}}分钟",
   "minutes": "分钟",
   "missingLocation": "地点缺失",
-  "missingPriority": "请选择一个优先级",
   "missingQueueName": "队列名称缺失",
   "missingQueueRoom": "请选择一个候诊室",
   "missingQueueRoomName": "候诊室名称缺失",
   "missingQueueRoomService": "候诊室服务缺失",
   "missingService": "服务缺失",
-  "missingVisitType": "就诊类型缺失",
   "modifyDefaultValue": "修改默认值",
   "movePatientToNextService": "将患者转移到下一个服务？",
   "moveToNextService": "转移到下一个服务",
   "name": "姓名",
   "nextPage": "下一页",
-  "noActiveVisitsForLocation": "在这个地点没有活动的就诊记录可供显示。",
-  "noAppointmentsFound": "未找到预约",
   "noColumnsDefined": "未定义表格列，请检查配置。",
   "noEncountersFound": "未找到问诊记录",
   "noLastEncounter": "该患者没有可显示的最近问诊记录",
   "noLocationsAvailable": "没有可用的地点",
   "noMedicationsFound": "未找到药物",
   "noNotesFound": "未找到备注",
-  "noPatientFoundMessage": "抱歉，未找到任何患者。",
   "noPatientsToDisplay": "没有患者可显示",
   "noPreviousVisitFound": "未找到先前的就诊",
   "noPrioritiesConfigured": "未配置优先级",
   "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
   "noPrioritiesForServiceTitle": "No priorities available",
   "noPriorityFound": "未找到优先级",
-  "noResultsFound": "未找到结果",
   "noReturnDate": "该患者没有可显示的最近回访日期",
   "noServicesAvailable": "没有可用的服务",
   "noServicesConfigured": "未配置服务",
   "noStatusConfigured": "未配置状态",
   "notableConfig": "没有表格配置",
   "notes": "备注",
-  "noVisitsNotInQueueFound": "当前没有找到不在队列中的就诊",
-  "noVisitTypesMatchingSearch": "没有与此搜索文本匹配的就诊类型",
   "noVitalsFound": "未找到就诊记录",
-  "oldest": "老人优先",
   "onTime": "准时",
-  "or": "或者",
   "orderDurationAndUnit": "持续 {{duration}} {{durationUnit}}",
   "orderIndefiniteDuration": "无限期",
-  "orInProperFormat": "或者",
-  "orPatientName": "或者患者的姓名",
   "patientAge": "Age",
-  "patientAlreadyInQueue": "患者已在队列中",
   "patientAttendingService": "患者就诊服务",
-  "patientHasActiveVisit": "该患者已经有一个进行中的就诊",
   "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "患者列表",
   "patientName": "患者姓名",
@@ -171,23 +128,17 @@
   "patientRequeued": "患者已重新加入队列",
   "patients": "患者",
   "patientsCurrentlyInQueue": "当前排队的患者",
-  "personalDetails": "个人详情",
   "phoneNumber": "电话号码",
   "pleaseSelectLocation": "请选择一个地点",
-  "pleaseSelectService": "请选择一个服务",
-  "postCode": "邮政编码",
   "previousPage": "上一页",
   "previousVisit": "上次就诊",
-  "primaryHelperText": "搜索患者",
   "priority": "优先级",
   "priorityComment": "优先级注释",
   "priorityIsRequired": "优先级是必填项",
-  "program": "项目",
   "provider": "提供者",
   "quantity": "数量",
   "queueAddedSuccessfully": "队列成功添加",
   "queueEntryAddedSuccessfully": "队列条目添加成功",
-  "queueEntryAddFailed": "添加队列条目状态时出现错误",
   "queueEntryDeleteFailed": "删除队列条目时出现错误",
   "queueEntryDeleteSuccessful": "队列条目删除成功",
   "queueEntryEdited": "队列条目已编辑",
@@ -217,9 +168,6 @@
   "queueScreen": "队列显示屏",
   "queueService": "队列服务",
   "queueStatus": "队列状态",
-  "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
-  "recentScheduledVisits_other": "{{count}} visits scheduled for +/- 7 days",
-  "recommended": "推荐",
   "refills": "补充处方",
   "removeFromQueueAndEndVisit": "将患者从队列中移除并结束当前的就诊",
   "removePatient": "移除患者",
@@ -233,40 +181,24 @@
   "save": "保存",
   "scheduledAppointmentsList": "预约患者名单",
   "scheduledToday": "今日安排",
-  "search": "搜索",
-  "searchboxPlaceholder": "搜索患者姓名或ID标识",
-  "searchForAVisitType": "搜索就诊类型",
-  "searchForPatient": "搜索患者",
-  "searchPatient": "搜索患者",
   "searchThisList": "搜索此列表",
-  "secondaryHelperText": "输入患者姓名或唯一ID编号",
   "selectALocation": "Select a location",
   "selectAVisitType": "选择就诊类型",
-  "selectFacility": "选择一个机构",
-  "selectOption": "选择一个选项",
-  "selectProgramType": "选择项目类型",
   "selectQueue": "选择一个队列",
   "selectQueueLocation": "选择一个队列地点",
   "selectQueueService": "选择一个队列服务",
   "selectRoom": "选择一个诊室",
   "selectService": "选择一个服务",
   "selectServiceType": "选择一个服务类型",
-  "selectVisitType": "请选择就诊类型",
   "serve": "接待",
   "servePatient": "接待患者",
   "service": "服务",
   "serviceIsRequired": "Service is required",
   "serviceQueue": "服务队列",
   "serviceQueues": "服务队列",
-  "sex": "性别",
-  "sortBy": "排序方式",
   "sortWeight": "排序权重",
   "sp02": "血氧",
   "startAgeRangeInvalid": "起始年龄范围无效",
-  "startAVisit": "开始就诊",
-  "startVisit": "开始就诊",
-  "startVisitError": "开始就诊时出现错误",
-  "startVisitQueueSuccessfully": "患者已添加到活动就诊列表和队列中。",
   "status": "状态",
   "statusIsRequired": "Status is required",
   "submitting": "Submitting...",
@@ -286,7 +218,6 @@
   "transitionPatientStatusOrQueue": "选择一个新的状态或队列用于患者的转诊。",
   "triageForm": "分诊表",
   "triageNote": "分诊记录",
-  "trySearchWithPatientUniqueID": "尝试使用患者的唯一ID进行搜索",
   "undoQueueEntryTransitionSuccess": "Undo transition success",
   "undoTransition": "Undo transition",
   "unexpectedServerResponse": "意外的服务器响应",
@@ -295,14 +226,11 @@
   "updateRoom": "更新诊室",
   "useTodaysDate": "使用今天的日期",
   "visitQueueNumberAttributeUuid not configured": "visitQueueNumberAttributeUuid not configured",
-  "visitStartTime": "就诊时间",
   "visitTabs": "Visit tabs",
   "visitType": "就诊类型",
   "vitals": "生命体征",
   "vitalsForm": "生命体征表单",
   "vitalsNotRecordedForVisit": "此次就诊未记录该患者的生命体征",
   "waitingFor": "等待中",
-  "weight": "体重",
-  "years": "Years",
-  "youngest": "儿童优先"
+  "weight": "体重"
 }
diff --git a/packages/esm-ward-app/package.json b/packages/esm-ward-app/package.json
index fd82d29ef..29d0df1a9 100644
--- a/packages/esm-ward-app/package.json
+++ b/packages/esm-ward-app/package.json
@@ -37,7 +37,7 @@
     "url": "https://github.com/openmrs/openmrs-esm-patient-management/issues"
   },
   "dependencies": {
-    "@carbon/react": "~1.37.0",
+    "@carbon/react": "^1.71.0",
     "lodash-es": "^4.17.15"
   },
   "peerDependencies": {
diff --git a/packages/esm-ward-app/src/action-menu-buttons/clinical-forms-workspace-siderail.component.tsx b/packages/esm-ward-app/src/action-menu-buttons/clinical-forms-workspace-siderail.component.tsx
index d5faca5b7..0b62c566a 100644
--- a/packages/esm-ward-app/src/action-menu-buttons/clinical-forms-workspace-siderail.component.tsx
+++ b/packages/esm-ward-app/src/action-menu-buttons/clinical-forms-workspace-siderail.component.tsx
@@ -29,7 +29,7 @@ const ClinicalFormsWorkspaceSideRailIcon: React.FC = () => {
       label={t('clinicalForms', 'Clinical forms')}
       iconDescription={t('clinicalForms', 'Clinical forms')}
       handler={launchPatientWorkspaceCb}
-      type="ward-patient-clinical-form"
+      type="ward-patient-clinical-forms"
     />
   );
 };
diff --git a/packages/esm-ward-app/src/action-menu-buttons/discharge-workspace-siderail.component.tsx b/packages/esm-ward-app/src/action-menu-buttons/discharge-workspace-siderail.component.tsx
index 63e32d822..dd2b5451b 100644
--- a/packages/esm-ward-app/src/action-menu-buttons/discharge-workspace-siderail.component.tsx
+++ b/packages/esm-ward-app/src/action-menu-buttons/discharge-workspace-siderail.component.tsx
@@ -14,7 +14,7 @@ export default function PatientDischargeSideRailIcon() {
       label={t('discharge', 'Discharge')}
       iconDescription={t('discharge', 'Discharge')}
       handler={handler}
-      type="patient-discharge-workspace"
+      type="ward-patient-discharge"
     />
   );
 }
diff --git a/packages/esm-ward-app/src/index.ts b/packages/esm-ward-app/src/index.ts
index 66bd2816d..7d43e89a5 100644
--- a/packages/esm-ward-app/src/index.ts
+++ b/packages/esm-ward-app/src/index.ts
@@ -117,10 +117,4 @@ export function startupApp() {
     'Bed management module',
     'Enables features related to bed management / assignment. Requires the backend bed management module to be installed.',
   );
-
-  registerFeatureFlag(
-    'ward-view-vertical-tiling',
-    'Ward view vertical tiling',
-    'Enable tiling of bed cards vertically in the ward view.',
-  );
 }
diff --git a/packages/esm-ward-app/src/root.component.tsx b/packages/esm-ward-app/src/root.component.tsx
index 972cb69ad..61a2f0822 100644
--- a/packages/esm-ward-app/src/root.component.tsx
+++ b/packages/esm-ward-app/src/root.component.tsx
@@ -15,8 +15,6 @@ const Root: React.FC = () => {
           <Route path="/:locationUuid" element={<WardView />} />
         </Routes>
       </BrowserRouter>
-      
-      <WorkspaceContainer overlay contextKey="ward" />
     </main>
   );
 };
diff --git a/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-identifier.tsx b/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-identifier.tsx
index 877782840..d7db313f6 100644
--- a/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-identifier.tsx
+++ b/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-identifier.tsx
@@ -1,5 +1,5 @@
-import { type Patient, type PatientIdentifier, PatientBannerPatientIdentifier } from '@openmrs/esm-framework';
 import React from 'react';
+import { type Patient, type PatientIdentifier, PatientBannerPatientIdentifiers } from '@openmrs/esm-framework';
 import { useElementConfig } from '../../ward-view/ward-view.resource';
 
 export interface WardPatientIdentifierProps {
@@ -23,7 +23,7 @@ const WardPatientIdentifier: React.FC<WardPatientIdentifierProps> = ({ id, patie
   }));
 
   return (
-    <PatientBannerPatientIdentifier identifier={fhirIdentifiers} showIdentifierLabel={config?.showIdentifierLabel} />
+    <PatientBannerPatientIdentifiers identifiers={fhirIdentifiers} showIdentifierLabel={config?.showIdentifierLabel} />
   );
 };
 
diff --git a/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-pending-transfer.tsx b/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-pending-transfer.tsx
index 23a4f0d5c..08537f076 100644
--- a/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-pending-transfer.tsx
+++ b/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-pending-transfer.tsx
@@ -1,10 +1,10 @@
 import React, { useMemo } from 'react';
+import { IconButton } from '@carbon/react';
 import { Movement } from '@carbon/react/icons';
-import styles from '../ward-patient-card.scss';
 import { useTranslation } from 'react-i18next';
-import { type WardPatientWorkspaceProps, type WardViewContext, type WardPatient } from '../../types';
 import { CloseOutlineIcon, launchWorkspace, useAppContext } from '@openmrs/esm-framework';
-import { IconButton } from '@carbon/react';
+import { type WardPatientWorkspaceProps, type WardViewContext, type WardPatient } from '../../types';
+import styles from '../ward-patient-card.scss';
 
 export interface WardPatientTransferProps {
   wardPatient: WardPatient;
@@ -26,7 +26,7 @@ const WardPatientPendingTransfer: React.FC<WardPatientTransferProps> = ({ wardPa
       return t('pendingDischarge', 'Pending Discharge');
     }
     return '';
-  }, [dispositionType, dispositionLocation]);
+  }, [dispositionType, dispositionLocation, t]);
 
   const launchCancelAdmissionForm = () => {
     launchWorkspace<WardPatientWorkspaceProps>('cancel-admission-request-workspace', {
diff --git a/packages/esm-ward-app/src/ward-view/ward-view.component.tsx b/packages/esm-ward-app/src/ward-view/ward-view.component.tsx
index 609f6f4f3..2f70bc36c 100644
--- a/packages/esm-ward-app/src/ward-view/ward-view.component.tsx
+++ b/packages/esm-ward-app/src/ward-view/ward-view.component.tsx
@@ -13,7 +13,6 @@ const WardView: React.FC<{}> = () => {
   const { t } = useTranslation();
 
   const locationUuid = location?.uuid;
-  const isVertical = useFeatureFlag('ward-view-vertical-tiling');
   const wardConfig = useWardConfig(locationUuid);
 
   if (isLoadingLocation) {
@@ -27,7 +26,7 @@ const WardView: React.FC<{}> = () => {
   const wardId = wardConfig.id;
 
   return (
-    <div className={classNames(styles.wardView, { [styles.verticalTiling]: isVertical })}>
+    <div className={classNames(styles.wardView, styles.verticalTiling)}>
       <ExtensionSlot name={wardId} />
     </div>
   );
diff --git a/packages/esm-ward-app/src/ward-view/ward.component.tsx b/packages/esm-ward-app/src/ward-view/ward.component.tsx
index 99b572ef4..6257ce2f1 100644
--- a/packages/esm-ward-app/src/ward-view/ward.component.tsx
+++ b/packages/esm-ward-app/src/ward-view/ward.component.tsx
@@ -1,22 +1,21 @@
-import { InlineNotification } from '@carbon/react';
-import { useAppContext, useFeatureFlag } from '@openmrs/esm-framework';
-import classNames from 'classnames';
 import React, { useEffect, useRef, type ReactNode } from 'react';
+import classNames from 'classnames';
+import { InlineNotification } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
-import EmptyBedSkeleton from '../beds/empty-bed-skeleton';
-import useWardLocation from '../hooks/useWardLocation';
+import { useAppContext, useFeatureFlag } from '@openmrs/esm-framework';
 import { type WardViewContext } from '../types';
+import useWardLocation from '../hooks/useWardLocation';
+import EmptyBedSkeleton from '../beds/empty-bed-skeleton';
 import styles from './ward-view.scss';
 
 const Ward = ({ wardBeds, wardUnassignedPatients }: { wardBeds: ReactNode; wardUnassignedPatients: ReactNode }) => {
   const { location } = useWardLocation();
   const { t } = useTranslation();
-  const isVertical = useFeatureFlag('ward-view-vertical-tiling');
 
-  const {wardPatientGroupDetails} = useAppContext<WardViewContext>('ward-view-context') ?? {};
+  const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
   const { bedLayouts } = wardPatientGroupDetails ?? {};
   const { isLoading: isLoadingAdmissionLocation, error: errorLoadingAdmissionLocation } =
-  wardPatientGroupDetails?.admissionLocationResponse ?? {};
+    wardPatientGroupDetails?.admissionLocationResponse ?? {};
   const {
     isLoading: isLoadingInpatientAdmissions,
     error: errorLoadingInpatientAdmissions,
@@ -44,19 +43,28 @@ const Ward = ({ wardBeds, wardUnassignedPatients }: { wardBeds: ReactNode; wardU
       if (scrollToLoadMoreTrigger.current) {
         observer.observe(scrollToLoadMoreTrigger.current);
       }
+
       return () => {
         if (scrollToLoadMoreTrigger.current) {
+          // TODO: Fix this more meaningfully
+          // eslint-disable-next-line react-hooks/exhaustive-deps
           observer.unobserve(scrollToLoadMoreTrigger.current);
         }
       };
     },
-    [scrollToLoadMoreTrigger, hasMoreInpatientAdmissions, errorLoadingInpatientAdmissions, loadMoreInpatientAdmissions],
+    [
+      errorLoadingInpatientAdmissions,
+      hasMoreInpatientAdmissions,
+      isLoadingInpatientAdmissions,
+      loadMoreInpatientAdmissions,
+      scrollToLoadMoreTrigger,
+    ],
   );
 
   if (!wardPatientGroupDetails) return <></>;
 
   return (
-    <div className={classNames(styles.wardViewMain, { [styles.verticalTiling]: isVertical })}>
+    <div className={classNames(styles.wardViewMain, styles.verticalTiling)}>
       {wardBeds}
       {bedLayouts?.length == 0 && isBedManagementModuleInstalled && (
         <InlineNotification
@@ -103,4 +111,4 @@ const EmptyBeds = () => {
   );
 };
 
-export default Ward;
\ No newline at end of file
+export default Ward;
diff --git a/packages/esm-ward-app/src/ward-workspace/admit-patient-form-workspace/admit-patient-form.workspace.tsx b/packages/esm-ward-app/src/ward-workspace/admit-patient-form-workspace/admit-patient-form.workspace.tsx
index 40034bc5f..8166c6e97 100644
--- a/packages/esm-ward-app/src/ward-workspace/admit-patient-form-workspace/admit-patient-form.workspace.tsx
+++ b/packages/esm-ward-app/src/ward-workspace/admit-patient-form-workspace/admit-patient-form.workspace.tsx
@@ -1,14 +1,14 @@
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { Button, ButtonSet, Column, Form, InlineNotification, Row } from '@carbon/react';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { showSnackbar, useAppContext } from '@openmrs/esm-framework';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { z } from 'zod';
-import { useAssignedBedByPatient } from '../../hooks/useAssignedBedByPatient';
-import useWardLocation from '../../hooks/useWardLocation';
+import { showSnackbar, useAppContext } from '@openmrs/esm-framework';
 import type { WardPatientWorkspaceProps, WardViewContext } from '../../types';
+import { useAssignedBedByPatient } from '../../hooks/useAssignedBedByPatient';
 import { assignPatientToBed, removePatientFromBed, useAdmitPatient } from '../../ward.resource';
+import useWardLocation from '../../hooks/useWardLocation';
 import BedSelector from '../bed-selector.component';
 import WardPatientWorkspaceBanner from '../patient-banner/patient-banner.component';
 import styles from './admit-patient-form.scss';
@@ -46,7 +46,7 @@ const AdmitPatientFormWorkspace: React.FC<WardPatientWorkspaceProps> = ({
       z.object({
         bedId: z.number().optional(),
       }),
-    [beds],
+    [],
   );
 
   type FormValues = z.infer<typeof zodSchema>;
@@ -61,7 +61,7 @@ const AdmitPatientFormWorkspace: React.FC<WardPatientWorkspaceProps> = ({
 
   useEffect(() => {
     promptBeforeClosing(() => isDirty);
-  }, [isDirty]);
+  }, [isDirty, promptBeforeClosing]);
 
   const onSubmit = (values: FormValues) => {
     setShowErrorNotifications(false);
diff --git a/packages/esm-ward-app/src/ward-workspace/cancel-admission-request-workspace/cancel-admission-request.test.tsx b/packages/esm-ward-app/src/ward-workspace/cancel-admission-request-workspace/cancel-admission-request.test.tsx
index eff20cdc2..d0d452930 100644
--- a/packages/esm-ward-app/src/ward-workspace/cancel-admission-request-workspace/cancel-admission-request.test.tsx
+++ b/packages/esm-ward-app/src/ward-workspace/cancel-admission-request-workspace/cancel-admission-request.test.tsx
@@ -1,7 +1,7 @@
-import { useAppContext, type DefaultWorkspaceProps } from '@openmrs/esm-framework';
+import React from 'react';
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import React from 'react';
+import { useAppContext, type DefaultWorkspaceProps } from '@openmrs/esm-framework';
 import { mockInpatientRequestAlice, mockLocationInpatientWard, mockPatientAlice } from '__mocks__';
 import { renderWithSwr } from 'tools';
 import useWardLocation from '../../hooks/useWardLocation';
@@ -75,7 +75,7 @@ function renderCancelAdmissionRequestWorkspace() {
   );
 }
 
-describe('Testing CancelAdmissionRequestWorkspace', () => {
+describe('CancelAdmissionRequestWorkspace', () => {
   it('should cancel admission request form creates encounter when form is filled out and submitted ', async () => {
     const user = userEvent.setup();
     renderCancelAdmissionRequestWorkspace();
@@ -85,7 +85,7 @@ describe('Testing CancelAdmissionRequestWorkspace', () => {
     const submit = screen.getByRole('button', { name: /save/i });
     await user.click(submit);
 
-    const warningText = /Notes required for cancelling admission or transfer request/;
+    const warningText = /notes required for cancelling admission or transfer request/i;
     const warning = screen.getByText(warningText);
     expect(warning).toBeInTheDocument();
 
diff --git a/packages/esm-ward-app/src/ward-workspace/cancel-admission-request-workspace/cancel-admission-request.workspace.tsx b/packages/esm-ward-app/src/ward-workspace/cancel-admission-request-workspace/cancel-admission-request.workspace.tsx
index 19665b031..81ddc7962 100644
--- a/packages/esm-ward-app/src/ward-workspace/cancel-admission-request-workspace/cancel-admission-request.workspace.tsx
+++ b/packages/esm-ward-app/src/ward-workspace/cancel-admission-request-workspace/cancel-admission-request.workspace.tsx
@@ -1,16 +1,16 @@
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { Button, ButtonSet, Form, InlineNotification, TextArea } from '@carbon/react';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { ResponsiveWrapper, showSnackbar, useAppContext, useSession } from '@openmrs/esm-framework';
 import classNames from 'classnames';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { zodResolver } from '@hookform/resolvers/zod';
 import { Controller, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { z } from 'zod';
-import useWardLocation from '../../hooks/useWardLocation';
+import { ResponsiveWrapper, showSnackbar, useAppContext, useSession } from '@openmrs/esm-framework';
 import type { ObsPayload, WardPatientWorkspaceProps, WardViewContext } from '../../types';
 import { useCreateEncounter } from '../../ward.resource';
-import styles from './cancel-admission-request.scss';
+import useWardLocation from '../../hooks/useWardLocation';
 import WardPatientWorkspaceBanner from '../patient-banner/patient-banner.component';
+import styles from './cancel-admission-request.scss';
 
 export default function CancelAdmissionRequestWorkspace({
   closeWorkspaceWithSavedChanges,
@@ -58,7 +58,7 @@ export default function CancelAdmissionRequestWorkspace({
   useEffect(() => {
     promptBeforeClosing(() => isDirty);
     return () => promptBeforeClosing(null);
-  }, [isDirty]);
+  }, [isDirty, promptBeforeClosing]);
 
   const onSubmit = useCallback(
     (values: FormValues) => {
@@ -98,13 +98,15 @@ export default function CancelAdmissionRequestWorkspace({
         });
     },
     [
-      setShowErrorNotifications,
-      currentProvider,
-      location,
-      emrConfiguration,
-      patient?.uuid,
-      wardPatientGroupDetails,
+      emrConfiguration?.consultFreeTextCommentsConcept?.uuid,
+      emrConfiguration?.admissionDecisionConcept?.uuid,
+      emrConfiguration?.denyAdmissionConcept?.uuid,
+      emrConfiguration?.cancelADTRequestEncounterType,
       createEncounter,
+      patient,
+      t,
+      closeWorkspaceWithSavedChanges,
+      wardPatientGroupDetails,
     ],
   );
 
diff --git a/packages/esm-ward-app/src/ward-workspace/patient-details/ward-patient.style.scss b/packages/esm-ward-app/src/ward-workspace/patient-details/ward-patient.style.scss
index ebf3d15fd..93e9ffbd0 100644
--- a/packages/esm-ward-app/src/ward-workspace/patient-details/ward-patient.style.scss
+++ b/packages/esm-ward-app/src/ward-workspace/patient-details/ward-patient.style.scss
@@ -5,7 +5,19 @@
   min-height: var(--desktop-workspace-window-height);
 }
 
+.patientWorkspace {
+  display: flex;
+  height: 100%;
+  flex-direction: column;
+}
+
 .headerPatientDetail {
   @include type.type-style('body-compact-02');
   margin: 0 layout.$spacing-02;
 }
+
+.patientWorkspaceContentSlot {
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+}
diff --git a/packages/esm-ward-app/src/ward-workspace/patient-details/ward-patient.workspace.tsx b/packages/esm-ward-app/src/ward-workspace/patient-details/ward-patient.workspace.tsx
index a7f7eb084..23a5a7ec4 100644
--- a/packages/esm-ward-app/src/ward-workspace/patient-details/ward-patient.workspace.tsx
+++ b/packages/esm-ward-app/src/ward-workspace/patient-details/ward-patient.workspace.tsx
@@ -4,6 +4,7 @@ import { type WardPatientWorkspaceProps } from '../../types';
 import WardPatientWorkspaceBanner from '../patient-banner/patient-banner.component';
 import styles from './ward-patient.style.scss';
 import { type WardConfigObject } from '../../config-schema';
+import classNames from 'classnames';
 
 attach('ward-patient-workspace-header-slot', 'patient-vitals-info');
 
@@ -15,14 +16,14 @@ export default function WardPatientWorkspace({ wardPatient }: WardPatientWorkspa
   return (
     <>
       {wardPatient && (
-        <div className={styles.workspaceContainer}>
+        <div className={classNames(styles.workspaceContainer, styles.patientWorkspace)}>
           <WardPatientWorkspaceBanner {...{ wardPatient }} />
-          <div>
-            <ExtensionSlot name="ward-patient-workspace-header-slot" state={extensionSlotState} />
-          </div>
-          <div>
-            <ExtensionSlot name="ward-patient-workspace-content-slot" state={extensionSlotState} />
-          </div>
+          <ExtensionSlot name="ward-patient-workspace-header-slot" state={extensionSlotState} />
+          <ExtensionSlot
+            name="ward-patient-workspace-content-slot"
+            state={extensionSlotState}
+            className={styles.patientWorkspaceContentSlot}
+          />
         </div>
       )}
     </>
diff --git a/packages/esm-ward-app/src/ward-workspace/patient-discharge/patient-discharge.workspace.tsx b/packages/esm-ward-app/src/ward-workspace/patient-discharge/patient-discharge.workspace.tsx
index 9eb308396..583d14d80 100644
--- a/packages/esm-ward-app/src/ward-workspace/patient-discharge/patient-discharge.workspace.tsx
+++ b/packages/esm-ward-app/src/ward-workspace/patient-discharge/patient-discharge.workspace.tsx
@@ -1,18 +1,18 @@
+import React, { useCallback, useState } from 'react';
 import { Button, ButtonSet, InlineNotification } from '@carbon/react';
 import { Exit } from '@carbon/react/icons';
-import { ExtensionSlot, showSnackbar, useAppContext, useSession } from '@openmrs/esm-framework';
-import React, { useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import useWardLocation from '../../hooks/useWardLocation';
+import { ExtensionSlot, showSnackbar, useAppContext, useSession } from '@openmrs/esm-framework';
 import { type WardPatientWorkspaceProps, type WardViewContext } from '../../types';
 import { removePatientFromBed, useCreateEncounter } from '../../ward.resource';
+import useWardLocation from '../../hooks/useWardLocation';
 import WardPatientWorkspaceBanner from '../patient-banner/patient-banner.component';
 import styles from './patient-discharge.scss';
 
 export default function PatientDischargeWorkspace(props: WardPatientWorkspaceProps) {
   const { wardPatient, closeWorkspaceWithSavedChanges } = props;
   const { t } = useTranslation();
-  const [isSubmitting, setIsSubmitting] = useState<boolean>(false);
+  const [isSubmitting, setIsSubmitting] = useState(false);
   const { currentProvider } = useSession();
   const { location } = useWardLocation();
   const { createEncounter, emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } =
@@ -52,11 +52,12 @@ export default function PatientDischargeWorkspace(props: WardPatientWorkspacePro
         wardPatientGroupDetails.mutate();
       });
   }, [
-    currentProvider,
-    location,
+    createEncounter,
+    wardPatient?.patient,
+    wardPatient.bed.id,
     emrConfiguration,
-    wardPatient?.patient?.uuid,
-    wardPatient?.bed?.uuid,
+    t,
+    closeWorkspaceWithSavedChanges,
     wardPatientGroupDetails,
   ]);
 
diff --git a/packages/esm-ward-app/src/ward-workspace/patient-transfer-bed-swap/patient-bed-swap-form.component.tsx b/packages/esm-ward-app/src/ward-workspace/patient-transfer-bed-swap/patient-bed-swap-form.component.tsx
index 28dc967e2..c8070154a 100644
--- a/packages/esm-ward-app/src/ward-workspace/patient-transfer-bed-swap/patient-bed-swap-form.component.tsx
+++ b/packages/esm-ward-app/src/ward-workspace/patient-transfer-bed-swap/patient-bed-swap-form.component.tsx
@@ -1,14 +1,12 @@
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { Button, ButtonSet, Form, InlineNotification } from '@carbon/react';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { showSnackbar, useAppContext, useSession } from '@openmrs/esm-framework';
 import classNames from 'classnames';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { zodResolver } from '@hookform/resolvers/zod';
 import { Controller, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { z } from 'zod';
-import useEmrConfiguration from '../../hooks/useEmrConfiguration';
-import useWardLocation from '../../hooks/useWardLocation';
-import type { BedLayout, WardPatientWorkspaceProps, WardViewContext } from '../../types';
+import { showSnackbar, useAppContext } from '@openmrs/esm-framework';
+import type { WardPatientWorkspaceProps, WardViewContext } from '../../types';
 import { assignPatientToBed, useCreateEncounter, removePatientFromBed } from '../../ward.resource';
 import BedSelector from '../bed-selector.component';
 import styles from './patient-transfer-swap.scss';
@@ -24,8 +22,6 @@ export default function PatientBedSwapForm({
   const { createEncounter, emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } =
     useCreateEncounter();
   const [isSubmitting, setIsSubmitting] = useState(false);
-  const { currentProvider } = useSession();
-  const { location } = useWardLocation();
   const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
   const { isLoading } = wardPatientGroupDetails?.admissionLocationResponse ?? {};
 
@@ -51,13 +47,14 @@ export default function PatientBedSwapForm({
   useEffect(() => {
     promptBeforeClosing(() => isDirty);
     return () => promptBeforeClosing(null);
-  }, [isDirty]);
+  }, [isDirty, promptBeforeClosing]);
 
-  const beds = wardPatientGroupDetails?.bedLayouts ?? [];
+  const beds = useMemo(() => wardPatientGroupDetails?.bedLayouts ?? [], [wardPatientGroupDetails]);
 
   const onSubmit = useCallback(
     (values: FormValues) => {
       const bedSelected = beds.find((bed) => bed.bedId === values.bedId);
+      setIsSubmitting(true);
       setShowErrorNotifications(false);
       createEncounter(patient, emrConfiguration.bedAssignmentEncounterType)
         .then(async (response) => {
@@ -113,7 +110,7 @@ export default function PatientBedSwapForm({
           closeWorkspaceWithSavedChanges();
         });
     },
-    [setShowErrorNotifications, patient, emrConfiguration, currentProvider, location, beds, wardPatientGroupDetails],
+    [beds, createEncounter, patient, emrConfiguration, t, wardPatientGroupDetails, closeWorkspaceWithSavedChanges],
   );
 
   const onError = useCallback(() => {
diff --git a/packages/esm-ward-app/src/ward-workspace/patient-transfer-bed-swap/patient-transfer-request-form.component.tsx b/packages/esm-ward-app/src/ward-workspace/patient-transfer-bed-swap/patient-transfer-request-form.component.tsx
index 40cb6eded..25f55d46c 100644
--- a/packages/esm-ward-app/src/ward-workspace/patient-transfer-bed-swap/patient-transfer-request-form.component.tsx
+++ b/packages/esm-ward-app/src/ward-workspace/patient-transfer-bed-swap/patient-transfer-request-form.component.tsx
@@ -1,32 +1,25 @@
-import { Button, ButtonSet, Form, InlineNotification, RadioButton, RadioButtonGroup, TextArea } from '@carbon/react';
-import { zodResolver } from '@hookform/resolvers/zod';
-import {
-  ArrowRightIcon,
-  ResponsiveWrapper,
-  showSnackbar,
-  useAppContext,
-  useLayoutType,
-  useSession,
-} from '@openmrs/esm-framework';
-import classNames from 'classnames';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import classNames from 'classnames';
+import { z } from 'zod';
+import { Button, ButtonSet, Form, InlineNotification, RadioButton, RadioButtonGroup, TextArea } from '@carbon/react';
 import { Controller, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
-import { z } from 'zod';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { ResponsiveWrapper, showSnackbar, useAppContext, useLayoutType, useSession } from '@openmrs/esm-framework';
+import { useCreateEncounter } from '../../ward.resource';
+import type { ObsPayload, WardPatientWorkspaceProps, WardViewContext } from '../../types';
 import useWardLocation from '../../hooks/useWardLocation';
+import AdmissionPatientButton from '../admit-patient-button.component';
 import LocationSelector from '../../location-selector/location-selector.component';
-import type { ObsPayload, WardPatientWorkspaceProps, WardViewContext } from '../../types';
-import { useCreateEncounter } from '../../ward.resource';
 import styles from './patient-transfer-swap.scss';
-import AdmissionPatientButton from '../admit-patient-button.component';
 
 export default function PatientTransferForm({
   closeWorkspaceWithSavedChanges,
   wardPatient,
   promptBeforeClosing,
 }: WardPatientWorkspaceProps) {
-  const { patient, inpatientAdmission } = wardPatient ?? {};
   const { t } = useTranslation();
+  const { patient, inpatientAdmission } = wardPatient ?? {};
   const [showErrorNotifications, setShowErrorNotifications] = useState(false);
   const [isSubmitting, setIsSubmitting] = useState(false);
   const { createEncounter, emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } =
@@ -79,12 +72,12 @@ export default function PatientTransferForm({
     if (dispositionsWithTypeTransfer?.length === 1) {
       setValue('transferType', dispositionsWithTypeTransfer[0].uuid);
     }
-  }, [dispositionsWithTypeTransfer]);
+  }, [dispositionsWithTypeTransfer, setValue]);
 
   useEffect(() => {
     promptBeforeClosing(() => isDirty);
     return () => promptBeforeClosing(null);
-  }, [isDirty]);
+  }, [isDirty, promptBeforeClosing]);
 
   const onSubmit = useCallback(
     (values: FormValues) => {
@@ -134,12 +127,12 @@ export default function PatientTransferForm({
         });
     },
     [
-      setShowErrorNotifications,
-      currentProvider,
-      location,
-      emrConfiguration,
-      patient?.uuid,
+      closeWorkspaceWithSavedChanges,
+      createEncounter,
       dispositionsWithTypeTransfer,
+      emrConfiguration,
+      patient,
+      t,
       wardPatientGroupDetails,
     ],
   );
diff --git a/packages/esm-ward-app/src/ward-workspace/ward-patient-notes/form/notes-form.component.tsx b/packages/esm-ward-app/src/ward-workspace/ward-patient-notes/form/notes-form.component.tsx
index ede900b9e..f7231e8d2 100644
--- a/packages/esm-ward-app/src/ward-workspace/ward-patient-notes/form/notes-form.component.tsx
+++ b/packages/esm-ward-app/src/ward-workspace/ward-patient-notes/form/notes-form.component.tsx
@@ -5,7 +5,6 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { Controller, useForm } from 'react-hook-form';
 import { Button, Column, Form, InlineLoading, InlineNotification, Row, Stack, TextArea } from '@carbon/react';
 import {
-  createErrorHandler,
   type DefaultWorkspaceProps,
   type PatientUuid,
   ResponsiveWrapper,
@@ -13,13 +12,17 @@ import {
   translateFrom,
   useSession,
 } from '@openmrs/esm-framework';
-import { savePatientNote } from '../notes.resource';
-import styles from './notes-form.scss';
 import { moduleName } from '../../../constant';
+import { savePatientNote } from '../notes.resource';
 import useEmrConfiguration from '../../../hooks/useEmrConfiguration';
+import styles from './notes-form.scss';
 
 type NotesFormData = z.infer<typeof noteFormSchema>;
 
+interface PatientNotesFormProps extends DefaultWorkspaceProps {
+  patientUuid: PatientUuid;
+}
+
 const noteFormSchema = z.object({
   wardClinicalNote: z.string().refine((val) => val.trim().length > 0, {
     //t('clinicalNoteErrorMessage','Clinical note is required')
@@ -27,10 +30,6 @@ const noteFormSchema = z.object({
   }),
 });
 
-interface PatientNotesFormProps extends DefaultWorkspaceProps {
-  patientUuid: PatientUuid;
-}
-
 const PatientNotesForm: React.FC<PatientNotesFormProps> = ({
   closeWorkspaceWithSavedChanges,
   patientUuid,
@@ -39,8 +38,9 @@ const PatientNotesForm: React.FC<PatientNotesFormProps> = ({
   const { emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } = useEmrConfiguration();
   const { t } = useTranslation();
   const session = useSession();
+
   const [isSubmitting, setIsSubmitting] = useState(false);
-  const [rows, setRows] = useState<number>();
+  const [rows, setRows] = useState(0);
 
   const {
     control,
@@ -93,26 +93,31 @@ const PatientNotesForm: React.FC<PatientNotesFormProps> = ({
           closeWorkspaceWithSavedChanges();
           showSnackbar({
             isLowContrast: true,
-            subtitle: t('patientNoteNowVisible', 'It should be now visible in the notes history'),
             kind: 'success',
+            subtitle: t('patientNoteNowVisible', 'It should be now visible in the notes history'),
             title: t('visitNoteSaved', 'Patient note saved'),
           });
         })
         .catch((err) => {
-          createErrorHandler();
-
           showSnackbar({
-            title: t('patientNoteSaveError', 'Error saving patient note'),
-            kind: 'error',
             isLowContrast: false,
+            kind: 'error',
             subtitle: err?.message,
+            title: t('patientNoteSaveError', 'Error saving patient note'),
           });
         })
-        .finally(() => {
-          setIsSubmitting(false);
-        });
+        .finally(() => setIsSubmitting(false));
     },
-    [emrConfiguration, patientUuid, locationUuid, providerUuid],
+    [
+      closeWorkspaceWithSavedChanges,
+      emrConfiguration?.clinicianEncounterRole.uuid,
+      emrConfiguration?.consultFreeTextCommentsConcept.uuid,
+      emrConfiguration?.inpatientNoteEncounterType.uuid,
+      locationUuid,
+      patientUuid,
+      providerUuid,
+      t,
+    ],
   );
 
   const onError = (errors) => console.error(errors);
@@ -146,19 +151,19 @@ const PatientNotesForm: React.FC<PatientNotesFormProps> = ({
                 <ResponsiveWrapper>
                   <TextArea
                     id="additionalNote"
-                    rows={rows}
-                    labelText={t('clinicalNoteLabel', 'Write your notes')}
-                    placeholder={t('wardClinicalNotePlaceholder', 'Write any notes here')}
-                    value={value}
-                    onBlur={onBlur}
                     invalid={!!errors.wardClinicalNote}
                     invalidText={errors.wardClinicalNote?.message}
+                    labelText={t('clinicalNoteLabel', 'Write your notes')}
+                    onBlur={onBlur}
                     onChange={(event) => {
                       onChange(event);
-                      const textareaLineHeight = 24; // This is the default line height for Carbon's TextArea component
-                      const newRows = Math.ceil(event.target.scrollHeight / textareaLineHeight);
+                      const textAreaLineHeight = 24; // This is the default line height for Carbon's TextArea component
+                      const newRows = Math.ceil(event.target.scrollHeight / textAreaLineHeight);
                       setRows(newRows);
                     }}
+                    placeholder={t('wardClinicalNotePlaceholder', 'Write any notes here')}
+                    rows={rows}
+                    value={value}
                   />
                 </ResponsiveWrapper>
               )}
@@ -167,9 +172,9 @@ const PatientNotesForm: React.FC<PatientNotesFormProps> = ({
         </Row>
       </Stack>
       <Button
-        kind="primary"
         className={styles.saveButton}
         disabled={isSubmitting || isLoadingEmrConfiguration || errorFetchingEmrConfiguration}
+        kind="primary"
         type="submit">
         {isSubmitting ? <InlineLoading description={t('saving', 'Saving...')} /> : <span>{t('save', 'Save')}</span>}
       </Button>
diff --git a/turbo.json b/turbo.json
index bc1396c59..28fe0c655 100644
--- a/turbo.json
+++ b/turbo.json
@@ -6,7 +6,12 @@
         "dist/**"
       ]
     },
-    "coverage": {},
+    "coverage": {
+      "outputs": [
+        "coverage/**"
+      ],
+      "dependsOn": ["test"]
+    },
     "extract-translations": {},
     "lint": {
       "dependsOn": [
diff --git a/yarn.lock b/yarn.lock
index b077a042b..e00d80e26 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1291,6 +1291,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/runtime@npm:^7.24.5, @babel/runtime@npm:^7.24.7":
+  version: 7.26.0
+  resolution: "@babel/runtime@npm:7.26.0"
+  dependencies:
+    regenerator-runtime: "npm:^0.14.0"
+  checksum: 10/9f4ea1c1d566c497c052d505587554e782e021e6ccd302c2ad7ae8291c8e16e3f19d4a7726fb64469e057779ea2081c28b7dbefec6d813a22f08a35712c0f699
+  languageName: node
+  linkType: hard
+
 "@babel/template@npm:^7.18.10, @babel/template@npm:^7.3.3":
   version: 7.18.10
   resolution: "@babel/template@npm:7.18.10"
@@ -1374,6 +1383,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@carbon/colors@npm:^11.28.0":
+  version: 11.28.0
+  resolution: "@carbon/colors@npm:11.28.0"
+  dependencies:
+    "@ibm/telemetry-js": "npm:^1.5.0"
+  checksum: 10/557419fe3a6bda7ba8e8936662ffd7599003dc05d849811ffd19fd0d52762f9f3100e5ae2193486b5bcaed46e1cd65c6683c4bee48a1a9bc80c330c7c6d691ca
+  languageName: node
+  linkType: hard
+
 "@carbon/feature-flags@npm:^0.16.0":
   version: 0.16.0
   resolution: "@carbon/feature-flags@npm:0.16.0"
@@ -1381,6 +1399,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@carbon/feature-flags@npm:^0.24.0":
+  version: 0.24.0
+  resolution: "@carbon/feature-flags@npm:0.24.0"
+  dependencies:
+    "@ibm/telemetry-js": "npm:^1.5.0"
+  checksum: 10/abfe35e02d45208e64ead6e22c76c1f97c3099013bb0f0bbca46893c33f4571c9c6f0a2cacc6e8b5cd78aa90696beef89145b7bfc06fcab06c8ca3ff7cd11e02
+  languageName: node
+  linkType: hard
+
 "@carbon/grid@npm:^11.21.0, @carbon/grid@npm:^11.21.1":
   version: 11.21.1
   resolution: "@carbon/grid@npm:11.21.1"
@@ -1390,6 +1417,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@carbon/grid@npm:^11.29.0":
+  version: 11.29.0
+  resolution: "@carbon/grid@npm:11.29.0"
+  dependencies:
+    "@carbon/layout": "npm:^11.28.0"
+    "@ibm/telemetry-js": "npm:^1.5.0"
+  checksum: 10/27dfde60051e5db01d7f0c7f76adfa7f9c4df3e9fdff9bf3ed3e999221b9110959db162aaa06ac054474af79c6c8a47dcfd0e1112f5171342938fb9c4c02657d
+  languageName: node
+  linkType: hard
+
 "@carbon/icon-helpers@npm:^10.46.0":
   version: 10.46.0
   resolution: "@carbon/icon-helpers@npm:10.46.0"
@@ -1397,6 +1434,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@carbon/icon-helpers@npm:^10.54.0":
+  version: 10.54.0
+  resolution: "@carbon/icon-helpers@npm:10.54.0"
+  dependencies:
+    "@ibm/telemetry-js": "npm:^1.5.0"
+  checksum: 10/558988f429fd42e2a03fcf5fbf97cb3fee3a75a41cce9d93a1eefa1978498bd4445b8de622ede66e60e48dc46459f1af83dfe767ba5bd8eb6f436e8307618f27
+  languageName: node
+  linkType: hard
+
 "@carbon/icons-react@npm:^11.26.0, @carbon/icons-react@npm:^11.35.0":
   version: 11.35.0
   resolution: "@carbon/icons-react@npm:11.35.0"
@@ -1410,6 +1456,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@carbon/icons-react@npm:^11.53.0":
+  version: 11.53.0
+  resolution: "@carbon/icons-react@npm:11.53.0"
+  dependencies:
+    "@carbon/icon-helpers": "npm:^10.54.0"
+    "@ibm/telemetry-js": "npm:^1.5.0"
+    prop-types: "npm:^15.7.2"
+  peerDependencies:
+    react: ">=16"
+  checksum: 10/32eafc698024b3228e8d42c151f22384fdd82206e7259023a92994b19d268c171a0ed8ff85a00718d2ef7bc1fbaccce584e3ea4c7a766ef1b464eccd8fb4537b
+  languageName: node
+  linkType: hard
+
 "@carbon/layout@npm:^11.19.0, @carbon/layout@npm:^11.20.0, @carbon/layout@npm:^11.20.1":
   version: 11.20.1
   resolution: "@carbon/layout@npm:11.20.1"
@@ -1417,6 +1476,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@carbon/layout@npm:^11.28.0":
+  version: 11.28.0
+  resolution: "@carbon/layout@npm:11.28.0"
+  dependencies:
+    "@ibm/telemetry-js": "npm:^1.5.0"
+  checksum: 10/4ce8fbe84aa869121e0c83ae81c6beeeee87162165fd452fc51012715a3bf3ebb4e096dd4fb9a6f64ef45855d680e0953f13a79978cad855c0c64450a884e554
+  languageName: node
+  linkType: hard
+
 "@carbon/motion@npm:^11.16.0":
   version: 11.16.1
   resolution: "@carbon/motion@npm:11.16.1"
@@ -1424,6 +1492,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@carbon/motion@npm:^11.24.0":
+  version: 11.24.0
+  resolution: "@carbon/motion@npm:11.24.0"
+  dependencies:
+    "@ibm/telemetry-js": "npm:^1.5.0"
+  checksum: 10/ac358bf2a09ea7d77aae5dbe92abafaef817012abd0bb25a5ef33a77e7d88d32c33d796511f7e36a443ce32b7441eacea40869e2552042143fe3262cb8c4ea3d
+  languageName: node
+  linkType: hard
+
 "@carbon/react@npm:^1.12.0":
   version: 1.49.0
   resolution: "@carbon/react@npm:1.49.0"
@@ -1457,6 +1534,40 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@carbon/react@npm:^1.71.0":
+  version: 1.71.0
+  resolution: "@carbon/react@npm:1.71.0"
+  dependencies:
+    "@babel/runtime": "npm:^7.24.7"
+    "@carbon/feature-flags": "npm:^0.24.0"
+    "@carbon/icons-react": "npm:^11.53.0"
+    "@carbon/layout": "npm:^11.28.0"
+    "@carbon/styles": "npm:^1.70.0"
+    "@floating-ui/react": "npm:^0.26.0"
+    "@ibm/telemetry-js": "npm:^1.5.0"
+    classnames: "npm:2.5.1"
+    copy-to-clipboard: "npm:^3.3.1"
+    downshift: "npm:9.0.8"
+    flatpickr: "npm:4.6.13"
+    invariant: "npm:^2.2.3"
+    lodash.debounce: "npm:^4.0.8"
+    lodash.findlast: "npm:^4.5.0"
+    lodash.omit: "npm:^4.5.0"
+    lodash.throttle: "npm:^4.1.1"
+    prop-types: "npm:^15.7.2"
+    react-fast-compare: "npm:^3.2.2"
+    react-is: "npm:^18.2.0"
+    tabbable: "npm:^6.2.0"
+    use-resize-observer: "npm:^6.0.0"
+    window-or-global: "npm:^1.0.1"
+  peerDependencies:
+    react: ^16.8.6 || ^17.0.1 || ^18.2.0
+    react-dom: ^16.8.6 || ^17.0.1 || ^18.2.0
+    sass: ^1.33.0
+  checksum: 10/27bff8291c8a4d066c6839fa3521aef1461f1628ec09b47304f75286ed982128ec0f9a5f99ea7a99cfc508ce1941d5a11cc0797effa25b8749c49160cad9587c
+  languageName: node
+  linkType: hard
+
 "@carbon/react@npm:~1.37.0":
   version: 1.37.0
   resolution: "@carbon/react@npm:1.37.0"
@@ -1511,6 +1622,36 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@carbon/styles@npm:^1.70.0":
+  version: 1.70.0
+  resolution: "@carbon/styles@npm:1.70.0"
+  dependencies:
+    "@carbon/colors": "npm:^11.28.0"
+    "@carbon/feature-flags": "npm:^0.24.0"
+    "@carbon/grid": "npm:^11.29.0"
+    "@carbon/layout": "npm:^11.28.0"
+    "@carbon/motion": "npm:^11.24.0"
+    "@carbon/themes": "npm:^11.43.0"
+    "@carbon/type": "npm:^11.33.0"
+    "@ibm/plex": "npm:6.0.0-next.6"
+    "@ibm/plex-mono": "npm:0.0.3-alpha.0"
+    "@ibm/plex-sans": "npm:0.0.3-alpha.0"
+    "@ibm/plex-sans-arabic": "npm:0.0.3-alpha.0"
+    "@ibm/plex-sans-devanagari": "npm:0.0.3-alpha.0"
+    "@ibm/plex-sans-hebrew": "npm:0.0.3-alpha.0"
+    "@ibm/plex-sans-thai": "npm:0.0.3-alpha.0"
+    "@ibm/plex-sans-thai-looped": "npm:0.0.3-alpha.0"
+    "@ibm/plex-serif": "npm:0.0.3-alpha.0"
+    "@ibm/telemetry-js": "npm:^1.5.0"
+  peerDependencies:
+    sass: ^1.33.0
+  peerDependenciesMeta:
+    sass:
+      optional: true
+  checksum: 10/6a6c7c6c8c226b95bcac86633db516bb7099a4bb203bf68cced7f259ceaf0e0ff0c205e620be02abf2424e380c752ff57ebd9179ac2d242ccc252a36ad2b1532
+  languageName: node
+  linkType: hard
+
 "@carbon/telemetry@npm:0.1.0, @carbon/telemetry@npm:~0.1.0":
   version: 0.1.0
   resolution: "@carbon/telemetry@npm:0.1.0"
@@ -1532,6 +1673,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@carbon/themes@npm:^11.43.0":
+  version: 11.43.0
+  resolution: "@carbon/themes@npm:11.43.0"
+  dependencies:
+    "@carbon/colors": "npm:^11.28.0"
+    "@carbon/layout": "npm:^11.28.0"
+    "@carbon/type": "npm:^11.33.0"
+    "@ibm/telemetry-js": "npm:^1.5.0"
+    color: "npm:^4.0.0"
+  checksum: 10/ffbe3316dcdd3920a2e5139e550a1195734f591b3de1d79b41f8ca606c85ae0365660d9cc79b1562e82730c860fb7b001da1e3101ca49ca9e99867bfa8d7e50f
+  languageName: node
+  linkType: hard
+
 "@carbon/type@npm:^11.25.0":
   version: 11.25.1
   resolution: "@carbon/type@npm:11.25.1"
@@ -1542,6 +1696,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@carbon/type@npm:^11.33.0":
+  version: 11.33.0
+  resolution: "@carbon/type@npm:11.33.0"
+  dependencies:
+    "@carbon/grid": "npm:^11.29.0"
+    "@carbon/layout": "npm:^11.28.0"
+    "@ibm/telemetry-js": "npm:^1.5.0"
+  checksum: 10/bbaa5f9bafd6b47e2b65fe03333e4c70999bdca5a227365a2ff39cafc0b9a0dca4df41b85ea53c36ecb355090cdb43ec8c6aa43a398b9089162938b5c6b35167
+  languageName: node
+  linkType: hard
+
 "@carbon/utils-position@npm:^1.1.4":
   version: 1.1.4
   resolution: "@carbon/utils-position@npm:1.1.4"
@@ -1598,6 +1763,58 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@floating-ui/core@npm:^1.6.0":
+  version: 1.6.8
+  resolution: "@floating-ui/core@npm:1.6.8"
+  dependencies:
+    "@floating-ui/utils": "npm:^0.2.8"
+  checksum: 10/87d52989c3d2cc80373bc153b7a40814db3206ce7d0b2a2bdfb63e2ff39ffb8b999b1b0ccf28e548000ebf863bf16e2bed45eab4c4d287a5dbe974ef22368d82
+  languageName: node
+  linkType: hard
+
+"@floating-ui/dom@npm:^1.0.0":
+  version: 1.6.12
+  resolution: "@floating-ui/dom@npm:1.6.12"
+  dependencies:
+    "@floating-ui/core": "npm:^1.6.0"
+    "@floating-ui/utils": "npm:^0.2.8"
+  checksum: 10/5c8e5fdcd3843140a606ab6dc6c12ad740f44e66b898966ef877393faaede0bbe14586e1049e2c2f08856437da8847e884a2762e78275fefa65a5a9cd71e580d
+  languageName: node
+  linkType: hard
+
+"@floating-ui/react-dom@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "@floating-ui/react-dom@npm:2.1.2"
+  dependencies:
+    "@floating-ui/dom": "npm:^1.0.0"
+  peerDependencies:
+    react: ">=16.8.0"
+    react-dom: ">=16.8.0"
+  checksum: 10/2a67dc8499674e42ff32c7246bded185bb0fdd492150067caf9568569557ac4756a67787421d8604b0f241e5337de10762aee270d9aeef106d078a0ff13596c4
+  languageName: node
+  linkType: hard
+
+"@floating-ui/react@npm:^0.26.0":
+  version: 0.26.28
+  resolution: "@floating-ui/react@npm:0.26.28"
+  dependencies:
+    "@floating-ui/react-dom": "npm:^2.1.2"
+    "@floating-ui/utils": "npm:^0.2.8"
+    tabbable: "npm:^6.0.0"
+  peerDependencies:
+    react: ">=16.8.0"
+    react-dom: ">=16.8.0"
+  checksum: 10/7f8e6b27db48b68ca94756687af21857be04e7360ac922d7c8e22411f2895df6384af7bd40f4b48663d3cc5809bb5c6574cd9c9ea15543ec747b9a8e1c8c3008
+  languageName: node
+  linkType: hard
+
+"@floating-ui/utils@npm:^0.2.8":
+  version: 0.2.8
+  resolution: "@floating-ui/utils@npm:0.2.8"
+  checksum: 10/3e3ea3b2de06badc4baebdf358b3dbd77ccd9474a257a6ef237277895943db2acbae756477ec64de65a2a1436d94aea3107129a1feeef6370675bf2b161c1abc
+  languageName: node
+  linkType: hard
+
 "@formatjs/ecma402-abstract@npm:1.17.2":
   version: 1.17.2
   resolution: "@formatjs/ecma402-abstract@npm:1.17.2"
@@ -1718,6 +1935,62 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ibm/plex-mono@npm:0.0.3-alpha.0":
+  version: 0.0.3-alpha.0
+  resolution: "@ibm/plex-mono@npm:0.0.3-alpha.0"
+  checksum: 10/fbdfb70762dead35bd12fd69344133f3290bd4ede4fd3607f6949e80e3c516190e772afc5f8ba060426911bf1b89744f02e7b0fdd25cca818086f3ce312fcad4
+  languageName: node
+  linkType: hard
+
+"@ibm/plex-sans-arabic@npm:0.0.3-alpha.0":
+  version: 0.0.3-alpha.0
+  resolution: "@ibm/plex-sans-arabic@npm:0.0.3-alpha.0"
+  checksum: 10/c390dd9788a36f4cb2abb2fcf63deb2a3c8b9e7aa8a7e6263ff6484b2fe99044258e2daeb36e7c0b0eeaea17e4128a8ce567208458f851ee6b05ec8c54f84edb
+  languageName: node
+  linkType: hard
+
+"@ibm/plex-sans-devanagari@npm:0.0.3-alpha.0":
+  version: 0.0.3-alpha.0
+  resolution: "@ibm/plex-sans-devanagari@npm:0.0.3-alpha.0"
+  checksum: 10/ef3cd967100210a822bea7b36c5ac54f915a319d5e23fa1175ea63d0405c826023f241d54b4f7beb5928603fbe01a5bae22839dad6922330bb84921eb289d193
+  languageName: node
+  linkType: hard
+
+"@ibm/plex-sans-hebrew@npm:0.0.3-alpha.0":
+  version: 0.0.3-alpha.0
+  resolution: "@ibm/plex-sans-hebrew@npm:0.0.3-alpha.0"
+  checksum: 10/e67ed6e081dbf9a522eca8e35471a329c788e6a03042df89649b034eaa2e66898bc44b72c0c0f57d93d24b37796cfc92729cee7754eb83ec2cd27f1fa9bdeea6
+  languageName: node
+  linkType: hard
+
+"@ibm/plex-sans-thai-looped@npm:0.0.3-alpha.0":
+  version: 0.0.3-alpha.0
+  resolution: "@ibm/plex-sans-thai-looped@npm:0.0.3-alpha.0"
+  checksum: 10/11272b1353611fed07788a870793ca6f45c644f47faa99880d5278552a7acd85b0696ca02336b7aa8e29bf5d6353538d322149cb8b6b2e65985c38f0af6359fe
+  languageName: node
+  linkType: hard
+
+"@ibm/plex-sans-thai@npm:0.0.3-alpha.0":
+  version: 0.0.3-alpha.0
+  resolution: "@ibm/plex-sans-thai@npm:0.0.3-alpha.0"
+  checksum: 10/baac49d77d2075ee6ecbd5ed22d938b1afca898e5d8d9948f079613d2be011216acf52a6ae555e3cf732d8aa60b7b89b1eaef4380590a66270d7b166067a271a
+  languageName: node
+  linkType: hard
+
+"@ibm/plex-sans@npm:0.0.3-alpha.0":
+  version: 0.0.3-alpha.0
+  resolution: "@ibm/plex-sans@npm:0.0.3-alpha.0"
+  checksum: 10/5b0b0521dbeb7c32eb13a932b53baef0013b96d5d39547b35c69a991707a3f75cec37383c9f239229fdedfb91fda8c8005f25fdddcb900937d6de7dbd456175a
+  languageName: node
+  linkType: hard
+
+"@ibm/plex-serif@npm:0.0.3-alpha.0":
+  version: 0.0.3-alpha.0
+  resolution: "@ibm/plex-serif@npm:0.0.3-alpha.0"
+  checksum: 10/462dcf33937f50f5a0ecf320f1d930c612e92293aa40dda08c05f6630d8795e4233023bb4f8ed3d340d2dbbd82a4b7ec5ae5e511f4260b16ff9ade6f481e48e8
+  languageName: node
+  linkType: hard
+
 "@ibm/plex@npm:6.0.0-next.6":
   version: 6.0.0-next.6
   resolution: "@ibm/plex@npm:6.0.0-next.6"
@@ -1734,6 +2007,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ibm/telemetry-js@npm:^1.5.0":
+  version: 1.8.0
+  resolution: "@ibm/telemetry-js@npm:1.8.0"
+  bin:
+    ibmtelemetry: dist/collect.js
+  checksum: 10/10546acd6ce1b7547d3950e0f6b4da533c795ac7a8cfff96f63e05b39aaaf49d31dd1303637a3d830f7a2dbe67a10eca227cd5327ffb763a2631da0d524c0601
+  languageName: node
+  linkType: hard
+
 "@internationalized/date@npm:^3.5.4, @internationalized/date@npm:^3.5.5":
   version: 3.5.5
   resolution: "@internationalized/date@npm:3.5.5"
@@ -2718,7 +3000,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@openmrs/esm-active-visits-app@workspace:packages/esm-active-visits-app"
   dependencies:
-    "@carbon/react": "npm:~1.37.0"
+    "@carbon/react": "npm:^1.71.0"
     lodash-es: "npm:^4.17.15"
     webpack: "npm:^5.74.0"
   peerDependencies:
@@ -2731,9 +3013,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openmrs/esm-api@npm:5.8.2-pre.2488":
-  version: 5.8.2-pre.2488
-  resolution: "@openmrs/esm-api@npm:5.8.2-pre.2488"
+"@openmrs/esm-api@npm:6.0.1-pre.2541":
+  version: 6.0.1-pre.2541
+  resolution: "@openmrs/esm-api@npm:6.0.1-pre.2541"
   dependencies:
     "@types/fhir": "npm:0.0.31"
     lodash-es: "npm:^4.17.21"
@@ -2742,17 +3024,17 @@ __metadata:
     "@openmrs/esm-error-handling": 5.x
     "@openmrs/esm-navigation": 5.x
     "@openmrs/esm-offline": 5.x
-  checksum: 10/0c68fbd48cf9edaeee11319209bae36cd50c79713badb5a24bb75f798077a0d14118e5cb758e764d07c121a868b74ee31630e4aa4d016bf8bef6e09d6ace3b15
+  checksum: 10/ce72f8d08b9e2e0fe70f339b1a7097f48362af380f8e0a8847a5b033357308c773e5d15841924ffbea08d17ba3d6485bd44737a2fd676214d5fc6be576895cf9
   languageName: node
   linkType: hard
 
-"@openmrs/esm-app-shell@npm:5.8.2-pre.2488":
-  version: 5.8.2-pre.2488
-  resolution: "@openmrs/esm-app-shell@npm:5.8.2-pre.2488"
+"@openmrs/esm-app-shell@npm:6.0.1-pre.2541":
+  version: 6.0.1-pre.2541
+  resolution: "@openmrs/esm-app-shell@npm:6.0.1-pre.2541"
   dependencies:
     "@carbon/react": "npm:~1.37.0"
-    "@openmrs/esm-framework": "npm:5.8.2-pre.2488"
-    "@openmrs/esm-styleguide": "npm:5.8.2-pre.2488"
+    "@openmrs/esm-framework": "npm:6.0.1-pre.2541"
+    "@openmrs/esm-styleguide": "npm:6.0.1-pre.2541"
     dayjs: "npm:^1.10.4"
     dexie: "npm:^3.0.3"
     html-webpack-plugin: "npm:^5.5.0"
@@ -2777,7 +3059,7 @@ __metadata:
     workbox-strategies: "npm:^6.1.5"
     workbox-webpack-plugin: "npm:^6.1.5"
     workbox-window: "npm:^6.1.5"
-  checksum: 10/1f0ca55567c0cf1f2c6a8c05fd8b864d56c4620b092767d6e1a481781fc0d0e13799a9f276933445625ec99167fdb5406caded04a8c401313fc4d76298a170d9
+  checksum: 10/9856e53ef3cfc23d43ea33cd153652d664d85c2d3216550bd660c035847417cdda3a3d09cab2cd7219398338acbb44e064d6284137f126157adf16d4ac95c3d8
   languageName: node
   linkType: hard
 
@@ -2785,7 +3067,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@openmrs/esm-appointments-app@workspace:packages/esm-appointments-app"
   dependencies:
-    "@carbon/react": "npm:~1.37.0"
+    "@carbon/react": "npm:^1.71.0"
     formik: "npm:^2.2.9"
     lodash-es: "npm:^4.17.15"
     webpack: "npm:^5.74.0"
@@ -2804,7 +3086,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@openmrs/esm-bed-management-app@workspace:packages/esm-bed-management-app"
   dependencies:
-    "@carbon/react": "npm:~1.37.0"
+    "@carbon/react": "npm:^1.71.0"
     lodash-es: "npm:^4.17.15"
     webpack: "npm:^5.74.0"
   peerDependencies:
@@ -2817,9 +3099,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openmrs/esm-config@npm:5.8.2-pre.2488":
-  version: 5.8.2-pre.2488
-  resolution: "@openmrs/esm-config@npm:5.8.2-pre.2488"
+"@openmrs/esm-config@npm:6.0.1-pre.2541":
+  version: 6.0.1-pre.2541
+  resolution: "@openmrs/esm-config@npm:6.0.1-pre.2541"
   dependencies:
     ramda: "npm:^0.26.1"
   peerDependencies:
@@ -2827,44 +3109,44 @@ __metadata:
     "@openmrs/esm-state": 5.x
     "@openmrs/esm-utils": 5.x
     single-spa: 5.x
-  checksum: 10/44e8caa856ac1bb1f8d99bc11733c5526c0bc82480dbb14cc2c9770ca1e14f456708c2b901453478bf8c74c83eab71229110f7fcb882db0ec313dc369ac187a9
+  checksum: 10/ebadca1a3ccc14a67eeb22d19b114d74b227a2f21e5d7d87704e5dd77389b2bcb20703207c74cbed4b94660a92ce5135f53a4a0d94c1251879e38021a2a30eca
   languageName: node
   linkType: hard
 
-"@openmrs/esm-context@npm:5.8.2-pre.2488":
-  version: 5.8.2-pre.2488
-  resolution: "@openmrs/esm-context@npm:5.8.2-pre.2488"
+"@openmrs/esm-context@npm:6.0.1-pre.2541":
+  version: 6.0.1-pre.2541
+  resolution: "@openmrs/esm-context@npm:6.0.1-pre.2541"
   dependencies:
     immer: "npm:^10.0.4"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
-  checksum: 10/8aef80cbc454cf10b4f159b90e108cb8fe5ac44f72c72278f14274fae602d93b4fae5471b3c33d99a85f4892ba6faebf8b95dede4fb47316f25c120367a7c014
+  checksum: 10/a5c9c105632b65d1b549df472f24c4e83241bbf71dd700eba6132608203db224ed9aa58fb64b0a95b86a9838f73d1ca8dab5d34c0c0e0393e1c769d72e141d2b
   languageName: node
   linkType: hard
 
-"@openmrs/esm-dynamic-loading@npm:5.8.2-pre.2488":
-  version: 5.8.2-pre.2488
-  resolution: "@openmrs/esm-dynamic-loading@npm:5.8.2-pre.2488"
+"@openmrs/esm-dynamic-loading@npm:6.0.1-pre.2541":
+  version: 6.0.1-pre.2541
+  resolution: "@openmrs/esm-dynamic-loading@npm:6.0.1-pre.2541"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-translations": 5.x
-  checksum: 10/fbc66dfa5922fdb681a2e8978058eb76c233b6be549e01b2a01c49dd92db2621a542895c1f5fa8929e1533ac299775f8f5a330f2b9c2f034a0a2b83a253e68dd
+  checksum: 10/792203582d671b4fa32524949d6aa9dcef261959e3e0fb2a523e0b89a10fcca8175e0335cae594ab323b48585587849d6eef5922b5a26de516b378222ffab99d
   languageName: node
   linkType: hard
 
-"@openmrs/esm-error-handling@npm:5.8.2-pre.2488":
-  version: 5.8.2-pre.2488
-  resolution: "@openmrs/esm-error-handling@npm:5.8.2-pre.2488"
+"@openmrs/esm-error-handling@npm:6.0.1-pre.2541":
+  version: 6.0.1-pre.2541
+  resolution: "@openmrs/esm-error-handling@npm:6.0.1-pre.2541"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
-  checksum: 10/a9837ffde90ef8dd20904f9c5cfe33657738ec3f176971760bbd824b7ffde38c2e371ab72712354bb35c37a6b24070883c8d56eac242df4c85aaebc444cfd1c7
+  checksum: 10/0854c7d471d454790b02bcb8cdac7ca9d3ed84d78d361a7b3d7a1633e4de68fa608c82e79e1b198e5d5f99df29925fadced32ef510614fd6946ae7bb95a48a18
   languageName: node
   linkType: hard
 
-"@openmrs/esm-expression-evaluator@npm:5.8.2-pre.2488":
-  version: 5.8.2-pre.2488
-  resolution: "@openmrs/esm-expression-evaluator@npm:5.8.2-pre.2488"
+"@openmrs/esm-expression-evaluator@npm:6.0.1-pre.2541":
+  version: 6.0.1-pre.2541
+  resolution: "@openmrs/esm-expression-evaluator@npm:6.0.1-pre.2541"
   dependencies:
     "@jsep-plugin/arrow": "npm:^1.0.5"
     "@jsep-plugin/new": "npm:^1.0.3"
@@ -2873,13 +3155,13 @@ __metadata:
     "@jsep-plugin/template": "npm:^1.0.4"
     "@jsep-plugin/ternary": "npm:^1.1.3"
     jsep: "npm:^1.3.9"
-  checksum: 10/a4f69068396478aba396df08ccebebec2854eac49acb2bc5cdd069f869ca2186a52692a6ec4343696017e7dcf10596924b822ef52f12f0657ead5d86417a5c41
+  checksum: 10/36da9d9bbd8050a6f2e36cac42d5dbd9ba5337e6469d0d4084d08df0296723a0c1b53a9f1c814794cf11d491372d03c84f9715da46c5fe70be07ef54674b3243
   languageName: node
   linkType: hard
 
-"@openmrs/esm-extensions@npm:5.8.2-pre.2488":
-  version: 5.8.2-pre.2488
-  resolution: "@openmrs/esm-extensions@npm:5.8.2-pre.2488"
+"@openmrs/esm-extensions@npm:6.0.1-pre.2541":
+  version: 6.0.1-pre.2541
+  resolution: "@openmrs/esm-extensions@npm:6.0.1-pre.2541"
   dependencies:
     lodash-es: "npm:^4.17.21"
   peerDependencies:
@@ -2890,44 +3172,44 @@ __metadata:
     "@openmrs/esm-state": 5.x
     "@openmrs/esm-utils": 5.x
     single-spa: 5.x
-  checksum: 10/0457a61f7dd909ef3b702e3fc42f80fccb0d7b7372b9f2ceb1909e20df776d96485a43886f617863b7f48a5219276703c9fd73d7a74b94a09a1b63e28e52c28f
+  checksum: 10/8c5a99af14b458dfe36c7b985c26225145af9b799386d1eb21ab6de144a2aa38ba96ed7c578bcb17a4e5c5de2671865b6fb8ed3a73fe6a01e6fa0319a3814cf7
   languageName: node
   linkType: hard
 
-"@openmrs/esm-feature-flags@npm:5.8.2-pre.2488":
-  version: 5.8.2-pre.2488
-  resolution: "@openmrs/esm-feature-flags@npm:5.8.2-pre.2488"
+"@openmrs/esm-feature-flags@npm:6.0.1-pre.2541":
+  version: 6.0.1-pre.2541
+  resolution: "@openmrs/esm-feature-flags@npm:6.0.1-pre.2541"
   dependencies:
     ramda: "npm:^0.26.1"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
     single-spa: 5.x
-  checksum: 10/84431c41d1bd855e1ba996a22d80faefba79d5162256d975e7b4c2ee510a1d360f22ae818e6d9c980603a8afd1fade38aebd3f2b667a34c9429cc0ae9bbcfd17
-  languageName: node
-  linkType: hard
-
-"@openmrs/esm-framework@npm:5.8.2-pre.2488, @openmrs/esm-framework@npm:next":
-  version: 5.8.2-pre.2488
-  resolution: "@openmrs/esm-framework@npm:5.8.2-pre.2488"
-  dependencies:
-    "@openmrs/esm-api": "npm:5.8.2-pre.2488"
-    "@openmrs/esm-config": "npm:5.8.2-pre.2488"
-    "@openmrs/esm-context": "npm:5.8.2-pre.2488"
-    "@openmrs/esm-dynamic-loading": "npm:5.8.2-pre.2488"
-    "@openmrs/esm-error-handling": "npm:5.8.2-pre.2488"
-    "@openmrs/esm-expression-evaluator": "npm:5.8.2-pre.2488"
-    "@openmrs/esm-extensions": "npm:5.8.2-pre.2488"
-    "@openmrs/esm-feature-flags": "npm:5.8.2-pre.2488"
-    "@openmrs/esm-globals": "npm:5.8.2-pre.2488"
-    "@openmrs/esm-navigation": "npm:5.8.2-pre.2488"
-    "@openmrs/esm-offline": "npm:5.8.2-pre.2488"
-    "@openmrs/esm-react-utils": "npm:5.8.2-pre.2488"
-    "@openmrs/esm-routes": "npm:5.8.2-pre.2488"
-    "@openmrs/esm-state": "npm:5.8.2-pre.2488"
-    "@openmrs/esm-styleguide": "npm:5.8.2-pre.2488"
-    "@openmrs/esm-translations": "npm:5.8.2-pre.2488"
-    "@openmrs/esm-utils": "npm:5.8.2-pre.2488"
+  checksum: 10/84d869c17992fc9afefb5f1079f6f1077451492ca6ba17f41fe2c93e633086a27fc07edc853c5f0ffefa36ab90d3898a81603a2f6bf02954691e5732b429bc16
+  languageName: node
+  linkType: hard
+
+"@openmrs/esm-framework@npm:6.0.1-pre.2541, @openmrs/esm-framework@npm:next":
+  version: 6.0.1-pre.2541
+  resolution: "@openmrs/esm-framework@npm:6.0.1-pre.2541"
+  dependencies:
+    "@openmrs/esm-api": "npm:6.0.1-pre.2541"
+    "@openmrs/esm-config": "npm:6.0.1-pre.2541"
+    "@openmrs/esm-context": "npm:6.0.1-pre.2541"
+    "@openmrs/esm-dynamic-loading": "npm:6.0.1-pre.2541"
+    "@openmrs/esm-error-handling": "npm:6.0.1-pre.2541"
+    "@openmrs/esm-expression-evaluator": "npm:6.0.1-pre.2541"
+    "@openmrs/esm-extensions": "npm:6.0.1-pre.2541"
+    "@openmrs/esm-feature-flags": "npm:6.0.1-pre.2541"
+    "@openmrs/esm-globals": "npm:6.0.1-pre.2541"
+    "@openmrs/esm-navigation": "npm:6.0.1-pre.2541"
+    "@openmrs/esm-offline": "npm:6.0.1-pre.2541"
+    "@openmrs/esm-react-utils": "npm:6.0.1-pre.2541"
+    "@openmrs/esm-routes": "npm:6.0.1-pre.2541"
+    "@openmrs/esm-state": "npm:6.0.1-pre.2541"
+    "@openmrs/esm-styleguide": "npm:6.0.1-pre.2541"
+    "@openmrs/esm-translations": "npm:6.0.1-pre.2541"
+    "@openmrs/esm-utils": "npm:6.0.1-pre.2541"
     dayjs: "npm:^1.10.7"
   peerDependencies:
     dayjs: 1.x
@@ -2938,35 +3220,35 @@ __metadata:
     rxjs: 6.x
     single-spa: 5.x
     swr: 2.x
-  checksum: 10/891ff8aafbf28bdd445237d26f630dd439f76943208bcea8601698feb3cbbf989b671f427d26e912a19164f036731dcd48205738ad57cb464962ab5633363f27
+  checksum: 10/82b5d012330bade9d07e42f629a167224a2a72bdf4728560094564c0c0b21d6ac345a8be583d2cf4accb45c5068da1054a6441fca757fa6e1c37c85a668c936c
   languageName: node
   linkType: hard
 
-"@openmrs/esm-globals@npm:5.8.2-pre.2488":
-  version: 5.8.2-pre.2488
-  resolution: "@openmrs/esm-globals@npm:5.8.2-pre.2488"
+"@openmrs/esm-globals@npm:6.0.1-pre.2541":
+  version: 6.0.1-pre.2541
+  resolution: "@openmrs/esm-globals@npm:6.0.1-pre.2541"
   dependencies:
     "@types/fhir": "npm:0.0.31"
   peerDependencies:
     single-spa: 5.x
-  checksum: 10/5f49684c39da5e857b9e402c17ab49fbfe54c1a12f8603ca6ca5cd34cf182e2556a87ccf5eff928171a4bbd92ff38b9bded4b5baab95e46618cba335f7a486a2
+  checksum: 10/ea5e21e086d35ca61b79ded78e7ad75eb8850d1053352323c0aed6978411bfa8f50973bdf795a0f5c35b5da730c5a2636fffadbbecf2e5393df62363260341b5
   languageName: node
   linkType: hard
 
-"@openmrs/esm-navigation@npm:5.8.2-pre.2488":
-  version: 5.8.2-pre.2488
-  resolution: "@openmrs/esm-navigation@npm:5.8.2-pre.2488"
+"@openmrs/esm-navigation@npm:6.0.1-pre.2541":
+  version: 6.0.1-pre.2541
+  resolution: "@openmrs/esm-navigation@npm:6.0.1-pre.2541"
   dependencies:
     path-to-regexp: "npm:6.1.0"
   peerDependencies:
     "@openmrs/esm-state": 5.x
-  checksum: 10/8acb709ce6148bd5a782e7e15800a8605e904e16e2307c86333f8d58b2c6a382ceaba92d13e45a7b7a7ce7d78849b041e224c1530bc0ff1acb2584ce858cd3a6
+  checksum: 10/325e98f27ef5671ece368b61716cbe0d6ea115e7e124c982d47e43b98e8dfa3c0e74e1bb216f7e6f8fbedf1da4c89cac7383ef4559d8cac54fa6e5fb24082a28
   languageName: node
   linkType: hard
 
-"@openmrs/esm-offline@npm:5.8.2-pre.2488":
-  version: 5.8.2-pre.2488
-  resolution: "@openmrs/esm-offline@npm:5.8.2-pre.2488"
+"@openmrs/esm-offline@npm:6.0.1-pre.2541":
+  version: 6.0.1-pre.2541
+  resolution: "@openmrs/esm-offline@npm:6.0.1-pre.2541"
   dependencies:
     dexie: "npm:^3.0.3"
     lodash-es: "npm:^4.17.21"
@@ -2977,13 +3259,13 @@ __metadata:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
     rxjs: 6.x
-  checksum: 10/5273f438b2fe103487397302c938136c3cd39709c2b36c8ce26d8474282900ad5e1caa7c4a8e0e7b8e3ad14f42adfd558c2809bc55ae34ebdd2fd0f9fd92fb9a
+  checksum: 10/4306a23d2c7a1223780f76a8ee1bdddc8be7a2f3657ed8d6d817b52560c95b5d225ac40a40bcf4f0a2e386d6be58280e43971bd0b6f32291fe78541f39474ded
   languageName: node
   linkType: hard
 
 "@openmrs/esm-patient-common-lib@npm:next":
-  version: 8.2.1-pre.5925
-  resolution: "@openmrs/esm-patient-common-lib@npm:8.2.1-pre.5925"
+  version: 8.2.1-pre.6234
+  resolution: "@openmrs/esm-patient-common-lib@npm:8.2.1-pre.6234"
   dependencies:
     "@carbon/react": "npm:^1.12.0"
     lodash-es: "npm:^4.17.21"
@@ -2992,7 +3274,7 @@ __metadata:
     "@openmrs/esm-framework": 5.x
     react: 18.x
     single-spa: 6.x
-  checksum: 10/29a09207573960e49dac9a5e029ef281c907aabe009eb261986a97004d5aa59f2e8fb7c920c7bfb507b92d2cef11bb3229c0a01abbc16adfa439c951d9685b48
+  checksum: 10/a29b5ed65f42764fa3e67a243531c54dce20bb19e139342122a1302d668dcc8c2790c8542c5c8d6ab74a285942f94ebdb77a03c02a24e9f58532274f8eb166e8
   languageName: node
   linkType: hard
 
@@ -3000,7 +3282,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@openmrs/esm-patient-list-management-app@workspace:packages/esm-patient-list-management-app"
   dependencies:
-    "@carbon/react": "npm:~1.37.0"
+    "@carbon/react": "npm:^1.71.0"
     dexie: "npm:^3.0.3"
     fuzzy: "npm:^0.1.3"
     lodash-es: "npm:^4.17.15"
@@ -3019,7 +3301,7 @@ __metadata:
   resolution: "@openmrs/esm-patient-management@workspace:."
   dependencies:
     "@babel/core": "npm:^7.11.6"
-    "@carbon/react": "npm:~1.37.0"
+    "@carbon/react": "npm:^1.71.0"
     "@hookform/resolvers": "npm:^3.3.1"
     "@internationalized/date": "npm:^3.5.4"
     "@openmrs/esm-framework": "npm:next"
@@ -3051,6 +3333,7 @@ __metadata:
     eslint: "npm:^8.55.0"
     eslint-plugin-import: "npm:^2.31.0"
     eslint-plugin-jest-dom: "npm:^5.4.0"
+    eslint-plugin-playwright: "npm:^2.1.0"
     eslint-plugin-react-hooks: "npm:^4.6.0"
     eslint-plugin-testing-library: "npm:^6.2.2"
     husky: "npm:^8.0.3"
@@ -3087,7 +3370,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@openmrs/esm-patient-registration-app@workspace:packages/esm-patient-registration-app"
   dependencies:
-    "@carbon/react": "npm:~1.37.0"
+    "@carbon/react": "npm:^1.71.0"
     formik: "npm:^2.1.5"
     lodash-es: "npm:^4.17.15"
     uuid: "npm:^8.3.2"
@@ -3107,7 +3390,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@openmrs/esm-patient-search-app@workspace:packages/esm-patient-search-app"
   dependencies:
-    "@carbon/react": "npm:~1.37.0"
+    "@carbon/react": "npm:^1.71.0"
     lodash-es: "npm:^4.17.15"
     webpack: "npm:^5.74.0"
   peerDependencies:
@@ -3119,9 +3402,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openmrs/esm-react-utils@npm:5.8.2-pre.2488":
-  version: 5.8.2-pre.2488
-  resolution: "@openmrs/esm-react-utils@npm:5.8.2-pre.2488"
+"@openmrs/esm-react-utils@npm:6.0.1-pre.2541":
+  version: 6.0.1-pre.2541
+  resolution: "@openmrs/esm-react-utils@npm:6.0.1-pre.2541"
   dependencies:
     lodash-es: "npm:^4.17.21"
     single-spa-react: "npm:^6.0.0"
@@ -3142,13 +3425,13 @@ __metadata:
     react-i18next: 11.x
     rxjs: 6.x
     swr: 2.x
-  checksum: 10/34945ec919e441f22cd5002885b522b77e994d9c92afa904516e9798e67f624ed5986471c929488d26b1fa7265bdb9ede729dc3c19af80d87dd8838bf060e00c
+  checksum: 10/e24460325ad64bfa59f56010e22ea129332632e42d88906b936d9899e79a8bba21f4c6d675fdb405ecab21b67d62093d45ea489077160a9472a5bb87880f4e31
   languageName: node
   linkType: hard
 
-"@openmrs/esm-routes@npm:5.8.2-pre.2488":
-  version: 5.8.2-pre.2488
-  resolution: "@openmrs/esm-routes@npm:5.8.2-pre.2488"
+"@openmrs/esm-routes@npm:6.0.1-pre.2541":
+  version: 6.0.1-pre.2541
+  resolution: "@openmrs/esm-routes@npm:6.0.1-pre.2541"
   peerDependencies:
     "@openmrs/esm-config": 5.x
     "@openmrs/esm-dynamic-loading": 5.x
@@ -3157,7 +3440,7 @@ __metadata:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-utils": 5.x
     single-spa: 6.x
-  checksum: 10/7fa0caeb78f461cf23565ff3325ba307379962e731ef14d28ab03fd569234384ea02f25655f79000bd6b68ba223c2361d58cb337fe28841b81f9f6b63eb692e4
+  checksum: 10/cb0012e58a23586b4ed2316ceb32669f06136588970a090d8f4e4bf151ef6cfca5d7152c659f80c919746b59578ec1c78065584ba8855a4784a66c43c3115953
   languageName: node
   linkType: hard
 
@@ -3165,7 +3448,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@openmrs/esm-service-queues-app@workspace:packages/esm-service-queues-app"
   dependencies:
-    "@carbon/react": "npm:~1.37.0"
+    "@carbon/react": "npm:^1.71.0"
     lodash-es: "npm:^4.17.15"
     webpack: "npm:^5.74.0"
   peerDependencies:
@@ -3177,21 +3460,21 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openmrs/esm-state@npm:5.8.2-pre.2488":
-  version: 5.8.2-pre.2488
-  resolution: "@openmrs/esm-state@npm:5.8.2-pre.2488"
+"@openmrs/esm-state@npm:6.0.1-pre.2541":
+  version: 6.0.1-pre.2541
+  resolution: "@openmrs/esm-state@npm:6.0.1-pre.2541"
   dependencies:
     zustand: "npm:^4.5.5"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-utils": 5.x
-  checksum: 10/60714faad87ef0203bda03fe194966c565eaf2b3d5b6971c51b01689e477a3e535a13a217521123ab2271dfce42da3ff509c43702d1706cc9f5cde4fbca5660e
+  checksum: 10/80aff6a69d21bcd8c1466806eb2d1ca0562e82d95c5eefe01b09bd323a87b1c2a95463ebff1484e43403d12a30378bd7428170274f7a5dec78475e2c28c18b51
   languageName: node
   linkType: hard
 
-"@openmrs/esm-styleguide@npm:5.8.2-pre.2488":
-  version: 5.8.2-pre.2488
-  resolution: "@openmrs/esm-styleguide@npm:5.8.2-pre.2488"
+"@openmrs/esm-styleguide@npm:6.0.1-pre.2541":
+  version: 6.0.1-pre.2541
+  resolution: "@openmrs/esm-styleguide@npm:6.0.1-pre.2541"
   dependencies:
     "@carbon/charts": "npm:^1.12.0"
     "@carbon/react": "npm:~1.37.0"
@@ -3215,24 +3498,24 @@ __metadata:
     react-dom: 18.x
     react-i18next: 11.x
     rxjs: 6.x
-  checksum: 10/ec19b1b2482311df049444c176399e7b956ee16951d454d47e16375f604b60b8dbb6e5c514b4105b990ee9a9375a18023245afe703fcf422e6a07e31306ad21f
+  checksum: 10/6218c85f712521f7bba1e6fc5adb739efd78ed1c9c2bc831d0add367be5b4fdfdd6570f668d59bcb6c3ac436d71528c2565f2ea871f35f4fe1f828f2022f637a
   languageName: node
   linkType: hard
 
-"@openmrs/esm-translations@npm:5.8.2-pre.2488":
-  version: 5.8.2-pre.2488
-  resolution: "@openmrs/esm-translations@npm:5.8.2-pre.2488"
+"@openmrs/esm-translations@npm:6.0.1-pre.2541":
+  version: 6.0.1-pre.2541
+  resolution: "@openmrs/esm-translations@npm:6.0.1-pre.2541"
   dependencies:
     i18next: "npm:21.10.0"
   peerDependencies:
     i18next: 21.x
-  checksum: 10/c6fa15bc5a1f2d760251c2818a462b9625918fe8c40235519e0de00f0f24c07c055d5ac2d59b753d69746ee56e8d783875b051ee2a4878ee39ea99b73011137e
+  checksum: 10/c7e68d118888b367591bf6f3fe2091856000517abd8322fa903de53b751551b11ec3e96252706ecfcbca629eb4e4331d4a2cab15473133f934dc2c4de9a0895a
   languageName: node
   linkType: hard
 
-"@openmrs/esm-utils@npm:5.8.2-pre.2488":
-  version: 5.8.2-pre.2488
-  resolution: "@openmrs/esm-utils@npm:5.8.2-pre.2488"
+"@openmrs/esm-utils@npm:6.0.1-pre.2541":
+  version: 6.0.1-pre.2541
+  resolution: "@openmrs/esm-utils@npm:6.0.1-pre.2541"
   dependencies:
     "@formatjs/intl-durationformat": "npm:^0.2.4"
     "@internationalized/date": "npm:^3.5.5"
@@ -3242,7 +3525,7 @@ __metadata:
     dayjs: 1.x
     i18next: 21.x
     rxjs: 6.x
-  checksum: 10/7dcc313b99208d4b3c21b3162950b2399ffc8d2edfd9f9ae303564ef4a1b8f4d01fdc654f6b512f0ed03a6fd64c1d1716a5802c543c5b91ccf7042abbf061c19
+  checksum: 10/40e0c67fd532e02f45a68f72ea55c9c4deda755aed0415ae0918d695913a3e010de8eb4f8438b6366c46215ac12078bf4613c269de49aca5747540444f880ef3
   languageName: node
   linkType: hard
 
@@ -3250,7 +3533,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@openmrs/esm-ward-app@workspace:packages/esm-ward-app"
   dependencies:
-    "@carbon/react": "npm:~1.37.0"
+    "@carbon/react": "npm:^1.71.0"
     lodash-es: "npm:^4.17.15"
     webpack: "npm:^5.74.0"
   peerDependencies:
@@ -3262,9 +3545,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openmrs/webpack-config@npm:5.8.2-pre.2488":
-  version: 5.8.2-pre.2488
-  resolution: "@openmrs/webpack-config@npm:5.8.2-pre.2488"
+"@openmrs/webpack-config@npm:6.0.1-pre.2541":
+  version: 6.0.1-pre.2541
+  resolution: "@openmrs/webpack-config@npm:6.0.1-pre.2541"
   dependencies:
     "@swc/core": "npm:^1.3.58"
     clean-webpack-plugin: "npm:^4.0.0"
@@ -3282,7 +3565,7 @@ __metadata:
     webpack-stats-plugin: "npm:^1.0.3"
   peerDependencies:
     webpack: 5.x
-  checksum: 10/9890ad52400d90d58a20434665b50e6460619efc04f5c1943158a71835fe2693f47131f1c3d758da071f66f6df37700aad43333077e88bca0ab07e5b7e867a75
+  checksum: 10/1b4ab73a214508c7796fb7d61b8780e51bc59e6048b02814ed7d8c617ac0ed30aa112b1e4a18c4cf2e79b6b762899e69cb2bba2cd5322c77521ffe0b45392ce3
   languageName: node
   linkType: hard
 
@@ -7845,7 +8128,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"compute-scroll-into-view@npm:^3.0.3":
+"compute-scroll-into-view@npm:^3.0.3, compute-scroll-into-view@npm:^3.1.0":
   version: 3.1.0
   resolution: "compute-scroll-into-view@npm:3.1.0"
   checksum: 10/cc5211d49bced5ad23385da5c2eaf69b6045628581b0dcb9f4dd407bfee51bbd26d2bce426be26edf2feaf8c243706f5a7c3759827d89cc5a01a5cf7d299a5eb
@@ -9177,6 +9460,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"downshift@npm:9.0.8":
+  version: 9.0.8
+  resolution: "downshift@npm:9.0.8"
+  dependencies:
+    "@babel/runtime": "npm:^7.24.5"
+    compute-scroll-into-view: "npm:^3.1.0"
+    prop-types: "npm:^15.8.1"
+    react-is: "npm:18.2.0"
+    tslib: "npm:^2.6.2"
+  peerDependencies:
+    react: ">=16.12.0"
+  checksum: 10/9dc4577e780c54742ba4dde11f481f0d839f001b309200fbe4db112385b227ccd9cd2ef97d9e995379fa70249f0664a562240e415b9966f18c8a5cb7ce435f2c
+  languageName: node
+  linkType: hard
+
 "duplexer@npm:^0.1.2":
   version: 0.1.2
   resolution: "duplexer@npm:0.1.2"
@@ -9645,6 +9943,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-plugin-playwright@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "eslint-plugin-playwright@npm:2.1.0"
+  dependencies:
+    globals: "npm:^13.23.0"
+  peerDependencies:
+    eslint: ">=8.40.0"
+  checksum: 10/5c36202a56760203bf3738b03fbd1fddce520f09772b998d2cd7631636f5dec1c4dda724af94ccafb462ffadd113bb8a940ef6991661095cab4997cf19863000
+  languageName: node
+  linkType: hard
+
 "eslint-plugin-react-hooks@npm:^4.6.0":
   version: 4.6.0
   resolution: "eslint-plugin-react-hooks@npm:4.6.0"
@@ -10139,6 +10448,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"flatpickr@npm:4.6.13":
+  version: 4.6.13
+  resolution: "flatpickr@npm:4.6.13"
+  checksum: 10/0e32f2fbd427aa8d838da8fb0cf2e56b65efc22783dcebcc32c11b7fbb6bbc8c3532f9410915f3acb7dc0feebb49202bea03e49cc80b9d4d11b3bdce49488bc0
+  languageName: node
+  linkType: hard
+
 "flatpickr@npm:4.6.9":
   version: 4.6.9
   resolution: "flatpickr@npm:4.6.9"
@@ -10666,7 +10982,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globals@npm:^13.19.0":
+"globals@npm:^13.19.0, globals@npm:^13.23.0":
   version: 13.24.0
   resolution: "globals@npm:13.24.0"
   dependencies:
@@ -14064,11 +14380,11 @@ __metadata:
   linkType: hard
 
 "openmrs@npm:next":
-  version: 5.8.2-pre.2488
-  resolution: "openmrs@npm:5.8.2-pre.2488"
+  version: 6.0.1-pre.2541
+  resolution: "openmrs@npm:6.0.1-pre.2541"
   dependencies:
-    "@openmrs/esm-app-shell": "npm:5.8.2-pre.2488"
-    "@openmrs/webpack-config": "npm:5.8.2-pre.2488"
+    "@openmrs/esm-app-shell": "npm:6.0.1-pre.2541"
+    "@openmrs/webpack-config": "npm:6.0.1-pre.2541"
     "@pnpm/npm-conf": "npm:^2.1.0"
     "@swc/core": "npm:^1.3.58"
     autoprefixer: "npm:^10.4.20"
@@ -14107,7 +14423,7 @@ __metadata:
     yargs: "npm:^17.6.2"
   bin:
     openmrs: ./dist/cli.js
-  checksum: 10/28ef634ed6c01041784abbb46b5bb13ec9d76de10657c6abe32314d46071884bc163cbe681536b123a55d62d5d73db6ac10392c2586643630a438d4ae877154a
+  checksum: 10/c14d9ad1637589fd76f210de75eb8f445e2c3f8f26c41d60607d6728558702926ea27799ab7314a7f73acdcc09d2da8de7a7cd721175e2b232149a979da63804
   languageName: node
   linkType: hard
 
@@ -15373,6 +15689,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-fast-compare@npm:^3.2.2":
+  version: 3.2.2
+  resolution: "react-fast-compare@npm:3.2.2"
+  checksum: 10/a6826180ba75cefba1c8d3ac539735f9b627ca05d3d307fe155487f5d0228d376dac6c9708d04a283a7b9f9aee599b637446635b79c8c8753d0b4eece56c125c
+  languageName: node
+  linkType: hard
+
 "react-hook-form@npm:^7.46.2":
   version: 7.50.0
   resolution: "react-hook-form@npm:7.50.0"
@@ -15400,6 +15723,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-is@npm:18.2.0, react-is@npm:^18.0.0, react-is@npm:^18.2.0":
+  version: 18.2.0
+  resolution: "react-is@npm:18.2.0"
+  checksum: 10/200cd65bf2e0be7ba6055f647091b725a45dd2a6abef03bf2380ce701fd5edccee40b49b9d15edab7ac08a762bf83cb4081e31ec2673a5bfb549a36ba21570df
+  languageName: node
+  linkType: hard
+
 "react-is@npm:^16.13.1, react-is@npm:^16.7.0":
   version: 16.13.1
   resolution: "react-is@npm:16.13.1"
@@ -15414,13 +15744,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-is@npm:^18.0.0, react-is@npm:^18.2.0":
-  version: 18.2.0
-  resolution: "react-is@npm:18.2.0"
-  checksum: 10/200cd65bf2e0be7ba6055f647091b725a45dd2a6abef03bf2380ce701fd5edccee40b49b9d15edab7ac08a762bf83cb4081e31ec2673a5bfb549a36ba21570df
-  languageName: node
-  linkType: hard
-
 "react-router-dom@npm:^6.3.0":
   version: 6.4.3
   resolution: "react-router-dom@npm:6.4.3"
@@ -17146,6 +17469,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tabbable@npm:^6.0.0, tabbable@npm:^6.2.0":
+  version: 6.2.0
+  resolution: "tabbable@npm:6.2.0"
+  checksum: 10/980fa73476026e99dcacfc0d6e000d41d42c8e670faf4682496d30c625495e412c4369694f2a15cf1e5252d22de3c396f2b62edbe8d60b5dadc40d09e3f2dde3
+  languageName: node
+  linkType: hard
+
 "tapable@npm:^1.0.0":
   version: 1.1.3
   resolution: "tapable@npm:1.1.3"