diff --git a/README.md b/README.md
index 84cac17bf..ef6f6ec37 100644
--- a/README.md
+++ b/README.md
@@ -65,16 +65,14 @@ Note: there is a test account you can use. Get this from another developer if yo
 - `GOOGLE_TAG_MANAGER_CONTAINER_ID` - Optional Google Tag Manager container ID
 - `NEXT_PUBLIC_MEDIA_FAVICON` - Application favicon image url
 - `NEXT_PUBLIC_MEDIA_LOGO` - Application logo image url
-- `REWRITE_DOMAIN` - The domain which where new & old MPDX applications live. Set to `old.mpdx.org` for mpdx.org & `old-stage.mpdx.org` for staging.
 - `DATADOG_APP_ID` - Datadog tracking application ID.
 - `DATADOG_CLIENT_TOKEN` - Datadog tracking client token.
 - `DD_ENV` - Datadog environment.
-- `BEACON_TOKEN` - HelpScout beacon token
-- `HS_CONTACTS_SUGGESTIONS` - Comma-separated IDs of the HelpScout articles to suggest on the contacts page
-- `HS_CONTACTS_CONTACT_SUGGESTIONS` - Comma-separated IDs of the HelpScout articles to suggest on the contact page
-- `HS_HOME_SUGGESTIONS` - Comma-separated IDs of the HelpScout articles to suggest on the dashboard page
-- `HS_REPORTS_SUGGESTIONS` - Comma-separated IDs of the HelpScout articles to suggest on the reports pages
-- `HS_TASKS_SUGGESTIONS` - Comma-separated IDs of the HelpScout articles to suggest on the tasks page
+- `HELPJUICE_ORIGIN` - Helpjuice origin for documentation and user support (example: `https://www.helpducks.org`)
+- `HELPJUICE_KNOWLEDGE_BASE_URL` - Knowledge base page to make the Helpjuice "Visit Knowledge Base" page link to (example: `https://www.helpducks.org/mpdx`)
+- `HELP_URL_COACHING_ACTIVITY` - Link to an article explaining the coaching activity table
+- `HELP_URL_COACHING_APPOINTMENTS_AND_RESULTS` - Link to an article explaining the coaching appointments and results table
+- `HELP_URL_SETUP_FIND_ORGANIZATION` - Link to an article explaining how to find an organization
 - `PRIVACY_POLICY_URL` - URL of the privacy policy
 - `TERMS_OF_USE_URL` - URL of the terms of use
 - `DISABLE_SETUP_TOUR` - Set to `true` to disable starting users on the welcome tour. This should be removed from the codebase once tools are live.
diff --git a/__tests__/pages/api/MpdxWebHandoff.test.ts b/__tests__/pages/api/MpdxWebHandoff.test.ts
deleted file mode 100644
index 9955b8db6..000000000
--- a/__tests__/pages/api/MpdxWebHandoff.test.ts
+++ /dev/null
@@ -1,314 +0,0 @@
-import { getToken } from 'next-auth/jwt';
-import { createMocks } from 'node-mocks-http';
-import mpdxWebHandoff from 'pages/api/mpdx-web-handoff.page';
-import { taskFiltersTabs } from 'src/utils/tasks/taskFilterTabs';
-
-jest.mock('next-auth/jwt', () => ({ getToken: jest.fn() }));
-
-const siteUrl = process.env.SITE_URL;
-const accountListsUrl = `${siteUrl}/accountLists`;
-// User one
-const userOneId = 'userId_1';
-const userOneToken = 'userOne.token';
-const userOneImpersonate = 'userOne.impersonate.token';
-// User two
-const userTwoId = 'userId_2';
-const userTwoToken = 'userTwo.token';
-const userTwoImpersonate = 'userTwo.impersonate.token';
-
-const convertCookieStringToObject = (cookieString) => {
-  return cookieString.split('; ').reduce((prev, current) => {
-    const [name, ...value] = current.split('=');
-    prev[name] = value.join('=');
-    return prev;
-  }, {});
-};
-
-const grabCookies = (setCookieHeader: string[]): Cookies[] => {
-  const cookies: Cookies[] = [];
-  setCookieHeader.forEach((cookie) =>
-    cookies.push(convertCookieStringToObject(cookie)),
-  );
-  return cookies;
-};
-
-type Cookies = Record<string, string>;
-
-describe('/api/mpdx-web-handoff', () => {
-  it('No accountListId or path defined. Redirect to home', async () => {
-    const { req, res } = createMocks({ method: 'GET' });
-    await mpdxWebHandoff(req, res);
-    expect(res._getRedirectUrl()).toBe(`${siteUrl}/`);
-  });
-
-  const redirectUrl = `${siteUrl}/accountLists/accountListId/contacts`;
-
-  describe('No prev session', () => {
-    beforeEach(() => {
-      (getToken as jest.Mock).mockReturnValue(null);
-    });
-    it('New user - Redirect to login with correct cookies', async () => {
-      const { req, res } = createMocks({
-        method: 'GET',
-        query: {
-          accountListId: 'accountListId',
-          path: '/contacts',
-        },
-      });
-      await mpdxWebHandoff(req, res);
-      expect(res._getRedirectUrl()).toBe(`${siteUrl}/login`);
-      const cookies = grabCookies(res._getHeaders()['set-cookie']);
-      expect(cookies.length).toBe(2);
-      expect(cookies[0]['mpdx-handoff.redirect-url']).toBe(redirectUrl);
-      expect(cookies[1]['mpdx-handoff.logged-in']).toBe(`true`);
-    });
-
-    it('Impersonate user - Redirect to login with correct cookies', async () => {
-      const { req, res } = createMocks({
-        method: 'GET',
-        query: {
-          accountListId: 'accountListId',
-          path: '/contacts',
-          userId: userOneId,
-          token: userOneToken,
-          impersonate: userOneImpersonate,
-        },
-      });
-      await mpdxWebHandoff(req, res);
-      expect(res._getRedirectUrl()).toBe(`${siteUrl}/login`);
-      const cookies = grabCookies(res._getHeaders()['set-cookie']);
-
-      expect(cookies.length).toBe(4);
-      expect(cookies[0]['mpdx-handoff.impersonate']).toBe(userOneImpersonate);
-      expect(cookies[1]['mpdx-handoff.redirect-url']).toBe(redirectUrl);
-      expect(cookies[2]['mpdx-handoff.token']).toBe(userOneToken);
-      expect(cookies[3]['mpdx-handoff.logged-in']).toBe(`true`);
-    });
-
-    it('No user - Redirect to home', async () => {
-      const { req, res } = createMocks({ method: 'GET' });
-      await mpdxWebHandoff(req, res);
-      expect(res._getRedirectUrl()).toBe(`${siteUrl}/`);
-    });
-  });
-
-  describe('Has active session', () => {
-    beforeEach(() => {
-      (getToken as jest.Mock).mockReturnValue({
-        apiToken: userOneToken,
-        userID: userOneId,
-      });
-    });
-
-    it('New user - Loggout prev user', async () => {
-      const { req, res } = createMocks({
-        method: 'GET',
-        query: {
-          accountListId: 'accountListId',
-          path: '/contacts',
-          userId: userTwoId,
-          token: userTwoToken,
-        },
-      });
-      await mpdxWebHandoff(req, res);
-      expect(res._getRedirectUrl()).toBe(
-        `${siteUrl}/accountLists/accountListId/contacts`,
-      );
-      const cookies = grabCookies(res._getHeaders()['set-cookie']);
-
-      expect(cookies.length).toBe(5);
-      expect(cookies[0]['__Secure-next-auth.session-token']).toBe('');
-      expect(cookies[1]['next-auth.session-token']).toBe('');
-      expect(cookies[0]['Max-Age']).toBe('0');
-      expect(cookies[1]['Max-Age']).toBe('0');
-      expect(cookies[2]['mpdx-handoff.accountConflictUserId']).toBe(userTwoId);
-      expect(cookies[3]['mpdx-handoff.redirect-url']).toBe(redirectUrl);
-      expect(cookies[4]['mpdx-handoff.token']).toBe(userTwoToken);
-    });
-
-    it('New user - Same token - Shouldnt remove prev user', async () => {
-      const { req, res } = createMocks({
-        method: 'GET',
-        query: {
-          accountListId: 'accountListId',
-          path: '/contacts',
-          userId: userTwoId,
-          token: userOneToken,
-        },
-      });
-      await mpdxWebHandoff(req, res);
-      expect(res._getRedirectUrl()).toBe(
-        `${siteUrl}/accountLists/accountListId/contacts`,
-      );
-      const cookies = grabCookies(res._getHeaders()['set-cookie']);
-
-      expect(cookies.length).toBe(5);
-      expect(cookies[0]['__Secure-next-auth.session-token']).toBe('');
-      expect(cookies[1]['next-auth.session-token']).toBe('');
-      expect(cookies[0]['Max-Age']).toBe('0');
-      expect(cookies[1]['Max-Age']).toBe('0');
-      expect(cookies[2]['mpdx-handoff.accountConflictUserId']).toBe(userTwoId);
-      expect(cookies[3]['mpdx-handoff.redirect-url']).toBe(redirectUrl);
-      expect(cookies[4]['mpdx-handoff.token']).toBe(userOneToken);
-    });
-
-    it('Impersonate user - Loggout prev user', async () => {
-      const { req, res } = createMocks({
-        method: 'GET',
-        query: {
-          accountListId: 'accountListId',
-          path: '/contacts',
-          userId: userTwoId,
-          token: userTwoToken,
-          impersonate: userTwoImpersonate,
-        },
-      });
-      await mpdxWebHandoff(req, res);
-      expect(res._getRedirectUrl()).toBe(
-        `${siteUrl}/accountLists/accountListId/contacts`,
-      );
-      const cookies = grabCookies(res._getHeaders()['set-cookie']);
-
-      expect(cookies.length).toBe(6);
-      expect(cookies[0]['__Secure-next-auth.session-token']).toBe('');
-      expect(cookies[1]['next-auth.session-token']).toBe('');
-      expect(cookies[0]['Max-Age']).toBe('0');
-      expect(cookies[1]['Max-Age']).toBe('0');
-      expect(cookies[2]['mpdx-handoff.accountConflictUserId']).toBe(userTwoId);
-      expect(cookies[3]['mpdx-handoff.redirect-url']).toBe(redirectUrl);
-      expect(cookies[4]['mpdx-handoff.token']).toBe(userTwoToken);
-      expect(cookies[5]['mpdx-handoff.impersonate']).toBe(userTwoImpersonate);
-    });
-
-    it('New user - Same token - Should logout prev user', async () => {
-      const { req, res } = createMocks({
-        method: 'GET',
-        query: {
-          accountListId: 'accountListId',
-          path: '/contacts',
-          token: userOneToken,
-        },
-      });
-      await mpdxWebHandoff(req, res);
-      expect(res._getRedirectUrl()).toBe(
-        `${siteUrl}/accountLists/accountListId/contacts`,
-      );
-      const cookies = grabCookies(res._getHeaders()['set-cookie']);
-      expect(cookies.length).toBe(0);
-    });
-
-    it('Same user - Redirect to contact with url params', async () => {
-      const { req, res } = createMocks({
-        method: 'GET',
-        query: {
-          accountListId: 'accountListId',
-          p1: 'p1',
-          p2: 'p2',
-          path: '/contacts',
-        },
-      });
-      await mpdxWebHandoff(req, res);
-
-      expect(res._getRedirectUrl()).toBe(
-        `${accountListsUrl}/accountListId/contacts?p1=p1&p2=p2&`,
-      );
-      const cookies = grabCookies(res._getHeaders()['set-cookie']);
-      expect(cookies.length).toBe(0);
-    });
-    it('Same user - Redirects to reports', async () => {
-      const { req, res } = createMocks({
-        method: 'GET',
-        query: {
-          accountListId: 'accountListId',
-          path: '/reports',
-        },
-      });
-      await mpdxWebHandoff(req, res);
-
-      expect(res._getRedirectUrl()).toBe(
-        `${accountListsUrl}/accountListId/reports`,
-      );
-      const cookies = grabCookies(res._getHeaders()['set-cookie']);
-      expect(cookies.length).toBe(0);
-    });
-
-    it('Same user - Redirects to reports with url params', async () => {
-      const { req, res } = createMocks({
-        method: 'GET',
-        query: {
-          accountListId: 'accountListId',
-          p1: 'p1',
-          p2: 'p2',
-          path: '/reports',
-        },
-      });
-      await mpdxWebHandoff(req, res);
-
-      expect(res._getRedirectUrl()).toBe(
-        `${accountListsUrl}/accountListId/reports?p1=p1&p2=p2&`,
-      );
-      const cookies = grabCookies(res._getHeaders()['set-cookie']);
-      expect(cookies.length).toBe(0);
-    });
-    it('Same user - Redirects with tasks', async () => {
-      const { req, res } = createMocks({
-        method: 'GET',
-        query: {
-          accountListId: 'accountListId',
-          path: '/tasks',
-        },
-      });
-      await mpdxWebHandoff(req, res);
-
-      expect(res._getRedirectUrl()).toBe(
-        `${accountListsUrl}/accountListId/tasks`,
-      );
-      const cookies = grabCookies(res._getHeaders()['set-cookie']);
-      expect(cookies.length).toBe(0);
-    });
-
-    it('Same user - Redirects with tasks and group', async () => {
-      const { req, res } = createMocks({
-        method: 'GET',
-        query: {
-          accountListId: 'accountListId',
-          group: 'today',
-          path: '/tasks',
-        },
-      });
-      await mpdxWebHandoff(req, res);
-
-      const typeDetails = taskFiltersTabs.find(
-        (item) => item.name.toLowerCase() === 'today',
-      );
-
-      const filters = `filters=${encodeURIComponent(
-        JSON.stringify(typeDetails?.activeFiltersOptions),
-      )}`;
-
-      expect(res._getRedirectUrl()).toBe(
-        `${accountListsUrl}/accountListId/tasks?${filters}`,
-      );
-      const cookies = grabCookies(res._getHeaders()['set-cookie']);
-      expect(cookies.length).toBe(0);
-    });
-
-    it('Same user - Redirects with none Contact/Report or Task path', async () => {
-      const { req, res } = createMocks({
-        method: 'GET',
-        query: {
-          accountListId: 'accountListId',
-          modal: 'AddContact',
-          path: '/',
-        },
-      });
-      await mpdxWebHandoff(req, res);
-
-      expect(res._getRedirectUrl()).toBe(
-        `${accountListsUrl}/accountListId/?modal=AddContact&`,
-      );
-      const cookies = grabCookies(res._getHeaders()['set-cookie']);
-      expect(cookies.length).toBe(0);
-    });
-  });
-});
diff --git a/__tests__/pages/api/NextAuth.test.ts b/__tests__/pages/api/NextAuth.test.ts
index 4684ff50f..33d754577 100644
--- a/__tests__/pages/api/NextAuth.test.ts
+++ b/__tests__/pages/api/NextAuth.test.ts
@@ -15,8 +15,6 @@ const cookieCreator = (name: string, value: string) => {
   switch (name) {
     case '__Secure-next-auth.session-token':
       return `__Secure-next-auth.session-token=${value}; Secure; ${expireCookieDefaultInfo}`;
-    case 'mpdx-handoff.logged-in':
-      return `mpdx-handoff.logged-in=${value}; path=/; domain=${process.env.REWRITE_DOMAIN}`;
     default:
       return `${name}=${value}; ${expireCookieDefaultInfo}`;
   }
diff --git a/__tests__/pages/api/handoff.test.ts b/__tests__/pages/api/handoff.test.ts
deleted file mode 100644
index cbbe7ee8f..000000000
--- a/__tests__/pages/api/handoff.test.ts
+++ /dev/null
@@ -1,196 +0,0 @@
-import { getToken } from 'next-auth/jwt';
-import { createMocks } from 'node-mocks-http';
-import handoff from 'pages/api/handoff.page';
-import makeSsrClient from 'src/lib/apollo/ssrClient';
-
-jest.mock('next-auth/jwt', () => ({ getToken: jest.fn() }));
-jest.mock('src/lib/apollo/ssrClient', () => jest.fn());
-
-describe('/api/handoff', () => {
-  const OLD_ENV = process.env;
-  beforeEach(() => {
-    jest.resetModules();
-    process.env = { ...OLD_ENV, REWRITE_DOMAIN: 'stage.mpdx.org' };
-  });
-
-  afterAll(() => {
-    process.env = OLD_ENV;
-  });
-  it('returns 302', async () => {
-    const { req, res } = createMocks({ method: 'GET' });
-    await handoff(req, res);
-
-    expect(res._getStatusCode()).toBe(302);
-  });
-
-  describe('session', () => {
-    const defaultAccountList = 'defaultAccountList';
-    beforeEach(() => {
-      (getToken as jest.Mock).mockReturnValue({
-        apiToken: 'accessToken',
-        userID: 'sessionUserID',
-      });
-      (makeSsrClient as jest.Mock).mockReturnValue({
-        query: jest.fn().mockReturnValue({
-          data: { user: { defaultAccountList } },
-        }),
-      });
-    });
-
-    describe('Staging env', () => {
-      const OLD_ENV = process.env;
-      beforeEach(() => {
-        jest.resetModules();
-        process.env = {
-          ...OLD_ENV,
-          REWRITE_DOMAIN: 'stage.mpdx.org',
-        };
-      });
-
-      afterAll(() => {
-        process.env = OLD_ENV;
-      });
-
-      it('returns redirect', async () => {
-        const { req, res } = createMocks({
-          method: 'GET',
-          query: {
-            accountListId: 'accountListId',
-            userId: 'userId',
-            path: 'path',
-          },
-        });
-        await handoff(req, res);
-
-        expect(res._getStatusCode()).toBe(302);
-        expect(res._getRedirectUrl()).toBe(
-          'https://stage.mpdx.org/handoff?accessToken=accessToken&accountListId=accountListId&userId=userId&path=path',
-        );
-      });
-
-      it('returns redirect but gets session userID', async () => {
-        const { req, res } = createMocks({
-          method: 'GET',
-          query: {
-            accountListId: 'accountListId',
-            userId: '',
-            path: 'path',
-          },
-        });
-        await handoff(req, res);
-
-        expect(res._getStatusCode()).toBe(302);
-        expect(res._getRedirectUrl()).toBe(
-          `https://stage.mpdx.org/handoff?accessToken=accessToken&accountListId=accountListId&userId=sessionUserID&path=path`,
-        );
-      });
-
-      it('returns redirect but gets defaultAccountList', async () => {
-        const { req, res } = createMocks({
-          method: 'GET',
-          query: {
-            accountListId: '',
-            userId: 'userId',
-            path: 'path',
-          },
-        });
-        await handoff(req, res);
-
-        expect(res._getStatusCode()).toBe(302);
-        expect(res._getRedirectUrl()).toBe(
-          `https://stage.mpdx.org/handoff?accessToken=accessToken&accountListId=${defaultAccountList}&userId=userId&path=path`,
-        );
-      });
-
-      it('returns redirect but gets first accountList id', async () => {
-        (makeSsrClient as jest.Mock).mockReturnValue({
-          query: jest.fn().mockReturnValue({
-            data: {
-              user: { defaultAccountList: '' },
-              accountLists: { nodes: [{ id: 'accountID' }] },
-            },
-          }),
-        });
-        const { req, res } = createMocks({
-          method: 'GET',
-          query: {
-            accountListId: '',
-            userId: 'userId',
-            path: 'path',
-          },
-        });
-        await handoff(req, res);
-
-        expect(res._getStatusCode()).toBe(302);
-        expect(res._getRedirectUrl()).toBe(
-          `https://stage.mpdx.org/handoff?accessToken=accessToken&accountListId=accountID&userId=userId&path=path`,
-        );
-      });
-
-      it('returns redirect for auth', async () => {
-        const { req, res } = createMocks({
-          method: 'GET',
-          query: {
-            path: 'auth/user/admin',
-            auth: 'true',
-          },
-        });
-        await handoff(req, res);
-
-        expect(res._getStatusCode()).toBe(302);
-        expect(res._getRedirectUrl()).toBe(
-          'https://auth.stage.mpdx.org/auth/user/admin?access_token=accessToken',
-        );
-      });
-    });
-
-    describe('Production env', () => {
-      const OLD_ENV = process.env;
-
-      beforeEach(() => {
-        jest.resetModules();
-        process.env = {
-          ...OLD_ENV,
-          REWRITE_DOMAIN: 'mpdx.org',
-        };
-      });
-
-      afterAll(() => {
-        process.env = OLD_ENV;
-      });
-
-      it('returns redirect', async () => {
-        const { req, res } = createMocks({
-          method: 'GET',
-          query: {
-            accountListId: 'accountListId',
-            userId: 'userId',
-            path: 'path',
-          },
-        });
-        await handoff(req, res);
-
-        expect(res._getStatusCode()).toBe(302);
-        expect(res._getRedirectUrl()).toBe(
-          'https://mpdx.org/handoff?accessToken=accessToken&accountListId=accountListId&userId=userId&path=path',
-        );
-      });
-
-      it('returns redirect for auth', async () => {
-        const { req, res } = createMocks({
-          method: 'GET',
-          query: {
-            path: 'auth/user/admin',
-            auth: 'true',
-          },
-        });
-        await handoff(req, res);
-
-        expect(res._getStatusCode()).toBe(302);
-        expect(res._getRedirectUrl()).toBe(
-          'https://auth.mpdx.org/auth/user/admin?access_token=accessToken',
-        );
-      });
-    });
-  });
-});
diff --git a/__tests__/pages/api/stopImpersonating.test.ts b/__tests__/pages/api/stopImpersonating.test.ts
index f1c1e96f1..3377a3068 100644
--- a/__tests__/pages/api/stopImpersonating.test.ts
+++ b/__tests__/pages/api/stopImpersonating.test.ts
@@ -1,177 +1,14 @@
-import { getToken } from 'next-auth/jwt';
 import { createMocks } from 'node-mocks-http';
 import stopImpersonating from 'pages/api/stop-impersonating.page';
-import makeSsrClient from 'src/lib/apollo/ssrClient';
-
-jest.mock('next-auth/jwt', () => ({ getToken: jest.fn() }));
-jest.mock('src/lib/apollo/ssrClient', () => jest.fn());
-// User one
-const userOneImpersonate = 'userOne.impersonate.token';
-
-const convertCookieStringToObject = (cookieString) => {
-  return cookieString.split('; ').reduce((prev, current) => {
-    const [name, ...value] = current.split('=');
-    prev[name] = value.join('=');
-    return prev;
-  }, {});
-};
-type Cookies = Record<string, string>;
+import { clearNextAuthSessionCookies } from 'pages/api/utils/cookies';
 
 describe('/api/stop-impersonating', () => {
-  const defaultAccountList = 'defaultAccountList';
-  const OLD_ENV = process.env;
-  const siteUrl = 'https://next.mpdx.org';
-
-  beforeEach(() => {
-    jest.resetModules();
-    process.env = {
-      ...OLD_ENV,
-      REWRITE_DOMAIN: 'mpdx.org',
-      SITE_URL: siteUrl,
-    };
-    (getToken as jest.Mock).mockReturnValue({
-      impersonatorApiToken: userOneImpersonate,
-      apiToken: 'accessToken',
-      userID: 'sessionUserID',
-    });
-    (makeSsrClient as jest.Mock).mockReturnValue({
-      query: jest.fn().mockReturnValue({
-        data: { user: { defaultAccountList } },
-      }),
-    });
-  });
-
-  afterAll(() => {
-    process.env = OLD_ENV;
-  });
-
-  it('Returns user to home when error', async () => {
-    (makeSsrClient as jest.Mock).mockReturnValue({
-      query: jest.fn().mockRejectedValueOnce(new Error('An Error Happened')),
-    });
-
-    const { req, res } = createMocks({ method: 'GET' });
-    await stopImpersonating(req, res);
-
-    expect(res._getStatusCode()).toBe(302);
-    expect(res._getRedirectUrl()).toBe('https://next.mpdx.org/');
-  });
-
-  it('Returns user to legacy home when no values sent', async () => {
+  it('clears auth cookies and redirects the user', async () => {
     const { req, res } = createMocks({ method: 'GET' });
     await stopImpersonating(req, res);
 
     expect(res._getStatusCode()).toBe(302);
-    expect(res._getRedirectUrl()).toBe(
-      'https://mpdx.org/handoff?accessToken=accessToken&accountListId=defaultAccountList&userId=sessionUserID&path=',
-    );
-  });
-
-  it('Ensure Correct cookies are removed or added/edited', async () => {
-    const { req, res } = createMocks({ method: 'GET' });
-    await stopImpersonating(req, res);
-    const cookies: Cookies[] = [];
-    res._getHeaders()['set-cookie'].forEach((cookie) => {
-      cookies.push(convertCookieStringToObject(cookie));
-    });
-    expect(cookies.length).toBe(4);
-    expect(cookies[0]['__Secure-next-auth.session-token']).toBe('');
-    expect(cookies[1]['next-auth.session-token']).toBe('');
-    expect(cookies[0]['Max-Age']).toBe('0');
-    expect(cookies[1]['Max-Age']).toBe('0');
-    expect(cookies[2]['mpdx-handoff.redirect-url']).toBe(`${siteUrl}/`);
-    expect(cookies[3]['mpdx-handoff.token']).toBe(userOneImpersonate);
-  });
-
-  it('Should redirect user to legacy site', async () => {
-    const { req, res } = createMocks({
-      method: 'GET',
-      query: {
-        accountListId: 'accountListId',
-        userId: 'userId',
-        path: 'path',
-      },
-    });
-    await stopImpersonating(req, res);
-
-    expect(res._getStatusCode()).toBe(302);
-    expect(res._getRedirectUrl()).toBe(
-      'https://mpdx.org/handoff?accessToken=accessToken&accountListId=accountListId&userId=userId&path=path',
-    );
-  });
-
-  it('Redirects user to legacy site using sessionUserID when userId not passed in', async () => {
-    const { req, res } = createMocks({
-      method: 'GET',
-      query: {
-        accountListId: 'accountListId',
-        userId: '',
-        path: 'path',
-      },
-    });
-    await stopImpersonating(req, res);
-
-    expect(res._getStatusCode()).toBe(302);
-    expect(res._getRedirectUrl()).toBe(
-      `https://mpdx.org/handoff?accessToken=accessToken&accountListId=accountListId&userId=sessionUserID&path=path`,
-    );
-  });
-
-  it('Redirects user to legacy site but gets defaultAccountList', async () => {
-    const { req, res } = createMocks({
-      method: 'GET',
-      query: {
-        accountListId: '',
-        userId: 'userId',
-        path: 'path',
-      },
-    });
-    await stopImpersonating(req, res);
-
-    expect(res._getStatusCode()).toBe(302);
-    expect(res._getRedirectUrl()).toBe(
-      `https://mpdx.org/handoff?accessToken=accessToken&accountListId=${defaultAccountList}&userId=userId&path=path`,
-    );
-  });
-
-  it('Redirects user to legacy site but gets first accountList id', async () => {
-    (makeSsrClient as jest.Mock).mockReturnValue({
-      query: jest.fn().mockReturnValue({
-        data: {
-          user: { defaultAccountList: '' },
-          accountLists: { nodes: [{ id: 'accountID' }] },
-        },
-      }),
-    });
-    const { req, res } = createMocks({
-      method: 'GET',
-      query: {
-        accountListId: '',
-        userId: 'userId',
-        path: 'path',
-      },
-    });
-    await stopImpersonating(req, res);
-
-    expect(res._getStatusCode()).toBe(302);
-    expect(res._getRedirectUrl()).toBe(
-      `https://mpdx.org/handoff?accessToken=accessToken&accountListId=accountID&userId=userId&path=path`,
-    );
-  });
-
-  it('Redirect user to auth site', async () => {
-    const { req, res } = createMocks({
-      method: 'GET',
-      query: {
-        path: 'auth/user/admin',
-        auth: 'true',
-      },
-    });
-    await stopImpersonating(req, res);
-
-    expect(res._getStatusCode()).toBe(302);
-    expect(res._getRedirectUrl()).toBe(
-      'https://auth.mpdx.org/auth/user/admin?access_token=accessToken',
-    );
+    expect(res._getRedirectUrl()).toBe('/');
+    expect(res.getHeaders()['set-cookie']).toEqual(clearNextAuthSessionCookies);
   });
 });
diff --git a/__tests__/util/setup.ts b/__tests__/util/setup.ts
index e10250bfe..5531f4bb1 100644
--- a/__tests__/util/setup.ts
+++ b/__tests__/util/setup.ts
@@ -25,8 +25,6 @@ expect.extend({
   toHaveGraphqlOperation,
 });
 
-window.Beacon = jest.fn();
-
 window.document.createRange = (): Range =>
   ({
     setStart: jest.fn(),
diff --git a/next.config.js b/next.config.js
index 71c589551..638365c6e 100644
--- a/next.config.js
+++ b/next.config.js
@@ -41,7 +41,6 @@ const config = {
     SITE_URL: siteUrl,
     CLIENT_ID: process.env.CLIENT_ID ?? '4027334344069527005',
     CLIENT_SECRET: process.env.CLIENT_SECRET,
-    BEACON_TOKEN: process.env.BEACON_TOKEN,
     AUTH_PROVIDER: process.env.AUTH_PROVIDER ?? 'OKTA',
     OKTA_CLIENT_ID: process.env.OKTA_CLIENT_ID ?? '0oa1n0gjoy3j5Ycdg0h8',
     OKTA_CLIENT_SECRET: process.env.OKTA_CLIENT_SECRET,
@@ -67,7 +66,6 @@ const config = {
     ONESKY_API_KEY: process.env.ONESKY_API_KEY,
     APP_NAME: process.env.APP_NAME ?? 'MPDX',
     ROLLBAR_SERVER_ACCESS_TOKEN: process.env.ROLLBAR_SERVER_ACCESS_TOKEN,
-    REWRITE_DOMAIN: process.env.REWRITE_DOMAIN ?? 'mpdx.org',
     DATADOG_APP_ID: process.env.DATADOG_APP_ID,
     DATADOG_CLIENT_TOKEN: process.env.DATADOG_CLIENT_TOKEN,
     DATADOG_CONFIGURED: Boolean(
@@ -75,25 +73,13 @@ const config = {
         process.env.DATADOG_APP_ID &&
         process.env.DATADOG_CLIENT_TOKEN,
     ).toString(),
-    HS_COACHING_ACTIVITY_SUMMARY: process.env.HS_COACHING_ACTIVITY_SUMMARY,
-    HS_COACHING_ACTIVITY: process.env.HS_COACHING_ACTIVITY,
-    HS_COACHING_APPOINTMENTS_AND_RESULTS:
-      process.env.HS_COACHING_APPOINTMENTS_AND_RESULTS,
-    HS_COACHING_COMMITMENTS: process.env.HS_COACHING_COMMITMENTS,
-    HS_COACHING_OUTSTANDING_RECURRING_COMMITMENTS:
-      process.env.HS_COACHING_OUTSTANDING_RECURRING_COMMITMENTS,
-    HS_COACHING_OUTSTANDING_SPECIAL_NEEDS:
-      process.env.HS_COACHING_OUTSTANDING_SPECIAL_NEEDS,
-    HS_COACHING_SUGGESTIONS: process.env.HS_COACHING_SUGGESTIONS,
-    HS_CONTACTS_CONTACT_SUGGESTIONS:
-      process.env.HS_CONTACTS_CONTACT_SUGGESTIONS,
-    HS_CONTACTS_SUGGESTIONS: process.env.HS_CONTACTS_SUGGESTIONS,
-    HS_HOME_SUGGESTIONS: process.env.HS_HOME_SUGGESTIONS,
-    HS_REPORTS_SUGGESTIONS: process.env.HS_REPORTS_SUGGESTIONS,
-    HS_TASKS_SUGGESTIONS: process.env.HS_TASKS_SUGGESTIONS,
-    HS_SETTINGS_SERVICES_SUGGESTIONS:
-      process.env.HS_SETTINGS_SERVICES_SUGGESTIONS,
-    HS_SETUP_FIND_ORGANIZATION: process.env.HS_SETUP_FIND_ORGANIZATION,
+    HELPJUICE_ORIGIN: process.env.HELPJUICE_ORIGIN,
+    HELPJUICE_KNOWLEDGE_BASE_URL: process.env.HELPJUICE_KNOWLEDGE_BASE_URL,
+    HELP_URL_COACHING_ACTIVITY: process.env.HELP_URL_COACHING_ACTIVITY,
+    HELP_URL_COACHING_APPOINTMENTS_AND_RESULTS:
+      process.env.HELP_URL_COACHING_APPOINTMENTS_AND_RESULTS,
+    HELP_URL_SETUP_FIND_ORGANIZATION:
+      process.env.HELP_URL_SETUP_FIND_ORGANIZATION,
     ALERT_MESSAGE: process.env.ALERT_MESSAGE,
     PRIVACY_POLICY_URL: process.env.PRIVACY_POLICY_URL,
     TERMS_OF_USE_URL: process.env.TERMS_OF_USE_URL,
diff --git a/pages/_app.page.tsx b/pages/_app.page.tsx
index 9cef845a7..20d37f3b7 100644
--- a/pages/_app.page.tsx
+++ b/pages/_app.page.tsx
@@ -21,7 +21,7 @@ import { I18nextProvider, useTranslation } from 'react-i18next';
 import Rollbar from 'rollbar';
 import DataDog from 'src/components/DataDog/DataDog';
 import { GlobalStyles } from 'src/components/GlobalStyles/GlobalStyles';
-import HelpscoutBeacon from 'src/components/Helpscout/HelpscoutBeacon';
+import { Helpjuice } from 'src/components/Helpjuice/Helpjuice';
 import PrimaryLayout from 'src/components/Layouts/Primary';
 import Loading from 'src/components/Loading';
 import { RouterGuard } from 'src/components/RouterGuard/RouterGuard';
@@ -36,7 +36,7 @@ import { useRequiredSession } from 'src/hooks/useRequiredSession';
 import makeClient from 'src/lib/apollo/client';
 import i18n from 'src/lib/i18n';
 import theme from 'src/theme';
-import './helpscout.css';
+import './helpjuice.css';
 import './print.css';
 
 export type PageWithLayout = NextPage & {
@@ -170,7 +170,6 @@ const App = ({
         <ErrorBoundary>
           <AppSettingsProvider>
             <SessionProvider session={session}>
-              <HelpscoutBeacon />
               <I18nextProvider i18n={i18n}>
                 <StyledEngineProvider injectFirst>
                   <CacheProvider value={emotionCache}>
@@ -203,6 +202,7 @@ const App = ({
                 </StyledEngineProvider>
               </I18nextProvider>
               <DataDog />
+              <Helpjuice />
             </SessionProvider>
             {process.env.ALERT_MESSAGE ? (
               <AlertBanner
diff --git a/pages/_document.page.tsx b/pages/_document.page.tsx
index 156e8c914..cbfad50db 100644
--- a/pages/_document.page.tsx
+++ b/pages/_document.page.tsx
@@ -22,6 +22,33 @@ class MyDocument extends Document {
             href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;700&display=swap"
             rel="stylesheet"
           />
+          {process.env.HELPJUICE_ORIGIN && (
+            <link
+              rel="stylesheet"
+              href={`${process.env.HELPJUICE_ORIGIN}/swifty.css`}
+            />
+          )}
+          {/* The swifty.js script initializes in response to a DOMContentLoaded
+           * event, but that event has fired by the time the script is executed
+           * when using the Next.js <Script> component. To workaround this, we
+           * have to use a native <script> element and cannot use async or
+           * defer. This is not ideal for first-load performance and should be
+           * switched to <Script> as soon as Helpjuice can fix their swifty.js
+           * script.
+           */}
+          {process.env.HELPJUICE_ORIGIN && (
+            <script
+              dangerouslySetInnerHTML={{
+                __html: `window.helpjuice_account_url = '${process.env.HELPJUICE_ORIGIN}';
+window.helpjuice_contact_us_url = '${process.env.HELPJUICE_ORIGIN}/contact-us';
+window.helpjuiceSwiftyConfig = { widgetPosition: 'bottomRight' };
+window.helpjuiceSwiftyUrlMap = {};`,
+              }}
+            />
+          )}
+          {process.env.HELPJUICE_ORIGIN && (
+            <script src={`${process.env.HELPJUICE_ORIGIN}/swifty.js`} />
+          )}
           {process.env.DATADOG_CONFIGURED === 'true' && (
             <Script id="datadog-rum" strategy="afterInteractive">
               {`!function(a,e,t,n,s){a=a[s]=a[s]||{q:[],onReady:function(e){a.q.push(e)}},(s=e.createElement(t)).async=1,s.src=n,(n=e.getElementsByTagName(t)[0]).parentNode.insertBefore(s,n)}(window,document,"script","https://www.datadoghq-browser-agent.com/datadog-rum-v5.js","DD_RUM"),DD_RUM.onReady(function(){DD_RUM.init({clientToken:"${process.env.DATADOG_CLIENT_TOKEN}",applicationId:"${process.env.DATADOG_APP_ID}",site:"datadoghq.com",service:"mpdx-web-react",sessionSampleRate:100,sessionReplaySampleRate:20,trackUserInteractions:!0,trackResources:!0,trackLongTasks:!0,defaultPrivacyLevel:"mask-user-input",env:"${process.env.DD_ENV}",allowedTracingUrls:["${process.env.API_URL}"]})});`}
diff --git a/pages/accountLists/[accountListId].page.tsx b/pages/accountLists/[accountListId].page.tsx
index 8c7ced059..a7a296e19 100644
--- a/pages/accountLists/[accountListId].page.tsx
+++ b/pages/accountLists/[accountListId].page.tsx
@@ -20,7 +20,6 @@ import {
   replaceUrlAccountList,
 } from 'src/lib/apollo/accountListRedirect';
 import makeSsrClient from 'src/lib/apollo/ssrClient';
-import { suggestArticles } from 'src/lib/helpScout';
 import {
   GetDashboardDocument,
   GetDashboardQuery,
@@ -42,10 +41,6 @@ const AccountListIdPage = ({
     useState<AddMenuItemsEnum | null>(null);
   const [dialogOpen, setDialogOpen] = useState(false);
 
-  useEffect(() => {
-    suggestArticles('HS_HOME_SUGGESTIONS');
-  }, []);
-
   useEffect(() => {
     if (!modal || dialogOpen) {
       return;
diff --git a/pages/accountLists/[accountListId]/contacts/ContactsWrapper.tsx b/pages/accountLists/[accountListId]/contacts/ContactsWrapper.tsx
index 729776471..b68b343c4 100644
--- a/pages/accountLists/[accountListId]/contacts/ContactsWrapper.tsx
+++ b/pages/accountLists/[accountListId]/contacts/ContactsWrapper.tsx
@@ -2,7 +2,6 @@ import { useRouter } from 'next/router';
 import React, { useEffect, useMemo, useState } from 'react';
 import { ContactsProvider } from 'src/components/Contacts/ContactsContext/ContactsContext';
 import { ContactFilterSetInput } from 'src/graphql/types.generated';
-import { suggestArticles } from 'src/lib/helpScout';
 import { sanitizeFilters } from 'src/lib/sanitizeFilters';
 
 interface Props {
@@ -45,12 +44,6 @@ export const ContactsWrapper: React.FC<Props> = ({ children }) => {
     });
   }, [sanitizedFilters, isReady]);
 
-  useEffect(() => {
-    suggestArticles(
-      contactId ? 'HS_CONTACTS_CONTACT_SUGGESTIONS' : 'HS_CONTACTS_SUGGESTIONS',
-    );
-  }, [contactId]);
-
   return (
     <ContactsProvider
       urlFilters={urlFilters}
diff --git a/pages/accountLists/[accountListId]/reports/coaching.page.tsx b/pages/accountLists/[accountListId]/reports/coaching.page.tsx
index 7b0fa12f8..f773525b3 100644
--- a/pages/accountLists/[accountListId]/reports/coaching.page.tsx
+++ b/pages/accountLists/[accountListId]/reports/coaching.page.tsx
@@ -1,5 +1,5 @@
 import Head from 'next/head';
-import React, { ReactElement, useEffect } from 'react';
+import React, { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
 import { loadSession } from 'pages/api/utils/pagePropsHelpers';
 import {
@@ -9,17 +9,12 @@ import {
 import Loading from 'src/components/Loading';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
-import { suggestArticles } from 'src/lib/helpScout';
 
 const CoachingReportPage = (): ReactElement => {
   const { t } = useTranslation();
   const accountListId = useAccountListId();
   const { appName } = useGetAppSettings();
 
-  useEffect(() => {
-    suggestArticles('HS_REPORTS_SUGGESTIONS');
-  }, []);
-
   return (
     <>
       <Head>
diff --git a/pages/accountLists/[accountListId]/reports/designationAccounts.page.tsx b/pages/accountLists/[accountListId]/reports/designationAccounts.page.tsx
index df3626875..077d4fb14 100644
--- a/pages/accountLists/[accountListId]/reports/designationAccounts.page.tsx
+++ b/pages/accountLists/[accountListId]/reports/designationAccounts.page.tsx
@@ -1,5 +1,5 @@
 import Head from 'next/head';
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 import { Box } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import { useTranslation } from 'react-i18next';
@@ -13,7 +13,6 @@ import {
 } from 'src/components/Shared/MultiPageLayout/MultiPageMenu/MultiPageMenu';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
-import { suggestArticles } from 'src/lib/helpScout';
 
 const DesignationAccountsReportPageWrapper = styled(Box)(({ theme }) => ({
   backgroundColor: theme.palette.common.white,
@@ -26,10 +25,6 @@ const DesignationAccountsReportPage: React.FC = () => {
   const [isNavListOpen, setNavListOpen] = useState<boolean>(false);
   const [designationAccounts, setDesignationAccounts] = useState<string[]>([]);
 
-  useEffect(() => {
-    suggestArticles('HS_REPORTS_SUGGESTIONS');
-  }, []);
-
   const handleNavListToggle = () => {
     setNavListOpen(!isNavListOpen);
   };
diff --git a/pages/accountLists/[accountListId]/reports/donations/[[...contactId]].page.tsx b/pages/accountLists/[accountListId]/reports/donations/[[...contactId]].page.tsx
index 20945c7fc..34ff82c32 100644
--- a/pages/accountLists/[accountListId]/reports/donations/[[...contactId]].page.tsx
+++ b/pages/accountLists/[accountListId]/reports/donations/[[...contactId]].page.tsx
@@ -1,6 +1,6 @@
 import Head from 'next/head';
 import { useRouter } from 'next/router';
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 import { Box } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import { useTranslation } from 'react-i18next';
@@ -15,7 +15,6 @@ import {
 } from 'src/components/Shared/MultiPageLayout/MultiPageMenu/MultiPageMenu';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
-import { suggestArticles } from 'src/lib/helpScout';
 import { getQueryParam } from 'src/utils/queryParam';
 import { ContactsWrapper } from '../../contacts/ContactsWrapper';
 
@@ -31,10 +30,6 @@ const DonationsReportPage: React.FC = () => {
   const [designationAccounts, setDesignationAccounts] = useState<string[]>([]);
   const [isNavListOpen, setNavListOpen] = useState<boolean>(false);
 
-  useEffect(() => {
-    suggestArticles('HS_REPORTS_SUGGESTIONS');
-  }, []);
-
   const selectedContactId = getQueryParam(router.query, 'contactId');
 
   const handleNavListToggle = () => {
diff --git a/pages/accountLists/[accountListId]/reports/expectedMonthlyTotal.page.tsx b/pages/accountLists/[accountListId]/reports/expectedMonthlyTotal.page.tsx
index 25b2651c5..5cd5b07f0 100644
--- a/pages/accountLists/[accountListId]/reports/expectedMonthlyTotal.page.tsx
+++ b/pages/accountLists/[accountListId]/reports/expectedMonthlyTotal.page.tsx
@@ -1,5 +1,5 @@
 import Head from 'next/head';
-import React, { ReactElement, useEffect, useState } from 'react';
+import React, { ReactElement, useState } from 'react';
 import { Box } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import { useTranslation } from 'react-i18next';
@@ -14,7 +14,6 @@ import {
 } from 'src/components/Shared/MultiPageLayout/MultiPageMenu/MultiPageMenu';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
-import { suggestArticles } from 'src/lib/helpScout';
 
 const ExpectedMonthlyTotalReportPageWrapper = styled(Box)(({ theme }) => ({
   backgroundColor: theme.palette.common.white,
@@ -27,10 +26,6 @@ const ExpectedMonthlyTotalReportPage = (): ReactElement => {
   const [isNavListOpen, setNavListOpen] = useState<boolean>(false);
   const [designationAccounts, setDesignationAccounts] = useState<string[]>([]);
 
-  useEffect(() => {
-    suggestArticles('HS_REPORTS_SUGGESTIONS');
-  }, []);
-
   const handleNavListToggle = () => {
     setNavListOpen(!isNavListOpen);
   };
diff --git a/pages/accountLists/[accountListId]/reports/partnerCurrency/[[...contactId]].page.tsx b/pages/accountLists/[accountListId]/reports/partnerCurrency/[[...contactId]].page.tsx
index 277ee217f..0adaa6ba8 100644
--- a/pages/accountLists/[accountListId]/reports/partnerCurrency/[[...contactId]].page.tsx
+++ b/pages/accountLists/[accountListId]/reports/partnerCurrency/[[...contactId]].page.tsx
@@ -1,6 +1,6 @@
 import Head from 'next/head';
 import { useRouter } from 'next/router';
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 import { Box } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import { useTranslation } from 'react-i18next';
@@ -16,7 +16,6 @@ import {
 import { FourteenMonthReportCurrencyType } from 'src/graphql/types.generated';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
-import { suggestArticles } from 'src/lib/helpScout';
 import { getQueryParam } from 'src/utils/queryParam';
 import { ContactsWrapper } from '../../contacts/ContactsWrapper';
 
@@ -33,10 +32,6 @@ const PartnerCurrencyReportPage: React.FC = () => {
   const [isNavListOpen, setNavListOpen] = useState<boolean>(false);
   const [designationAccounts, setDesignationAccounts] = useState<string[]>([]);
 
-  useEffect(() => {
-    suggestArticles('HS_REPORTS_SUGGESTIONS');
-  }, []);
-
   const handleNavListToggle = () => {
     setNavListOpen(!isNavListOpen);
   };
diff --git a/pages/accountLists/[accountListId]/reports/partnerGivingAnalysis/[[...contactId]].page.tsx b/pages/accountLists/[accountListId]/reports/partnerGivingAnalysis/[[...contactId]].page.tsx
index bbdd7426b..eb1ac7e87 100644
--- a/pages/accountLists/[accountListId]/reports/partnerGivingAnalysis/[[...contactId]].page.tsx
+++ b/pages/accountLists/[accountListId]/reports/partnerGivingAnalysis/[[...contactId]].page.tsx
@@ -1,6 +1,6 @@
 import Head from 'next/head';
 import { useRouter } from 'next/router';
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import React, { useMemo, useRef, useState } from 'react';
 import { sortBy } from 'lodash';
 import { useTranslation } from 'react-i18next';
 import { ReportContactFilterSetInput } from 'pages/api/graphql-rest.page.generated';
@@ -22,7 +22,6 @@ import {
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import { useDebouncedValue } from 'src/hooks/useDebounce';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
-import { suggestArticles } from 'src/lib/helpScout';
 import { getQueryParam } from 'src/utils/queryParam';
 import { useContactFiltersQuery } from '../../contacts/Contacts.generated';
 import { ContactsWrapper } from '../../contacts/ContactsWrapper';
@@ -87,10 +86,6 @@ const PartnerGivingAnalysisReportPage: React.FC = () => {
     return [reportFilterGroup, ...groups];
   }, [filterData]);
 
-  useEffect(() => {
-    suggestArticles('HS_REPORTS_SUGGESTIONS');
-  }, []);
-
   const handleSelectContact = (contactId: string) => {
     router.push(
       `/accountLists/${accountListId}/reports/partnerGivingAnalysis/${contactId}`,
diff --git a/pages/accountLists/[accountListId]/reports/responsibilityCenters.page.tsx b/pages/accountLists/[accountListId]/reports/responsibilityCenters.page.tsx
index 0eba1be51..b5d0044ce 100644
--- a/pages/accountLists/[accountListId]/reports/responsibilityCenters.page.tsx
+++ b/pages/accountLists/[accountListId]/reports/responsibilityCenters.page.tsx
@@ -1,5 +1,5 @@
 import Head from 'next/head';
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 import { Box } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import { useTranslation } from 'react-i18next';
@@ -13,7 +13,6 @@ import {
 } from 'src/components/Shared/MultiPageLayout/MultiPageMenu/MultiPageMenu';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
-import { suggestArticles } from 'src/lib/helpScout';
 
 const ResponsibilityCentersReportPageWrapper = styled(Box)(({ theme }) => ({
   backgroundColor: theme.palette.common.white,
@@ -26,10 +25,6 @@ const ResponsibilityCentersReportPage: React.FC = () => {
   const [isNavListOpen, setNavListOpen] = useState<boolean>(false);
   const [designationAccounts, setDesignationAccounts] = useState<string[]>([]);
 
-  useEffect(() => {
-    suggestArticles('HS_REPORTS_SUGGESTIONS');
-  }, []);
-
   const handleNavListToggle = () => {
     setNavListOpen(!isNavListOpen);
   };
diff --git a/pages/accountLists/[accountListId]/reports/salaryCurrency/[[...contactId]].page.tsx b/pages/accountLists/[accountListId]/reports/salaryCurrency/[[...contactId]].page.tsx
index b143d37ac..843902adc 100644
--- a/pages/accountLists/[accountListId]/reports/salaryCurrency/[[...contactId]].page.tsx
+++ b/pages/accountLists/[accountListId]/reports/salaryCurrency/[[...contactId]].page.tsx
@@ -1,6 +1,6 @@
 import Head from 'next/head';
 import { useRouter } from 'next/router';
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 import { Box } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import { useTranslation } from 'react-i18next';
@@ -16,7 +16,6 @@ import {
 import { FourteenMonthReportCurrencyType } from 'src/graphql/types.generated';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
-import { suggestArticles } from 'src/lib/helpScout';
 import { getQueryParam } from 'src/utils/queryParam';
 import { ContactsWrapper } from '../../contacts/ContactsWrapper';
 
@@ -33,10 +32,6 @@ const SalaryCurrencyReportPage: React.FC = () => {
   const [isNavListOpen, setNavListOpen] = useState<boolean>(false);
   const [designationAccounts, setDesignationAccounts] = useState<string[]>([]);
 
-  useEffect(() => {
-    suggestArticles('HS_REPORTS_SUGGESTIONS');
-  }, []);
-
   const handleNavListToggle = () => {
     setNavListOpen(!isNavListOpen);
   };
diff --git a/pages/accountLists/[accountListId]/settings/admin.page.test.tsx b/pages/accountLists/[accountListId]/settings/admin.page.test.tsx
index 114019b27..8d90b7038 100644
--- a/pages/accountLists/[accountListId]/settings/admin.page.test.tsx
+++ b/pages/accountLists/[accountListId]/settings/admin.page.test.tsx
@@ -6,18 +6,14 @@ import { SnackbarProvider } from 'notistack';
 import { I18nextProvider } from 'react-i18next';
 import TestRouter from '__tests__/util/TestRouter';
 import { GqlMockedProvider } from '__tests__/util/graphqlMocking';
-import { suggestArticles } from 'src/lib/helpScout';
 import i18n from 'src/lib/i18n';
 import theme from 'src/theme';
-import Admin, { suggestedArticles } from './admin.page';
+import Admin from './admin.page';
 
 jest.mock('next-auth/react');
 jest.mock('next/router', () => ({
   useRouter: jest.fn(),
 }));
-jest.mock('src/lib/helpScout', () => ({
-  suggestArticles: jest.fn(),
-}));
 jest.mock('notistack', () => ({
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
@@ -62,13 +58,6 @@ describe('Admin', () => {
     });
   });
 
-  it('should fire suggestArticles on intital render', async () => {
-    render(<Components />);
-    await waitFor(() =>
-      expect(suggestArticles).toHaveBeenCalledWith(suggestedArticles),
-    );
-  });
-
   it('should keep impersonate user accordion close', async () => {
     const { getAllByText } = render(<Components />);
     await waitFor(() => {
diff --git a/pages/accountLists/[accountListId]/settings/admin.page.tsx b/pages/accountLists/[accountListId]/settings/admin.page.tsx
index e855faf64..fc402ad70 100644
--- a/pages/accountLists/[accountListId]/settings/admin.page.tsx
+++ b/pages/accountLists/[accountListId]/settings/admin.page.tsx
@@ -1,11 +1,10 @@
 import { useRouter } from 'next/router';
-import React, { ReactElement, useEffect, useState } from 'react';
+import React, { ReactElement, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { enforceAdmin } from 'pages/api/utils/pagePropsHelpers';
 import { ImpersonateUserAccordion } from 'src/components/Settings/Admin/ImpersonateUser/ImpersonateUserAccordion';
 import { ResetAccountAccordion } from 'src/components/Settings/Admin/ResetAccount/ResetAccountAccordion';
 import { AccordionGroup } from 'src/components/Shared/Forms/Accordions/AccordionGroup';
-import { suggestArticles } from 'src/lib/helpScout';
 import { SettingsWrapper } from './Wrapper';
 
 export const suggestedArticles = 'HS_SETTINGS_SERVICES_SUGGESTIONS';
@@ -19,10 +18,6 @@ const Admin = (): ReactElement => {
       : 'Impersonate User',
   );
 
-  useEffect(() => {
-    suggestArticles(suggestedArticles);
-  }, []);
-
   const handleAccordionChange = (panel: string) => {
     const panelLowercase = panel.toLowerCase();
     setExpandedPanel(expandedPanel === panelLowercase ? '' : panelLowercase);
diff --git a/pages/accountLists/[accountListId]/settings/integrations/index.page.tsx b/pages/accountLists/[accountListId]/settings/integrations/index.page.tsx
index ae632395f..5ad22ca8e 100644
--- a/pages/accountLists/[accountListId]/settings/integrations/index.page.tsx
+++ b/pages/accountLists/[accountListId]/settings/integrations/index.page.tsx
@@ -17,7 +17,6 @@ import { AccordionGroup } from 'src/components/Shared/Forms/Accordions/Accordion
 import { StickyBox } from 'src/components/Shared/Header/styledComponents';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
-import { suggestArticles } from 'src/lib/helpScout';
 import { SettingsWrapper } from '../Wrapper';
 
 const Integrations: React.FC = () => {
@@ -65,9 +64,6 @@ const Integrations: React.FC = () => {
     const panelLowercase = panel.toLowerCase();
     setExpandedPanel(expandedPanel === panelLowercase ? '' : panelLowercase);
   };
-  useEffect(() => {
-    suggestArticles('HS_SETTINGS_SERVICES_SUGGESTIONS');
-  }, []);
 
   useEffect(() => {
     if (onSetupTour) {
diff --git a/pages/accountLists/[accountListId]/settings/manageAccounts.page.test.tsx b/pages/accountLists/[accountListId]/settings/manageAccounts.page.test.tsx
index 17f1dc1f4..5921e894e 100644
--- a/pages/accountLists/[accountListId]/settings/manageAccounts.page.test.tsx
+++ b/pages/accountLists/[accountListId]/settings/manageAccounts.page.test.tsx
@@ -5,17 +5,13 @@ import { SnackbarProvider } from 'notistack';
 import { I18nextProvider } from 'react-i18next';
 import TestRouter from '__tests__/util/TestRouter';
 import { GqlMockedProvider } from '__tests__/util/graphqlMocking';
-import { suggestArticles } from 'src/lib/helpScout';
 import i18n from 'src/lib/i18n';
 import theme from 'src/theme';
-import ManageAccounts, { suggestedArticles } from './manageAccounts.page';
+import ManageAccounts from './manageAccounts.page';
 
 jest.mock('next/router', () => ({
   useRouter: jest.fn(),
 }));
-jest.mock('src/lib/helpScout', () => ({
-  suggestArticles: jest.fn(),
-}));
 jest.mock('notistack', () => ({
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
@@ -49,13 +45,6 @@ describe('ManageAccounts', () => {
     });
   });
 
-  it('should fire suggestArticles on initial render', async () => {
-    render(<Components />);
-    await waitFor(() =>
-      expect(suggestArticles).toHaveBeenCalledWith(suggestedArticles),
-    );
-  });
-
   it('should open `Manage Account Access` accordion', async () => {
     const { getAllByText } = render(<Components />);
     await waitFor(() => {
diff --git a/pages/accountLists/[accountListId]/settings/manageAccounts.page.tsx b/pages/accountLists/[accountListId]/settings/manageAccounts.page.tsx
index 3d875d226..1e8de017b 100644
--- a/pages/accountLists/[accountListId]/settings/manageAccounts.page.tsx
+++ b/pages/accountLists/[accountListId]/settings/manageAccounts.page.tsx
@@ -1,12 +1,11 @@
 import { useRouter } from 'next/router';
-import React, { ReactElement, useEffect, useState } from 'react';
+import React, { ReactElement, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { loadSession } from 'pages/api/utils/pagePropsHelpers';
 import { ManageAccountAccessAccordion } from 'src/components/Settings/Accounts/ManageAccountAccess/ManageAccountAccessAccordion';
 import { MergeAccountsAccordion } from 'src/components/Settings/Accounts/MergeAccounts/MergeAccountsAccordion';
 import { MergeSpouseAccountsAccordion } from 'src/components/Settings/Accounts/MergeSpouseAccounts/MergeSpouseAccountsAccordion';
 import { AccordionGroup } from 'src/components/Shared/Forms/Accordions/AccordionGroup';
-import { suggestArticles } from 'src/lib/helpScout';
 import { SettingsWrapper } from './Wrapper';
 
 export const suggestedArticles = 'HS_SETTINGS_SERVICES_SUGGESTIONS';
@@ -20,10 +19,6 @@ const ManageAccounts = (): ReactElement => {
       : 'Manage Account Access',
   );
 
-  useEffect(() => {
-    suggestArticles('HS_SETTINGS_SERVICES_SUGGESTIONS');
-  }, []);
-
   const handleAccordionChange = (panel: string) => {
     const panelLowercase = panel.toLowerCase();
     setExpandedPanel(expandedPanel === panelLowercase ? '' : panelLowercase);
diff --git a/pages/accountLists/[accountListId]/settings/manageCoaches.page.test.tsx b/pages/accountLists/[accountListId]/settings/manageCoaches.page.test.tsx
index 9282f2a59..732e23b1f 100644
--- a/pages/accountLists/[accountListId]/settings/manageCoaches.page.test.tsx
+++ b/pages/accountLists/[accountListId]/settings/manageCoaches.page.test.tsx
@@ -5,17 +5,13 @@ import { SnackbarProvider } from 'notistack';
 import { I18nextProvider } from 'react-i18next';
 import TestRouter from '__tests__/util/TestRouter';
 import { GqlMockedProvider } from '__tests__/util/graphqlMocking';
-import { suggestArticles } from 'src/lib/helpScout';
 import i18n from 'src/lib/i18n';
 import theme from 'src/theme';
-import ManageCoaching, { suggestedArticles } from './manageCoaches.page';
+import ManageCoaching from './manageCoaches.page';
 
 jest.mock('next/router', () => ({
   useRouter: jest.fn(),
 }));
-jest.mock('src/lib/helpScout', () => ({
-  suggestArticles: jest.fn(),
-}));
 jest.mock('notistack', () => ({
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
@@ -49,13 +45,6 @@ describe('ManageCoaching', () => {
     });
   });
 
-  it('should fire suggestArticles on initial render', async () => {
-    render(<Components />);
-    await waitFor(() =>
-      expect(suggestArticles).toHaveBeenCalledWith(suggestedArticles),
-    );
-  });
-
   it('should open Coaching Access accordion', async () => {
     const { getAllByText } = render(<Components />);
     await waitFor(() => {
diff --git a/pages/accountLists/[accountListId]/settings/manageCoaches.page.tsx b/pages/accountLists/[accountListId]/settings/manageCoaches.page.tsx
index 771adf082..f154a57f9 100644
--- a/pages/accountLists/[accountListId]/settings/manageCoaches.page.tsx
+++ b/pages/accountLists/[accountListId]/settings/manageCoaches.page.tsx
@@ -1,14 +1,11 @@
 import { useRouter } from 'next/router';
-import React, { ReactElement, useEffect, useState } from 'react';
+import React, { ReactElement, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { loadSession } from 'pages/api/utils/pagePropsHelpers';
 import { ManageCoachesAccessAccordion } from 'src/components/Settings/Coaches/ManageCoachesAccess/ManageCoachesAccessAccordion';
 import { AccordionGroup } from 'src/components/Shared/Forms/Accordions/AccordionGroup';
-import { suggestArticles } from 'src/lib/helpScout';
 import { SettingsWrapper } from './Wrapper';
 
-export const suggestedArticles = 'HS_SETTINGS_SERVICES_SUGGESTIONS';
-
 const ManageCoaching = (): ReactElement => {
   const { t } = useTranslation();
   const { query } = useRouter();
@@ -18,10 +15,6 @@ const ManageCoaching = (): ReactElement => {
       : 'Manage Account Coaching Access',
   );
 
-  useEffect(() => {
-    suggestArticles(suggestedArticles);
-  }, []);
-
   const handleAccordionChange = (panel: string) => {
     const panelLowercase = panel.toLowerCase();
     setExpandedPanel(expandedPanel === panelLowercase ? '' : panelLowercase);
diff --git a/pages/accountLists/[accountListId]/settings/organizations.page.tsx b/pages/accountLists/[accountListId]/settings/organizations.page.tsx
index 4e6877189..da5951b0c 100644
--- a/pages/accountLists/[accountListId]/settings/organizations.page.tsx
+++ b/pages/accountLists/[accountListId]/settings/organizations.page.tsx
@@ -7,7 +7,6 @@ import { loadSession } from 'pages/api/utils/pagePropsHelpers';
 import { ImpersonateUserAccordion } from 'src/components/Settings/Organization/ImpersonateUser/ImpersonateUserAccordion';
 import { ManageOrganizationAccessAccordion } from 'src/components/Settings/Organization/ManageOrganizationAccess/ManageOrganizationAccessAccordion';
 import { AccordionGroup } from 'src/components/Shared/Forms/Accordions/AccordionGroup';
-import { suggestArticles } from 'src/lib/helpScout';
 import { SettingsWrapper } from './Wrapper';
 import {
   SettingsOrganizationFragment,
@@ -61,10 +60,6 @@ const Organizations = (): ReactElement => {
     setSelectedOrganization(organizations?.[0]);
   }, [organizations]);
 
-  useEffect(() => {
-    suggestArticles('HS_SETTINGS_SERVICES_SUGGESTIONS');
-  }, []);
-
   const handleAccordionChange = (panel: string) => {
     const panelLowercase = panel.toLowerCase();
     setExpandedPanel(expandedPanel === panelLowercase ? '' : panelLowercase);
diff --git a/pages/accountLists/[accountListId]/settings/preferences.page.tsx b/pages/accountLists/[accountListId]/settings/preferences.page.tsx
index 5e4cd7192..555430342 100644
--- a/pages/accountLists/[accountListId]/settings/preferences.page.tsx
+++ b/pages/accountLists/[accountListId]/settings/preferences.page.tsx
@@ -33,7 +33,6 @@ import { StickyBox } from 'src/components/Shared/Header/styledComponents';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import { useGetTimezones } from 'src/hooks/useGetTimezones';
 import { getCountries } from 'src/lib/data/countries';
-import { suggestArticles } from 'src/lib/helpScout';
 import { SettingsWrapper } from './Wrapper';
 
 const AccordionLoading = styled(Skeleton)(() => ({
@@ -80,10 +79,6 @@ const Preferences: React.FC = () => {
   const { data: userOrganizationAccountsData } =
     useGetUsersOrganizationsAccountsQuery();
 
-  useEffect(() => {
-    suggestArticles('HS_SETTINGS_PREFERENCES_SUGGESTIONS');
-  }, []);
-
   useEffect(() => {
     if (onSetupTour) {
       setExpandedPanel(setupAccordions[0]);
diff --git a/pages/accountLists/[accountListId]/tasks/Tasks.test.tsx b/pages/accountLists/[accountListId]/tasks/Tasks.test.tsx
index 3a4e75833..2a0f1d45d 100644
--- a/pages/accountLists/[accountListId]/tasks/Tasks.test.tsx
+++ b/pages/accountLists/[accountListId]/tasks/Tasks.test.tsx
@@ -195,4 +195,24 @@ describe('tasks page', () => {
       expect(getByText('All Tasks')).toHaveClass('MuiButton-contained'),
     );
   });
+
+  it('should remove task', async () => {
+    const { getByText, getByTestId } = render(
+      <MocksProviders>
+        <Tasks />
+      </MocksProviders>,
+    );
+    await waitFor(() => expect(getByText('Test Person')).toBeInTheDocument());
+    userEvent.click(getByTestId('task-checkbox-1'));
+    expect(getByText('Showing 17')).toBeInTheDocument();
+    userEvent.click(getByTestId('DeleteIconButton-1'));
+    // This is needed for some reason
+    userEvent.click(getByTestId('DeleteIconButton-1'));
+    userEvent.click(getByText('Yes'));
+    await waitFor(() => {
+      expect(mockEnqueue).toHaveBeenCalledWith(`Task deleted successfully`, {
+        variant: 'success',
+      });
+    });
+  });
 });
diff --git a/pages/accountLists/[accountListId]/tasks/[[...contactId]].page.tsx b/pages/accountLists/[accountListId]/tasks/[[...contactId]].page.tsx
index 6086696b4..6be7eada1 100644
--- a/pages/accountLists/[accountListId]/tasks/[[...contactId]].page.tsx
+++ b/pages/accountLists/[accountListId]/tasks/[[...contactId]].page.tsx
@@ -31,7 +31,6 @@ import { useAccountListId } from 'src/hooks/useAccountListId';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
 import { useMassSelection } from 'src/hooks/useMassSelection';
 import useTaskModal from 'src/hooks/useTaskModal';
-import { suggestArticles } from 'src/lib/helpScout';
 import { sanitizeFilters } from 'src/lib/sanitizeFilters';
 import theme from 'src/theme';
 import {
@@ -117,10 +116,6 @@ const TasksPage: React.FC = () => {
     }
   }, [isReady, contactId]);
 
-  useEffect(() => {
-    suggestArticles('HS_TASKS_SUGGESTIONS');
-  }, []);
-
   //#region Filters
   const urlFilters =
     query?.filters && JSON.parse(decodeURI(query.filters as string));
@@ -236,6 +231,7 @@ const TasksPage: React.FC = () => {
     deselectAll,
     toggleSelectAll,
     toggleSelectionById,
+    deselectIds,
   } = useMassSelection(
     data?.tasks?.totalCount ?? 0,
     allTaskIds,
@@ -344,6 +340,7 @@ const TasksPage: React.FC = () => {
                     toggleStarredFilter={setStarredFilter}
                     headerCheckboxState={selectionType}
                     massDeselectAll={deselectAll}
+                    showShowingCount
                     selectedIds={ids}
                     buttonGroup={
                       <Hidden xsDown>
@@ -415,6 +412,7 @@ const TasksPage: React.FC = () => {
                             onTaskCheckToggle={toggleSelectionById}
                             isChecked={isRowChecked(task.id)}
                             useTopMargin={index === 0}
+                            removeSelectedIds={deselectIds}
                           />
                         </Box>
                       )}
diff --git a/pages/accountLists/[accountListId]/tools/appeals/AppealsWrapper.tsx b/pages/accountLists/[accountListId]/tools/appeals/AppealsWrapper.tsx
index 4290401e0..df6ef5e93 100644
--- a/pages/accountLists/[accountListId]/tools/appeals/AppealsWrapper.tsx
+++ b/pages/accountLists/[accountListId]/tools/appeals/AppealsWrapper.tsx
@@ -2,7 +2,6 @@ import { useRouter } from 'next/router';
 import React, { useEffect, useMemo, useState } from 'react';
 import { AppealsProvider } from 'src/components/Tool/Appeal/AppealsContext/AppealsContext';
 import { ContactFilterSetInput } from 'src/graphql/types.generated';
-import { suggestArticles } from 'src/lib/helpScout';
 import { sanitizeFilters } from 'src/lib/sanitizeFilters';
 
 interface Props {
@@ -39,12 +38,6 @@ export const AppealsWrapper: React.FC<Props> = ({ children }) => {
   const { appealId: appealIdParams, searchTerm, accountListId } = query;
 
   useEffect(() => {
-    // TODO: Fix these suggested Articles
-    suggestArticles(
-      appealIdParams
-        ? 'HS_CONTACTS_CONTACT_SUGGESTIONS'
-        : 'HS_CONTACTS_SUGGESTIONS',
-    );
     if (appealIdParams === undefined) {
       push({
         pathname: '/accountLists/[accountListId]/tools/appeals',
diff --git a/pages/accountLists/[accountListId]/tools/fix/emailAddresses/[[...contactId]].page.test.tsx b/pages/accountLists/[accountListId]/tools/fix/emailAddresses/[[...contactId]].page.test.tsx
index 1ea547ae3..896a960d9 100644
--- a/pages/accountLists/[accountListId]/tools/fix/emailAddresses/[[...contactId]].page.test.tsx
+++ b/pages/accountLists/[accountListId]/tools/fix/emailAddresses/[[...contactId]].page.test.tsx
@@ -19,9 +19,6 @@ jest.mock('next-auth/react');
 jest.mock('next/router', () => ({
   useRouter: jest.fn(),
 }));
-jest.mock('src/lib/helpScout', () => ({
-  suggestArticles: jest.fn(),
-}));
 jest.mock('notistack', () => ({
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
diff --git a/pages/accountLists/[accountListId]/tools/fix/mailingAddresses/[[...contactId]].page.test.tsx b/pages/accountLists/[accountListId]/tools/fix/mailingAddresses/[[...contactId]].page.test.tsx
index 7a84a17de..931eb9740 100644
--- a/pages/accountLists/[accountListId]/tools/fix/mailingAddresses/[[...contactId]].page.test.tsx
+++ b/pages/accountLists/[accountListId]/tools/fix/mailingAddresses/[[...contactId]].page.test.tsx
@@ -18,9 +18,6 @@ jest.mock('next-auth/react');
 jest.mock('next/router', () => ({
   useRouter: jest.fn(),
 }));
-jest.mock('src/lib/helpScout', () => ({
-  suggestArticles: jest.fn(),
-}));
 jest.mock('notistack', () => ({
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
diff --git a/pages/accountLists/[accountListId]/tools/fix/phoneNumbers/[[...contactId]].page.test.tsx b/pages/accountLists/[accountListId]/tools/fix/phoneNumbers/[[...contactId]].page.test.tsx
index 109d6806c..b9808d51a 100644
--- a/pages/accountLists/[accountListId]/tools/fix/phoneNumbers/[[...contactId]].page.test.tsx
+++ b/pages/accountLists/[accountListId]/tools/fix/phoneNumbers/[[...contactId]].page.test.tsx
@@ -17,9 +17,6 @@ jest.mock('next-auth/react');
 jest.mock('next/router', () => ({
   useRouter: jest.fn(),
 }));
-jest.mock('src/lib/helpScout', () => ({
-  suggestArticles: jest.fn(),
-}));
 jest.mock('notistack', () => ({
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
diff --git a/pages/accountLists/[accountListId]/tools/fix/sendNewsletter/[[...contactId]].page.test.tsx b/pages/accountLists/[accountListId]/tools/fix/sendNewsletter/[[...contactId]].page.test.tsx
index fc4913e12..ffc891b9b 100644
--- a/pages/accountLists/[accountListId]/tools/fix/sendNewsletter/[[...contactId]].page.test.tsx
+++ b/pages/accountLists/[accountListId]/tools/fix/sendNewsletter/[[...contactId]].page.test.tsx
@@ -18,9 +18,6 @@ jest.mock('next-auth/react');
 jest.mock('next/router', () => ({
   useRouter: jest.fn(),
 }));
-jest.mock('src/lib/helpScout', () => ({
-  suggestArticles: jest.fn(),
-}));
 jest.mock('notistack', () => ({
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
diff --git a/pages/accountLists/[accountListId]/tools/merge/contacts/[[...contactId]].page.test.tsx b/pages/accountLists/[accountListId]/tools/merge/contacts/[[...contactId]].page.test.tsx
index 41f9531e4..d82e172d5 100644
--- a/pages/accountLists/[accountListId]/tools/merge/contacts/[[...contactId]].page.test.tsx
+++ b/pages/accountLists/[accountListId]/tools/merge/contacts/[[...contactId]].page.test.tsx
@@ -17,9 +17,6 @@ jest.mock('next-auth/react');
 jest.mock('next/router', () => ({
   useRouter: jest.fn(),
 }));
-jest.mock('src/lib/helpScout', () => ({
-  suggestArticles: jest.fn(),
-}));
 jest.mock('notistack', () => ({
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
diff --git a/pages/accountLists/[accountListId]/tools/merge/people/[[...contactId]].page.test.tsx b/pages/accountLists/[accountListId]/tools/merge/people/[[...contactId]].page.test.tsx
index c87f5cfcd..9423a7040 100644
--- a/pages/accountLists/[accountListId]/tools/merge/people/[[...contactId]].page.test.tsx
+++ b/pages/accountLists/[accountListId]/tools/merge/people/[[...contactId]].page.test.tsx
@@ -17,9 +17,6 @@ jest.mock('next-auth/react');
 jest.mock('next/router', () => ({
   useRouter: jest.fn(),
 }));
-jest.mock('src/lib/helpScout', () => ({
-  suggestArticles: jest.fn(),
-}));
 jest.mock('notistack', () => ({
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
diff --git a/pages/api/handoff.page.test.ts b/pages/api/handoff.page.test.ts
deleted file mode 100644
index a9b11bf8b..000000000
--- a/pages/api/handoff.page.test.ts
+++ /dev/null
@@ -1,214 +0,0 @@
-import { getToken } from 'next-auth/jwt';
-import makeSsrClient from 'src/lib/apollo/ssrClient';
-import { returnRedirectUrl } from './handoff.page';
-
-jest.mock('next-auth/jwt', () => ({ getToken: jest.fn() }));
-jest.mock('src/lib/apollo/ssrClient', () => jest.fn());
-
-const rewriteDomain = 'rewrite-domain.org';
-const queryPath = 'pathName';
-const apiToken = 'apiToken';
-const userID = 'userID';
-const accountListId = 'accountListId';
-const defaultAccountList = 'defaultAccountList';
-process.env.REWRITE_DOMAIN = rewriteDomain;
-
-describe('Handoff', () => {
-  const nextApiRequest = {
-    query: {
-      path: queryPath,
-    },
-  } as any;
-
-  describe('Errors', () => {
-    it('returns an error if getToken throws an error', () => {
-      (getToken as jest.Mock).mockRejectedValueOnce(
-        new Error('NextAuth authenication error'),
-      );
-      // eslint-disable-next-line jest/valid-expect
-      expect(async () => {
-        await returnRedirectUrl(nextApiRequest);
-      }).rejects.toThrow('NextAuth authenication error');
-    });
-
-    it('returns an error if getToken is not defined', () => {
-      (getToken as jest.Mock).mockReturnValue(null);
-      // eslint-disable-next-line jest/valid-expect
-      expect(async () => {
-        await returnRedirectUrl(nextApiRequest);
-      }).rejects.toThrow(
-        'Something went wrong. jwtToken or auth are undefined',
-      );
-    });
-  });
-
-  describe('Authenicated', () => {
-    beforeEach(() => {
-      (getToken as jest.Mock).mockReturnValue({
-        apiToken,
-        userID,
-      });
-    });
-
-    describe('Redirect to Auth website', () => {
-      it('should return auth website with path and access token', async () => {
-        nextApiRequest.query.auth = 'true';
-        const redirectUrl = await returnRedirectUrl(nextApiRequest);
-
-        expect(redirectUrl).toEqual(
-          `https://auth.${rewriteDomain}/${queryPath}?access_token=${apiToken}`,
-        );
-      });
-    });
-
-    describe('Redirect to old MPDx website', () => {
-      beforeEach(() => {
-        (makeSsrClient as jest.Mock).mockReturnValue({
-          query: jest.fn().mockReturnValue({
-            data: {
-              accountLists: {
-                nodes: [{ id: accountListId }],
-              },
-              user: {
-                defaultAccountList,
-              },
-            },
-          }),
-        });
-        nextApiRequest.query.auth = 'false';
-      });
-
-      it('redirects to the old MPDx website', async () => {
-        nextApiRequest.query.accountListId = `${accountListId}-1`;
-        const redirectUrl = await returnRedirectUrl(nextApiRequest);
-
-        expect(redirectUrl).toEqual(
-          `https://${rewriteDomain}/handoff?accessToken=${apiToken}&accountListId=${accountListId}-1&userId=${userID}&path=${queryPath}`,
-        );
-      });
-
-      it("should grab the user's defaultAccountList if query.accountListId is undefined", async () => {
-        nextApiRequest.query.accountListId = undefined;
-        const redirectUrl = await returnRedirectUrl(nextApiRequest);
-
-        expect(redirectUrl).toEqual(
-          `https://${rewriteDomain}/handoff?accessToken=${apiToken}&accountListId=${defaultAccountList}&userId=${userID}&path=${queryPath}`,
-        );
-      });
-
-      it("should grab the user's first accountLists if query.accountListId and defaultAccountList are undefined", async () => {
-        (makeSsrClient as jest.Mock).mockReturnValue({
-          query: jest.fn().mockReturnValue({
-            data: {
-              accountLists: {
-                nodes: [{ id: accountListId }],
-              },
-              user: {
-                defaultAccountList: undefined,
-              },
-            },
-          }),
-        });
-
-        nextApiRequest.query.accountListId = undefined;
-        const redirectUrl = await returnRedirectUrl(nextApiRequest);
-
-        expect(redirectUrl).toEqual(
-          `https://${rewriteDomain}/handoff?accessToken=${apiToken}&accountListId=${accountListId}&userId=${userID}&path=${queryPath}`,
-        );
-      });
-    });
-
-    describe('Redirect after impersonating', () => {
-      const impersonatorApiToken = 'impersonatorApiToken';
-      const apiToken = 'apiToken';
-      beforeEach(() => {
-        (makeSsrClient as jest.Mock).mockReturnValue({
-          query: jest.fn().mockReturnValue({
-            data: {
-              accountLists: {
-                nodes: [{ id: accountListId }],
-              },
-              user: {
-                defaultAccountList,
-              },
-            },
-          }),
-        });
-        nextApiRequest.query.auth = 'false';
-      });
-
-      describe('should redirect to old MPDx with normal ApiToken', () => {
-        it('returns correct URL when useImpersonatorToken is not passed', async () => {
-          (getToken as jest.Mock).mockReturnValue({
-            name: 'John Doe',
-            email: 'john.doe@cru.org',
-            sub: 'sub',
-            admin: true,
-            developer: true,
-            apiToken: 'apiToken',
-            userID: 'userID',
-            impersonating: true,
-            impersonatorApiToken,
-            iat: 1714059807,
-            exp: 1716651807,
-            jti: 'jti',
-          });
-
-          nextApiRequest.query.accountListId = `${accountListId}-1`;
-          const redirectUrl = await returnRedirectUrl(nextApiRequest);
-
-          expect(redirectUrl).toEqual(
-            `https://${rewriteDomain}/handoff?accessToken=${apiToken}&accountListId=${accountListId}-1&userId=${userID}&path=${queryPath}`,
-          );
-        });
-
-        it('returns correct URL when not impersonating but useImpersonatorToken is passed', async () => {
-          (getToken as jest.Mock).mockReturnValue({
-            name: 'John Doe',
-            email: 'john.doe@cru.org',
-            sub: 'sub',
-            admin: true,
-            developer: true,
-            apiToken: 'apiToken',
-            userID: 'userID',
-            iat: 1714059807,
-            exp: 1716651807,
-            jti: 'jti',
-          });
-
-          nextApiRequest.query.accountListId = `${accountListId}-1`;
-          const redirectUrl = await returnRedirectUrl(nextApiRequest, true);
-
-          expect(redirectUrl).toEqual(
-            `https://${rewriteDomain}/handoff?accessToken=${apiToken}&accountListId=${accountListId}-1&userId=${userID}&path=${queryPath}`,
-          );
-        });
-      });
-
-      it('should redirect to old MPDx with impersonators ApiToken', async () => {
-        (getToken as jest.Mock).mockReturnValue({
-          name: 'John Doe',
-          email: 'john.doe@cru.org',
-          sub: 'sub',
-          admin: true,
-          developer: true,
-          apiToken: 'apiToken',
-          userID: 'userID',
-          impersonating: true,
-          impersonatorApiToken,
-          iat: 1714059807,
-          exp: 1716651807,
-          jti: 'jti',
-        });
-
-        nextApiRequest.query.accountListId = `${accountListId}-1`;
-        const redirectUrl = await returnRedirectUrl(nextApiRequest, true);
-
-        expect(redirectUrl).toEqual(
-          `https://${rewriteDomain}/handoff?accessToken=${impersonatorApiToken}&accountListId=${defaultAccountList}&userId=${userID}&path=${queryPath}`,
-        );
-      });
-    });
-  });
-});
diff --git a/pages/api/handoff.page.ts b/pages/api/handoff.page.ts
deleted file mode 100644
index 005a659d8..000000000
--- a/pages/api/handoff.page.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import { NextApiRequest, NextApiResponse } from 'next';
-import { getToken } from 'next-auth/jwt';
-import makeSsrClient from 'src/lib/apollo/ssrClient';
-import {
-  GetDefaultAccountDocument,
-  GetDefaultAccountQuery,
-  GetDefaultAccountQueryVariables,
-} from './getDefaultAccount.generated';
-import { logErrorOnRollbar } from './utils/rollBar';
-
-if (!process.env.JWT_SECRET) {
-  throw new Error('JWT_SECRET env var is not set');
-}
-
-export const returnRedirectUrl = async (
-  req: NextApiRequest,
-  useImpersonatorToken = false,
-) => {
-  const jwtToken = await getToken({
-    req,
-    secret: process.env.JWT_SECRET as string,
-  });
-
-  const path = req.query.path ?? '';
-
-  const isImpersonating = !!(useImpersonatorToken && jwtToken?.impersonating);
-
-  const apiToken = isImpersonating
-    ? jwtToken?.impersonatorApiToken
-    : jwtToken?.apiToken;
-
-  if (apiToken && jwtToken?.userID && req.query.auth !== 'true') {
-    const ssrClient = makeSsrClient(apiToken);
-    const response = await ssrClient.query<
-      GetDefaultAccountQuery,
-      GetDefaultAccountQueryVariables
-    >({
-      query: GetDefaultAccountDocument,
-    });
-    const {
-      data: { user, accountLists },
-    } = response;
-
-    // When impersonating and useImpersonatorToken is set to TRUE
-    // - Fetch GraphQL data with the Impersonators ApiToken
-    // - This allows us to grab their accountListId when sending the impersonator back to the old MPDx
-    // When not impersonating and useImpersonatorToken is set to FALSE
-    // - We fetch the graphQL data with the user's ApiToken
-    // - By default use the accountListId from the request query
-
-    const defaultAccountID =
-      isImpersonating && user.defaultAccountList
-        ? user.defaultAccountList || accountLists?.nodes[0]?.id
-        : req.query?.accountListId ||
-          user.defaultAccountList ||
-          accountLists?.nodes[0]?.id;
-
-    const userId = req.query.userId || jwtToken.userID;
-
-    let protocol = 'https';
-    if (process.env.REWRITE_DOMAIN?.includes('localhost')) {
-      protocol = 'http';
-    }
-    const url = new URL(`${protocol}://${process.env.REWRITE_DOMAIN}/handoff`);
-
-    url.searchParams.append('accessToken', apiToken);
-    url.searchParams.append('accountListId', defaultAccountID.toString());
-    url.searchParams.append('userId', userId.toString());
-    url.searchParams.append('path', path.toString());
-    return url.href;
-  } else if (apiToken && req.query.auth === 'true') {
-    const url = new URL(
-      `https://auth.${process.env.REWRITE_DOMAIN}/${path
-        .toString()
-        .replace(/^\/+/, '')}`,
-    );
-    url.searchParams.append('access_token', apiToken);
-    return url.href;
-  } else {
-    throw new Error('Something went wrong. jwtToken or auth are undefined');
-  }
-};
-
-const handoff = async (
-  req: NextApiRequest,
-  res: NextApiResponse,
-): Promise<void> => {
-  try {
-    const redirectUrl = await returnRedirectUrl(req);
-    res.redirect(redirectUrl);
-  } catch (error) {
-    logErrorOnRollbar(error, '/api/handoff.page');
-    res.redirect('/');
-  }
-};
-
-export default handoff;
diff --git a/pages/api/mpdx-web-handoff.page.ts b/pages/api/mpdx-web-handoff.page.ts
deleted file mode 100644
index a9c2c755c..000000000
--- a/pages/api/mpdx-web-handoff.page.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import { NextApiRequest, NextApiResponse } from 'next';
-import { getToken } from 'next-auth/jwt';
-import { taskFiltersTabs } from 'src/utils/tasks/taskFilterTabs';
-import {
-  clearNextAuthSessionCookies,
-  cookieDefaultInfo,
-} from './utils/cookies';
-
-interface DefineRedirectUrlProps {
-  accountListId: string;
-  path: string;
-  rest: any;
-}
-
-const defineRedirectUrl = ({
-  accountListId,
-  path,
-  rest,
-}: DefineRedirectUrlProps): string => {
-  let redirectUrl = `${process.env.SITE_URL}/accountLists/${accountListId}`;
-  if (path) {
-    redirectUrl += path;
-  }
-  if (rest) {
-    for (const [key, value] of Object.entries(rest)) {
-      if (typeof value !== 'string') {
-        continue;
-      }
-      const contactsAndReportsRegex = new RegExp('/contacts|/reports');
-      if (contactsAndReportsRegex.test(path) && key === 'contactId') {
-        if (redirectUrl.includes('?')) {
-          redirectUrl = [
-            redirectUrl.split('?')[0],
-            `/${value}`,
-            `?${redirectUrl.split('?')[1]}`,
-          ].join('');
-        } else {
-          redirectUrl += `/${value}`;
-        }
-        continue;
-      } else if (path.includes('/tasks') && key === 'group') {
-        const typeDetails = taskFiltersTabs.find(
-          (item) => item.name.toLowerCase() === value.toLowerCase(),
-        );
-        if (typeDetails) {
-          if (!redirectUrl.includes('?')) {
-            redirectUrl += '?';
-          }
-          redirectUrl += `filters=${encodeURIComponent(
-            JSON.stringify(typeDetails.activeFiltersOptions),
-          )}`;
-          continue;
-        }
-      }
-      if (!redirectUrl.includes('?')) {
-        redirectUrl += '?';
-      }
-      redirectUrl += `${key}=${value}&`;
-    }
-  }
-  return redirectUrl;
-};
-
-const mpdxWebHandoff = async (
-  req: NextApiRequest,
-  res: NextApiResponse,
-): Promise<void> => {
-  try {
-    const jwtToken = await getToken({
-      req,
-      secret: process.env.JWT_SECRET as string,
-    });
-
-    const {
-      path = '',
-      accountListId = '',
-      userId = '',
-      token = '',
-      impersonate = '',
-      ...rest
-    } = req.query;
-    if (!path || !accountListId) {
-      throw new Error('Path and accountListId are not defined.');
-    }
-
-    const isAccountConflict = !!(
-      userId &&
-      jwtToken &&
-      userId !== jwtToken?.userID
-    );
-
-    const redirectUrl = defineRedirectUrl({
-      accountListId: accountListId.toString(),
-      path: path.toString(),
-      rest,
-    });
-
-    const cookies: string[] = [];
-    if (isAccountConflict) {
-      // We can force the user to logout, but OKTA caches and will auto log the previous user in.
-      // To solve this problem we store the JWT as a HTTP cookie which we use on login in [...nextauth].page.ts
-      cookies.push(
-        ...clearNextAuthSessionCookies,
-        `mpdx-handoff.accountConflictUserId=${userId}; ${cookieDefaultInfo}`,
-        `mpdx-handoff.redirect-url=${redirectUrl}; ${cookieDefaultInfo}`,
-        `mpdx-handoff.token=${token}; ${cookieDefaultInfo}`,
-      );
-    }
-    if (impersonate) {
-      cookies.push(
-        `mpdx-handoff.impersonate=${impersonate}; ${cookieDefaultInfo}`,
-        `mpdx-handoff.redirect-url=${redirectUrl}; ${cookieDefaultInfo}`,
-        `mpdx-handoff.token=${token}; ${cookieDefaultInfo}`,
-      );
-    }
-    if (!jwtToken) {
-      cookies.push(
-        `mpdx-handoff.redirect-url=${redirectUrl}; ${cookieDefaultInfo}`,
-        `mpdx-handoff.logged-in=true; path=/; domain=${process.env.REWRITE_DOMAIN}`,
-      );
-    }
-    // Removes duplicates and set cookies
-    if (cookies) {
-      res.setHeader('Set-Cookie', [...new Set(cookies)]);
-    }
-    res.redirect(jwtToken ? redirectUrl : `${process.env.SITE_URL}/login`);
-  } catch (err) {
-    res.redirect(`${process.env.SITE_URL}/`);
-  }
-};
-
-export default mpdxWebHandoff;
diff --git a/pages/api/stop-impersonating.page.ts b/pages/api/stop-impersonating.page.ts
index e40eac15a..b77a36fc6 100644
--- a/pages/api/stop-impersonating.page.ts
+++ b/pages/api/stop-impersonating.page.ts
@@ -1,31 +1,12 @@
 import { NextApiRequest, NextApiResponse } from 'next';
-import { getToken } from 'next-auth/jwt';
-import { returnRedirectUrl } from './handoff.page';
-import {
-  clearNextAuthSessionCookies,
-  cookieDefaultInfo,
-} from './utils/cookies';
+import { clearNextAuthSessionCookies } from './utils/cookies';
 
-const mpdxWebHandoff = async (
+const stopImpersonating = async (
   req: NextApiRequest,
   res: NextApiResponse,
 ): Promise<void> => {
-  const redirectUrl = `${process.env.SITE_URL}/`;
-  try {
-    const jwtToken = await getToken({
-      req,
-      secret: process.env.JWT_SECRET as string,
-    });
-    res.setHeader('Set-Cookie', [
-      ...clearNextAuthSessionCookies,
-      `mpdx-handoff.redirect-url=${redirectUrl}; ${cookieDefaultInfo}`,
-      `mpdx-handoff.token=${jwtToken?.impersonatorApiToken}; ${cookieDefaultInfo}`,
-    ]);
-    const handoffRedirectUrl = await returnRedirectUrl(req, true);
-    res.redirect(handoffRedirectUrl);
-  } catch (err) {
-    res.redirect(redirectUrl);
-  }
+  res.setHeader('Set-Cookie', clearNextAuthSessionCookies);
+  res.redirect('/');
 };
 
-export default mpdxWebHandoff;
+export default stopImpersonating;
diff --git a/pages/helpjuice.css b/pages/helpjuice.css
new file mode 100644
index 000000000..1bd471837
--- /dev/null
+++ b/pages/helpjuice.css
@@ -0,0 +1,46 @@
+#helpjuice-widget .article .footer {
+  /* Hide the estimated reading time and last updated time in search results */
+  display: none !important;
+}
+
+/*
+ * The default height of #helpjuice-widget-expanded is 620px and #helpjuice-widget-content is 500px. It fits well when
+ * the screen is 800px. Therefore, the widget content height should be 300px less than the screen height, while keeping
+ * its height between 300px and 500px. And the widget itself should be 120px taller than the content.
+ */
+#helpjuice-widget #helpjuice-widget-expanded {
+  --content-height: clamp(100vh - 300px, 300px, 500px);
+  height: calc(var(--content-height) + 120px) !important;
+}
+
+#helpjuice-widget #helpjuice-widget-expanded #helpjuice-widget-content {
+  height: var(--content-height) !important;
+}
+
+#helpjuice-widget.bottomRight {
+  right: 130px !important;
+}
+
+/* Move the beacon higher from the bottom when it is not expanded */
+#helpjuice-widget.bottomRight:has(#helpjuice-widget-expanded:not(.hj-shown)) {
+  bottom: 170px !important;
+}
+
+/* If the browser doesn't support :has and :not selectors, always move the beacon higher. */
+@supports not selector(:has(*):not(*)) {
+  #helpjuice-widget.bottomRight {
+    bottom: 170px !important;
+  }
+}
+
+@media (max-width: 900px) {
+  #helpjuice-widget.bottomRight {
+    right: 100px !important;
+  }
+}
+
+@media (max-width: 600px) {
+  #helpjuice-widget.bottomRight {
+    right: 90px !important;
+  }
+}
diff --git a/pages/helpscout.css b/pages/helpscout.css
deleted file mode 100644
index 3184cb2a0..000000000
--- a/pages/helpscout.css
+++ /dev/null
@@ -1,27 +0,0 @@
-.BeaconFabButtonFrame {
-  right: 70px !important;
-  bottom: 30px !important;
-}
-
-@media only screen and (max-width: 900px) {
-  .BeaconFabButtonFrame {
-    right: 40px !important;
-    bottom: 25px !important;
-  }
-}
-
-@media only screen and (max-width: 600px) {
-  .BeaconFabButtonFrame {
-    right: 30px !important;
-    bottom: 30px !important;
-  }
-}
-
-.BeaconContainer {
-  right: 20px !important;
-  bottom: 90px !important;
-  z-index: 1350 !important;
-}
-.BeaconFabButtonFrame {
-  z-index: 1500 !important;
-}
diff --git a/pages/login-apioauth.page.test.tsx b/pages/login-apioauth.page.test.tsx
index 454ce9f1c..553ffcf7d 100644
--- a/pages/login-apioauth.page.test.tsx
+++ b/pages/login-apioauth.page.test.tsx
@@ -70,6 +70,7 @@ describe('Login - API_OAUTH', () => {
       signInButtonText: 'Sign In with Third-party oAuth',
       signInAuthProviderId: 'apioauth',
       immediateSignIn: false,
+      isOkta: false,
     });
     expect(redirect).toBeUndefined();
   });
@@ -85,6 +86,7 @@ describe('Login - API_OAUTH', () => {
       signInButtonText: 'Sign In with Third-party oAuth',
       signInAuthProviderId: 'apioauth',
       immediateSignIn: true,
+      isOkta: false,
     });
     expect(redirect).toBeUndefined();
     expect(setHeaderMock).toHaveBeenCalledWith(
@@ -121,4 +123,19 @@ describe('Login - API_OAUTH', () => {
       expect(signIn).toHaveBeenCalledWith('apioauth');
     });
   });
+
+  it('does not render create account help text', () => {
+    const { queryByText } = render(
+      <Components
+        props={{
+          signInButtonText: 'Sign In with SSO',
+          signInAuthProviderId: 'apioauth',
+          immediateSignIn: false,
+          isOkta: false,
+        }}
+      />,
+    );
+
+    expect(queryByText(/Don't have an Okta account\?/)).not.toBeInTheDocument();
+  });
 });
diff --git a/pages/login.page.test.tsx b/pages/login.page.test.tsx
index 74e25ff4b..b66a9ec1b 100644
--- a/pages/login.page.test.tsx
+++ b/pages/login.page.test.tsx
@@ -89,6 +89,7 @@ describe('Login - OKTA', () => {
         signInButtonText: 'Sign In',
         signInAuthProviderId: 'okta',
         immediateSignIn: false,
+        isOkta: true,
       });
       expect(redirect).toBeUndefined();
     });
@@ -108,6 +109,7 @@ describe('Login - OKTA', () => {
         signInButtonText: 'Sign In',
         signInAuthProviderId: 'okta',
         immediateSignIn: false,
+        isOkta: true,
       });
       expect(redirect).toBeUndefined();
     });
@@ -123,6 +125,7 @@ describe('Login - OKTA', () => {
         signInButtonText: 'Sign In',
         signInAuthProviderId: 'okta',
         immediateSignIn: true,
+        isOkta: true,
       });
       expect(redirect).toBeUndefined();
       expect(setHeaderMock).toHaveBeenCalledWith(
@@ -177,4 +180,19 @@ describe('Login - OKTA', () => {
       });
     });
   });
+
+  it('renders create account help text', () => {
+    const { getByText } = render(
+      <Components
+        props={{
+          signInButtonText: 'Sign In',
+          signInAuthProviderId: 'okta',
+          immediateSignIn: false,
+          isOkta: true,
+        }}
+      />,
+    );
+
+    expect(getByText(/Don't have an Okta account\?/)).toBeInTheDocument();
+  });
 });
diff --git a/pages/login.page.tsx b/pages/login.page.tsx
index 0146d2d25..2bb3274d4 100644
--- a/pages/login.page.tsx
+++ b/pages/login.page.tsx
@@ -2,7 +2,8 @@ import { GetServerSideProps } from 'next';
 import Head from 'next/head';
 import React, { ReactElement, useEffect } from 'react';
 import SubjectIcon from '@mui/icons-material/Subject';
-import { Button } from '@mui/material';
+import { Button, Typography } from '@mui/material';
+import { styled } from '@mui/material/styles';
 import { getSession, signIn } from 'next-auth/react';
 import BaseLayout from 'src/components/Layouts/Basic';
 import Loading from 'src/components/Loading';
@@ -11,16 +12,22 @@ import useGetAppSettings from 'src/hooks/useGetAppSettings';
 import { extractCookie } from 'src/lib/extractCookie';
 import i18n from 'src/lib/i18n';
 
+const SignUpBox = styled('div')(({ theme }) => ({
+  marginBlock: theme.spacing(2),
+}));
+
 export interface LoginProps {
   signInButtonText: string;
   signInAuthProviderId: string;
   immediateSignIn: boolean;
+  isOkta: boolean;
 }
 
 const Login = ({
   signInButtonText,
   signInAuthProviderId,
   immediateSignIn,
+  isOkta,
 }: LoginProps): ReactElement => {
   const { appName } = useGetAppSettings();
 
@@ -67,6 +74,16 @@ const Login = ({
         >
           Find help
         </Button>
+        {isOkta && (
+          <SignUpBox>
+            <Typography>
+              Don&apos;t have an Okta account?
+              <br />
+              Click the <strong>Sign in</strong> button above, then{' '}
+              <strong>Sign up</strong>.
+            </Typography>
+          </SignUpBox>
+        )}
       </Welcome>
     </>
   );
@@ -116,6 +133,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => {
       signInButtonText,
       signInAuthProviderId,
       immediateSignIn,
+      isOkta: authProvider === 'OKTA',
     },
   };
 };
diff --git a/pages/logout.page.tsx b/pages/logout.page.tsx
index 851347580..65e7e308e 100644
--- a/pages/logout.page.tsx
+++ b/pages/logout.page.tsx
@@ -1,4 +1,3 @@
-import { GetServerSideProps } from 'next';
 import Head from 'next/head';
 import React, { ReactElement, useEffect } from 'react';
 import { useApolloClient } from '@apollo/client';
@@ -54,12 +53,6 @@ const LogoutPage = ({}): ReactElement => {
   );
 };
 
-export const getServerSideProps: GetServerSideProps = async (context) => {
-  context.res.setHeader(
-    'Set-Cookie',
-    `mpdx-handoff.logged-in=; path=/; Max-Age=0; domain=${process.env.REWRITE_DOMAIN}`,
-  );
-  return loadSession(context);
-};
+export const getServerSideProps = loadSession;
 
 export default LogoutPage;
diff --git a/pages/print.css b/pages/print.css
index f9442e4ca..0d5532bd7 100644
--- a/pages/print.css
+++ b/pages/print.css
@@ -18,8 +18,4 @@
   header {
     display: none !important;
   }
-
-  #beacon-container {
-    display: none;
-  }
 }
diff --git a/src/components/Coaching/CoachingDetail/Activity/Activity.tsx b/src/components/Coaching/CoachingDetail/Activity/Activity.tsx
index 7ba454b8c..ff7c6f88e 100644
--- a/src/components/Coaching/CoachingDetail/Activity/Activity.tsx
+++ b/src/components/Coaching/CoachingDetail/Activity/Activity.tsx
@@ -19,7 +19,6 @@ import { styled } from '@mui/material/styles';
 import { DateTime, DateTimeUnit } from 'luxon';
 import { useTranslation } from 'react-i18next';
 import AnimatedCard from 'src/components/AnimatedCard';
-import HandoffLink from 'src/components/HandoffLink';
 import {
   ActivityTypeEnum,
   Appeal,
@@ -263,7 +262,7 @@ export const Activity: React.FC<ActivityProps> = ({
                 <ChevronRight />
               </StyledButton>
             </ButtonGroup>
-            <HelpButton articleVar="HS_COACHING_ACTIVITY" />
+            <HelpButton articleVar="HELP_URL_COACHING_ACTIVITY" />
           </Header>
         }
       />
@@ -672,9 +671,16 @@ export const Activity: React.FC<ActivityProps> = ({
           <MoneyOutlined sx={{ fontSize: '6rem' }} />
           <SectionTitle>
             {accountListType === AccountListTypeEnum.Own ? (
-              <HandoffLink path="/tools/appeals">
+              <NextLink
+                href={
+                  primaryAppeal
+                    ? `/accountLists/${accountListId}/tools/appeals/appeal/${primaryAppeal.id}`
+                    : `/accountLists/${accountListId}/tools/appeals`
+                }
+                passHref
+              >
                 <MuiLink underline="none">{t('Primary Appeal')}</MuiLink>
-              </HandoffLink>
+              </NextLink>
             ) : (
               t('Primary Appeal')
             )}
@@ -701,13 +707,14 @@ export const Activity: React.FC<ActivityProps> = ({
                     </StatsText>
                     <StatsColumnTitle>
                       {accountListType === AccountListTypeEnum.Own ? (
-                        <HandoffLink
-                          path={`/tools/appeals/${primaryAppeal.id}`}
+                        <NextLink
+                          href={`/accountLists/${accountListId}/tools/appeals/appeal/${primaryAppeal.id}`}
+                          passHref
                         >
                           <MuiLink underline="none">
                             {primaryAppeal.name}
                           </MuiLink>
-                        </HandoffLink>
+                        </NextLink>
                       ) : (
                         primaryAppeal.name
                       )}
diff --git a/src/components/Coaching/CoachingDetail/ActivitySummary/ActivitySummary.tsx b/src/components/Coaching/CoachingDetail/ActivitySummary/ActivitySummary.tsx
index 9c8f5875f..8795736cb 100644
--- a/src/components/Coaching/CoachingDetail/ActivitySummary/ActivitySummary.tsx
+++ b/src/components/Coaching/CoachingDetail/ActivitySummary/ActivitySummary.tsx
@@ -1,6 +1,5 @@
 import { useMemo } from 'react';
 import {
-  Box,
   CardContent,
   CardHeader,
   Divider,
@@ -18,7 +17,6 @@ import { useLocale } from 'src/hooks/useLocale';
 import { dateFormatWithoutYear } from 'src/lib/intlFormat';
 import { MultilineSkeleton } from '../../../Shared/MultilineSkeleton';
 import { CoachingPeriodEnum } from '../CoachingDetail';
-import { HelpButton } from '../HelpButton';
 import { AlignedTableCell, DividerRow, HeaderRow } from '../StyledComponents';
 import { getResultColor } from '../helpers';
 import { useActivitySummaryQuery } from './ActivitySummary.generated';
@@ -96,14 +94,7 @@ export const ActivitySummary: React.FC<ActivitySummaryProps> = ({
 
   return (
     <AnimatedCard>
-      <CardHeader
-        title={
-          <Box display="flex" alignItems="center">
-            <Box flex={1}>{t('Activity Summary')}</Box>
-            <HelpButton articleVar="HS_COACHING_ACTIVITY_SUMMARY" />
-          </Box>
-        }
-      />
+      <CardHeader title={t('Activity Summary')} />
       <ContentContainer>
         {loading ? (
           <MultilineSkeleton lines={4} />
diff --git a/src/components/Coaching/CoachingDetail/AppointmentResults/AppointmentResults.tsx b/src/components/Coaching/CoachingDetail/AppointmentResults/AppointmentResults.tsx
index de8defa64..251baa9e9 100644
--- a/src/components/Coaching/CoachingDetail/AppointmentResults/AppointmentResults.tsx
+++ b/src/components/Coaching/CoachingDetail/AppointmentResults/AppointmentResults.tsx
@@ -83,7 +83,7 @@ export const AppointmentResults: React.FC<AppointmentResultsProps> = ({
         title={
           <Box display="flex" alignItems="center">
             <Box flex={1}>{t('Appointments and Results')}</Box>
-            <HelpButton articleVar="HS_COACHING_APPOINTMENTS_AND_RESULTS" />
+            <HelpButton articleVar="HELP_URL_COACHING_APPOINTMENTS_AND_RESULTS" />
           </Box>
         }
       />
diff --git a/src/components/Coaching/CoachingDetail/CoachingDetail.tsx b/src/components/Coaching/CoachingDetail/CoachingDetail.tsx
index c62ab500f..2f0190f40 100644
--- a/src/components/Coaching/CoachingDetail/CoachingDetail.tsx
+++ b/src/components/Coaching/CoachingDetail/CoachingDetail.tsx
@@ -58,7 +58,7 @@ const CoachingDetailContainer = styled(Box)({
 const CoachingMainContainer = styled(Box)(({ theme }) => ({
   flex: 1,
   padding: theme.spacing(1),
-  paddingBottom: theme.spacing(6), // prevent the HelpScout beacon from obscuring content at the bottom
+  paddingBottom: theme.spacing(6), // prevent the Helpjuice beacon from obscuring content at the bottom
   overflowY: 'scroll',
 }));
 
diff --git a/src/components/Coaching/CoachingDetail/HelpButton.test.tsx b/src/components/Coaching/CoachingDetail/HelpButton.test.tsx
index 0b50f1def..fc3d43830 100644
--- a/src/components/Coaching/CoachingDetail/HelpButton.test.tsx
+++ b/src/components/Coaching/CoachingDetail/HelpButton.test.tsx
@@ -1,17 +1,27 @@
 import { render } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { showArticle } from 'src/lib/helpScout';
 import { HelpButton } from './HelpButton';
 
-jest.mock('src/lib/helpScout');
-
 describe('help button', () => {
-  it('opens the HelpScout article', () => {
+  it('renders a link to the help article', () => {
+    process.env.HELP_URL_COACHING_ACTIVITY = 'https://help.org';
+
     const { getByRole } = render(
-      <HelpButton articleVar="HS_COACHING_ACTIVITY" />,
+      <HelpButton articleVar="HELP_URL_COACHING_ACTIVITY" />,
+    );
+
+    expect(getByRole('link', { name: 'Help' })).toHaveAttribute(
+      'href',
+      'https://help.org',
+    );
+  });
+
+  it('renders nothing if the help article does not exist', () => {
+    process.env.HELP_URL_COACHING_ACTIVITY = '';
+
+    const { queryByRole } = render(
+      <HelpButton articleVar="HELP_URL_COACHING_ACTIVITY" />,
     );
 
-    userEvent.click(getByRole('button', { name: 'Help' }));
-    expect(showArticle).toHaveBeenCalled();
+    expect(queryByRole('link', { name: 'Help' })).not.toBeInTheDocument();
   });
 });
diff --git a/src/components/Coaching/CoachingDetail/HelpButton.tsx b/src/components/Coaching/CoachingDetail/HelpButton.tsx
index e84d23561..23a3bcebb 100644
--- a/src/components/Coaching/CoachingDetail/HelpButton.tsx
+++ b/src/components/Coaching/CoachingDetail/HelpButton.tsx
@@ -1,17 +1,26 @@
 import QuestionMark from '@mui/icons-material/QuestionMark';
 import { IconButton } from '@mui/material';
-import { ArticleVar, showArticle } from 'src/lib/helpScout';
+import { ArticleVar, articles } from 'src/lib/helpjuice';
 
 interface HelpButtonProps {
   articleVar: ArticleVar;
 }
 
-export const HelpButton: React.FC<HelpButtonProps> = ({ articleVar }) => (
-  <IconButton
-    size="small"
-    onClick={() => showArticle(articleVar)}
-    aria-label="Help"
-  >
-    <QuestionMark />
-  </IconButton>
-);
+export const HelpButton: React.FC<HelpButtonProps> = ({ articleVar }) => {
+  const url = articles[articleVar];
+  if (!url) {
+    return null;
+  }
+
+  return (
+    <IconButton
+      href={url}
+      target="_blank"
+      rel="nofollow noreferrer"
+      size="small"
+      aria-label="Help"
+    >
+      <QuestionMark />
+    </IconButton>
+  );
+};
diff --git a/src/components/Coaching/CoachingRow/CoachingRow.tsx b/src/components/Coaching/CoachingRow/CoachingRow.tsx
index 0cd7e60d2..1358bb227 100644
--- a/src/components/Coaching/CoachingRow/CoachingRow.tsx
+++ b/src/components/Coaching/CoachingRow/CoachingRow.tsx
@@ -72,7 +72,9 @@ export const CoachingRow: React.FC<Props> = ({
             }}
             passHref
           >
-            <Link flex={1}>{name}</Link>
+            <Link flex={1} underline="hover">
+              {name}
+            </Link>
           </NextLink>
           <Button
             onClick={(event) => {
diff --git a/src/components/Contacts/ContactDetails/ContactTasksTab/DeleteTaskIconButton/DeleteTaskIconButton.tsx b/src/components/Contacts/ContactDetails/ContactTasksTab/DeleteTaskIconButton/DeleteTaskIconButton.tsx
index 4de903911..d901d53e7 100644
--- a/src/components/Contacts/ContactDetails/ContactTasksTab/DeleteTaskIconButton/DeleteTaskIconButton.tsx
+++ b/src/components/Contacts/ContactDetails/ContactTasksTab/DeleteTaskIconButton/DeleteTaskIconButton.tsx
@@ -13,12 +13,14 @@ interface DeleteTaskIconButtonProps {
   accountListId: string;
   taskId: string;
   onDeleteConfirm?: () => void;
+  removeSelectedIds?: (id: string[]) => void;
 }
 
 export const DeleteTaskIconButton: React.FC<DeleteTaskIconButtonProps> = ({
   accountListId,
   taskId,
   onDeleteConfirm,
+  removeSelectedIds,
 }) => {
   const { t } = useTranslation();
 
@@ -26,7 +28,10 @@ export const DeleteTaskIconButton: React.FC<DeleteTaskIconButtonProps> = ({
 
   return (
     <>
-      <DeleteButton onClick={() => setRemoveDialogOpen(true)}>
+      <DeleteButton
+        onClick={() => setRemoveDialogOpen(true)}
+        data-testid={`DeleteIconButton-${taskId}`}
+      >
         <DeletedItemIcon />
       </DeleteButton>
       <DeleteConfirmation
@@ -36,6 +41,7 @@ export const DeleteTaskIconButton: React.FC<DeleteTaskIconButtonProps> = ({
         onClickDecline={setRemoveDialogOpen}
         accountListId={accountListId}
         taskId={taskId}
+        removeSelectedIds={removeSelectedIds}
       />
     </>
   );
diff --git a/src/components/Contacts/ContactsMap/ContactsMap.tsx b/src/components/Contacts/ContactsMap/ContactsMap.tsx
index d3c039621..611e1932a 100644
--- a/src/components/Contacts/ContactsMap/ContactsMap.tsx
+++ b/src/components/Contacts/ContactsMap/ContactsMap.tsx
@@ -92,15 +92,14 @@ export const ContactsMap: React.FC = ({}) => {
   });
 
   useEffect(() => {
-    // Add styles to HelpScout Beacon to move left of Google zoom buttons.
-    const beacon = document.querySelector(
-      '#beacon-container .BeaconFabButtonFrame',
-    ) as HTMLElement;
-    if (!beacon) {
+    // Add styles to Helpjuice beacon to move left of Google zoom buttons.
+    const beacon = document.querySelector('#helpjuice-widget.bottomRight');
+    if (!(beacon instanceof HTMLElement)) {
       return;
     }
-    beacon.style.setProperty('right', '60px', 'important');
-    return () => beacon.style.setProperty('right', '20px');
+    const oldRight = beacon.style.getPropertyValue('right');
+    beacon.style.setProperty('right', '120px', 'important');
+    return () => beacon.style.setProperty('right', oldRight);
   }, []);
 
   useEffect(() => {
diff --git a/src/components/Dashboard/Balance/Balance.test.tsx b/src/components/Dashboard/Balance/Balance.test.tsx
index b60911100..878685f60 100644
--- a/src/components/Dashboard/Balance/Balance.test.tsx
+++ b/src/components/Dashboard/Balance/Balance.test.tsx
@@ -14,16 +14,16 @@ jest.mock('next/router', () => ({
 
 describe('Balance', () => {
   it('default', () => {
-    const { getByTestId } = render(
+    const { getByTestId, getByRole } = render(
       <GqlMockedProvider>
         <Balance balance={1000.99} />
       </GqlMockedProvider>,
     );
     expect(getByTestId('BalanceTypography').textContent).toEqual('$1,000.99');
-    // TODO: needs fix, switching from the HandOffLink to NextLink breaks this
-    // expect(
-    //   getByRole('link', { hidden: true, name: 'View Gifts' }),
-    // ).toHaveAttribute('href', 'https://stage.mpdx.org/reports/donations');
+    expect(getByRole('link', { name: 'View Gifts' })).toHaveAttribute(
+      'href',
+      '/accountLists/abc/reports/donations',
+    );
   });
 
   it('custom props', () => {
diff --git a/src/components/Dashboard/Balance/Balance.tsx b/src/components/Dashboard/Balance/Balance.tsx
index 207986cf7..d21a3aedb 100644
--- a/src/components/Dashboard/Balance/Balance.tsx
+++ b/src/components/Dashboard/Balance/Balance.tsx
@@ -65,8 +65,11 @@ const Balance = ({
           <Typography>{t('It may take a few days to update.')}</Typography>
         </CardContent>
         <CardActions>
-          <NextLink href={`/accountLists/${accountListId}/reports/donations`}>
-            <Button size="small" color="primary">
+          <NextLink
+            href={`/accountLists/${accountListId}/reports/donations`}
+            passHref
+          >
+            <Button component="a" size="small" color="primary">
               {t('View Gifts')}
             </Button>
           </NextLink>
diff --git a/src/components/Dashboard/ThisWeek/Appeals/Appeals.test.tsx b/src/components/Dashboard/ThisWeek/Appeals/Appeals.test.tsx
index d43edf7f8..677e4e7c4 100644
--- a/src/components/Dashboard/ThisWeek/Appeals/Appeals.test.tsx
+++ b/src/components/Dashboard/ThisWeek/Appeals/Appeals.test.tsx
@@ -46,11 +46,9 @@ describe('Appeals', () => {
     expect(
       getByTestId('AppealsTypographyPledgesAmountTotal').children[0].className,
     ).toContain('MuiSkeleton-root');
-    expect(
-      getByRole('link', { hidden: true, name: 'View All' }),
-    ).toHaveAttribute(
+    expect(getByRole('link', { name: 'View All' })).toHaveAttribute(
       'href',
-      `https://${process.env.REWRITE_DOMAIN}/tools/appeals`,
+      '/accountLists/abc/tools',
     );
   });
 
diff --git a/src/components/Dashboard/ThisWeek/Appeals/Appeals.tsx b/src/components/Dashboard/ThisWeek/Appeals/Appeals.tsx
index 1c2d2f55e..35809c618 100644
--- a/src/components/Dashboard/ThisWeek/Appeals/Appeals.tsx
+++ b/src/components/Dashboard/ThisWeek/Appeals/Appeals.tsx
@@ -1,3 +1,4 @@
+import NextLink from 'next/link';
 import React, { ReactElement } from 'react';
 import {
   Box,
@@ -14,11 +15,11 @@ import {
 import { motion } from 'framer-motion';
 import { useTranslation } from 'react-i18next';
 import { makeStyles } from 'tss-react/mui';
+import { useAccountListId } from 'src/hooks/useAccountListId';
 import { useLocale } from 'src/hooks/useLocale';
 import illustration13 from '../../../../images/drawkit/grape/drawkit-grape-pack-illustration-13.svg';
 import { currencyFormat, percentageFormat } from '../../../../lib/intlFormat';
 import AnimatedCard from '../../../AnimatedCard';
-import HandoffLink from '../../../HandoffLink';
 import StyledProgress from '../../../StyledProgress';
 import { GetThisWeekQuery } from '../GetThisWeek.generated';
 
@@ -99,6 +100,7 @@ interface Props {
 }
 
 const Appeals = ({ loading, appeal }: Props): ReactElement => {
+  const accountListId = useAccountListId();
   const { classes } = useStyles();
   const { t } = useTranslation();
   const locale = useLocale();
@@ -138,7 +140,14 @@ const Appeals = ({ loading, appeal }: Props): ReactElement => {
               ' ',
             )}
           >
-            <HandoffLink path={`/tools/appeals/${appeal?.id}`}>
+            <NextLink
+              href={
+                appeal
+                  ? `/accountLists/${accountListId}/tools/appeals/appeal/${appeal.id}`
+                  : `/accountLists/${accountListId}/tools/appeals`
+              }
+              passHref
+            >
               <Link underline="hover" className={classes.appealsHeader}>
                 <Typography variant="h6" className={classes.titleContainer}>
                   <Box className={classes.title}>
@@ -165,7 +174,7 @@ const Appeals = ({ loading, appeal }: Props): ReactElement => {
                   </Box>
                 </Typography>
               </Link>
-            </HandoffLink>
+            </NextLink>
             <StyledProgress
               loading={loading}
               primary={pledgesAmountProcessedPercentage}
@@ -245,11 +254,11 @@ const Appeals = ({ loading, appeal }: Props): ReactElement => {
             </Grid>
           </CardContent>
           <CardActions>
-            <HandoffLink path="/tools/appeals">
+            <NextLink href={`/accountLists/${accountListId}/tools`} passHref>
               <Button size="small" color="primary">
                 {t('View All')}
               </Button>
-            </HandoffLink>
+            </NextLink>
           </CardActions>
         </motion.div>
       )}
diff --git a/src/components/HandoffLink/HandoffLink.test.tsx b/src/components/HandoffLink/HandoffLink.test.tsx
deleted file mode 100644
index 000dd6dcc..000000000
--- a/src/components/HandoffLink/HandoffLink.test.tsx
+++ /dev/null
@@ -1,152 +0,0 @@
-import * as nextRouter from 'next/router';
-import React from 'react';
-import { render } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { GqlMockedProvider } from '__tests__/util/graphqlMocking';
-import { UserPreferenceContext } from '../User/Preferences/UserPreferenceProvider';
-import HandoffLink from '.';
-
-describe('HandoffLink', () => {
-  let open: jest.Mock;
-  let originalOpen: Window['open'];
-  const useRouter = jest.spyOn(nextRouter, 'useRouter');
-  const rewriteDomain = process.env.REWRITE_DOMAIN;
-  const userId = 'userID123';
-
-  beforeEach(() => {
-    open = jest.fn();
-    originalOpen = window.open;
-    window.open = open;
-    (
-      useRouter as jest.SpyInstance<
-        Pick<nextRouter.NextRouter, 'query' | 'isReady'>
-      >
-    ).mockImplementation(() => ({
-      query: { accountListId: 'accountListId' },
-      isReady: true,
-    }));
-  });
-
-  afterEach(() => {
-    window.open = originalOpen;
-  });
-
-  it('default', async () => {
-    const { getByRole } = render(
-      <GqlMockedProvider>
-        <UserPreferenceContext.Provider value={{ userId, locale: 'en-US' }}>
-          <HandoffLink path="/contacts">
-            <a>Link</a>
-          </HandoffLink>
-        </UserPreferenceContext.Provider>
-      </GqlMockedProvider>,
-    );
-    const linkElement = getByRole('link', { hidden: true, name: 'Link' });
-    expect(linkElement).toHaveAttribute(
-      'href',
-      `https://${rewriteDomain}/contacts`,
-    );
-    userEvent.click(linkElement);
-    expect(open).toHaveBeenCalledWith(
-      `${process.env.SITE_URL}/api/handoff?accountListId=accountListId&userId=${userId}&path=%2Fcontacts`,
-      '_blank',
-    );
-  });
-
-  it('default auth', async () => {
-    const { getByRole } = render(
-      <GqlMockedProvider>
-        <HandoffLink path="/contacts" auth>
-          <a>Link</a>
-        </HandoffLink>
-      </GqlMockedProvider>,
-    );
-    const linkElement = getByRole('link', { hidden: true, name: 'Link' });
-    expect(linkElement).toHaveAttribute(
-      'href',
-      `https://auth.${rewriteDomain}/contacts`,
-    );
-    userEvent.click(linkElement);
-    expect(open).toHaveBeenCalledWith(
-      `${process.env.SITE_URL}/api/handoff?auth=true&path=%2Fcontacts`,
-      '_blank',
-    );
-  });
-
-  it('onClick defaultPrevented', async () => {
-    const handleClick = jest.fn((e) => e.preventDefault());
-    const { getByRole } = render(
-      <GqlMockedProvider>
-        <HandoffLink path="/contacts">
-          <a onClick={handleClick}>Link</a>
-        </HandoffLink>
-      </GqlMockedProvider>,
-    );
-    const linkElement = getByRole('link', { hidden: true, name: 'Link' });
-    expect(linkElement).toHaveAttribute(
-      'href',
-      `https://${rewriteDomain}/contacts`,
-    );
-    userEvent.click(linkElement);
-    expect(handleClick).toHaveBeenCalled();
-    expect(open).not.toHaveBeenCalled();
-  });
-
-  it('enforces single child', async () => {
-    expect(() =>
-      render(
-        <GqlMockedProvider>
-          <HandoffLink path="/contacts">
-            <a>Link</a>
-            <a>Link</a>
-          </HandoffLink>
-        </GqlMockedProvider>,
-      ),
-    ).toThrow();
-  });
-
-  describe('SITE_URL set', () => {
-    const OLD_ENV = process.env;
-
-    beforeEach(() => {
-      jest.resetModules();
-      process.env = { ...OLD_ENV, SITE_URL: 'https://mpdx.org' };
-    });
-
-    afterAll(() => {
-      process.env = OLD_ENV;
-    });
-
-    it('changes base URL', () => {
-      const { getByRole } = render(
-        <GqlMockedProvider>
-          <HandoffLink path="/contacts">
-            <a>Link</a>
-          </HandoffLink>
-        </GqlMockedProvider>,
-      );
-      expect(getByRole('link', { hidden: true, name: 'Link' })).toHaveAttribute(
-        'href',
-        `https://${rewriteDomain}/contacts`,
-      );
-      expect(getByRole('link', { hidden: true, name: 'Link' })).toHaveAttribute(
-        'target',
-        `_blank`,
-      );
-    });
-
-    it('default auth', async () => {
-      const { getByRole } = render(
-        <GqlMockedProvider>
-          <HandoffLink path="/contacts" auth>
-            <a>Link</a>
-          </HandoffLink>
-        </GqlMockedProvider>,
-      );
-      expect(getByRole('link', { hidden: true, name: 'Link' })).toHaveAttribute(
-        'href',
-        `https://auth.${rewriteDomain}/contacts`,
-      );
-    });
-  });
-});
diff --git a/src/components/HandoffLink/HandoffLink.tsx b/src/components/HandoffLink/HandoffLink.tsx
deleted file mode 100644
index 458f8a89f..000000000
--- a/src/components/HandoffLink/HandoffLink.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { Children, ReactElement, ReactNode, cloneElement } from 'react';
-import { useAccountListId } from '../../hooks/useAccountListId';
-import { useUserPreferenceContext } from '../User/Preferences/UserPreferenceProvider';
-
-interface Props {
-  path: string;
-  auth?: boolean;
-  children: ReactNode;
-}
-
-const HandoffLink = ({ path, auth, children }: Props): ReactElement => {
-  const accountListId = useAccountListId();
-  const { userId } = useUserPreferenceContext();
-
-  const url = new URL(
-    `${process.env.SITE_URL || window.location.origin}/api/handoff`,
-  );
-
-  if (auth) {
-    url.searchParams.append('auth', 'true');
-  } else {
-    url.searchParams.append('accountListId', accountListId ?? '');
-    url.searchParams.append('userId', userId ?? '');
-  }
-  url.searchParams.append('path', path);
-
-  const child = Children.only(children) as ReactElement;
-
-  const childProps = {
-    href: `https://${auth ? 'auth.' : ''}${process.env.REWRITE_DOMAIN + path}`,
-    target: '_blank',
-    onClick: (e: React.MouseEvent) => {
-      if (child.props && typeof child.props.onClick === 'function') {
-        child.props.onClick(e);
-      }
-      if (!e.defaultPrevented) {
-        window.open(url.href, '_blank');
-        e.preventDefault();
-      }
-    },
-  };
-
-  return cloneElement(child, childProps);
-};
-
-export default HandoffLink;
diff --git a/src/components/HandoffLink/index.tsx b/src/components/HandoffLink/index.tsx
deleted file mode 100644
index d7af9b77c..000000000
--- a/src/components/HandoffLink/index.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import HandoffLink from './HandoffLink';
-
-export default HandoffLink;
diff --git a/src/components/Helpjuice/Helpjuice.test.tsx b/src/components/Helpjuice/Helpjuice.test.tsx
new file mode 100644
index 000000000..de879aa1c
--- /dev/null
+++ b/src/components/Helpjuice/Helpjuice.test.tsx
@@ -0,0 +1,100 @@
+import { act, render } from '@testing-library/react';
+import { useSession } from 'next-auth/react';
+import { session } from '__tests__/fixtures/session';
+import { Helpjuice } from './Helpjuice';
+
+describe('Helpjuice', () => {
+  beforeEach(() => {
+    process.env.HELPJUICE_ORIGIN = 'https://domain.helpjuice.com';
+    process.env.HELPJUICE_KNOWLEDGE_BASE_URL =
+      'https://domain.helpjuice.com/kb';
+    document.body.innerHTML =
+      '<a id="helpjuice-contact-link">Contact Us</a><a class="knowledge-base-link">Visit Knowledge Base</a>';
+    location.href = 'https://example.com/';
+  });
+
+  it('does nothing if the element is missing', () => {
+    document.body.innerHTML = '';
+
+    render(<Helpjuice />);
+
+    expect(
+      document.getElementById('helpjuice-contact-link'),
+    ).not.toBeInTheDocument();
+  });
+
+  it('does nothing if the $HELPJUICE_ORIGIN environment variable is missing', () => {
+    process.env.HELPJUICE_ORIGIN = '';
+
+    render(<Helpjuice />);
+
+    expect(document.getElementById('helpjuice-contact-link')).toHaveProperty(
+      'href',
+      '',
+    );
+  });
+
+  it('updates the contact link', () => {
+    const { rerender } = render(<Helpjuice />);
+
+    expect(document.getElementById('helpjuice-contact-link')).toHaveProperty(
+      'href',
+      'https://domain.helpjuice.com/contact-us?mpdxName=First+Last&mpdxEmail=first.last%40cru.org&mpdxUrl=https%3A%2F%2Fexample.com%2F',
+    );
+
+    // Update the session
+    (useSession as jest.MockedFn<typeof useSession>).mockReturnValue({
+      data: {
+        ...session,
+        user: {
+          ...session.user,
+          name: 'John Doe',
+          email: 'john.doe@cru.org',
+        },
+      },
+      status: 'authenticated',
+      update: () => Promise.resolve(null),
+    });
+    rerender(<Helpjuice />);
+
+    expect(document.getElementById('helpjuice-contact-link')).toHaveProperty(
+      'href',
+      'https://domain.helpjuice.com/contact-us?mpdxName=John+Doe&mpdxEmail=john.doe%40cru.org&mpdxUrl=https%3A%2F%2Fexample.com%2F',
+    );
+
+    // Update the URL
+    location.href = 'https://example.com/page';
+    act(() => {
+      window.dispatchEvent(new PopStateEvent('popstate'));
+    });
+
+    expect(document.getElementById('helpjuice-contact-link')).toHaveProperty(
+      'href',
+      'https://domain.helpjuice.com/contact-us?mpdxName=John+Doe&mpdxEmail=john.doe%40cru.org&mpdxUrl=https%3A%2F%2Fexample.com%2Fpage',
+    );
+  });
+
+  it('omits the user data if the session is missing', () => {
+    (useSession as jest.MockedFn<typeof useSession>).mockReturnValue({
+      data: null,
+      status: 'loading',
+      update: () => Promise.resolve(null),
+    });
+
+    render(<Helpjuice />);
+
+    expect(document.getElementById('helpjuice-contact-link')).toHaveProperty(
+      'href',
+      'https://domain.helpjuice.com/contact-us?mpdxUrl=https%3A%2F%2Fexample.com%2F',
+    );
+  });
+
+  it('updates the knowledge base link', () => {
+    render(<Helpjuice />);
+
+    expect(document.querySelector('a.knowledge-base-link')).toHaveProperty(
+      'href',
+      'https://domain.helpjuice.com/kb',
+    );
+  });
+});
diff --git a/src/components/Helpjuice/Helpjuice.tsx b/src/components/Helpjuice/Helpjuice.tsx
new file mode 100644
index 000000000..b21663242
--- /dev/null
+++ b/src/components/Helpjuice/Helpjuice.tsx
@@ -0,0 +1,40 @@
+import { useEffect } from 'react';
+import { useSession } from 'next-auth/react';
+import { useLocation } from './useLocation';
+
+export const Helpjuice: React.FC = () => {
+  // Because of the way the Helpjuice script is written, it must be added in _document.page.tsx instead of a component.
+  // It adds content to the DOM in response to the DOMContentLoaded. If we add the Swifty script to this component, the
+  // DOMContentLoaded event has already fired, and Swifty will not add the beacon elements to the page.
+  const { data: session } = useSession();
+  const href = useLocation();
+
+  useEffect(() => {
+    if (!process.env.HELPJUICE_ORIGIN) {
+      return;
+    }
+
+    // Add some extra information about the current user and page to the contact us Helpjuice link. Out custom JS on the
+    // Helpjuice page will extract this data from the URL and use it to pre-populate the contact form.
+    const contactLink = document.getElementById('helpjuice-contact-link');
+    if (contactLink instanceof HTMLAnchorElement) {
+      const url = new URL(`${process.env.HELPJUICE_ORIGIN}/contact-us`);
+      if (session) {
+        url.searchParams.set('mpdxName', session.user.name);
+        url.searchParams.set('mpdxEmail', session.user.email);
+      }
+      url.searchParams.set('mpdxUrl', window.location.href);
+      contactLink.href = url.toString();
+    }
+
+    const knowledgeBaseLink = document.querySelector('a.knowledge-base-link');
+    if (
+      process.env.HELPJUICE_KNOWLEDGE_BASE_URL &&
+      knowledgeBaseLink instanceof HTMLAnchorElement
+    ) {
+      knowledgeBaseLink.href = process.env.HELPJUICE_KNOWLEDGE_BASE_URL;
+    }
+  }, [session, href]);
+
+  return null;
+};
diff --git a/src/components/Helpjuice/useLocation.test.ts b/src/components/Helpjuice/useLocation.test.ts
new file mode 100644
index 000000000..0faee43f5
--- /dev/null
+++ b/src/components/Helpjuice/useLocation.test.ts
@@ -0,0 +1,53 @@
+import { act, renderHook } from '@testing-library/react-hooks';
+import { useLocation } from './useLocation';
+
+describe('useLocation', () => {
+  beforeEach(() => {
+    location.href = 'https://example.com';
+  });
+
+  it('should return the current location.href initially', () => {
+    const { result } = renderHook(useLocation);
+
+    expect(result.current).toBe('https://example.com');
+  });
+
+  it('should update href when location.href changes due to popstate event', () => {
+    const { result } = renderHook(useLocation);
+
+    act(() => {
+      location.href = 'https://example.com/page1';
+      window.dispatchEvent(new PopStateEvent('popstate'));
+    });
+
+    expect(result.current).toBe('https://example.com/page1');
+  });
+
+  it('should update href when location.href changes due to hashchange event', () => {
+    const { result } = renderHook(useLocation);
+
+    act(() => {
+      location.href = 'https://example.com#section';
+      window.dispatchEvent(new HashChangeEvent('hashchange'));
+    });
+
+    expect(result.current).toBe('https://example.com#section');
+  });
+
+  it('should remove event listeners on unmount', () => {
+    const { unmount } = renderHook(useLocation);
+
+    const removeEventListenerSpy = jest.spyOn(window, 'removeEventListener');
+
+    unmount();
+
+    expect(removeEventListenerSpy).toHaveBeenCalledWith(
+      'popstate',
+      expect.any(Function),
+    );
+    expect(removeEventListenerSpy).toHaveBeenCalledWith(
+      'hashchange',
+      expect.any(Function),
+    );
+  });
+});
diff --git a/src/components/Helpjuice/useLocation.ts b/src/components/Helpjuice/useLocation.ts
new file mode 100644
index 000000000..283e45ae0
--- /dev/null
+++ b/src/components/Helpjuice/useLocation.ts
@@ -0,0 +1,24 @@
+import { useEffect, useState } from 'react';
+
+// This hook returns the current value of location.href
+export const useLocation = () => {
+  const [href, setHref] = useState(
+    typeof location !== 'undefined' ? location.href : '',
+  );
+
+  useEffect(() => {
+    const handleLocationChange = () => {
+      setHref(location.href);
+    };
+
+    window.addEventListener('popstate', handleLocationChange);
+    window.addEventListener('hashchange', handleLocationChange);
+
+    return () => {
+      window.removeEventListener('popstate', handleLocationChange);
+      window.removeEventListener('hashchange', handleLocationChange);
+    };
+  }, []);
+
+  return href;
+};
diff --git a/src/components/Helpscout/HelpscoutBeacon.test.tsx b/src/components/Helpscout/HelpscoutBeacon.test.tsx
deleted file mode 100644
index 45ff67e08..000000000
--- a/src/components/Helpscout/HelpscoutBeacon.test.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import { render, waitFor } from '@testing-library/react';
-import { GqlMockedProvider } from '__tests__/util/graphqlMocking';
-import { identifyUser } from 'src/lib/helpScout';
-import { GetUserQuery } from '../User/GetUser.generated';
-import HelpscoutBeacon from './HelpscoutBeacon';
-
-jest.mock('src/lib/helpScout', () => ({
-  callBeacon: jest.fn(),
-  destroy: jest.fn(),
-  initBeacon: jest.fn(),
-  identifyUser: jest.fn(),
-}));
-
-describe('HelpscoutBeacon', () => {
-  it('identifies the current user', async () => {
-    render(
-      <GqlMockedProvider<{ GetUser: GetUserQuery }>
-        mocks={{
-          GetUser: {
-            user: {
-              id: 'user-1',
-              firstName: 'First',
-              lastName: 'Last',
-              keyAccounts: [
-                {
-                  email: 'first.last@cru.org',
-                },
-              ],
-            },
-          },
-        }}
-      >
-        <HelpscoutBeacon />
-      </GqlMockedProvider>,
-    );
-
-    await waitFor(() =>
-      expect(identifyUser).toHaveBeenCalledWith(
-        'user-1',
-        'first.last@cru.org',
-        'First Last',
-      ),
-    );
-  });
-});
diff --git a/src/components/Helpscout/HelpscoutBeacon.tsx b/src/components/Helpscout/HelpscoutBeacon.tsx
deleted file mode 100644
index b57794c81..000000000
--- a/src/components/Helpscout/HelpscoutBeacon.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import Script from 'next/script';
-import { useEffect } from 'react';
-import { useSession } from 'next-auth/react';
-import { callBeacon, identifyUser, initBeacon } from 'src/lib/helpScout';
-
-const HelpscoutBeacon: React.FC = () => {
-  const { data: session } = useSession();
-
-  useEffect(() => {
-    initBeacon();
-
-    return () => {
-      callBeacon('destroy');
-    };
-  }, []);
-
-  const user = session?.user;
-  useEffect(() => {
-    if (user) {
-      identifyUser(user.userID, user.email, user.name);
-    }
-  }, [user]);
-
-  return <Script src="https://beacon-v2.helpscout.net" strategy="lazyOnload" />;
-};
-
-export default HelpscoutBeacon;
diff --git a/src/components/Layouts/Primary/NavBar/NavBar.tsx b/src/components/Layouts/Primary/NavBar/NavBar.tsx
index 9a9a9d2b2..22de7cc78 100644
--- a/src/components/Layouts/Primary/NavBar/NavBar.tsx
+++ b/src/components/Layouts/Primary/NavBar/NavBar.tsx
@@ -5,12 +5,12 @@ import type { FC } from 'react';
 import { Box, Drawer, Hidden, List, Theme, useMediaQuery } from '@mui/material';
 import { useTranslation } from 'react-i18next';
 import { makeStyles } from 'tss-react/mui';
+import { useLoadCoachingListQuery } from 'src/components/Coaching/LoadCoachingList.generated';
 import { useSetupContext } from 'src/components/Setup/SetupProvider';
 import { reportNavItems } from 'src/components/Shared/MultiPageLayout/MultiPageMenu/MultiPageMenuItems';
 import { ToolsListNav } from 'src/components/Tool/Home/ToolsListNav';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import { LogoLink } from '../LogoLink/LogoLink';
-import { toolsRedirectLinks } from '../TopBar/Items/NavMenu/NavMenu';
 import { NavItem } from './NavItem/NavItem';
 import { NavTools } from './NavTools/NavTools';
 
@@ -117,6 +117,9 @@ export const NavBar: FC<NavBarProps> = ({ onMobileClose, openMobile }) => {
   const { pathname } = useRouter();
   const { t } = useTranslation();
   const { onSetupTour } = useSetupContext();
+  const { data } = useLoadCoachingListQuery();
+
+  const coachingAccountCount = data?.coachingAccountLists.totalCount;
 
   const sections: Section[] = [
     {
@@ -144,17 +147,17 @@ export const NavBar: FC<NavBarProps> = ({ onMobileClose, openMobile }) => {
       items: ToolsListNav.flatMap((toolsGroup) =>
         toolsGroup.items.map((tool) => ({
           title: tool.tool,
-          href: `https://${process.env.REWRITE_DOMAIN}/tools/${
-            toolsRedirectLinks[tool.id]
-          }`,
+          href: `/accountLists/${accountListId}/tools/${tool.url}`,
         })),
       ),
     },
-    {
-      title: t('Coaches'),
-      href: `/accountLists/${accountListId}/coaching`,
-    },
   ];
+  if (coachingAccountCount) {
+    sections.push({
+      title: t('Coaching'),
+      href: `/accountLists/${accountListId}/coaching`,
+    });
+  }
 
   const drawerHidden = useMediaQuery<Theme>((theme) =>
     theme.breakpoints.up('md'),
diff --git a/src/components/Layouts/Primary/NavBar/NavItem/NavItem.tsx b/src/components/Layouts/Primary/NavBar/NavItem/NavItem.tsx
index cb87c501a..64844a07b 100644
--- a/src/components/Layouts/Primary/NavBar/NavItem/NavItem.tsx
+++ b/src/components/Layouts/Primary/NavBar/NavItem/NavItem.tsx
@@ -6,7 +6,6 @@ import ExpandLessIcon from '@mui/icons-material/ExpandLess';
 import { Button, Collapse, ListItemButton, MenuItem } from '@mui/material';
 import { styled, useTheme } from '@mui/material/styles';
 import { useTranslation } from 'react-i18next';
-import HandoffLink from 'src/components/HandoffLink';
 import { LeafListItem, Title } from '../StyledComponents';
 
 interface NavItemProps {
@@ -99,21 +98,12 @@ export const NavItem: FC<NavItemProps> = ({
 
   return (
     <LeafListItem disableGutters key={title} {...rest}>
-      {(href as string).includes('tools') ? (
-        <HandoffLink key={title} path={href as string}>
-          <MenuItem style={style}>
-            {Icon && <Icon style={iconStyle} size="20" />}
-            <Title>{title}</Title>
-          </MenuItem>
-        </HandoffLink>
-      ) : (
-        <NextLink href={href} passHref>
-          <MenuItem component="a" style={style}>
-            {Icon && <Icon style={iconStyle} size="20" />}
-            <Title>{title}</Title>
-          </MenuItem>
-        </NextLink>
-      )}
+      <NextLink href={href} passHref>
+        <MenuItem component="a" style={style}>
+          {Icon && <Icon style={iconStyle} size="20" />}
+          <Title>{title}</Title>
+        </MenuItem>
+      </NextLink>
     </LeafListItem>
   );
 };
diff --git a/src/components/Layouts/Primary/NavBar/NavTools/ProfileMenuPanel/ProfileMenuPanel.test.tsx b/src/components/Layouts/Primary/NavBar/NavTools/ProfileMenuPanel/ProfileMenuPanel.test.tsx
index fd389df5c..c30bc0547 100644
--- a/src/components/Layouts/Primary/NavBar/NavTools/ProfileMenuPanel/ProfileMenuPanel.test.tsx
+++ b/src/components/Layouts/Primary/NavBar/NavTools/ProfileMenuPanel/ProfileMenuPanel.test.tsx
@@ -33,6 +33,10 @@ const TestComponent: React.FC<TestComponentProps> = ({ onSetupTour }) => (
 );
 
 describe('ProfileMenuPanelForNavBar', () => {
+  beforeAll(() => {
+    process.env.OAUTH_URL = 'https://auth.mpdx.org';
+  });
+
   it('default', () => {
     const { getByTestId } = render(<TestComponent />);
 
diff --git a/src/components/Layouts/Primary/NavBar/NavTools/ProfileMenuPanel/ProfileMenuPanel.tsx b/src/components/Layouts/Primary/NavBar/NavTools/ProfileMenuPanel/ProfileMenuPanel.tsx
index 7fc34f428..f97432268 100644
--- a/src/components/Layouts/Primary/NavBar/NavTools/ProfileMenuPanel/ProfileMenuPanel.tsx
+++ b/src/components/Layouts/Primary/NavBar/NavTools/ProfileMenuPanel/ProfileMenuPanel.tsx
@@ -7,6 +7,7 @@ import { Box, Button, Drawer, List } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import { signOut } from 'next-auth/react';
 import { useTranslation } from 'react-i18next';
+import { OauthLink } from 'src/components/OauthLink/OauthLink';
 import { useSetupContext } from 'src/components/Setup/SetupProvider';
 import {
   PrivacyPolicyLink,
@@ -16,7 +17,6 @@ import { NextLinkComposed } from 'src/components/common/Links/NextLinkComposed';
 import { clearDataDogUser } from 'src/lib/dataDog';
 import { useAccountListId } from '../../../../../../hooks/useAccountListId';
 import theme from '../../../../../../theme';
-import HandoffLink from '../../../../../HandoffLink';
 import { useGetTopBarQuery } from '../../../TopBar/GetTopBar.generated';
 import { LeafListItem, Title } from '../../StyledComponents';
 
@@ -199,20 +199,20 @@ export const ProfileMenuPanel: React.FC = () => {
           )}
           {data?.user?.developer && (
             <LeafListItem disableGutters>
-              <HandoffLink path="/auth/user/admin" auth>
+              <OauthLink path="/auth/user/admin">
                 <StyledButton>
                   <Title>{t('Backend Admin')}</Title>
                 </StyledButton>
-              </HandoffLink>
+              </OauthLink>
             </LeafListItem>
           )}
           {data?.user?.developer && (
             <LeafListItem disableGutters>
-              <HandoffLink path="/auth/user/sidekiq" auth>
+              <OauthLink path="/auth/user/sidekiq">
                 <StyledButton>
                   <Title>{t('Sidekiq')}</Title>
                 </StyledButton>
-              </HandoffLink>
+              </OauthLink>
             </LeafListItem>
           )}
         </>
diff --git a/src/components/Layouts/Primary/Primary.test.tsx b/src/components/Layouts/Primary/Primary.test.tsx
index 22b4a89e7..1f87f79ec 100644
--- a/src/components/Layouts/Primary/Primary.test.tsx
+++ b/src/components/Layouts/Primary/Primary.test.tsx
@@ -1,7 +1,7 @@
-import * as nextRouter from 'next/router';
 import React from 'react';
 import { ThemeProvider } from '@mui/material/styles';
 import { render } from '@testing-library/react';
+import TestRouter from '__tests__/util/TestRouter';
 import TestWrapper from '__tests__/util/TestWrapper';
 import matchMediaMock from '__tests__/util/matchMediaMock';
 import { SetupProvider } from 'src/components/Setup/SetupProvider';
@@ -10,30 +10,28 @@ import { getNotificationsMocks } from './TopBar/Items/NotificationMenu/Notificat
 import { getTopBarMock } from './TopBar/TopBar.mock';
 import Primary from '.';
 
+const router = {
+  query: { accountListId: 'accountListId' },
+  isReady: true,
+};
+
 describe('Primary', () => {
-  const useRouter = jest.spyOn(nextRouter, 'useRouter');
   const mocks = [...getNotificationsMocks(), getTopBarMock()];
   beforeEach(() => {
     matchMediaMock({ width: '1024px' });
-    (
-      useRouter as jest.SpyInstance<
-        Pick<nextRouter.NextRouter, 'query' | 'isReady'>
-      >
-    ).mockImplementation(() => ({
-      query: { accountListId: 'accountListId' },
-      isReady: true,
-    }));
   });
 
   it('has correct defaults', () => {
     const { getByTestId } = render(
       <ThemeProvider theme={theme}>
         <TestWrapper mocks={mocks}>
-          <SetupProvider>
-            <Primary>
-              <div data-testid="PrimaryTestChildren"></div>
-            </Primary>
-          </SetupProvider>
+          <TestRouter router={router}>
+            <SetupProvider>
+              <Primary>
+                <div data-testid="PrimaryTestChildren"></div>
+              </Primary>
+            </SetupProvider>
+          </TestRouter>
         </TestWrapper>
       </ThemeProvider>,
     );
diff --git a/src/components/Layouts/Primary/TopBar/GetTopBar.graphql b/src/components/Layouts/Primary/TopBar/GetTopBar.graphql
index bc51bece7..916aefbf7 100644
--- a/src/components/Layouts/Primary/TopBar/GetTopBar.graphql
+++ b/src/components/Layouts/Primary/TopBar/GetTopBar.graphql
@@ -10,6 +10,7 @@ query GetTopBar {
     id
     firstName
     lastName
+    avatar
     admin
     developer
     defaultAccountList
diff --git a/src/components/Layouts/Primary/TopBar/Items/NavMenu/NavMenu.test.tsx b/src/components/Layouts/Primary/TopBar/Items/NavMenu/NavMenu.test.tsx
index 4149d930e..2f4b62e2c 100644
--- a/src/components/Layouts/Primary/TopBar/Items/NavMenu/NavMenu.test.tsx
+++ b/src/components/Layouts/Primary/TopBar/Items/NavMenu/NavMenu.test.tsx
@@ -4,6 +4,7 @@ import userEvent from '@testing-library/user-event';
 import TestRouter from '__tests__/util/TestRouter';
 import { GqlMockedProvider } from '__tests__/util/graphqlMocking';
 import { render, waitFor } from '__tests__/util/testingLibraryReactMock';
+import { LoadCoachingListQuery } from 'src/components/Coaching/LoadCoachingList.generated';
 import theme from 'src/theme';
 import { GetToolNotificationsQuery } from './GetToolNotifcations.generated';
 import NavMenu from './NavMenu';
@@ -27,11 +28,19 @@ const routerAppeals = {
 };
 
 describe('NavMenu', () => {
-  it('default', () => {
-    const { getByRole, getByTestId } = render(
+  it('default', async () => {
+    const { getByRole, getByTestId, findByRole } = render(
       <ThemeProvider theme={theme}>
         <TestRouter router={router}>
-          <GqlMockedProvider>
+          <GqlMockedProvider<{ LoadCoachingList: LoadCoachingListQuery }>
+            mocks={{
+              LoadCoachingList: {
+                coachingAccountLists: {
+                  totalCount: 1,
+                },
+              },
+            }}
+          >
             <NavMenu />
           </GqlMockedProvider>
         </TestRouter>
@@ -49,9 +58,7 @@ describe('NavMenu', () => {
     expect(
       getByRole('menuitem', { hidden: true, name: 'Tools' }),
     ).toBeInTheDocument();
-    expect(
-      getByRole('menuitem', { hidden: true, name: 'Coaches' }),
-    ).toBeInTheDocument();
+
     userEvent.click(getByTestId('ReportMenuToggle'));
     expect(
       getByRole('menuitem', { hidden: true, name: 'Donations' }),
@@ -151,6 +158,35 @@ describe('NavMenu', () => {
       getByRole('menuitem', { hidden: true, name: 'Coaching' }),
     ).not.toBeVisible();
     expect(getByTestId('appeals-false')).toBeInTheDocument();
+    expect(
+      await findByRole('menuitem', { hidden: true, name: 'Coaching' }),
+    ).toBeInTheDocument();
+  });
+
+  it('does not show coaching link if there are no coaching accounts', async () => {
+    const { queryByRole } = render(
+      <ThemeProvider theme={theme}>
+        <TestRouter router={router}>
+          <GqlMockedProvider<{ LoadCoachingList: LoadCoachingListQuery }>
+            mocks={{
+              LoadCoachingList: {
+                coachingAccountLists: {
+                  totalCount: 0,
+                  nodes: [],
+                },
+              },
+            }}
+          >
+            <NavMenu />
+          </GqlMockedProvider>
+        </TestRouter>
+      </ThemeProvider>,
+    );
+    await waitFor(() =>
+      expect(
+        queryByRole('menuitem', { hidden: true, name: 'Coaching' }),
+      ).not.toBeInTheDocument(),
+    );
   });
 
   it('hidden', () => {
@@ -267,7 +303,7 @@ describe('NavMenu', () => {
     expect(getByTestId('fixCommitmentInfo-notifications')).toBeInTheDocument();
   });
 
-  it('test notifications > 10', async () => {
+  it('test notifications > 99', async () => {
     const { getByTestId } = render(
       <ThemeProvider theme={theme}>
         <TestRouter router={router}>
@@ -277,16 +313,16 @@ describe('NavMenu', () => {
             mocks={{
               GetToolNotifications: {
                 contacts: {
-                  totalCount: 3,
+                  totalCount: 30,
                 },
                 people: {
-                  totalCount: 3,
+                  totalCount: 30,
                 },
                 contactDuplicates: {
-                  totalCount: 3,
+                  totalCount: 130,
                 },
                 personDuplicates: {
-                  totalCount: 3,
+                  totalCount: 30,
                 },
               },
             }}
@@ -300,6 +336,8 @@ describe('NavMenu', () => {
     await waitFor(() =>
       expect(getByTestId('notificationTotal')).toBeInTheDocument(),
     );
-    expect(getByTestId('notificationTotalText')).toHaveTextContent('9+');
+    expect(getByTestId('notificationTotalText')).toHaveTextContent('99+');
+    userEvent.click(getByTestId('ToolsMenuToggle'));
+    expect(getByTestId('mergeContacts-notifications')).toHaveTextContent('99+');
   });
 });
diff --git a/src/components/Layouts/Primary/TopBar/Items/NavMenu/NavMenu.tsx b/src/components/Layouts/Primary/TopBar/Items/NavMenu/NavMenu.tsx
index 4a26701a3..f70885dd4 100644
--- a/src/components/Layouts/Primary/TopBar/Items/NavMenu/NavMenu.tsx
+++ b/src/components/Layouts/Primary/TopBar/Items/NavMenu/NavMenu.tsx
@@ -18,7 +18,7 @@ import {
 import clsx from 'clsx';
 import { useTranslation } from 'react-i18next';
 import { makeStyles } from 'tss-react/mui';
-import HandoffLink from 'src/components/HandoffLink';
+import { useLoadCoachingListQuery } from 'src/components/Coaching/LoadCoachingList.generated';
 import { reportNavItems } from 'src/components/Shared/MultiPageLayout/MultiPageMenu/MultiPageMenuItems';
 import { useAccountListId } from '../../../../../../hooks/useAccountListId';
 import { useCurrentToolId } from '../../../../../../hooks/useCurrentToolId';
@@ -62,13 +62,19 @@ const useStyles = makeStyles()(() => ({
   },
   notificationBox: {
     backgroundColor: theme.palette.progressBarYellow.main,
-    paddingLeft: theme.spacing(1),
-    paddingRight: theme.spacing(1),
-    borderRadius: '25%',
+    borderRadius: '10px',
     display: 'flex',
     justifyContent: 'center',
     alignItems: 'center',
-    marginLeft: theme.spacing(2),
+    marginLeft: theme.spacing(1),
+    '&>.MuiTypography-root': {
+      fontSize: '12px',
+      whiteSpace: 'nowrap',
+      fontWeight: '700',
+      lineHeight: 1,
+      minWidth: '10px',
+      padding: '3px 7px',
+    },
   },
   darkText: {
     color: theme.palette.cruGrayDark.main,
@@ -77,6 +83,7 @@ const useStyles = makeStyles()(() => ({
     color: 'white',
   },
   menuItem: {
+    paddingInline: '10px',
     '&:focus-visible, &:hover, &[aria-current=page]': {
       backgroundColor: theme.palette.cruGrayMedium.main,
       backgroundBlendMode: 'multiply',
@@ -94,20 +101,6 @@ export enum ToolName {
   MergePeople = 'mergePeople',
 }
 
-export const toolsRedirectLinks: { [key: string]: string } = {
-  appeals: 'appeals',
-  fixCommitmentInfo: 'fix/commitment-info',
-  fixEmailAddresses: 'fix/email-addresses',
-  fixPhoneNumbers: 'fix/phone-numbers',
-  fixSendNewsletter: 'fix/send-newsletter',
-  fixMailingAddresses: 'fix/addresses',
-  mergePeople: 'merge/people',
-  mergeContacts: 'merge/contacts',
-  google: 'import/google',
-  tntConnect: 'import/tnt',
-  csv: 'import/csv/upload',
-};
-
 const NavMenu: React.FC = () => {
   const { t } = useTranslation();
   const accountListId = useAccountListId();
@@ -117,6 +110,9 @@ const NavMenu: React.FC = () => {
     variables: { accountListId: accountListId ?? '' },
     skip: !accountListId,
   });
+  const { data: coachingData } = useLoadCoachingListQuery();
+
+  const coachingAccounts = coachingData?.coachingAccountLists;
 
   const toolData: { [key: string]: { totalCount: number } } = {
     [ToolName.FixCommitmentInfo]: data?.[ToolName.FixCommitmentInfo] ?? {
@@ -171,7 +167,8 @@ const NavMenu: React.FC = () => {
   const handleToolsMenuClose = () => {
     setToolsMenuOpen(false);
   };
-  const router = useRouter();
+  const { pathname } = useRouter();
+
   return accountListId ? (
     <Grid container item alignItems="center" xs="auto">
       <Grid item className={classes.navListItem}>
@@ -181,7 +178,7 @@ const NavMenu: React.FC = () => {
             tabIndex={0}
             className={classes.menuItem}
             aria-current={
-              router.asPath === `/accountLists/${accountListId}` && 'page'
+              pathname === '/accountLists/[accountListId]' ? 'page' : undefined
             }
           >
             <ListItemText primary={t('Dashboard')} />
@@ -194,7 +191,12 @@ const NavMenu: React.FC = () => {
             component="a"
             tabIndex={0}
             className={classes.menuItem}
-            aria-current={router.asPath?.includes('contacts') && 'page'}
+            aria-current={
+              pathname ===
+              '/accountLists/[accountListId]/contacts/[[...contactId]]'
+                ? 'page'
+                : undefined
+            }
           >
             <ListItemText primary={t('Contacts')} />
           </MenuItem>
@@ -206,7 +208,12 @@ const NavMenu: React.FC = () => {
             component="a"
             tabIndex={0}
             className={classes.menuItem}
-            aria-current={router.asPath?.includes('tasks') && 'page'}
+            aria-current={
+              pathname ===
+              '/accountLists/[accountListId]/tasks/[[...contactId]]'
+                ? 'page'
+                : undefined
+            }
           >
             <ListItemText primary={t('Tasks')} />
           </MenuItem>
@@ -224,7 +231,8 @@ const NavMenu: React.FC = () => {
           className={clsx(
             classes.menuItem,
             reportsMenuOpen && classes.menuItemSelected,
-            router.asPath?.includes('reports') && classes.menuItemSelected,
+            pathname.startsWith('/accountLists/[accountListId]/reports') &&
+              classes.menuItemSelected,
           )}
         >
           <ListItemText primary={t('Reports')} />
@@ -263,7 +271,11 @@ const NavMenu: React.FC = () => {
                           onClick={handleReportsMenuClose}
                           tabIndex={0}
                           aria-current={
-                            router.asPath.includes(`${id}`) && 'page'
+                            pathname.startsWith(
+                              `/accountLists/[accountListId]/reports/${id}`,
+                            )
+                              ? 'page'
+                              : undefined
                           }
                         >
                           <ListItemText primary={t(title)} />
@@ -288,7 +300,8 @@ const NavMenu: React.FC = () => {
           className={clsx(
             classes.menuItem,
             toolsMenuOpen && classes.menuItemSelected,
-            router.asPath?.includes('tools') && classes.menuItemSelected,
+            pathname.startsWith('/accountLists/[accountListId]/tools') &&
+              classes.menuItemSelected,
           )}
           aria-expanded={toolsMenuOpen}
         >
@@ -299,7 +312,7 @@ const NavMenu: React.FC = () => {
               data-testid="notificationTotal"
             >
               <Typography data-testid="notificationTotalText">
-                {sum < 10 ? sum : '9+'}
+                {sum < 100 ? sum : '99+'}
               </Typography>
             </Box>
           )}
@@ -334,24 +347,24 @@ const NavMenu: React.FC = () => {
                             ? toolData[tool.id]?.totalCount > 0
                             : false;
                           return (
-                            <HandoffLink
+                            <NextLink
                               key={tool.id}
-                              path={`https://${
-                                process.env.REWRITE_DOMAIN
-                              }/tools/${toolsRedirectLinks[tool.id]}`}
+                              href={`/accountLists/${accountListId}/tools/${tool.url}`}
+                              passHref
                             >
-                              {/* When switching to pointing tools at this app we need to add these attributes
-                                href={`/accountLists/${accountListId}/tools/${tool.id}`}
-                                component="a"
-                              */}
                               <MenuItem
+                                component="a"
                                 tabIndex={0}
                                 onClick={handleToolsMenuClose}
                                 data-testid={`${tool.id}-${
                                   currentToolId === tool.id
                                 }`}
                                 aria-current={
-                                  router.asPath.includes(tool.url) && 'page'
+                                  pathname.startsWith(
+                                    `/accountLists/[accountListId]/tools/${tool.url}`,
+                                  )
+                                    ? 'page'
+                                    : undefined
                                 }
                                 className={clsx(
                                   classes.menuItem,
@@ -382,14 +395,14 @@ const NavMenu: React.FC = () => {
                                     data-testid={`${tool.id}-notifications`}
                                   >
                                     <Typography>
-                                      {toolData[tool.id].totalCount < 10
+                                      {toolData[tool.id].totalCount < 100
                                         ? toolData[tool.id].totalCount
-                                        : '9+'}
+                                        : '99+'}
                                     </Typography>
                                   </Box>
                                 )}
                               </MenuItem>
-                            </HandoffLink>
+                            </NextLink>
                           );
                         })}
                       </Box>
@@ -401,18 +414,25 @@ const NavMenu: React.FC = () => {
           )}
         </Popper>
       </Grid>
-      <Grid item className={classes.navListItem}>
-        <NextLink href={`/accountLists/${accountListId}/coaching`} passHref>
-          <MenuItem
-            component="a"
-            tabIndex={0}
-            className={classes.menuItem}
-            aria-current={router.asPath?.includes(`/coaching`) && 'page'}
-          >
-            <ListItemText primary={t('Coaches')} />
-          </MenuItem>
-        </NextLink>
-      </Grid>
+
+      {!!coachingAccounts?.totalCount && (
+        <Grid item className={classes.navListItem}>
+          <NextLink href={`/accountLists/${accountListId}/coaching`} passHref>
+            <MenuItem
+              component="a"
+              tabIndex={0}
+              className={classes.menuItem}
+              aria-current={
+                pathname === '/accountLists/[accountListId]/coaching'
+                  ? 'page'
+                  : undefined
+              }
+            >
+              <ListItemText primary={t('Coaching')} />
+            </MenuItem>
+          </NextLink>
+        </Grid>
+      )}
     </Grid>
   ) : null;
 };
diff --git a/src/components/Layouts/Primary/TopBar/Items/NotificationMenu/Item/Item.tsx b/src/components/Layouts/Primary/TopBar/Items/NotificationMenu/Item/Item.tsx
index 4723f0633..5c1615414 100644
--- a/src/components/Layouts/Primary/TopBar/Items/NotificationMenu/Item/Item.tsx
+++ b/src/components/Layouts/Primary/TopBar/Items/NotificationMenu/Item/Item.tsx
@@ -33,6 +33,7 @@ interface Props {
   last?: boolean;
   previousItem?: GetNotificationsQuery['userNotifications']['nodes'][0];
   onClick?: () => void;
+  isInDrawer?: boolean;
 }
 
 const NotificationMenuItem = ({
@@ -40,6 +41,7 @@ const NotificationMenuItem = ({
   previousItem,
   last,
   onClick,
+  isInDrawer,
 }: Props): ReactElement => {
   const { t } = useTranslation();
   const locale = useLocale();
@@ -247,13 +249,10 @@ const NotificationMenuItem = ({
           </ListItemAvatar>
           <ListItemText
             primary={item.notification.contact.name}
+            primaryTypographyProps={{ color: isInDrawer ? 'white' : 'initial' }}
             secondary={
               <>
-                <Typography
-                  component="span"
-                  variant="body2"
-                  color="textPrimary"
-                >
+                <Typography component="span" variant="body2">
                   {dateFormat(
                     DateTime.fromISO(item.notification.occurredAt),
                     locale,
diff --git a/src/components/Layouts/Primary/TopBar/Items/NotificationMenu/NotificationMenu.tsx b/src/components/Layouts/Primary/TopBar/Items/NotificationMenu/NotificationMenu.tsx
index 0a523866b..938d14785 100644
--- a/src/components/Layouts/Primary/TopBar/Items/NotificationMenu/NotificationMenu.tsx
+++ b/src/components/Layouts/Primary/TopBar/Items/NotificationMenu/NotificationMenu.tsx
@@ -9,11 +9,11 @@ import {
   ListItem,
   ListSubheader,
   Menu,
-  Theme,
   Typography,
 } from '@mui/material';
 import { useTranslation } from 'react-i18next';
 import { makeStyles } from 'tss-react/mui';
+import theme from 'src/theme';
 import { useAccountListId } from '../../../../../../hooks/useAccountListId';
 import illustration13 from '../../../../../../images/drawkit/grape/drawkit-grape-pack-illustration-13.svg';
 import { useAcknowledgeAllUserNotificationsMutation } from './AcknowledgeAllUserNotifications.generated';
@@ -28,7 +28,7 @@ interface NotificationMenuProps {
   isInDrawer?: boolean;
 }
 
-const useStyles = makeStyles()((theme: Theme) => ({
+const useStyles = makeStyles()(() => ({
   link: {
     textTransform: 'none',
     color: 'rgba(255,255,255,0.75)',
@@ -63,6 +63,11 @@ const useStyles = makeStyles()((theme: Theme) => ({
     height: '150px',
     marginBottom: theme.spacing(2),
   },
+  customBadge: {
+    backgroundColor: theme.palette.progressBarYellow.main,
+    color: 'white',
+    fontWeight: '700',
+  },
 }));
 
 export const NotificationContent = ({
@@ -71,12 +76,14 @@ export const NotificationContent = ({
   onAcknowledgeAllClick,
   onClose,
   onFetchMore,
+  isInDrawer,
 }: {
   data: GetNotificationsQuery | undefined;
   loading: boolean;
   onAcknowledgeAllClick: () => void;
   onClose: () => void;
   onFetchMore: () => void;
+  isInDrawer?: boolean;
 }): ReactElement => {
   const { classes } = useStyles();
   const { t } = useTranslation();
@@ -110,6 +117,7 @@ export const NotificationContent = ({
           previousItem={nodes[index - 1]}
           last={index + 1 === nodes.length && !loading}
           onClick={onClose}
+          isInDrawer={isInDrawer}
         />
       ))}
       {!loading && data?.userNotifications?.pageInfo?.hasNextPage && (
@@ -221,6 +229,7 @@ const NotificationMenu = ({
         onAcknowledgeAllClick={handleAcknowledgeAllClick}
         onClose={handleClose}
         onFetchMore={handleFetchMore}
+        isInDrawer={true}
       />
     );
   }
@@ -235,7 +244,8 @@ const NotificationMenu = ({
       >
         <Badge
           badgeContent={data?.userNotifications?.unreadCount}
-          color="secondary"
+          classes={{ badge: classes.customBadge }}
+          max={99}
         >
           {data?.userNotifications?.unreadCount !== 0 ? (
             <NotificationsIcon />
diff --git a/src/components/Layouts/Primary/TopBar/Items/ProfileMenu/ProfileMenu.test.tsx b/src/components/Layouts/Primary/TopBar/Items/ProfileMenu/ProfileMenu.test.tsx
index d4abc718c..2e772cea1 100644
--- a/src/components/Layouts/Primary/TopBar/Items/ProfileMenu/ProfileMenu.test.tsx
+++ b/src/components/Layouts/Primary/TopBar/Items/ProfileMenu/ProfileMenu.test.tsx
@@ -65,7 +65,16 @@ const TestComponent: React.FC<TestComponentProps> = ({
   </ThemeProvider>
 );
 
+beforeAll(() => {
+  // Make the screen wide enough to show all data
+  global.innerWidth = 1200;
+});
+
 describe('ProfileMenu', () => {
+  beforeAll(() => {
+    process.env.OAUTH_URL = 'https://auth.mpdx.org';
+  });
+
   it('default', async () => {
     const { getByTestId, getByRole, getByText, findByText } = render(
       <TestComponent />,
@@ -158,6 +167,31 @@ describe('ProfileMenu', () => {
     expect(getByText('Staff Account')).toBeInTheDocument();
   });
 
+  it('should display avatar', async () => {
+    const { findByText, getByTestId } = render(
+      <TestComponent mocks={[getTopBarMockWithMultipleAccountLists()]} />,
+    );
+    expect(await findByText('John Smith')).toBeInTheDocument();
+    expect(getByTestId('AvatarInTopBar')).toBeInTheDocument();
+    userEvent.click(getByTestId('profileMenuButton'));
+    await waitFor(() => expect(getByTestId('profileMenu')).toBeInTheDocument());
+    expect(getByTestId('AvatarProfileImage')).toBeInTheDocument();
+  });
+
+  it('should display placeholder if there is no avatar', async () => {
+    const { findByText, getByTestId, queryByTestId } = render(
+      <TestComponent />,
+    );
+    expect(await findByText('John Smith')).toBeInTheDocument();
+    expect(getByTestId('AccountIconInTopBar')).toBeInTheDocument();
+    userEvent.click(getByTestId('profileMenuButton'));
+    await waitFor(() => expect(getByTestId('profileMenu')).toBeInTheDocument());
+    await waitFor(() =>
+      expect(queryByTestId('AvatarProfileImage')).not.toBeInTheDocument(),
+    );
+    expect(getByTestId('AvatarProfileLetter')).toBeInTheDocument();
+  });
+
   it('Ensure Sign Out is called with callback', async () => {
     const { findByText, getByTestId, getByText, queryByTestId } = render(
       <TestComponent router={routerNoAccountListId} />,
@@ -197,6 +231,8 @@ describe('ProfileMenu while Impersonating', () => {
   });
 
   beforeEach(() => {
+    process.env.OAUTH_URL = 'https://auth.mpdx.org';
+
     (useSession as jest.MockedFn<typeof useSession>).mockReturnValue({
       data: {
         ...session,
diff --git a/src/components/Layouts/Primary/TopBar/Items/ProfileMenu/ProfileMenu.tsx b/src/components/Layouts/Primary/TopBar/Items/ProfileMenu/ProfileMenu.tsx
index c7d34d7bb..1affe23d6 100644
--- a/src/components/Layouts/Primary/TopBar/Items/ProfileMenu/ProfileMenu.tsx
+++ b/src/components/Layouts/Primary/TopBar/Items/ProfileMenu/ProfileMenu.tsx
@@ -11,6 +11,7 @@ import {
   Box,
   Button,
   Divider,
+  Hidden,
   ListItemAvatar,
   ListItemText,
   Menu,
@@ -21,6 +22,7 @@ import { styled } from '@mui/material/styles';
 import { signOut } from 'next-auth/react';
 import { useSnackbar } from 'notistack';
 import { useTranslation } from 'react-i18next';
+import { OauthLink } from 'src/components/OauthLink/OauthLink';
 import { useSetupContext } from 'src/components/Setup/SetupProvider';
 import {
   PrivacyPolicyLink,
@@ -31,7 +33,6 @@ import { useRequiredSession } from 'src/hooks/useRequiredSession';
 import { clearDataDogUser } from 'src/lib/dataDog';
 import { useAccountListId } from '../../../../../../hooks/useAccountListId';
 import theme from '../../../../../../theme';
-import HandoffLink from '../../../../../HandoffLink';
 import { useGetTopBarQuery } from '../../GetTopBar.generated';
 import ProfileName from './ProfileName';
 
@@ -39,6 +40,9 @@ const AccountName = styled(Typography)(({ theme }) => ({
   color: theme.palette.common.white,
   margin: 0,
   padding: '0px 8px',
+  overflow: 'clip',
+  textOverflow: 'ellipsis',
+  whiteSpace: 'nowrap',
 }));
 
 const MenuItemAccount = styled(MenuItem)(() => ({
@@ -60,6 +64,13 @@ const MenuButton = styled(Button)(({ theme }) => ({
   color: theme.palette.cruGrayLight.main,
 }));
 
+const NameBox = styled(Box)(() => ({
+  display: 'block',
+  textAlign: 'left',
+  maxWidth: '250px',
+  maxHeight: '45px',
+}));
+
 const StyledMenuItem = styled(MenuItem)(({ theme }) => ({
   '&:hover': {
     backgroundColor: `${theme.palette.cruGrayMedium.main} !important`,
@@ -81,7 +92,7 @@ const AccountListSelectorDetails = styled(AccordionDetails)(({ theme }) => ({
   flexDirection: 'column',
   padding: 0,
   borderBottom: `1px solid ${theme.palette.cruGrayLight.main}`,
-  maxHeight: theme.spacing(24),
+  maxHeight: theme.spacing(44),
   overflow: 'auto',
   '& .MuiMenuItem-root': {
     minHeight: theme.spacing(6),
@@ -124,7 +135,7 @@ const ProfileMenu = (): ReactElement => {
   const { enqueueSnackbar } = useSnackbar();
   const { contactId: _, ...queryWithoutContactId } = router.query;
   const accountListId = useAccountListId();
-  const { data } = useGetTopBarQuery();
+  const { data, loading } = useGetTopBarQuery();
   const { onSetupTour } = useSetupContext();
   const [profileMenuAnchorEl, setProfileMenuAnchorEl] =
     useState<HTMLButtonElement>();
@@ -201,29 +212,33 @@ const ProfileMenu = (): ReactElement => {
         impersonating={!!session.impersonating}
         onProfileMenuOpen={handleProfileMenuOpen}
         showSubAccount={hasSelectedAccount}
+        avatar={data?.user.avatar || undefined}
+        loading={loading}
       >
         {data && (
-          <Box display="block" textAlign="left">
-            <AccountName>
-              {session.impersonating ? `Impersonating ` : ``}
-              {[data.user.firstName, data.user.lastName]
-                .filter(Boolean)
-                .join(' ')}
-            </AccountName>
-            {hasSelectedAccount && (
-              <AccountName
-                display="block"
-                variant="body2"
-                data-testid="accountListName"
-              >
-                {
-                  data.accountLists.nodes.find(
-                    (accountList) => accountList.id === accountListId,
-                  )?.name
-                }
+          <Hidden lgDown>
+            <NameBox>
+              <AccountName>
+                {session.impersonating ? `Impersonating ` : ``}
+                {[data.user.firstName, data.user.lastName]
+                  .filter(Boolean)
+                  .join(' ')}
               </AccountName>
-            )}
-          </Box>
+              {hasSelectedAccount && (
+                <AccountName
+                  display="block"
+                  variant="body2"
+                  data-testid="accountListName"
+                >
+                  {
+                    data.accountLists.nodes.find(
+                      (accountList) => accountList.id === accountListId,
+                    )?.name
+                  }
+                </AccountName>
+              )}
+            </NameBox>
+          </Hidden>
         )}
       </ProfileName>
       <MenuWrapper
@@ -236,7 +251,16 @@ const ProfileMenu = (): ReactElement => {
         {data && (
           <MenuItemAccount>
             <ListItemAvatar>
-              <Avatar>{data.user.firstName?.[0]}</Avatar>
+              {data.user.avatar ? (
+                <Avatar
+                  src={data.user.avatar}
+                  data-testid="AvatarProfileImage"
+                />
+              ) : (
+                <Avatar data-testid="AvatarProfileLetter">
+                  {data.user.firstName?.[0]}
+                </Avatar>
+              )}
             </ListItemAvatar>
             <ListItemText
               primary={[data.user.firstName, data.user.lastName]
@@ -353,18 +377,18 @@ const ProfileMenu = (): ReactElement => {
               </NextLink>
             )}
             {data?.user?.developer && (
-              <HandoffLink path="/auth/user/admin" auth>
+              <OauthLink path="/auth/user/admin">
                 <MenuItem onClick={handleProfileMenuClose} component="a">
                   <ListItemText primary={t('Backend Admin')} />
                 </MenuItem>
-              </HandoffLink>
+              </OauthLink>
             )}
             {data?.user?.developer && (
-              <HandoffLink path="/auth/user/sidekiq" auth>
+              <OauthLink path="/auth/user/sidekiq">
                 <MenuItem onClick={handleProfileMenuClose} component="a">
                   <ListItemText primary={t('Sidekiq')} />
                 </MenuItem>
-              </HandoffLink>
+              </OauthLink>
             )}
           </div>
         )}
diff --git a/src/components/Layouts/Primary/TopBar/Items/ProfileMenu/ProfileName.tsx b/src/components/Layouts/Primary/TopBar/Items/ProfileMenu/ProfileName.tsx
index 4d0808611..383345aab 100644
--- a/src/components/Layouts/Primary/TopBar/Items/ProfileMenu/ProfileName.tsx
+++ b/src/components/Layouts/Primary/TopBar/Items/ProfileMenu/ProfileName.tsx
@@ -1,10 +1,16 @@
 import React, { ReactElement } from 'react';
 import AccountCircleIcon from '@mui/icons-material/AccountCircle';
-import { Box, IconButton } from '@mui/material';
+import { Avatar, Box, IconButton } from '@mui/material';
 import { styled } from '@mui/material/styles';
 
-const StyledAvatar = styled(AccountCircleIcon)(({ theme }) => ({
-  color: theme.palette.cruGrayMedium.main,
+const StyledAccountIcon = styled(AccountCircleIcon)(({ theme }) => ({
+  textTransform: 'none',
+  color: theme.palette.common.white,
+  opacity: '0.75',
+  transition: 'color 0.2s ease-in-out',
+  '&:hover': {
+    opacity: '1',
+  },
 }));
 
 const ImpersonatingBox = styled(Box)(() => ({
@@ -34,12 +40,16 @@ interface ProfileNameProps {
     event: React.MouseEvent<HTMLButtonElement, MouseEvent>,
   ) => void;
   children: React.ReactNode;
+  avatar?: string;
+  loading?: boolean;
 }
 
 const ProfileName = ({
   impersonating,
   showSubAccount,
   onProfileMenuOpen,
+  avatar,
+  loading,
   children,
 }: ProfileNameProps): ReactElement => {
   return (
@@ -59,7 +69,20 @@ const ProfileName = ({
       {!impersonating && (
         <IconButton onClick={onProfileMenuOpen} data-testid="profileMenuButton">
           <Box display="flex" alignItems="center" m={-1}>
-            <StyledAvatar />
+            <IconButton>
+              {loading || !avatar ? (
+                <StyledAccountIcon data-testid="AccountIconInTopBar" />
+              ) : (
+                <Avatar
+                  data-testid="AvatarInTopBar"
+                  src={avatar}
+                  sx={{
+                    width: 30,
+                    height: 30,
+                  }}
+                />
+              )}
+            </IconButton>
             {children}
           </Box>
         </IconButton>
diff --git a/src/components/Layouts/Primary/TopBar/TopBar.mock.tsx b/src/components/Layouts/Primary/TopBar/TopBar.mock.tsx
index 2abf2d3d8..763970933 100644
--- a/src/components/Layouts/Primary/TopBar/TopBar.mock.tsx
+++ b/src/components/Layouts/Primary/TopBar/TopBar.mock.tsx
@@ -10,6 +10,7 @@ export const getTopBarMock = (): MockedResponse => {
       id: 'user-1',
       firstName: 'John',
       lastName: 'Smith',
+      avatar: '',
       admin: true,
       developer: true,
       keyAccounts: [{ id: '1', email: 'john.smith@gmail.com' }],
@@ -41,6 +42,7 @@ export const getTopBarMockWithMultipleAccountLists = (): MockedResponse => {
       firstName: 'John',
       lastName: 'Smith',
       admin: true,
+      avatar: 'test',
       developer: true,
       keyAccounts: [{ id: '1', email: 'john.smith@gmail.com' }],
       administrativeOrganizations: {
@@ -70,6 +72,7 @@ export const getTopBarMultipleMock = (): MockedResponse => {
       id: 'user-1',
       firstName: 'John',
       lastName: 'Smith',
+      avatar: '',
       admin: false,
       developer: false,
       keyAccounts: [{ id: '1', email: 'john.smith@gmail.com' }],
@@ -96,6 +99,7 @@ export const getTopBarNoAccountListMock = (): MockedResponse => {
       id: 'user-5',
       firstName: 'John',
       lastName: 'Smith',
+      avatar: '',
       admin: false,
       developer: false,
       keyAccounts: [{ id: '5', email: 'john.smith@gmail.com' }],
diff --git a/src/components/Layouts/Primary/TopBar/TopBar.tsx b/src/components/Layouts/Primary/TopBar/TopBar.tsx
index f98f63b31..6a250a2ea 100644
--- a/src/components/Layouts/Primary/TopBar/TopBar.tsx
+++ b/src/components/Layouts/Primary/TopBar/TopBar.tsx
@@ -61,7 +61,7 @@ const TopBar = ({
             {onSetupTour && <Box flexGrow={1} />}
             {!onSetupTour && accountListId && (
               <>
-                <Box ml={10} flexGrow={1}>
+                <Box ml={2} flexGrow={1}>
                   <NavMenu />
                 </Box>
                 <SearchMenu />
@@ -69,7 +69,7 @@ const TopBar = ({
                 <NotificationMenu />
               </>
             )}
-            <Box ml={2}>
+            <Box ml={{ lg: 1, xl: 2 }}>
               <ProfileMenu />
             </Box>
           </Hidden>
diff --git a/src/components/OauthLink/OauthLink.test.tsx b/src/components/OauthLink/OauthLink.test.tsx
new file mode 100644
index 000000000..b39826e3f
--- /dev/null
+++ b/src/components/OauthLink/OauthLink.test.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { OauthLink } from './OauthLink';
+
+describe('OauthLink', () => {
+  const oauthDomain = 'https://auth.example.com';
+
+  beforeEach(() => {
+    process.env.OAUTH_URL = oauthDomain;
+  });
+
+  it('default', async () => {
+    const { getByRole } = render(
+      <OauthLink path="/contacts">
+        <a>Link</a>
+      </OauthLink>,
+    );
+    expect(getByRole('link', { name: 'Link' })).toHaveAttribute(
+      'href',
+      `${oauthDomain}/contacts?access_token=apiToken`,
+    );
+  });
+
+  it('enforces single child', async () => {
+    expect(() =>
+      render(
+        <OauthLink path="/contacts">
+          <a>Link</a>
+          <a>Link</a>
+        </OauthLink>,
+      ),
+    ).toThrow();
+  });
+});
diff --git a/src/components/OauthLink/OauthLink.tsx b/src/components/OauthLink/OauthLink.tsx
new file mode 100644
index 000000000..43a4db061
--- /dev/null
+++ b/src/components/OauthLink/OauthLink.tsx
@@ -0,0 +1,24 @@
+import { Children, ReactElement, ReactNode, cloneElement } from 'react';
+import { useRequiredSession } from 'src/hooks/useRequiredSession';
+
+interface OauthLinkProps {
+  path: string;
+  children: ReactNode;
+}
+
+export const OauthLink: React.FC<OauthLinkProps> = ({ path, children }) => {
+  const session = useRequiredSession();
+
+  const url = new URL(path, process.env.OAUTH_URL);
+  url.searchParams.append('access_token', session.apiToken);
+
+  const child = Children.only(children) as ReactElement;
+
+  const childProps = {
+    href: url.toString(),
+    target: '_blank',
+    ...child.props,
+  };
+
+  return cloneElement(child, childProps);
+};
diff --git a/src/components/Reports/AccountsListLayout/List/ListItem/ListItem.tsx b/src/components/Reports/AccountsListLayout/List/ListItem/ListItem.tsx
index 0fbd23a97..dcf6a2944 100644
--- a/src/components/Reports/AccountsListLayout/List/ListItem/ListItem.tsx
+++ b/src/components/Reports/AccountsListLayout/List/ListItem/ListItem.tsx
@@ -3,7 +3,6 @@ import {
   Box,
   Checkbox,
   Divider,
-  Link,
   ListItem,
   ListItemText,
   Typography,
@@ -12,7 +11,6 @@ import { styled } from '@mui/material/styles';
 import { Maybe } from 'graphql/jsutils/Maybe';
 import { DateTime } from 'luxon';
 import { useTranslation } from 'react-i18next';
-import HandoffLink from 'src/components/HandoffLink';
 import { EntryHistoriesQuery } from 'src/components/Reports/ResponsibilityCentersReport/GetEntryHistories.generated';
 import { useLocale } from 'src/hooks/useLocale';
 import { currencyFormat, dateFormat } from 'src/lib/intlFormat';
@@ -111,21 +109,16 @@ export const AccountListItem: FC<AccountListItemProps> = ({
                           : ''
                       }`}
                     </Typography>
-                    {hasFinancial && (
+
+                    {/* {hasFinancial && (
                       <Box display="flex">
-                        <HandoffLink
-                          path={`/reports/financial_accounts/${account.id}`}
-                        >
-                          <Link>Summary</Link>
-                        </HandoffLink>
+                        // Used to link to be a handoff link to /reports/financial_accounts/${account.id}
+                        <Link>Summary</Link>
                         {' · '}
-                        <HandoffLink
-                          path={`/reports/financial_accounts/${account.id}/entries`}
-                        >
-                          <Link>Transactions</Link>
-                        </HandoffLink>
+                        // Used to link to be a handoff link to /reports/financial_accounts/${account.id}/entries
+                        <Link>Transactions</Link>
                       </Box>
-                    )}
+                    )} */}
                   </Box>
                   <Typography>
                     {currencyFormat(
diff --git a/src/components/Reports/EmptyReport/EmptyReport.stories.tsx b/src/components/Reports/EmptyReport/EmptyReport.stories.tsx
index 6f455b301..b01fd1bc4 100644
--- a/src/components/Reports/EmptyReport/EmptyReport.stories.tsx
+++ b/src/components/Reports/EmptyReport/EmptyReport.stories.tsx
@@ -7,7 +7,7 @@ export default {
 
 export const Default = (): ReactElement => (
   <EmptyReport
-    title="You have received no donations in the last thirteen months"
+    title="You have received no donations in the last fourteen months"
     subTitle="You can setup an organization account to import them or add a new donation."
   />
 );
diff --git a/src/components/Reports/FourteenMonthReports/FourteenMonthReport.tsx b/src/components/Reports/FourteenMonthReports/FourteenMonthReport.tsx
index 5d06877af..9ff10ece4 100644
--- a/src/components/Reports/FourteenMonthReports/FourteenMonthReport.tsx
+++ b/src/components/Reports/FourteenMonthReports/FourteenMonthReport.tsx
@@ -135,7 +135,7 @@ export const FourteenMonthReport: React.FC<Props> = ({
       ) : (
         <EmptyReport
           title={t(
-            'You have received no donations in the last thirteen months',
+            'You have received no donations in the last fourteen months',
           )}
           subTitle={t(
             'You can setup an organization account to import them or add a new donation.',
diff --git a/src/components/Reports/ResponsibilityCentersReport/ResponsibilityCentersReport.tsx b/src/components/Reports/ResponsibilityCentersReport/ResponsibilityCentersReport.tsx
index 3f87eaa47..d3419400f 100644
--- a/src/components/Reports/ResponsibilityCentersReport/ResponsibilityCentersReport.tsx
+++ b/src/components/Reports/ResponsibilityCentersReport/ResponsibilityCentersReport.tsx
@@ -1,5 +1,11 @@
 import React, { useMemo } from 'react';
-import { Box, CircularProgress, Divider, Typography } from '@mui/material';
+import {
+  Alert,
+  Box,
+  CircularProgress,
+  Divider,
+  Typography,
+} from '@mui/material';
 import { styled } from '@mui/material/styles';
 import { useTranslation } from 'react-i18next';
 import { Notification } from 'src/components/Notification/Notification';
@@ -207,6 +213,11 @@ export const ResponsibilityCentersReport: React.FC<Props> = ({
         />
       ) : (
         <ScrollBox data-testid="ResponsibilityCentersScrollBox">
+          <Alert severity="warning">
+            {t(
+              'The Responsibility Centers page has some features that are not working. Developers are prioritizing this issue and it should be ready in the next few days. Please check back later.',
+            )}
+          </Alert>
           <Divider />
           {financialAccountsGroups?.map((financialAccountGroup) => {
             const accounts: Account[] =
diff --git a/src/components/Settings/integrations/Google/GoogleAccordion.test.tsx b/src/components/Settings/integrations/Google/GoogleAccordion.test.tsx
index eb6dec879..c3c074807 100644
--- a/src/components/Settings/integrations/Google/GoogleAccordion.test.tsx
+++ b/src/components/Settings/integrations/Google/GoogleAccordion.test.tsx
@@ -131,7 +131,6 @@ describe('GoogleAccordion', () => {
 
   describe('Connected', () => {
     let googleAccount = { ...standardGoogleAccount };
-    process.env.REWRITE_DOMAIN = 'stage.mpdx.org';
 
     beforeEach(() => {
       googleAccount = { ...standardGoogleAccount };
@@ -165,7 +164,7 @@ describe('GoogleAccordion', () => {
       userEvent.click(getByText(/import contacts/i));
       expect(getByText(/import contacts/i)).toHaveAttribute(
         'href',
-        `https://stage.mpdx.org/tools/import/google`,
+        '/accountLists/account-list-1/tools/import/google',
       );
 
       userEvent.click(getByTestId('EditIcon'));
diff --git a/src/components/Settings/integrations/Google/GoogleAccordion.tsx b/src/components/Settings/integrations/Google/GoogleAccordion.tsx
index 14e319988..79736a3fe 100644
--- a/src/components/Settings/integrations/Google/GoogleAccordion.tsx
+++ b/src/components/Settings/integrations/Google/GoogleAccordion.tsx
@@ -1,3 +1,4 @@
+import NextLink from 'next/link';
 import { useState } from 'react';
 import DeleteIcon from '@mui/icons-material/Delete';
 import EditIcon from '@mui/icons-material/Edit';
@@ -15,11 +16,11 @@ import {
 } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import { Trans, useTranslation } from 'react-i18next';
-import HandoffLink from 'src/components/HandoffLink';
 import { AccordionItem } from 'src/components/Shared/Forms/Accordions/AccordionItem';
 import { StyledFormLabel } from 'src/components/Shared/Forms/FieldHelper';
 import Modal from 'src/components/common/Modal/Modal';
 import { GoogleAccountAttributes } from 'src/graphql/types.generated';
+import { useAccountListId } from 'src/hooks/useAccountListId';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
 import theme from 'src/theme';
 import {
@@ -75,6 +76,7 @@ export const GoogleAccordion: React.FC<AccordionProps> = ({
   expandedPanel,
   disabled,
 }) => {
+  const accountListId = useAccountListId();
   const { t } = useTranslation();
   const [openEditGoogleAccount, setOpenEditGoogleAccount] = useState(false);
   const [openDeleteGoogleAccount, setOpenDeleteGoogleAccount] = useState(false);
@@ -210,14 +212,18 @@ export const GoogleAccordion: React.FC<AccordionProps> = ({
           </StyledServicesButton>
 
           {!!googleAccounts?.length && (
-            <HandoffLink path="/tools/import/google">
+            <NextLink
+              href={`/accountLists/${accountListId}/tools/import/google`}
+              passHref
+            >
               <StyledServicesButton
                 variant="outlined"
                 style={{ marginLeft: '15px' }}
+                component="a"
               >
                 {t('Import contacts')}
               </StyledServicesButton>
-            </HandoffLink>
+            </NextLink>
           )}
         </Box>
       </AccordionItem>
diff --git a/src/components/Settings/integrations/Organization/ConnectOrganization.tsx b/src/components/Settings/integrations/Organization/ConnectOrganization.tsx
index 9fd85eb42..0e35c40c2 100644
--- a/src/components/Settings/integrations/Organization/ConnectOrganization.tsx
+++ b/src/components/Settings/integrations/Organization/ConnectOrganization.tsx
@@ -17,7 +17,7 @@ import { useTranslation } from 'react-i18next';
 import { FieldWrapper } from 'src/components/Shared/Forms/FieldWrapper';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
 import { clearDataDogUser } from 'src/lib/dataDog';
-import { articles, showArticle } from 'src/lib/helpScout';
+import { articles } from 'src/lib/helpjuice';
 import theme from 'src/theme';
 import { useOauthUrl } from '../useOauthUrl';
 import {
@@ -127,10 +127,6 @@ export const ConnectOrganization: React.FC<ConnectOrganizationProps> = ({
     onDone();
   };
 
-  const showOrganizationHelp = () => {
-    showArticle('HS_SETUP_FIND_ORGANIZATION');
-  };
-
   return (
     <Formik
       initialValues={{
@@ -178,11 +174,15 @@ export const ConnectOrganization: React.FC<ConnectOrganizationProps> = ({
                 <TextField {...params} label={t('Organization')} />
               )}
             />
-            {!selectedOrganization && !!articles.HS_SETUP_FIND_ORGANIZATION && (
-              <Button onClick={showOrganizationHelp}>
-                {t("Can't find your organization?")}
-              </Button>
-            )}
+            {!selectedOrganization &&
+              articles.HELP_URL_SETUP_FIND_ORGANIZATION && (
+                <Button
+                  href={articles.HELP_URL_SETUP_FIND_ORGANIZATION}
+                  target="_blank"
+                >
+                  {t("Can't find your organization?")}
+                </Button>
+              )}
             {organizationType === OrganizationTypesEnum.MINISTRY && (
               <WarningBox>
                 <Typography
diff --git a/src/components/Settings/integrations/integrationsHelper.ts b/src/components/Settings/integrations/integrationsHelper.ts
index 7a5b135d3..0a0503c41 100644
--- a/src/components/Settings/integrations/integrationsHelper.ts
+++ b/src/components/Settings/integrations/integrationsHelper.ts
@@ -12,7 +12,7 @@ export const StyledList = styled(List)(({ theme }) => ({
 
 export const StyledServicesButton = styled(Button)(({ theme }) => ({
   marginTop: theme.spacing(2),
-}));
+})) as typeof Button; // Type cast so that component="a" works
 
 export interface AccordionProps {
   handleAccordionChange: (panel: string) => void;
diff --git a/src/components/Settings/preferences/accordions/EarlyAdopterAccordion/EarlyAdopterAccordion.test.tsx b/src/components/Settings/preferences/accordions/EarlyAdopterAccordion/EarlyAdopterAccordion.test.tsx
index f75386da6..eb327b3fb 100644
--- a/src/components/Settings/preferences/accordions/EarlyAdopterAccordion/EarlyAdopterAccordion.test.tsx
+++ b/src/components/Settings/preferences/accordions/EarlyAdopterAccordion/EarlyAdopterAccordion.test.tsx
@@ -35,13 +35,12 @@ interface ComponentsProps {
   tester: boolean;
   expandedPanel: string;
 }
-const userId = 'userID123';
 const Components: React.FC<ComponentsProps> = ({ tester, expandedPanel }) => (
   <SnackbarProvider>
     <TestRouter router={router}>
       <ThemeProvider theme={theme}>
         <GqlMockedProvider onCall={mutationSpy}>
-          <UserPreferenceContext.Provider value={{ userId, locale: 'en-US' }}>
+          <UserPreferenceContext.Provider value={{ locale: 'en-US' }}>
             <EarlyAdopterAccordion
               handleAccordionChange={handleAccordionChange}
               expandedPanel={expandedPanel}
@@ -126,12 +125,7 @@ describe('EarlyAdopterAccordion', () => {
   });
 
   describe('onSubmit()', () => {
-    beforeEach(() => {
-      process.env.SITE_URL = 'https://mpdx.org';
-      window.location.href = process.env.SITE_URL;
-    });
-
-    it('sets early adopter to true and does not redirect user', async () => {
+    it('sets early adopter to true', async () => {
       const { getByRole } = render(
         <Components tester={false} expandedPanel={label} />,
       );
@@ -144,11 +138,9 @@ describe('EarlyAdopterAccordion', () => {
           variant: 'success',
         }),
       );
-
-      expect(window.location.href).toEqual(process.env.SITE_URL);
     });
 
-    it('sets early adopter to false and redirects user to old MPDx', async () => {
+    it('sets early adopter to false', async () => {
       const { getByRole } = render(
         <Components tester={true} expandedPanel={label} />,
       );
@@ -161,10 +153,6 @@ describe('EarlyAdopterAccordion', () => {
           variant: 'success',
         }),
       );
-
-      expect(window.location.href).toEqual(
-        `${process.env.SITE_URL}/api/handoff?accountListId=${accountListId}&userId=${userId}&path=%2Fpreferences%2Fpersonal`,
-      );
     });
   });
 });
diff --git a/src/components/Settings/preferences/accordions/EarlyAdopterAccordion/EarlyAdopterAccordion.tsx b/src/components/Settings/preferences/accordions/EarlyAdopterAccordion/EarlyAdopterAccordion.tsx
index f65e02d16..89f3721df 100644
--- a/src/components/Settings/preferences/accordions/EarlyAdopterAccordion/EarlyAdopterAccordion.tsx
+++ b/src/components/Settings/preferences/accordions/EarlyAdopterAccordion/EarlyAdopterAccordion.tsx
@@ -7,7 +7,6 @@ import * as yup from 'yup';
 import { AccordionItem } from 'src/components/Shared/Forms/Accordions/AccordionItem';
 import { FieldWrapper } from 'src/components/Shared/Forms/FieldWrapper';
 import { FormWrapper } from 'src/components/Shared/Forms/FormWrapper';
-import { useUserPreferenceContext } from 'src/components/User/Preferences/UserPreferenceProvider';
 import { AccountListSettingsInput } from 'src/graphql/types.generated';
 import useGetAppSettings from 'src/hooks/useGetAppSettings';
 import { useUpdateAccountPreferencesMutation } from '../UpdateAccountPreferences.generated';
@@ -34,7 +33,6 @@ export const EarlyAdopterAccordion: React.FC<EarlyAdopterAccordionProps> = ({
   disabled,
 }) => {
   const { t } = useTranslation();
-  const { userId } = useUserPreferenceContext();
   const { appName } = useGetAppSettings();
   const { enqueueSnackbar } = useSnackbar();
   const [updateAccountPreferences] = useUpdateAccountPreferencesMutation();
@@ -58,24 +56,6 @@ export const EarlyAdopterAccordion: React.FC<EarlyAdopterAccordionProps> = ({
           variant: 'success',
         });
         handleAccordionChange(label);
-
-        if (!attributes.tester) {
-          enqueueSnackbar(
-            t('Redirecting you back to the old MPDx application.'),
-            {
-              variant: 'success',
-            },
-          );
-
-          const url = new URL(
-            `${process.env.SITE_URL || window.location.origin}/api/handoff`,
-          );
-          url.searchParams.append('accountListId', accountListId ?? '');
-          url.searchParams.append('userId', userId ?? '');
-          url.searchParams.append('path', '/preferences/personal');
-
-          window.location.href = url.toString();
-        }
       },
       onError: () => {
         enqueueSnackbar(t('Saving failed.'), {
diff --git a/src/components/Shared/Header/ListHeader.test.tsx b/src/components/Shared/Header/ListHeader.test.tsx
index 377a263bb..aca6712c6 100644
--- a/src/components/Shared/Header/ListHeader.test.tsx
+++ b/src/components/Shared/Header/ListHeader.test.tsx
@@ -10,7 +10,6 @@ import {
   ContactFilterSetInput,
   TaskFilterSetInput,
 } from 'src/graphql/types.generated';
-import { useAccountListId } from 'src/hooks/useAccountListId';
 import i18n from 'src/lib/i18n';
 import theme from '../../../theme';
 import { TasksMassActionsDropdown } from '../MassActions/TasksMassActionsDropdown';
@@ -112,10 +111,6 @@ const router = {
   push,
 };
 
-beforeEach(() => {
-  (useAccountListId as jest.Mock).mockReturnValue(router);
-});
-
 const ButtonGroup: React.FC = () => {
   return (
     <>
@@ -473,3 +468,29 @@ describe('ListHeader', () => {
     expect(queryByText('Actions')).not.toBeInTheDocument();
   });
 });
+
+describe('Counts', () => {
+  it('Should update count upon deletion', async () => {
+    const { queryByText, getByText } = render(
+      <Components
+        selectedIds={['a', 'b', 'c']}
+        page={PageEnum.Task}
+        totalItems={50}
+        showShowingCount={true}
+      />,
+    );
+    expect(queryByText('Showing 50')).toBeInTheDocument();
+    expect(queryByText('3 Selected')).toBeInTheDocument();
+    const actionsButton = getByText('Actions');
+    userEvent.click(actionsButton);
+    expect(getByText('Delete Tasks')).toBeInTheDocument();
+    userEvent.click(getByText('Delete Tasks'));
+    await waitFor(() => {
+      expect(
+        queryByText('Are you sure you wish to delete the 3 selected tasks?'),
+      ).toBeInTheDocument();
+    });
+    userEvent.click(getByText('Yes'));
+    expect(queryByText('Showing 50')).toBeInTheDocument();
+  });
+});
diff --git a/src/components/Shared/Links/Links.tsx b/src/components/Shared/Links/Links.tsx
index f4a705db9..93d79f527 100644
--- a/src/components/Shared/Links/Links.tsx
+++ b/src/components/Shared/Links/Links.tsx
@@ -5,7 +5,12 @@ export const PrivacyPolicyLink: React.FC<LinkProps> = (props) => {
   const { t } = useTranslation();
 
   return (
-    <Link href={process.env.PRIVACY_POLICY_URL} target="_blank" {...props}>
+    <Link
+      href={process.env.PRIVACY_POLICY_URL}
+      target="_blank"
+      underline="hover"
+      {...props}
+    >
       {t('Privacy Policy')}
     </Link>
   );
@@ -15,7 +20,12 @@ export const TermsOfUseLink: React.FC<LinkProps> = (props) => {
   const { t } = useTranslation();
 
   return (
-    <Link href={process.env.TERMS_OF_USE_URL} target="_blank" {...props}>
+    <Link
+      href={process.env.TERMS_OF_USE_URL}
+      target="_blank"
+      underline="hover"
+      {...props}
+    >
       {t('Terms of Use')}
     </Link>
   );
diff --git a/src/components/Shared/MultiPageLayout/MultiPageMenu/Item/Item.tsx b/src/components/Shared/MultiPageLayout/MultiPageMenu/Item/Item.tsx
index 43ba47b7c..8ef51381d 100644
--- a/src/components/Shared/MultiPageLayout/MultiPageMenu/Item/Item.tsx
+++ b/src/components/Shared/MultiPageLayout/MultiPageMenu/Item/Item.tsx
@@ -3,7 +3,7 @@ import React, { useMemo, useState } from 'react';
 import ArrowForwardIos from '@mui/icons-material/ArrowForwardIos';
 import { Collapse, ListItem, ListItemText } from '@mui/material';
 import { useTranslation } from 'react-i18next';
-import HandoffLink from 'src/components/HandoffLink';
+import { OauthLink } from 'src/components/OauthLink/OauthLink';
 import { useAccountListId } from 'src/hooks/useAccountListId';
 import theme from 'src/theme';
 import { NavTypeEnum } from '../MultiPageMenu';
@@ -72,12 +72,8 @@ export const Item: React.FC<Props> = ({
 
   return (
     <>
-      {item.handoff && (
-        <HandoffLink path={item.id} auth={item.handoffAuth}>
-          {children}
-        </HandoffLink>
-      )}
-      {!item.handoff && (
+      {item.oauth && <OauthLink path={item.id}>{children}</OauthLink>}
+      {!item.oauth && (
         <NextLink
           href={`/accountLists/${accountListId}/${navType}/${item.id}`}
           scroll={false}
diff --git a/src/components/Shared/MultiPageLayout/MultiPageMenu/MultiPageMenu.test.tsx b/src/components/Shared/MultiPageLayout/MultiPageMenu/MultiPageMenu.test.tsx
index 4f917f84e..6236f116d 100644
--- a/src/components/Shared/MultiPageLayout/MultiPageMenu/MultiPageMenu.test.tsx
+++ b/src/components/Shared/MultiPageLayout/MultiPageMenu/MultiPageMenu.test.tsx
@@ -36,6 +36,10 @@ const hasOrganizationsAccessMock = {
 };
 
 describe('MultiPageMenu', () => {
+  beforeAll(() => {
+    process.env.OAUTH_URL = 'https://auth.mpdx.org';
+  });
+
   it('default', async () => {
     const { getByText } = render(
       <ThemeProvider theme={theme}>
diff --git a/src/components/Shared/MultiPageLayout/MultiPageMenu/MultiPageMenuItems.ts b/src/components/Shared/MultiPageLayout/MultiPageMenu/MultiPageMenuItems.ts
index 0def0a209..eff89f729 100644
--- a/src/components/Shared/MultiPageLayout/MultiPageMenu/MultiPageMenuItems.ts
+++ b/src/components/Shared/MultiPageLayout/MultiPageMenu/MultiPageMenuItems.ts
@@ -4,8 +4,7 @@ export type NavItems = {
   subTitle?: string;
   grantedAccess?: string[];
   subItems?: NavItems[];
-  handoff?: boolean;
-  handoffAuth?: boolean;
+  oauth?: boolean;
 };
 
 export const reportNavItems: NavItems[] = [
@@ -96,15 +95,13 @@ export const settingsNavItems: NavItems[] = [
   {
     id: '/auth/user/admin',
     title: 'Backend Admin',
-    handoff: true,
-    handoffAuth: true,
+    oauth: true,
     grantedAccess: ['developer'],
   },
   {
     id: '/auth/user/sidekiq',
     title: 'Sidekiq',
-    handoff: true,
-    handoffAuth: true,
+    oauth: true,
     grantedAccess: ['developer'],
   },
 ];
diff --git a/src/components/Task/MassActions/EditTasks/MassActionsEditTasksModal.test.tsx b/src/components/Task/MassActions/EditTasks/MassActionsEditTasksModal.test.tsx
index e490c7877..0b0b30f76 100644
--- a/src/components/Task/MassActions/EditTasks/MassActionsEditTasksModal.test.tsx
+++ b/src/components/Task/MassActions/EditTasks/MassActionsEditTasksModal.test.tsx
@@ -65,4 +65,25 @@ describe('MassActionsEditTasksModal', () => {
     });
     expect(handleClose).toHaveBeenCalled();
   });
+  it('displays warning message', async () => {
+    const handleClose = jest.fn();
+    const mutationSpy = jest.fn();
+    const { getByText } = render(
+      <LocalizationProvider dateAdapter={AdapterLuxon}>
+        <ThemeProvider theme={theme}>
+          <SnackbarProvider>
+            <GqlMockedProvider onCall={mutationSpy}>
+              <MassActionsEditTasksModal
+                accountListId={accountListId}
+                ids={['task-1', 'task-2']}
+                selectedIdCount={2}
+                handleClose={handleClose}
+              />
+            </GqlMockedProvider>
+          </SnackbarProvider>
+        </ThemeProvider>
+      </LocalizationProvider>,
+    );
+    expect(getByText('Blank fields will not be affected!')).toBeInTheDocument();
+  });
 });
diff --git a/src/components/Task/MassActions/EditTasks/MassActionsEditTasksModal.tsx b/src/components/Task/MassActions/EditTasks/MassActionsEditTasksModal.tsx
index a9757c719..73fde4e5b 100644
--- a/src/components/Task/MassActions/EditTasks/MassActionsEditTasksModal.tsx
+++ b/src/components/Task/MassActions/EditTasks/MassActionsEditTasksModal.tsx
@@ -1,5 +1,6 @@
 import React, { ReactElement } from 'react';
 import {
+  Alert,
   Checkbox,
   DialogActions,
   DialogContent,
@@ -105,6 +106,9 @@ export const MassActionsEditTasksModal: React.FC<
 
   return (
     <Modal title={t('Edit Fields')} isOpen={true} handleClose={handleClose}>
+      <Alert severity="warning" style={{ justifyContent: 'center' }}>
+        Blank fields will not be affected!
+      </Alert>
       <Formik<Attributes>
         initialValues={{
           subject: '',
diff --git a/src/components/Task/TaskRow/TaskRow.tsx b/src/components/Task/TaskRow/TaskRow.tsx
index 878653373..1819f8591 100644
--- a/src/components/Task/TaskRow/TaskRow.tsx
+++ b/src/components/Task/TaskRow/TaskRow.tsx
@@ -66,6 +66,7 @@ interface TaskRowProps {
   onContactSelected: (taskId: string) => void;
   onTaskCheckToggle: (taskId: string) => void;
   useTopMargin?: boolean;
+  removeSelectedIds?: (id: string[]) => void;
 }
 
 export const TaskRow: React.FC<TaskRowProps> = ({
@@ -75,6 +76,7 @@ export const TaskRow: React.FC<TaskRowProps> = ({
   onContactSelected,
   onTaskCheckToggle,
   useTopMargin,
+  removeSelectedIds,
 }) => {
   const { t } = useTranslation();
 
@@ -166,6 +168,7 @@ export const TaskRow: React.FC<TaskRowProps> = ({
             <Box padding="checkbox">
               <Checkbox
                 checked={isChecked}
+                data-testid={`task-checkbox-${taskId}`}
                 color="secondary"
                 onClick={(event) => event.stopPropagation()}
                 onChange={() => onTaskCheckToggle(taskId)}
@@ -269,6 +272,7 @@ export const TaskRow: React.FC<TaskRowProps> = ({
               <DeleteTaskIconButton
                 accountListId={accountListId}
                 taskId={taskId}
+                removeSelectedIds={removeSelectedIds}
               />
             </Box>
             <Box onClick={(e) => e.stopPropagation()}>
diff --git a/src/components/Tool/Home/Tool.test.tsx b/src/components/Tool/Home/Tool.test.tsx
index a3347a48c..782937a50 100644
--- a/src/components/Tool/Home/Tool.test.tsx
+++ b/src/components/Tool/Home/Tool.test.tsx
@@ -66,11 +66,11 @@ describe('Tool', () => {
     );
   });
 
-  it('renders count with over 9', () => {
+  it('renders count with over 99', () => {
     const { queryByText, getByTestId } = render(
-      <TestComponent totalCount={10} />,
+      <TestComponent totalCount={100} />,
     );
-    expect(queryByText('9+')).toBeInTheDocument();
+    expect(queryByText('99+')).toBeInTheDocument();
     expect(getByTestId('fixCommitmentInfo-icon')).toBeInTheDocument();
     expect(getByTestId('fixCommitmentInfo-icon')).toHaveStyle(
       'background-color: rgb(249, 182, 37)',
diff --git a/src/components/Tool/Home/Tool.tsx b/src/components/Tool/Home/Tool.tsx
index c7bc078ad..adf72b4ca 100644
--- a/src/components/Tool/Home/Tool.tsx
+++ b/src/components/Tool/Home/Tool.tsx
@@ -99,13 +99,8 @@ const Tool = ({
               <Badge
                 classes={{ badge: classes.customBadge }}
                 overlap="circular"
-                badgeContent={
-                  !loading && needsAttention
-                    ? totalCount < 10
-                      ? totalCount
-                      : '9+'
-                    : 0
-                }
+                badgeContent={!loading && needsAttention ? totalCount : 0}
+                max={99}
                 data-testid={`${toolId}-notifications`}
                 color="secondary"
               >
diff --git a/src/components/Tool/Home/ToolsHome.test.tsx b/src/components/Tool/Home/ToolsHome.test.tsx
index 22210a729..f382c75e0 100644
--- a/src/components/Tool/Home/ToolsHome.test.tsx
+++ b/src/components/Tool/Home/ToolsHome.test.tsx
@@ -17,7 +17,7 @@ const mocks = {
     contacts: { totalCount: 2 },
     people: { totalCount: 4 },
     contactDuplicates: { totalCount: 6 },
-    personDuplicates: { totalCount: 10 },
+    personDuplicates: { totalCount: 100 },
   },
 };
 
@@ -67,7 +67,7 @@ describe('ToolHome', () => {
     const contactDuplicates = await findAllByText('6');
     expect(contactDuplicates).toHaveLength(1);
 
-    const personDuplicates = await findAllByText('9+');
+    const personDuplicates = await findAllByText('99+');
     expect(personDuplicates).toHaveLength(1);
   });
 
diff --git a/src/components/User/Preferences/UserPreferenceProvider.test.tsx b/src/components/User/Preferences/UserPreferenceProvider.test.tsx
index a903ecd95..95c633a0b 100644
--- a/src/components/User/Preferences/UserPreferenceProvider.test.tsx
+++ b/src/components/User/Preferences/UserPreferenceProvider.test.tsx
@@ -2,23 +2,14 @@ import { render } from '@testing-library/react';
 import { GqlMockedProvider } from '__tests__/util/graphqlMocking';
 import { useLocale } from 'src/hooks/useLocale';
 import { GetUserQuery } from '../GetUser.generated';
-import {
-  UserPreferenceProvider,
-  useUserPreferenceContext,
-} from './UserPreferenceProvider';
+import { UserPreferenceProvider } from './UserPreferenceProvider';
 
 const userId = 'userID123';
 
 const Consumer: React.FC = () => {
   const locale = useLocale();
-  const { userId } = useUserPreferenceContext();
 
-  return (
-    <>
-      <p>User ID: {userId}</p>
-      <p>Locale: {locale}</p>
-    </>
-  );
+  return <p>Locale: {locale}</p>;
 };
 
 describe('UserPreferenceProvider', () => {
@@ -54,12 +45,8 @@ describe('UserPreferenceProvider', () => {
 
     // Initial default locale
     expect(getByText('Locale: en-US')).toBeInTheDocument();
-    expect(getByText(`User ID:`)).toBeInTheDocument();
 
     // Locale loaded from query
     expect(await findByText('Locale: es')).toBeInTheDocument();
-
-    // Locale loaded from query
-    expect(await findByText(`User ID: ${userId}`)).toBeInTheDocument();
   });
 });
diff --git a/src/components/User/Preferences/UserPreferenceProvider.tsx b/src/components/User/Preferences/UserPreferenceProvider.tsx
index 1d343772b..4d7925fe9 100644
--- a/src/components/User/Preferences/UserPreferenceProvider.tsx
+++ b/src/components/User/Preferences/UserPreferenceProvider.tsx
@@ -5,12 +5,10 @@ import { useGetUserQuery } from '../GetUser.generated';
 export type UserPreferenceType = {
   defaultCurrency?: string;
   locale: string;
-  userId: string;
 };
 
 export const UserPreferenceContext = createContext<UserPreferenceType>({
   locale: 'en-US',
-  userId: '',
 });
 
 export const useUserPreferenceContext = (): UserPreferenceType =>
@@ -34,7 +32,6 @@ export const UserPreferenceProvider: React.FC<Props> = ({ children }) => {
     <UserPreferenceContext.Provider
       value={{
         locale,
-        userId: data?.user.id ?? '',
       }}
     >
       {children}
diff --git a/src/components/Welcome/Welcome.tsx b/src/components/Welcome/Welcome.tsx
index 2872481cb..a0a7ae502 100644
--- a/src/components/Welcome/Welcome.tsx
+++ b/src/components/Welcome/Welcome.tsx
@@ -26,13 +26,13 @@ const useStyles = makeStyles()((theme: Theme) => ({
     minHeight: '100vh',
     minWidth: '100vw',
     backgroundColor: theme.palette.mpdxBlue.main,
+    '.MuiTypography-root': {
+      color: theme.palette.common.white,
+    },
   },
   subtitle: {
     maxWidth: '450px',
   },
-  whiteText: {
-    color: theme.palette.common.white,
-  },
 }));
 
 const variants = {
@@ -78,7 +78,6 @@ const Welcome = ({
                     data-testid="welcomeTitle"
                     variant="h4"
                     component="h1"
-                    className={classes.whiteText}
                   >
                     {title}
                   </Typography>
@@ -89,10 +88,7 @@ const Welcome = ({
               <motion.div variants={divVariants}>
                 {typeof subtitle === 'string' ? (
                   <Box my={3} className={classes.subtitle}>
-                    <Typography
-                      data-testid="welcomeSubtitle"
-                      className={classes.whiteText}
-                    >
+                    <Typography data-testid="welcomeSubtitle">
                       {subtitle}
                     </Typography>
                   </Box>
diff --git a/src/components/common/DateTimePickers/DateTimeFieldPair.test.tsx b/src/components/common/DateTimePickers/DateTimeFieldPair.test.tsx
index da1d6a009..367a45543 100644
--- a/src/components/common/DateTimePickers/DateTimeFieldPair.test.tsx
+++ b/src/components/common/DateTimePickers/DateTimeFieldPair.test.tsx
@@ -16,7 +16,7 @@ const onChange = jest.fn();
 const TestComponent: React.FC<TestComponentProps> = ({
   value = DateTime.local(2024, 1, 2, 3, 4, 5),
 }) => (
-  <UserPreferenceContext.Provider value={{ locale: 'en-US', userId: 'userId' }}>
+  <UserPreferenceContext.Provider value={{ locale: 'en-US' }}>
     <LocalizationProvider dateAdapter={AdapterLuxon} adapterLocale="en-US">
       <DateTimeFieldPair
         value={value}
diff --git a/src/components/common/DateTimePickers/DesktopDateField.test.tsx b/src/components/common/DateTimePickers/DesktopDateField.test.tsx
index ba9dbcd55..56ac175a9 100644
--- a/src/components/common/DateTimePickers/DesktopDateField.test.tsx
+++ b/src/components/common/DateTimePickers/DesktopDateField.test.tsx
@@ -19,7 +19,7 @@ const TestComponent: React.FC<TestComponentProps> = ({
   locale = 'en-US',
   invalidDate = false,
 }) => (
-  <UserPreferenceContext.Provider value={{ locale, userId: 'userId' }}>
+  <UserPreferenceContext.Provider value={{ locale }}>
     <LocalizationProvider dateAdapter={AdapterLuxon} adapterLocale={locale}>
       <DesktopDateField
         value={value}
diff --git a/src/components/common/DateTimePickers/DesktopTimeField.test.tsx b/src/components/common/DateTimePickers/DesktopTimeField.test.tsx
index 8981bd2f0..714e7a07f 100644
--- a/src/components/common/DateTimePickers/DesktopTimeField.test.tsx
+++ b/src/components/common/DateTimePickers/DesktopTimeField.test.tsx
@@ -17,7 +17,7 @@ const TestComponent: React.FC<TestComponentProps> = ({
   value = DateTime.local(2024, 1, 2, 3, 4, 5),
   locale = 'en-US',
 }) => (
-  <UserPreferenceContext.Provider value={{ locale, userId: 'userId' }}>
+  <UserPreferenceContext.Provider value={{ locale }}>
     <LocalizationProvider dateAdapter={AdapterLuxon} adapterLocale={locale}>
       <DesktopTimeField value={value} onChange={onChange} label="Time" />
     </LocalizationProvider>
diff --git a/src/components/common/Modal/DeleteConfirmation/DeleteConfirmation.tsx b/src/components/common/Modal/DeleteConfirmation/DeleteConfirmation.tsx
index 166f73fde..6713ca304 100644
--- a/src/components/common/Modal/DeleteConfirmation/DeleteConfirmation.tsx
+++ b/src/components/common/Modal/DeleteConfirmation/DeleteConfirmation.tsx
@@ -29,6 +29,7 @@ interface DeleteConfirmationProps {
   accountListId?: string;
   taskId?: string;
   onClose?: () => void;
+  removeSelectedIds?: (id: string[]) => void;
 }
 
 export const DeleteConfirmation: React.FC<DeleteConfirmationProps> = ({
@@ -40,6 +41,7 @@ export const DeleteConfirmation: React.FC<DeleteConfirmationProps> = ({
   accountListId,
   taskId,
   onClose,
+  removeSelectedIds,
 }) => {
   const { t } = useTranslation();
   const { enqueueSnackbar } = useSnackbar();
@@ -56,12 +58,18 @@ export const DeleteConfirmation: React.FC<DeleteConfirmationProps> = ({
           cache.evict({ id: `Task:${taskId}` });
           cache.gc();
         },
-        refetchQueries: ['ContactTasksTab', 'GetWeeklyActivity', 'GetThisWeek'],
+        refetchQueries: [
+          'ContactTasksTab',
+          'GetWeeklyActivity',
+          'GetThisWeek',
+          'Tasks',
+        ],
       });
       enqueueSnackbar(t('Task deleted successfully'), { variant: 'success' });
       onClickDecline(false);
       onClose && onClose();
       onClickConfirm && onClickConfirm();
+      removeSelectedIds && removeSelectedIds([taskId]);
     }
   };
 
diff --git a/src/hooks/useMassSelection.test.ts b/src/hooks/useMassSelection.test.ts
index 168abad28..5ee7fb7dc 100644
--- a/src/hooks/useMassSelection.test.ts
+++ b/src/hooks/useMassSelection.test.ts
@@ -159,4 +159,26 @@ describe('useMassSelection', () => {
       expect(result.current.ids).toEqual(['1', '2', '3', '7', '8', '9', '10']);
     });
   });
+
+  describe('deselectIds()', () => {
+    it('should deselect ids', () => {
+      const { result, rerender } = renderHook(() =>
+        useMassSelection(
+          defaultTotalCount,
+          defaultIdsList,
+          defaultActiveFilters,
+          defaultWildcardSearch,
+          defaultStarredFilter,
+        ),
+      );
+
+      result.current.toggleSelectAll();
+      rerender();
+      expect(result.current.ids).toEqual(defaultIdsList);
+
+      result.current.deselectIds(['7', '8', '9']);
+      rerender();
+      expect(result.current.ids).toEqual(['1', '2', '3', '4', '5', '6', '10']);
+    });
+  });
 });
diff --git a/src/hooks/useMassSelection.ts b/src/hooks/useMassSelection.ts
index 68e0d8399..498aae504 100644
--- a/src/hooks/useMassSelection.ts
+++ b/src/hooks/useMassSelection.ts
@@ -20,6 +20,7 @@ export const useMassSelection = (
   toggleSelectionById: (id: string) => void;
   selectMultipleIds: (ids: string[]) => void;
   deselectMultipleIds: (ids: string[]) => void;
+  deselectIds: (idsToRemove: string[]) => void;
 } => {
   const [selectionType, setSelectionType] = useState(
     ListHeaderCheckBoxState.Unchecked,
@@ -93,6 +94,10 @@ export const useMassSelection = (
     }
   };
 
+  const deselectIds = (idsToRemove: string[]) => {
+    setIds(ids.filter((id) => !idsToRemove.includes(id)));
+  };
+
   useEffect(() => {
     switch (selectionType) {
       case ListHeaderCheckBoxState.Checked:
@@ -121,5 +126,6 @@ export const useMassSelection = (
     toggleSelectionById,
     selectMultipleIds,
     deselectMultipleIds,
+    deselectIds,
   };
 };
diff --git a/src/lib/apollo/link.ts b/src/lib/apollo/link.ts
index e25ef557a..3e19474c0 100644
--- a/src/lib/apollo/link.ts
+++ b/src/lib/apollo/link.ts
@@ -57,6 +57,10 @@ export const makeAuthLink = (apiToken: string) =>
       headers: {
         ...headers,
         Authorization: `Bearer ${apiToken}`,
+        // We pass through a empty Accept-Language header to the API to avoid it defaulting to 'en-US'
+        // The API uses this header to determine the language of the response
+        // if there is no header it goes off the user's account settings, which is what we want.
+        'Accept-Language': '',
       },
     }));
     return forward(operation);
diff --git a/src/lib/helpScout.test.ts b/src/lib/helpScout.test.ts
deleted file mode 100644
index b6d42db82..000000000
--- a/src/lib/helpScout.test.ts
+++ /dev/null
@@ -1,183 +0,0 @@
-import {
-  BeaconFn,
-  identifyUser,
-  initBeacon,
-  showArticle,
-  suggestArticles,
-} from './helpScout';
-
-const env = process.env;
-
-describe('HelpScout', () => {
-  const beacon = jest.fn() as BeaconFn;
-  beforeEach(() => {
-    beacon.readyQueue = [];
-    window.Beacon = beacon;
-    jest.resetModules();
-    process.env = { ...env };
-  });
-
-  afterEach(() => {
-    process.env = env;
-  });
-
-  beforeEach(() => {
-    jest.resetModules();
-    process.env = { ...env };
-  });
-
-  afterEach(() => {
-    process.env = env;
-  });
-
-  describe('initBeacon', () => {
-    it('sets window.Beacon if HelpScout has not loaded yet', () => {
-      window.Beacon = undefined;
-
-      initBeacon();
-
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore
-      expect(window.Beacon.readyQueue).toHaveLength(1);
-    });
-
-    it('does nothing if HelpScout has already loaded', () => {
-      initBeacon();
-
-      expect(beacon).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  describe('identifyUser', () => {
-    it('calls callBeacon', () => {
-      identifyUser('id', 'email', 'name');
-      expect(beacon).toHaveBeenCalledWith('identify', {
-        id: 'id',
-        name: 'name',
-        email: 'email',
-      });
-    });
-  });
-  describe('suggestArticles', () => {
-    it('calls callBeacon when the suggestions exist', () => {
-      const makeSuggestions = (key: string) => `${key}-1,${key}-2`;
-      Object.assign(process.env, {
-        HS_COACHING_SUGGESTIONS: makeSuggestions('coaching'),
-        HS_CONTACTS_CONTACT_SUGGESTIONS: makeSuggestions('contacts-contact'),
-        HS_CONTACTS_SUGGESTIONS: makeSuggestions('contacts'),
-        HS_HOME_SUGGESTIONS: makeSuggestions('home'),
-        HS_REPORTS_SUGGESTIONS: makeSuggestions('reports'),
-        HS_TASKS_SUGGESTIONS: makeSuggestions('tasks'),
-        HS_SETTINGS_SERVICES_SUGGESTIONS: makeSuggestions('services'),
-        HS_SETTINGS_PREFERENCES_SUGGESTIONS: makeSuggestions('preferences'),
-      });
-
-      suggestArticles('HS_COACHING_SUGGESTIONS');
-      expect(beacon).toHaveBeenLastCalledWith('suggest', [
-        'coaching-1',
-        'coaching-2',
-      ]);
-
-      suggestArticles('HS_CONTACTS_CONTACT_SUGGESTIONS');
-      expect(beacon).toHaveBeenLastCalledWith('suggest', [
-        'contacts-contact-1',
-        'contacts-contact-2',
-      ]);
-
-      suggestArticles('HS_CONTACTS_SUGGESTIONS');
-      expect(beacon).toHaveBeenLastCalledWith('suggest', [
-        'contacts-1',
-        'contacts-2',
-      ]);
-
-      suggestArticles('HS_HOME_SUGGESTIONS');
-      expect(beacon).toHaveBeenLastCalledWith('suggest', ['home-1', 'home-2']);
-
-      suggestArticles('HS_REPORTS_SUGGESTIONS');
-      expect(beacon).toHaveBeenLastCalledWith('suggest', [
-        'reports-1',
-        'reports-2',
-      ]);
-
-      suggestArticles('HS_TASKS_SUGGESTIONS');
-      expect(beacon).toHaveBeenLastCalledWith('suggest', [
-        'tasks-1',
-        'tasks-2',
-      ]);
-
-      suggestArticles('HS_SETTINGS_SERVICES_SUGGESTIONS');
-      expect(beacon).toHaveBeenLastCalledWith('suggest', [
-        'services-1',
-        'services-2',
-      ]);
-
-      suggestArticles('HS_SETTINGS_PREFERENCES_SUGGESTIONS');
-      expect(beacon).toHaveBeenLastCalledWith('suggest', [
-        'preferences-1',
-        'preferences-2',
-      ]);
-    });
-
-    it('calls callBeacon when the suggestions do not exist', () => {
-      process.env.HS_HOME_SUGGESTIONS = undefined;
-      suggestArticles('HS_HOME_SUGGESTIONS');
-      expect(beacon).toHaveBeenCalledWith('suggest', []);
-    });
-  });
-
-  describe('showArticle', () => {
-    it('calls callBeacon when the article exists', () => {
-      Object.assign(process.env, {
-        HS_COACHING_ACTIVITY: 'coaching-activity',
-        HS_COACHING_ACTIVITY_SUMMARY: 'coaching-activity-summary',
-        HS_COACHING_APPOINTMENTS_AND_RESULTS:
-          'coaching-appointments-and-results',
-        HS_COACHING_COMMITMENTS: 'coaching-commitments',
-        HS_COACHING_OUTSTANDING_RECURRING_COMMITMENTS:
-          'coaching-outstanding-recurring-commitments',
-        HS_COACHING_OUTSTANDING_SPECIAL_NEEDS:
-          'coaching-outstanding-special-needs',
-        HS_SETUP_FIND_ORGANIZATION: 'organization-activity',
-      });
-
-      showArticle('HS_SETUP_FIND_ORGANIZATION');
-      expect(beacon).toHaveBeenCalledWith('article', 'organization-activity');
-
-      showArticle('HS_COACHING_ACTIVITY');
-      expect(beacon).toHaveBeenCalledWith('article', 'coaching-activity');
-
-      showArticle('HS_COACHING_ACTIVITY_SUMMARY');
-      expect(beacon).toHaveBeenCalledWith(
-        'article',
-        'coaching-activity-summary',
-      );
-
-      showArticle('HS_COACHING_APPOINTMENTS_AND_RESULTS');
-      expect(beacon).toHaveBeenCalledWith(
-        'article',
-        'coaching-appointments-and-results',
-      );
-
-      showArticle('HS_COACHING_COMMITMENTS');
-      expect(beacon).toHaveBeenCalledWith('article', 'coaching-commitments');
-
-      showArticle('HS_COACHING_OUTSTANDING_RECURRING_COMMITMENTS');
-      expect(beacon).toHaveBeenCalledWith(
-        'article',
-        'coaching-outstanding-recurring-commitments',
-      );
-
-      showArticle('HS_COACHING_OUTSTANDING_SPECIAL_NEEDS');
-      expect(beacon).toHaveBeenCalledWith(
-        'article',
-        'coaching-outstanding-special-needs',
-      );
-    });
-
-    it('calls callBeacon when the article does not exist', () => {
-      process.env.HS_COACHING_ACTIVITY = undefined;
-      showArticle('HS_COACHING_ACTIVITY');
-      expect(beacon).toHaveBeenCalledWith('open', undefined);
-    });
-  });
-});
diff --git a/src/lib/helpScout.ts b/src/lib/helpScout.ts
deleted file mode 100644
index 24ebb3903..000000000
--- a/src/lib/helpScout.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-export interface BeaconFn {
-  (method: string, options?: unknown, data?: unknown): void;
-  readyQueue?: unknown[];
-}
-
-declare global {
-  interface Window {
-    Beacon: BeaconFn | undefined;
-  }
-}
-
-// Create the beacon stub that will be used until the real HelpScout beacon loads
-const readyQueue: unknown[] = [];
-const beacon = (method: string, options?: unknown, data?: unknown) => {
-  readyQueue.push({ method, options, data });
-};
-beacon.readyQueue = readyQueue;
-
-export const initBeacon = () => {
-  if (!window.Beacon) {
-    window.Beacon = beacon;
-  }
-  callBeacon('init', process.env.BEACON_TOKEN);
-};
-
-export const callBeacon = (name: string, options?: unknown) => {
-  if (!window.Beacon) {
-    throw new Error('HelpScout beacon has not been initialized yet');
-  }
-
-  window.Beacon(name, options);
-};
-
-export const identifyUser = (id: string, email: string, name: string) => {
-  callBeacon('identify', {
-    id,
-    email,
-    name,
-  });
-};
-
-export type SuggestionsVar = keyof typeof suggestions;
-
-export const suggestArticles = (envVar: SuggestionsVar) => {
-  const articleIds = suggestions[envVar];
-  callBeacon('suggest', articleIds?.split(',') ?? []);
-};
-
-export type ArticleVar = keyof typeof articles;
-
-export const showArticle = (envVar: ArticleVar) => {
-  const articleId = articles[envVar];
-  if (articleId) {
-    callBeacon('article', articleId);
-  } else {
-    callBeacon('open');
-  }
-};
-
-// We are using getters so that when tests override environment variables, the changes will be picked up
-const suggestions = {
-  get HS_COACHING_SUGGESTIONS() {
-    return process.env.HS_COACHING_SUGGESTIONS;
-  },
-  get HS_CONTACTS_CONTACT_SUGGESTIONS() {
-    return process.env.HS_CONTACTS_CONTACT_SUGGESTIONS;
-  },
-  get HS_CONTACTS_SUGGESTIONS() {
-    return process.env.HS_CONTACTS_SUGGESTIONS;
-  },
-  get HS_HOME_SUGGESTIONS() {
-    return process.env.HS_HOME_SUGGESTIONS;
-  },
-  get HS_REPORTS_SUGGESTIONS() {
-    return process.env.HS_REPORTS_SUGGESTIONS;
-  },
-  get HS_TASKS_SUGGESTIONS() {
-    return process.env.HS_TASKS_SUGGESTIONS;
-  },
-  get HS_SETTINGS_SERVICES_SUGGESTIONS() {
-    return process.env.HS_SETTINGS_SERVICES_SUGGESTIONS;
-  },
-  get HS_SETTINGS_PREFERENCES_SUGGESTIONS() {
-    return process.env.HS_SETTINGS_PREFERENCES_SUGGESTIONS;
-  },
-};
-
-export const articles = {
-  get HS_SETUP_FIND_ORGANIZATION() {
-    return process.env.HS_SETUP_FIND_ORGANIZATION;
-  },
-  get HS_COACHING_ACTIVITY() {
-    return process.env.HS_COACHING_ACTIVITY;
-  },
-  get HS_COACHING_ACTIVITY_SUMMARY() {
-    return process.env.HS_COACHING_ACTIVITY_SUMMARY;
-  },
-  get HS_COACHING_APPOINTMENTS_AND_RESULTS() {
-    return process.env.HS_COACHING_APPOINTMENTS_AND_RESULTS;
-  },
-  get HS_COACHING_COMMITMENTS() {
-    return process.env.HS_COACHING_COMMITMENTS;
-  },
-  get HS_COACHING_OUTSTANDING_RECURRING_COMMITMENTS() {
-    return process.env.HS_COACHING_OUTSTANDING_RECURRING_COMMITMENTS;
-  },
-  get HS_COACHING_OUTSTANDING_SPECIAL_NEEDS() {
-    return process.env.HS_COACHING_OUTSTANDING_SPECIAL_NEEDS;
-  },
-};
diff --git a/src/lib/helpjuice.ts b/src/lib/helpjuice.ts
new file mode 100644
index 000000000..2001dc59a
--- /dev/null
+++ b/src/lib/helpjuice.ts
@@ -0,0 +1,14 @@
+export type ArticleVar = keyof typeof articles;
+
+// We are using getters so that when tests override environment variables, the changes will be picked up
+export const articles = {
+  get HELP_URL_COACHING_ACTIVITY() {
+    return process.env.HELP_URL_COACHING_ACTIVITY;
+  },
+  get HELP_URL_COACHING_APPOINTMENTS_AND_RESULTS() {
+    return process.env.HELP_URL_COACHING_APPOINTMENTS_AND_RESULTS;
+  },
+  get HELP_URL_SETUP_FIND_ORGANIZATION() {
+    return process.env.HELP_URL_SETUP_FIND_ORGANIZATION;
+  },
+};