diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 00000000..5453e59b
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,25 @@
+## Requirements
+- [ ] This PR has a title that briefly describes the work done including a [conventional commit](https://o3-docs.openmrs.org/#/getting_started/contributing?id=your-pr-title-should-indicate-the-type-of-change-it-is) type prefix and a Jira ticket number if applicable. See existing PR titles for inspiration.
+
+#### For changes to apps
+- [ ]  My work conforms to the [**OpenMRS 3.0 Styleguide**](https://om.rs/styleguide) and [**design documentation**](https://zeroheight.com/23a080e38/p/880723-introduction).
+
+#### If applicable
+- [ ] My work includes tests or is validated by existing tests.
+
+## Summary
+<!-- Please describe what problems your PR addresses. -->
+<!-- *None* -->
+
+## Screenshots
+<!-- Required if you are making UI changes. -->
+<!-- *None* -->
+
+## Related Issue
+<!-- Paste the link to the Jira ticket here if one exists. -->
+<!-- https://issues.openmrs.org/browse/O3- -->
+<!-- *None* -->
+
+## Other
+<!-- Anything not covered above -->
+<!-- *None* -->
diff --git a/packages/esm-patient-queues-app/src/active-visits/change-status-dialog.component.tsx b/packages/esm-patient-queues-app/src/active-visits/change-status-dialog.component.tsx
index db36dd12..30b4b1d2 100644
--- a/packages/esm-patient-queues-app/src/active-visits/change-status-dialog.component.tsx
+++ b/packages/esm-patient-queues-app/src/active-visits/change-status-dialog.component.tsx
@@ -193,9 +193,9 @@ const ChangeStatus: React.FC<ChangeStatusDialogProps> = ({ queueEntry, currentEn
           () => {
             showToast({
               critical: true,
-              title: t('endVisit', 'End Vist'),
+              title: t('completePatient', 'Completed Patient'),
               kind: 'success',
-              description: t('endVisitSuccessfully', 'You have successfully ended patient visit'),
+              description: t('endVisitSuccessfully', 'You have successfully completed working on the pa'),
             });
             closeModal();
             mutate();
@@ -374,23 +374,25 @@ const ChangeStatus: React.FC<ChangeStatusDialogProps> = ({ queueEntry, currentEn
               </section>
             )}
 
-            <section className={styles.section}>
-              <Select
-                labelText={t('selectProvider', 'Select a provider')}
-                id="providers-list"
-                name="providers-list"
-                invalidText="Required"
-                value={selectedProvider}
-                onChange={(event) => setSelectedProvider(event.target.value)}
-              >
-                {!selectedProvider ? <SelectItem text={t('selectProvider', 'Select a provider')} value="" /> : null}
-                {filteredProviders.map((provider) => (
-                  <SelectItem key={provider.uuid} text={provider.display} value={provider.uuid}>
-                    {provider.display}
-                  </SelectItem>
-                ))}
-              </Select>
-            </section>
+            {status === 'completed' && (
+              <section className={styles.section}>
+                <Select
+                  labelText={t('selectProvider', 'Select a provider')}
+                  id="providers-list"
+                  name="providers-list"
+                  invalidText="Required"
+                  value={selectedProvider}
+                  onChange={(event) => setSelectedProvider(event.target.value)}
+                >
+                  {!selectedProvider ? <SelectItem text={t('selectProvider', 'Select a provider')} value="" /> : null}
+                  {filteredProviders.map((provider) => (
+                    <SelectItem key={provider.uuid} text={provider.display} value={provider.uuid}>
+                      {provider.display}
+                    </SelectItem>
+                  ))}
+                </Select>
+              </section>
+            )}
 
             {status === 'completed' && (
               <section className={styles.section}>
diff --git a/packages/esm-patient-queues-app/src/active-visits/change-status-move-to-next-dialog.component.tsx b/packages/esm-patient-queues-app/src/active-visits/change-status-move-to-next-dialog.component.tsx
new file mode 100644
index 00000000..02b568e1
--- /dev/null
+++ b/packages/esm-patient-queues-app/src/active-visits/change-status-move-to-next-dialog.component.tsx
@@ -0,0 +1,377 @@
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+
+import {
+  Button,
+  ContentSwitcher,
+  Form,
+  ModalBody,
+  ModalFooter,
+  ModalHeader,
+  Select,
+  SelectItem,
+  Switch,
+  TextArea,
+} from '@carbon/react';
+
+import { showNotification, showToast, useLocations, useSession } from '@openmrs/esm-framework';
+
+import { addQueueEntry, getCareProvider, updateQueueEntry } from './active-visits-table.resource';
+
+import { useTranslation } from 'react-i18next';
+import { useQueueRoomLocations } from '../patient-search/hooks/useQueueRooms';
+
+import styles from './change-status-dialog.scss';
+import { getCurrentPatientQueueByPatientUuid, useProviders } from '../patient-search/visit-form/queue.resource';
+import { MappedQueueEntry, QueueRecord } from '../types';
+
+interface ChangeStatusDialogProps {
+  patientUuid: string;
+  closeModal: () => void;
+}
+
+const ChangeStatusMoveToNext: React.FC<ChangeStatusDialogProps> = ({ patientUuid, closeModal }) => {
+  const { t } = useTranslation();
+
+  const locations = useLocations();
+
+  const sessionUser = useSession();
+
+  const { providers } = useProviders();
+
+  const [selectedLocation, setSelectedLocation] = useState('');
+
+  const [contentSwitcherIndex, setContentSwitcherIndex] = useState(1);
+
+  const [statusSwitcherIndex, setStatusSwitcherIndex] = useState(1);
+
+  const [status, setStatus] = useState('');
+
+  const { queueRoomLocations } = useQueueRoomLocations(sessionUser?.sessionLocation?.uuid);
+
+  const [selectedNextQueueLocation, setSelectedNextQueueLocation] = useState(queueRoomLocations[0]?.uuid);
+
+  const [provider, setProvider] = useState('');
+
+  const [priorityComment, setPriorityComment] = useState('');
+
+  const [selectedProvider, setSelectedProvider] = useState('');
+
+  let mappedQueueEntry: QueueRecord;
+
+  useEffect(() => {
+    getCareProvider(sessionUser?.user?.systemId).then(
+      (response) => {
+        setProvider(response?.data?.results[0].uuid);
+        // mutate();
+      },
+      (error) => {
+        showNotification({
+          title: t(`errorGettingProvider', 'Couldn't get provider`),
+          kind: 'error',
+          critical: true,
+          description: error?.message,
+        });
+      },
+    );
+  });
+
+  getCurrentPatientQueueByPatientUuid(patientUuid, sessionUser?.sessionLocation?.uuid).then(
+    (res) => {
+      mappedQueueEntry = res.data.results[0];
+
+      console.info('mappedQueueEntry', JSON.stringify(mappedQueueEntry, null, 2));
+    },
+    (error) => {
+      showNotification({
+        title: t('errorGettingPatientQueueEntry', 'Error Getting Patient Queue Entry'),
+        kind: 'error',
+        critical: true,
+        description: error?.message,
+      });
+    },
+  );
+
+  useEffect(() => {
+    if (locations?.length && sessionUser) {
+      setSelectedLocation(sessionUser?.sessionLocation?.uuid);
+    }
+  }, [locations, sessionUser]);
+
+  useMemo(() => {
+    switch (statusSwitcherIndex) {
+      case 0: {
+        setStatus('pending');
+        break;
+      }
+      case 1: {
+        setStatus('completed');
+        break;
+      }
+    }
+  }, [statusSwitcherIndex]);
+
+  useMemo(() => {
+    switch (contentSwitcherIndex) {
+      case 0: {
+        setPriorityComment('Not Urgent');
+        break;
+      }
+      case 1: {
+        setPriorityComment('Urgent');
+        break;
+      }
+      case 2: {
+        setPriorityComment('Emergency');
+        break;
+      }
+    }
+  }, [contentSwitcherIndex]);
+
+  const filteredlocations = queueRoomLocations?.filter((location) => location.uuid != selectedLocation);
+
+  const filteredProviders = providers?.flatMap((provider) =>
+    provider.attributes.filter(
+      (item) =>
+        item.attributeType.display === 'Default Location' &&
+        typeof item.value === 'object' &&
+        item?.value?.uuid === selectedNextQueueLocation,
+    ).length > 0
+      ? provider
+      : [],
+  );
+
+  // change to picked
+  const changeQueueStatus = useCallback(
+    (event: { preventDefault: () => void; target: { [x: string]: { value: string } } }) => {
+      event.preventDefault();
+
+      // check status
+
+      if (status === 'pending') {
+        const comment = event?.target['nextNotes']?.value ?? 'Not Set';
+        updateQueueEntry(status, provider, mappedQueueEntry?.uuid, 0, priorityComment, comment).then(
+          () => {
+            showToast({
+              critical: true,
+              title: t('updateEntry', 'Update entry'),
+              kind: 'success',
+              description: t('queueEntryUpdateSuccessfully', 'Queue Entry Updated Successfully'),
+            });
+            closeModal();
+            // mutate();
+          },
+          (error) => {
+            showNotification({
+              title: t('queueEntryUpdateFailed', 'Error updating queue entry status'),
+              kind: 'error',
+              critical: true,
+              description: error?.message,
+            });
+          },
+        );
+      } else if (status === 'completed') {
+        const comment = event?.target['nextNotes']?.value ?? 'Not Set';
+        const nextQueueLocationUuid = event?.target['nextQueueLocation']?.value;
+
+        updateQueueEntry(
+          'Completed',
+          provider,
+          mappedQueueEntry?.uuid,
+          contentSwitcherIndex,
+          priorityComment,
+          comment,
+        ).then(
+          () => {
+            showToast({
+              critical: true,
+              title: t('endVisit', 'End Vist'),
+              kind: 'success',
+              description: t('endVisitSuccessfully', 'You have successfully ended patient visit'),
+            });
+            closeModal();
+            // mutate();
+          },
+          (error) => {
+            showNotification({
+              title: t('queueEntryUpdateFailed', 'Error ending visit'),
+              kind: 'error',
+              critical: true,
+              description: error?.message,
+            });
+          },
+        );
+
+        addQueueEntry(
+          mappedQueueEntry?.uuid,
+          nextQueueLocationUuid,
+          '',
+          selectedProvider,
+          contentSwitcherIndex,
+          patientUuid,
+          'pending',
+          selectedLocation,
+          priorityComment,
+          comment,
+        ).then(
+          () => {
+            showToast({
+              critical: true,
+              title: t('updateEntry', 'Move to next queue'),
+              kind: 'success',
+              description: t('movetonextqueue', 'Move to next queue successfully'),
+            });
+            //pick and route
+            const status = 'picked';
+            updateQueueEntry(
+              status,
+              provider,
+              mappedQueueEntry?.uuid,
+              contentSwitcherIndex,
+              priorityComment,
+              'comment',
+            ).then(
+              () => {
+                closeModal();
+              },
+              (error) => {
+                showNotification({
+                  title: t('queueEntryUpdateFailed', 'Error updating queue entry status'),
+                  kind: 'error',
+                  critical: true,
+                  description: error?.message,
+                });
+              },
+            );
+
+            closeModal();
+            // mutate();
+          },
+          (error) => {
+            showNotification({
+              title: t('queueEntryUpdateFailed', 'Error updating queue entry status'),
+              kind: 'error',
+              critical: true,
+              description: error?.message,
+            });
+          },
+        );
+      }
+    },
+    [
+      closeModal,
+      contentSwitcherIndex,
+      mappedQueueEntry?.uuid,
+      patientUuid,
+      priorityComment,
+      provider,
+      selectedLocation,
+      selectedProvider,
+      status,
+      t,
+    ],
+  );
+
+  return (
+    <div>
+      <Form onSubmit={changeQueueStatus}>
+        <ModalHeader closeModal={closeModal} />
+        <ModalBody>
+          <div className={styles.modalBody}>
+            <div style={{ display: 'flex', alignItems: 'center' }}>
+              <h4 className={styles.section}> Queue to next service area</h4>
+            </div>
+          </div>
+          <section className={styles.section}>
+            <div className={styles.sectionTitle}>{t('priority', 'Priority')}</div>
+            <ContentSwitcher
+              selectedIndex={contentSwitcherIndex}
+              className={styles.contentSwitcher}
+              onChange={({ index }) => setContentSwitcherIndex(index)}
+            >
+              <Switch name="notUrgent" text={t('notUrgent', 'Not Urgent')} />
+              <Switch name="urgent" text={t('urgent', 'Urgent')} />
+              <Switch name="emergency" text={t('emergency', 'Emergency')} />
+            </ContentSwitcher>
+          </section>
+
+          <section className={styles.section}>
+            <div className={styles.sectionTitle}>{t('status', 'Status')}</div>
+            <ContentSwitcher
+              selectedIndex={statusSwitcherIndex}
+              className={styles.contentSwitcher}
+              onChange={({ index }) => setStatusSwitcherIndex(index)}
+            >
+              <Switch name="pending" text={t('pending', 'Move to Pending')} />
+              <Switch name="completed" text={t('completed', 'Move to completed')} />
+            </ContentSwitcher>
+          </section>
+
+          {status === 'completed' && (
+            <section className={styles.section}>
+              <Select
+                labelText={t('selectNextQueueRoom', 'Select next queue room ')}
+                id="nextQueueLocation"
+                name="nextQueueLocation"
+                invalidText="Required"
+                value={selectedNextQueueLocation}
+                onChange={(event) => setSelectedNextQueueLocation(event.target.value)}
+              >
+                {!selectedNextQueueLocation ? (
+                  <SelectItem text={t('selectNextServicePoint', 'Select next service point')} value="" />
+                ) : null}
+                {filteredlocations.map((location) => (
+                  <SelectItem key={location.uuid} text={location.display} value={location.uuid}>
+                    {location.display}
+                  </SelectItem>
+                ))}
+              </Select>
+            </section>
+          )}
+
+          {status === 'completed' && (
+            <section className={styles.section}>
+              <Select
+                labelText={t('selectProvider', 'Select a provider')}
+                id="providers-list"
+                name="providers-list"
+                invalidText="Required"
+                value={selectedProvider}
+                onChange={(event) => setSelectedProvider(event.target.value)}
+              >
+                {!selectedProvider ? <SelectItem text={t('selectProvider', 'Select a provider')} value="" /> : null}
+                {filteredProviders.map((provider) => (
+                  <SelectItem key={provider.uuid} text={provider.display} value={provider.uuid}>
+                    {provider.display}
+                  </SelectItem>
+                ))}
+              </Select>
+            </section>
+          )}
+
+          {status === 'completed' && (
+            <section className={styles.section}>
+              <TextArea
+                labelText={t('notes', 'Enter notes ')}
+                id="nextNotes"
+                name="nextNotes"
+                invalidText="Required"
+                helperText="Please enter notes"
+                maxCount={500}
+                enableCounter
+              />
+            </section>
+          )}
+        </ModalBody>
+        <ModalFooter>
+          <Button kind="secondary" onClick={closeModal}>
+            {t('cancel', 'Cancel')}
+          </Button>
+
+          <Button type="submit">{status === 'pending' ? 'Save' : 'Move to the next queue room'}</Button>
+        </ModalFooter>
+      </Form>
+    </div>
+  );
+};
+
+export default ChangeStatusMoveToNext;
diff --git a/packages/esm-patient-queues-app/src/active-visits/move-to-next-service-point-action.components.tsx b/packages/esm-patient-queues-app/src/active-visits/move-to-next-service-point-action.components.tsx
new file mode 100644
index 00000000..261bbf6a
--- /dev/null
+++ b/packages/esm-patient-queues-app/src/active-visits/move-to-next-service-point-action.components.tsx
@@ -0,0 +1,36 @@
+import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+import { showModal } from '@openmrs/esm-framework';
+
+interface PatientMoveToNextServicePointProps {
+  patientUuid: string;
+}
+
+const PatientMovetoNextPoint: React.FC<PatientMoveToNextServicePointProps> = ({ patientUuid }) => {
+  const { t } = useTranslation();
+  const openModal = useCallback(() => {
+    const dispose = showModal('patient-move-to-next-service-point-modal', {
+      patientUuid,
+      closeModal: () => dispose(),
+    });
+  }, [patientUuid]);
+  return (
+    <li className="cds--overflow-menu-options__option">
+      <button
+        className="cds--overflow-menu-options__btn"
+        role="menuitem"
+        title={t('moveToNext', 'Move to Next Service Point')}
+        data-floating-menu-primary-focus
+        onClick={openModal}
+        style={{
+          maxWidth: '100vw',
+        }}
+      >
+        <span className="cds--overflow-menu-options__option-content">
+          {t('moveToNext', 'Move to Next Service Point')}
+        </span>
+      </button>
+    </li>
+  );
+};
+export default PatientMovetoNextPoint;
diff --git a/packages/esm-patient-queues-app/src/index.ts b/packages/esm-patient-queues-app/src/index.ts
index 625991f5..0882129c 100644
--- a/packages/esm-patient-queues-app/src/index.ts
+++ b/packages/esm-patient-queues-app/src/index.ts
@@ -63,6 +63,16 @@ export const editQueueEntryStatusModal = getAsyncLifecycle(
   },
 );
 
+export const patientChartMoveToNextServicePointModal = getAsyncLifecycle(
+  () => import('./active-visits/change-status-move-to-next-dialog.component'),
+  options,
+);
+
+export const moveToNextServicePointButton = getAsyncLifecycle(
+  () => import('./active-visits/move-to-next-service-point-action.components'),
+  options,
+);
+
 export const patientInfoBannerSlot = getAsyncLifecycle(() => import('./patient-info/patient-info.component'), {
   featureName: 'patient info slot',
   moduleName,
diff --git a/packages/esm-patient-queues-app/src/patient-search/visit-form/queue.resource.ts b/packages/esm-patient-queues-app/src/patient-search/visit-form/queue.resource.ts
index 5737dd6a..3f49d7db 100644
--- a/packages/esm-patient-queues-app/src/patient-search/visit-form/queue.resource.ts
+++ b/packages/esm-patient-queues-app/src/patient-search/visit-form/queue.resource.ts
@@ -75,3 +75,16 @@ export function useProviders() {
     isValidating,
   };
 }
+
+export async function getCurrentPatientQueueByPatientUuid(patientUuid: string, currentLocation: string) {
+  const apiUrl = `/ws/rest/v1/incompletequeue?queueRoom=${currentLocation}&patient=${patientUuid}&v=full`;
+
+  const abortController = new AbortController();
+
+  return await openmrsFetch(apiUrl, {
+    signal: abortController.signal,
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  });
+}
diff --git a/packages/esm-patient-queues-app/src/routes.json b/packages/esm-patient-queues-app/src/routes.json
index f90ecbcc..e649b76a 100644
--- a/packages/esm-patient-queues-app/src/routes.json
+++ b/packages/esm-patient-queues-app/src/routes.json
@@ -44,6 +44,17 @@
             "name": "edit-queue-entry-status-modal",
             "component": "editQueueEntryStatusModal"
         },
+        {
+            "name": "patient-move-to-next-service-point-modal",
+            "component": "patientChartMoveToNextServicePointModal"
+        },
+        {
+            "name": "patient-move-to-next-service-point",
+            "slot": "patient-actions-slot",
+            "component": "moveToNextServicePointButton",
+            "online": true,
+            "offline": true
+        },
         {
             "name": "patient-info-banner-slot",
             "component": "patientInfoBannerSlot"
diff --git a/packages/esm-patient-queues-app/src/types/index.ts b/packages/esm-patient-queues-app/src/types/index.ts
index b7095792..f2dff5f4 100644
--- a/packages/esm-patient-queues-app/src/types/index.ts
+++ b/packages/esm-patient-queues-app/src/types/index.ts
@@ -514,3 +514,154 @@ export interface Link {
   uri: string;
   resourceAlias: string;
 }
+
+export interface QueueRecord {
+  uuid: string;
+  visitNumber: string;
+  dateCreated: string;
+  dateChanged: string;
+  locationFrom: LocationFrom;
+  locationTo: LocationTo;
+  status: string;
+  queueRoom: QueueRoom;
+  datePicked: string;
+  dateCompleted: any;
+  provider: Provider;
+  links: Link[];
+}
+
+export interface LocationFrom {
+  uuid: string;
+  display: string;
+  name: string;
+  description: any;
+  address1: any;
+  address2: any;
+  cityVillage: any;
+  stateProvince: any;
+  country: string;
+  postalCode: any;
+  latitude: any;
+  longitude: any;
+  countyDistrict: any;
+  address3: any;
+  address4: any;
+  address5: any;
+  address6: any;
+  tags: Tag[];
+  parentLocation: ParentLocation;
+  childLocations: any[];
+  retired: boolean;
+  attributes: any[];
+  address7: any;
+  address8: any;
+  address9: any;
+  address10: any;
+  address11: any;
+  address12: any;
+  address13: any;
+  address14: any;
+  address15: any;
+  links: Link[];
+  resourceVersion: string;
+}
+
+export interface Tag {
+  uuid: string;
+  display: string;
+  links: Link[];
+}
+
+export interface Link {
+  rel: string;
+  uri: string;
+  resourceAlias: string;
+}
+
+export interface ParentLocation {
+  uuid: string;
+  display: string;
+  links: Link[];
+}
+
+export interface LocationTo {
+  uuid: string;
+  display: string;
+  name: string;
+  description: any;
+  address1: any;
+  address2: any;
+  cityVillage: any;
+  stateProvince: any;
+  country: string;
+  postalCode: any;
+  latitude: any;
+  longitude: any;
+  countyDistrict: any;
+  address3: any;
+  address4: any;
+  address5: any;
+  address6: any;
+  tags: Tag[];
+  parentLocation: ParentLocation;
+  childLocations: any[];
+  retired: boolean;
+  attributes: any[];
+  address7: any;
+  address8: any;
+  address9: any;
+  address10: any;
+  address11: any;
+  address12: any;
+  address13: any;
+  address14: any;
+  address15: any;
+  links: Link[];
+  resourceVersion: string;
+}
+
+export interface QueueRoom {
+  uuid: string;
+  display: string;
+  name: string;
+  address1: any;
+  address2: any;
+  cityVillage: any;
+  stateProvince: any;
+  country: string;
+  postalCode: any;
+  latitude: any;
+  longitude: any;
+  countyDistrict: any;
+  address3: any;
+  address4: any;
+  address5: any;
+  address6: any;
+  tags: Tag[];
+  parentLocation: ParentLocation;
+  childLocations: any[];
+  retired: boolean;
+  attributes: any[];
+  address7: any;
+  address8: any;
+  address9: any;
+  address10: any;
+  address11: any;
+  address12: any;
+  address13: any;
+  address14: any;
+  address15: any;
+  links: Link[];
+  resourceVersion: string;
+}
+
+export interface Provider {
+  uuid: string;
+  display: string;
+  person: OpenmrsResource;
+  identifier: string;
+  attributes: Attribute[];
+  retired: boolean;
+  links: Link[];
+  resourceVersion: string;
+}
diff --git a/packages/esm-ugandaemr-app/src/index.ts b/packages/esm-ugandaemr-app/src/index.ts
index 01947804..5b756924 100644
--- a/packages/esm-ugandaemr-app/src/index.ts
+++ b/packages/esm-ugandaemr-app/src/index.ts
@@ -3,10 +3,7 @@ import { configSchema } from './config-schema';
 import { moduleName } from './constants';
 import { createDashboardLink } from './createDashboardLink';
 import { facilityHomeDashboardMeta, hieHomeDashboardMeta } from './dashboard.meta';
-import {
-  createOHRIPatientChartSideNavLink,
-  patientChartDivider_dashboardMeta,
-} from '@ohri/openmrs-esm-ohri-commons-lib';
+
 import formBuilderAppMenu from './menu-app-items/form-builder-app-item/form-builder-app-item.component';
 import systemInfoAppMenu from './menu-app-items/system-info-app-item/system-info-app-item.component';
 import legacyAdminAppMenu from './menu-app-items/legacy-admin-item/legacy-admin-item.component';