diff --git a/.babelrc b/.babelrc
index e0ea56c5fa..b535556b8f 100644
--- a/.babelrc
+++ b/.babelrc
@@ -5,9 +5,17 @@
         "@babel/preset-typescript",
     ],
     "plugins": [
-        // Reuse babel"s injected headers
+        // Reuse babel's injected headers
         "@babel/plugin-transform-runtime",
 
+        // Polyfill
+        ["polyfill-corejs3", {
+            "method": "usage-global",
+        }],
+        ["polyfill-regenerator", {
+            "method": "usage-global",
+        }],
+
         // Handle absolute imports
         ["babel-plugin-module-resolver", {
             "root": ["."],
@@ -27,21 +35,12 @@
 
         // Extends javascript support
         "@babel/plugin-syntax-dynamic-import",
-        "@babel/plugin-proposal-do-expressions",
 
         // Extends react support
         "@babel/plugin-transform-react-constant-elements",
-        "@babel/plugin-transform-react-inline-elements",
+        // "@babel/plugin-transform-react-inline-elements",
 
         // Extends graphql support
         'babel-plugin-graphql-tag',
-
-        // Polyfill
-        ["polyfill-corejs3", {
-            "method": "usage-global",
-        }],
-        ["polyfill-regenerator", {
-            "method": "usage-global",
-        }],
     ],
 }
diff --git a/.eslintrc.js b/.eslintrc.js
index bf1f88a7d0..214ecd86af 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -38,6 +38,7 @@ const config = {
     },
     rules: {
         strict: 1,
+        'default-param-last': 0,
 
         'no-unused-vars': 0,
         '@typescript-eslint/no-unused-vars': 1,
@@ -76,6 +77,12 @@ const config = {
         'react/jsx-indent': [2, 4],
         'react/jsx-indent-props': [2, 4],
         'react/jsx-filename-extension': ['error', { extensions: ['.js', '.jsx', '.ts', '.tsx'] }],
+        'react/jsx-props-no-spreading': 0,
+        'react/jsx-key': ['warn', {
+            checkFragmentShorthand: true,
+            checkKeyMustBeforeSpread: true,
+        }],
+
         'react/prop-types': [1, { ignore: [], customValidators: [], skipUndeclared: false }],
         'react/forbid-prop-types': [1],
         'react/destructuring-assignment': [1, 'always', { ignoreClassFields: true }],
@@ -89,12 +96,16 @@ const config = {
             ],
         }],
         'react/no-unused-state': 'warn',
-        'react/jsx-props-no-spreading': 0,
         'react/require-default-props': ['warn', { ignoreFunctionalComponents: true }],
         'react/default-props-match-prop-types': ['warn', {
             allowRequiredDefaults: true,
         }],
 
+
+        'react/function-component-definition': [2, {
+            'namedComponents': 'function-declaration',
+            'unnamedComponents': 'function-expression',
+        }],
         'react-hooks/rules-of-hooks': 'error',
         'react-hooks/exhaustive-deps': 'warn',
 
diff --git a/Dockerfile b/Dockerfile
index d5d36b2af8..10a069acbf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
-FROM node:12.20-alpine
+FROM node:lts-alpine
 
 MAINTAINER togglecorp info@togglecorp.com
 
 RUN apk update\
-    && apk add --no-cache git bash
+    && apk add --no-cache git bash python3 g++ make
 
 WORKDIR /code
 
 COPY ./package.json ./yarn.lock /code/
-RUN yarn install --network-concurrency 1
+RUN yarn install --frozen-lockfile
 
 COPY . /code/
diff --git a/app/Base/components/AuthPopup/index.tsx b/app/Base/components/AuthPopup/index.tsx
index 51d32de98a..ccd3c079fb 100644
--- a/app/Base/components/AuthPopup/index.tsx
+++ b/app/Base/components/AuthPopup/index.tsx
@@ -19,6 +19,8 @@ function AuthPopup() {
     return (
         <Modal
             heading="Invalid Session"
+            size="extraSmall"
+            freeHeight
             onCloseButtonClick={onCancel}
             footerClassName={styles.actionButtonsRow}
             footer={(
diff --git a/app/Base/components/Navbar/index.tsx b/app/Base/components/Navbar/index.tsx
index 25a61e420a..a23d12d374 100644
--- a/app/Base/components/Navbar/index.tsx
+++ b/app/Base/components/Navbar/index.tsx
@@ -1,32 +1,41 @@
 import React, { useContext } from 'react';
 import { _cs } from '@togglecorp/fujs';
-import { gql, useMutation } from '@apollo/client';
+import { Link } from 'react-router-dom';
+import { useQuery, gql, useMutation } from '@apollo/client';
 import {
-    ButtonLikeLink,
     QuickActionLink,
     QuickActionDropdownMenu,
     DropdownMenu,
     DropdownMenuItem,
     useConfirmation,
+    useAlert,
+    Svg,
 } from '@the-deep/deep-ui';
 import {
     IoHelp,
     IoCompassOutline,
     IoNotificationsOutline,
+    IoLogInOutline,
     IoLogOutOutline,
 } from 'react-icons/io5';
 
-import Svg from '#components/Svg';
 import Notifications from '#components/Notifications';
 import SmartNavLink from '#base/components/SmartNavLink';
+import SmartButtonLikeLink from '#base/components/SmartButtonLikeLink';
 import Avatar from '#components/Avatar';
 import { UserContext } from '#base/context/UserContext';
 import route from '#base/configs/routes';
-import { LogoutMutation } from '#generated/types';
+import {
+    LogoutMutation,
+    UserNotificationsCountQuery,
+    UserNotificationsCountQueryVariables,
+} from '#generated/types';
 import deepLogo from '#resources/img/deep-logo-new.svg';
 
 import styles from './styles.css';
 
+const NOTIFICATION_POLL_INTERVAL = 60000;
+
 const LOGOUT = gql`
     mutation Logout {
         logout {
@@ -35,12 +44,23 @@ const LOGOUT = gql`
     }
 `;
 
+export const USER_NOTIFICATIONS_COUNT = gql`
+    query UserNotificationsCount {
+        notifications(
+            status: UNSEEN,
+        ) {
+            totalCount
+        }
+    }
+`;
+
 interface Props {
     className?: string;
 }
 
 function Navbar(props: Props) {
     const { className } = props;
+    const alert = useAlert();
 
     const {
         authenticated,
@@ -48,16 +68,34 @@ function Navbar(props: Props) {
         setUser,
     } = useContext(UserContext);
 
+    const {
+        data: notifications,
+    } = useQuery<UserNotificationsCountQuery, UserNotificationsCountQueryVariables>(
+        USER_NOTIFICATIONS_COUNT,
+        {
+            pollInterval: NOTIFICATION_POLL_INTERVAL,
+        },
+    );
+
     const [logout] = useMutation<LogoutMutation>(
         LOGOUT,
         {
             onCompleted: (data) => {
                 if (data.logout?.ok) {
                     setUser(undefined);
+                } else {
+                    alert.show(
+                        'Failed to logout.',
+                        { variant: 'error' },
+                    );
                 }
-                // FIXME: handle failure
             },
-            // FIXME: handle failure
+            onError: () => {
+                alert.show(
+                    'Failed to logout.',
+                    { variant: 'error' },
+                );
+            },
         },
     );
 
@@ -70,18 +108,22 @@ function Navbar(props: Props) {
         message: 'Are you sure you want to logout?',
     });
 
+    const notificationsCount = notifications?.notifications?.totalCount;
+
     return (
         <nav className={_cs(className, styles.navbar)}>
-            <div className={styles.appBrand}>
+            <Link
+                to={route.home.path}
+                className={styles.appBrand}
+            >
                 <Svg
                     className={styles.logo}
                     src={deepLogo}
                 />
-            </div>
+            </Link>
             <div className={styles.main}>
                 <div className={styles.navLinks}>
                     <SmartNavLink
-                        exact
                         route={route.home}
                         className={styles.link}
                     />
@@ -95,25 +137,40 @@ function Navbar(props: Props) {
                     />
                 </div>
                 <div className={styles.actions}>
-                    <ButtonLikeLink
-                        to={route.explore.path}
+                    <SmartButtonLikeLink
+                        route={route.explore}
                         variant="tertiary"
                         icons={<IoCompassOutline />}
                     >
                         Explore DEEP
-                    </ButtonLikeLink>
+                    </SmartButtonLikeLink>
+                    <SmartButtonLikeLink
+                        route={route.login}
+                        variant="tertiary"
+                        icons={(
+                            <IoLogInOutline />
+                        )}
+                    >
+                        Login
+                    </SmartButtonLikeLink>
                     <QuickActionLink
+                        title="DEEP Support"
                         to="https://deephelp.zendesk.com/hc/en-us"
                     >
                         <IoHelp />
                     </QuickActionLink>
-                    <QuickActionDropdownMenu
-                        label={<IoNotificationsOutline />}
-                        popupClassName={styles.popup}
-                        persistent
-                    >
-                        <Notifications />
-                    </QuickActionDropdownMenu>
+                    {authenticated && (
+                        <QuickActionDropdownMenu
+                            label={(<IoNotificationsOutline />)}
+                            className={styles.notificationButton}
+                            actions={notificationsCount !== 0 ? notificationsCount : undefined}
+                            popupClassName={styles.popup}
+                            actionsContainerClassName={styles.notificationCount}
+                            persistent
+                        >
+                            <Notifications />
+                        </QuickActionDropdownMenu>
+                    )}
                 </div>
             </div>
             {authenticated && user && (
diff --git a/app/Base/components/Navbar/styles.css b/app/Base/components/Navbar/styles.css
index 638fb01a36..8aa7f9e5d8 100644
--- a/app/Base/components/Navbar/styles.css
+++ b/app/Base/components/Navbar/styles.css
@@ -44,10 +44,29 @@
         display: flex;
         align-items: center;
         flex-shrink: 0;
-        padding: 0 calc(var(--dui-spacing-large) - var(--dui-spacing-small));
+        padding: var(--dui-spacing-large);
+        gap: var(--dui-spacing-small);
 
-        >* {
-            margin: 0 var(--dui-spacing-small);
+        .notification-button {
+            position: relative;
+            overflow: visible;
+
+            .notification-count {
+                display: flex;
+                position: absolute;
+                top: -0.5em;
+                right: -0.5em;
+                align-items: center;
+                justify-content: center;
+                /* NOTE: Want to move this a bit up */
+                border-radius: 1em;
+                background-color: var(--dui-color-danger);
+                padding: 2px;
+                min-width: 1.4em;
+                min-height: 1.4em;
+                color: var(--dui-color-text-on-dark);
+                font-size: var(--dui-font-size-extra-small);
+            }
         }
     }
 
diff --git a/app/Base/components/Page/index.tsx b/app/Base/components/Page/index.tsx
index 50d6ffd98f..496b76c73d 100644
--- a/app/Base/components/Page/index.tsx
+++ b/app/Base/components/Page/index.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect, useContext } from 'react';
-import { Redirect } from 'react-router-dom';
+import { Navigate } from 'react-router-dom';
+import { isDefined } from '@togglecorp/fujs';
 
 import FullPageErrorMessage from '#views/FullPageErrorMessage';
 import { UserContext } from '#base/context/UserContext';
@@ -8,7 +9,6 @@ import { ProjectContext } from '#base/context/ProjectContext';
 import PageTitle from '#base/components/PageTitle';
 import { Project } from '#base/types/project';
 import ErrorBoundary from '#base/components/ErrorBoundary';
-import divingKraken from '#resources/img/diving-kraken.png';
 
 import styles from './styles.css';
 
@@ -25,7 +25,7 @@ export interface Props<T extends { className?: string }> {
         project: Project | undefined,
         skipProjectPermissionCheck: boolean,
     ) => boolean | undefined,
-    navbarVisibility: boolean;
+    navbarVisibility: boolean | undefined;
 
     path: string;
     loginPage?: string;
@@ -65,7 +65,9 @@ function Page<T extends { className?: string }>(props: Props<T>) {
         () => {
             // NOTE: should not set visibility for redirection or, navbar will
             // flash
-            if (!redirect) {
+            // NOTE: if navbarVisibility do not change navbar state
+            // useful for parent routes
+            if (!redirect && isDefined(navbarVisibility)) {
                 setNavbarVisibility(navbarVisibility);
             }
         },
@@ -78,14 +80,14 @@ function Page<T extends { className?: string }>(props: Props<T>) {
     if (redirectToSignIn) {
         // console.warn('Redirecting to sign-in');
         return (
-            <Redirect to={loginPage} />
+            <Navigate to={loginPage} />
         );
     }
 
     if (redirectToHome) {
         // console.warn('Redirecting to dashboard');
         return (
-            <Redirect to={defaultPage} />
+            <Navigate to={defaultPage} />
         );
     }
 
@@ -99,7 +101,7 @@ function Page<T extends { className?: string }>(props: Props<T>) {
                 <FullPageErrorMessage
                     errorTitle="403"
                     errorMessage="You do not have permission to access this page"
-                    errorImage={divingKraken}
+                    krakenVariant="hi"
                 />
             </>
         );
diff --git a/app/Base/components/Routes/index.tsx b/app/Base/components/Routes/index.tsx
index ec99c9b3c8..c781096cac 100644
--- a/app/Base/components/Routes/index.tsx
+++ b/app/Base/components/Routes/index.tsx
@@ -1,5 +1,5 @@
 import React, { Suspense } from 'react';
-import { Switch, Route } from 'react-router-dom';
+import { Routes, Route } from 'react-router-dom';
 import PreloadMessage from '#base/components/PreloadMessage';
 
 import routes from '#base/configs/routes';
@@ -8,7 +8,7 @@ interface Props {
     className?: string;
 }
 
-function Routes(props: Props) {
+function MyRoutes(props: Props) {
     const { className } = props;
 
     return (
@@ -20,86 +20,61 @@ function Routes(props: Props) {
                 />
             )}
         >
-            <Switch>
+            <Routes>
                 <Route
-                    exact
-                    path={routes.home.path}
-                >
-                    {routes.home.load({ className })}
-                </Route>
+                    path={routes.home.pathForRoute}
+                    element={routes.home.load({ className })}
+                />
                 <Route
-                    exact
-                    path={routes.myProfile.path}
-                >
-                    {routes.myProfile.load({ className })}
-                </Route>
+                    path={routes.myProfile.pathForRoute}
+                    element={routes.myProfile.load({ className })}
+                />
                 <Route
-                    exact
-                    path={routes.userGroups.path}
-                >
-                    {routes.userGroups.load({ className })}
-                </Route>
+                    path={routes.userGroups.pathForRoute}
+                    element={routes.userGroups.load({ className })}
+                />
                 <Route
-                    exact
-                    path={routes.explore.path}
-                >
-                    {routes.explore.load({ className })}
-                </Route>
+                    path={routes.explore.pathForRoute}
+                    element={routes.explore.load({ className })}
+                />
                 <Route
-                    exact
-                    path={routes.projectCreate.path}
-                >
-                    {routes.projectCreate.load({ className })}
-                </Route>
+                    path={routes.projectCreate.pathForRoute}
+                    element={routes.projectCreate.load({ className })}
+                />
                 <Route
-                    path={routes.project.path}
-                >
-                    {routes.project.load({ className })}
-                </Route>
+                    path={routes.project.pathForRoute}
+                    element={routes.project.load({ className })}
+                />
                 <Route
-                    exact
-                    path={routes.analyticalFrameworkEdit.path}
-                >
-                    {routes.analyticalFrameworkEdit.load({ className })}
-                </Route>
+                    path={routes.analyticalFrameworkEdit.pathForRoute}
+                    element={routes.analyticalFrameworkEdit.load({ className })}
+                />
                 <Route
-                    exact
-                    path={routes.analyticalFrameworkCreate.path}
-                >
-                    {routes.analyticalFrameworkCreate.load({ className })}
-                </Route>
+                    path={routes.analyticalFrameworkCreate.pathForRoute}
+                    element={routes.analyticalFrameworkCreate.load({ className })}
+                />
                 <Route
-                    exact
-                    path={routes.login.path}
-                >
-                    {routes.login.load({ className })}
-                </Route>
+                    path={routes.login.pathForRoute}
+                    element={routes.login.load({ className })}
+                />
                 <Route
-                    exact
-                    path={routes.register.path}
-                >
-                    {routes.register.load({ className })}
-                </Route>
+                    path={routes.register.pathForRoute}
+                    element={routes.register.load({ className })}
+                />
                 <Route
-                    exact
-                    path={routes.forgotPassword.path}
-                >
-                    {routes.forgotPassword.load({ className })}
-                </Route>
+                    path={routes.forgotPassword.pathForRoute}
+                    element={routes.forgotPassword.load({ className })}
+                />
                 <Route
-                    exact
-                    path={routes.resetPassword.path}
-                >
-                    {routes.resetPassword.load({ className })}
-                </Route>
+                    path={routes.resetPassword.pathForRoute}
+                    element={routes.resetPassword.load({ className })}
+                />
                 <Route
-                    exact
-                    path={routes.fourHundredFour.path}
-                >
-                    {routes.fourHundredFour.load({ className })}
-                </Route>
-            </Switch>
+                    path={routes.fourHundredFour.pathForRoute}
+                    element={routes.fourHundredFour.load({})}
+                />
+            </Routes>
         </Suspense>
     );
 }
-export default Routes;
+export default MyRoutes;
diff --git a/app/Base/components/SmartButtonLikeLink/index.tsx b/app/Base/components/SmartButtonLikeLink/index.tsx
index 760f09565e..3bd212a015 100644
--- a/app/Base/components/SmartButtonLikeLink/index.tsx
+++ b/app/Base/components/SmartButtonLikeLink/index.tsx
@@ -8,7 +8,10 @@ import useRouteMatching, {
 
 export type Props = Omit<ButtonLikeLinkProps, 'to'> & {
     route: RouteData;
+
+    state?: object;
     attrs?: Attrs;
+    hash?: string;
     children?: React.ReactNode;
 };
 
@@ -17,6 +20,8 @@ function SmartButtonLikeLink(props: Props) {
         route,
         attrs,
         children,
+        state,
+        hash,
         ...otherProps
     } = props;
 
@@ -28,7 +33,7 @@ function SmartButtonLikeLink(props: Props) {
     return (
         <ButtonLikeLink
             {...otherProps}
-            to={routeData.to}
+            to={{ pathname: routeData.to, state, hash }}
         >
             {children ?? routeData.children}
         </ButtonLikeLink>
diff --git a/app/Base/components/SmartNavLink/index.tsx b/app/Base/components/SmartNavLink/index.tsx
index ecf7bb5e7e..9006b463d7 100644
--- a/app/Base/components/SmartNavLink/index.tsx
+++ b/app/Base/components/SmartNavLink/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import { NavLink, NavLinkProps } from 'react-router-dom';
 import { _cs } from '@togglecorp/fujs';
 import { Border } from '@the-deep/deep-ui';
@@ -10,7 +10,7 @@ import useRouteMatching, {
 
 import styles from './styles.css';
 
-export type Props = Omit<NavLinkProps, 'to'> & {
+export type Props = Omit<NavLinkProps, 'to' | 'children'> & {
     route: RouteData;
     attrs?: Attrs;
     children?: React.ReactNode;
@@ -22,10 +22,18 @@ function SmartNavLink(props: Props) {
         attrs,
         children,
         className,
-        activeClassName,
         ...otherProps
     } = props;
 
+    const classNameCallback = useCallback(
+        ({ isActive }: { isActive: boolean }) => _cs(
+            styles.smartNavLink,
+            isActive && styles.active,
+            typeof className === 'function' ? className({ isActive }) : className,
+        ),
+        [className],
+    );
+
     const routeData = useRouteMatching(route, attrs);
     if (!routeData) {
         return null;
@@ -35,8 +43,7 @@ function SmartNavLink(props: Props) {
         <NavLink
             {...otherProps}
             to={routeData.to}
-            className={_cs(styles.smartNavLink, className)}
-            activeClassName={_cs(styles.active, activeClassName)}
+            className={classNameCallback}
         >
             {children ?? routeData.children}
             <Border
diff --git a/app/Base/components/SmartQuickActionLink/index.tsx b/app/Base/components/SmartQuickActionLink/index.tsx
index 0c6c01cfab..f7de1d2d04 100644
--- a/app/Base/components/SmartQuickActionLink/index.tsx
+++ b/app/Base/components/SmartQuickActionLink/index.tsx
@@ -9,6 +9,9 @@ import useRouteMatching, {
 export type Props = Omit<QuickActionLinkProps, 'to'> & {
     route: RouteData;
     attrs?: Attrs;
+
+    state?: object;
+    hash?: string;
     children?: React.ReactNode;
 };
 
@@ -17,6 +20,8 @@ function SmartQuickActionLink(props: Props) {
         route,
         attrs,
         children,
+        state,
+        hash,
         ...otherProps
     } = props;
 
@@ -28,7 +33,7 @@ function SmartQuickActionLink(props: Props) {
     return (
         <QuickActionLink
             {...otherProps}
-            to={routeData.to}
+            to={{ pathname: routeData.to, state, hash }}
         >
             {children ?? routeData.children}
         </QuickActionLink>
diff --git a/app/Base/configs/apollo.ts b/app/Base/configs/apollo.ts
index 829f477564..7b6c6039cf 100644
--- a/app/Base/configs/apollo.ts
+++ b/app/Base/configs/apollo.ts
@@ -2,11 +2,19 @@ import { ApolloClientOptions, NormalizedCacheObject, InMemoryCache, ApolloLink a
 import { ApolloLink } from 'apollo-link';
 import { RetryLink } from 'apollo-link-retry';
 import { createUploadLink } from 'apollo-upload-client';
+import { isDefined } from '@togglecorp/fujs';
 
 const GRAPHQL_ENDPOINT = process.env.REACT_APP_GRAPHQL_ENDPOINT as string;
 
 const link: ApolloLinkFromClient = ApolloLink.from([
-    new RetryLink(),
+    new RetryLink({
+        attempts: {
+            max: 5,
+            retryIf: (error: { statusCode: number | undefined }) => (
+                isDefined(error.statusCode) && error.statusCode < 400
+            ),
+        },
+    }),
     ApolloLink.split(
         (operation) => operation.getContext().hasUpload,
         createUploadLink({
diff --git a/app/Base/configs/googleAnalytics.ts b/app/Base/configs/googleAnalytics.ts
index 6e2f3477b9..a82641e767 100644
--- a/app/Base/configs/googleAnalytics.ts
+++ b/app/Base/configs/googleAnalytics.ts
@@ -6,9 +6,16 @@ import {
     isDev,
 } from './env';
 
-export const trackingId = isBeta || isAlpha || isNightly
-    ? 'UA-112330910-1'
-    : 'UA-112330910-2';
+export const trackingId = (() => {
+    const keyFromEnv = process.env.REACT_APP_GA_TRACKING_ID;
+    if (keyFromEnv) {
+        return keyFromEnv;
+    }
+    if (isBeta || isAlpha || isNightly) {
+        return 'UA-112330910-1';
+    }
+    return 'UA-112330910-2';
+})();
 
 export const gaConfig: InitializeOptions = {
     debug: isDev,
diff --git a/app/Base/configs/hCaptcha.ts b/app/Base/configs/hCaptcha.ts
index ad805cbe94..f43d6331e6 100644
--- a/app/Base/configs/hCaptcha.ts
+++ b/app/Base/configs/hCaptcha.ts
@@ -1,22 +1,18 @@
 import {
-    isDevelopment,
     isBeta,
     isAlpha,
     isNightly,
 } from '#base/configs/env';
 
 const siteKey = (() => {
-    const keyFromEnv = process.env.REACT_APP_HCATPCHA_SITEKEY as string | undefined;
+    const keyFromEnv = process.env.REACT_APP_HCATPCHA_SITEKEY;
     if (keyFromEnv) {
         return keyFromEnv;
     }
-    if (isDevelopment) {
-        return '10000000-ffff-ffff-ffff-000000000001';
-    }
     if (isBeta || isAlpha || isNightly) {
         return 'ac332154-0c48-4fc1-9092-e52b291d903c';
     }
-    return undefined;
+    return '10000000-ffff-ffff-ffff-000000000001';
 })();
 
 export default siteKey;
diff --git a/app/Base/configs/hid.ts b/app/Base/configs/hid.ts
index 2439f3a908..5d07986829 100644
--- a/app/Base/configs/hid.ts
+++ b/app/Base/configs/hid.ts
@@ -1,14 +1,13 @@
-const responseType = 'token';
-const scope = 'profile';
-const state = '12345';
+import {
+    isBeta,
+    isAlpha,
+    isNightly,
+} from './env';
 
-// TODO: Add configs for local, dev and production
-// TODO: Add three types of env variable local, dev and production
-// instead of just development and production
 let clientId;
 let redirectUrl;
 let hidAuthUrl;
-if (process.env.REACT_APP_HID_CLIENT_ID) {
+if (isBeta || isAlpha || isNightly) {
     clientId = process.env.REACT_APP_HID_CLIENT_ID;
     redirectUrl = process.env.REACT_APP_HID_CLIENT_REDIRECT_URL;
     hidAuthUrl = process.env.REACT_APP_HID_AUTH_URI;
@@ -18,6 +17,9 @@ if (process.env.REACT_APP_HID_CLIENT_ID) {
     hidAuthUrl = 'https://api2.dev.humanitarian.id';
 }
 
+const responseType = 'token';
+const scope = 'profile';
+const state = '12345';
 // NOTE: HID doesn't seem to decode the params, so don't use `p` for now
 // eslint-disable-next-line import/prefer-default-export
 export const hidUrl = `${hidAuthUrl}/oauth/authorize?response_type=${responseType}&client_id=${clientId}&scope=${scope}&state=${state}&redirect_uri=${redirectUrl}`;
diff --git a/app/Base/configs/routes.tsx b/app/Base/configs/routes.tsx
index e21ca7fb9d..93be33eca9 100644
--- a/app/Base/configs/routes.tsx
+++ b/app/Base/configs/routes.tsx
@@ -1,7 +1,6 @@
 import React, { lazy } from 'react';
 import { isNotDefined } from '@togglecorp/fujs';
 
-import flyingKraken from '#resources/img/flying-kraken.png';
 import { wrap } from '#base/utils/routes';
 
 const fourHundredFour = wrap({
@@ -9,7 +8,7 @@ const fourHundredFour = wrap({
     title: '404',
     component: lazy(() => import('#views/FullPageErrorMessage')),
     componentProps: {
-        errorImage: flyingKraken,
+        krakenVariant: 'skydive',
         errorTitle: '404',
         errorMessage: (
             <>
@@ -93,7 +92,7 @@ const explore = wrap({
     component: lazy(() => import('#views/ExploreDeep')),
     componentProps: {
     },
-    visibility: 'is-authenticated',
+    visibility: 'is-anything',
 });
 const analyticalFrameworkCreateRoute = wrap({
     path: '/frameworks/new/',
@@ -106,7 +105,7 @@ const analyticalFrameworkCreateRoute = wrap({
     // as this route manages all the data load
 });
 const analyticalFrameworkEditRoute = wrap({
-    path: '/frameworks/:frameworkId(\\d+)/',
+    path: '/frameworks/:frameworkId/',
     title: 'Analytical Framework',
     navbarVisibility: false,
     component: lazy(() => import('#views/AnalyticalFramework')),
@@ -128,9 +127,9 @@ const projectCreateRoute = wrap({
 });
 
 const projectRoute = wrap({
-    path: '/projects/:projectId(\\d+)/',
+    path: '/projects/:projectId/*',
     title: 'Project',
-    navbarVisibility: true,
+    navbarVisibility: undefined,
     component: lazy(() => import('#views/Project')),
     componentProps: { },
     visibility: 'is-authenticated',
@@ -140,9 +139,9 @@ const projectRoute = wrap({
 
 const taggingRoute = wrap({
     parent: { path: projectRoute.path },
-    path: '/tagging/',
+    path: '/tagging/*',
     title: 'Tagging',
-    navbarVisibility: true,
+    navbarVisibility: undefined,
     component: lazy(() => import('#views/Project/Tagging')),
     componentProps: {
     },
@@ -180,7 +179,7 @@ const projectEditRoute = wrap({
 });
 const entryEditRoute = wrap({
     parent: { path: projectRoute.path },
-    path: '/leads/:leadId(\\d+)/',
+    path: '/leads/:leadId/',
     title: 'Edit Entry',
     navbarVisibility: false,
     component: lazy(() => import('#views/Project/EntryEdit')),
@@ -208,7 +207,7 @@ const entryEditRoute = wrap({
     },
 });
 const analysis = wrap({
-    parent: projectRoute,
+    parent: { path: projectRoute.path },
     path: '/analysis/',
     title: 'Analysis',
     navbarVisibility: true,
@@ -229,8 +228,8 @@ const analysis = wrap({
     },
 });
 const pillarAnalysis = wrap({
-    parent: projectRoute,
-    path: '/analysis/:analysisId(\\d+)/pillar/:pillarAnalysisId(\\d+)/',
+    parent: { path: projectRoute.path },
+    path: '/analysis/:analysisId/pillar/:pillarAnalysisId/',
     title: 'Pillar Analysis',
     navbarVisibility: false,
     component: lazy(() => import('#views/Project/PillarAnalysis')),
@@ -281,8 +280,8 @@ const assessments = wrap({
 });
 const leadGroups = wrap({
     parent: { path: taggingRoute.path },
-    path: '/lead-groups/',
-    title: 'Lead Groups',
+    path: '/source-groups/',
+    title: 'Source Groups',
     navbarVisibility: true,
     component: lazy(() => import('#views/Project/Tagging/LeadGroups')),
     componentProps: {
@@ -317,6 +316,31 @@ const dashboard = wrap({
         return project.isVisualizationEnabled && project.isVisualizationAvailable;
     },
 });
+
+const aryDashboard = wrap({
+    parent: { path: taggingRoute.path },
+    path: '/assessment-dashboard/',
+    title: 'Assessments Dashboard',
+    navbarVisibility: true,
+    component: lazy(() => import('#views/Project/Tagging/AryDashboard')),
+    componentProps: {
+    },
+    visibility: 'is-authenticated',
+    checkPermissions: (project, skipProjectPermissionCheck) => {
+        if (skipProjectPermissionCheck) {
+            return true;
+        }
+        if (!project) {
+            return false;
+        }
+        return (
+            project.isVisualizationEnabled
+            && project.isVisualizationAvailable
+            && project.hasAssessmentTemplate
+        );
+    },
+});
+
 const exportRoute = wrap({
     parent: { path: taggingRoute.path },
     path: '/export/',
@@ -328,6 +352,54 @@ const exportRoute = wrap({
     visibility: 'is-authenticated',
 });
 
+const assessmentEditRoute = wrap({
+    parent: { path: projectRoute.path },
+    path: '/assessments/leads/:leadId/',
+    title: 'Edit Assessment',
+    navbarVisibility: false,
+    component: lazy(() => import('#views/Project/EditAssessment')),
+    componentProps: {
+    },
+    visibility: 'is-authenticated',
+    checkPermissions: (project, skipProjectPermissionCheck) => {
+        if (skipProjectPermissionCheck) {
+            return true;
+        }
+        if (!project) {
+            return false;
+        }
+        // NOTE: using permission for LEAD as we don't have one for assessment
+        return project.hasAssessmentTemplate && (
+            project.allowedPermissions.includes('CREATE_LEAD')
+            || project.allowedPermissions.includes('UPDATE_LEAD')
+        );
+    },
+});
+
+const groupAssessmentEditRoute = wrap({
+    parent: { path: projectRoute.path },
+    path: '/assessments/lead-groups/:leadGroupId/',
+    title: 'Edit Source Group Assessment',
+    navbarVisibility: false,
+    component: lazy(() => import('#views/Project/EditGroupAssessment')),
+    componentProps: {
+    },
+    visibility: 'is-authenticated',
+    checkPermissions: (project, skipProjectPermissionCheck) => {
+        if (skipProjectPermissionCheck) {
+            return true;
+        }
+        if (!project) {
+            return false;
+        }
+        // NOTE: using permission for LEAD as we don't have one for assessment
+        return project.hasAssessmentTemplate && (
+            project.allowedPermissions.includes('CREATE_LEAD')
+            || project.allowedPermissions.includes('UPDATE_LEAD')
+        );
+    },
+});
+
 const routes = {
     login,
     register,
@@ -350,7 +422,10 @@ const routes = {
     leadGroups,
     fourHundredFour,
     dashboard,
+    aryDashboard,
     export: exportRoute,
     entryEdit: entryEditRoute,
+    assessmentEdit: assessmentEditRoute,
+    groupAssessmentEdit: groupAssessmentEditRoute,
 };
 export default routes;
diff --git a/app/Base/configs/sentry.ts b/app/Base/configs/sentry.ts
index 92a641bb3f..9dfb505789 100644
--- a/app/Base/configs/sentry.ts
+++ b/app/Base/configs/sentry.ts
@@ -1,38 +1,37 @@
-import { matchPath } from 'react-router-dom';
-import { reactRouterV5Instrumentation, BrowserOptions } from '@sentry/react';
-import { Integrations } from '@sentry/tracing';
+import { BrowserOptions } from '@sentry/react';
 
-import browserHistory from '#base/configs/history';
-import routes from '#base/configs/routes';
 import {
     isBeta,
     isAlpha,
     isNightly,
+    isDev,
 } from '#base/configs/env';
 
 const appCommitHash = process.env.REACT_APP_COMMITHASH;
 const appName = process.env.MY_APP;
 
-const sentryDsn = isBeta || isAlpha || isNightly
-    ? 'https://9a60f35c6a1c45fe999727c5f6f7229c@sentry.io/1220157'
-    : undefined;
+const sentryDsn = (() => {
+    const keyFromEnv = process.env.REACT_APP_SENTRY_DSN;
+    if (keyFromEnv) {
+        return keyFromEnv;
+    }
+    if (isBeta || isAlpha || isNightly) {
+        return 'https://9a60f35c6a1c45fe999727c5f6f7229c@sentry.io/1220157';
+    }
+    return undefined;
+})();
 
 const env = process.env.REACT_APP_DEEP_ENVIRONMENT;
 const sentryConfig: BrowserOptions | undefined = sentryDsn ? {
     dsn: sentryDsn,
     release: `${appName}@${appCommitHash}`,
     environment: env,
+    debug: isDev,
     // sendDefaultPii: true,
     normalizeDepth: 5,
-    integrations: [
-        new Integrations.BrowserTracing({
-            routingInstrumentation: reactRouterV5Instrumentation(
-                browserHistory,
-                Object.entries(routes),
-                matchPath,
-            ),
-        }),
-    ],
+    // FIXME: check for proper casts
+    tracesSampleRate: +(process.env.REACT_APP_SENTRY_TRACES_SAMPLE_RATE || 0.2),
+    integrations: [],
 } : undefined;
 
 export default sentryConfig;
diff --git a/app/Base/hooks/useAuthSync.ts b/app/Base/hooks/useAuthSync.ts
index 575d9b880b..42b1483c2f 100644
--- a/app/Base/hooks/useAuthSync.ts
+++ b/app/Base/hooks/useAuthSync.ts
@@ -82,7 +82,8 @@ function useAuthSync() {
 
     const handleConfirmModalConfirm = useCallback(
         () => {
-            window.location.reload(true);
+            // NOTE: Pass true to force-reload window on firefox
+            window.location.reload();
         },
         [],
     );
diff --git a/app/Base/index.tsx b/app/Base/index.tsx
index 1201c5f994..18fa5049b7 100644
--- a/app/Base/index.tsx
+++ b/app/Base/index.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useMemo, useCallback } from 'react';
-import { Router } from 'react-router-dom';
-import { init, ErrorBoundary, setUser as setUserOnSentry } from '@sentry/react';
+import { BrowserRouter } from 'react-router-dom';
+import { init, ErrorBoundary, setUser as setUserOnSentry, withProfiler } from '@sentry/react';
 import { unique, _cs } from '@togglecorp/fujs';
 import { AlertContainer, AlertContext, AlertOptions } from '@the-deep/deep-ui';
 import { ApolloClient, ApolloProvider } from '@apollo/client';
@@ -11,7 +11,6 @@ import '@the-deep/deep-ui/build/index.css';
 
 import Init from '#base/components/Init';
 import PreloadMessage from '#base/components/PreloadMessage';
-import browserHistory from '#base/configs/history';
 import sentryConfig from '#base/configs/sentry';
 import { UserContext, UserContextInterface } from '#base/context/UserContext';
 import { NavbarContext, NavbarContextInterface } from '#base/context/NavbarContext';
@@ -28,8 +27,9 @@ import {
     processDeepResponse,
     processDeepError,
     RequestContext,
+    DeepContextInterface,
 } from '#base/utils/restRequest';
-import '../../node_modules/mapbox-gl/dist/mapbox-gl.css';
+import 'mapbox-gl/dist/mapbox-gl.css';
 
 import styles from './styles.css';
 
@@ -40,21 +40,9 @@ if (sentryConfig) {
 }
 
 ReactGA.initialize(trackingId, gaConfig);
-browserHistory.listen((location) => {
-    const page = location.pathname ?? window.location.pathname;
-    ReactGA.set({ page });
-    ReactGA.pageview(page);
-});
 
 const apolloClient = new ApolloClient(apolloConfig);
 
-const requestContextValue = {
-    transformUrl: processDeepUrls,
-    transformOptions: processDeepOptions,
-    transformResponse: processDeepResponse,
-    transformError: processDeepError,
-};
-
 function Base() {
     const [user, setUser] = useState<User | undefined>();
 
@@ -170,6 +158,22 @@ function Base() {
         [alerts, addAlert, updateAlertContent, removeAlert],
     );
 
+    const requestContextValue = useMemo(
+        () => {
+            const transformError: DeepContextInterface['transformError'] = (...args) => (
+                processDeepError(addAlert)(...args)
+            );
+
+            return {
+                transformUrl: processDeepUrls,
+                transformOptions: processDeepOptions,
+                transformResponse: processDeepResponse,
+                transformError,
+            };
+        },
+        [addAlert],
+    );
+
     return (
         <div className={styles.base}>
             <ErrorBoundary
@@ -188,7 +192,7 @@ function Base() {
                                 <AlertContext.Provider value={alertContext}>
                                     <AuthPopup />
                                     <AlertContainer className={styles.alertContainer} />
-                                    <Router history={browserHistory}>
+                                    <BrowserRouter>
                                         <Init
                                             className={styles.init}
                                         >
@@ -202,7 +206,7 @@ function Base() {
                                                 className={styles.view}
                                             />
                                         </Init>
-                                    </Router>
+                                    </BrowserRouter>
                                 </AlertContext.Provider>
                             </NavbarContext.Provider>
                         </UserContext.Provider>
@@ -213,4 +217,4 @@ function Base() {
     );
 }
 
-export default Base;
+export default withProfiler(Base, { name: 'Base' });
diff --git a/app/Base/styles.css b/app/Base/styles.css
index 85f7749916..968a705d38 100644
--- a/app/Base/styles.css
+++ b/app/Base/styles.css
@@ -7,23 +7,34 @@
 
     .navbar {
         flex-shrink: 0;
+        height: 64px;
+
+        &:not(.hidden) {
+            transition: 200ms margin-top ease-in;
+            margin-top: 0;
+        }
 
         &.hidden {
-            display: none;
+            transition: 200ms margin-top ease-out;
+            margin-top: -64px;
         }
     }
 
-    .view,
     .init {
         flex-grow: 1;
         overflow: auto;
     }
 
+    .view {
+        flex-grow: 1;
+        overflow: auto;
+    }
+
     .alert-container {
         position: fixed;
         top: var(--dui-spacing-large);
         right: var(--dui-spacing-large);
         z-index: 1;
-        width: 20rem;
+        width: 24rem;
     }
 }
diff --git a/app/Base/utils/restRequest.ts b/app/Base/utils/restRequest.ts
index 2e7350adc2..76f2a040c4 100644
--- a/app/Base/utils/restRequest.ts
+++ b/app/Base/utils/restRequest.ts
@@ -6,7 +6,8 @@ import {
     LazyRequestOptions,
     ContextInterface,
 } from '@togglecorp/toggle-request';
-import { mapToMap, isDefined } from '@togglecorp/fujs';
+import { AlertOptions } from '@the-deep/deep-ui';
+import { mapToMap, isDefined, randomString } from '@togglecorp/fujs';
 import {
     serverlessEndpoint,
     wsEndpoint,
@@ -93,11 +94,11 @@ function alterResponse(errors: ErrorFromServer['errors']): Error['value']['faram
 
 export interface OptionBase {
     formData?: boolean;
-    failureHeader?: React.ReactNode;
+    failureMessage?: React.ReactNode;
 }
 
-type DeepContextInterface = ContextInterface<
-    // eslint-disable-next-line @typescript-eslint/ban-types
+export type DeepContextInterface = ContextInterface<
+
     object,
     ErrorFromServer | undefined,
     Error,
@@ -211,7 +212,9 @@ export const processDeepResponse: DeepContextInterface['transformResponse'] = as
     return undefined;
 };
 
-export const processDeepError: DeepContextInterface['transformError'] = (
+export const processDeepError = (
+    addAlert: (alert: AlertOptions) => void,
+): DeepContextInterface['transformError'] => (
     res,
     _,
     __,
@@ -278,13 +281,19 @@ export const processDeepError: DeepContextInterface['transformError'] = (
         };
     }
 
-    const { failureHeader } = ctx;
+    const { failureMessage } = ctx;
 
-    if (failureHeader) {
-        // FIXME: use notify
+    if (failureMessage) {
+        // NOTE: failureMessage is not used
+        addAlert({
+            children: error.value.messageForNotification,
+            variant: 'error',
+            duration: 3000,
+            name: randomString(),
+        });
         // eslint-disable-next-line no-console
         console.error(
-            failureHeader,
+            failureMessage,
             error.value.messageForNotification,
         );
     }
diff --git a/app/Base/utils/routes.tsx b/app/Base/utils/routes.tsx
index 8ee0fa0007..ca639588c6 100644
--- a/app/Base/utils/routes.tsx
+++ b/app/Base/utils/routes.tsx
@@ -2,6 +2,13 @@ import React from 'react';
 
 import Page, { Props as PageProps } from '#base/components/Page';
 
+function removeAsterisk(link: string) {
+    if (link.endsWith('*')) {
+        return link.slice(0, link.length - 1);
+    }
+    return link;
+}
+
 function joinUrlPart(foo: string, bar: string) {
     if (foo.endsWith('/')) {
         return foo.substring(0, foo.length - 1) + bar;
@@ -21,11 +28,14 @@ export function wrap<T extends string, K extends { className?: string }>(
         ...otherProps
     } = props;
 
-    const fullPath = parent ? joinUrlPart(parent.path, path) : path;
+    const fullPathForRoute = parent ? joinUrlPart(removeAsterisk(parent.path), path) : path;
+    const fullPath = removeAsterisk(fullPathForRoute);
 
     return {
         ...otherProps,
         path: fullPath,
+        pathForRoute: path,
+        // NOTE: this is not used anywhere
         originalPath: path,
         load: (overrideProps: Partial<typeof componentProps>) => (
             <Page
diff --git a/app/components/CommaSeparateItems/index.tsx b/app/components/CommaSeparateItems/index.tsx
index 321d16fb02..10626d3f42 100644
--- a/app/components/CommaSeparateItems/index.tsx
+++ b/app/components/CommaSeparateItems/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { _cs } from '@togglecorp/fujs';
 
 import { joinList } from '#utils/common';
@@ -18,6 +18,11 @@ interface Props {
 // FIXME may need to add key on the commas
 function CommaSeparateItems(props: Props) {
     const { items, className } = props;
+
+    const title = useMemo(() => (
+        items?.map((i) => i.name)?.join(', ') ?? undefined
+    ), [items]);
+
     if (!items || items.length < 1) {
         return null;
     }
@@ -32,7 +37,10 @@ function CommaSeparateItems(props: Props) {
     ));
 
     return (
-        <span className={_cs(className, styles.items)}>
+        <span
+            className={_cs(className, styles.items)}
+            title={title}
+        >
             { joinList(list) }
         </span>
     );
diff --git a/app/components/FullPageHeader/index.tsx b/app/components/FullPageHeader/index.tsx
deleted file mode 100644
index 3df67b4421..0000000000
--- a/app/components/FullPageHeader/index.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import React from 'react';
-import { _cs } from '@togglecorp/fujs';
-import {
-    Heading,
-    Border,
-} from '@the-deep/deep-ui';
-
-import Svg from '#components/Svg';
-import deepLogo from '#resources/img/deep-logo-new.svg';
-
-import styles from './styles.css';
-
-// FIXME: this should be obsolete
-
-interface FullPageHeaderProps {
-    className?: string;
-    children?: React.ReactNode;
-    actions?: React.ReactNode;
-    heading?: React.ReactNode;
-    description?: React.ReactNode;
-}
-
-function FullPageHeader(props: FullPageHeaderProps) {
-    const {
-        className,
-        children,
-        heading,
-        actions,
-        description,
-    } = props;
-
-    return (
-        <div className={_cs(styles.fullPageHeader, className)}>
-            <div className={styles.headingSection}>
-                <div className={styles.appBrand}>
-                    <Svg
-                        className={styles.logo}
-                        src={deepLogo}
-                    />
-                </div>
-                <div className={styles.headingContainer}>
-                    <Heading
-                        size="medium"
-                        className={styles.heading}
-                    >
-                        {heading}
-                    </Heading>
-                </div>
-                {description && (
-                    <div className={styles.descriptionContainer}>
-                        <div className={styles.description}>
-                            {description}
-                        </div>
-                    </div>
-                )}
-            </div>
-            <div className={styles.menuSection}>
-                {children}
-            </div>
-            <div className={styles.actionsSection}>
-                {actions}
-            </div>
-            <Border width="thin" />
-        </div>
-    );
-}
-
-export default FullPageHeader;
diff --git a/app/components/FullPageHeader/styles.css b/app/components/FullPageHeader/styles.css
deleted file mode 100644
index 6ad2d39610..0000000000
--- a/app/components/FullPageHeader/styles.css
+++ /dev/null
@@ -1,62 +0,0 @@
-.full-page-header {
-    display: flex;
-    position: relative;
-    align-items: center;
-    background-color: var(--dui-color-foreground);
-    padding: 0 var(--dui-spacing-super-large);
-    overflow: auto;
-    --gap: var(--dui-spacing-large);
-    gap: var(--gap);
-
-    .heading-section {
-        display: flex;
-        align-items: center;
-        padding: var(--dui-spacing-medium) 0;
-        overflow: auto;
-        gap: var(--gap);
-
-        .app-brand {
-            flex-shrink: 0;
-            overflow: auto;
-            color: var(--dui-color-brand);
-
-            .logo {
-                height: var(--dui-font-size-super-large);
-            }
-        }
-
-        .heading-container {
-            flex-grow: 1;
-            overflow: auto;
-
-            .heading {
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-            }
-        }
-
-        .description-container {
-            flex-grow: 0.5;
-            overflow: auto;
-
-            .description {
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-            }
-        }
-    }
-
-    .menu-section {
-        display: flex;
-        align-self: stretch;
-        flex-grow: 1;
-        justify-content: center;
-    }
-
-    .actions-section {
-        display: flex;
-        flex-shrink: 0;
-    }
-}
diff --git a/app/components/GeoLocationInput/GeoLocationModal/GeoLocationMapInput/GeoAreaListItem/styles.css b/app/components/GeoLocationInput/GeoLocationModal/GeoLocationMapInput/GeoAreaListItem/styles.css
index fb3a9640ff..619b86aee4 100644
--- a/app/components/GeoLocationInput/GeoLocationModal/GeoLocationMapInput/GeoAreaListItem/styles.css
+++ b/app/components/GeoLocationInput/GeoLocationModal/GeoLocationMapInput/GeoAreaListItem/styles.css
@@ -1,3 +1,8 @@
 .geo-area-list-item {
     display: flex;
+    padding: var(--dui-spacing-small);
+
+    &:hover {
+        background-color: var(--dui-color-background-hover);
+    }
 }
diff --git a/app/components/GeoLocationInput/GeoLocationModal/GeoLocationMapInput/index.tsx b/app/components/GeoLocationInput/GeoLocationModal/GeoLocationMapInput/index.tsx
index 9bf2b360be..94b5a42c20 100644
--- a/app/components/GeoLocationInput/GeoLocationModal/GeoLocationMapInput/index.tsx
+++ b/app/components/GeoLocationInput/GeoLocationModal/GeoLocationMapInput/index.tsx
@@ -1,16 +1,15 @@
 import React, { useState, useMemo, useCallback } from 'react';
 import { _cs } from '@togglecorp/fujs';
-import { useLazyQuery, useQuery, gql } from '@apollo/client';
+import { useQuery, gql } from '@apollo/client';
 import {
     Container,
     SelectInput,
     ListView,
     ContainerCard,
+    Kraken,
 } from '@the-deep/deep-ui';
 import GeoMultiSelectInput, { GeoArea } from '#components/GeoMultiSelectInput';
 import {
-    ProjectGeoAreasQuery,
-    ProjectGeoAreasQueryVariables,
     ProjectRegionsQuery,
     ProjectRegionsQueryVariables,
 } from '#generated/types';
@@ -30,30 +29,14 @@ function geoAreaKeySelector(geoArea: GeoArea) {
     return geoArea.id;
 }
 
-const GEOAREAS = gql`
-    query ProjectGeoAreas(
-        $projectId: ID!,
-        $ids: [ID!],
-    ) {
-        project(id: $projectId) {
-            geoAreas(ids: $ids) {
-                results {
-                    adminLevelTitle
-                    id
-                    regionTitle
-                    title
-                }
-            }
-        }
-    }
-`;
-
 const PROJECT_REGIONS = gql`
     query ProjectRegions($projectId: ID!) {
         project(id: $projectId) {
+            id
             regions {
                 title
                 id
+                isPublished
                 adminLevels {
                     id
                     level
@@ -100,17 +83,6 @@ function GeoLocationMapInput(props: Props) {
         setActiveAdminLevel,
     ] = useState<string | undefined>();
 
-    const [
-        getGeoAreas,
-    ] = useLazyQuery<ProjectGeoAreasQuery, ProjectGeoAreasQueryVariables>(
-        GEOAREAS,
-        {
-            onCompleted: (data) => {
-                onGeoAreaOptionsChange(data.project?.geoAreas?.results);
-            },
-        },
-    );
-
     const variables = useMemo(() => ({
         projectId,
     }
@@ -125,7 +97,9 @@ function GeoLocationMapInput(props: Props) {
             skip: !projectId,
             variables,
             onCompleted: (data) => {
-                const [topRegion] = data.project?.regions ?? [];
+                const [topRegion] = data.project?.regions?.filter(
+                    (region) => region.isPublished,
+                ) ?? [];
                 const topAdminLevel = topRegion?.adminLevels?.find((v) => v.level === 0)
                     ?? topRegion?.adminLevels?.[0];
 
@@ -135,16 +109,6 @@ function GeoLocationMapInput(props: Props) {
         },
     );
 
-    const handleGeoAreasMapSelection = useCallback((values: string[]) => {
-        onChange(values);
-        getGeoAreas({
-            variables: {
-                ids: values,
-                projectId,
-            },
-        });
-    }, [onChange, getGeoAreas, projectId]);
-
     const handleRegionChange = useCallback((newRegion: string | undefined) => {
         setSelectedRegion(newRegion);
 
@@ -164,11 +128,12 @@ function GeoLocationMapInput(props: Props) {
     const geoAreaGroupRendererParams = useCallback((key: string) => ({
         heading: key,
         headingSize: 'extraSmall',
+        spacing: 'compact',
     }), []);
 
     const geoAreasRendererParams = useCallback((_: string, geoArea: GeoArea) => ({
         id: `${geoArea.id}`,
-        value: breadcrumb([geoArea.regionTitle, geoArea.adminLevelTitle, geoArea.title]),
+        value: breadcrumb([geoArea.adminLevelTitle, geoArea.title]),
         onDismiss: handleRemoveItem,
     }), [handleRemoveItem]);
 
@@ -176,6 +141,10 @@ function GeoLocationMapInput(props: Props) {
         geoAreaOptions?.filter((item) => value?.includes(item.id))
     ), [geoAreaOptions, value]);
 
+    const filteredProjectRegions = useMemo(() => (
+        projectRegions?.project?.regions?.filter((region) => region.isPublished)
+    ), [projectRegions?.project?.regions]);
+
     return (
         <div className={_cs(className, styles.geoLocationMapInput)}>
             <div className={styles.mapSelection}>
@@ -186,7 +155,7 @@ function GeoLocationMapInput(props: Props) {
                         )}
                         name="regionSelect"
                         onChange={handleRegionChange}
-                        options={projectRegions?.project?.regions}
+                        options={filteredProjectRegions}
                         keySelector={regionKeySelector}
                         labelSelector={regionLabelSelector}
                         value={selectedRegion}
@@ -210,12 +179,16 @@ function GeoLocationMapInput(props: Props) {
                     regionId={selectedRegion}
                     onAdminLevelChange={setActiveAdminLevel}
                     selectedGeoAreas={value}
-                    onSelectedGeoAreasChange={handleGeoAreasMapSelection}
+                    showTooltip
+                    onSelectedGeoAreasChange={onChange}
+                    geoAreaOptions={geoAreaOptions}
+                    onGeoAreaOptionsChange={onGeoAreaOptionsChange}
                 />
             </div>
             <Container
                 className={styles.selectedGeoAreas}
                 heading="Selected Geo Areas"
+                spacing="none"
                 headingSize="small"
             >
                 <ListView
@@ -227,9 +200,18 @@ function GeoLocationMapInput(props: Props) {
                     data={geoAreasList}
                     renderer={GeoAreaListItem}
                     keySelector={geoAreaKeySelector}
-                    emptyIcon={null}
-                    emptyMessage={null}
                     rendererParams={geoAreasRendererParams}
+                    filtered={false}
+                    errored={false}
+                    pending={false}
+                    emptyIcon={(
+                        <Kraken
+                            variant="hi"
+                        />
+                    )}
+                    emptyMessage="No geo areas selected."
+                    messageIconShown
+                    messageShown
                 />
             </Container>
         </div>
diff --git a/app/components/GeoLocationInput/GeoLocationModal/GeoLocationMapInput/styles.css b/app/components/GeoLocationInput/GeoLocationModal/GeoLocationMapInput/styles.css
index 65324a0e13..6fdce0bab7 100644
--- a/app/components/GeoLocationInput/GeoLocationModal/GeoLocationMapInput/styles.css
+++ b/app/components/GeoLocationInput/GeoLocationModal/GeoLocationMapInput/styles.css
@@ -1,11 +1,11 @@
 .geo-location-map-input {
     display: flex;
     flex-grow: 1;
-    width: 80vw;
-    height: 70vh;
+    gap: var(--dui-spacing-medium);
 
     .map-selection {
         display: flex;
+        align-self: stretch;
         flex-basis: 75%;
         flex-direction: column;
 
diff --git a/app/components/GeoLocationInput/GeoLocationModal/index.tsx b/app/components/GeoLocationInput/GeoLocationModal/index.tsx
index 8b22fdd31c..0678d0a811 100644
--- a/app/components/GeoLocationInput/GeoLocationModal/index.tsx
+++ b/app/components/GeoLocationInput/GeoLocationModal/index.tsx
@@ -42,6 +42,7 @@ function GeoLocationModal(props: Props) {
         <Modal
             heading="Select Geo Areas"
             className={_cs(className, styles.geoLocationModal)}
+            size="cover"
             onCloseButtonClick={onModalClose}
             footerActions={(
                 <>
@@ -62,6 +63,7 @@ function GeoLocationModal(props: Props) {
                     </Button>
                 </>
             )}
+            bodyClassName={styles.content}
         >
             <GeoLocationMapInput
                 projectId={projectId}
diff --git a/app/components/GeoLocationInput/GeoLocationModal/styles.css b/app/components/GeoLocationInput/GeoLocationModal/styles.css
index 9af0d7de60..3c4e466c95 100644
--- a/app/components/GeoLocationInput/GeoLocationModal/styles.css
+++ b/app/components/GeoLocationInput/GeoLocationModal/styles.css
@@ -1,3 +1,5 @@
 .geo-location-modal {
-    display: flex;
+    .content {
+        display: flex;
+    }
 }
diff --git a/app/components/GeoLocationInput/index.tsx b/app/components/GeoLocationInput/index.tsx
index 569318a95d..fedebe8a43 100644
--- a/app/components/GeoLocationInput/index.tsx
+++ b/app/components/GeoLocationInput/index.tsx
@@ -20,6 +20,7 @@ interface Props<N extends string> {
     error?: string;
     readOnly?: boolean;
     disabled?: boolean;
+    showList?: boolean;
     geoAreaOptions: GeoArea[] | undefined | null;
     onGeoAreaOptionsChange: React.Dispatch<React.SetStateAction<GeoArea[] | undefined | null>>;
 }
@@ -32,6 +33,7 @@ function GeoLocationInput<N extends string>(props: Props<N>) {
         disabled,
         readOnly,
         error,
+        showList,
         geoAreaOptions,
         onGeoAreaOptionsChange,
     } = props;
@@ -86,6 +88,7 @@ function GeoLocationInput<N extends string>(props: Props<N>) {
                                 <IoEarth />
                             </Button>
                         )}
+                        selectionListShown={showList}
                     />
                     {isGeoLocationModalVisible && (
                         <GeoLocationModal
diff --git a/app/components/GeoMultiSelectInput/index.tsx b/app/components/GeoMultiSelectInput/index.tsx
index 6a3cbed3c0..8ee79c28f9 100644
--- a/app/components/GeoMultiSelectInput/index.tsx
+++ b/app/components/GeoMultiSelectInput/index.tsx
@@ -15,6 +15,7 @@ const GEOAREAS = gql`
         $search: String,
     ) {
         project(id: $projectId) {
+            id
             geoAreas(search: $search) {
                 results {
                     adminLevelTitle
@@ -31,7 +32,7 @@ const GEOAREAS = gql`
 export type GeoArea = NonNullable<NonNullable<NonNullable<NonNullable<GeoAreaOptionsQuery['project']>>['geoAreas']>['results']>[number];
 
 const keySelector = (d: GeoArea) => d.id;
-const labelSelector = (d: GeoArea) => breadcrumb([d.regionTitle, d.adminLevelTitle, d.title]);
+const labelSelector = (d: GeoArea) => breadcrumb([d.adminLevelTitle, d.title]);
 type Def = { containerClassName?: string };
 type GeoSelectInputProps<K extends string> = SearchMultiSelectInputProps<
     string,
diff --git a/app/components/Notifications/NotificationContainer/index.tsx b/app/components/Notifications/NotificationContainer/index.tsx
index 37317ae068..2454c7bfd2 100644
--- a/app/components/Notifications/NotificationContainer/index.tsx
+++ b/app/components/Notifications/NotificationContainer/index.tsx
@@ -13,6 +13,7 @@ import {
 import {
     Button,
     QuickActionButton,
+    PendingMessage,
     useAlert,
     Container,
     DateOutput,
@@ -43,6 +44,7 @@ mutation NotificationStatusUpdate($notificationId: ID!, $newStatus: Notification
                 title
             }
             status
+            statusDisplay
             timestamp
         }
     }
@@ -57,6 +59,7 @@ interface Props {
     description?: string;
     descriptionLabel?: string;
     actions?: React.ReactNode;
+    pendingRequests?: boolean;
 }
 
 function NotificationContainer(props: Props) {
@@ -71,6 +74,7 @@ function NotificationContainer(props: Props) {
         },
         description,
         actions,
+        pendingRequests = false,
         descriptionLabel,
     } = props;
 
@@ -83,19 +87,38 @@ function NotificationContainer(props: Props) {
 
     const [
         updateStatus,
+        { loading },
     ] = useMutation<NotificationStatusUpdateMutation, NotificationStatusUpdateMutationVariables>(
         NOTIFICATION_STATUS_UPDATE,
         {
+            refetchQueries: ['UserNotificationsCount'],
             onCompleted: (response) => {
                 if (response?.notificationStatusUpdate?.ok) {
+                    const newStatus = response.notificationStatusUpdate?.result?.statusDisplay;
                     alert.show(
-                        'Successfully updated notification seen status.',
+                        `Successfully updated notification status as ${newStatus?.toLowerCase() ?? 'required'}.`,
                         {
                             variant: 'success',
                         },
                     );
+                } else {
+                    alert.show(
+                        'Failed to update notification status.',
+                        {
+                            variant: 'error',
+                        },
+                    );
                 }
             },
+
+            onError: () => {
+                alert.show(
+                    'Failed to update notification status.',
+                    {
+                        variant: 'error',
+                    },
+                );
+            },
         },
     );
 
@@ -127,6 +150,7 @@ function NotificationContainer(props: Props) {
             contentClassName={styles.content}
             footerActions={actions}
         >
+            {(loading || pendingRequests) && (<PendingMessage />)}
             <Avatar
                 className={styles.displayPicture}
                 // NOTE: We'll add user profiles later after we fix it from server side
@@ -139,7 +163,7 @@ function NotificationContainer(props: Props) {
                 </div>
                 <div className={styles.dateContainer}>
                     <DateOutput
-                        format="dd-MM-yyyy at hh:mm AAA"
+                        format="dd-MM-yyyy at hh:mm aaa"
                         value={timestamp}
                     />
                     {isDefined(description) && (
@@ -163,6 +187,7 @@ function NotificationContainer(props: Props) {
             <QuickActionButton
                 name={undefined}
                 className={styles.button}
+                title={status === 'SEEN' ? 'Mark as unseen' : 'Mark as seen'}
                 onClick={status === 'SEEN' ? handleUnseenClick : handleSeenClick}
             >
                 {status === 'SEEN' ? <IoArrowUndoSharp /> : <IoCheckmark />}
diff --git a/app/components/Notifications/NotificationContainer/styles.css b/app/components/Notifications/NotificationContainer/styles.css
index 5119431a5c..b7a16dcbeb 100644
--- a/app/components/Notifications/NotificationContainer/styles.css
+++ b/app/components/Notifications/NotificationContainer/styles.css
@@ -40,6 +40,7 @@
         }
 
         .description {
+            word-break: break-word;
             color: var(--dui-color-text-label);
             font-size: var(--dui-font-size-medium);
         }
diff --git a/app/components/Notifications/NotificationItem/ProjectJoinRequestItem/index.tsx b/app/components/Notifications/NotificationItem/ProjectJoinRequestItem/index.tsx
index d998db509f..308a737bd3 100644
--- a/app/components/Notifications/NotificationItem/ProjectJoinRequestItem/index.tsx
+++ b/app/components/Notifications/NotificationItem/ProjectJoinRequestItem/index.tsx
@@ -31,7 +31,12 @@ mutation JoinRequestAcceptReject(
     $status: ProjectJoinRequestStatusEnum,
 ) {
     project(id: $projectId) {
+        id
         acceptRejectProject(id: $requestId, data: { status: $status }) {
+            result {
+                id
+                status
+            }
             ok
             errors
         }
@@ -57,20 +62,40 @@ function ProjectJoinRequestItem(props: Props) {
 
     const [
         updateStatus,
+        { loading },
     ] = useMutation<JoinRequestAcceptRejectMutation, JoinRequestAcceptRejectMutationVariables>(
         JOIN_REQUEST_ACCEPT_REJECT,
         {
+            refetchQueries: ['UserNotificationsCount'],
             onCompleted: (response) => {
                 if (response?.project?.acceptRejectProject?.ok) {
+                    const status = response.project.acceptRejectProject?.result?.status;
                     alert.show(
-                        'Successfully updated notification status.',
+                        status === 'ACCEPTED'
+                            ? 'Successfully added user to the project.'
+                            : 'Successfully rejected the request to join the project.',
                         {
                             variant: 'success',
                         },
                     );
                     onNotificationUpdate();
+                } else {
+                    alert.show(
+                        'Failed to update notification status.',
+                        {
+                            variant: 'error',
+                        },
+                    );
                 }
             },
+            onError: () => {
+                alert.show(
+                    'Failed to update notification status.',
+                    {
+                        variant: 'error',
+                    },
+                );
+            },
         },
     );
 
@@ -107,6 +132,7 @@ function ProjectJoinRequestItem(props: Props) {
             userName={data?.requested_by?.display_name}
             descriptionLabel="Reason"
             description={data?.reason}
+            pendingRequests={loading}
             content={
                 generateString(
                     '{requestorName} requested to join the project {projectTitle}.',
@@ -126,6 +152,7 @@ function ProjectJoinRequestItem(props: Props) {
                         )}
                         spacing="compact"
                         variant="secondary"
+                        disabled={loading}
                     >
                         Reject
                     </Button>
@@ -136,6 +163,7 @@ function ProjectJoinRequestItem(props: Props) {
                         icons={(
                             <IoCheckmark />
                         )}
+                        disabled={loading}
                     >
                         Accept
                     </Button>
diff --git a/app/components/Notifications/NotificationItem/index.tsx b/app/components/Notifications/NotificationItem/index.tsx
index 64237ccf7e..ff94834599 100644
--- a/app/components/Notifications/NotificationItem/index.tsx
+++ b/app/components/Notifications/NotificationItem/index.tsx
@@ -9,9 +9,10 @@ import { generatePath } from 'react-router-dom';
 import generateString from '#utils/string';
 import routes from '#base/configs/routes';
 
-import { Notification } from '../types';
+import { Notification, ReviewEntryCommentAdd } from '../types';
 import NotificationContainer from '../NotificationContainer';
 import ProjectJoinRequestItem from './ProjectJoinRequestItem';
+import { EntryAction } from '#components/entryReview/commentConstants';
 import styles from './styles.css';
 
 interface Props {
@@ -20,6 +21,25 @@ interface Props {
     onNotificationUpdate: () => void;
 }
 
+function getCommentTokenString(data: ReviewEntryCommentAdd['data']) {
+    if (data?.comment_type === EntryAction.COMMENT) {
+        return '{createdByName} assigned you to a comment in an {entryLink} in the project {projectTitle}.';
+    }
+    if (data?.comment_type === EntryAction.VERIFY) {
+        return '{createdByName} verified an {entryLink} in the project {projectTitle}.';
+    }
+    if (data?.comment_type === EntryAction.UNVERIFY) {
+        return '{createdByName} unverified an {entryLink} in the project {projectTitle}.';
+    }
+    if (data?.comment_type === EntryAction.CONTROL) {
+        return '{createdByName} controlled an {entryLink} in the project {projectTitle}.';
+    }
+    if (data?.comment_type === EntryAction.UNCONTROL) {
+        return '{createdByName} uncontrolled an {entryLink} in the project {projectTitle}.';
+    }
+    return '';
+}
+
 function NotificationItem(props: Props) {
     const {
         className,
@@ -95,15 +115,15 @@ function NotificationItem(props: Props) {
             project,
         } = notification;
 
-        const editEntryLink = {
-            pathname: (generatePath(routes.entryEdit.path, {
+        const editEntryLink = (project?.id && data?.lead) ? ({
+            pathname: generatePath(routes.entryEdit.path, {
                 projectId: project?.id,
                 leadId: data?.lead,
-            })),
+            }),
             state: {
                 entryId: data?.entry,
             },
-        };
+        }) : undefined;
 
         return (
             <NotificationContainer
@@ -117,13 +137,15 @@ function NotificationItem(props: Props) {
                         '{createdByName} assigned you to a comment in the {entryLink} in the project {projectTitle}.',
                         {
                             createdByName: (<b>{data?.created_by_detail?.name}</b>),
-                            entryLink: (
+                            entryLink: editEntryLink ? (
                                 <Link
                                     className={styles.link}
                                     to={editEntryLink}
                                 >
                                     entry
                                 </Link>
+                            ) : (
+                                'entry'
                             ),
                             projectTitle: (<b>{project?.title}</b>),
                         },
@@ -138,7 +160,7 @@ function NotificationItem(props: Props) {
             project,
         } = notification;
 
-        const editEntryLink = {
+        const editEntryLink = (project?.id && data?.lead) ? ({
             pathname: (generatePath(routes.entryEdit.path, {
                 projectId: project?.id,
                 leadId: data?.lead,
@@ -146,7 +168,7 @@ function NotificationItem(props: Props) {
             state: {
                 entryId: data?.entry,
             },
-        };
+        }) : undefined;
 
         return (
             <NotificationContainer
@@ -160,13 +182,15 @@ function NotificationItem(props: Props) {
                         '{createdByName} modified the comment you were assigned to in the {entryLink} in the project {projectTitle}.',
                         {
                             createdByName: (<b>{data?.created_by_detail?.name}</b>),
-                            entryLink: (
+                            entryLink: editEntryLink ? (
                                 <Link
                                     className={styles.link}
                                     to={editEntryLink}
                                 >
                                     entry
                                 </Link>
+                            ) : (
+                                'entry'
                             ),
                             projectTitle: (<b>{project?.title}</b>),
                         },
@@ -359,7 +383,21 @@ function NotificationItem(props: Props) {
                 entryId: data?.entry,
             },
         };
-
+        const content = generateString(
+            getCommentTokenString(data),
+            {
+                createdByName: (<b>{data?.created_by_details?.name}</b>),
+                entryLink: (
+                    <Link
+                        className={styles.link}
+                        to={editEntryLink}
+                    >
+                        entry
+                    </Link>
+                ),
+                projectTitle: (<b>{data?.project_details?.title}</b>),
+            },
+        );
         return (
             <NotificationContainer
                 className={_cs(className, styles.notificationItem)}
@@ -367,26 +405,11 @@ function NotificationItem(props: Props) {
                 userName={data?.created_by_details?.name}
                 descriptionLabel="Comment"
                 description={data?.text}
-                content={
-                    generateString(
-                        '{createdByName} assigned you to a comment in the {entryLink} in the project {projectTitle}.',
-                        {
-                            createdByName: (<b>{data?.created_by_details?.name}</b>),
-                            entryLink: (
-                                <Link
-                                    className={styles.link}
-                                    to={editEntryLink}
-                                >
-                                    entry
-                                </Link>
-                            ),
-                            projectTitle: (<b>{data?.project_details?.title}</b>),
-                        },
-                    )
-                }
+                content={content}
             />
         );
     }
+
     if (notification.notificationType === 'ENTRY_REVIEW_COMMENT_MODIFY') {
         const { data } = notification;
 
diff --git a/app/components/Notifications/index.tsx b/app/components/Notifications/index.tsx
index 7f5d4453d8..f39c823329 100644
--- a/app/components/Notifications/index.tsx
+++ b/app/components/Notifications/index.tsx
@@ -3,12 +3,13 @@ import { _cs } from '@togglecorp/fujs';
 import { useQuery, gql } from '@apollo/client';
 import {
     ListView,
+    Checkbox,
     Tabs,
-    PendingMessage,
     Pager,
     Tab,
     TabList,
     Container,
+    Kraken,
 } from '@the-deep/deep-ui';
 
 import {
@@ -54,11 +55,13 @@ const USER_NOTIFICATIONS = gql`
     query UserNotifications(
         $isPending: Boolean,
         $page: Int,
+        $status: NotificationStatusEnum,
         $pageSize: Int,
     ) {
         notifications(
             isPending: $isPending,
             page: $page,
+            status: $status,
             pageSize: $pageSize,
         ) {
             totalCount
@@ -89,17 +92,21 @@ function Notifications(props: Props) {
         className,
     } = props;
 
+    const [doneNotificationsHidden, onDoneNotificationsHiddenChange] = useState(true);
+
     const [activeView, setActiveView] = React.useState<'notifications' | 'requests' | undefined>('notifications');
     const [page, setPage] = useState<number>(1);
 
     const variables = useMemo(() => ({
         isPending: activeView === 'requests',
         page,
+        status: doneNotificationsHidden ? 'UNSEEN' as const : undefined,
         pageSize: PAGE_SIZE,
-    }), [activeView, page]);
+    }), [activeView, page, doneNotificationsHidden]);
 
     const {
-        data,
+        previousData,
+        data = previousData,
         loading,
         refetch,
     } = useQuery<UserNotificationsQuery, UserNotificationsQueryVariables>(
@@ -128,7 +135,6 @@ function Notifications(props: Props) {
             value={activeView}
             onChange={setActiveView}
         >
-            {loading && <PendingMessage />}
             <Container
                 className={_cs(styles.notifications, className)}
                 spacing="none"
@@ -149,6 +155,15 @@ function Notifications(props: Props) {
                         </Tab>
                     </TabList>
                 )}
+                headerActionsContainerClassName={styles.headerActions}
+                headerActions={(
+                    <Checkbox
+                        name={undefined}
+                        label="Hide seen notifications"
+                        value={doneNotificationsHidden}
+                        onChange={onDoneNotificationsHiddenChange}
+                    />
+                )}
                 borderBelowHeader
                 footerActions={(
                     <Pager
@@ -168,6 +183,17 @@ function Notifications(props: Props) {
                     rendererParams={notificationRendererParams}
                     rendererClassName={styles.notificationItem}
                     keySelector={notificationKeySelector}
+                    filtered={false}
+                    errored={false}
+                    pending={loading}
+                    emptyIcon={(
+                        <Kraken
+                            variant="hi"
+                        />
+                    )}
+                    emptyMessage="You're all caught up."
+                    messageShown
+                    messageIconShown
                     /*
                         grouped
                         groupRendererParams={notificationGroupRendererParams}
diff --git a/app/components/Notifications/styles.css b/app/components/Notifications/styles.css
index 86f357cc65..a69fe7fd12 100644
--- a/app/components/Notifications/styles.css
+++ b/app/components/Notifications/styles.css
@@ -8,6 +8,10 @@
         background-color: var(--dui-color-foreground);
     }
     */
+    .header-actions {
+        align-self: center;
+        padding: var(--dui-spacing-small) var(--dui-spacing-medium);
+    }
 
     .notification-list {
         display: flex;
diff --git a/app/components/Notifications/types.ts b/app/components/Notifications/types.ts
index 618bd9d7f4..036edabd94 100644
--- a/app/components/Notifications/types.ts
+++ b/app/components/Notifications/types.ts
@@ -6,23 +6,23 @@ export type NotificationFromServer = NonNullable<NonNullable<NonNullable<UserNot
 
 export type BaseNotification = Omit<NotificationFromServer, 'data' | 'notificationType'>;
 
-interface ReviewEntryCommentAdd {
+export interface ReviewEntryCommentAdd {
     notificationType: 'ENTRY_REVIEW_COMMENT_ADD';
     data: {
-        // eslint-disable-next-line camelcase
+
         comment_type: number;
-        // eslint-disable-next-line camelcase
+
         created_at: string;
         entry: number;
         lead: number;
         id: number;
         text: string;
-        // eslint-disable-next-line camelcase
+
         created_by_details: {
             id: number;
             name: string;
         };
-        // eslint-disable-next-line camelcase
+
         project_details: {
             id: number;
             title: string;
@@ -33,20 +33,20 @@ interface ReviewEntryCommentAdd {
 interface ReviewEntryCommentModify {
     notificationType: 'ENTRY_REVIEW_COMMENT_MODIFY';
     data: {
-        // eslint-disable-next-line camelcase
+
         comment_type: number;
-        // eslint-disable-next-line camelcase
+
         created_at: string;
         entry: number;
         lead: number;
         id: number;
         text: string;
-        // eslint-disable-next-line camelcase
+
         created_by_details: {
             id: number;
             name: string;
         };
-        // eslint-disable-next-line camelcase
+
         project_details: {
             id: number;
             title: string;
@@ -57,13 +57,13 @@ interface ReviewEntryCommentModify {
 export interface ProjectJoinRequest {
     notificationType: 'PROJECT_JOIN_REQUEST';
     data: {
-        // eslint-disable-next-line camelcase
+
         requested_at: string;
         id: number;
-        // eslint-disable-next-line camelcase
+
         requested_by: {
             id: number;
-            // eslint-disable-next-line camelcase
+
             display_name: string;
         };
         reason: string;
@@ -80,16 +80,16 @@ interface ProjectJoinResponse {
     data: {
         id: number;
         status: 'rejected' | 'accepted';
-        // eslint-disable-next-line camelcase
+
         requested_by: {
             id: number;
-            // eslint-disable-next-line camelcase
+
             display_name: string;
         };
-        // eslint-disable-next-line camelcase
+
         responded_by: {
             id: number;
-            // eslint-disable-next-line camelcase
+
             display_name: string;
         };
         reason: string;
@@ -104,10 +104,10 @@ interface ProjectJoinRequestAbort {
     notificationType: 'PROJECT_JOIN_REQUEST_ABORT';
     data: {
         id: number;
-        // eslint-disable-next-line camelcase
+
         requested_by: {
             id: number;
-            // eslint-disable-next-line camelcase
+
             display_name: string;
         };
         reason: string;
@@ -129,7 +129,7 @@ interface EntryCommentGeneral {
 
     data: {
         id: number;
-        // eslint-disable-next-line camelcase
+
         created_by_detail: {
             id: number;
             name: string;
diff --git a/app/components/OrganigramInput/index.tsx b/app/components/OrganigramInput/index.tsx
index bace8fc82a..9b88b3b86b 100644
--- a/app/components/OrganigramInput/index.tsx
+++ b/app/components/OrganigramInput/index.tsx
@@ -5,6 +5,7 @@ import OrgTree from 'react-org-tree';
 import {
     Card,
 } from '@the-deep/deep-ui';
+
 import styles from './styles.css';
 
 import NonFieldError from '#components/NonFieldError';
diff --git a/app/components/OrganigramInput/styles.css b/app/components/OrganigramInput/styles.css
index d99d4a199f..4c51e98db9 100644
--- a/app/components/OrganigramInput/styles.css
+++ b/app/components/OrganigramInput/styles.css
@@ -6,6 +6,13 @@
         }
     }
 }
+.disabled {
+    :global {
+        .org-tree-node-label {
+            pointer-events: none;
+        }
+    }
+}
 
 .card {
     display: flex;
@@ -19,11 +26,3 @@
         color: var(--dui-color-text-on-accent);
     }
 }
-
-.disabled {
-    :global {
-        .org-tree-node-label {
-            pointer-events: none;
-        }
-    }
-}
diff --git a/app/components/Screenshot/index.tsx b/app/components/Screenshot/index.tsx
index 665370a936..dbf1b32432 100644
--- a/app/components/Screenshot/index.tsx
+++ b/app/components/Screenshot/index.tsx
@@ -5,6 +5,7 @@ import { select } from 'd3-selection';
 import { _cs } from '@togglecorp/fujs';
 
 import { getScreenshot } from '#utils/browserExtension';
+
 import styles from './styles.css';
 
 function getCroppedImage(
@@ -31,8 +32,14 @@ function getCroppedImage(
 
     context.drawImage(
         image,
-        startX, startY, canvas.width, canvas.height,
-        0, 0, canvas.width, canvas.height,
+        startX,
+        startY,
+        canvas.width,
+        canvas.height,
+        0,
+        0,
+        canvas.width,
+        canvas.height,
     );
 
     const croppedImage = canvas.toDataURL('image/jpeg');
@@ -135,10 +142,10 @@ function Screenshot(props: Props) {
         }).catch(() => {
             // FIXME: use strings
             const captureError = (
-                <>
+                <div className={styles.error}>
                     In order to use the screenshot functionality,
                     you must have the Chrome extension installed.
-                    You can download it from the Chrome store
+                    You can download it from the chrome web store
                     <a
                         className={styles.link}
                         href="https://chrome.google.com/webstore/detail/deep-2-add-lead/kafonkgglonkbldmcigbdojiadfcmcdc"
@@ -147,7 +154,7 @@ function Screenshot(props: Props) {
                     >
                         here.
                     </a>
-                </>
+                </div>
             );
             if (onCaptureError) {
                 onCaptureError(captureError);
diff --git a/app/components/Screenshot/styles.css b/app/components/Screenshot/styles.css
index 08113a4cb9..0eb2e960eb 100644
--- a/app/components/Screenshot/styles.css
+++ b/app/components/Screenshot/styles.css
@@ -1,7 +1,11 @@
-.link {
-    padding: 0 var(--dui-spacing-extra-small);
-    text-transform: none;
-    color: var(--dui-color-accent);
+.error {
+    display: inline-block;
+
+    .link {
+        padding: 0 var(--dui-spacing-extra-small);
+        text-transform: none;
+        color: var(--dui-color-text-on-danger);
+    }
 }
 
 .screenshot {
diff --git a/app/components/SortableList/index.tsx b/app/components/SortableList/index.tsx
index 2c6af9341e..f227f6f331 100644
--- a/app/components/SortableList/index.tsx
+++ b/app/components/SortableList/index.tsx
@@ -124,7 +124,7 @@ export type Props<
     GP extends GroupCommonProps,
     GK extends OptionKey,
     ItemContainerParams,
-> = Omit<ListViewProps<D, P, K, GP, GK>, 'keySelector' | 'renderer'> & {
+> = Omit<ListViewProps<D, P, K, GP, GK>, 'keySelector' | 'renderer' | 'direction' | 'pending' | 'filtered' | 'errored'> & {
     name: N;
     keySelector: (val: D) => K;
     renderer: (props: P & {
@@ -137,6 +137,9 @@ export type Props<
     direction: 'vertical' | 'horizontal' | 'rect';
     showDragOverlay?: boolean;
     itemContainerParams?: (key: K, datum: D, index: number, data: D[]) => ItemContainerParams;
+    pending?: boolean;
+    filtered?: boolean;
+    errored?: boolean;
 }
 
 function SortableList<
@@ -147,9 +150,7 @@ function SortableList<
     GP extends GroupCommonProps,
     GK extends OptionKey,
     ItemContainerParams,
->(
-    props: Props<N, D, P, K, GP, GK, ItemContainerParams>,
-) {
+>(props: Props<N, D, P, K, GP, GK, ItemContainerParams>) {
     const {
         className,
         name,
@@ -161,6 +162,9 @@ function SortableList<
         direction,
         showDragOverlay,
         itemContainerParams,
+        pending = false,
+        filtered = false,
+        errored = false,
         ...otherProps
     } = props;
     const [activeId, setActiveId] = useState<string | undefined>();
@@ -295,14 +299,15 @@ function SortableList<
                 strategy={sortingStrategy}
             >
                 <ListView
-                    emptyIcon={null}
-                    emptyMessage={null}
                     className={className}
                     data={data}
                     keySelector={keySelector}
                     renderer={MemoizedSortableItem}
                     rendererParams={modifiedRendererParams}
                     {...otherProps}
+                    pending={pending}
+                    filtered={filtered}
+                    errored={errored}
                     grouped={false}
                 />
             </SortableContext>
diff --git a/app/components/SubNavbar/index.tsx b/app/components/SubNavbar/index.tsx
index 0b6d5ee0b3..7043b79336 100644
--- a/app/components/SubNavbar/index.tsx
+++ b/app/components/SubNavbar/index.tsx
@@ -2,9 +2,13 @@ import React, { useContext, useEffect, useRef } from 'react';
 import {
     Heading,
     Border,
+    Svg,
 } from '@the-deep/deep-ui';
+import { Link } from 'react-router-dom';
 import ReactDOM from 'react-dom';
 import { _cs } from '@togglecorp/fujs';
+import deepLogo from '#resources/img/deep-logo-new.svg';
+import route from '#base/configs/routes';
 
 import NavbarContext from './context';
 import styles from './styles.css';
@@ -81,6 +85,8 @@ interface SubNavbarProps {
 
     heading?: string;
     description?: string;
+
+    homeLinkShown?: boolean;
 }
 function SubNavbar(props: SubNavbarProps) {
     const {
@@ -96,6 +102,7 @@ function SubNavbar(props: SubNavbarProps) {
         descriptionClassName,
         descriptionContainerClassName,
         description,
+        homeLinkShown,
     } = props;
 
     const { setActionsNode, setIconsNode, setChildrenNode } = useContext(NavbarContext);
@@ -132,34 +139,50 @@ function SubNavbar(props: SubNavbarProps) {
     return (
         <nav className={_cs(className, styles.subNavbar)}>
             <div
+                key="icons"
                 ref={iconsRef}
                 className={_cs(styles.icons, iconsClassName)}
             >
+                {homeLinkShown && (
+                    <Link
+                        to={route.home.path}
+                        className={styles.appBrand}
+                    >
+                        <Svg
+                            className={styles.logo}
+                            src={deepLogo}
+                        />
+                    </Link>
+                )}
                 {defaultIcons}
-            </div>
-            {heading && (
-                <Heading
-                    size="medium"
-                    className={_cs(styles.heading, headingClassName)}
-                >
-                    {heading}
-                </Heading>
-            )}
-            {description && (
-                <div className={_cs(styles.descriptionContainer, descriptionContainerClassName)}>
-                    <div className={_cs(styles.description, descriptionClassName)}>
-                        {description}
+                {heading && (
+                    <Heading
+                        size="medium"
+                        className={_cs(styles.heading, headingClassName)}
+                    >
+                        {heading}
+                    </Heading>
+                )}
+                {description && (
+                    <div
+                        className={_cs(styles.descriptionContainer, descriptionContainerClassName)}
+                    >
+                        <div className={_cs(styles.description, descriptionClassName)}>
+                            {description}
+                        </div>
                     </div>
-                </div>
-            )}
+                )}
+            </div>
             <div
                 ref={childrenRef}
+                key="children"
                 className={_cs(styles.children, childrenClassName)}
             >
                 {children}
             </div>
             <div
                 ref={actionsRef}
+                key="actions"
                 className={_cs(styles.actions, actionsClassName)}
             >
                 {defaultActions}
diff --git a/app/components/SubNavbar/styles.css b/app/components/SubNavbar/styles.css
index 5fa2dc34a6..3ec94897ee 100644
--- a/app/components/SubNavbar/styles.css
+++ b/app/components/SubNavbar/styles.css
@@ -1,47 +1,60 @@
 .sub-navbar {
     display: flex;
     position: relative;
+    justify-content: space-between;
     padding: 0 var(--dui-spacing-super-large);
-    --gap: var(--dui-spacing-large);
+    min-height: 60px;
     gap: var(--gap);
 
+    --gap: var(--dui-spacing-large);
+
     .children {
         display: flex;
-        flex-grow: 1;
         justify-content: center;
     }
 
-    .heading {
+    .icons {
+        display: flex;
         align-self: center;
-        flex-shrink: unset;
-        padding: var(--dui-spacing-medium) 0;
-    }
+        flex-basis: 0;
+        flex-grow: 1;
+        gap: var(--dui-spacing-medium);
 
-    .description-container {
-        align-self: center;
-        flex-shrink: unset;
-        overflow: auto;
+        .app-brand {
+            align-self: center;
+            overflow: auto;
+            color: var(--dui-color-brand);
 
-        .description {
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
+            .logo {
+                height: var(--dui-font-size-super-large);
+            }
         }
-    }
 
-    .icons {
-        display: flex;
-        align-self: center;
-        flex-shrink: 0;
-        padding: var(--dui-spacing-medium) 0;
-        gap: var(--dui-spacing-small);
+        .heading {
+            align-self: baseline;
+            flex-shrink: unset;
+            padding: var(--dui-spacing-medium) 0;
+        }
+
+        .description-container {
+            align-self: baseline;
+            flex-shrink: unset;
+            overflow: auto;
+
+            .description {
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+            }
+        }
     }
 
     .actions {
         display: flex;
         align-self: center;
-        flex-shrink: 0;
-        padding: var(--dui-spacing-medium) 0;
+        flex-basis: 0;
+        flex-grow: 1;
+        justify-content: end;
         gap: var(--dui-spacing-small);
 
         >* {
diff --git a/app/components/Svg/index.tsx b/app/components/Svg/index.tsx
deleted file mode 100644
index 6861e2deca..0000000000
--- a/app/components/Svg/index.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { randomString, _cs } from '@togglecorp/fujs';
-import SVGInjector from 'svg-injector';
-
-import styles from './styles.css';
-
-interface Props extends React.SVGProps<SVGSVGElement> {
-    className?: string;
-    evalScripts?: 'always' | 'once' | 'never';
-    fallback?: string;
-    onInject?: () => void;
-    src: string;
-}
-
-function Svg(props: Props) {
-    const {
-        className,
-        src,
-        evalScripts,
-        fallback,
-        onInject,
-        ...otherProps
-    } = props;
-
-    const [id] = useState(() => randomString(16));
-
-    useEffect(() => {
-        const svg = document.getElementById(id);
-        if (svg) {
-            svg.setAttribute('data-src', src);
-            const options = {
-                evalScripts,
-            };
-
-            SVGInjector(svg, options, onInject);
-        }
-
-        return () => {
-            if (svg) {
-                svg.remove();
-            }
-        };
-    }, [evalScripts, id, onInject, src]);
-
-    return (
-        <svg
-            id={id}
-            className={_cs(className, styles.svg)}
-            data-src={src}
-            data-fallback={fallback}
-            {...otherProps}
-        />
-    );
-}
-
-export default Svg;
diff --git a/app/components/Svg/styles.css b/app/components/Svg/styles.css
deleted file mode 100644
index c646cb4a1e..0000000000
--- a/app/components/Svg/styles.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.svg {
-    width: auto;
-    height: var(--font-size-medium);
-    color: inherit;
-
-    path {
-        color: inherit;
-        fill: currentColor;
-    }
-}
diff --git a/app/components/Timeline/index.tsx b/app/components/Timeline/index.tsx
index c96dbedb9f..69b4015de9 100644
--- a/app/components/Timeline/index.tsx
+++ b/app/components/Timeline/index.tsx
@@ -158,6 +158,9 @@ function Timeline<T>(props: TimelineProps<T>) {
                     renderer={TimeElement}
                     keySelector={keySelector}
                     rendererParams={timeElementRendererParams}
+                    filtered={false}
+                    errored={false}
+                    pending={false}
                 />
                 <ListView
                     className={styles.axis}
@@ -165,6 +168,9 @@ function Timeline<T>(props: TimelineProps<T>) {
                     renderer={AxisTick}
                     keySelector={axisTickKeySelector}
                     rendererParams={axisTickRendererParams}
+                    filtered={false}
+                    errored={false}
+                    pending={false}
                 />
             </div>
         </div>
diff --git a/app/components/entry/CompactSection/index.tsx b/app/components/entry/CompactSection/index.tsx
index d849bee18b..b115a99b77 100644
--- a/app/components/entry/CompactSection/index.tsx
+++ b/app/components/entry/CompactSection/index.tsx
@@ -2,6 +2,7 @@ import React, { useMemo, useCallback } from 'react';
 import {
     _cs,
     isDefined,
+    doesObjectHaveNoData,
 } from '@togglecorp/fujs';
 import {
     QuickActionButton,
@@ -12,7 +13,7 @@ import { SetValueArg, Error, getErrorObject } from '@togglecorp/toggle-form';
 import { IoAdd } from 'react-icons/io5';
 
 import { GeoArea } from '#components/GeoMultiSelectInput';
-import { Widget } from '#types/newAnalyticalFramework';
+import { Widget, getHiddenWidgetIds } from '#types/newAnalyticalFramework';
 import CompactAttributeInput, { Props as AttributeInputProps } from '#components/framework/CompactAttributeInput';
 import { PartialEntryType } from '#views/Project/EntryEdit/schema';
 
@@ -22,6 +23,9 @@ const widgetKeySelector = (d: Widget) => d.clientId;
 type WidgetAttribute = NonNullable<PartialEntryType['attributes']>[number];
 
 export interface Props {
+    // NOTE: if allWidgets is null/undefined/empty then the conditional widgets will be visible
+    allWidgets: Widget[] | undefined | null;
+
     className?: string;
     widgets: Widget[] | undefined | null;
     title?: string;
@@ -33,6 +37,7 @@ export interface Props {
     disabled?: boolean;
     entryClientId: string;
     sectionId?: string;
+    onApplyToAll?: (entryId: string, widgetId: string, applyBelowOnly?: boolean) => void;
     onAddButtonClick: (entryId: string, sectionId?: string) => void;
     geoAreaOptions: GeoArea[] | undefined | null;
     onGeoAreaOptionsChange: React.Dispatch<React.SetStateAction<GeoArea[] | undefined | null>>;
@@ -40,6 +45,7 @@ export interface Props {
 
 function CompactSection(props: Props) {
     const {
+        allWidgets,
         className,
         title,
         onAttributeChange,
@@ -54,19 +60,65 @@ function CompactSection(props: Props) {
         onAddButtonClick,
         geoAreaOptions,
         onGeoAreaOptionsChange,
+        onApplyToAll,
     } = props;
 
+    const filteredWidgets = useMemo(
+        () => {
+            const hiddenWidgetIds = getHiddenWidgetIds(
+                allWidgets ?? [],
+                Object.values(attributesMap)
+                    .filter(isDefined)
+                    .map((item) => item.value),
+            );
+            return widgets?.filter((w) => !hiddenWidgetIds[w.id]);
+        },
+        [allWidgets, attributesMap, widgets],
+    );
+
     const error = getErrorObject(riskyError);
 
     const widgetsWithValue = useMemo(() => {
         if (!emptyValueHidden) {
-            return widgets;
+            return filteredWidgets;
         }
-        return widgets?.filter(
+        return filteredWidgets?.filter(
             // FIXME: should only check into data, not value
-            (widget) => isDefined(attributesMap?.[widget.clientId]?.value?.data?.value),
+            (widget) => {
+                if (widget.widgetId === 'MATRIX1D') {
+                    return !doesObjectHaveNoData(
+                        attributesMap?.[widget.clientId]?.value?.data?.value,
+                        [''],
+                    );
+                }
+
+                if (widget.widgetId === 'MATRIX2D') {
+                    const val = attributesMap?.[widget.clientId]?.value?.data?.value;
+                    return Object.keys(val ?? {}).length > 0;
+                }
+
+                return isDefined(attributesMap?.[widget.clientId]?.value?.data?.value);
+            },
         );
-    }, [emptyValueHidden, attributesMap, widgets]);
+    }, [emptyValueHidden, attributesMap, filteredWidgets]);
+
+    const handleApplyBelowClick = useCallback(
+        (widgetId: string) => {
+            if (onApplyToAll) {
+                onApplyToAll(entryClientId, widgetId, true);
+            }
+        },
+        [entryClientId, onApplyToAll],
+    );
+
+    const handleApplyAllClick = useCallback(
+        (widgetId: string) => {
+            if (onApplyToAll) {
+                onApplyToAll(entryClientId, widgetId, false);
+            }
+        },
+        [entryClientId, onApplyToAll],
+    );
 
     const widgetRendererParams = useCallback(
         (key: string, data: Widget): AttributeInputProps<number | undefined> => {
@@ -84,9 +136,13 @@ function CompactSection(props: Props) {
                 error: err,
                 geoAreaOptions,
                 onGeoAreaOptionsChange,
+                applyButtonsHidden: !onApplyToAll,
+                onApplyBelowClick: handleApplyBelowClick,
+                onApplyAllClick: handleApplyAllClick,
             };
         },
         [
+            onApplyToAll,
             onAttributeChange,
             attributesMap,
             readOnly,
@@ -94,6 +150,8 @@ function CompactSection(props: Props) {
             error,
             geoAreaOptions,
             onGeoAreaOptionsChange,
+            handleApplyBelowClick,
+            handleApplyAllClick,
         ],
     );
 
@@ -113,6 +171,7 @@ function CompactSection(props: Props) {
                 <QuickActionButton
                     name="addAttribute"
                     onClick={handleAddButtonClick}
+                    title="Add tags"
                 >
                     <IoAdd />
                 </QuickActionButton>
@@ -127,6 +186,12 @@ function CompactSection(props: Props) {
                 renderer={CompactAttributeInput}
                 rendererParams={widgetRendererParams}
                 compactEmptyMessage
+                pending={false}
+                filtered={false}
+                errored={false}
+                emptyMessage="No widgets were tagged under this section."
+                messageShown
+                messageIconShown
             />
         </Container>
     );
diff --git a/app/components/entry/CompactSection/styles.css b/app/components/entry/CompactSection/styles.css
index f6251cdeef..84a69c0785 100644
--- a/app/components/entry/CompactSection/styles.css
+++ b/app/components/entry/CompactSection/styles.css
@@ -4,6 +4,7 @@
     .widget-list {
         display: flex;
         flex-direction: column;
+        padding: var(--dui-spacing-small);
         gap: var(--dui-spacing-large);
     }
 }
diff --git a/app/components/entry/EntryInput/index.tsx b/app/components/entry/EntryInput/index.tsx
index c9a201c8ff..1968e6a77c 100644
--- a/app/components/entry/EntryInput/index.tsx
+++ b/app/components/entry/EntryInput/index.tsx
@@ -63,10 +63,15 @@ interface EntryInputProps<T extends string | number | undefined> {
     entryImage: Entry['image'] | undefined | null;
     geoAreaOptions: GeoArea[] | undefined | null;
     onGeoAreaOptionsChange: React.Dispatch<React.SetStateAction<GeoArea[] | undefined | null>>;
+    excerptHeaderActions?: React.ReactNode;
+    onApplyToAll?: (entryId: string, widgetId: string, applyBelowOnly?: boolean) => void;
+
+    allWidgets: Widget[] | undefined | null;
 }
 
 function EntryInput<T extends string | number | undefined>(props: EntryInputProps<T>) {
     const {
+        allWidgets,
         className,
         value,
         onAddButtonClick,
@@ -85,6 +90,8 @@ function EntryInput<T extends string | number | undefined>(props: EntryInputProp
         error: riskyError,
         geoAreaOptions,
         onGeoAreaOptionsChange,
+        excerptHeaderActions,
+        onApplyToAll,
     } = props;
 
     const error = getErrorObject(riskyError);
@@ -132,7 +139,10 @@ function EntryInput<T extends string | number | undefined>(props: EntryInputProp
         entryClientId: value.clientId,
         geoAreaOptions,
         onGeoAreaOptionsChange,
+        onApplyToAll,
+        allWidgets,
     }), [
+        allWidgets,
         geoAreaOptions,
         onGeoAreaOptionsChange,
         onAddButtonClick,
@@ -142,6 +152,7 @@ function EntryInput<T extends string | number | undefined>(props: EntryInputProp
         readOnly,
         error?.attributes,
         value.clientId,
+        onApplyToAll,
     ]);
 
     return (
@@ -158,6 +169,8 @@ function EntryInput<T extends string | number | undefined>(props: EntryInputProp
                     className={styles.excerpt}
                     heading={isDefined(index) ? `Entry ${index + 1}` : undefined}
                     headingSize="extraSmall"
+                    headerActions={excerptHeaderActions}
+                    headingSectionClassName={styles.headingSection}
                     contentClassName={styles.excerptContent}
                 >
                     <ExcerptInput
@@ -197,7 +210,9 @@ function EntryInput<T extends string | number | undefined>(props: EntryInputProp
                 error={error?.attributes}
                 geoAreaOptions={geoAreaOptions}
                 onGeoAreaOptionsChange={onGeoAreaOptionsChange}
+                onApplyToAll={onApplyToAll}
                 entryClientId={value.clientId}
+                allWidgets={allWidgets}
             />
         </div>
     );
diff --git a/app/components/entry/EntryInput/styles.css b/app/components/entry/EntryInput/styles.css
index c66ecc1367..72acacce49 100644
--- a/app/components/entry/EntryInput/styles.css
+++ b/app/components/entry/EntryInput/styles.css
@@ -1,5 +1,6 @@
 .entry-input {
     display: flex;
+    flex-shrink: 0;
     background-color: var(--dui-color-foreground);
     height: var(--height-entry-item);
     overflow-y: auto;
@@ -12,6 +13,10 @@
         flex-direction: column;
     }
 
+    .heading-section {
+        overflow: visible;
+    }
+
     .excerpt {
         background-color: var(--dui-color-foreground);
         width: var(--inner-width);
diff --git a/app/components/entry/ExcerptInput/index.tsx b/app/components/entry/ExcerptInput/index.tsx
index d5bc41275c..40eadc6ea0 100644
--- a/app/components/entry/ExcerptInput/index.tsx
+++ b/app/components/entry/ExcerptInput/index.tsx
@@ -2,12 +2,12 @@ import React from 'react';
 import { _cs } from '@togglecorp/fujs';
 import {
     ImagePreview,
-    TextArea,
     Message,
 } from '@the-deep/deep-ui';
 import { genericMemo } from '#utils/common';
 
 import { EntryType } from '#generated/types';
+import ExcerptTextArea from '#components/entry/ExcerptTextArea';
 import _ts from '#ts';
 
 import styles from './styles.css';
@@ -47,7 +47,7 @@ function ExcerptInput<N extends string>(props: Props<N>) {
     if (entryType === 'IMAGE') {
         const imageSrc = image?.file?.url ?? leadImageUrl ?? imageRaw;
         return (
-            <div className={_cs(className, styles.excerptInput)}>
+            <div className={_cs(className, styles.excerptInput, styles.imageExcerptContainer)}>
                 {imageSrc ? (
                     <ImagePreview
                         className={_cs(imageClassName, styles.image)}
@@ -60,16 +60,22 @@ function ExcerptInput<N extends string>(props: Props<N>) {
                         message="Image data is not available."
                     />
                 )}
-                {!props.readOnly && (
-                    <TextArea
+                {!props.readOnly && ( // eslint-disable-line react/destructuring-assignment
+                    <ExcerptTextArea
                         label="Additional Context"
-                        className={_cs(excerptForImageClassName, styles.textArea)}
+                        className={_cs(
+                            excerptForImageClassName,
+                            styles.textAreaForImage,
+                        )}
                         value={value}
+                        // eslint-disable-next-line react/destructuring-assignment
                         name={props.name}
+                        // eslint-disable-next-line react/destructuring-assignment
                         onChange={props.onChange}
+                        autoSize
                     />
                 )}
-                {value && !props.readOnly && (
+                {props.readOnly && value && ( // eslint-disable-line react/destructuring-assignment
                     <div className={excerptForImageClassName}>
                         {value}
                     </div>
@@ -78,6 +84,7 @@ function ExcerptInput<N extends string>(props: Props<N>) {
         );
     }
     if (entryType === 'EXCERPT') {
+        // eslint-disable-next-line react/destructuring-assignment
         return props.readOnly ? (
             <div className={_cs(className, styles.excerptInput)}>
                 {value || (
@@ -88,11 +95,14 @@ function ExcerptInput<N extends string>(props: Props<N>) {
             </div>
         ) : (
             <div className={_cs(className, styles.excerptInput)}>
-                <TextArea
+                <ExcerptTextArea
                     className={_cs(className, styles.textArea)}
                     value={value}
+                    // eslint-disable-next-line react/destructuring-assignment
                     onChange={props.onChange}
+                    // eslint-disable-next-line react/destructuring-assignment
                     name={props.name}
+                    autoSize
                 />
             </div>
         );
diff --git a/app/components/entry/ExcerptInput/styles.css b/app/components/entry/ExcerptInput/styles.css
index 2cd8b1a626..209720a1a0 100644
--- a/app/components/entry/ExcerptInput/styles.css
+++ b/app/components/entry/ExcerptInput/styles.css
@@ -11,11 +11,24 @@
         font-style: italic;
     }
 
+    .text-area {
+        flex-grow: 1;
+    }
+}
+
+.image-excerpt-container {
+    display: flex;
+    flex-direction: column;
+    overflow-y: auto;
+
     .image {
+        flex-grow: 1;
         background-color: var(--dui-color-background-information);
+        overflow-y: auto;
     }
 
-    .text-area {
-        flex-grow: 1;
+    .text-area-for-image {
+        flex-shrink: 0;
     }
 }
+
diff --git a/app/components/entry/ExcerptTextArea/index.tsx b/app/components/entry/ExcerptTextArea/index.tsx
new file mode 100644
index 0000000000..6dfadc2790
--- /dev/null
+++ b/app/components/entry/ExcerptTextArea/index.tsx
@@ -0,0 +1,74 @@
+import React, { useCallback } from 'react';
+import {
+    _cs,
+    formatPdfText,
+} from '@togglecorp/fujs';
+import {
+    QuickActionButton,
+    TextArea,
+    TextAreaProps,
+} from '@the-deep/deep-ui';
+import { IoBandageOutline } from 'react-icons/io5';
+
+import styles from './styles.css';
+
+type Props<N extends string> = Omit<TextAreaProps<N>, 'onChange'> & {
+    onChange?: (
+        value: string | undefined,
+        name: N,
+        e?: React.FormEvent<HTMLTextAreaElement>,
+    ) => void;
+
+};
+
+function ExcerptTextArea<N extends string>(props: Props<N>) {
+    const {
+        className,
+        onChange,
+        readOnly,
+        disabled,
+        value,
+        name,
+        ...otherProps
+    } = props;
+
+    const handleAutoFormatButtonClick = useCallback(() => {
+        if (readOnly || disabled) {
+            return;
+        }
+
+        if (onChange) {
+            onChange(formatPdfText(value ?? ''), name);
+        }
+    }, [
+        name,
+        readOnly,
+        value,
+        disabled,
+        onChange,
+    ]);
+
+    return (
+        <TextArea
+            className={_cs(className, styles.textArea)}
+            name={name}
+            readOnly={readOnly}
+            disabled={disabled}
+            onChange={onChange}
+            value={value}
+            icons={(
+                <QuickActionButton
+                    name={undefined}
+                    onClick={handleAutoFormatButtonClick}
+                    title="Auto format"
+                >
+                    <IoBandageOutline />
+                </QuickActionButton>
+            )}
+            iconsContainerClassName={styles.icons}
+            {...otherProps}
+        />
+    );
+}
+
+export default ExcerptTextArea;
diff --git a/app/components/entry/ExcerptTextArea/styles.css b/app/components/entry/ExcerptTextArea/styles.css
new file mode 100644
index 0000000000..7d3e422d9a
--- /dev/null
+++ b/app/components/entry/ExcerptTextArea/styles.css
@@ -0,0 +1,17 @@
+.text-area {
+    position: relative;
+
+    .icons {
+        position: absolute;
+        bottom: var(--dui-spacing-small);
+        left: var(--dui-spacing-small);
+        transition: 200ms opacity ease-in-out;
+        opacity: 0;
+    }
+
+    &:hover {
+        .icons {
+            opacity: 1;
+        }
+    }
+}
diff --git a/app/components/entry/Section/index.tsx b/app/components/entry/Section/index.tsx
index e8989045a7..c516baf44e 100644
--- a/app/components/entry/Section/index.tsx
+++ b/app/components/entry/Section/index.tsx
@@ -1,11 +1,17 @@
-import React, { useCallback } from 'react';
-import { _cs } from '@togglecorp/fujs';
-import { ListView } from '@the-deep/deep-ui';
+import React, { useCallback, useMemo } from 'react';
+import { _cs, isDefined } from '@togglecorp/fujs';
+import {
+    ListView,
+    Kraken,
+} from '@the-deep/deep-ui';
 import { SetValueArg, Error, getErrorObject } from '@togglecorp/toggle-form';
+import {
+    IoGitBranchOutline,
+} from 'react-icons/io5';
 
 import { GeoArea } from '#components/GeoMultiSelectInput';
 import NonFieldError from '#components/NonFieldError';
-import { Widget } from '#types/newAnalyticalFramework';
+import { Widget, getHiddenWidgetIds } from '#types/newAnalyticalFramework';
 import AttributeInput, { Props as AttributeInputProps } from '#components/framework/AttributeInput';
 import { PartialEntryType } from '#views/Project/EntryEdit/schema';
 
@@ -15,6 +21,9 @@ const widgetKeySelector = (d: Widget) => d.clientId;
 type WidgetAttribute = NonNullable<PartialEntryType['attributes']>[number];
 
 interface Props {
+    // NOTE: if allWidgets is null/undefined/empty then the conditional widgets will be visible
+    allWidgets: Widget[] | undefined | null;
+
     widgets: Widget[] | undefined | null;
     onAttributeChange: (val: SetValueArg<WidgetAttribute>, index: number | undefined) => void;
     error: Error<WidgetAttribute[]> | undefined;
@@ -27,6 +36,7 @@ interface Props {
 
 function Section(props: Props) {
     const {
+        allWidgets,
         onAttributeChange,
         widgets,
         attributesMap,
@@ -37,6 +47,19 @@ function Section(props: Props) {
         onGeoAreaOptionsChange,
     } = props;
 
+    const filteredWidgets = useMemo(
+        () => {
+            const hiddenWidgetIds = getHiddenWidgetIds(
+                allWidgets ?? [],
+                Object.values(attributesMap)
+                    .filter(isDefined)
+                    .map((item) => item.value),
+            );
+            return widgets?.filter((w) => !hiddenWidgetIds[w.id]);
+        },
+        [allWidgets, attributesMap, widgets],
+    );
+
     const error = getErrorObject(riskyError);
 
     const widgetRendererParams = useCallback(
@@ -45,10 +68,17 @@ function Section(props: Props) {
             const err = attribute
                 ? error?.[attribute.value.clientId]
                 : undefined;
+
             return {
                 className: _cs(
                     styles.widgetContainer,
-                    data?.width === 'HALF' && styles.halfWidget,
+                    data.width === 'HALF' && styles.halfWidget,
+                    data.conditional && styles.conditional,
+                ),
+                icons: data.conditional && (
+                    <IoGitBranchOutline
+                        title="This is a child widget"
+                    />
                 ),
                 name: attribute?.index,
                 value: attribute?.value,
@@ -78,13 +108,24 @@ function Section(props: Props) {
             <ListView
                 className={_cs(
                     styles.section,
-                    (widgets?.length ?? 0) < 1 && styles.empty,
+                    (filteredWidgets?.length ?? 0) < 1 && styles.empty,
                 )}
-                data={widgets ?? undefined}
+                data={filteredWidgets}
                 keySelector={widgetKeySelector}
                 renderer={AttributeInput}
                 rendererParams={widgetRendererParams}
                 emptyMessage="There are no widgets in this section."
+                filtered={false}
+                errored={false}
+                pending={false}
+                emptyIcon={(
+                    <Kraken
+                        size="large"
+                        variant="sleep"
+                    />
+                )}
+                messageShown
+                messageIconShown
             />
         </>
     );
diff --git a/app/components/entry/Section/styles.css b/app/components/entry/Section/styles.css
index 70126a3d67..b5b7e9fd7e 100644
--- a/app/components/entry/Section/styles.css
+++ b/app/components/entry/Section/styles.css
@@ -2,14 +2,20 @@
     &:not(.empty) {
         display: flex;
         flex-wrap: wrap;
-        padding: var(--dui-spacing-large);
-        gap: var(--dui-spacing-large);
+        padding: calc(var(--dui-spacing-medium) - var(--dui-spacing-small));
+        gap: calc(var(--dui-spacing-medium) - var(--dui-spacing-small));
 
         .widget-container {
             flex-basis: 100%;
+            background-color: var(--dui-color-foreground);
+            padding: var(--dui-spacing-small);
 
             &.half-widget {
-                flex-basis: calc(50% - var(--dui-spacing-large));
+                flex-basis: calc(50% - (var(--dui-spacing-medium) - var(--dui-spacing-small)));
+            }
+
+            &.conditional {
+                background-color: var(--dui-color-background-information);
             }
         }
     }
diff --git a/app/components/entryReview/EntryCommentWrapper/CommentContext.ts b/app/components/entryReview/EntryCommentWrapper/CommentContext.ts
new file mode 100644
index 0000000000..4d3fe6f00a
--- /dev/null
+++ b/app/components/entryReview/EntryCommentWrapper/CommentContext.ts
@@ -0,0 +1,18 @@
+import { createContext } from 'react';
+
+export type CountMap = { [key in string]: number | undefined };
+
+export interface CommentCountContextInterface {
+    commentsCountMap: CountMap;
+    setCommentsCountMap: React.Dispatch<React.SetStateAction<CountMap>>;
+}
+
+export const CommentCountContext = createContext<CommentCountContextInterface>({
+    commentsCountMap: {},
+    setCommentsCountMap: (value: unknown) => {
+        // eslint-disable-next-line no-console
+        console.error('set comments count map called on context without a provider', value);
+    },
+});
+
+export default CommentCountContext;
diff --git a/app/components/entryReview/EntryCommentWrapper/index.tsx b/app/components/entryReview/EntryCommentWrapper/index.tsx
new file mode 100644
index 0000000000..70a2b3ed50
--- /dev/null
+++ b/app/components/entryReview/EntryCommentWrapper/index.tsx
@@ -0,0 +1,33 @@
+import React, { useCallback, useContext } from 'react';
+
+import EntryComments, { Props as EntryCommentsProps } from '#components/entryReview/EntryComments';
+import CommentCountContext from '#components/entryReview/EntryCommentWrapper/CommentContext';
+
+function EntryCommentWrapper(props: EntryCommentsProps) {
+    const {
+        entryId,
+    } = props;
+
+    const {
+        commentsCountMap,
+        setCommentsCountMap,
+    } = useContext(CommentCountContext);
+
+    const handleEntryCommentAdd = useCallback(() => {
+        setCommentsCountMap((oldCounts) => ({
+            ...oldCounts,
+            [String(entryId)]: (oldCounts?.[String(entryId)] ?? 0) + 1,
+        }));
+    }, [entryId, setCommentsCountMap]);
+
+    return (
+        <EntryComments
+            {...props}
+            entryId={entryId}
+            activityCount={commentsCountMap?.[String(entryId)]}
+            onEntryCommentAdd={handleEntryCommentAdd}
+        />
+    );
+}
+
+export default EntryCommentWrapper;
diff --git a/app/components/entryReview/EntryComments/Comment/EditCommentForm/index.tsx b/app/components/entryReview/EntryComments/Comment/EditCommentForm/index.tsx
index bf0ef43d41..8b02d76742 100644
--- a/app/components/entryReview/EntryComments/Comment/EditCommentForm/index.tsx
+++ b/app/components/entryReview/EntryComments/Comment/EditCommentForm/index.tsx
@@ -4,6 +4,7 @@ import {
     TextArea,
     Button,
     ContainerCard,
+    useAlert,
 } from '@the-deep/deep-ui';
 import {
     useForm,
@@ -49,6 +50,8 @@ function EditCommentForm(props: Props) {
     const [initialFormValue] = useState<FormType>({
         text: comment.textHistory[0]?.text ?? '',
     });
+    const alert = useAlert();
+
     const {
         pristine,
         value,
@@ -69,6 +72,10 @@ function EditCommentForm(props: Props) {
         body: (ctx) => ctx,
         onSuccess: (response) => {
             onEditSuccess(response);
+            alert.show(
+                'Successfully edited comment.',
+                { variant: 'success' },
+            );
         },
         onFailure: ({ value: errorValue }) => {
             const {
@@ -81,7 +88,7 @@ function EditCommentForm(props: Props) {
                 [internal]: $internal,
             });
         },
-        failureHeader: 'Entry comment edit',
+        failureMessage: 'Failed to edit comment.',
     });
 
     return (
diff --git a/app/components/entryReview/EntryComments/Comment/index.tsx b/app/components/entryReview/EntryComments/Comment/index.tsx
index 729aac5751..5684c89dd4 100644
--- a/app/components/entryReview/EntryComments/Comment/index.tsx
+++ b/app/components/entryReview/EntryComments/Comment/index.tsx
@@ -63,6 +63,7 @@ function Comment(props: Props) {
                 <>
                     Assigned to
                     <CommaSeparateItems
+                        className={styles.assignees}
                         items={mentionedUsersDetails}
                     />
                 </>
@@ -75,15 +76,17 @@ function Comment(props: Props) {
                     isEditModalVisible && styles.inline,
                 )}
                 >
-                    <span className={styles.userName}>
-                        {createdByDetails?.name}
-                    </span>
-                    &nbsp;
-                    {commentType !== 0 && (
-                        <span className={styles.details}>
-                            {`${commentTypeToTextMap[commentType]} the entry.`}
+                    <div className={styles.userAction}>
+                        <span className={styles.userName}>
+                            {createdByDetails?.name}
                         </span>
-                    )}
+                        &nbsp;
+                        {commentType !== 0 && (
+                            <span className={styles.details}>
+                                {`${commentTypeToTextMap[commentType]} the entry.`}
+                            </span>
+                        )}
+                    </div>
                     {isEditModalVisible ? (
                         <EditCommentForm
                             className={styles.editComment}
diff --git a/app/components/entryReview/EntryComments/Comment/styles.css b/app/components/entryReview/EntryComments/Comment/styles.css
index 3277193f02..ad7602a90e 100644
--- a/app/components/entryReview/EntryComments/Comment/styles.css
+++ b/app/components/entryReview/EntryComments/Comment/styles.css
@@ -10,11 +10,13 @@
         justify-content: space-between;
 
         .user-name {
+            display: inline;
             font-size: var(--font-size-medium);
             font-weight: var(--dui-font-weight-bold);
         }
 
         .details {
+            display: inline;
             color: var(--dui-color-text);
         }
 
@@ -22,6 +24,10 @@
             display: flex;
             align-items: center;
 
+            .user-action {
+                display: inline;
+            }
+
             &.inline {
                 align-items: flex-start;
                 flex-direction: column;
@@ -36,6 +42,13 @@
 
     .header-actions{
         color: var(--dui-color-accent);
+
+        .assignees {
+            max-width: 14rem;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
     }
 
     .comment {
diff --git a/app/components/entryReview/EntryComments/CommentForm/index.tsx b/app/components/entryReview/EntryComments/CommentForm/index.tsx
index f973e945ae..cf357b4a65 100644
--- a/app/components/entryReview/EntryComments/CommentForm/index.tsx
+++ b/app/components/entryReview/EntryComments/CommentForm/index.tsx
@@ -100,7 +100,7 @@ function CommentForm(props: Props) {
                 [internal]: $internal,
             });
         },
-        failureHeader: 'Entry comment edit',
+        failureMessage: 'Entry comment edit',
     });
 
     return (
diff --git a/app/components/entryReview/EntryComments/index.tsx b/app/components/entryReview/EntryComments/index.tsx
index 9d859ad914..f47d1171d9 100644
--- a/app/components/entryReview/EntryComments/index.tsx
+++ b/app/components/entryReview/EntryComments/index.tsx
@@ -6,6 +6,7 @@ import {
     Pager,
     QuickActionButton,
     ListView,
+    Kraken,
     Modal,
 } from '@the-deep/deep-ui';
 import {
@@ -24,11 +25,12 @@ import Comment from './Comment';
 import CommentForm from './CommentForm';
 import styles from './styles.css';
 
-interface Props {
+export interface Props {
     className?: string;
     activityCount?: number;
     entryId: number;
     projectId: string;
+    onEntryCommentAdd?: () => void;
 }
 
 interface MultiResponseWithSummary<T> extends MultiResponse<T> {
@@ -44,6 +46,7 @@ function EntryComments(props: Props) {
         entryId,
         projectId,
         activityCount = 0,
+        onEntryCommentAdd,
     } = props;
 
     const [activePage, setActivePage] = useState<number>(1);
@@ -66,9 +69,15 @@ function EntryComments(props: Props) {
             offset: (activePage - 1) * maxItemsPerPage,
             limit: maxItemsPerPage,
         },
-        failureHeader: 'Entry Comment',
     });
 
+    const handleEntryCommentSave = useCallback(() => {
+        getComments();
+        if (onEntryCommentAdd) {
+            onEntryCommentAdd();
+        }
+    }, [getComments, onEntryCommentAdd]);
+
     const commentRendererParams = useCallback((_, comment: EntryComment) => ({
         comment,
     }), []);
@@ -76,6 +85,7 @@ function EntryComments(props: Props) {
     return (
         <>
             <QuickActionButton
+                title="Entry comments"
                 className={_cs(styles.commentButton, className)}
                 onClick={showCommentModal}
                 name={entryId}
@@ -91,6 +101,7 @@ function EntryComments(props: Props) {
                 <Modal
                     className={styles.entryCommentModal}
                     heading="Entry Comments"
+                    freeHeight
                     onCloseButtonClick={hideCommentModal}
                     bodyClassName={styles.modalBody}
                     footerActions={(
@@ -113,11 +124,21 @@ function EntryComments(props: Props) {
                         rendererParams={commentRendererParams}
                         renderer={Comment}
                         pending={commentsPending}
+                        filtered={false}
+                        errored={false}
+                        emptyIcon={(
+                            <Kraken
+                                variant="work"
+                            />
+                        )}
+                        emptyMessage="No comments found"
+                        messageIconShown
+                        messageShown
                     />
                     <CommentForm
                         entryId={entryId}
                         projectId={projectId}
-                        onSave={getComments}
+                        onSave={handleEntryCommentSave}
                     />
                 </Modal>
             )}
diff --git a/app/components/entryReview/EntryComments/styles.css b/app/components/entryReview/EntryComments/styles.css
index ab4d2eb342..e76a0e0fe1 100644
--- a/app/components/entryReview/EntryComments/styles.css
+++ b/app/components/entryReview/EntryComments/styles.css
@@ -1,12 +1,16 @@
 .comment-button {
+    position: relative;
     overflow: visible;
 
     .comment-count {
         position: absolute;
-        top: 0;
-        right: 0;
+        /* NOTE: Want to move this a bit up */
+        top: -0.5em;
+        right: -0.5em;
         border-radius: 1em;
         background-color: var(--dui-color-danger);
+        width: 1.3em;
+        height: 1.3em;
         color: var(--dui-color-text-on-dark);
         font-size: var(--dui-font-size-extra-small);
     }
diff --git a/app/components/entryReview/EntryControl/EntryUncontrolCommentModal/index.tsx b/app/components/entryReview/EntryControl/EntryUncontrolCommentModal/index.tsx
index 2d5df05353..be4abd25cd 100644
--- a/app/components/entryReview/EntryControl/EntryUncontrolCommentModal/index.tsx
+++ b/app/components/entryReview/EntryControl/EntryUncontrolCommentModal/index.tsx
@@ -15,6 +15,7 @@ import {
     Modal,
     TextArea,
     Button,
+    useAlert,
 } from '@the-deep/deep-ui';
 
 import { useLazyRequest } from '#base/utils/restRequest';
@@ -62,6 +63,7 @@ function EntryUncontrolCommentModal(props: Props) {
     } = props;
 
     const [members, setMembers] = useState<ProjectMember[] | undefined | null>();
+    const alert = useAlert();
 
     const {
         pristine,
@@ -82,6 +84,10 @@ function EntryUncontrolCommentModal(props: Props) {
         onSuccess: (response) => {
             onControlStatusChange(response.entry);
             onModalClose();
+            alert.show(
+                'Successfully posted comment.',
+                { variant: 'success' },
+            );
         },
         onFailure: ({ value: errorValue }) => {
             const {
@@ -94,7 +100,7 @@ function EntryUncontrolCommentModal(props: Props) {
                 [internal]: $internal,
             });
         },
-        failureHeader: 'Entry Control',
+        failureMessage: 'Failed to post comment.',
     });
 
     const error = getErrorObject(riskyError);
@@ -112,6 +118,8 @@ function EntryUncontrolCommentModal(props: Props) {
         <Modal
             onCloseButtonClick={onModalClose}
             className={_cs(styles.modal, className)}
+            freeHeight
+            size="small"
             heading="Reason to uncontrol entry"
             bodyClassName={styles.modalBody}
             footerIcons={(
diff --git a/app/components/entryReview/EntryControl/index.tsx b/app/components/entryReview/EntryControl/index.tsx
index d25d461231..06ef1f695e 100644
--- a/app/components/entryReview/EntryControl/index.tsx
+++ b/app/components/entryReview/EntryControl/index.tsx
@@ -55,7 +55,7 @@ function EntryControl(props: Props) {
         onSuccess: (response) => {
             onChange(response.entry);
         },
-        failureHeader: 'Entry Control',
+        failureMessage: 'Entry Control',
     });
 
     const handleClick = React.useCallback(() => {
diff --git a/app/components/entryReview/EntryVerification/EntryUnverifyCommentModal/index.tsx b/app/components/entryReview/EntryVerification/EntryUnverifyCommentModal/index.tsx
index 977114f1b9..4651af0a58 100644
--- a/app/components/entryReview/EntryVerification/EntryUnverifyCommentModal/index.tsx
+++ b/app/components/entryReview/EntryVerification/EntryUnverifyCommentModal/index.tsx
@@ -14,6 +14,7 @@ import {
     Modal,
     TextArea,
     Button,
+    useAlert,
 } from '@the-deep/deep-ui';
 
 import { useLazyRequest } from '#base/utils/restRequest';
@@ -66,6 +67,8 @@ function EntryUnverifyCommentModal(props: Props) {
         entryId,
     } = props;
 
+    const alert = useAlert();
+
     const [members, setMembers] = useState<ProjectMember[] | undefined | null>();
 
     const {
@@ -78,8 +81,12 @@ function EntryUnverifyCommentModal(props: Props) {
         onSuccess: (response) => {
             onVerificationChange(response.entry);
             onModalClose();
+            alert.show(
+                'Successfully posted review comment.',
+                { variant: 'success' },
+            );
         },
-        failureHeader: 'Entry Verification',
+        failureMessage: 'Failed to post review comment.',
     });
 
     const {
@@ -107,6 +114,8 @@ function EntryUnverifyCommentModal(props: Props) {
             onCloseButtonClick={onModalClose}
             className={_cs(styles.modal, className)}
             heading="Reason for unverify"
+            size="small"
+            freeHeight
             bodyClassName={styles.modalBody}
             footerIcons={(
                 <ProjectMemberMultiSelectInput
diff --git a/app/components/entryReview/EntryVerification/index.tsx b/app/components/entryReview/EntryVerification/index.tsx
index a3b2addea8..177c1aa818 100644
--- a/app/components/entryReview/EntryVerification/index.tsx
+++ b/app/components/entryReview/EntryVerification/index.tsx
@@ -61,7 +61,7 @@ function EntryVerification(props: Props) {
         onSuccess: (response) => {
             onVerificationChange(response.entry);
         },
-        failureHeader: 'Entry Verification',
+        failureMessage: 'Entry Verification',
     });
 
     const handleClick = useCallback(() => {
diff --git a/app/components/framework/AttributeInput/BaseWidgetInput/index.tsx b/app/components/framework/AttributeInput/BaseWidgetInput/index.tsx
index 16f8d71c4d..07bcd0719b 100644
--- a/app/components/framework/AttributeInput/BaseWidgetInput/index.tsx
+++ b/app/components/framework/AttributeInput/BaseWidgetInput/index.tsx
@@ -7,6 +7,7 @@ export interface Props{
     title: string | undefined;
     className?: string;
     actions?: React.ReactNode,
+    icons?: React.ReactNode,
     error?: unknown;
     disabled?: boolean;
     readOnly?: boolean;
@@ -17,6 +18,7 @@ function BaseWidgetInput(props: Props) {
         className,
         title,
         actions,
+        icons,
         error,
         disabled,
         readOnly,
@@ -27,6 +29,7 @@ function BaseWidgetInput(props: Props) {
             className={className}
             title={title}
             actions={actions}
+            icons={icons}
             error={error}
             disabled={disabled}
             readOnly={readOnly}
diff --git a/app/components/framework/AttributeInput/DateRangeWidgetInput/index.tsx b/app/components/framework/AttributeInput/DateRangeWidgetInput/index.tsx
index 63e02559a6..1b35ef0231 100644
--- a/app/components/framework/AttributeInput/DateRangeWidgetInput/index.tsx
+++ b/app/components/framework/AttributeInput/DateRangeWidgetInput/index.tsx
@@ -1,10 +1,8 @@
 import React, { useCallback } from 'react';
 import {
-    QuickActionButton,
     DateRangeInput,
 } from '@the-deep/deep-ui';
 import { isNotDefined } from '@togglecorp/fujs';
-import { IoSwapHorizontal } from 'react-icons/io5';
 import { Error, getErrorObject, getErrorString } from '@togglecorp/toggle-form';
 
 import NonFieldError from '#components/NonFieldError';
@@ -24,6 +22,7 @@ export interface Props <N extends string>{
     error: Error<DateRangeValue> | undefined;
     onChange: (value: DateRangeValue | undefined, name: N) => void,
     actions?: React.ReactNode,
+    icons?: React.ReactNode,
     disabled?: boolean;
     readOnly?: boolean;
 }
@@ -38,6 +37,7 @@ function DateRangeWidgetInput<N extends string>(props: Props<N>) {
         disabled,
         readOnly,
         actions,
+        icons,
         error: riskyError,
     } = props;
 
@@ -54,21 +54,6 @@ function DateRangeWidgetInput<N extends string>(props: Props<N>) {
         [onChangeFromProps],
     );
 
-    const handleValueSwap = useCallback(
-        () => {
-            if (value?.value) {
-                onChange(
-                    {
-                        endDate: value.value.startDate,
-                        startDate: value.value.endDate,
-                    },
-                    name,
-                );
-            }
-        },
-        [onChange, value, name],
-    );
-
     const valueErrorString = getErrorString(error?.value);
     const valueErrorObject = getErrorObject(error?.value);
 
@@ -83,6 +68,7 @@ function DateRangeWidgetInput<N extends string>(props: Props<N>) {
             childrenContainerClassName={styles.content}
             error={error}
             actions={actions}
+            icons={icons}
         >
             <NonFieldError
                 error={error}
@@ -95,16 +81,6 @@ function DateRangeWidgetInput<N extends string>(props: Props<N>) {
                 readOnly={readOnly}
                 disabled={disabled}
                 error={valueError}
-                actions={value?.value && (
-                    <QuickActionButton
-                        name={undefined}
-                        onClick={handleValueSwap}
-                        title="Swap Values" // FIXME: use translations
-                        variant="transparent"
-                    >
-                        <IoSwapHorizontal />
-                    </QuickActionButton>
-                )}
             />
         </WidgetWrapper>
     );
diff --git a/app/components/framework/AttributeInput/DateWidgetInput/index.tsx b/app/components/framework/AttributeInput/DateWidgetInput/index.tsx
index cb97ca4a33..12f088dfa3 100644
--- a/app/components/framework/AttributeInput/DateWidgetInput/index.tsx
+++ b/app/components/framework/AttributeInput/DateWidgetInput/index.tsx
@@ -19,6 +19,7 @@ export interface Props <N extends string>{
     error: Error<DateValue> | undefined;
 
     actions?: React.ReactNode,
+    icons?: React.ReactNode,
     disabled?: boolean;
     readOnly?: boolean;
 }
@@ -33,6 +34,7 @@ function DateWidgetInput<N extends string>(props: Props<N>) {
         disabled,
         readOnly,
         actions,
+        icons,
         error: riskyError,
     } = props;
 
@@ -54,6 +56,7 @@ function DateWidgetInput<N extends string>(props: Props<N>) {
             className={className}
             title={title}
             actions={actions}
+            icons={icons}
             error={error}
         >
             <NonFieldError
diff --git a/app/components/framework/AttributeInput/GeoLocationWidgetInput/index.tsx b/app/components/framework/AttributeInput/GeoLocationWidgetInput/index.tsx
index 5d91d315c5..ac946f52f7 100644
--- a/app/components/framework/AttributeInput/GeoLocationWidgetInput/index.tsx
+++ b/app/components/framework/AttributeInput/GeoLocationWidgetInput/index.tsx
@@ -10,8 +10,8 @@ import GeoLocationInput from '#components/GeoLocationInput';
 import WidgetWrapper from '../WidgetWrapper';
 
 export type PartialGeoLocationWidget = PartialForm<
-GeoLocationWidget,
-    'key' | 'widgetId' | 'order'
+    GeoLocationWidget,
+    'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type GeoLocationValue = NonNullable<GeoLocationWidgetAttribute['data']>;
@@ -25,6 +25,7 @@ export interface Props <N extends string>{
     onChange: (value: GeoLocationValue | undefined, name: N) => void;
 
     actions?: React.ReactNode;
+    icons?: React.ReactNode;
     disabled?: boolean;
     readOnly?: boolean;
 
@@ -40,6 +41,7 @@ function GeoLocationWidgetInput<N extends string>(props: Props<N>) {
         name,
         value,
         actions,
+        icons,
         onChange: onChangeFromProps,
         disabled,
         readOnly,
@@ -67,6 +69,7 @@ function GeoLocationWidgetInput<N extends string>(props: Props<N>) {
             className={className}
             title={title}
             actions={actions}
+            icons={icons}
             error={error}
         >
             <NonFieldError error={error} />
diff --git a/app/components/framework/AttributeInput/Matrix1dWidgetInput/index.tsx b/app/components/framework/AttributeInput/Matrix1dWidgetInput/index.tsx
index 3073df3b4e..0680d8bdb5 100644
--- a/app/components/framework/AttributeInput/Matrix1dWidgetInput/index.tsx
+++ b/app/components/framework/AttributeInput/Matrix1dWidgetInput/index.tsx
@@ -4,7 +4,7 @@ import { PartialForm, Error, getErrorObject } from '@togglecorp/toggle-form';
 import { isNotDefined } from '@togglecorp/fujs';
 
 import { sortByOrder } from '#utils/common';
-import { removeEmptyObject } from '#utils/unsafeCommon';
+import { removeUndefinedKeys, removeEmptyObject } from '#utils/unsafeCommon';
 
 import NonFieldError from '#components/NonFieldError';
 import { Matrix1dWidget } from '#types/newAnalyticalFramework';
@@ -17,7 +17,7 @@ type Matrix1dValue = NonNullable<Matrix1dWidgetAttribute['data']>;
 
 export type PartialMatrix1dWidget = PartialForm<
     Matrix1dWidget,
-    'key' | 'widgetId' | 'order'
+    'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type RowType = NonNullable<NonNullable<NonNullable<PartialMatrix1dWidget>['properties']>['rows']>[number];
@@ -144,6 +144,7 @@ export interface Props <N extends string>{
     error: Error<Matrix1dValue> | undefined;
 
     actions?: React.ReactNode;
+    icons?: React.ReactNode;
     disabled?: boolean;
     readOnly?: boolean;
 
@@ -161,6 +162,7 @@ function Matrix1dWidgetInput<N extends string>(props: Props<N>) {
         disabled,
         readOnly,
         actions,
+        icons,
         error: riskyError,
     } = props;
 
@@ -183,13 +185,13 @@ function Matrix1dWidgetInput<N extends string>(props: Props<N>) {
 
     const handleCellChange = useCallback(
         (rowId: string, cellId: string, state: boolean | undefined) => {
-            const newValue = removeEmptyObject({
+            const newValue = removeEmptyObject(removeUndefinedKeys({
                 ...value?.value,
                 [rowId]: {
                     ...value?.value?.[rowId],
                     [cellId]: state,
                 },
-            });
+            }));
             onChange(newValue, name);
         },
         [value, name, onChange],
@@ -218,6 +220,7 @@ function Matrix1dWidgetInput<N extends string>(props: Props<N>) {
             childrenContainerClassName={styles.matrix}
             title={title}
             actions={actions}
+            icons={icons}
             error={error}
         >
             <NonFieldError
diff --git a/app/components/framework/AttributeInput/Matrix1dWidgetInput/styles.css b/app/components/framework/AttributeInput/Matrix1dWidgetInput/styles.css
index f4e754fd11..7a711396f2 100644
--- a/app/components/framework/AttributeInput/Matrix1dWidgetInput/styles.css
+++ b/app/components/framework/AttributeInput/Matrix1dWidgetInput/styles.css
@@ -1,12 +1,11 @@
 .matrix {
     display: flex;
     flex-direction: column;
-    margin: calc(var(--dui-spacing-medium) - var(--dui-spacing-small));
+    gap: var(--dui-spacing-small);
 
     .row {
         display: flex;
         flex-direction: column;
-        padding: var(--dui-spacing-small);
 
         .title {
             font-size: var(--dui-font-size-medium);
diff --git a/app/components/framework/AttributeInput/Matrix2dWidgetInput/index.tsx b/app/components/framework/AttributeInput/Matrix2dWidgetInput/index.tsx
index 73480c9118..6e5e76e948 100644
--- a/app/components/framework/AttributeInput/Matrix2dWidgetInput/index.tsx
+++ b/app/components/framework/AttributeInput/Matrix2dWidgetInput/index.tsx
@@ -1,13 +1,14 @@
-import React, { useMemo, useCallback } from 'react';
+import React, { useMemo, useCallback, useState } from 'react';
 import { _cs, isNotDefined } from '@togglecorp/fujs';
 import {
     Checkbox,
     Heading,
     List,
 } from '@the-deep/deep-ui';
+import { IoArrowBackOutline } from 'react-icons/io5';
 import { PartialForm, Error, getErrorObject } from '@togglecorp/toggle-form';
 import { sortByOrder } from '#utils/common';
-import { removeEmptyObject } from '#utils/unsafeCommon';
+import { removeUndefinedKeys, removeEmptyObject } from '#utils/unsafeCommon';
 
 import NonFieldError from '#components/NonFieldError';
 import { Matrix2dWidget } from '#types/newAnalyticalFramework';
@@ -21,7 +22,7 @@ type Matrix2dValue = NonNullable<Matrix2dWidgetAttribute['data']>;
 
 export type PartialMatrix2dWidget = PartialForm<
     Matrix2dWidget,
-    'key' | 'widgetId' | 'order'
+    'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type RowType = NonNullable<NonNullable<NonNullable<PartialMatrix2dWidget>['properties']>['rows']>[number];
@@ -33,11 +34,12 @@ interface ColumnProps {
         rowId: string,
         subRowId: string,
         columnId: string,
-        selected: string[] | undefined,
+        selected: (val: string[] | undefined) => string[] | undefined,
     ) => void;
     rowId: string;
     subRowId: string;
     columnId: string;
+    subColumnId?: string;
     disabled?: boolean;
     title?: string;
     selected: boolean;
@@ -47,6 +49,7 @@ function Column(props: ColumnProps) {
         rowId,
         subRowId,
         columnId,
+        subColumnId,
         onSubRowChange,
         disabled,
         title,
@@ -55,9 +58,27 @@ function Column(props: ColumnProps) {
 
     const handleSubRowChange = useCallback(
         (val: boolean) => {
-            onSubRowChange(rowId, subRowId, columnId, val ? [] : undefined);
+            if (subColumnId) {
+                onSubRowChange(
+                    rowId,
+                    subRowId,
+                    columnId,
+                    (oldValue) => {
+                        if (val) {
+                            return [...(oldValue ?? []), subColumnId];
+                        }
+                        const newValue = oldValue?.filter((item) => item !== subColumnId);
+                        if (!newValue || newValue.length <= 0) {
+                            return undefined;
+                        }
+                        return newValue;
+                    },
+                );
+            } else {
+                onSubRowChange(rowId, subRowId, columnId, () => (val ? [] : undefined));
+            }
         },
-        [rowId, subRowId, columnId, onSubRowChange],
+        [rowId, subRowId, columnId, subColumnId, onSubRowChange],
     );
 
     return (
@@ -90,11 +111,12 @@ interface SubRowProps {
         rowId: string,
         subRowId: string,
         columnId: string,
-        selected: string[] | undefined,
+        selected: (val: string[] | undefined) => string[] | undefined,
     ) => void;
     subRow: SubRow;
     value: NonNullable<NonNullable<Matrix2dValue['value']>[string]>[string];
     columns: ColumnType[] | undefined;
+    selectedColumnId: string | undefined;
 }
 
 function SubRow(props: SubRowProps) {
@@ -108,6 +130,8 @@ function SubRow(props: SubRowProps) {
         subRow,
         value,
         columns,
+
+        selectedColumnId,
     } = props;
 
     const {
@@ -116,15 +140,19 @@ function SubRow(props: SubRowProps) {
         key: subRowId,
     } = subRow;
 
+    const selectedColumn = columns?.find((item) => item.key === selectedColumnId);
+
     return (
-        <tr className={_cs(className, styles.tableRow)}>
+        <tr
+            className={_cs(className, styles.tableRow)}
+        >
             <td
                 className={_cs(styles.tableRow, styles.subRowHeading)}
                 title={title ?? ''}
             >
                 {label ?? 'Unnamed'}
             </td>
-            {columns?.map((column) => (
+            {!selectedColumn && columns?.map((column) => (
                 <Column
                     key={column.key}
                     rowId={rowId}
@@ -136,6 +164,19 @@ function SubRow(props: SubRowProps) {
                     onSubRowChange={onSubRowChange}
                 />
             ))}
+            {selectedColumn && selectedColumn.subColumns?.map((subColumn) => (
+                <Column
+                    key={subColumn.key}
+                    rowId={rowId}
+                    subRowId={subRowId}
+                    columnId={selectedColumn.key}
+                    subColumnId={subColumn.key}
+                    disabled={disabled}
+                    title={`${subRow.label} & ${subColumn.label}`}
+                    selected={value?.[selectedColumn.key]?.includes(subColumn.key) ?? false}
+                    onSubRowChange={onSubRowChange}
+                />
+            ))}
         </tr>
     );
 }
@@ -150,7 +191,7 @@ interface RowProps {
         rowId: string,
         subRowId: string,
         columnId: string,
-        selected: string[] | undefined,
+        selected: (val: string[] | undefined) => string[] | undefined,
     ) => void;
 }
 
@@ -164,6 +205,10 @@ function Row(props: RowProps) {
         columns,
     } = props;
 
+    const [selectedColumnKey, setSelectedColumnKey] = useState<string | undefined>(undefined);
+
+    const selectedColumn = columns?.find((item) => item.key === selectedColumnKey);
+
     const {
         key,
         label,
@@ -187,8 +232,9 @@ function Row(props: RowProps) {
             subRow,
             rowId: key,
             columns,
+            selectedColumnId: selectedColumnKey,
         }),
-        [disabled, onSubRowChange, readOnly, value, key, columns],
+        [disabled, onSubRowChange, readOnly, value, key, columns, selectedColumnKey],
     );
 
     return (
@@ -203,27 +249,71 @@ function Row(props: RowProps) {
             <table className={styles.table}>
                 <thead>
                     <tr className={_cs(styles.tableRow, styles.tableHead)}>
-                        {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
-                        <th
-                            className={styles.tableHeader}
-                        />
-                        {columns?.map((column) => (
-                            <th
-                                className={styles.tableHeader}
-                                key={column.key}
-                                title={column.tooltip}
+                        {!selectedColumn && (
+                            <React.Fragment
+                                key={`${row.key}-column`}
                             >
-                                {column.label}
-                            </th>
-                        ))}
+                                {/* eslint-disable-next-line max-len */}
+                                {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
+                                <th className={_cs(styles.tableHeader, styles.firstColumn)} />
+                                {columns?.map((column) => (
+                                    <th
+                                        className={_cs(
+                                            styles.tableHeader,
+                                            ((column.subColumns?.length ?? 0) > 0 && !readOnly)
+                                                && styles.clickable,
+                                        )}
+                                        key={column.key}
+                                        title={column.tooltip}
+                                        onClick={() => {
+                                            if ((column.subColumns?.length ?? 0) > 0 && !readOnly) {
+                                                setSelectedColumnKey(column.key);
+                                            }
+                                        }}
+                                    >
+                                        {column.label}
+                                    </th>
+                                ))}
+                            </React.Fragment>
+                        )}
+                        {selectedColumn && (
+                            <React.Fragment
+                                key={`${row.key}-${selectedColumn}`}
+                            >
+                                <th
+                                    className={_cs(
+                                        styles.tableHeader,
+                                        styles.firstColumn,
+                                        styles.clickable,
+                                    )}
+                                    onClick={() => setSelectedColumnKey(undefined)}
+                                >
+                                    <div className={styles.back}>
+                                        <IoArrowBackOutline />
+                                        Back
+                                    </div>
+                                </th>
+                                {selectedColumn.subColumns?.map((subColumn) => (
+                                    <th
+                                        className={styles.tableHeader}
+                                        key={subColumn.key}
+                                        title={subColumn.tooltip}
+                                    >
+                                        {subColumn.label}
+                                    </th>
+                                ))}
+                            </React.Fragment>
+                        )}
                     </tr>
                 </thead>
-                <List
-                    data={orderedSubRows}
-                    keySelector={subRowKeySelector}
-                    rendererParams={subRowRendererParams}
-                    renderer={SubRow}
-                />
+                <tbody>
+                    <List
+                        data={orderedSubRows}
+                        keySelector={subRowKeySelector}
+                        rendererParams={subRowRendererParams}
+                        renderer={SubRow}
+                    />
+                </tbody>
             </table>
         </div>
     );
@@ -239,6 +329,7 @@ export interface Props <N extends string>{
     onChange: (value: Matrix2dValue | undefined, name: N) => void,
 
     actions?: React.ReactNode,
+    icons?: React.ReactNode,
     disabled?: boolean;
     readOnly?: boolean;
 
@@ -256,6 +347,7 @@ function Matrix2dWidgetInput<N extends string>(props: Props<N>) {
         disabled,
         readOnly,
         actions,
+        icons,
         error: riskyError,
     } = props;
 
@@ -277,18 +369,18 @@ function Matrix2dWidgetInput<N extends string>(props: Props<N>) {
             rowId: string,
             subRowId: string,
             columnId: string,
-            state: string[] | undefined,
+            state: (val: string[] | undefined) => string[] | undefined,
         ) => {
-            const newValue = removeEmptyObject({
+            const newValue = removeEmptyObject(removeUndefinedKeys({
                 ...value?.value,
                 [rowId]: {
                     ...value?.value?.[rowId],
                     [subRowId]: {
                         ...value?.value?.[rowId]?.[subRowId],
-                        [columnId]: state,
+                        [columnId]: state(value?.value?.[rowId]?.[subRowId]?.[columnId]),
                     },
                 },
-            });
+            }));
             onChange(newValue, name);
         },
         [value, name, onChange],
@@ -325,6 +417,7 @@ function Matrix2dWidgetInput<N extends string>(props: Props<N>) {
             childrenContainerClassName={styles.matrix}
             title={title}
             actions={actions}
+            icons={icons}
             error={error}
         >
             <NonFieldError
diff --git a/app/components/framework/AttributeInput/Matrix2dWidgetInput/styles.css b/app/components/framework/AttributeInput/Matrix2dWidgetInput/styles.css
index e9dbc6aa79..608bf0717d 100644
--- a/app/components/framework/AttributeInput/Matrix2dWidgetInput/styles.css
+++ b/app/components/framework/AttributeInput/Matrix2dWidgetInput/styles.css
@@ -1,12 +1,10 @@
 .matrix {
     display: flex;
     flex-direction: column;
-    margin: calc(var(--dui-spacing-medium) - var(--dui-spacing-small));
 
     .matrix-row {
         display: flex;
         flex-direction: column;
-        padding: var(--dui-spacing-small);
 
         .title {
             padding: var(--dui-spacing-medium) 0;
@@ -16,9 +14,29 @@
             border-collapse: collapse;
 
             .table-head {
+                .first-column {
+                    width: 10em;
+                }
+
+                .back {
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                    gap: var(--dui-spacing-extra-small);
+                }
+
                 .table-header {
                     background-color: var(--dui-color-background);
+                    cursor: not-allowed;
                     padding: var(--dui-spacing-medium);
+
+                    &.clickable {
+                        cursor: pointer;
+
+                        &:hover {
+                            background-color: var(--dui-color-surface-information);
+                        }
+                    }
                 }
             }
 
diff --git a/app/components/framework/AttributeInput/MultiSelectWidgetInput/index.tsx b/app/components/framework/AttributeInput/MultiSelectWidgetInput/index.tsx
index df418ef5d3..71cdfdb379 100644
--- a/app/components/framework/AttributeInput/MultiSelectWidgetInput/index.tsx
+++ b/app/components/framework/AttributeInput/MultiSelectWidgetInput/index.tsx
@@ -16,7 +16,7 @@ type MultiSelectValue = NonNullable<MultiSelectWidgetAttribute['data']>;
 
 export type PartialMultiSelectWidget = PartialForm<
     MultiSelectWidget,
-    'key' | 'widgetId' | 'order'
+    'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type Option = NonNullable<NonNullable<
@@ -36,6 +36,7 @@ export interface Props <N extends string>{
     onChange: (value: MultiSelectValue | undefined, name: N) => void,
 
     actions?: React.ReactNode,
+    icons?: React.ReactNode,
     disabled?: boolean;
     readOnly?: boolean;
 
@@ -50,6 +51,7 @@ function MultiSelectWidgetInput<N extends string>(props: Props<N>) {
         value,
         onChange: onChangeFromProps,
         actions,
+        icons,
         widget,
         disabled,
         readOnly,
@@ -79,6 +81,7 @@ function MultiSelectWidgetInput<N extends string>(props: Props<N>) {
             className={className}
             title={title}
             actions={actions}
+            icons={icons}
             error={error}
         >
             <NonFieldError
diff --git a/app/components/framework/AttributeInput/NumberWidgetInput/index.tsx b/app/components/framework/AttributeInput/NumberWidgetInput/index.tsx
index 0181746977..8b04e4d690 100644
--- a/app/components/framework/AttributeInput/NumberWidgetInput/index.tsx
+++ b/app/components/framework/AttributeInput/NumberWidgetInput/index.tsx
@@ -19,6 +19,7 @@ export interface Props <N extends string>{
     onChange: (value: NumberValue | undefined, name: N) => void,
 
     actions?: React.ReactNode,
+    icons?: React.ReactNode,
     disabled?: boolean;
     readOnly?: boolean;
 }
@@ -33,6 +34,7 @@ function NumberWidgetInput<N extends string>(props: Props<N>) {
         disabled,
         readOnly,
         actions,
+        icons,
         error: riskyError,
     } = props;
 
@@ -54,6 +56,7 @@ function NumberWidgetInput<N extends string>(props: Props<N>) {
             className={className}
             title={title}
             actions={actions}
+            icons={icons}
             error={error}
         >
             <NonFieldError
diff --git a/app/components/framework/AttributeInput/OrganigramWidgetInput/index.tsx b/app/components/framework/AttributeInput/OrganigramWidgetInput/index.tsx
index 3ea4c32611..d36c74e53b 100644
--- a/app/components/framework/AttributeInput/OrganigramWidgetInput/index.tsx
+++ b/app/components/framework/AttributeInput/OrganigramWidgetInput/index.tsx
@@ -10,7 +10,7 @@ import WidgetWrapper from '../WidgetWrapper';
 
 export type PartialOrganigramWidget = PartialForm<
     OrganigramWidget,
-    'key' | 'widgetId' | 'order'
+    'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type OrganigramValue = NonNullable<OrganigramWidgetAttribute['data']>;
@@ -25,6 +25,7 @@ export interface Props <N extends string>{
     onChange: (value: OrganigramValue | undefined, name: N) => void;
 
     actions?: React.ReactNode;
+    icons?: React.ReactNode;
     disabled?: boolean;
     readOnly?: boolean;
 
@@ -38,6 +39,7 @@ function OrganigramWidgetInput<N extends string>(props: Props<N>) {
         name,
         value,
         actions,
+        icons,
         onChange: onChangeFromProps,
         widget,
         disabled,
@@ -63,6 +65,7 @@ function OrganigramWidgetInput<N extends string>(props: Props<N>) {
             className={className}
             title={title}
             actions={actions}
+            icons={icons}
             error={error}
         >
             <NonFieldError error={error} />
diff --git a/app/components/framework/AttributeInput/ScaleWidgetInput/index.tsx b/app/components/framework/AttributeInput/ScaleWidgetInput/index.tsx
index fad1b88c14..e1a1055a3f 100644
--- a/app/components/framework/AttributeInput/ScaleWidgetInput/index.tsx
+++ b/app/components/framework/AttributeInput/ScaleWidgetInput/index.tsx
@@ -16,7 +16,7 @@ type ScaleValue = NonNullable<ScaleWidgetAttribute['data']>;
 
 export type PartialScaleWidget = PartialForm<
     ScaleWidget,
-    'key' | 'widgetId' | 'order'
+    'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type Option = NonNullable<NonNullable<
@@ -37,6 +37,7 @@ export interface Props<N extends string>{
     onChange: (value: ScaleValue | undefined, name: N) => void,
 
     actions?: React.ReactNode,
+    icons?: React.ReactNode,
     disabled?: boolean;
     readOnly?: boolean;
 
@@ -51,6 +52,7 @@ function ScaleWidgetInput<N extends string>(props: Props<N>) {
         value,
         onChange: onChangeFromProps,
         actions,
+        icons,
         widget,
         disabled,
         readOnly,
@@ -79,6 +81,7 @@ function ScaleWidgetInput<N extends string>(props: Props<N>) {
             className={className}
             title={title}
             actions={actions}
+            icons={icons}
             error={error}
         >
             <NonFieldError
diff --git a/app/components/framework/AttributeInput/SingleSelectWidgetInput/index.tsx b/app/components/framework/AttributeInput/SingleSelectWidgetInput/index.tsx
index 21033e787d..8920436908 100644
--- a/app/components/framework/AttributeInput/SingleSelectWidgetInput/index.tsx
+++ b/app/components/framework/AttributeInput/SingleSelectWidgetInput/index.tsx
@@ -16,7 +16,7 @@ type SingleSelectValue = NonNullable<SingleSelectWidgetAttribute['data']>;
 
 export type PartialSingleSelectWidget = PartialForm<
     SingleSelectWidget,
-    'key' | 'widgetId' | 'order'
+    'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type Option = NonNullable<NonNullable<
@@ -36,6 +36,7 @@ export interface Props <N extends string>{
     onChange: (value: SingleSelectValue | undefined, name: N) => void,
 
     actions?: React.ReactNode,
+    icons?: React.ReactNode,
     disabled?: boolean;
     readOnly?: boolean;
 
@@ -50,6 +51,7 @@ function SingleSelectWidgetInput<N extends string>(props: Props<N>) {
         value,
         onChange: onChangeFromProps,
         actions,
+        icons,
         widget,
         disabled,
         readOnly,
@@ -79,6 +81,7 @@ function SingleSelectWidgetInput<N extends string>(props: Props<N>) {
             className={className}
             title={title}
             actions={actions}
+            icons={icons}
             error={error}
         >
             <NonFieldError
diff --git a/app/components/framework/AttributeInput/TextWidgetInput/index.tsx b/app/components/framework/AttributeInput/TextWidgetInput/index.tsx
index e181d6d9eb..7efaf995ed 100644
--- a/app/components/framework/AttributeInput/TextWidgetInput/index.tsx
+++ b/app/components/framework/AttributeInput/TextWidgetInput/index.tsx
@@ -19,6 +19,7 @@ export interface Props <N extends string>{
     onChange: (value: TextValue | undefined, name: N) => void,
 
     actions?: React.ReactNode,
+    icons?: React.ReactNode,
     disabled?: boolean;
     readOnly?: boolean;
 }
@@ -33,6 +34,7 @@ function TextWidgetInput<N extends string>(props: Props<N>) {
         disabled,
         readOnly,
         actions,
+        icons,
         error: riskyError,
     } = props;
 
@@ -54,6 +56,7 @@ function TextWidgetInput<N extends string>(props: Props<N>) {
             className={className}
             title={title}
             actions={actions}
+            icons={icons}
             error={error}
         >
             <NonFieldError
@@ -67,6 +70,7 @@ function TextWidgetInput<N extends string>(props: Props<N>) {
                 readOnly={readOnly}
                 disabled={disabled}
                 error={error?.value}
+                autoSize
             />
         </WidgetWrapper>
     );
diff --git a/app/components/framework/AttributeInput/TimeRangeWidgetInput/index.tsx b/app/components/framework/AttributeInput/TimeRangeWidgetInput/index.tsx
index 8bc357ec5e..c68965f446 100644
--- a/app/components/framework/AttributeInput/TimeRangeWidgetInput/index.tsx
+++ b/app/components/framework/AttributeInput/TimeRangeWidgetInput/index.tsx
@@ -1,7 +1,6 @@
 import React, { useCallback } from 'react';
-import { TimeRangeInput, QuickActionButton } from '@the-deep/deep-ui';
+import { TimeRangeInput } from '@the-deep/deep-ui';
 import { isNotDefined } from '@togglecorp/fujs';
-import { IoSwapHorizontal } from 'react-icons/io5';
 import { Error, getErrorObject, getErrorString } from '@togglecorp/toggle-form';
 
 import NonFieldError from '#components/NonFieldError';
@@ -24,6 +23,7 @@ export interface Props <N extends string>{
         name: N,
     ) => void,
     actions?: React.ReactNode,
+    icons?: React.ReactNode,
     disabled?: boolean;
     readOnly?: boolean;
 }
@@ -38,6 +38,7 @@ function TimeRangeWidgetInput<N extends string>(props: Props<N>) {
         disabled,
         readOnly,
         actions,
+        icons,
         error: riskyError,
     } = props;
 
@@ -53,20 +54,6 @@ function TimeRangeWidgetInput<N extends string>(props: Props<N>) {
         },
         [onChangeFromProps],
     );
-    const handleValueSwap = useCallback(
-        () => {
-            if (value?.value) {
-                onChange(
-                    {
-                        startTime: value.value.endTime,
-                        endTime: value.value.startTime,
-                    },
-                    name,
-                );
-            }
-        },
-        [onChange, value, name],
-    );
 
     const valueErrorString = getErrorString(error?.value);
     const valueErrorObject = getErrorObject(error?.value);
@@ -81,6 +68,7 @@ function TimeRangeWidgetInput<N extends string>(props: Props<N>) {
             title={title}
             childrenContainerClassName={styles.content}
             actions={actions}
+            icons={icons}
             error={error}
         >
             <NonFieldError
@@ -94,16 +82,6 @@ function TimeRangeWidgetInput<N extends string>(props: Props<N>) {
                 readOnly={readOnly}
                 disabled={disabled}
                 error={valueError}
-                actions={value?.value && (
-                    <QuickActionButton
-                        name={undefined}
-                        onClick={handleValueSwap}
-                        title="Swap Values" // FIXME: use translations
-                        variant="transparent"
-                    >
-                        <IoSwapHorizontal />
-                    </QuickActionButton>
-                )}
             />
         </WidgetWrapper>
     );
diff --git a/app/components/framework/AttributeInput/TimeWidgetInput/index.tsx b/app/components/framework/AttributeInput/TimeWidgetInput/index.tsx
index 6fc68de5f2..6335336435 100644
--- a/app/components/framework/AttributeInput/TimeWidgetInput/index.tsx
+++ b/app/components/framework/AttributeInput/TimeWidgetInput/index.tsx
@@ -19,6 +19,7 @@ export interface Props <N extends string>{
     error: Error<TimeValue> | undefined;
 
     actions?: React.ReactNode,
+    icons?: React.ReactNode,
     disabled?: boolean;
     readOnly?: boolean;
 }
@@ -33,6 +34,7 @@ function TimeWidgetInput<N extends string>(props: Props<N>) {
         disabled,
         readOnly,
         actions,
+        icons,
         error: riskyError,
     } = props;
 
@@ -54,6 +56,7 @@ function TimeWidgetInput<N extends string>(props: Props<N>) {
             className={className}
             title={title}
             actions={actions}
+            icons={icons}
             error={error}
         >
             <NonFieldError
diff --git a/app/components/framework/AttributeInput/WidgetWrapper/index.tsx b/app/components/framework/AttributeInput/WidgetWrapper/index.tsx
index d294e5d814..7b25ca8ab4 100644
--- a/app/components/framework/AttributeInput/WidgetWrapper/index.tsx
+++ b/app/components/framework/AttributeInput/WidgetWrapper/index.tsx
@@ -14,6 +14,9 @@ export interface Props {
     actions?: React.ReactNode,
     actionsContainerClassName?: string;
 
+    icons?: React.ReactNode;
+    iconsContainerClassName?: string;
+
     children?: React.ReactNode,
     childrenContainerClassName?: string;
 
@@ -28,9 +31,11 @@ function WidgetWrapper(props: Props) {
         className,
         title,
         actions,
+        icons,
         children,
         headerClassName,
         actionsContainerClassName,
+        iconsContainerClassName,
         childrenContainerClassName,
     } = props;
 
@@ -44,12 +49,16 @@ function WidgetWrapper(props: Props) {
             <Header
                 // FIXME: use strings
                 heading={title ?? 'Unnamed'}
+                spacing="compact"
                 className={headerClassName}
                 headingSize="extraSmall"
+                headingSectionClassName={styles.header}
                 actionsContainerClassName={actionsContainerClassName}
                 actions={actions}
+                iconsContainerClassName={iconsContainerClassName}
+                icons={icons}
             />
-            <div className={childrenContainerClassName}>
+            <div className={_cs(childrenContainerClassName, styles.children)}>
                 <ErrorBoundary>
                     {children}
                 </ErrorBoundary>
diff --git a/app/components/framework/AttributeInput/WidgetWrapper/styles.css b/app/components/framework/AttributeInput/WidgetWrapper/styles.css
index a32652cce1..11526862dd 100644
--- a/app/components/framework/AttributeInput/WidgetWrapper/styles.css
+++ b/app/components/framework/AttributeInput/WidgetWrapper/styles.css
@@ -1,6 +1,13 @@
 .widget-wrapper {
     display: flex;
     flex-direction: column;
-    background-color: var(--dui-color-foreground);
     overflow-y: auto;
+
+    .header {
+        align-items: center;
+    }
+
+    .children {
+        padding: var(--dui-spacing-small);
+    }
 }
diff --git a/app/components/framework/AttributeInput/index.tsx b/app/components/framework/AttributeInput/index.tsx
index 21c44db258..5e7ac80f66 100644
--- a/app/components/framework/AttributeInput/index.tsx
+++ b/app/components/framework/AttributeInput/index.tsx
@@ -13,7 +13,7 @@ import {
     isNotDefined,
 } from '@togglecorp/fujs';
 
-import { Widget } from '#types/newAnalyticalFramework';
+import { Widget, getWidgetVersion } from '#types/newAnalyticalFramework';
 import { PartialEntryType } from '#views/Project/EntryEdit/schema';
 import NonFieldError from '#components/NonFieldError';
 import { GeoArea } from '#components/GeoMultiSelectInput';
@@ -58,7 +58,7 @@ type PartialAttributeType = NonNullable<PartialEntryType['attributes']>[number];
 
 export type PartialWidget = PartialForm<
     Widget,
-    'clientId' | 'key' | 'widgetId' | 'order'
+    'key' | 'widgetId' | 'clientId' | 'order' | 'conditional'
 >;
 
 export interface Props<N extends string | number | undefined> {
@@ -72,6 +72,7 @@ export interface Props<N extends string | number | undefined> {
     readOnly?: boolean;
     disabled?: boolean;
     actions?: React.ReactNode;
+    icons?: React.ReactNode;
     geoAreaOptions: GeoArea[] | undefined | null;
     onGeoAreaOptionsChange: React.Dispatch<React.SetStateAction<GeoArea[] | undefined | null>>;
 }
@@ -87,6 +88,7 @@ function AttributeInput<N extends string | number | undefined>(props: Props<N>)
         readOnly,
         disabled,
         actions,
+        icons,
         error: riskyError,
 
         geoAreaOptions,
@@ -102,6 +104,7 @@ function AttributeInput<N extends string | number | undefined>(props: Props<N>)
             // NOTE: widget.id should always be defined before an attribute can be saved
             widget: widget.id ?? 'not-random',
             data: undefined,
+            widgetVersion: getWidgetVersion(widget.widgetId),
         }),
         [widget],
     );
@@ -110,6 +113,8 @@ function AttributeInput<N extends string | number | undefined>(props: Props<N>)
 
     let component: JSX.Element;
 
+    // TODO: check widget and attribute version
+
     if (widget.widgetId === 'TEXT' && (isNotDefined(value) || value.widgetType === widget.widgetId)) {
         const data = value?.data;
         component = (
@@ -122,6 +127,7 @@ function AttributeInput<N extends string | number | undefined>(props: Props<N>)
                 readOnly={readOnly}
                 disabled={disabled}
                 actions={actions}
+                icons={icons}
                 error={error?.data as Error<typeof data> | undefined}
             />
         );
@@ -137,6 +143,7 @@ function AttributeInput<N extends string | number | undefined>(props: Props<N>)
                 readOnly={readOnly}
                 disabled={disabled}
                 actions={actions}
+                icons={icons}
                 error={error?.data as Error<typeof data> | undefined}
             />
         );
@@ -152,6 +159,7 @@ function AttributeInput<N extends string | number | undefined>(props: Props<N>)
                 readOnly={readOnly}
                 disabled={disabled}
                 actions={actions}
+                icons={icons}
                 error={error?.data as Error<typeof data> | undefined}
             />
         );
@@ -167,6 +175,7 @@ function AttributeInput<N extends string | number | undefined>(props: Props<N>)
                 readOnly={readOnly}
                 disabled={disabled}
                 actions={actions}
+                icons={icons}
                 error={error?.data as Error<typeof data> | undefined}
             />
         );
@@ -182,6 +191,7 @@ function AttributeInput<N extends string | number | undefined>(props: Props<N>)
                 readOnly={readOnly}
                 disabled={disabled}
                 actions={actions}
+                icons={icons}
                 error={error?.data as Error<typeof data> | undefined}
             />
         );
@@ -197,6 +207,7 @@ function AttributeInput<N extends string | number | undefined>(props: Props<N>)
                 readOnly={readOnly}
                 disabled={disabled}
                 actions={actions}
+                icons={icons}
                 error={error?.data as Error<typeof data> | undefined}
             />
         );
@@ -212,6 +223,7 @@ function AttributeInput<N extends string | number | undefined>(props: Props<N>)
                 readOnly={readOnly}
                 disabled={disabled}
                 actions={actions}
+                icons={icons}
                 widget={widget}
                 error={error?.data as Error<typeof data> | undefined}
             />
@@ -228,6 +240,7 @@ function AttributeInput<N extends string | number | undefined>(props: Props<N>)
                 readOnly={readOnly}
                 disabled={disabled}
                 actions={actions}
+                icons={icons}
                 widget={widget}
                 error={error?.data as Error<typeof data> | undefined}
             />
@@ -244,6 +257,7 @@ function AttributeInput<N extends string | number | undefined>(props: Props<N>)
                 readOnly={readOnly}
                 disabled={disabled}
                 actions={actions}
+                icons={icons}
                 widget={widget}
                 error={error?.data as Error<typeof data> | undefined}
             />
@@ -260,6 +274,7 @@ function AttributeInput<N extends string | number | undefined>(props: Props<N>)
                 readOnly={readOnly}
                 disabled={disabled}
                 actions={actions}
+                icons={icons}
                 widget={widget}
                 error={error?.data as Error<typeof data> | undefined}
             />
@@ -276,6 +291,7 @@ function AttributeInput<N extends string | number | undefined>(props: Props<N>)
                 readOnly={readOnly}
                 disabled={disabled}
                 actions={actions}
+                icons={icons}
                 widget={widget}
                 error={error?.data as Error<typeof data> | undefined}
             />
@@ -293,6 +309,7 @@ function AttributeInput<N extends string | number | undefined>(props: Props<N>)
                 disabled={disabled}
                 widget={widget}
                 actions={actions}
+                icons={icons}
                 error={error?.data as Error<typeof data> | undefined}
             />
         );
@@ -309,6 +326,7 @@ function AttributeInput<N extends string | number | undefined>(props: Props<N>)
                 disabled={disabled}
                 widget={widget}
                 actions={actions}
+                icons={icons}
                 error={error?.data as Error<typeof data> | undefined}
                 geoAreaOptions={geoAreaOptions}
                 onGeoAreaOptionsChange={onGeoAreaOptionsChange}
@@ -320,6 +338,7 @@ function AttributeInput<N extends string | number | undefined>(props: Props<N>)
                 className={className}
                 title={widget.title}
                 actions={actions}
+                icons={icons}
                 error={error?.data}
                 disabled={disabled}
                 readOnly={readOnly}
diff --git a/app/components/framework/CompactAttributeInput/BaseWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/BaseWidgetInput/index.tsx
index 663248c016..badd660449 100644
--- a/app/components/framework/CompactAttributeInput/BaseWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/BaseWidgetInput/index.tsx
@@ -9,6 +9,8 @@ export interface Props{
     error?: unknown;
     disabled?: boolean;
     readOnly?: boolean;
+    actions?: React.ReactNode;
+    icons?: React.ReactNode;
 }
 
 function BaseWidgetInput(props: Props) {
@@ -18,6 +20,8 @@ function BaseWidgetInput(props: Props) {
         error,
         disabled,
         readOnly,
+        actions,
+        icons,
     } = props;
 
     return (
@@ -27,6 +31,8 @@ function BaseWidgetInput(props: Props) {
             error={error}
             disabled={disabled}
             readOnly={readOnly}
+            actions={actions}
+            icons={icons}
         >
             <Card>
                 {/* FIXME: use strings */}
diff --git a/app/components/framework/CompactAttributeInput/DateRangeWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/DateRangeWidgetInput/index.tsx
index 98dae6ac2b..bf624ae071 100644
--- a/app/components/framework/CompactAttributeInput/DateRangeWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/DateRangeWidgetInput/index.tsx
@@ -1,11 +1,9 @@
 import React, { useCallback } from 'react';
 import {
-    QuickActionButton,
     DateRangeInput,
     DateRangeOutput,
 } from '@the-deep/deep-ui';
 import { isNotDefined } from '@togglecorp/fujs';
-import { IoSwapHorizontal } from 'react-icons/io5';
 import { Error, getErrorObject, getErrorString } from '@togglecorp/toggle-form';
 
 import NonFieldError from '#components/NonFieldError';
@@ -26,6 +24,8 @@ export interface Props <N extends string>{
     onChange: (value: DateRangeValue | undefined, name: N) => void,
     disabled?: boolean;
     readOnly?: boolean;
+    actions?: React.ReactNode;
+    icons?: React.ReactNode;
 }
 
 function DateRangeWidgetInput<N extends string>(props: Props<N>) {
@@ -37,6 +37,8 @@ function DateRangeWidgetInput<N extends string>(props: Props<N>) {
         onChange: onChangeFromProps,
         disabled,
         readOnly,
+        actions,
+        icons,
         error: riskyError,
     } = props;
 
@@ -53,21 +55,6 @@ function DateRangeWidgetInput<N extends string>(props: Props<N>) {
         [onChangeFromProps],
     );
 
-    const handleValueSwap = useCallback(
-        () => {
-            if (value?.value) {
-                onChange(
-                    {
-                        endDate: value.value.startDate,
-                        startDate: value.value.endDate,
-                    },
-                    name,
-                );
-            }
-        },
-        [onChange, value, name],
-    );
-
     const valueErrorString = getErrorString(error?.value);
     const valueErrorObject = getErrorObject(error?.value);
 
@@ -83,6 +70,8 @@ function DateRangeWidgetInput<N extends string>(props: Props<N>) {
             error={error}
             disabled={disabled}
             readOnly={readOnly}
+            actions={actions}
+            icons={icons}
         >
             {!readOnly ? (
                 <>
@@ -98,15 +87,6 @@ function DateRangeWidgetInput<N extends string>(props: Props<N>) {
                         disabled={disabled}
                         error={valueError}
                     />
-                    <QuickActionButton
-                        className={styles.button}
-                        name={undefined}
-                        onClick={handleValueSwap}
-                        title="Swap Values" // FIXME: use translations
-                        variant="action"
-                    >
-                        <IoSwapHorizontal />
-                    </QuickActionButton>
                 </>
             ) : (
                 <DateRangeOutput
diff --git a/app/components/framework/CompactAttributeInput/DateRangeWidgetInput/styles.css b/app/components/framework/CompactAttributeInput/DateRangeWidgetInput/styles.css
index bab336a666..9b5a0955be 100644
--- a/app/components/framework/CompactAttributeInput/DateRangeWidgetInput/styles.css
+++ b/app/components/framework/CompactAttributeInput/DateRangeWidgetInput/styles.css
@@ -4,8 +4,4 @@
     .input {
         flex-grow: 1;
     }
-
-    .button {
-        flex-shrink: 0;
-    }
 }
diff --git a/app/components/framework/CompactAttributeInput/DateWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/DateWidgetInput/index.tsx
index 63984988ac..38067a0c73 100644
--- a/app/components/framework/CompactAttributeInput/DateWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/DateWidgetInput/index.tsx
@@ -20,6 +20,8 @@ export interface Props <N extends string>{
 
     disabled?: boolean;
     readOnly?: boolean;
+    actions?: React.ReactNode;
+    icons?: React.ReactNode;
 }
 
 function DateWidgetInput<N extends string>(props: Props<N>) {
@@ -31,6 +33,8 @@ function DateWidgetInput<N extends string>(props: Props<N>) {
         onChange: onChangeFromProps,
         disabled,
         readOnly,
+        actions,
+        icons,
         error: riskyError,
     } = props;
 
@@ -54,6 +58,8 @@ function DateWidgetInput<N extends string>(props: Props<N>) {
             error={error}
             disabled={disabled}
             readOnly={readOnly}
+            actions={actions}
+            icons={icons}
         >
             {readOnly ? (
                 <DateOutput
diff --git a/app/components/framework/CompactAttributeInput/GeoLocationWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/GeoLocationWidgetInput/index.tsx
index a6edc20259..684e38c9e0 100644
--- a/app/components/framework/CompactAttributeInput/GeoLocationWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/GeoLocationWidgetInput/index.tsx
@@ -12,7 +12,7 @@ import WidgetWrapper from '../WidgetWrapper';
 
 export type PartialGeoLocationWidget = PartialForm<
 GeoLocationWidget,
-    'key' | 'widgetId' | 'order'
+    'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type GeoLocationValue = NonNullable<GeoLocationWidgetAttribute['data']>;
@@ -27,6 +27,8 @@ export interface Props <N extends string>{
 
     disabled?: boolean;
     readOnly?: boolean;
+    actions?: React.ReactNode;
+    icons?: React.ReactNode;
 
     widget: PartialGeoLocationWidget;
     geoAreaOptions: GeoArea[] | undefined | null;
@@ -42,6 +44,8 @@ function GeoLocationWidgetInput<N extends string>(props: Props<N>) {
         onChange: onChangeFromProps,
         disabled,
         readOnly,
+        actions,
+        icons,
         error: riskyError,
         geoAreaOptions,
         onGeoAreaOptionsChange,
@@ -63,7 +67,8 @@ function GeoLocationWidgetInput<N extends string>(props: Props<N>) {
     const selectedValues = useMemo(() => {
         const optionsMap = listToMap(
             geoAreaOptions,
-            (d) => d.id, (d) => breadcrumb([d.regionTitle, d.adminLevelTitle, d.title]),
+            (d) => d.id,
+            (d) => breadcrumb([d.regionTitle, d.adminLevelTitle, d.title]),
         );
         return value?.value?.map((v) => optionsMap?.[v]);
     }, [geoAreaOptions, value]);
@@ -75,6 +80,8 @@ function GeoLocationWidgetInput<N extends string>(props: Props<N>) {
             error={error}
             disabled={disabled}
             readOnly={readOnly}
+            actions={actions}
+            icons={icons}
         >
             {readOnly ? (
                 selectedValues?.map((val) => (
@@ -94,6 +101,7 @@ function GeoLocationWidgetInput<N extends string>(props: Props<N>) {
                         error={getErrorString(error?.value)}
                         geoAreaOptions={geoAreaOptions}
                         onGeoAreaOptionsChange={onGeoAreaOptionsChange}
+                        showList
                     />
                 </>
             )}
diff --git a/app/components/framework/CompactAttributeInput/Matrix1dWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/Matrix1dWidgetInput/index.tsx
index 7f4a3080e5..db1c10a92c 100644
--- a/app/components/framework/CompactAttributeInput/Matrix1dWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/Matrix1dWidgetInput/index.tsx
@@ -26,7 +26,7 @@ type Matrix1dValue = NonNullable<Matrix1dWidgetAttribute['data']>;
 
 export type PartialMatrix1dWidget = PartialForm<
     Matrix1dWidget,
-    'key' | 'widgetId' | 'order'
+    'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type RowType = NonNullable<NonNullable<NonNullable<PartialMatrix1dWidget>['properties']>['rows']>[number];
@@ -114,9 +114,10 @@ export interface Props <N extends string>{
     onChange: (value: Matrix1dValue | undefined, name: N) => void;
     error: Error<Matrix1dValue> | undefined;
 
-    actions?: React.ReactNode;
     disabled?: boolean;
     readOnly?: boolean;
+    actions?: React.ReactNode;
+    icons?: React.ReactNode;
 
     widget: PartialMatrix1dWidget;
 }
@@ -127,9 +128,12 @@ function Matrix1dWidgetInput<N extends string>(props: Props<N>) {
         widget,
         name,
         value,
+        title,
         onChange: onChangeFromProps,
         disabled,
         readOnly,
+        actions,
+        icons,
         error: riskyError,
     } = props;
 
@@ -184,13 +188,15 @@ function Matrix1dWidgetInput<N extends string>(props: Props<N>) {
         [disabled, readOnly, handleCellsChange, value],
     );
 
-    // FIXME: handle finer level errors
-
     return (
         <WidgetWrapper
             className={_cs(className, styles.matrix)}
             error={error}
-            hideTitle
+            disabled={disabled}
+            readOnly={readOnly}
+            actions={actions}
+            icons={icons}
+            title={title}
         >
             <NonFieldError
                 error={error}
@@ -202,6 +208,11 @@ function Matrix1dWidgetInput<N extends string>(props: Props<N>) {
                 rendererParams={rowRendererParams}
                 renderer={Row}
                 compactEmptyMessage
+                emptyMessage="-"
+                messageShown
+                errored={false}
+                filtered={false}
+                pending={false}
             />
         </WidgetWrapper>
     );
diff --git a/app/components/framework/CompactAttributeInput/Matrix2dWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/Matrix2dWidgetInput/index.tsx
index 525a344a80..4ba5d7f355 100644
--- a/app/components/framework/CompactAttributeInput/Matrix2dWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/Matrix2dWidgetInput/index.tsx
@@ -21,7 +21,7 @@ type Matrix2dValue = NonNullable<Matrix2dWidgetAttribute['data']>;
 
 export type PartialMatrix2dWidget = PartialForm<
     Matrix2dWidget,
-    'key' | 'widgetId' | 'order'
+    'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type RowType = NonNullable<NonNullable<NonNullable<PartialMatrix2dWidget>['properties']>['rows']>[number];
@@ -259,9 +259,10 @@ export interface Props <N extends string>{
     error: Error<Matrix2dValue> | undefined;
     onChange: (value: Matrix2dValue | undefined, name: N) => void,
 
-    actions?: React.ReactNode,
     disabled?: boolean;
     readOnly?: boolean;
+    actions?: React.ReactNode;
+    icons?: React.ReactNode;
 
     widget: PartialMatrix2dWidget,
 }
@@ -271,10 +272,13 @@ function Matrix2dWidgetInput<N extends string>(props: Props<N>) {
         className,
         widget,
         name,
+        title,
         value,
         onChange: onChangeFromProps,
         disabled,
         readOnly,
+        actions,
+        icons,
         error: riskyError,
     } = props;
 
@@ -345,7 +349,11 @@ function Matrix2dWidgetInput<N extends string>(props: Props<N>) {
         <WidgetWrapper
             className={_cs(className, styles.matrix)}
             error={error}
-            hideTitle
+            title={title}
+            disabled={disabled}
+            readOnly={readOnly}
+            actions={actions}
+            icons={icons}
         >
             <NonFieldError
                 error={error}
@@ -357,6 +365,11 @@ function Matrix2dWidgetInput<N extends string>(props: Props<N>) {
                 rendererParams={rowRendererParams}
                 renderer={Row}
                 compactEmptyMessage
+                emptyMessage="-"
+                messageShown
+                pending={false}
+                filtered={false}
+                errored={false}
             />
         </WidgetWrapper>
     );
diff --git a/app/components/framework/CompactAttributeInput/MultiSelectWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/MultiSelectWidgetInput/index.tsx
index bd7af8741d..ed2889c02c 100644
--- a/app/components/framework/CompactAttributeInput/MultiSelectWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/MultiSelectWidgetInput/index.tsx
@@ -16,7 +16,7 @@ type MultiSelectValue = NonNullable<MultiSelectWidgetAttribute['data']>;
 
 export type PartialMultiSelectWidget = PartialForm<
     MultiSelectWidget,
-    'key' | 'widgetId' | 'order'
+    'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type Option = NonNullable<NonNullable<
@@ -37,6 +37,8 @@ export interface Props <N extends string>{
 
     disabled?: boolean;
     readOnly?: boolean;
+    actions?: React.ReactNode;
+    icons?: React.ReactNode;
 
     widget: PartialMultiSelectWidget,
 }
@@ -51,6 +53,8 @@ function MultiSelectWidgetInput<N extends string>(props: Props<N>) {
         widget,
         disabled,
         readOnly,
+        actions,
+        icons,
         error: riskyError,
     } = props;
 
@@ -84,6 +88,8 @@ function MultiSelectWidgetInput<N extends string>(props: Props<N>) {
             error={error}
             disabled={disabled}
             readOnly={readOnly}
+            actions={actions}
+            icons={icons}
         >
             {readOnly ? (
                 selectedValues?.map((val) => (
diff --git a/app/components/framework/CompactAttributeInput/NumberWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/NumberWidgetInput/index.tsx
index d1078d9617..88db387c93 100644
--- a/app/components/framework/CompactAttributeInput/NumberWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/NumberWidgetInput/index.tsx
@@ -20,6 +20,8 @@ export interface Props <N extends string>{
 
     disabled?: boolean;
     readOnly?: boolean;
+    actions?: React.ReactNode;
+    icons?: React.ReactNode;
 }
 
 function NumberWidgetInput<N extends string>(props: Props<N>) {
@@ -31,6 +33,8 @@ function NumberWidgetInput<N extends string>(props: Props<N>) {
         onChange: onChangeFromProps,
         disabled,
         readOnly,
+        actions,
+        icons,
         error: riskyError,
     } = props;
 
@@ -54,6 +58,8 @@ function NumberWidgetInput<N extends string>(props: Props<N>) {
             error={error}
             disabled={disabled}
             readOnly={readOnly}
+            actions={actions}
+            icons={icons}
         >
             {readOnly ? (
                 <NumberOutput
diff --git a/app/components/framework/CompactAttributeInput/OrganigramWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/OrganigramWidgetInput/index.tsx
index 3d611cdf4a..9e3f2c0a93 100644
--- a/app/components/framework/CompactAttributeInput/OrganigramWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/OrganigramWidgetInput/index.tsx
@@ -16,7 +16,7 @@ import WidgetWrapper from '../WidgetWrapper';
 
 export type PartialOrganigramWidget = PartialForm<
     OrganigramWidget,
-    'key' | 'widgetId' | 'order'
+    'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type OrganigramValue = NonNullable<OrganigramWidgetAttribute['data']>;
@@ -52,6 +52,8 @@ export interface Props <N extends string> {
 
     disabled?: boolean;
     readOnly?: boolean;
+    actions?: React.ReactNode;
+    icons?: React.ReactNode;
 
     widget: PartialOrganigramWidget;
 }
@@ -66,6 +68,8 @@ function OrganigramWidgetInput<N extends string>(props: Props<N>) {
         widget,
         disabled,
         readOnly,
+        actions,
+        icons,
         error: riskyError,
     } = props;
 
@@ -98,6 +102,8 @@ function OrganigramWidgetInput<N extends string>(props: Props<N>) {
             error={error}
             disabled={disabled}
             readOnly={readOnly}
+            actions={actions}
+            icons={icons}
         >
             {readOnly ? (
                 selectedValues?.map((val) => (
diff --git a/app/components/framework/CompactAttributeInput/ScaleWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/ScaleWidgetInput/index.tsx
index 538bd59f77..26c7c8a318 100644
--- a/app/components/framework/CompactAttributeInput/ScaleWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/ScaleWidgetInput/index.tsx
@@ -16,7 +16,7 @@ type ScaleValue = NonNullable<ScaleWidgetAttribute['data']>;
 
 export type PartialScaleWidget = PartialForm<
     ScaleWidget,
-    'key' | 'widgetId' | 'order'
+    'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type Option = NonNullable<NonNullable<
@@ -38,6 +38,8 @@ export interface Props<N extends string>{
 
     disabled?: boolean;
     readOnly?: boolean;
+    actions?: React.ReactNode;
+    icons?: React.ReactNode;
 
     widget: PartialScaleWidget,
 }
@@ -52,6 +54,8 @@ function ScaleWidgetInput<N extends string>(props: Props<N>) {
         widget,
         disabled,
         readOnly,
+        actions,
+        icons,
         error: riskyError,
     } = props;
 
@@ -79,6 +83,8 @@ function ScaleWidgetInput<N extends string>(props: Props<N>) {
             error={error}
             disabled={disabled}
             readOnly={readOnly}
+            actions={actions}
+            icons={icons}
         >
             <NonFieldError
                 error={error}
diff --git a/app/components/framework/CompactAttributeInput/SingleSelectWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/SingleSelectWidgetInput/index.tsx
index 9bbd4a1364..cf9e86900d 100644
--- a/app/components/framework/CompactAttributeInput/SingleSelectWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/SingleSelectWidgetInput/index.tsx
@@ -16,7 +16,7 @@ type SingleSelectValue = NonNullable<SingleSelectWidgetAttribute['data']>;
 
 export type PartialSingleSelectWidget = PartialForm<
     SingleSelectWidget,
-    'key' | 'widgetId' | 'order'
+    'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type Option = NonNullable<NonNullable<
@@ -37,6 +37,8 @@ export interface Props <N extends string>{
 
     disabled?: boolean;
     readOnly?: boolean;
+    actions?: React.ReactNode;
+    icons?: React.ReactNode;
 
     widget: PartialSingleSelectWidget,
 }
@@ -51,6 +53,8 @@ function SingleSelectWidgetInput<N extends string>(props: Props<N>) {
         widget,
         disabled,
         readOnly,
+        actions,
+        icons,
         error: riskyError,
     } = props;
 
@@ -83,6 +87,8 @@ function SingleSelectWidgetInput<N extends string>(props: Props<N>) {
             error={error}
             disabled={disabled}
             readOnly={readOnly}
+            actions={actions}
+            icons={icons}
         >
             {readOnly ? (
                 <div>
diff --git a/app/components/framework/CompactAttributeInput/TextWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/TextWidgetInput/index.tsx
index a3de602615..c53d364b0f 100644
--- a/app/components/framework/CompactAttributeInput/TextWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/TextWidgetInput/index.tsx
@@ -20,6 +20,8 @@ export interface Props <N extends string>{
 
     disabled?: boolean;
     readOnly?: boolean;
+    actions?: React.ReactNode;
+    icons?: React.ReactNode;
 }
 
 function TextWidgetInput<N extends string>(props: Props<N>) {
@@ -31,6 +33,8 @@ function TextWidgetInput<N extends string>(props: Props<N>) {
         onChange: onChangeFromProps,
         disabled,
         readOnly,
+        actions,
+        icons,
         error: riskyError,
     } = props;
 
@@ -54,6 +58,8 @@ function TextWidgetInput<N extends string>(props: Props<N>) {
             error={error}
             disabled={disabled}
             readOnly={readOnly}
+            actions={actions}
+            icons={icons}
         >
             {readOnly ? (
                 <div>
@@ -72,6 +78,7 @@ function TextWidgetInput<N extends string>(props: Props<N>) {
                         readOnly={readOnly}
                         disabled={disabled}
                         error={error?.value}
+                        autoSize
                     />
                 </>
             )}
diff --git a/app/components/framework/CompactAttributeInput/TimeRangeWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/TimeRangeWidgetInput/index.tsx
index 282b41d667..05d09b1c41 100644
--- a/app/components/framework/CompactAttributeInput/TimeRangeWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/TimeRangeWidgetInput/index.tsx
@@ -1,7 +1,6 @@
 import React, { useCallback } from 'react';
-import { TimeRangeInput, TimeRangeOutput, QuickActionButton } from '@the-deep/deep-ui';
+import { TimeRangeInput, TimeRangeOutput } from '@the-deep/deep-ui';
 import { isNotDefined } from '@togglecorp/fujs';
-import { IoSwapHorizontal } from 'react-icons/io5';
 import { Error, getErrorObject, getErrorString } from '@togglecorp/toggle-form';
 
 import NonFieldError from '#components/NonFieldError';
@@ -25,6 +24,8 @@ export interface Props <N extends string>{
     ) => void,
     disabled?: boolean;
     readOnly?: boolean;
+    actions?: React.ReactNode;
+    icons?: React.ReactNode;
 }
 
 function TimeRangeWidgetInput<N extends string>(props: Props<N>) {
@@ -36,6 +37,8 @@ function TimeRangeWidgetInput<N extends string>(props: Props<N>) {
         onChange: onChangeFromProps,
         disabled,
         readOnly,
+        actions,
+        icons,
         error: riskyError,
     } = props;
 
@@ -51,20 +54,6 @@ function TimeRangeWidgetInput<N extends string>(props: Props<N>) {
         },
         [onChangeFromProps],
     );
-    const handleValueSwap = useCallback(
-        () => {
-            if (value?.value) {
-                onChange(
-                    {
-                        startTime: value.value.endTime,
-                        endTime: value.value.startTime,
-                    },
-                    name,
-                );
-            }
-        },
-        [onChange, value, name],
-    );
 
     const valueErrorString = getErrorString(error?.value);
     const valueErrorObject = getErrorObject(error?.value);
@@ -81,6 +70,8 @@ function TimeRangeWidgetInput<N extends string>(props: Props<N>) {
             error={error}
             disabled={disabled}
             readOnly={readOnly}
+            actions={actions}
+            icons={icons}
         >
             {readOnly ? (
                 <TimeRangeOutput
@@ -101,15 +92,6 @@ function TimeRangeWidgetInput<N extends string>(props: Props<N>) {
                         disabled={disabled}
                         error={valueError}
                     />
-                    <QuickActionButton
-                        className={styles.button}
-                        name={undefined}
-                        onClick={handleValueSwap}
-                        title="Swap Values" // FIXME: use translations
-                        variant="action"
-                    >
-                        <IoSwapHorizontal />
-                    </QuickActionButton>
                 </>
             )}
         </WidgetWrapper>
diff --git a/app/components/framework/CompactAttributeInput/TimeRangeWidgetInput/styles.css b/app/components/framework/CompactAttributeInput/TimeRangeWidgetInput/styles.css
index bab336a666..9b5a0955be 100644
--- a/app/components/framework/CompactAttributeInput/TimeRangeWidgetInput/styles.css
+++ b/app/components/framework/CompactAttributeInput/TimeRangeWidgetInput/styles.css
@@ -4,8 +4,4 @@
     .input {
         flex-grow: 1;
     }
-
-    .button {
-        flex-shrink: 0;
-    }
 }
diff --git a/app/components/framework/CompactAttributeInput/TimeWidgetInput/index.tsx b/app/components/framework/CompactAttributeInput/TimeWidgetInput/index.tsx
index e54ca28b4d..6f3cc587a7 100644
--- a/app/components/framework/CompactAttributeInput/TimeWidgetInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/TimeWidgetInput/index.tsx
@@ -20,6 +20,8 @@ export interface Props <N extends string>{
 
     disabled?: boolean;
     readOnly?: boolean;
+    actions?: React.ReactNode;
+    icons?: React.ReactNode;
 }
 
 function TimeWidgetInput<N extends string>(props: Props<N>) {
@@ -31,6 +33,8 @@ function TimeWidgetInput<N extends string>(props: Props<N>) {
         onChange: onChangeFromProps,
         disabled,
         readOnly,
+        actions,
+        icons,
         error: riskyError,
     } = props;
 
@@ -54,6 +58,8 @@ function TimeWidgetInput<N extends string>(props: Props<N>) {
             error={error}
             disabled={disabled}
             readOnly={readOnly}
+            actions={actions}
+            icons={icons}
         >
             {readOnly ? (
                 <TimeOutput
diff --git a/app/components/framework/CompactAttributeInput/WidgetWrapper/index.tsx b/app/components/framework/CompactAttributeInput/WidgetWrapper/index.tsx
index 43305da7ea..99e46c4328 100644
--- a/app/components/framework/CompactAttributeInput/WidgetWrapper/index.tsx
+++ b/app/components/framework/CompactAttributeInput/WidgetWrapper/index.tsx
@@ -1,11 +1,13 @@
 import React from 'react';
 import { _cs, isDefined } from '@togglecorp/fujs';
 
+import { Header } from '@the-deep/deep-ui';
+
 import ErrorBoundary from '#base/components/ErrorBoundary';
 
 import styles from './styles.css';
 
-interface BaseProps {
+export interface Props {
     className?: string;
     headerClassName?: string;
 
@@ -14,17 +16,12 @@ interface BaseProps {
 
     disabled?: boolean;
     readOnly?: boolean;
+    actions?: React.ReactNode;
+    icons?: React.ReactNode;
 
     error: unknown;
-}
-
-export type Props = BaseProps & ({
     title: string | undefined;
-    hideTitle?: false;
-} | {
-    title?: string;
-    hideTitle: true;
-});
+}
 
 function WidgetWrapper(props: Props) {
     const {
@@ -33,8 +30,9 @@ function WidgetWrapper(props: Props) {
         children,
         headerClassName,
         childrenContainerClassName,
-        hideTitle,
         readOnly,
+        actions,
+        icons,
         error,
     } = props;
 
@@ -46,14 +44,15 @@ function WidgetWrapper(props: Props) {
                 isDefined(error) && styles.errored,
             )}
         >
-            {!hideTitle && (
-                <div
-                    className={_cs(headerClassName, styles.header)}
-                    // FIXME: use strings
-                >
-                    {title ?? 'Unnamed'}
-                </div>
-            )}
+            <Header
+                className={_cs(styles.header, headerClassName)}
+                icons={icons}
+                headingClassName={_cs(headerClassName, styles.heading)}
+                spacing="compact"
+                actionsContainerClassName={styles.actions}
+                heading={title ?? 'Unnamed'}
+                actions={actions}
+            />
             <div
                 className={_cs(
                     childrenContainerClassName,
diff --git a/app/components/framework/CompactAttributeInput/WidgetWrapper/styles.css b/app/components/framework/CompactAttributeInput/WidgetWrapper/styles.css
index babe6e3a72..1b630226ed 100644
--- a/app/components/framework/CompactAttributeInput/WidgetWrapper/styles.css
+++ b/app/components/framework/CompactAttributeInput/WidgetWrapper/styles.css
@@ -9,11 +9,26 @@
     }
 
     .header {
-        display: flex;
-        align-items: flex-end;
-        text-transform: capitalize;
-        color: var(--dui-color-brand);
-        font-weight: var(--dui-font-weight-bold);
+        .heading {
+            display: flex;
+            align-items: flex-end;
+            text-transform: capitalize;
+            color: var(--dui-color-brand);
+            font-size: var(--dui-font-size-medium);
+            font-weight: var(--dui-font-weight-bold);
+        }
+
+        .actions {
+            opacity: 0;
+        }
+    }
+
+    &:hover {
+        .header {
+            .actions {
+                opacity: 1;
+            }
+        }
     }
 
     .children {
diff --git a/app/components/framework/CompactAttributeInput/index.tsx b/app/components/framework/CompactAttributeInput/index.tsx
index 7b75110386..6fa3cf25c1 100644
--- a/app/components/framework/CompactAttributeInput/index.tsx
+++ b/app/components/framework/CompactAttributeInput/index.tsx
@@ -8,12 +8,19 @@ import {
     ObjectError,
     internal,
 } from '@togglecorp/toggle-form';
+import {
+    QuickActionConfirmButton,
+} from '@the-deep/deep-ui';
+import {
+    IoCaretDownOutline,
+    IoGlobeOutline,
+} from 'react-icons/io5';
 import {
     randomString,
     isNotDefined,
 } from '@togglecorp/fujs';
 
-import { Widget } from '#types/newAnalyticalFramework';
+import { Widget, getWidgetVersion } from '#types/newAnalyticalFramework';
 
 import { PartialEntryType } from '#views/Project/EntryEdit/schema';
 import NonFieldError from '#components/NonFieldError';
@@ -34,6 +41,8 @@ import OrganigramWidgetInput from './OrganigramWidgetInput';
 import GeoLocationWidgetInput from './GeoLocationWidgetInput';
 import BaseWidgetInput from './BaseWidgetInput';
 
+import styles from './styles.css';
+
 // FIXME: move this to utils later on
 export function getErrorObject<T extends ArrayError<T>>(
     value: T | string | undefined,
@@ -59,7 +68,7 @@ type PartialAttributeType = NonNullable<PartialEntryType['attributes']>[number];
 
 export type PartialWidget = PartialForm<
     Widget,
-    'clientId' | 'key' | 'widgetId' | 'order'
+    'key' | 'widgetId' | 'clientId' | 'order' | 'conditional'
 >;
 
 export interface Props<N extends string | number | undefined> {
@@ -75,6 +84,11 @@ export interface Props<N extends string | number | undefined> {
 
     geoAreaOptions: GeoArea[] | undefined | null;
     onGeoAreaOptionsChange: React.Dispatch<React.SetStateAction<GeoArea[] | undefined | null>>;
+
+    onApplyBelowClick?: (widgetId: string) => void;
+    onApplyAllClick?: (widgetId: string) => void;
+
+    applyButtonsHidden?: boolean;
 }
 
 function CompactAttributeInput<N extends string | number | undefined>(props: Props<N>) {
@@ -91,6 +105,11 @@ function CompactAttributeInput<N extends string | number | undefined>(props: Pro
 
         geoAreaOptions,
         onGeoAreaOptionsChange,
+
+        onApplyBelowClick,
+        onApplyAllClick,
+
+        applyButtonsHidden = true,
     } = props;
 
     const error = getErrorObject(riskyError);
@@ -102,6 +121,7 @@ function CompactAttributeInput<N extends string | number | undefined>(props: Pro
             // NOTE: widget.id should always be defined before an attribute can be saved
             widget: widget.id ?? 'not-random',
             data: undefined,
+            widgetVersion: getWidgetVersion(widget.widgetId),
         }),
         [widget],
     );
@@ -109,6 +129,47 @@ function CompactAttributeInput<N extends string | number | undefined>(props: Pro
     const onFieldChange = useFormObject(name, onChange, defaultOptionVal);
 
     let component: JSX.Element;
+    const handleApplyBelowClick = useCallback(() => {
+        if (onApplyBelowClick) {
+            onApplyBelowClick(widget.clientId);
+        }
+    }, [onApplyBelowClick, widget.clientId]);
+
+    const handleApplyAllClick = useCallback(() => {
+        if (onApplyAllClick) {
+            onApplyAllClick(widget.clientId);
+        }
+    }, [onApplyAllClick, widget.clientId]);
+
+    // TODO: check widget and attribute version
+
+    // FIXME: hide this if apply not implemented
+    const actions = !readOnly && !applyButtonsHidden && (
+        <>
+            <QuickActionConfirmButton
+                className={styles.button}
+                name={widget.clientId}
+                onConfirm={handleApplyBelowClick}
+                message="Are you sure you want to apply this widget's value to all the entries below?"
+                title="Apply to all below"
+                disabled={disabled}
+                spacing="compact"
+            >
+                <IoCaretDownOutline />
+            </QuickActionConfirmButton>
+            <QuickActionConfirmButton
+                className={styles.button}
+                name={widget.clientId}
+                onConfirm={handleApplyAllClick}
+                message="Are you sure you want to apply this widget's value to all entries in this lead?"
+                title="Apply to all"
+                disabled={disabled}
+                spacing="compact"
+            >
+                <IoGlobeOutline />
+            </QuickActionConfirmButton>
+        </>
+    );
 
     if (widget.widgetId === 'TEXT' && (isNotDefined(value) || value.widgetType === widget.widgetId)) {
         const data = value?.data;
@@ -122,6 +183,7 @@ function CompactAttributeInput<N extends string | number | undefined>(props: Pro
                 readOnly={readOnly}
                 disabled={disabled}
                 error={error?.data as Error<typeof data> | undefined}
+                actions={actions}
             />
         );
     } else if (widget.widgetId === 'NUMBER' && (isNotDefined(value) || value.widgetType === widget.widgetId)) {
@@ -136,6 +198,7 @@ function CompactAttributeInput<N extends string | number | undefined>(props: Pro
                 readOnly={readOnly}
                 disabled={disabled}
                 error={error?.data as Error<typeof data> | undefined}
+                actions={actions}
             />
         );
     } else if (widget.widgetId === 'DATE' && (isNotDefined(value) || value.widgetType === widget.widgetId)) {
@@ -150,6 +213,7 @@ function CompactAttributeInput<N extends string | number | undefined>(props: Pro
                 readOnly={readOnly}
                 disabled={disabled}
                 error={error?.data as Error<typeof data> | undefined}
+                actions={actions}
             />
         );
     } else if (widget.widgetId === 'TIME' && (isNotDefined(value) || value.widgetType === widget.widgetId)) {
@@ -164,6 +228,7 @@ function CompactAttributeInput<N extends string | number | undefined>(props: Pro
                 readOnly={readOnly}
                 disabled={disabled}
                 error={error?.data as Error<typeof data> | undefined}
+                actions={actions}
             />
         );
     } else if (widget.widgetId === 'DATE_RANGE' && (isNotDefined(value) || value.widgetType === widget.widgetId)) {
@@ -178,6 +243,7 @@ function CompactAttributeInput<N extends string | number | undefined>(props: Pro
                 readOnly={readOnly}
                 disabled={disabled}
                 error={error?.data as Error<typeof data> | undefined}
+                actions={actions}
             />
         );
     } else if (widget.widgetId === 'TIME_RANGE' && (isNotDefined(value) || value.widgetType === widget.widgetId)) {
@@ -192,6 +258,7 @@ function CompactAttributeInput<N extends string | number | undefined>(props: Pro
                 readOnly={readOnly}
                 disabled={disabled}
                 error={error?.data as Error<typeof data> | undefined}
+                actions={actions}
             />
         );
     } else if (widget.widgetId === 'SCALE' && (isNotDefined(value) || value.widgetType === widget.widgetId)) {
@@ -207,6 +274,7 @@ function CompactAttributeInput<N extends string | number | undefined>(props: Pro
                 disabled={disabled}
                 widget={widget}
                 error={error?.data as Error<typeof data> | undefined}
+                actions={actions}
             />
         );
     } else if (widget.widgetId === 'MULTISELECT' && (isNotDefined(value) || value.widgetType === widget.widgetId)) {
@@ -222,6 +290,7 @@ function CompactAttributeInput<N extends string | number | undefined>(props: Pro
                 disabled={disabled}
                 widget={widget}
                 error={error?.data as Error<typeof data> | undefined}
+                actions={actions}
             />
         );
     } else if (widget.widgetId === 'SELECT' && (isNotDefined(value) || value.widgetType === widget.widgetId)) {
@@ -237,6 +306,7 @@ function CompactAttributeInput<N extends string | number | undefined>(props: Pro
                 disabled={disabled}
                 widget={widget}
                 error={error?.data as Error<typeof data> | undefined}
+                actions={actions}
             />
         );
     } else if (widget.widgetId === 'MATRIX1D' && (isNotDefined(value) || value.widgetType === widget.widgetId)) {
@@ -252,6 +322,7 @@ function CompactAttributeInput<N extends string | number | undefined>(props: Pro
                 disabled={disabled}
                 widget={widget}
                 error={error?.data as Error<typeof data> | undefined}
+                actions={actions}
             />
         );
     } else if (widget.widgetId === 'MATRIX2D' && (isNotDefined(value) || value.widgetType === widget.widgetId)) {
@@ -267,6 +338,7 @@ function CompactAttributeInput<N extends string | number | undefined>(props: Pro
                 disabled={disabled}
                 widget={widget}
                 error={error?.data as Error<typeof data> | undefined}
+                actions={actions}
             />
         );
     } else if (widget.widgetId === 'ORGANIGRAM' && (isNotDefined(value) || value.widgetType === widget.widgetId)) {
@@ -282,6 +354,7 @@ function CompactAttributeInput<N extends string | number | undefined>(props: Pro
                 disabled={disabled}
                 widget={widget}
                 error={error?.data as Error<typeof data> | undefined}
+                actions={actions}
             />
         );
     } else if (widget.widgetId === 'GEO' && (isNotDefined(value) || value.widgetType === widget.widgetId)) {
@@ -299,6 +372,7 @@ function CompactAttributeInput<N extends string | number | undefined>(props: Pro
                 error={error?.data as Error<typeof data> | undefined}
                 geoAreaOptions={geoAreaOptions}
                 onGeoAreaOptionsChange={onGeoAreaOptionsChange}
+                actions={actions}
             />
         );
     } else {
@@ -309,6 +383,7 @@ function CompactAttributeInput<N extends string | number | undefined>(props: Pro
                 error={error?.data}
                 disabled={disabled}
                 readOnly={readOnly}
+                actions={actions}
             />
         );
     }
diff --git a/app/components/framework/CompactAttributeInput/styles.css b/app/components/framework/CompactAttributeInput/styles.css
new file mode 100644
index 0000000000..c7c65b3307
--- /dev/null
+++ b/app/components/framework/CompactAttributeInput/styles.css
@@ -0,0 +1,4 @@
+.button {
+    padding: 0.2rem!important;
+    font-size: 0.8em;
+}
diff --git a/app/components/framework/FrameworkImageButton/index.tsx b/app/components/framework/FrameworkImageButton/index.tsx
index 6b0ffb0c9e..41821b72f3 100644
--- a/app/components/framework/FrameworkImageButton/index.tsx
+++ b/app/components/framework/FrameworkImageButton/index.tsx
@@ -19,11 +19,12 @@ const query = {
     fields: ['title', 'preview_image', 'id'],
 };
 
-export interface Props {
-    frameworkId: number | string | undefined;
+export type Props = {
     label?: string;
     className?: string;
     variant?: ButtonProps<string>['variant'];
+    frameworkId?: number | string;
+    image?: string;
 }
 
 function FrameworkImageButton(props: Props) {
@@ -32,6 +33,7 @@ function FrameworkImageButton(props: Props) {
         frameworkId,
         label,
         variant,
+        image,
     } = props;
 
     const [
@@ -48,35 +50,38 @@ function FrameworkImageButton(props: Props) {
         url: `server://analysis-frameworks/${frameworkId}/`,
         query,
         method: 'GET',
-        failureHeader: _ts('analyticalFramework', 'title'),
     });
 
     return (
         <>
-            <Button
-                name={frameworkId}
-                className={_cs(
-                    !variant && styles.frameworkImageButton,
-                    className,
-                )}
-                onClick={showModal}
-                variant={variant ?? 'transparent'}
-                disabled={!frameworkId}
-            >
-                {label}
-            </Button>
+            {(!frameworkId && !image) ? (
+                label
+            ) : (
+                <Button
+                    name={frameworkId}
+                    className={_cs(
+                        !variant && styles.frameworkImageButton,
+                        className,
+                    )}
+                    onClick={showModal}
+                    variant={variant ?? 'transparent'}
+                >
+                    {label}
+                </Button>
+            )}
             {isModalVisible && (
                 <Modal
                     className={styles.modal}
                     heading={label}
+                    size="large"
                     onCloseButtonClick={hideModal}
                     bodyClassName={styles.content}
                 >
                     {pending && <PendingMessage />}
-                    {frameworkDetails?.previewImage ? (
+                    {(frameworkDetails?.previewImage || image) ? (
                         <ImagePreview
                             alt={frameworkDetails?.title ?? _ts('projectEdit', 'frameworkReferenceImageAlt')}
-                            src={frameworkDetails.previewImage}
+                            src={image ?? frameworkDetails?.previewImage}
                         />
                     ) : (
                         _ts('analyticalFramework', 'noImageUploaded')
diff --git a/app/components/general/AddLeadGroupModal/index.tsx b/app/components/general/AddLeadGroupModal/index.tsx
index 74415f27f1..816a14be67 100644
--- a/app/components/general/AddLeadGroupModal/index.tsx
+++ b/app/components/general/AddLeadGroupModal/index.tsx
@@ -12,10 +12,14 @@ import {
     TextInput,
     Button,
     PendingMessage,
+    useAlert,
 } from '@the-deep/deep-ui';
 
 import ProjectContext from '#base/context/ProjectContext';
-import { useLazyRequest } from '#base/utils/restRequest';
+import {
+    useLazyRequest,
+    useRequest,
+} from '#base/utils/restRequest';
 import { LeadGroup } from '#types';
 import _ts from '#ts';
 
@@ -31,6 +35,7 @@ const leadGroupSchema: FormSchema = {
 
 export interface Props {
     onModalClose: () => void;
+    leadGroupToEdit?: string;
     // FIXME: Replace with graphql mutation
     onLeadGroupAdd?: (leadGroup: { id: string; title: string }) => void;
 }
@@ -38,18 +43,48 @@ export interface Props {
 function AddLeadGroupModal(props: Props) {
     const {
         onModalClose,
+        leadGroupToEdit,
         onLeadGroupAdd,
     } = props;
 
+    const alert = useAlert();
     const { project } = React.useContext(ProjectContext);
     const activeProject = project ? +project.id : undefined;
 
+    const defaultFormValue: FormType = useMemo(() => ({
+        project: activeProject,
+    }), [activeProject]);
+
+    const {
+        pristine,
+        value,
+        error: riskyError,
+        setFieldValue,
+        validate,
+        setError,
+        setValue,
+    } = useForm(leadGroupSchema, defaultFormValue);
+
+    const {
+        pending: leadGroupFetchPending,
+    } = useRequest<LeadGroup>({
+        skip: !leadGroupToEdit,
+        url: `server://lead-groups/${leadGroupToEdit}/`,
+        method: 'GET',
+        onSuccess: (response) => {
+            setValue({
+                ...value,
+                title: response?.title,
+            });
+        },
+    });
+
     const {
         trigger: leadGroupAddTrigger,
         pending: leadGroupAddPending,
     } = useLazyRequest<LeadGroup, FormType>({
-        url: 'server://lead-groups/',
-        method: 'POST',
+        url: leadGroupToEdit ? `server://lead-groups/${leadGroupToEdit}/` : 'server://lead-groups/',
+        method: leadGroupToEdit ? 'PATCH' : 'POST',
         body: (ctx) => ctx,
         onSuccess: (response) => {
             if (onLeadGroupAdd) {
@@ -58,24 +93,21 @@ function AddLeadGroupModal(props: Props) {
                     title: response.title,
                 });
             }
+            alert.show(
+                leadGroupToEdit
+                    ? 'Successfully updated source group.'
+                    : 'Successfully added source group.',
+                {
+                    variant: 'success',
+                },
+            );
             onModalClose();
         },
-        failureHeader: _ts('addLeadGroup', 'title'),
+        failureMessage: leadGroupToEdit
+            ? 'Failed to update source group.'
+            : 'Failed to create source group.',
     });
 
-    const defaultFormValue: FormType = useMemo(() => ({
-        project: activeProject,
-    }), [activeProject]);
-
-    const {
-        pristine,
-        value,
-        error: riskyError,
-        setFieldValue,
-        validate,
-        setError,
-    } = useForm(leadGroupSchema, defaultFormValue);
-
     const error = getErrorObject(riskyError);
 
     const handleSubmit = useCallback(
@@ -93,6 +125,8 @@ function AddLeadGroupModal(props: Props) {
     return (
         <Modal
             heading={_ts('addLeadGroup', 'addLeadGroupHeading')}
+            freeHeight
+            size="small"
             onCloseButtonClick={onModalClose}
             footerActions={(
                 <Button
@@ -106,7 +140,7 @@ function AddLeadGroupModal(props: Props) {
                 </Button>
             )}
         >
-            {leadGroupAddPending && <PendingMessage />}
+            {(leadGroupFetchPending || leadGroupAddPending) && <PendingMessage />}
             <TextInput
                 name="title"
                 value={value?.title}
diff --git a/app/components/general/AddOrganizationModal/index.tsx b/app/components/general/AddOrganizationModal/index.tsx
index 6a93577ed9..17e8447f2d 100644
--- a/app/components/general/AddOrganizationModal/index.tsx
+++ b/app/components/general/AddOrganizationModal/index.tsx
@@ -14,6 +14,7 @@ import {
     TextInput,
     Button,
     Modal,
+    useAlert,
 } from '@the-deep/deep-ui';
 
 import _ts from '#ts';
@@ -58,13 +59,14 @@ function AddOrganizationModal(props: Props) {
         onOrganizationAdd,
     } = props;
 
+    const alert = useAlert();
+
     const {
         pending: organizationTypesPending,
         response: organizatonTypesResponse,
     } = useRequest<MultiResponse<OrganizationType>>({
         url: 'server://organization-types/',
         method: 'GET',
-        failureHeader: _ts('addOrganizationModal', 'title'),
     });
     const {
         pending: organizationPostPending,
@@ -77,9 +79,15 @@ function AddOrganizationModal(props: Props) {
             if (onOrganizationAdd) {
                 onOrganizationAdd(response);
             }
+            alert.show(
+                'Successfully created new organization.',
+                {
+                    variant: 'success',
+                },
+            );
             onModalClose();
         },
-        failureHeader: _ts('addOrganizationModal', 'title'),
+        failureMessage: 'Failed to create organization.',
     });
 
     const {
@@ -111,6 +119,7 @@ function AddOrganizationModal(props: Props) {
             className={styles.addOrganizationModal}
             heading={_ts('addOrganizationModal', 'title')}
             onCloseButtonClick={onModalClose}
+            freeHeight
             bodyClassName={styles.modalBody}
             footerActions={(
                 <Button
diff --git a/app/components/general/AddStakeholderModal/SearchStakeholder/index.tsx b/app/components/general/AddStakeholderModal/SearchStakeholder/index.tsx
index e815f6cd32..b3b35702be 100644
--- a/app/components/general/AddStakeholderModal/SearchStakeholder/index.tsx
+++ b/app/components/general/AddStakeholderModal/SearchStakeholder/index.tsx
@@ -4,6 +4,7 @@ import {
     ListView,
     TextInput,
     Container,
+    Kraken,
 } from '@the-deep/deep-ui';
 import { Organization, MultiResponse } from '#types';
 
@@ -44,7 +45,6 @@ function SearchStakeholder(props: Props) {
             method: 'GET',
             skip: !searchText,
             query: searchQueryParams,
-            failureHeader: _ts('project.detail.stakeholders', 'stakeholdersModalTitle'),
         },
     );
 
@@ -94,7 +94,22 @@ function SearchStakeholder(props: Props) {
                 data={stakeholders?.results}
                 renderer={Stakeholder}
                 keySelector={stakeholderKeySelector}
+                errored={false}
                 rendererParams={stakeholderRendererParams}
+                emptyIcon={(
+                    <Kraken
+                        variant="exercise"
+                    />
+                )}
+                filtered={(searchText?.length ?? 0) > 0}
+                filteredEmptyIcon={(
+                    <Kraken
+                        variant="search"
+                    />
+                )}
+                filteredEmptyMessage="No matching organization found."
+                messageIconShown
+                messageShown
             />
         </Container>
     );
diff --git a/app/components/general/AddStakeholderModal/StakeholderList/StakeholderRow/index.tsx b/app/components/general/AddStakeholderModal/StakeholderList/StakeholderRow/index.tsx
index facfa4a79d..6c9da4479c 100644
--- a/app/components/general/AddStakeholderModal/StakeholderList/StakeholderRow/index.tsx
+++ b/app/components/general/AddStakeholderModal/StakeholderList/StakeholderRow/index.tsx
@@ -29,6 +29,7 @@ function StakeholderRow(props: Props) {
             <ElementFragments
                 actions={(
                     <QuickActionButton
+                        title="Remove"
                         name={undefined}
                         onClick={handleClick}
                     >
diff --git a/app/components/general/AddStakeholderModal/index.tsx b/app/components/general/AddStakeholderModal/index.tsx
index fb30e43e05..b13426d736 100644
--- a/app/components/general/AddStakeholderModal/index.tsx
+++ b/app/components/general/AddStakeholderModal/index.tsx
@@ -104,6 +104,7 @@ function AddStakeholderModal<T extends string>(props: Props<T>) {
     return (
         <Modal
             className={styles.addStakeholderModal}
+            size="cover"
             heading={
                 initialValue?.length === 0
                     ? _ts('project.detail.stakeholders', 'addStakeholder')
diff --git a/app/components/general/AddStakeholderModal/styles.css b/app/components/general/AddStakeholderModal/styles.css
index 2cf5e7eeb1..b344b64ea9 100644
--- a/app/components/general/AddStakeholderModal/styles.css
+++ b/app/components/general/AddStakeholderModal/styles.css
@@ -1,7 +1,4 @@
 .add-stakeholder-modal {
-    width: 96vw;
-    height: 96vh;
-
     .modal-body {
         display: flex;
         gap: var(--dui-spacing-large);
diff --git a/app/components/general/DeepFileInput/index.tsx b/app/components/general/DeepFileInput/index.tsx
index 94dd37af19..8e6573d054 100644
--- a/app/components/general/DeepFileInput/index.tsx
+++ b/app/components/general/DeepFileInput/index.tsx
@@ -28,6 +28,7 @@ function DeepFileInput<T extends string>(props: Props<T>) {
         disabled,
         name,
         onChange,
+        readOnly,
         isPublic = true,
         ...otherProps
     } = props;
@@ -84,7 +85,8 @@ function DeepFileInput<T extends string>(props: Props<T>) {
     return (
         <FileInput
             {...otherProps}
-            disabled={disabled || pending}
+            readOnly={readOnly}
+            disabled={disabled || pending || readOnly}
             name={name}
             overrideStatus
             status={currentStatus}
diff --git a/app/components/general/DeepImageInput/index.tsx b/app/components/general/DeepImageInput/index.tsx
index af615cc2d3..3645d0efb4 100644
--- a/app/components/general/DeepImageInput/index.tsx
+++ b/app/components/general/DeepImageInput/index.tsx
@@ -3,28 +3,28 @@ import { FileInput, FileInputProps, ImagePreview } from '@the-deep/deep-ui';
 import { useLazyRequest } from '#base/utils/restRequest';
 import _ts from '#ts';
 
-interface Option {
-    id: number;
+export interface Option<N extends string | number> {
+    id: N;
     title: string;
     file: string;
     mimeType?: string;
     metadata?: unknown;
 }
 
-interface Props<T extends string> extends Omit<FileInputProps<T>, 'overrideStatus' | 'status' | 'value' | 'onChange' | 'multiple' | 'className'> {
+interface Props<T extends string, N extends number | string> extends Omit<FileInputProps<T>, 'overrideStatus' | 'status' | 'value' | 'onChange' | 'multiple' | 'className'> {
     className?: string;
     previewClassName?: string;
     fileInputClassName?: string;
-    value?: number;
-    onChange: (value: number | undefined, name: T) => void;
+    value: N | null | undefined;
+    onChange: (value: N | null | undefined, name: T) => void;
 
-    option?: Option;
-    onOptionChange: (value: Option) => void;
+    option?: Option<N>;
+    onOptionChange: (value: Option<N>) => void;
     isPrivate?: boolean;
     previewVisible?: boolean;
 }
 
-function DeepImageInput<T extends string>(props: Props<T>) {
+function DeepImageInput<T extends string, N extends number | string>(props: Props<T, N>) {
     const {
         className,
         previewClassName,
@@ -37,6 +37,7 @@ function DeepImageInput<T extends string>(props: Props<T>) {
         onChange,
         isPrivate,
         previewVisible,
+        maxFileSize = 2,
         ...otherProps
     } = props;
 
@@ -45,7 +46,7 @@ function DeepImageInput<T extends string>(props: Props<T>) {
     const {
         pending,
         trigger,
-    } = useLazyRequest<Option, File>({
+    } = useLazyRequest<Option<N>, File>({
         formData: true,
         url: 'server://files/',
         method: 'POST',
@@ -58,7 +59,7 @@ function DeepImageInput<T extends string>(props: Props<T>) {
             onChange(response.id, name);
             onOptionChange(response);
         },
-        failureHeader: _ts('deepImageInput', 'title'),
+        failureMessage: _ts('deepImageInput', 'title'),
     });
     const handleChange = useCallback(
         (file: File | undefined) => {
@@ -106,6 +107,7 @@ function DeepImageInput<T extends string>(props: Props<T>) {
                 value={value}
                 onChange={handleChange}
                 multiple={false}
+                maxFileSize={maxFileSize}
             />
             { previewVisible && src && (
                 <ImagePreview
diff --git a/app/components/general/ProjectSwitcher/index.tsx b/app/components/general/ProjectSwitcher/index.tsx
index 00047d06ed..a426fc9fed 100644
--- a/app/components/general/ProjectSwitcher/index.tsx
+++ b/app/components/general/ProjectSwitcher/index.tsx
@@ -2,9 +2,9 @@ import React, { useCallback } from 'react';
 import { FiEdit2 } from 'react-icons/fi';
 import { _cs } from '@togglecorp/fujs';
 import {
-    generatePath,
-    useRouteMatch,
-    useHistory,
+    // generatePath,
+    // useMatch,
+    useNavigate,
 } from 'react-router-dom';
 
 import ProjectSelectInput from '#components/selections/ProjectSelectInput';
@@ -25,15 +25,17 @@ function ProjectSwitcher(props: Props) {
 
     const { project } = React.useContext(ProjectContext);
 
-    const { path, params } = useRouteMatch();
-    const { push } = useHistory();
+    // const { path, params } = useMatch();
+    const navigate = useNavigate();
 
     const handleChange = useCallback(
         (value: string) => {
-            const newPath = generatePath(path, { ...params, projectId: value });
-            push(newPath);
+            // const newPath = generatePath(path, { ...params, projectId: value });
+            // navigate(newPath);
+            console.warn(value);
+            navigate('/');
         },
-        [path, params, push],
+        [navigate],
     );
 
     return (
diff --git a/app/components/general/WelcomeContent/index.tsx b/app/components/general/WelcomeContent/index.tsx
index 4c564dde03..8acb2bfcc4 100644
--- a/app/components/general/WelcomeContent/index.tsx
+++ b/app/components/general/WelcomeContent/index.tsx
@@ -1,12 +1,11 @@
 import React from 'react';
 import { _cs } from '@togglecorp/fujs';
-import { Heading } from '@the-deep/deep-ui';
+import { Heading, Svg } from '@the-deep/deep-ui';
 import {
     IoCompassOutline,
 } from 'react-icons/io5';
 
 import SmartButtonLikeLink from '#base/components/SmartButtonLikeLink';
-import Svg from '#components/Svg';
 import deepLogo from '#resources/img/logo.svg';
 import routes from '#base/configs/routes';
 import _ts from '#ts';
diff --git a/app/components/lead/LeadInput/EmmStats/index.tsx b/app/components/lead/LeadInput/EmmStats/index.tsx
index 74ab2bd74d..de845494dd 100644
--- a/app/components/lead/LeadInput/EmmStats/index.tsx
+++ b/app/components/lead/LeadInput/EmmStats/index.tsx
@@ -59,6 +59,9 @@ function EmmStatsModal(props: Props) {
                         data={emmTriggers ?? undefined}
                         keySelector={emmTriggerKeySelector}
                         rendererParams={emmTriggerRendererParams}
+                        pending={false}
+                        filtered={false}
+                        errored={false}
                     />
                 </ContainerCard>
             )}
@@ -74,6 +77,9 @@ function EmmStatsModal(props: Props) {
                         data={emmEntities ?? undefined}
                         keySelector={emmEntitiesKeySelector}
                         rendererParams={emmEntitiesRendererParams}
+                        pending={false}
+                        filtered={false}
+                        errored={false}
                     />
                 </ContainerCard>
             )}
diff --git a/app/components/lead/LeadInput/index.tsx b/app/components/lead/LeadInput/index.tsx
index aa2ecdbcf4..109a515af1 100644
--- a/app/components/lead/LeadInput/index.tsx
+++ b/app/components/lead/LeadInput/index.tsx
@@ -244,7 +244,7 @@ function LeadInput<N extends string | number | undefined>(props: Props<N>) {
                 ...response,
             });
         },
-        failureHeader: 'Web Info Extract',
+        failureMessage: 'Failed to extract Web Info.',
     });
 
     const {
@@ -276,10 +276,14 @@ function LeadInput<N extends string | number | undefined>(props: Props<N>) {
                 });
             }
         },
-        failureHeader: 'Raw Web Info Extract',
     });
 
-    const [getUserToken, { loading: pendingUserToken }] = useLazyQuery<TokenQuery>(
+    const [
+        getUserToken,
+        {
+            loading: pendingUserToken,
+        },
+    ] = useLazyQuery<TokenQuery>(
         TOKEN,
         {
             fetchPolicy: 'network-only',
@@ -377,7 +381,7 @@ function LeadInput<N extends string | number | undefined>(props: Props<N>) {
                                 name="leadExtract"
                                 variant="action"
                                 onClick={handleLeadDataExtract}
-                                title="Auto-fill lead information"
+                                title="Auto-fill source information"
                                 disabled={disabled}
                             >
                                 <IoEye />
@@ -421,17 +425,15 @@ function LeadInput<N extends string | number | undefined>(props: Props<N>) {
                         || value.sourceType === 'DROPBOX'
                         || value.sourceType === 'GOOGLE_DRIVE'
                     ) && attachment?.file && (
-                        <>
-                            <QuickActionButton
-                                name="fileExtract"
-                                title="Auto-fill lead information"
-                                variant="action"
-                                onClick={handleFileExtractClick}
-                                disabled={disabled}
-                            >
-                                <IoEye />
-                            </QuickActionButton>
-                        </>
+                        <QuickActionButton
+                            name="fileExtract"
+                            title="Auto-fill source information"
+                            variant="action"
+                            onClick={handleFileExtractClick}
+                            disabled={disabled}
+                        >
+                            <IoEye />
+                        </QuickActionButton>
                     )
                 }
             />
@@ -445,16 +447,16 @@ function LeadInput<N extends string | number | undefined>(props: Props<N>) {
                     options={leadGroupOptions}
                     onOptionsChange={onLeadGroupOptionsChange}
                     disabled={disabled}
-                    label="Lead Group"
+                    label="Source Group"
                     error={error?.leadGroup}
                     projectId={projectId}
                     actions={(
                         <QuickActionButton
-                            name="add-lead-group"
+                            name={undefined}
                             variant="transparent"
                             onClick={handleAddLeadGroupClick}
                             disabled={disabled}
-                            title="Add lead group"
+                            title="Add source group"
                         >
                             <IoAdd />
 
diff --git a/app/components/lead/LeadPreview/Preview/index.tsx b/app/components/lead/LeadPreview/Preview/index.tsx
index 7d1aa61c7a..131bca8895 100644
--- a/app/components/lead/LeadPreview/Preview/index.tsx
+++ b/app/components/lead/LeadPreview/Preview/index.tsx
@@ -5,6 +5,8 @@ import {
 } from '@togglecorp/fujs';
 import {
     ImagePreview,
+    Message,
+    Kraken,
 } from '@the-deep/deep-ui';
 
 import { isHttps } from '#utils/common';
@@ -63,17 +65,31 @@ function Preview(props: Props) {
 
     // NOTE: When hosted in http, we cannot use iframe or image to preview
     const httpsError = (
-        <div className={_cs(styles.viewer, className)}>
-            Cannot preview https content.
-        </div>
+        <Message
+            className={_cs(styles.viewer, className)}
+            message="Cannot preview https content."
+            icon={(
+                <Kraken
+                    size="large"
+                    variant="move"
+                />
+            )}
+        />
     );
 
     // NOTE: Generally check for X-Frame-Options or CSP to identify if content
     // can be embedded
     const iframeError = (
-        <div className={_cs(styles.viewer, className)}>
-            Cannot preview in iframe.
-        </div>
+        <Message
+            className={_cs(styles.viewer, className)}
+            message="This website has blocked us from viewing it inside DEEP."
+            icon={(
+                <Kraken
+                    size="large"
+                    variant="move"
+                />
+            )}
+        />
     );
 
     if (url.endsWith('txt')) {
@@ -148,9 +164,16 @@ function Preview(props: Props) {
         );
     }
     return (
-        <div className={_cs(styles.viewer, className)}>
-            Cannot preview for this filetype.
-        </div>
+        <Message
+            className={_cs(styles.viewer, className)}
+            message="We are unable to generate preview for this filetype."
+            icon={(
+                <Kraken
+                    size="large"
+                    variant="move"
+                />
+            )}
+        />
     );
 }
 
diff --git a/app/components/lead/LeadPreview/index.tsx b/app/components/lead/LeadPreview/index.tsx
index c2de5b3be2..0be000b415 100644
--- a/app/components/lead/LeadPreview/index.tsx
+++ b/app/components/lead/LeadPreview/index.tsx
@@ -1,7 +1,8 @@
-import React, { useState, useEffect, useRef, useCallback } from 'react';
+import React, { useMemo, useState, useEffect, useRef, useCallback } from 'react';
 import {
     _cs,
     isDefined,
+    isValidUrl,
     isNotDefined,
 } from '@togglecorp/fujs';
 import {
@@ -13,6 +14,8 @@ import {
     QuickActionButton,
     QuickActionLink,
     TextInput,
+    Message,
+    Kraken,
 } from '@the-deep/deep-ui';
 
 import ExternalUrlPreview from './ExternalUrlPreview';
@@ -73,11 +76,31 @@ function LeadPreview(props: Props) {
         }
     }, [fullScreenMode]);
 
+    const finalUrl = useMemo(() => {
+        if (url && isValidUrl(url)) {
+            return url;
+        }
+        if (attachment?.file?.url && isValidUrl(attachment.file.url)) {
+            return attachment.file.url;
+        }
+        return '';
+    }, [
+        url,
+        attachment?.file?.url,
+    ]);
+
     if (!url && !attachment) {
         return (
-            <div className={_cs(styles.leadPreview, className)}>
-                Preview not available
-            </div>
+            <Message
+                className={_cs(styles.leadPreview, className)}
+                message="We couldn't find anything to preview."
+                icon={(
+                    <Kraken
+                        size="large"
+                        variant="hi"
+                    />
+                )}
+            />
         );
     }
 
@@ -92,12 +115,14 @@ function LeadPreview(props: Props) {
                     actions={(
                         <>
                             <QuickActionLink
+                                title="Open external"
                                 className={styles.link}
-                                to={url || attachment?.file?.url || ''}
+                                to={finalUrl}
                             >
                                 <IoOpenOutline />
                             </QuickActionLink>
                             <QuickActionButton
+                                title={fullScreenMode ? 'Exit fullscreen' : 'Enter fullscreen'}
                                 className={styles.button}
                                 name={undefined}
                                 onClick={handleFullScreenToggleClick}
@@ -110,7 +135,7 @@ function LeadPreview(props: Props) {
                     <TextInput
                         className={styles.url}
                         name="url"
-                        value={url || attachment?.file?.url}
+                        value={finalUrl}
                         variant="general"
                         readOnly
                     />
@@ -119,7 +144,7 @@ function LeadPreview(props: Props) {
             {url && (
                 <ExternalUrlPreview
                     className={_cs(styles.content, className)}
-                    url={url}
+                    url={finalUrl}
                 />
             )}
             {attachment?.file?.url && attachment.mimeType && (
diff --git a/app/components/region/RegionMap/index.tsx b/app/components/region/RegionMap/index.tsx
index 213e4bce0e..b92fc8a812 100644
--- a/app/components/region/RegionMap/index.tsx
+++ b/app/components/region/RegionMap/index.tsx
@@ -1,5 +1,5 @@
 import React, { useMemo, useState, useCallback, useEffect } from 'react';
-import { _cs, isDefined, isNotDefined } from '@togglecorp/fujs';
+import { _cs, isDefined, isNotDefined, unique, isTruthyString } from '@togglecorp/fujs';
 import Map, {
     MapBounds,
     MapContainer,
@@ -29,15 +29,16 @@ import {
     GeoAreaBounds,
 } from '#types';
 import { useRequest } from '#base/utils/restRequest';
+import { GeoArea } from '#components/GeoMultiSelectInput';
 import {
     SelectedRegionQuery,
     SelectedRegionQueryVariables,
 } from '#generated/types';
-import _ts from '#ts';
 
 import styles from './styles.css';
 
 const scaleFactor = 1;
+
 const sourceOptions: AnySourceData = {
     type: 'geojson',
     // FIXME: we need to think about this
@@ -122,7 +123,9 @@ interface Props {
     navigationDisabled?: boolean;
     selectedGeoAreas?: string[] | null ;
     onSelectedGeoAreasChange?: (value: string[]) => void;
-
+    geoAreaOptions: GeoArea[] | null | undefined;
+    onGeoAreaOptionsChange: React.Dispatch<React.SetStateAction<GeoArea[] | null | undefined>>
+    | undefined;
     triggerId?: number;
 }
 
@@ -138,6 +141,8 @@ function RegionMap(props: Props) {
         triggerId,
         selectedGeoAreas,
         onSelectedGeoAreasChange,
+        geoAreaOptions,
+        onGeoAreaOptionsChange,
     } = props;
 
     const [hoverFeatureProperties, setHoverFeatureProperties] = useState<KeyValue[]>([]);
@@ -152,6 +157,8 @@ function RegionMap(props: Props) {
         data: selectedRegion,
         loading: selectedRegionPending,
         refetch: adminLevelRetrigger,
+        startPolling,
+        stopPolling,
     } = useQuery<SelectedRegionQuery, SelectedRegionQueryVariables>(
         SELECTED_REGION,
         {
@@ -160,6 +167,21 @@ function RegionMap(props: Props) {
         },
     );
 
+    useEffect(
+        () => {
+            const adminLevels = selectedRegion?.region?.adminLevels;
+            if (adminLevels?.some(
+                (v) => (isNotDefined(v.boundsFile) || isNotDefined(v.geojsonFile)),
+            )) {
+                startPolling(5000);
+            } else {
+                stopPolling();
+            }
+            return stopPolling;
+        },
+        [selectedRegion, startPolling, stopPolling],
+    );
+
     useEffect(
         () => {
             adminLevelRetrigger();
@@ -179,7 +201,6 @@ function RegionMap(props: Props) {
     } = useRequest<MapboxGeoJSONFeature>({
         url: activeAdminLevel?.geojsonFile?.url ?? undefined,
         method: 'GET',
-        failureHeader: _ts('geoAreas', 'title'),
     });
 
     const {
@@ -188,9 +209,14 @@ function RegionMap(props: Props) {
     } = useRequest<GeoAreaBoundsResponse>({
         url: activeAdminLevel?.boundsFile?.url ?? undefined,
         method: 'GET',
-        failureHeader: _ts('geoAreas', 'title'),
     });
 
+    const selectedAdminLevelTitle = useMemo(() => (
+        adminLevels?.find(
+            (item) => item.id.toString() === adminLevel,
+        )?.title
+    ), [adminLevels, adminLevel]);
+
     const lineLayerOptions: Omit<Layer, 'id'> = useMemo(() => {
         const noOfAdminLevels = adminLevels?.length;
         const selectedAdminLevel = adminLevels?.find(
@@ -221,28 +247,40 @@ function RegionMap(props: Props) {
         if (!onSelectedGeoAreasChange) {
             return false;
         }
-        const { id } = feature;
+        const { id, properties } = feature;
         const selection = String(id);
-
         const selections = [...selectedGeoAreas ?? []];
 
         const index = selections.indexOf(selection);
-        if (index === -1) {
+        if (index === -1 && onGeoAreaOptionsChange) {
             selections.push(selection);
+            const selectedGeoArea = {
+                id: selection,
+                title: properties?.title as string ?? '',
+                regionTitle: selectedRegion?.region?.title ?? '',
+                adminLevelTitle: selectedAdminLevelTitle ?? '',
+            };
+            const newOptions = unique([...(geoAreaOptions ?? []), selectedGeoArea], (d) => d.id);
+            onGeoAreaOptionsChange(newOptions);
         } else {
             selections.splice(index, 1);
         }
 
         onSelectedGeoAreasChange(selections);
         return true;
-    }, [onSelectedGeoAreasChange, selectedGeoAreas]);
+    }, [
+        onSelectedGeoAreasChange,
+        selectedGeoAreas,
+        geoAreaOptions,
+        onGeoAreaOptionsChange,
+        selectedAdminLevelTitle,
+        selectedRegion,
+    ]);
 
     const handleMouseEnter = useCallback((feature: MapboxGeoJSONFeature, lngLat: LngLat) => {
-        setHoverLngLat(lngLat);
-        if (feature.properties) {
-            const properties = Object.entries(feature.properties)
-                .map(([key, value]) => ({ key, value }));
-            setHoverFeatureProperties(properties);
+        if (feature.properties && isTruthyString(feature.properties.title)) {
+            setHoverLngLat(lngLat);
+            setHoverFeatureProperties([{ key: 'title', value: feature.properties.title }]);
         } else {
             setHoverFeatureProperties([]);
         }
diff --git a/app/components/selections/LeadGroupSelectInput/index.tsx b/app/components/selections/LeadGroupSelectInput/index.tsx
index a78f3bde81..8022f04551 100644
--- a/app/components/selections/LeadGroupSelectInput/index.tsx
+++ b/app/components/selections/LeadGroupSelectInput/index.tsx
@@ -14,6 +14,7 @@ import useDebouncedValue from '#hooks/useDebouncedValue';
 const LEAD_GROUPS = gql`
     query LeadGroups($search: String, $projectId: ID!) {
         project(id: $projectId) {
+            id
             leadGroups(search: $search) {
                 results {
                     id
diff --git a/app/components/selections/NewUserSelectInput/index.tsx b/app/components/selections/NewUserSelectInput/index.tsx
index db48f90748..be071eb8a9 100644
--- a/app/components/selections/NewUserSelectInput/index.tsx
+++ b/app/components/selections/NewUserSelectInput/index.tsx
@@ -13,8 +13,12 @@ import {
 import useDebouncedValue from '#hooks/useDebouncedValue';
 
 const USERS = gql`
-    query Users($membersExcludeProject: ID, $search: String) {
-        users(membersExcludeProject: $membersExcludeProject, search: $search) {
+    query Users($search: String, $membersExcludeProject: ID, $membersExcludeUsergroup: ID) {
+        users(
+            membersExcludeProject: $membersExcludeProject,
+            membersExcludeUsergroup: $membersExcludeUsergroup,
+            search: $search,
+        ) {
             results {
                 displayName
                 id
@@ -37,6 +41,7 @@ string,
     'onSearchValueChange' | 'searchOptions' | 'optionsPending' | 'keySelector' | 'labelSelector' | 'totalOptionsCount' | 'onShowDropdownChange'
 > & {
     membersExcludeProject?: string;
+    membersExcludeUsergroup?: string;
 };
 function keySelector(d: User) {
     return d.id;
@@ -50,6 +55,7 @@ function NewUserSelectInput<K extends string>(props: NewUserSelectInputProps<K>)
     const {
         className,
         membersExcludeProject,
+        membersExcludeUsergroup,
         ...otherProps
     } = props;
 
@@ -59,8 +65,9 @@ function NewUserSelectInput<K extends string>(props: NewUserSelectInputProps<K>)
 
     const variables = useMemo(() => ({
         membersExcludeProject,
+        membersExcludeUsergroup,
         search: debouncedSearchText,
-    }), [membersExcludeProject, debouncedSearchText]);
+    }), [membersExcludeProject, debouncedSearchText, membersExcludeUsergroup]);
 
     const { data, loading } = useQuery<UsersQuery, UsersQueryVariables>(
         USERS,
diff --git a/app/components/selections/OrganizationMultiSelectInput/index.tsx b/app/components/selections/OrganizationMultiSelectInput/index.tsx
index f48ab586ef..5a42a2a4cb 100644
--- a/app/components/selections/OrganizationMultiSelectInput/index.tsx
+++ b/app/components/selections/OrganizationMultiSelectInput/index.tsx
@@ -4,7 +4,6 @@ import { BasicOrganization, MultiResponse } from '#types';
 
 import { useRequest } from '#base/utils/restRequest';
 import useDebouncedValue from '#hooks/useDebouncedValue';
-import _ts from '#ts';
 
 type Def = { containerClassName?: string };
 type OrganizationSelectInputProps<K extends string> = SearchMultiSelectInputProps<
@@ -42,7 +41,6 @@ function OrganizationMultiSelectInput<K extends string>(props: OrganizationSelec
             method: 'GET',
             skip: !opened,
             query: searchQueryParams,
-            failureHeader: _ts('components.organizationSelectInput', 'title'),
         },
     );
 
diff --git a/app/components/selections/OrganizationSelectInput/index.tsx b/app/components/selections/OrganizationSelectInput/index.tsx
index dd65ed44b5..27708d4b45 100644
--- a/app/components/selections/OrganizationSelectInput/index.tsx
+++ b/app/components/selections/OrganizationSelectInput/index.tsx
@@ -4,7 +4,6 @@ import { BasicOrganization, MultiResponse } from '#types';
 
 import { useRequest } from '#base/utils/restRequest';
 import useDebouncedValue from '#hooks/useDebouncedValue';
-import _ts from '#ts';
 
 type Def = { containerClassName?: string };
 type OrganizationSelectInputProps<K extends string> = SearchSelectInputProps<
@@ -40,7 +39,6 @@ function OrganizationSelectInput<K extends string>(props: OrganizationSelectInpu
             method: 'GET',
             skip: !opened,
             query: searchQueryParams,
-            failureHeader: _ts('components.organizationSelectInput', 'title'),
         },
     );
 
diff --git a/app/components/selections/ProjectMemberMultiSelectInput/index.tsx b/app/components/selections/ProjectMemberMultiSelectInput/index.tsx
index 208fcea707..8b76e8d73d 100644
--- a/app/components/selections/ProjectMemberMultiSelectInput/index.tsx
+++ b/app/components/selections/ProjectMemberMultiSelectInput/index.tsx
@@ -15,6 +15,7 @@ import useDebouncedValue from '#hooks/useDebouncedValue';
 const PROJECT_USERS = gql`
     query ProjectUser($search: String, $projectId: ID!) {
         project(id: $projectId) {
+            id
             userMembers(search: $search) {
                 results {
                     id
diff --git a/app/components/selections/ProjectMultiSelectInput/index.tsx b/app/components/selections/ProjectMultiSelectInput/index.tsx
new file mode 100644
index 0000000000..10703c85a8
--- /dev/null
+++ b/app/components/selections/ProjectMultiSelectInput/index.tsx
@@ -0,0 +1,106 @@
+import React, { useState, useMemo } from 'react';
+import { SearchMultiSelectInput, SearchMultiSelectInputProps } from '@the-deep/deep-ui';
+import { useQuery, gql } from '@apollo/client';
+import {
+    ProjectPermission,
+    ProjectsListQuery,
+    ProjectsListQueryVariables,
+} from '#generated/types';
+
+import useDebouncedValue from '#hooks/useDebouncedValue';
+
+const PROJECTS_LIST = gql`
+    query ProjectsList(
+        $search: String,
+        $excludedProjects: [ID!],
+        $permissionAccess: ProjectPermission,
+        $myProjectsShown: Boolean,
+    ) {
+        projects(
+            search: $search,
+            isCurrentUserMember: $myProjectsShown,
+            hasPermissionAccess: $permissionAccess,
+            excludeIds: $excludedProjects,
+        ) {
+            results {
+                id
+                title
+                isPrivate
+            }
+            totalCount
+            page
+            pageSize
+        }
+    }
+`;
+
+export type BasicProject = NonNullable<NonNullable<NonNullable<ProjectsListQuery['projects']>['results']>[number]>;
+
+type Def = { containerClassName?: string };
+type ProjectMultiSelectInputProps<K extends string> = SearchMultiSelectInputProps<
+    string,
+    K,
+    BasicProject,
+    Def,
+    'onSearchValueChange' | 'searchOptions' | 'optionsPending' | 'keySelector' | 'labelSelector' | 'totalOptionsCount' | 'onShowDropdownChange'
+> & {
+    excludedProjects?: string[],
+    permissionAccess?: ProjectPermission,
+    myProjectsShown?: boolean,
+};
+
+const keySelector = (d: BasicProject) => d.id;
+const labelSelector = (d: BasicProject) => d.title;
+function ProjectMultiSelectInput<K extends string>(props: ProjectMultiSelectInputProps<K>) {
+    const {
+        className,
+        excludedProjects,
+        permissionAccess,
+        myProjectsShown,
+        ...otherProps
+    } = props;
+
+    const [opened, setOpened] = useState(false);
+    const [searchText, setSearchText] = useState<string>('');
+    const debouncedSearchText = useDebouncedValue(searchText);
+
+    const variables = useMemo(
+        (): ProjectsListQueryVariables => ({
+            search: debouncedSearchText,
+            excludedProjects,
+            permissionAccess,
+            myProjectsShown,
+        }),
+        [
+            debouncedSearchText,
+            excludedProjects,
+            permissionAccess,
+            myProjectsShown,
+        ],
+    );
+
+    const { data, loading } = useQuery<ProjectsListQuery, ProjectsListQueryVariables>(
+        PROJECTS_LIST,
+        {
+            variables,
+            skip: !opened,
+        },
+    );
+
+    return (
+        <SearchMultiSelectInput
+            {...otherProps}
+            className={className}
+            keySelector={keySelector}
+            labelSelector={labelSelector}
+            onSearchValueChange={setSearchText}
+            searchOptions={data?.projects?.results}
+            optionsPending={loading}
+            totalOptionsCount={data?.projects?.totalCount ?? undefined}
+            onShowDropdownChange={setOpened}
+            selectionListShown
+        />
+    );
+}
+
+export default ProjectMultiSelectInput;
diff --git a/app/components/selections/ProjectUserSelectInput/index.tsx b/app/components/selections/ProjectUserSelectInput/index.tsx
index 5b0649f00e..37e8f8d384 100644
--- a/app/components/selections/ProjectUserSelectInput/index.tsx
+++ b/app/components/selections/ProjectUserSelectInput/index.tsx
@@ -15,6 +15,7 @@ import useDebouncedValue from '#hooks/useDebouncedValue';
 const PROJECT_USERS = gql`
     query ProjectUser($search: String, $projectId: ID!) {
         project(id: $projectId) {
+            id
             userMembers(search: $search) {
                 results {
                     id
diff --git a/app/components/selections/PublicFrameworkMultiSelectInput/index.tsx b/app/components/selections/PublicFrameworkMultiSelectInput/index.tsx
new file mode 100644
index 0000000000..299aab544e
--- /dev/null
+++ b/app/components/selections/PublicFrameworkMultiSelectInput/index.tsx
@@ -0,0 +1,83 @@
+import React, { useState, useMemo } from 'react';
+
+import {
+    SearchMultiSelectInput,
+    SearchMultiSelectInputProps,
+} from '@the-deep/deep-ui';
+import { useQuery, gql } from '@apollo/client';
+
+import {
+    PublicAnalysisFrameworkOptionsQuery,
+    PublicAnalysisFrameworkOptionsQueryVariables,
+} from '#generated/types';
+import useDebouncedValue from '#hooks/useDebouncedValue';
+
+const PUBLIC_ANALYSIS_FRAMEWORKS = gql`
+    query PublicAnalysisFrameworkOptions($search: String) {
+        publicAnalysisFrameworks(search: $search) {
+            totalCount
+            results {
+                id
+                title
+            }
+        }
+    }
+`;
+
+export type AnalysisFramework = NonNullable<NonNullable<NonNullable<PublicAnalysisFrameworkOptionsQuery['publicAnalysisFrameworks']>['results']>[number]>;
+
+type Def = { containerClassName?: string };
+type PublicAnalysisFrameworkMultiSelectInputProps<K extends string> = SearchMultiSelectInputProps<
+    string,
+    K,
+    AnalysisFramework,
+    Def,
+    'onSearchValueChange' | 'searchOptions' | 'optionsPending' | 'keySelector' | 'labelSelector' | 'totalOptionsCount' | 'onShowDropdownChange'
+>;
+
+const keySelector = (d: AnalysisFramework) => d.id;
+const labelSelector = (d: AnalysisFramework) => d.title;
+
+function PublicAnalysisFrameworkSearchMultiSelectInput<K extends string>(
+    props: PublicAnalysisFrameworkMultiSelectInputProps<K>,
+) {
+    const {
+        className,
+        ...otherProps
+    } = props;
+
+    const [opened, setOpened] = useState(false);
+    const [searchText, setSearchText] = useState<string>('');
+    const debouncedSearchText = useDebouncedValue(searchText);
+
+    const variables = useMemo(() => ({
+        search: debouncedSearchText,
+    }), [debouncedSearchText]);
+
+    const {
+        data,
+        loading,
+    } = useQuery<PublicAnalysisFrameworkOptionsQuery, PublicAnalysisFrameworkOptionsQueryVariables>(
+        PUBLIC_ANALYSIS_FRAMEWORKS,
+        {
+            variables,
+            skip: !opened,
+        },
+    );
+
+    return (
+        <SearchMultiSelectInput
+            {...otherProps}
+            className={className}
+            keySelector={keySelector}
+            labelSelector={labelSelector}
+            onSearchValueChange={setSearchText}
+            searchOptions={data?.publicAnalysisFrameworks?.results}
+            optionsPending={loading}
+            totalOptionsCount={data?.publicAnalysisFrameworks?.totalCount ?? undefined}
+            onShowDropdownChange={setOpened}
+        />
+    );
+}
+
+export default PublicAnalysisFrameworkSearchMultiSelectInput;
diff --git a/app/components/selections/PublicOrganizationMultiSelectInput/index.tsx b/app/components/selections/PublicOrganizationMultiSelectInput/index.tsx
new file mode 100644
index 0000000000..bc24d60199
--- /dev/null
+++ b/app/components/selections/PublicOrganizationMultiSelectInput/index.tsx
@@ -0,0 +1,79 @@
+import React, { useState, useMemo } from 'react';
+import { SearchMultiSelectInput, SearchMultiSelectInputProps } from '@the-deep/deep-ui';
+import { useQuery, gql } from '@apollo/client';
+import {
+    PublicOrganizationOptionsQuery,
+    PublicOrganizationOptionsQueryVariables,
+} from '#generated/types';
+
+import useDebouncedValue from '#hooks/useDebouncedValue';
+
+const PUBLIC_ORGANIZATIONS = gql`
+    query PublicOrganizationOptions($search: String) {
+        publicOrganizations(search: $search) {
+            results {
+                id
+                title
+            }
+            totalCount
+        }
+    }
+`;
+
+export type BasicOrganization = NonNullable<NonNullable<NonNullable<PublicOrganizationOptionsQuery['publicOrganizations']>['results']>[number]>;
+
+type Def = { containerClassName?: string };
+type PublicOrganizationMultiSelectInputProps<K extends string> = SearchMultiSelectInputProps<
+    string,
+    K,
+    BasicOrganization,
+    Def,
+    'onSearchValueChange' | 'searchOptions' | 'optionsPending' | 'keySelector' | 'labelSelector' | 'totalOptionsCount' | 'onShowDropdownChange'
+>;
+
+const keySelector = (d: BasicOrganization) => d.id;
+const labelSelector = (d: BasicOrganization) => d.title;
+
+function PublicOrganizationMultiSelectInput<K extends string>(
+    props: PublicOrganizationMultiSelectInputProps<K>,
+) {
+    const {
+        className,
+        ...otherProps
+    } = props;
+
+    const [opened, setOpened] = useState(false);
+    const [searchText, setSearchText] = useState<string>('');
+    const debouncedSearchText = useDebouncedValue(searchText);
+
+    const variables = useMemo(() => ({
+        search: debouncedSearchText,
+    }), [debouncedSearchText]);
+
+    const { data, loading } = useQuery<
+        PublicOrganizationOptionsQuery,
+        PublicOrganizationOptionsQueryVariables
+    >(
+        PUBLIC_ORGANIZATIONS,
+        {
+            variables,
+            skip: !opened,
+        },
+    );
+
+    return (
+        <SearchMultiSelectInput
+            {...otherProps}
+            className={className}
+            keySelector={keySelector}
+            labelSelector={labelSelector}
+            onSearchValueChange={setSearchText}
+            searchOptions={data?.publicOrganizations?.results}
+            optionsPending={loading}
+            totalOptionsCount={data?.publicOrganizations?.totalCount ?? undefined}
+            onShowDropdownChange={setOpened}
+        />
+    );
+}
+
+export default PublicOrganizationMultiSelectInput;
diff --git a/app/components/selections/RegionSelectInput/index.tsx b/app/components/selections/RegionSelectInput/index.tsx
index 7cfcffade8..77a4c46967 100644
--- a/app/components/selections/RegionSelectInput/index.tsx
+++ b/app/components/selections/RegionSelectInput/index.tsx
@@ -50,7 +50,6 @@ function RegionSelectInput<K extends string>(props: RegionSelectInputProps<K>) {
             method: 'GET',
             skip: !opened,
             query: searchQueryParams,
-            failureHeader: 'Region select',
         },
     );
 
diff --git a/app/components/selections/UserSelectInput/index.tsx b/app/components/selections/UserSelectInput/index.tsx
index d320e3b148..872d996fa3 100644
--- a/app/components/selections/UserSelectInput/index.tsx
+++ b/app/components/selections/UserSelectInput/index.tsx
@@ -4,7 +4,6 @@ import { MultiResponse, BasicUser } from '#types';
 
 import { useRequest } from '#base/utils/restRequest';
 import useDebouncedValue from '#hooks/useDebouncedValue';
-import _ts from '#ts';
 
 type Def = { containerClassName?: string };
 type UserSelectInputProps<K extends string> = SearchSelectInputProps<
@@ -46,7 +45,6 @@ function UserSelectInput<K extends string>(props: UserSelectInputProps<K>) {
             method: 'GET',
             skip: !opened,
             query: searchQueryParams,
-            failureHeader: _ts('components.userSelectInput', 'title'),
         },
     );
 
diff --git a/app/favicon.ico b/app/favicon.ico
index 14211c91b5..5ac8653f5b 100644
Binary files a/app/favicon.ico and b/app/favicon.ico differ
diff --git a/app/favicon.png b/app/favicon.png
index 14211c91b5..98eb176537 100644
Binary files a/app/favicon.png and b/app/favicon.png differ
diff --git a/app/index.html b/app/index.html
index 8941a12dff..57d5be4eec 100644
--- a/app/index.html
+++ b/app/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" translate="no">
     <head>
         <title><%= process.env.MY_APP %></title>
         <style>
@@ -12,12 +12,14 @@
 
             * {
                 box-sizing: border-box;
+                scrollbar-color: var(--dui-color-foreground-scrollbar) var(--dui-color-background-scrollbar);
+                scrollbar-width: thin;
             }
 
             ::-webkit-scrollbar {
+                background-color: var(--dui-color-background-scrollbar);
                 width: var(--dui-width-scrollbar);
                 height: var(--dui-width-scrollbar);
-                background-color: var(--dui-color-background-scrollbar);
             }
 
             ::-webkit-scrollbar-track {
diff --git a/app/index.tsx b/app/index.tsx
index e6d42d5662..b3d8731f20 100644
--- a/app/index.tsx
+++ b/app/index.tsx
@@ -1,5 +1,10 @@
-import React from 'react';
+import React, { StrictMode } from 'react';
 import ReactDom from 'react-dom';
 import Base from './Base';
 
-ReactDom.render(<Base />, document.getElementById('app-container'));
+ReactDom.render(
+    <StrictMode>
+        <Base />
+    </StrictMode>,
+    document.getElementById('app-container'),
+);
diff --git a/app/resources/img/balloon-kraken.png b/app/resources/img/balloon-kraken.png
deleted file mode 100644
index 8fd9c1e55b..0000000000
Binary files a/app/resources/img/balloon-kraken.png and /dev/null differ
diff --git a/app/resources/img/diving-kraken.png b/app/resources/img/diving-kraken.png
deleted file mode 100644
index d32796c2af..0000000000
Binary files a/app/resources/img/diving-kraken.png and /dev/null differ
diff --git a/app/resources/img/flying-kraken.png b/app/resources/img/flying-kraken.png
deleted file mode 100644
index 0eec4e1900..0000000000
Binary files a/app/resources/img/flying-kraken.png and /dev/null differ
diff --git a/app/types/newAnalyticalFramework.ts b/app/types/newAnalyticalFramework.ts
index c916934c38..041d6eee0a 100644
--- a/app/types/newAnalyticalFramework.ts
+++ b/app/types/newAnalyticalFramework.ts
@@ -1,3 +1,13 @@
+import {
+    listToMap,
+    isDefined,
+    isNotDefined,
+    intersection,
+    mapToList,
+} from '@togglecorp/fujs';
+import {
+    PartialForm,
+} from '@togglecorp/toggle-form';
 import {
     // NOTE: Taking WidgetType instead of WidgetInputType
     WidgetType as WidgetRaw,
@@ -5,6 +15,34 @@ import {
     AnalysisFrameworkFilterType as AnalysisFrameworkFilterTypeRaw,
 } from '#generated/types';
 
+import {
+    WidgetAttribute,
+    TextWidgetAttribute,
+    NumberWidgetAttribute,
+    DateWidgetAttribute,
+    TimeWidgetAttribute,
+    DateRangeWidgetAttribute,
+    TimeRangeWidgetAttribute,
+    GeoLocationWidgetAttribute,
+    ScaleWidgetAttribute,
+    SingleSelectWidgetAttribute,
+    MultiSelectWidgetAttribute,
+    Matrix1dWidgetAttribute,
+    Matrix2dWidgetAttribute,
+    OrganigramWidgetAttribute,
+} from './newEntry';
+
+function invertBoolean(value: boolean | undefined, invert: boolean) {
+    if (value === undefined) {
+        return false;
+    }
+    return invert ? !value : value;
+}
+
+type PartializeAttribute<T> = PartialForm<T, 'clientId' | 'widgetType' | 'widget' | 'data' | 'widgetVersion'>;
+
+type PartialWidgetAttribute = PartializeAttribute<WidgetAttribute>;
+
 export type Types = WidgetTypes;
 
 export type Conjunction = 'XOR' | 'OR' | 'AND';
@@ -17,15 +55,12 @@ interface BaseCondition {
 }
 
 interface BaseConditional {
-    // FIXME: id is undefined only for input
-    id: string | undefined;
-    clientId: string;
-
-    // key of parent widget
-    parentClientId: string;
+    // Rename parentId to parentWidget
     // FIXME: id is undefined only for input
     // id of parent widget
-    parentId: string | undefined;
+    parentWidget: string | undefined;
+    parentWidgetType: string;
+    conditions: unknown[];
 }
 
 export interface EmptyCondition extends BaseCondition {
@@ -76,25 +111,10 @@ export interface OrganigramSelectedCondition extends BaseCondition {
     value: string[];
 }
 
-export interface OrganigramDescendentSelectedCondition extends BaseCondition {
-    operator: 'organigram-descendent-selected';
-    operatorModifier: 'every' | 'some';
-    value: string[];
-}
-
 export interface ScaleSelectedCondition extends BaseCondition {
     operator: 'scale-selected';
-    // operatorModifier: 'some';
     value: string[];
 }
-export interface ScaleAtLeastCondition extends BaseCondition {
-    operator: 'scale-more-than';
-    value: string;
-}
-export interface ScaleAtMostCondition extends BaseCondition {
-    operator: 'scale-less-than';
-    value: string;
-}
 export interface DateAfterCondition extends BaseCondition {
     operator: 'date-after';
     value: string;
@@ -192,8 +212,6 @@ export type SingleSelectCondition = EmptyCondition
 export type GeoLocationCondition = EmptyCondition;
 
 export type ScaleCondition = EmptyCondition
-    | ScaleAtLeastCondition
-    | ScaleAtMostCondition
     | ScaleSelectedCondition;
 
 export type DateCondition = EmptyCondition
@@ -220,8 +238,7 @@ export type MultiSelectCondition = EmptyCondition
     | MultiSelectSelectedCondition;
 
 export type OrganigramCondition = EmptyCondition
-    | OrganigramSelectedCondition
-    | OrganigramDescendentSelectedCondition;
+    | OrganigramSelectedCondition;
 
 export type Matrix1dCondition = EmptyCondition
     | Matrix1dRowsSelectedCondition
@@ -234,55 +251,55 @@ export type Matrix2dCondition = EmptyCondition
     | Matrix2dSubRowsSelectedCondition;
 
 export interface NumberConditional extends BaseConditional {
-    parentWidgetId: 'NUMBER';
+    parentWidgetType: 'NUMBER';
     conditions: NumberCondition[];
 }
 export interface TextConditional extends BaseConditional {
-    parentWidgetId: 'TEXT';
+    parentWidgetType: 'TEXT';
     conditions: TextCondition[];
 }
 export interface DateConditional extends BaseConditional {
-    parentWidgetId: 'DATE';
+    parentWidgetType: 'DATE';
     conditions: DateCondition[];
 }
 export interface TimeConditional extends BaseConditional {
-    parentWidgetId: 'TIME';
+    parentWidgetType: 'TIME';
     conditions: TimeCondition[];
 }
 export interface TimeRangeConditional extends BaseConditional {
-    parentWidgetId: 'TIME_RANGE';
+    parentWidgetType: 'TIME_RANGE';
     conditions: TimeRangeCondition[];
 }
 export interface DateRangeConditional extends BaseConditional {
-    parentWidgetId: 'DATE_RANGE';
+    parentWidgetType: 'DATE_RANGE';
     conditions: DateRangeCondition[];
 }
 export interface GeoLocationConditional extends BaseConditional {
-    parentWidgetId: 'GEO';
+    parentWidgetType: 'GEO';
     conditions: GeoLocationCondition[];
 }
 export interface SingleSelectConditional extends BaseConditional {
-    parentWidgetId: 'SELECT';
+    parentWidgetType: 'SELECT';
     conditions: SingleSelectCondition[];
 }
 export interface MultiSelectConditional extends BaseConditional {
-    parentWidgetId: 'MULTISELECT';
+    parentWidgetType: 'MULTISELECT';
     conditions: MultiSelectCondition[];
 }
 export interface Matrix1dConditional extends BaseConditional {
-    parentWidgetId: 'MATRIX1D';
+    parentWidgetType: 'MATRIX1D';
     conditions: Matrix1dCondition[];
 }
 export interface Matrix2dConditional extends BaseConditional {
-    parentWidgetId: 'MATRIX2D';
+    parentWidgetType: 'MATRIX2D';
     conditions: Matrix2dCondition[];
 }
 export interface OrganigramConditional extends BaseConditional {
-    parentWidgetId: 'ORGANIGRAM';
+    parentWidgetType: 'ORGANIGRAM';
     conditions: OrganigramCondition[];
 }
 export interface ScaleConditional extends BaseConditional {
-    parentWidgetId: 'SCALE';
+    parentWidgetType: 'SCALE';
     conditions: ScaleCondition[];
 }
 
@@ -301,7 +318,7 @@ type Conditional = NumberConditional
     | GeoLocationConditional;
 
 // NOTE: we are replacing these with more strict types
-export type BaseWidget = Omit<WidgetRaw, 'widgetId' | 'properties' | 'widgetIdDisplay' | 'widthDisplay'> & {
+export type BaseWidget = Omit<WidgetRaw, 'widgetId' | 'properties' | 'widgetIdDisplay' | 'widthDisplay' | 'conditional'> & {
     conditional?: Conditional;
 };
 
@@ -462,6 +479,20 @@ export type Widget = TextWidget
     | Matrix1dWidget
     | Matrix2dWidget;
 
+export const TEXT_WIDGET_VERSION = 1;
+export const NUMBER_WIDGET_VERSION = 1;
+export const TIME_WIDGET_VERSION = 1;
+export const DATE_WIDGET_VERSION = 1;
+export const TIME_RANGE_WIDGET_VERSION = 1;
+export const DATE_RANGE_WIDGET_VERSION = 1;
+export const SINGLE_SELECT_WIDGET_VERSION = 1;
+export const MULTI_SELECT_WIDGET_VERSION = 1;
+export const SCALE_WIDGET_VERSION = 1;
+export const ORGANIGRAM_WIDGET_VERSION = 1;
+export const GEOLOCATION_WIDGET_VERSION = 1;
+export const MATRIX1D_WIDGET_VERSION = 1;
+export const MATRIX2D_WIDGET_VERSION = 1;
+
 type BaseFilterType = Omit<AnalysisFrameworkFilterTypeRaw, 'properties' | 'widgetType'>;
 
 export interface KeyLabel {
@@ -649,16 +680,16 @@ export type FrameworkExportableType = TextExportableType
     | DateExportableType
     | TimeRangeExportableType
     | DateRangeExportableType
+    | GeoLocationExportableType
+    | ScaleExportableType
     | SingleSelectExportableType
     | MultiSelectExportableType
-    | ScaleExportableType
     | OrganigramExportableType
-    | GeoLocationExportableType
     | Matrix1dExportableType
     | Matrix2dExportableType;
 
 export interface FrameworkProperties {
-    // eslint-disable-next-line camelcase
+
     stats_config: {
         matrix1d?: {
             pk: number;
@@ -666,25 +697,600 @@ export interface FrameworkProperties {
         matrix2d?: {
             pk: number;
         }[];
-        // eslint-disable-next-line camelcase
+
         geo_widget?: {
             pk: number;
         };
-        // eslint-disable-next-line camelcase
+
         severity_widget?: {
             pk: number;
         };
-        // eslint-disable-next-line camelcase
+
         reliability_widget?: {
             pk: number;
         };
-        // eslint-disable-next-line camelcase
+
         affected_groups_widget?: {
             pk: number;
         };
-        // eslint-disable-next-line camelcase
+
         specific_needs_groups_widgets?: {
             pk: number;
         };
     };
 }
+
+const widgetVersionMapping: {
+    [key in Widget['widgetId']]: number
+} = {
+    TEXT: TEXT_WIDGET_VERSION,
+    NUMBER: NUMBER_WIDGET_VERSION,
+    TIME: TIME_WIDGET_VERSION,
+    DATE: DATE_WIDGET_VERSION,
+    TIME_RANGE: TIME_RANGE_WIDGET_VERSION,
+    DATE_RANGE: DATE_RANGE_WIDGET_VERSION,
+    GEO: GEOLOCATION_WIDGET_VERSION,
+    SELECT: SINGLE_SELECT_WIDGET_VERSION,
+    MULTISELECT: MULTI_SELECT_WIDGET_VERSION,
+    SCALE: SCALE_WIDGET_VERSION,
+    ORGANIGRAM: ORGANIGRAM_WIDGET_VERSION,
+    MATRIX1D: MATRIX1D_WIDGET_VERSION,
+    MATRIX2D: MATRIX2D_WIDGET_VERSION,
+};
+/*
+const supportedWidgetTypes: Widget['widgetId'][] = [
+    'NUMBER',
+    'TEXT',
+    'DATE',
+    'TIME',
+    'DATE_RANGE',
+    'TIME_RANGE',
+    'GEO',
+    'SELECT',
+    'MULTISELECT',
+    'MATRIX1D',
+    'MATRIX2D',
+    'ORGANIGRAM',
+    'SCALE',
+];
+*/
+
+export function getWidgetVersion(type: Widget['widgetId']) {
+    return widgetVersionMapping[type];
+}
+
+function convertDateStringToTimestamp(value: undefined): undefined;
+function convertDateStringToTimestamp(value: string): number;
+function convertDateStringToTimestamp(value: string | undefined): number | undefined;
+function convertDateStringToTimestamp(value: string | undefined) {
+    if (!value) {
+        return undefined;
+    }
+    return new Date(value).getTime();
+}
+
+function convertTimeStringToSeconds(value: undefined): undefined;
+function convertTimeStringToSeconds(value: string): number;
+function convertTimeStringToSeconds(value: string | undefined): number | undefined;
+function convertTimeStringToSeconds(value: string | undefined) {
+    if (!value) {
+        return undefined;
+    }
+    const [hh = '00', mm = '00', ss = '00'] = value.split(':');
+    return Number(hh) * 60 * 60 + Number(mm) * 60 + Number(ss);
+}
+
+function isEverySelected<T>(options: T[], value: T[]) {
+    const optionsSet = new Set(options);
+    const valueSet = new Set(value);
+    const commonSet = intersection(optionsSet, valueSet);
+    return commonSet.size === valueSet.size;
+}
+function isSomeSelected<T>(options: T[], value: T[]) {
+    const optionsSet = new Set(options);
+    const valueSet = new Set(value);
+    const commonSet = intersection(optionsSet, valueSet);
+    return commonSet.size > 0;
+}
+
+function validateNumberCondition(
+    condition: NumberCondition,
+    attribute: PartializeAttribute<NumberWidgetAttribute> | undefined,
+) {
+    const value = attribute?.data?.value;
+    switch (condition.operator) {
+        case 'empty':
+            return isNotDefined(value);
+        case 'number-greater-than':
+            return isDefined(value) && value > condition.value;
+        case 'number-less-than':
+            return isDefined(value) && value < condition.value;
+        case 'number-equal-to':
+            return isDefined(value) && value === condition.value;
+        default:
+            return undefined;
+    }
+}
+function validateTextCondition(
+    condition: TextCondition,
+    attribute: PartializeAttribute<TextWidgetAttribute> | undefined,
+) {
+    const value = attribute?.data?.value.toLowerCase();
+    switch (condition.operator) {
+        case 'empty':
+            return isNotDefined(value) || value === '';
+        case 'text-starts-with':
+            return isDefined(value) && value.startsWith(condition.value.toLowerCase());
+        case 'text-ends-with':
+            return isDefined(value) && value.endsWith(condition.value.toLowerCase());
+        case 'text-contains':
+            return isDefined(value) && value.includes(condition.value.toLowerCase());
+        default:
+            return undefined;
+    }
+}
+function validateDateCondition(
+    condition: DateCondition,
+    attribute: PartializeAttribute<DateWidgetAttribute> | undefined,
+) {
+    const value = convertDateStringToTimestamp(attribute?.data?.value);
+    switch (condition.operator) {
+        case 'empty':
+            return isNotDefined(value);
+        case 'date-after':
+            return isDefined(value) && value > convertDateStringToTimestamp(condition.value);
+        case 'date-before':
+            return isDefined(value) && value < convertDateStringToTimestamp(condition.value);
+        case 'date-equal-to':
+            return isDefined(value) && value === convertDateStringToTimestamp(condition.value);
+        default:
+            return undefined;
+    }
+}
+function validateTimeCondition(
+    condition: TimeCondition,
+    attribute: PartializeAttribute<TimeWidgetAttribute> | undefined,
+) {
+    const value = convertTimeStringToSeconds(attribute?.data?.value);
+    switch (condition.operator) {
+        case 'empty':
+            return isNotDefined(value);
+        case 'time-after':
+            return isDefined(value) && value > convertTimeStringToSeconds(condition.value);
+        case 'time-before':
+            return isDefined(value) && value < convertTimeStringToSeconds(condition.value);
+        case 'time-equal-to':
+            return isDefined(value) && value === convertTimeStringToSeconds(condition.value);
+        default:
+            return undefined;
+    }
+}
+function validateDateRangeCondition(
+    condition: DateRangeCondition,
+    attribute: PartializeAttribute<DateRangeWidgetAttribute> | undefined,
+) {
+    const startValue = convertDateStringToTimestamp(attribute?.data?.value?.startDate);
+    const endValue = convertDateStringToTimestamp(attribute?.data?.value?.endDate);
+    switch (condition.operator) {
+        case 'empty':
+            return isNotDefined(startValue) && isNotDefined(endValue);
+        case 'date-range-after':
+            return isDefined(startValue)
+                && startValue > convertDateStringToTimestamp(condition.value);
+        case 'date-range-before':
+            return isDefined(endValue)
+                && endValue < convertDateStringToTimestamp(condition.value);
+        case 'date-range-includes':
+            return isDefined(startValue)
+                && isDefined(endValue)
+                && endValue >= convertDateStringToTimestamp(condition.value)
+                && startValue <= convertDateStringToTimestamp(condition.value);
+        default:
+            return undefined;
+    }
+}
+function validateTimeRangeCondition(
+    condition: TimeRangeCondition,
+    attribute: PartializeAttribute<TimeRangeWidgetAttribute> | undefined,
+) {
+    const startValue = convertTimeStringToSeconds(attribute?.data?.value?.startTime);
+    const endValue = convertTimeStringToSeconds(attribute?.data?.value?.endTime);
+    switch (condition.operator) {
+        case 'empty':
+            return isNotDefined(startValue) && isNotDefined(endValue);
+        case 'time-range-after':
+            return isDefined(startValue)
+                && startValue > convertTimeStringToSeconds(condition.value);
+        case 'time-range-before':
+            return isDefined(endValue)
+                && endValue < convertTimeStringToSeconds(condition.value);
+        case 'time-range-includes':
+            return isDefined(startValue)
+                && isDefined(endValue)
+                && endValue >= convertTimeStringToSeconds(condition.value)
+                && startValue <= convertTimeStringToSeconds(condition.value);
+        default:
+            return undefined;
+    }
+}
+function validateGeoLocationCondition(
+    condition: GeoLocationCondition,
+    attribute: PartializeAttribute<GeoLocationWidgetAttribute> | undefined,
+) {
+    const value = attribute?.data?.value;
+    switch (condition.operator) {
+        case 'empty':
+            return isNotDefined(value) || value.length <= 0;
+        default:
+            return undefined;
+    }
+}
+function validateScaleCondition(
+    condition: ScaleCondition,
+    attribute: PartializeAttribute<ScaleWidgetAttribute> | undefined,
+) {
+    const value = attribute?.data?.value;
+    switch (condition.operator) {
+        case 'empty':
+            return isNotDefined(value) || value.length <= 0;
+        case 'scale-selected':
+            return isDefined(value) && condition.value.includes(value);
+        default:
+            return undefined;
+    }
+}
+function validateSingleSelectCondition(
+    condition: SingleSelectCondition,
+    attribute: PartializeAttribute<SingleSelectWidgetAttribute> | undefined,
+) {
+    const value = attribute?.data?.value;
+    switch (condition.operator) {
+        case 'empty':
+            return isNotDefined(value) || value.length <= 0;
+        case 'single-selection-selected':
+            return isDefined(value) && condition.value.includes(value);
+        default:
+            return undefined;
+    }
+}
+function validateMultiSelectCondition(
+    condition: MultiSelectCondition,
+    attribute: PartializeAttribute<MultiSelectWidgetAttribute> | undefined,
+) {
+    const value = attribute?.data?.value;
+    switch (condition.operator) {
+        case 'empty':
+            return isNotDefined(value) || value.length <= 0;
+        case 'multi-selection-selected':
+            return isDefined(value) && (
+                condition.operatorModifier === 'every'
+                    ? isEverySelected(value, condition.value)
+                    : isSomeSelected(value, condition.value)
+            );
+        default:
+            return undefined;
+    }
+}
+function validateMatrix1dCondition(
+    condition: Matrix1dCondition,
+    attribute: PartializeAttribute<Matrix1dWidgetAttribute> | undefined,
+) {
+    const value = attribute?.data?.value;
+    switch (condition.operator) {
+        case 'empty':
+            return isNotDefined(value);
+        case 'matrix1d-rows-selected': {
+            if (isNotDefined(value)) {
+                return false;
+            }
+            const rowsValue = Object.keys(value);
+            return (
+                condition.operatorModifier === 'every'
+                    ? isEverySelected(rowsValue, condition.value)
+                    : isSomeSelected(rowsValue, condition.value)
+            );
+        }
+        case 'matrix1d-cells-selected': {
+            if (isNotDefined(value)) {
+                return false;
+            }
+            const rowsValue = mapToList(
+                value,
+                (item) => item,
+            ).flatMap((item) => (item ? Object.keys(item) : []));
+            return (
+                condition.operatorModifier === 'every'
+                    ? isEverySelected(rowsValue, condition.value)
+                    : isSomeSelected(rowsValue, condition.value)
+            );
+        }
+        default:
+            return undefined;
+    }
+}
+function validateMatrix2dCondition(
+    condition: Matrix2dCondition,
+    attribute: PartializeAttribute<Matrix2dWidgetAttribute> | undefined,
+) {
+    const value = attribute?.data?.value;
+    switch (condition.operator) {
+        case 'empty':
+            return isNotDefined(value);
+        case 'matrix2d-rows-selected': {
+            if (isNotDefined(value)) {
+                return false;
+            }
+            const rowsValue = Object.keys(value);
+            return (
+                condition.operatorModifier === 'every'
+                    ? isEverySelected(rowsValue, condition.value)
+                    : isSomeSelected(rowsValue, condition.value)
+            );
+        }
+        case 'matrix2d-sub-rows-selected': {
+            if (isNotDefined(value)) {
+                return false;
+            }
+            const rowsValue = mapToList(value)
+                .filter(isDefined)
+                .flatMap((val) => Object.keys(val));
+            return (
+                condition.operatorModifier === 'every'
+                    ? isEverySelected(rowsValue, condition.value)
+                    : isSomeSelected(rowsValue, condition.value)
+            );
+        }
+        case 'matrix2d-columns-selected': {
+            if (isNotDefined(value)) {
+                return false;
+            }
+            const rowsValue = mapToList(value)
+                .filter(isDefined)
+                .flatMap((val) => mapToList(val))
+                .filter(isDefined)
+                .flatMap((val) => Object.keys(val));
+
+            return (
+                condition.operatorModifier === 'every'
+                    ? isEverySelected(rowsValue, condition.value)
+                    : isSomeSelected(rowsValue, condition.value)
+            );
+        }
+        case 'matrix2d-sub-columns-selected': {
+            if (isNotDefined(value)) {
+                return false;
+            }
+            const rowsValue = mapToList(value)
+                .filter(isDefined)
+                .flatMap((val) => mapToList(val))
+                .filter(isDefined)
+                .flatMap((val) => mapToList(val))
+                .filter(isDefined)
+                .flat();
+
+            return (
+                condition.operatorModifier === 'every'
+                    ? isEverySelected(rowsValue, condition.value)
+                    : isSomeSelected(rowsValue, condition.value)
+            );
+        }
+        default:
+            return undefined;
+    }
+}
+function validateOrganigramCondition(
+    condition: OrganigramCondition,
+    attribute: PartializeAttribute<OrganigramWidgetAttribute> | undefined,
+) {
+    const value = attribute?.data?.value;
+    switch (condition.operator) {
+        case 'empty':
+            return isNotDefined(value) || value.length <= 0;
+        case 'organigram-selected':
+            return isDefined(value) && (
+                condition.operatorModifier === 'every'
+                    ? isEverySelected(value, condition.value)
+                    : isSomeSelected(value, condition.value)
+            );
+        default:
+            return undefined;
+    }
+}
+
+function validateFirstCondition(
+    conditional: Conditional,
+    attribute: PartialWidgetAttribute | undefined,
+): boolean {
+    // If there is no condition, the child widget is always valid
+    if (!conditional.conditions[0]) {
+        return true;
+    }
+
+    // NOTE: invertBoolean will treat 'undefined' as false and will not be inverted
+    if (conditional.parentWidgetType === 'NUMBER' && (!attribute || attribute.widgetType === 'NUMBER')) {
+        const firstCondition = conditional.conditions[0];
+        return invertBoolean(
+            validateNumberCondition(firstCondition, attribute),
+            firstCondition.invert,
+        );
+    }
+    if (conditional.parentWidgetType === 'TEXT' && (!attribute || attribute.widgetType === 'TEXT')) {
+        const firstCondition = conditional.conditions[0];
+        return invertBoolean(
+            validateTextCondition(firstCondition, attribute),
+            firstCondition.invert,
+        );
+    }
+    if (conditional.parentWidgetType === 'DATE' && 'DATE' && (!attribute || attribute.widgetType === 'DATE')) {
+        const firstCondition = conditional.conditions[0];
+        return invertBoolean(
+            validateDateCondition(firstCondition, attribute),
+            firstCondition.invert,
+        );
+    }
+    if (conditional.parentWidgetType === 'TIME' && 'TIME' && (!attribute || attribute.widgetType === 'TIME')) {
+        const firstCondition = conditional.conditions[0];
+        return invertBoolean(
+            validateTimeCondition(firstCondition, attribute),
+            firstCondition.invert,
+        );
+    }
+    if (conditional.parentWidgetType === 'DATE_RANGE' && 'DATE_RANGE' && (!attribute || attribute.widgetType === 'DATE_RANGE')) {
+        const firstCondition = conditional.conditions[0];
+        return invertBoolean(
+            validateDateRangeCondition(firstCondition, attribute),
+            firstCondition.invert,
+        );
+    }
+    if (conditional.parentWidgetType === 'TIME_RANGE' && (!attribute || attribute.widgetType === 'TIME_RANGE')) {
+        const firstCondition = conditional.conditions[0];
+        return invertBoolean(
+            validateTimeRangeCondition(firstCondition, attribute),
+            firstCondition.invert,
+        );
+    }
+    if (conditional.parentWidgetType === 'GEO' && (!attribute || attribute.widgetType === 'GEO')) {
+        const firstCondition = conditional.conditions[0];
+        return invertBoolean(
+            validateGeoLocationCondition(firstCondition, attribute),
+            firstCondition.invert,
+        );
+    }
+    if (conditional.parentWidgetType === 'SELECT' && (!attribute || attribute.widgetType === 'SELECT')) {
+        const firstCondition = conditional.conditions[0];
+        return invertBoolean(
+            validateSingleSelectCondition(firstCondition, attribute),
+            firstCondition.invert,
+        );
+    }
+    if (conditional.parentWidgetType === 'MULTISELECT' && (!attribute || attribute.widgetType === 'MULTISELECT')) {
+        const firstCondition = conditional.conditions[0];
+        return invertBoolean(
+            validateMultiSelectCondition(firstCondition, attribute),
+            firstCondition.invert,
+        );
+    }
+    if (conditional.parentWidgetType === 'MATRIX1D' && (!attribute || attribute.widgetType === 'MATRIX1D')) {
+        const firstCondition = conditional.conditions[0];
+        return invertBoolean(
+            validateMatrix1dCondition(firstCondition, attribute),
+            firstCondition.invert,
+        );
+    }
+    if (conditional.parentWidgetType === 'MATRIX2D' && (!attribute || attribute.widgetType === 'MATRIX2D')) {
+        const firstCondition = conditional.conditions[0];
+        return invertBoolean(
+            validateMatrix2dCondition(firstCondition, attribute),
+            firstCondition.invert,
+        );
+    }
+    if (conditional.parentWidgetType === 'SCALE' && (!attribute || attribute.widgetType === 'SCALE')) {
+        const firstCondition = conditional.conditions[0];
+        return invertBoolean(
+            validateScaleCondition(firstCondition, attribute),
+            firstCondition.invert,
+        );
+    }
+    if (conditional.parentWidgetType === 'ORGANIGRAM' && (!attribute || attribute.widgetType === 'ORGANIGRAM')) {
+        const firstCondition = conditional.conditions[0];
+        return invertBoolean(
+            validateOrganigramCondition(firstCondition, attribute),
+            firstCondition.invert,
+        );
+    }
+
+    // If there is not parentWidgetType or attribute doesn't match,
+    // the child widget is always invalid
+    return false;
+}
+
+function validateConditions(
+    conditional: Conditional,
+    attribute: PartialWidgetAttribute | undefined,
+): boolean {
+    const firstConditionValue = validateFirstCondition(conditional, attribute);
+    if (conditional.conditions.length <= 1) {
+        return firstConditionValue;
+    }
+
+    const [firstCondition, ...otherConditions] = conditional.conditions;
+    const otherConditionValue = validateConditions(
+        { ...conditional, conditions: otherConditions } as Conditional,
+        attribute,
+    );
+    switch (firstCondition.conjunctionOperator) {
+        case 'XOR':
+            return (firstConditionValue && !otherConditionValue)
+                || (!firstConditionValue && otherConditionValue);
+        case 'OR':
+            return firstConditionValue || otherConditionValue;
+        case 'AND':
+            return firstConditionValue && otherConditionValue;
+        default:
+            return firstConditionValue && otherConditionValue;
+    }
+}
+
+export function getHiddenWidgetIds(
+    widgets: Widget[],
+    attributes: PartialWidgetAttribute[],
+) {
+    /*
+    const supportedWidgets = widgets.filter((widget) => {
+        // Filter out un-supported widgets
+        if (!supportedWidgetTypes.includes(widget.widgetId)) {
+            return false;
+        }
+        // Filter out out-of-date widgets
+        if (widget.version != getWidgetVersion(widget.widgetId)) {
+            return false;
+        }
+        return true;
+    });
+
+    const parentWidgets = listToMap(
+        supportedWidgets,
+        (widget) => widget.id,
+        (widget) => widget,
+    );
+    */
+    const parentAttributes = listToMap(
+        attributes,
+        (attribute) => attribute.widget,
+        (attribute) => attribute,
+    );
+
+    const widgetsToHide = widgets.filter((widget) => {
+        // All widgets without conditional are non-conditional widgets
+        if (!widget.conditional) {
+            return false;
+        }
+        // FIXME: make parentWidget mandatory
+        // All conditional widgets should have parentId
+        const parentId = widget.conditional.parentWidget;
+        if (!parentId) {
+            return true;
+        }
+        const value: PartialWidgetAttribute | undefined = parentAttributes[parentId];
+        /*
+        // All conditional widgets should have parentWidget
+        const parentWidget = parentWidgets[parentId];
+        if (!parentWidget) {
+            return false;
+        }
+        // Clearing out value if version does not match
+        let value: WidgetAttribute | undefined = parentAttributes[parentId];
+        if (value.widgetVersion !== parentWidget.version) {
+            value = undefined;
+        }
+       */
+
+        return !validateConditions(widget.conditional, value);
+    });
+
+    return listToMap(
+        widgetsToHide,
+        (item) => item.id,
+        () => true,
+    );
+}
diff --git a/app/types/project.tsx b/app/types/project.tsx
index 25dd5dda49..72a5f82230 100644
--- a/app/types/project.tsx
+++ b/app/types/project.tsx
@@ -224,6 +224,7 @@ export interface AdminLevel {
 export interface BasicRegion {
     id: number;
     title: string;
+    isPublished: boolean;
 }
 
 export interface Region extends BasicRegion {
diff --git a/app/types/user.tsx b/app/types/user.tsx
index 21df2fc177..e9483686c0 100644
--- a/app/types/user.tsx
+++ b/app/types/user.tsx
@@ -41,7 +41,7 @@ export interface RecentActivityItem {
     id: number;
     project: number;
     projectDisplayName: string;
-    type: string;
+    type: 'lead' | 'entry' | 'entry-comment';
 }
 
 export interface Assignment {
@@ -56,10 +56,9 @@ export interface Assignment {
     contentObjectDetails: {
         id: number;
         title: string;
+        lead?: string;
+        entry?: string;
     };
     isDone: boolean;
-    contentObjectType: {
-        id: number;
-        title: string;
-    };
+    contentObjectType: 'lead' | 'entryreviewcomment' | 'entrycomment';
 }
diff --git a/app/utils/common.ts b/app/utils/common.ts
index 1fb6927ebe..c5a19870e5 100644
--- a/app/utils/common.ts
+++ b/app/utils/common.ts
@@ -9,6 +9,7 @@ import {
     compareNumber,
     isTruthyString,
     formatDateToString,
+    doesObjectHaveNoData,
     padStart,
 } from '@togglecorp/fujs';
 
@@ -204,8 +205,8 @@ export function flatten<A, K>(
         ...flatten(itemsByChildren, valueSelector, childSelector),
     ];
 }
-export function generateFilename(title: string, format: string) {
-    return `${formatDateToString(new Date(), 'yyyyMMdd')}_DEEP_${title}.${format}`;
+export function generateFilename(title: string) {
+    return `${formatDateToString(new Date(), 'yyyyMMdd')} DEEP ${title}`;
 }
 
 /*
@@ -226,3 +227,7 @@ export function flatten<A>(a: A[] | A, childSelector: (item: A) => A[] | undefin
     return a;
 }
 */
+
+export function isFiltered(value: unknown) {
+    return !doesObjectHaveNoData(value, ['']);
+}
diff --git a/app/utils/types.ts b/app/utils/types.ts
index 6a3f52fb27..9aefee7e25 100644
--- a/app/utils/types.ts
+++ b/app/utils/types.ts
@@ -1,4 +1,4 @@
-// eslint-disable-next-line @typescript-eslint/ban-types, @typescript-eslint/no-explicit-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type DeepMandatory<T, K extends keyof any> = T extends object ? (
     T extends (infer I)[] ? (
         DeepMandatory<I, K>[]
@@ -15,7 +15,7 @@ export type DeepReplace<T, A, B> = (
             T extends (infer Z)[]
                 ? DeepReplace<Z, A, B>[]
                 : (
-                    // eslint-disable-next-line @typescript-eslint/ban-types
+
                     T extends object
                         ? { [K in keyof T]: DeepReplace<T[K], A, B> }
                         : T
@@ -25,7 +25,6 @@ export type DeepReplace<T, A, B> = (
 
 type Check<T> = T extends string[] ? string[] : T extends string ? string : undefined;
 
-// eslint-disable-next-line @typescript-eslint/ban-types
 export type EnumFix<T, F> = T extends object[] ? (
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     T extends any[] ? EnumFix<T[number], F>[] : T
diff --git a/app/utils/unsafeCommon.d.ts b/app/utils/unsafeCommon.d.ts
index a0c2b38862..a80e08a5db 100644
--- a/app/utils/unsafeCommon.d.ts
+++ b/app/utils/unsafeCommon.d.ts
@@ -1,2 +1,3 @@
-// eslint-disable-next-line import/prefer-default-export
 export function removeEmptyObject<T>(value: T): T;
+
+export function removeUndefinedKeys<T>(value: T): T;
diff --git a/app/utils/unsafeCommon.js b/app/utils/unsafeCommon.js
index e46aa34bd4..df9b51009a 100644
--- a/app/utils/unsafeCommon.js
+++ b/app/utils/unsafeCommon.js
@@ -1,11 +1,16 @@
 import {
     isObject,
+    isList,
+    isNotDefined,
     mapToMap,
     isDefined,
 } from '@togglecorp/fujs';
 
-// eslint-disable-next-line import/prefer-default-export
 export function removeEmptyObject(value) {
+    if (isList(value)) {
+        return value.map(removeEmptyObject);
+    }
+
     if (!isObject(value)) {
         return value;
     }
@@ -21,3 +26,23 @@ export function removeEmptyObject(value) {
     }
     return newValue;
 }
+
+export function removeUndefinedKeys(value) {
+    if (isList(value)) {
+        return value.map(removeUndefinedKeys);
+    }
+    if (!isObject(value)) {
+        return value;
+    }
+    const newValue = mapToMap(
+        value,
+        (key) => key,
+        (val) => removeUndefinedKeys(val),
+    );
+    Object.entries(newValue)
+        .filter(([, val]) => isNotDefined(val))
+        .forEach(([key]) => {
+            delete newValue[key];
+        });
+    return newValue;
+}
diff --git a/app/views/AnalyticalFramework/FrameworkForm/PrimaryTagging/SectionsEditor/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/PrimaryTagging/SectionsEditor/index.tsx
index 47088e4f49..4faff9d8c0 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/PrimaryTagging/SectionsEditor/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/PrimaryTagging/SectionsEditor/index.tsx
@@ -46,7 +46,7 @@ type FormType = {
 };
 type PartialFormType = PartialForm<
     FormType,
-    'clientId' | 'key' | 'widgetId' | 'order'
+    'clientId' | 'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type FormSchema = ObjectSchema<PartialFormType>;
@@ -55,7 +55,7 @@ type FormSchemaFields = ReturnType<FormSchema['fields']>;
 type SectionType = NonNullable<NonNullable<FormType['sections']>>[number];
 export type PartialSectionType = PartialForm<
     SectionType,
-    'clientId' | 'key' | 'widgetId' | 'order'
+    'clientId' | 'key' | 'widgetId' | 'order' | 'conditional'
 >;
 // type PartialWidgetType = NonNullable<PartialSectionType['widgets']>[number];
 
@@ -252,7 +252,9 @@ function SectionsEditor(props: Props) {
         removeValue: onSectionsRemove,
     } = useFormArray('sections', setFieldValue);
 
-    const [expandedSectionId, setExpandedSectionId] = useState<string | undefined>();
+    const [expandedSectionId, setExpandedSectionId] = useState<string | undefined>(
+        focusedSection ?? undefined,
+    );
 
     const handleExpansionChange = useCallback((sectionExpanded: boolean, sectionId) => {
         setExpandedSectionId(sectionExpanded ? sectionId : undefined);
@@ -277,6 +279,7 @@ function SectionsEditor(props: Props) {
                 'sections' as const,
             );
             onFocusChange(clientId);
+            setExpandedSectionId(clientId);
         },
         [setFieldValue, value.sections, onFocusChange],
     );
diff --git a/app/views/AnalyticalFramework/FrameworkForm/PrimaryTagging/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/PrimaryTagging/index.tsx
index 8ac51e5f19..f767f4aa95 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/PrimaryTagging/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/PrimaryTagging/index.tsx
@@ -25,7 +25,7 @@ import NonFieldError from '#components/NonFieldError';
 import { PartialWidget } from '#components/framework/AttributeInput';
 
 import WidgetConditionalEditor from '../components/WidgetConditionalEditor';
-import { SectionsType } from '../schema';
+import { SectionsType, WidgetsType } from '../schema';
 import Canvas from '../components/Canvas';
 import WidgetEditor from '../components/WidgetEditor';
 import WidgetList from '../components/WidgetList';
@@ -49,6 +49,8 @@ interface PrimaryTaggingInput<K extends string> {
     className?: string;
     frameworkId: number | undefined;
 
+    allWidgets: WidgetsType | undefined;
+
     name: K;
     value: SectionsType | undefined;
     error: Error<SectionsType> | undefined;
@@ -61,6 +63,9 @@ function PrimaryTaggingInput<K extends string>(props: PrimaryTaggingInput<K>) {
     const {
         className,
         frameworkId,
+
+        allWidgets = [],
+
         name,
         value: sectionsFromProps = [],
         onChange: setSectionsFromProps,
@@ -339,16 +344,6 @@ function PrimaryTaggingInput<K extends string>(props: PrimaryTaggingInput<K>) {
 
     const validSectionSelected = !!selectedSectionItem;
 
-    // NOTE: filtering out child conditions and self
-    // TODO: move child widget after parent
-    const parentWidgets = useMemo(
-        () => selectedSectionItem?.widgets?.filter((widget) => (
-            !widget.conditional
-            && (!conditional || widget.clientId !== conditional.widgetId)
-        )) ?? [],
-        [selectedSectionItem, conditional],
-    );
-
     return (
         <div className={_cs(styles.primaryTagging, className)}>
             <Container
@@ -388,10 +383,12 @@ function PrimaryTaggingInput<K extends string>(props: PrimaryTaggingInput<K>) {
                 )}
                 {sectionsState.editMode && conditionalEditMode && conditional && (
                     <WidgetConditionalEditor
-                        widgets={parentWidgets}
+                        widgets={allWidgets}
+                        // FIXME: we may not need to pass conditional as name
                         name={conditional}
                         title={conditional.title}
                         value={conditional.value}
+                        widgetId={conditional.widgetId}
                         onChange={handleConditionalChange}
                         onSave={handleConditionalSave}
                         onCancel={handleConditionalEditCancel}
@@ -439,6 +436,7 @@ function PrimaryTaggingInput<K extends string>(props: PrimaryTaggingInput<K>) {
                                 >
                                     {section.title || 'Unnamed'}
                                     <QuickActionButton
+                                        title="Edit section"
                                         className={styles.sectionEditButton}
                                         name={section.clientId}
                                         onClick={handleSectionEditClick}
@@ -480,7 +478,7 @@ function PrimaryTaggingInput<K extends string>(props: PrimaryTaggingInput<K>) {
                             <TabPanel
                                 key={section.clientId}
                                 name={section.clientId}
-                                className={styles.panel}
+                                activeClassName={styles.panel}
                             >
                                 <Canvas
                                     name={section.clientId}
@@ -498,7 +496,7 @@ function PrimaryTaggingInput<K extends string>(props: PrimaryTaggingInput<K>) {
                             <TabPanel
                                 key={section.clientId}
                                 name={section.clientId}
-                                className={styles.panel}
+                                activeClassName={styles.panel}
                             >
                                 <Canvas
                                     name={section.clientId}
diff --git a/app/views/AnalyticalFramework/FrameworkForm/PrimaryTagging/styles.css b/app/views/AnalyticalFramework/FrameworkForm/PrimaryTagging/styles.css
index bc846cfc42..7a3e4eafde 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/PrimaryTagging/styles.css
+++ b/app/views/AnalyticalFramework/FrameworkForm/PrimaryTagging/styles.css
@@ -41,6 +41,8 @@
             overflow-y: auto;
 
             .tabs {
+                flex-shrink: 0;
+
                 .border-wrapper {
                     display: flex;
                     flex-grow: 1;
diff --git a/app/views/AnalyticalFramework/FrameworkForm/Review/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/Review/index.tsx
index d19e1b2fda..65294f163d 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/Review/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/Review/index.tsx
@@ -71,6 +71,7 @@ function Review(props: Props) {
                             name={section.clientId}
                         >
                             <Section
+                                allWidgets={undefined}
                                 widgets={section.widgets}
                                 onAttributeChange={noop}
                                 attributesMap={emptyObject}
@@ -88,6 +89,7 @@ function Review(props: Props) {
                 heading={_ts('analyticalFramework.review', 'secondaryTagging')}
             >
                 <Section
+                    allWidgets={undefined}
                     widgets={secondaryTagging}
                     onAttributeChange={noop}
                     attributesMap={emptyObject}
diff --git a/app/views/AnalyticalFramework/FrameworkForm/SecondaryTagging/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/SecondaryTagging/index.tsx
index 88d1ed1e89..2971450a87 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/SecondaryTagging/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/SecondaryTagging/index.tsx
@@ -37,6 +37,8 @@ interface Props<K extends string> {
     className?: string;
     frameworkId: number | undefined;
 
+    allWidgets: WidgetsType | undefined;
+
     name: K;
     value: WidgetsType | undefined;
     onChange: (value: SetValueArg<WidgetsType | undefined>, name: K) => void;
@@ -50,6 +52,8 @@ function SecondaryTagging<K extends string>(props: Props<K>) {
         className,
         frameworkId,
 
+        allWidgets = [],
+
         value: widgetsFromProps = [],
         onChange: setWidgetsFromProps,
         name,
@@ -210,16 +214,6 @@ function SecondaryTagging<K extends string>(props: Props<K>) {
         onTempStateChange(widgetsState.editMode);
     }, [widgetsState.editMode, onTempStateChange]);
 
-    // NOTE: filtering out child conditions and self
-    // TODO: move child widget after parent
-    const parentWidgets = useMemo(
-        () => widgets.filter((widget) => (
-            !widget.conditional
-            && (!conditional || widget.clientId !== conditional.widgetId)
-        )),
-        [widgets, conditional],
-    );
-
     return (
         <div className={_cs(styles.secondaryTagging, className)}>
             <Container
@@ -247,10 +241,12 @@ function SecondaryTagging<K extends string>(props: Props<K>) {
                 {widgetsState.editMode && conditional && (
                     // NOTE: no need to disable as this is used as modal
                     <WidgetConditionalEditor
-                        widgets={parentWidgets}
+                        widgets={allWidgets}
+                        // FIXME: we may not need to pass conditional as name
                         name={conditional}
                         title={conditional.title}
                         value={conditional.value}
+                        widgetId={conditional.widgetId}
                         onChange={handleConditionalChange}
                         onSave={handleConditionalSave}
                         onCancel={handleConditionalEditCancel}
diff --git a/app/views/AnalyticalFramework/FrameworkForm/UploadImage/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/UploadImage/index.tsx
index 71fea58b74..c9f38a9234 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/UploadImage/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/UploadImage/index.tsx
@@ -50,6 +50,7 @@ function UploadImage<N extends string>(props: Props<N>) {
                         onChange={onChange}
                         showStatus={false}
                         accept="image/*"
+                        maxFileSize={5}
                     >
                         <MdFileUpload />
                         {_ts('analyticalFramework', 'uploadFrameworkImage')}
@@ -64,6 +65,7 @@ function UploadImage<N extends string>(props: Props<N>) {
                         onChange={onChange}
                         showStatus={false}
                         accept="image/*"
+                        maxFileSize={5}
                     >
                         <MdFileUpload />
                         {_ts('analyticalFramework', 'uploadFrameworkImage')}
diff --git a/app/views/AnalyticalFramework/FrameworkForm/UserTable/AddUserModal/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/UserTable/AddUserModal/index.tsx
index 28d31f7fed..79ad07eb51 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/UserTable/AddUserModal/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/UserTable/AddUserModal/index.tsx
@@ -118,7 +118,6 @@ function AddUserModal(props: Props) {
             : 'server://public-framework-roles/',
         method: 'GET',
         query: queryForRoles,
-        failureHeader: _ts('analyticalFramework.addUser', 'roleFetchFailed'),
     });
 
     const {
@@ -133,25 +132,18 @@ function AddUserModal(props: Props) {
             : 'POST',
         body: (ctx) => ctx,
         onSuccess: () => {
-            if (userValue?.id) {
-                alert.show(
-                    'Successfully updated user permissions.',
-                    {
-                        variant: 'success',
-                    },
-                );
-            } else {
-                alert.show(
-                    'Successfully added user to the analytical framework.',
-                    {
-                        variant: 'success',
-                    },
-                );
-            }
+            alert.show(
+                userValue?.id
+                    ? 'Successfully updated user permissions.'
+                    : 'Successfully added user to the analytical framework.',
+                {
+                    variant: 'success',
+                },
+            );
             onTableReload();
             onModalClose();
         },
-        failureHeader: _ts('analyticalFramework.addUser', 'membershipPostFailed'),
+        failureMessage: _ts('analyticalFramework.addUser', 'membershipPostFailed'),
     });
 
     const handleSubmit = useCallback(
@@ -184,6 +176,8 @@ function AddUserModal(props: Props) {
                     : _ts('analyticalFramework.addUser', 'addUserHeading')
             }
             onCloseButtonClick={onModalClose}
+            size="small"
+            freeHeight
             bodyClassName={styles.modalBody}
             footerActions={(
                 <Button
diff --git a/app/views/AnalyticalFramework/FrameworkForm/UserTable/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/UserTable/index.tsx
index add28f5036..dfae482ef8 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/UserTable/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/UserTable/index.tsx
@@ -98,7 +98,6 @@ function UserTable(props: Props) {
         query: frameworkUsersQuery,
         method: 'GET',
         preserveResponse: true,
-        failureHeader: _ts('analyticalFramework', 'title'),
     });
 
     const [
@@ -122,7 +121,7 @@ function UserTable(props: Props) {
             );
             triggerMembersList();
         },
-        failureHeader: _ts('analyticalFramework.addUser', 'membershipPostFailed'),
+        failureMessage: 'Failed to remove user from the analytical framework.',
     });
 
     const [userToEdit, setUserToEdit] = useState<UserToEdit | undefined>(undefined);
@@ -203,7 +202,7 @@ function UserTable(props: Props) {
 
     return (
         <>
-            {(pendingDeleteAction || frameworkUsersGetPending) && <PendingMessage />}
+            {pendingDeleteAction && <PendingMessage />}
             <Container
                 className={_cs(styles.tableContainer, className)}
                 heading={_ts('analyticalFramework', 'frameworkUsersHeading')}
@@ -231,6 +230,11 @@ function UserTable(props: Props) {
                     keySelector={userKeySelector}
                     columns={columns}
                     rowClassName={styles.tableRow}
+                    pending={frameworkUsersGetPending}
+                    errored={false}
+                    filtered={false}
+                    emptyMessage="No users found"
+                    messageShown
                 />
             </Container>
             {addUserModalShown && (
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/Canvas/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/Canvas/index.tsx
index 111cf4ce3a..401378b211 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/Canvas/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/Canvas/index.tsx
@@ -1,6 +1,7 @@
 import React, { useCallback } from 'react';
 import { _cs } from '@togglecorp/fujs';
 import {
+    Kraken,
     QuickActionButton,
 } from '@the-deep/deep-ui';
 import { GrDrag } from 'react-icons/gr';
@@ -44,7 +45,7 @@ interface WidgetProps {
     disabled?: boolean;
 }
 
-function WidgetWrapper(props: WidgetProps) {
+function AttributeInputWrapper(props: WidgetProps) {
     const {
         widget,
         clientId,
@@ -63,9 +64,8 @@ function WidgetWrapper(props: WidgetProps) {
         disabled,
     } = props;
 
-    // TODO: style conditional widgets differently
     return (
-        <AttributeInput<string>
+        <AttributeInput
             key={clientId}
             name={clientId}
             value={undefined}
@@ -75,6 +75,11 @@ function WidgetWrapper(props: WidgetProps) {
             error={undefined}
             geoAreaOptions={undefined}
             onGeoAreaOptionsChange={noop}
+            icons={widget.conditional && (
+                <IoGitBranchOutline
+                    title="This is a child widget"
+                />
+            )}
             actions={(
                 <>
                     {showWidgetEdit && (
@@ -176,6 +181,7 @@ function Canvas<T>(props: Props<T>) {
         disabled,
         isSecondary = false,
         error: riskyError,
+        editMode,
     } = props;
 
     const error = getErrorObject(riskyError);
@@ -185,56 +191,81 @@ function Canvas<T>(props: Props<T>) {
             // NOTE: when we start work on tagging page, we need to handle this
             // for preview page, we can skip this as the components are disabled any way
             // eslint-disable-next-line no-console
-            console.warn(`Trying to edit widget ${widgetName} from section ${name}`);
+            console.error(`Trying to edit widget ${widgetName} from section ${name}`);
         },
         [name],
     );
     const handleWidgetDeleteClick = useCallback(
         (widgetId: string) => {
-            if (!props.editMode && props.onWidgetDelete) {
-                props.onWidgetDelete(widgetId, name);
+            if (editMode) {
+                return;
+            }
+            // eslint-disable-next-line react/destructuring-assignment
+            const handleWidgetDelete = props.onWidgetDelete;
+            if (handleWidgetDelete) {
+                handleWidgetDelete(widgetId, name);
             }
         },
         // eslint-disable-next-line react/destructuring-assignment
-        [props.editMode, props.onWidgetDelete, name],
+        [editMode, props.onWidgetDelete, name],
     );
     const handleWidgetEditClick = useCallback(
         (widgetId: string) => {
-            if (!props.editMode && props.onWidgetEdit) {
-                props.onWidgetEdit(widgetId, name);
+            if (editMode) {
+                return;
+            }
+            // eslint-disable-next-line react/destructuring-assignment
+            const handleWidgetEdit = props.onWidgetEdit;
+            if (handleWidgetEdit) {
+                handleWidgetEdit(widgetId, name);
             }
         },
         // eslint-disable-next-line react/destructuring-assignment
-        [props.editMode, props.onWidgetEdit, name],
+        [editMode, props.onWidgetEdit, name],
     );
     const handleWidgetConditionEditClick = useCallback(
         (widgetId: string) => {
-            if (!props.editMode && props.onWidgetConditionEdit) {
-                props.onWidgetConditionEdit(widgetId, name);
+            if (editMode) {
+                return;
+            }
+            // eslint-disable-next-line react/destructuring-assignment
+            const handleWidgetConditionEdit = props.onWidgetConditionEdit;
+            if (handleWidgetConditionEdit) {
+                handleWidgetConditionEdit(widgetId, name);
             }
         },
         // eslint-disable-next-line react/destructuring-assignment
-        [props.editMode, props.onWidgetConditionEdit, name],
+        [editMode, props.onWidgetConditionEdit, name],
     );
 
-    const handleWidgetOrderChange = useCallback(
+    const handleWidgetOrderChangeComplete = useCallback(
         (value: Widget[]) => {
-            if (!props.editMode && props.onWidgetOrderChange) {
-                props.onWidgetOrderChange(value);
+            if (editMode) {
+                return;
+            }
+            // eslint-disable-next-line react/destructuring-assignment
+            const handleWidgetOrderChange = props.onWidgetOrderChange;
+            if (handleWidgetOrderChange) {
+                handleWidgetOrderChange(value);
             }
         },
         // eslint-disable-next-line react/destructuring-assignment
-        [props.editMode, props.onWidgetOrderChange],
+        [editMode, props.onWidgetOrderChange],
     );
 
     const handleWidgetCloneClick = useCallback(
         (widgetId: string) => {
-            if (!props.editMode && props.onWidgetClone) {
-                props.onWidgetClone(widgetId, name);
+            if (editMode) {
+                return;
+            }
+            // eslint-disable-next-line react/destructuring-assignment
+            const handleWidgetClone = props.onWidgetClone;
+            if (handleWidgetClone) {
+                handleWidgetClone(widgetId, name);
             }
         },
         // eslint-disable-next-line react/destructuring-assignment
-        [props.editMode, props.onWidgetClone, name],
+        [editMode, props.onWidgetClone, name],
     );
 
     const widgetRendererParams = useCallback((key: string, data: Widget | PartialWidget) => ({
@@ -242,15 +273,15 @@ function Canvas<T>(props: Props<T>) {
         isSecondary,
         widget: data,
         onWidgetValueChange: handleWidgetValueChange,
-        showWidgetEdit: !props.editMode,
-        showWidgetConditionEdit: !props.editMode,
+        showWidgetEdit: !editMode,
+        showWidgetConditionEdit: !editMode,
         onWidgetEditClick: handleWidgetEditClick,
         onWidgetConditionEditClick: handleWidgetConditionEditClick,
-        showWidgetDelete: !props.editMode,
+        showWidgetDelete: !editMode,
         onWidgetDeleteClick: handleWidgetDeleteClick,
-        showWidgetClone: !props.editMode,
+        showWidgetClone: !editMode,
         onWidgetCloneClick: handleWidgetCloneClick,
-        editMode: props.editMode,
+        editMode,
         disabled,
     }), [
         isSecondary,
@@ -259,8 +290,7 @@ function Canvas<T>(props: Props<T>) {
         handleWidgetConditionEditClick,
         handleWidgetDeleteClick,
         handleWidgetCloneClick,
-        // eslint-disable-next-line react/destructuring-assignment
-        props.editMode,
+        editMode,
         disabled,
     ]);
 
@@ -268,15 +298,14 @@ function Canvas<T>(props: Props<T>) {
         className: _cs(
             styles.widgetContainer,
             analyzeErrors(error?.[key]) && styles.errored,
-            (isSecondary && data?.width === 'HALF') && styles.halfWidget,
+            data?.width === 'HALF' && styles.halfWidget,
+            data?.conditional && styles.conditional,
         ),
     }), [
-        isSecondary,
         error,
     ]);
 
-    // eslint-disable-next-line react/destructuring-assignment
-    if (props.editMode) {
+    if (editMode) {
         return (
             <>
                 <NonFieldError
@@ -285,9 +314,10 @@ function Canvas<T>(props: Props<T>) {
                 <SortableList
                     className={styles.canvas}
                     name="widgets"
+                    // eslint-disable-next-line react/destructuring-assignment
                     data={props.widgets}
                     keySelector={partialWidgetKeySelector}
-                    renderer={WidgetWrapper}
+                    renderer={AttributeInputWrapper}
                     direction="rect"
                     rendererParams={widgetRendererParams}
                     itemContainerParams={itemContainerParams}
@@ -304,15 +334,23 @@ function Canvas<T>(props: Props<T>) {
             <SortableList
                 className={styles.canvas}
                 name="widgets"
-                onChange={handleWidgetOrderChange}
+                onChange={handleWidgetOrderChangeComplete}
                 // eslint-disable-next-line react/destructuring-assignment
                 data={props.widgets}
                 keySelector={widgetKeySelector}
-                renderer={WidgetWrapper}
+                renderer={AttributeInputWrapper}
                 direction="rect"
                 rendererParams={widgetRendererParams}
                 itemContainerParams={itemContainerParams}
                 showDragOverlay
+                emptyIcon={(
+                    <Kraken
+                        variant="sleep"
+                    />
+                )}
+                emptyMessage="No widgets found."
+                messageShown
+                messageIconShown
             />
         </>
     );
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/Canvas/styles.css b/app/views/AnalyticalFramework/FrameworkForm/components/Canvas/styles.css
index 72215a0dd4..9fb21eb4f3 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/Canvas/styles.css
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/Canvas/styles.css
@@ -1,11 +1,13 @@
 .canvas {
     display: flex;
     flex-wrap: wrap;
-    padding: var(--dui-spacing-large);
-    gap: var(--dui-spacing-large);
+    padding: calc(var(--dui-spacing-medium) - var(--dui-spacing-small));
+    gap: calc(var(--dui-spacing-medium) - var(--dui-spacing-small));
 
     .widget-container {
         flex-basis: 100%;
+        background-color: var(--dui-color-foreground);
+        padding: var(--dui-spacing-small);
 
         .action-button {
             transition: var(--dui-duration-transition-medium) opacity ease-in-out;
@@ -19,7 +21,11 @@
         }
 
         &.half-widget {
-            flex-basis: calc(50% - var(--dui-spacing-large) / 2);
+            flex-basis: calc(50% - (var(--dui-spacing-medium) - var(--dui-spacing-small)));
+        }
+
+        &.conditional {
+            background-color: var(--dui-color-background-information);
         }
 
         &.errored {
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/DateConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/DateConditionalWidgetForm/index.tsx
index e9487c3671..c267bc9c04 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/DateConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/DateConditionalWidgetForm/index.tsx
@@ -140,10 +140,8 @@ const conditionsSchema: ConditionsSchema = {
 
 const schema: FormSchema = {
     fields: (): FormSchemaFields => ({
-        id: [defaultUndefinedType],
-        clientId: [],
-        parentClientId: [],
-        parentWidgetId: [],
+        parentWidget: [defaultUndefinedType],
+        parentWidgetType: [],
         conditions: conditionsSchema,
     }),
 };
@@ -325,7 +323,7 @@ function DateConditionalWidgetForm(props: DateConditionalWidgetFormProps) {
         setFieldValue,
         setValue,
         setError,
-    } = useForm(schema, initialValue);
+    } = useForm(schema, initialValue, false);
 
     const error = getErrorObject(riskyError);
 
@@ -441,6 +439,9 @@ function DateConditionalWidgetForm(props: DateConditionalWidgetFormProps) {
                         direction="vertical"
                         rendererParams={conditionRendererParams}
                         showDragOverlay
+                        emptyMessage="No conditions were found."
+                        messageShown
+                        messageIconShown
                     />
                     {((value?.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/DateRangeConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/DateRangeConditionalWidgetForm/index.tsx
index 222e782384..2b2ac97b38 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/DateRangeConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/DateRangeConditionalWidgetForm/index.tsx
@@ -140,10 +140,8 @@ const conditionsSchema: ConditionsSchema = {
 
 const schema: FormSchema = {
     fields: (): FormSchemaFields => ({
-        id: [defaultUndefinedType],
-        clientId: [],
-        parentClientId: [],
-        parentWidgetId: [],
+        parentWidget: [defaultUndefinedType],
+        parentWidgetType: [],
         conditions: conditionsSchema,
     }),
 };
@@ -325,7 +323,7 @@ function DateRangeConditionalWidgetForm(props: DateRangeConditionalWidgetFormPro
         setFieldValue,
         setValue,
         setError,
-    } = useForm(schema, initialValue);
+    } = useForm(schema, initialValue, false);
 
     const error = getErrorObject(riskyError);
 
@@ -441,6 +439,9 @@ function DateRangeConditionalWidgetForm(props: DateRangeConditionalWidgetFormPro
                         direction="vertical"
                         rendererParams={conditionRendererParams}
                         showDragOverlay
+                        emptyMessage="No conditions were found."
+                        messageShown
+                        messageIconShown
                     />
                     {((value?.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/GeoLocationConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/GeoLocationConditionalWidgetForm/index.tsx
index fb3520bdc2..da2a555850 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/GeoLocationConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/GeoLocationConditionalWidgetForm/index.tsx
@@ -111,10 +111,8 @@ const conditionsSchema: ConditionsSchema = {
 
 const schema: FormSchema = {
     fields: (): FormSchemaFields => ({
-        id: [defaultUndefinedType],
-        clientId: [],
-        parentClientId: [],
-        parentWidgetId: [],
+        parentWidget: [defaultUndefinedType],
+        parentWidgetType: [],
         conditions: conditionsSchema,
     }),
 };
@@ -280,7 +278,7 @@ function GeoLocationConditionalWidgetForm(props: GeoLocationConditionalWidgetFor
         setFieldValue,
         setValue,
         setError,
-    } = useForm(schema, initialValue);
+    } = useForm(schema, initialValue, false);
 
     const error = getErrorObject(riskyError);
 
@@ -396,6 +394,9 @@ function GeoLocationConditionalWidgetForm(props: GeoLocationConditionalWidgetFor
                         direction="vertical"
                         rendererParams={conditionRendererParams}
                         showDragOverlay
+                        emptyMessage="No conditions were found."
+                        messageShown
+                        messageIconShown
                     />
                     {((value?.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/Matrix1dConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/Matrix1dConditionalWidgetForm/index.tsx
index cce86e5440..0535833350 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/Matrix1dConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/Matrix1dConditionalWidgetForm/index.tsx
@@ -140,10 +140,8 @@ const conditionsSchema: ConditionsSchema = {
 
 const schema: FormSchema = {
     fields: (): FormSchemaFields => ({
-        id: [defaultUndefinedType],
-        clientId: [],
-        parentClientId: [],
-        parentWidgetId: [],
+        parentWidget: [defaultUndefinedType],
+        parentWidgetType: [],
         conditions: conditionsSchema,
     }),
 };
@@ -330,7 +328,7 @@ function Matrix1dConditionalWidgetForm(props: Matrix1dConditionalWidgetFormProps
         setFieldValue,
         setValue,
         setError,
-    } = useForm(schema, initialValue);
+    } = useForm(schema, initialValue, false);
 
     const error = getErrorObject(riskyError);
 
@@ -448,6 +446,9 @@ function Matrix1dConditionalWidgetForm(props: Matrix1dConditionalWidgetFormProps
                         direction="vertical"
                         rendererParams={conditionRendererParams}
                         showDragOverlay
+                        emptyMessage="No conditions were found."
+                        messageShown
+                        messageIconShown
                     />
                     {((value?.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/Matrix2dConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/Matrix2dConditionalWidgetForm/index.tsx
index 94edad79cd..1ba2d1bd58 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/Matrix2dConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/Matrix2dConditionalWidgetForm/index.tsx
@@ -147,10 +147,8 @@ const conditionsSchema: ConditionsSchema = {
 
 const schema: FormSchema = {
     fields: (): FormSchemaFields => ({
-        id: [defaultUndefinedType],
-        clientId: [],
-        parentClientId: [],
-        parentWidgetId: [],
+        parentWidget: [defaultUndefinedType],
+        parentWidgetType: [],
         conditions: conditionsSchema,
     }),
 };
@@ -339,7 +337,7 @@ function Matrix2dConditionalWidgetForm(props: Matrix2dConditionalWidgetFormProps
         setFieldValue,
         setValue,
         setError,
-    } = useForm(schema, initialValue);
+    } = useForm(schema, initialValue, false);
 
     const error = getErrorObject(riskyError);
 
@@ -457,6 +455,9 @@ function Matrix2dConditionalWidgetForm(props: Matrix2dConditionalWidgetFormProps
                         direction="vertical"
                         rendererParams={conditionRendererParams}
                         showDragOverlay
+                        emptyMessage="No conditions were found."
+                        messageShown
+                        messageIconShown
                     />
                     {((value?.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/MultiSelectConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/MultiSelectConditionalWidgetForm/index.tsx
index 806c43910a..4d02cb5961 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/MultiSelectConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/MultiSelectConditionalWidgetForm/index.tsx
@@ -137,10 +137,8 @@ const conditionsSchema: ConditionsSchema = {
 
 const schema: FormSchema = {
     fields: (): FormSchemaFields => ({
-        id: [defaultUndefinedType],
-        clientId: [],
-        parentClientId: [],
-        parentWidgetId: [],
+        parentWidget: [defaultUndefinedType],
+        parentWidgetType: [],
         conditions: conditionsSchema,
     }),
 };
@@ -325,7 +323,7 @@ function MultiSelectConditionalWidgetForm(props: MultiSelectConditionalWidgetFor
         setFieldValue,
         setValue,
         setError,
-    } = useForm(schema, initialValue);
+    } = useForm(schema, initialValue, false);
 
     const error = getErrorObject(riskyError);
 
@@ -443,6 +441,9 @@ function MultiSelectConditionalWidgetForm(props: MultiSelectConditionalWidgetFor
                         direction="vertical"
                         rendererParams={conditionRendererParams}
                         showDragOverlay
+                        emptyMessage="No conditions were found."
+                        messageShown
+                        messageIconShown
                     />
                     {((value?.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/NumberConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/NumberConditionalWidgetForm/index.tsx
index 7236e50d63..5f2098ae17 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/NumberConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/NumberConditionalWidgetForm/index.tsx
@@ -141,10 +141,8 @@ const conditionsSchema: ConditionsSchema = {
 
 const schema: FormSchema = {
     fields: (): FormSchemaFields => ({
-        id: [defaultUndefinedType],
-        clientId: [],
-        parentClientId: [],
-        parentWidgetId: [],
+        parentWidget: [defaultUndefinedType],
+        parentWidgetType: [],
         conditions: conditionsSchema,
     }),
 };
@@ -326,7 +324,7 @@ function NumberConditionalWidgetForm(props: NumberConditionalWidgetFormProps) {
         setFieldValue,
         setValue,
         setError,
-    } = useForm(schema, initialValue);
+    } = useForm(schema, initialValue, false);
 
     const error = getErrorObject(riskyError);
 
@@ -442,6 +440,9 @@ function NumberConditionalWidgetForm(props: NumberConditionalWidgetFormProps) {
                         direction="vertical"
                         rendererParams={conditionRendererParams}
                         showDragOverlay
+                        emptyMessage="No conditions were found."
+                        messageShown
+                        messageIconShown
                     />
                     {((value?.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/OrganigramConditionalWidgetForm/DescendentOrganigramConditionInput/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/OrganigramConditionalWidgetForm/DescendentOrganigramConditionInput/index.tsx
deleted file mode 100644
index 5b27e38fd3..0000000000
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/OrganigramConditionalWidgetForm/DescendentOrganigramConditionInput/index.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import React, { useMemo } from 'react';
-import {
-    MultiSelectInput,
-} from '@the-deep/deep-ui';
-import {
-    useFormObject,
-    SetValueArg,
-    Error,
-    PartialForm,
-    getErrorObject,
-    getErrorString,
-} from '@togglecorp/toggle-form';
-import {
-    randomString,
-} from '@togglecorp/fujs';
-
-import {
-    OrganigramDescendentSelectedCondition,
-    OrganigramWidget,
-    KeyLabelEntity,
-} from '#types/newAnalyticalFramework';
-import {
-    flatten,
-} from '#utils/common';
-
-type PartialConditionType = PartialForm<
-    OrganigramDescendentSelectedCondition,
-    'operator' | 'conjunctionOperator' | 'key' | 'order'
->;
-
-interface OrganigramContainsConditionInputProps {
-    value: PartialConditionType;
-    error: Error<PartialConditionType> | undefined;
-    onChange: (value: SetValueArg<PartialConditionType>, index: number) => void;
-    index: number;
-    parentWidget: OrganigramWidget | undefined;
-}
-
-const defaultConditionVal = (): PartialConditionType => ({
-    key: randomString(),
-    order: -1,
-
-    conjunctionOperator: 'AND',
-    invert: false,
-    operator: 'organigram-descendent-selected',
-});
-
-const optionKeySelector = (option: KeyLabelEntity) => option.key;
-const optionLabelSelector = (option: KeyLabelEntity) => option.label;
-
-function DescendentOrganigramConditionInput(props: OrganigramContainsConditionInputProps) {
-    const {
-        value,
-        error: riskyError,
-        onChange,
-        index,
-        parentWidget,
-    } = props;
-
-    const onFieldChange = useFormObject(index, onChange, defaultConditionVal);
-
-    const error = getErrorObject(riskyError);
-
-    const arrayError = getErrorString(error?.value);
-
-    const options = parentWidget?.properties?.options;
-
-    const valueOptions = useMemo(
-        () => flatten(
-            options
-                ? [options]
-                : [],
-            ({ key, label, tooltip, order }) => ({
-                key,
-                label,
-                tooltip,
-                order,
-            }),
-            (item) => item.children,
-        ),
-        [options],
-    );
-
-    return (
-        <MultiSelectInput
-            name="value"
-            value={value.value}
-            onChange={onFieldChange}
-            error={arrayError}
-            options={valueOptions}
-            keySelector={optionKeySelector}
-            labelSelector={optionLabelSelector}
-        />
-    );
-}
-
-export default DescendentOrganigramConditionInput;
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/OrganigramConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/OrganigramConditionalWidgetForm/index.tsx
index 5ff2252c65..d7f39b0d29 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/OrganigramConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/OrganigramConditionalWidgetForm/index.tsx
@@ -42,13 +42,11 @@ import {
     OrganigramConditional,
     OrganigramCondition,
     OrganigramSelectedCondition,
-    OrganigramDescendentSelectedCondition,
     Conjunction,
     OrganigramWidget,
 } from '#types/newAnalyticalFramework';
 
 import SimpleOrganigramConditionInput from './SimpleOrganigramConditionInput';
-import DescendentOrganigramConditionInput from './DescendentOrganigramConditionInput';
 
 import styles from './styles.css';
 
@@ -60,7 +58,6 @@ interface Option {
 
 const options: Option[] = [
     { key: 'organigram-selected', label: 'Is selected', invertedLabel: 'Is not selected' },
-    { key: 'organigram-descendent-selected', label: 'Is selected (include descendent)', invertedLabel: 'Is not selected (include descendent)' },
     { key: 'empty', label: 'Is empty', invertedLabel: 'Is not empty' },
 ];
 function optionKeySelector(value: Option) {
@@ -94,10 +91,6 @@ type PartialConditionTypeNew = PartialForm<
     OrganigramSelectedCondition,
     'operator' | 'conjunctionOperator' | 'key' | 'order'
 >;
-type PartialConditionTypeNewer = PartialForm<
-    OrganigramDescendentSelectedCondition,
-    'operator' | 'conjunctionOperator' | 'key' | 'order'
->;
 
 type ConditionSchema = ObjectSchema<PartialConditionType, PartialFormType>;
 type ConditionSchemaFields = ReturnType<ConditionSchema['fields']>;
@@ -122,14 +115,6 @@ const conditionSchema: ConditionSchema = {
                 operatorModifier: [requiredStringCondition],
             };
         }
-        if (
-            val.operator === 'organigram-descendent-selected'
-        ) {
-            return {
-                ...basicValidation,
-                value: [requiredListCondition],
-            };
-        }
         if (val.operator === 'empty') {
             return basicValidation;
         }
@@ -152,10 +137,8 @@ const conditionsSchema: ConditionsSchema = {
 
 const schema: FormSchema = {
     fields: (): FormSchemaFields => ({
-        id: [defaultUndefinedType],
-        clientId: [],
-        parentClientId: [],
-        parentWidgetId: [],
+        parentWidget: [defaultUndefinedType],
+        parentWidgetType: [],
         conditions: conditionsSchema,
     }),
 };
@@ -307,21 +290,6 @@ function ConditionInput(props: ConditionInputProps) {
                     parentWidget={parentWidget}
                 />
             )}
-            {(
-                value.operator === 'organigram-descendent-selected'
-            ) && (
-                <DescendentOrganigramConditionInput
-                    index={index}
-                    value={value}
-                    // NOTE: we need to cast here as TS is not smart enough to
-                    // identify onChange as valid because of discriminated
-                    // unions
-                    // eslint-disable-next-line max-len
-                    onChange={onChange as (v: SetValueArg<PartialConditionTypeNewer>, index: number) => void}
-                    error={error}
-                    parentWidget={parentWidget}
-                />
-            )}
         </Container>
     );
 }
@@ -355,7 +323,7 @@ function OrganigramConditionalWidgetForm(props: OrganigramConditionalWidgetFormP
         setFieldValue,
         setValue,
         setError,
-    } = useForm(schema, initialValue);
+    } = useForm(schema, initialValue, false);
 
     const error = getErrorObject(riskyError);
 
@@ -473,6 +441,9 @@ function OrganigramConditionalWidgetForm(props: OrganigramConditionalWidgetFormP
                         direction="vertical"
                         rendererParams={conditionRendererParams}
                         showDragOverlay
+                        emptyMessage="No conditions were found."
+                        messageShown
+                        messageIconShown
                     />
                     {((value?.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/ScaleConditionalWidgetForm/ComparisonScaleConditionInput/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/ScaleConditionalWidgetForm/ComparisonScaleConditionInput/index.tsx
deleted file mode 100644
index f16bf68a8c..0000000000
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/ScaleConditionalWidgetForm/ComparisonScaleConditionInput/index.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import React from 'react';
-import {
-    SelectInput,
-} from '@the-deep/deep-ui';
-import {
-    useFormObject,
-    SetValueArg,
-    Error,
-    PartialForm,
-    getErrorObject,
-    getErrorString,
-} from '@togglecorp/toggle-form';
-import {
-    randomString,
-} from '@togglecorp/fujs';
-
-import {
-    ScaleAtLeastCondition,
-    ScaleAtMostCondition,
-    ScaleWidget,
-    KeyLabelEntity,
-} from '#types/newAnalyticalFramework';
-
-type PartialConditionType = PartialForm<
-    ScaleAtLeastCondition | ScaleAtMostCondition,
-    'operator' | 'conjunctionOperator' | 'key' | 'order'
->;
-
-interface ScaleContainsConditionInputProps {
-    value: PartialConditionType;
-    error: Error<PartialConditionType> | undefined;
-    onChange: (value: SetValueArg<PartialConditionType>, index: number) => void;
-    index: number;
-    parentWidget: ScaleWidget | undefined;
-}
-
-const defaultConditionVal = (): PartialConditionType => ({
-    key: randomString(),
-    order: -1,
-
-    conjunctionOperator: 'AND',
-    invert: false,
-    operator: 'scale-more-than',
-});
-
-const optionKeySelector = (option: KeyLabelEntity) => option.key;
-const optionLabelSelector = (option: KeyLabelEntity) => option.label;
-
-function ComparisonScaleConditionInput(props: ScaleContainsConditionInputProps) {
-    const {
-        value,
-        error: riskyError,
-        onChange,
-        index,
-        parentWidget,
-    } = props;
-
-    const onFieldChange = useFormObject(index, onChange, defaultConditionVal);
-
-    const error = getErrorObject(riskyError);
-
-    const arrayError = getErrorString(error?.value);
-
-    const options = parentWidget?.properties?.options;
-
-    return (
-        <SelectInput
-            name="value"
-            value={value.value}
-            onChange={onFieldChange}
-            error={arrayError}
-            options={options}
-            keySelector={optionKeySelector}
-            labelSelector={optionLabelSelector}
-        />
-    );
-}
-
-export default ComparisonScaleConditionInput;
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/ScaleConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/ScaleConditionalWidgetForm/index.tsx
index e196666ded..486e89b481 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/ScaleConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/ScaleConditionalWidgetForm/index.tsx
@@ -42,14 +42,11 @@ import {
     ScaleConditional,
     ScaleCondition,
     ScaleSelectedCondition,
-    ScaleAtLeastCondition,
-    ScaleAtMostCondition,
     Conjunction,
     ScaleWidget,
 } from '#types/newAnalyticalFramework';
 
 import SimpleScaleConditionInput from './SimpleScaleConditionInput';
-import ComparisonScaleConditionInput from './ComparisonScaleConditionInput';
 
 import styles from './styles.css';
 
@@ -61,8 +58,6 @@ interface Option {
 
 const options: Option[] = [
     { key: 'scale-selected', label: 'Is selected', invertedLabel: 'Is not selected' },
-    { key: 'scale-more-than', label: 'Is more than', invertedLabel: 'Is less than or equal to' },
-    { key: 'scale-less-than', label: 'Is less than', invertedLabel: 'Is more than or equal to' },
     { key: 'empty', label: 'Is empty', invertedLabel: 'Is not empty' },
 ];
 function optionKeySelector(value: Option) {
@@ -97,11 +92,6 @@ type PartialConditionTypeNew = PartialForm<
     'operator' | 'conjunctionOperator' | 'key' | 'order'
 >;
 
-type PartialConditionTypeNewer = PartialForm<
-    ScaleAtLeastCondition | ScaleAtMostCondition,
-    'operator' | 'conjunctionOperator' | 'key' | 'order'
->;
-
 type ConditionSchema = ObjectSchema<PartialConditionType, PartialFormType>;
 type ConditionSchemaFields = ReturnType<ConditionSchema['fields']>;
 const conditionSchema: ConditionSchema = {
@@ -124,15 +114,6 @@ const conditionSchema: ConditionSchema = {
                 value: [requiredListCondition],
             };
         }
-        if (
-            val.operator === 'scale-more-than'
-            || val.operator === 'scale-less-than'
-        ) {
-            return {
-                ...basicValidation,
-                value: [requiredStringCondition],
-            };
-        }
         if (val.operator === 'empty') {
             return basicValidation;
         }
@@ -155,10 +136,8 @@ const conditionsSchema: ConditionsSchema = {
 
 const schema: FormSchema = {
     fields: (): FormSchemaFields => ({
-        id: [defaultUndefinedType],
-        clientId: [],
-        parentClientId: [],
-        parentWidgetId: [],
+        parentWidget: [defaultUndefinedType],
+        parentWidgetType: [],
         conditions: conditionsSchema,
     }),
 };
@@ -310,22 +289,6 @@ function ConditionInput(props: ConditionInputProps) {
                     parentWidget={parentWidget}
                 />
             )}
-            {(
-                value.operator === 'scale-less-than'
-                || value.operator === 'scale-more-than'
-            ) && (
-                <ComparisonScaleConditionInput
-                    index={index}
-                    value={value}
-                    // NOTE: we need to cast here as TS is not smart enough to
-                    // identify onChange as valid because of discriminated
-                    // unions
-                    // eslint-disable-next-line max-len
-                    onChange={onChange as (v: SetValueArg<PartialConditionTypeNewer>, index: number) => void}
-                    error={error}
-                    parentWidget={parentWidget}
-                />
-            )}
         </Container>
     );
 }
@@ -359,7 +322,7 @@ function ScaleConditionalWidgetForm(props: ScaleConditionalWidgetFormProps) {
         setFieldValue,
         setValue,
         setError,
-    } = useForm(schema, initialValue);
+    } = useForm(schema, initialValue, false);
 
     const error = getErrorObject(riskyError);
 
@@ -477,6 +440,9 @@ function ScaleConditionalWidgetForm(props: ScaleConditionalWidgetFormProps) {
                         direction="vertical"
                         rendererParams={conditionRendererParams}
                         showDragOverlay
+                        emptyMessage="No conditions were found."
+                        messageShown
+                        messageIconShown
                     />
                     {((value?.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/SingleSelectConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/SingleSelectConditionalWidgetForm/index.tsx
index 9cfdfd6f7d..a07d636127 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/SingleSelectConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/SingleSelectConditionalWidgetForm/index.tsx
@@ -136,10 +136,8 @@ const conditionsSchema: ConditionsSchema = {
 
 const schema: FormSchema = {
     fields: (): FormSchemaFields => ({
-        id: [defaultUndefinedType],
-        clientId: [],
-        parentClientId: [],
-        parentWidgetId: [],
+        parentWidget: [defaultUndefinedType],
+        parentWidgetType: [],
         conditions: conditionsSchema,
     }),
 };
@@ -324,7 +322,7 @@ function SingleSelectConditionalWidgetForm(props: SingleSelectConditionalWidgetF
         setFieldValue,
         setValue,
         setError,
-    } = useForm(schema, initialValue);
+    } = useForm(schema, initialValue, false);
 
     const error = getErrorObject(riskyError);
 
@@ -442,6 +440,9 @@ function SingleSelectConditionalWidgetForm(props: SingleSelectConditionalWidgetF
                         direction="vertical"
                         rendererParams={conditionRendererParams}
                         showDragOverlay
+                        emptyMessage="No conditions were found."
+                        messageShown
+                        messageIconShown
                     />
                     {((value?.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/TextConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/TextConditionalWidgetForm/index.tsx
index 5824f898e1..5058e20d6e 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/TextConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/TextConditionalWidgetForm/index.tsx
@@ -140,10 +140,8 @@ const conditionsSchema: ConditionsSchema = {
 
 const schema: FormSchema = {
     fields: (): FormSchemaFields => ({
-        id: [defaultUndefinedType],
-        clientId: [],
-        parentClientId: [],
-        parentWidgetId: [],
+        parentWidget: [defaultUndefinedType],
+        parentWidgetType: [],
         conditions: conditionsSchema,
     }),
 };
@@ -325,7 +323,7 @@ function TextConditionalWidgetForm(props: TextConditionalWidgetFormProps) {
         setFieldValue,
         setValue,
         setError,
-    } = useForm(schema, initialValue);
+    } = useForm(schema, initialValue, false);
 
     const error = getErrorObject(riskyError);
 
@@ -441,6 +439,9 @@ function TextConditionalWidgetForm(props: TextConditionalWidgetFormProps) {
                         direction="vertical"
                         rendererParams={conditionRendererParams}
                         showDragOverlay
+                        emptyMessage="No conditions were found."
+                        messageShown
+                        messageIconShown
                     />
                     {((value?.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/TimeConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/TimeConditionalWidgetForm/index.tsx
index b91e0eab3c..4d7e303b48 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/TimeConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/TimeConditionalWidgetForm/index.tsx
@@ -140,10 +140,8 @@ const conditionsSchema: ConditionsSchema = {
 
 const schema: FormSchema = {
     fields: (): FormSchemaFields => ({
-        id: [defaultUndefinedType],
-        clientId: [],
-        parentClientId: [],
-        parentWidgetId: [],
+        parentWidget: [defaultUndefinedType],
+        parentWidgetType: [],
         conditions: conditionsSchema,
     }),
 };
@@ -325,7 +323,7 @@ function TimeConditionalWidgetForm(props: TimeConditionalWidgetFormProps) {
         setFieldValue,
         setValue,
         setError,
-    } = useForm(schema, initialValue);
+    } = useForm(schema, initialValue, false);
 
     const error = getErrorObject(riskyError);
 
@@ -441,6 +439,9 @@ function TimeConditionalWidgetForm(props: TimeConditionalWidgetFormProps) {
                         direction="vertical"
                         rendererParams={conditionRendererParams}
                         showDragOverlay
+                        emptyMessage="No conditions were found."
+                        messageShown
+                        messageIconShown
                     />
                     {((value?.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/TimeRangeConditionalWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/TimeRangeConditionalWidgetForm/index.tsx
index 4ecba49c5f..51be18a2f0 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/TimeRangeConditionalWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/TimeRangeConditionalWidgetForm/index.tsx
@@ -140,10 +140,8 @@ const conditionsSchema: ConditionsSchema = {
 
 const schema: FormSchema = {
     fields: (): FormSchemaFields => ({
-        id: [defaultUndefinedType],
-        clientId: [],
-        parentClientId: [],
-        parentWidgetId: [],
+        parentWidget: [defaultUndefinedType],
+        parentWidgetType: [],
         conditions: conditionsSchema,
     }),
 };
@@ -325,7 +323,7 @@ function TimeRangeConditionalWidgetForm(props: TimeRangeConditionalWidgetFormPro
         setFieldValue,
         setValue,
         setError,
-    } = useForm(schema, initialValue);
+    } = useForm(schema, initialValue, false);
 
     const error = getErrorObject(riskyError);
 
@@ -440,6 +438,9 @@ function TimeRangeConditionalWidgetForm(props: TimeRangeConditionalWidgetFormPro
                         direction="vertical"
                         rendererParams={conditionRendererParams}
                         showDragOverlay
+                        emptyMessage="No conditions were found."
+                        messageShown
+                        messageIconShown
                     />
                     {((value?.conditions?.length ?? 0) > 0) && (
                         <ConjunctionInput
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/index.tsx
index 9e1aef1c5a..168541c9f2 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetConditionalEditor/index.tsx
@@ -6,6 +6,7 @@ import {
 } from '@the-deep/deep-ui';
 import {
     randomString,
+    isDefined,
 } from '@togglecorp/fujs';
 
 import { Widget } from '#types/newAnalyticalFramework';
@@ -27,7 +28,7 @@ import TimeRangeConditionalWidgetForm from './TimeRangeConditionalWidgetForm';
 interface BaseFormContainerProps {
     title: string | undefined;
     onCancel: () => void;
-    onSave: () => void;
+    onSave: (() => void) | undefined;
     children?: React.ReactNode;
 }
 function BaseFormContainer(props: BaseFormContainerProps) {
@@ -46,17 +47,20 @@ function BaseFormContainer(props: BaseFormContainerProps) {
                         name={undefined}
                         onClick={onCancel}
                         variant="tertiary"
-                    // FIXME: use strings
+                        // FIXME: use strings
                     >
                         Cancel
                     </Button>
-                    <Button
-                        name={undefined}
-                        type="submit"
-                        onClick={onSave}
-                    >
-                        Save
-                    </Button>
+                    {onSave && (
+                        <Button
+                            name={undefined}
+                            type="submit"
+                            onClick={onSave}
+                            // FIXME: use strings
+                        >
+                            Save
+                        </Button>
+                    )}
                 </>
             )}
         >
@@ -66,7 +70,7 @@ function BaseFormContainer(props: BaseFormContainerProps) {
 }
 
 function widgetKeySelector(value: Widget) {
-    return value.clientId;
+    return value.id;
 }
 function widgetLabelSelector(value: Widget) {
     return value.title;
@@ -75,6 +79,7 @@ function widgetLabelSelector(value: Widget) {
 interface Props<T> {
     name: T;
     value: Widget['conditional'],
+    widgetId: string,
     title: string | undefined,
     widgets: Widget[];
     onChange: (value: Widget['conditional'], name: T) => void;
@@ -92,6 +97,7 @@ function WidgetConditionalEditor<T>(props: Props<T>) {
         className,
         widgets,
         title,
+        widgetId,
     } = props;
 
     const handleSave = useCallback(
@@ -109,11 +115,11 @@ function WidgetConditionalEditor<T>(props: Props<T>) {
     );
 
     const handleWidgetSelection = useCallback(
-        (widgetId: string | undefined) => {
-            if (!widgetId) {
+        (selectedWidgetId: string | undefined) => {
+            if (!selectedWidgetId) {
                 onChange(undefined, name);
             }
-            const widget = widgets.find((w) => w.clientId === widgetId);
+            const widget = widgets.find((w) => w.id === selectedWidgetId);
             if (!widget) {
                 // eslint-disable-next-line no-console
                 console.error('Widget not found');
@@ -122,11 +128,8 @@ function WidgetConditionalEditor<T>(props: Props<T>) {
             // NOTE: we are passing changed value to parent because we aren't
             // storing this value locally on this component
             onChange({
-                id: undefined,
-                parentId: undefined,
-                clientId: randomString(),
-                parentClientId: widget.clientId,
-                parentWidgetId: widget.widgetId,
+                parentWidget: widget.id,
+                parentWidgetType: widget.widgetId,
                 conditions: [{
                     key: randomString(),
                     order: 1,
@@ -139,23 +142,59 @@ function WidgetConditionalEditor<T>(props: Props<T>) {
         [widgets, onChange, name],
     );
 
+    const savedWidgets = useMemo(
+        () => widgets.filter((widget) => isDefined(widget.id)),
+        [widgets],
+    );
+
+    const nonChildWidgets = useMemo(
+        () => {
+            const widgetsWithoutSelf = savedWidgets.filter(
+                (widget) => widget.clientId !== widgetId,
+            );
+            return widgetsWithoutSelf.filter((widget) => !widget.conditional);
+        },
+        [savedWidgets, widgetId],
+    );
+
+    const childWidgets = useMemo(
+        () => (
+            savedWidgets.filter((widget) => (
+                widget.conditional && widget.conditional.parentWidget === widgetId
+            )) ?? []
+        ),
+        [savedWidgets, widgetId],
+    );
+
     const parentWidget = useMemo(
         () => (
             value
-                ? widgets.find((widget) => widget.clientId === value.parentClientId)
+                ? savedWidgets.find((widget) => widget.id === value.parentWidget)
                 : undefined
         ),
-        [widgets, value],
+        [savedWidgets, value],
     );
 
+    if (childWidgets.length > 0) {
+        return (
+            <BaseFormContainer
+                title={title}
+                onSave={undefined}
+                onCancel={onCancel}
+            >
+                {`This widget already has ${childWidgets.length} child widgets.`}
+            </BaseFormContainer>
+        );
+    }
+
     const parentSwitcher = (
         <SelectInput
             label="Parent Widget"
             name={undefined}
-            options={widgets}
+            options={nonChildWidgets}
             keySelector={widgetKeySelector}
             labelSelector={widgetLabelSelector}
-            value={value?.parentClientId}
+            value={value?.parentWidget}
             error={undefined}
             onChange={handleWidgetSelection}
         />
@@ -173,7 +212,7 @@ function WidgetConditionalEditor<T>(props: Props<T>) {
         );
     }
 
-    switch (value.parentWidgetId) {
+    switch (value.parentWidgetType) {
         case 'TEXT': {
             return (
                 <TextConditionalWidgetForm
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/DateRangeWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/DateRangeWidgetForm/index.tsx
index d9372eca96..2c2f671ab1 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/DateRangeWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/DateRangeWidgetForm/index.tsx
@@ -23,7 +23,7 @@ import styles from './styles.css';
 type FormType = DateRangeWidget;
 type PartialFormType = PartialForm<
     FormType,
-    'clientId' | 'key' | 'widgetId' | 'order'
+    'clientId' | 'key' | 'widgetId' | 'order' | 'conditional'
 >;
 type FormSchema = ObjectSchema<PartialFormType>;
 type FormSchemaFields = ReturnType<FormSchema['fields']>;
@@ -37,6 +37,8 @@ const schema: FormSchema = {
         widgetId: [],
         order: [],
         width: [],
+        version: [],
+        conditional: [],
     }),
 };
 
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/DateWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/DateWidgetForm/index.tsx
index f36d46c9d6..58a9600b11 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/DateWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/DateWidgetForm/index.tsx
@@ -29,7 +29,7 @@ import styles from './styles.css';
 type FormType = DateWidget;
 type PartialFormType = PartialForm<
     FormType,
-    'clientId' | 'key' | 'widgetId' | 'order'
+    'clientId' | 'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type FormSchema = ObjectSchema<PartialFormType>;
@@ -57,6 +57,8 @@ const schema: FormSchema = {
         width: [],
 
         properties: dataSchema,
+        conditional: [],
+        version: [],
     }),
 };
 
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/GeoWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/GeoWidgetForm/index.tsx
index e4ddff0686..c350a80c02 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/GeoWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/GeoWidgetForm/index.tsx
@@ -25,7 +25,7 @@ import styles from './styles.css';
 type FormType = GeoLocationWidget;
 type PartialFormType = PartialForm<
     FormType,
-    'clientId' | 'key' | 'widgetId' | 'order'
+    'clientId' | 'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type FormSchema = ObjectSchema<PartialFormType>;
@@ -53,6 +53,8 @@ const schema: FormSchema = {
         width: [],
 
         properties: dataSchema,
+        conditional: [],
+        version: [],
     }),
 };
 
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/Matrix1dWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/Matrix1dWidgetForm/index.tsx
index a603c5e8d1..c882bc0467 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/Matrix1dWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/Matrix1dWidgetForm/index.tsx
@@ -45,7 +45,7 @@ const CELLS_LIMIT = 30;
 type FormType = Matrix1dWidget;
 type PartialFormType = PartialForm<
     FormType,
-    'clientId' | 'key' | 'widgetId' | 'order'
+    'clientId' | 'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type FormSchema = ObjectSchema<PartialFormType>;
@@ -135,6 +135,8 @@ const schema: FormSchema = {
         width: [],
 
         properties: dataSchema,
+        conditional: [],
+        version: [],
     }),
 };
 
@@ -426,6 +428,10 @@ function RowInput(props: RowInputProps) {
                     direction="vertical"
                     rendererParams={cellRendererParams}
                     showDragOverlay
+                    emptyMessage="There are no cells in this row."
+                    messageShown
+                    messageIconShown
+                    compactEmptyMessage
                 />
             </Container>
         </ControlledExpandableContainer>
@@ -549,6 +555,9 @@ function DataInput<K extends string>(props: DataInputProps<K>) {
                     direction="vertical"
                     rendererParams={rowRendererParams}
                     showDragOverlay
+                    emptyMessage="No rows found."
+                    messageShown
+                    messageIconShown
                 />
             </Container>
         </>
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/Matrix2dWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/Matrix2dWidgetForm/index.tsx
index 9f235484e5..7bbcc4b77c 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/Matrix2dWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/Matrix2dWidgetForm/index.tsx
@@ -52,7 +52,7 @@ const SUB_COLUMNS_LIMIT = 30;
 type FormType = Matrix2dWidget;
 type PartialFormType = PartialForm<
     FormType,
-    'clientId' | 'key' | 'widgetId' | 'order'
+    'clientId' | 'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type FormSchema = ObjectSchema<PartialFormType>;
@@ -207,6 +207,8 @@ const schema: FormSchema = {
         width: [],
 
         properties: dataSchema,
+        conditional: [],
+        version: [],
     }),
 };
 
@@ -493,6 +495,10 @@ function RowInput(props: RowInputProps) {
                     renderer={SubRowInput}
                     rendererParams={subRowRendererParams}
                     direction="vertical"
+                    emptyMessage="There are no sub-rows in this row."
+                    messageShown
+                    messageIconShown
+                    compactEmptyMessage
                 />
             </Container>
         </ControlledExpandableContainer>
@@ -785,6 +791,10 @@ function ColumnInput(props: ColumnInputProps) {
                     renderer={SubColumnInput}
                     rendererParams={subColumnRendererParams}
                     direction="vertical"
+                    emptyMessage="There are no sub-columns in this column."
+                    messageShown
+                    messageIconShown
+                    compactEmptyMessage
                 />
             </Container>
         </ControlledExpandableContainer>
@@ -969,7 +979,9 @@ function DataInput<K extends string>(props: DataInputProps<K>) {
                     Columns
                 </Tab>
             </TabList>
-            <TabPanel name="rows">
+            <TabPanel
+                name="rows"
+            >
                 <Container
                     className={_cs(styles.container, className)}
                     contentClassName={styles.containerContent}
@@ -997,10 +1009,16 @@ function DataInput<K extends string>(props: DataInputProps<K>) {
                         renderer={RowInput}
                         rendererParams={rowRendererParams}
                         direction="vertical"
+                        emptyMessage="No rows were found."
+                        messageShown
+                        messageIconShown
                     />
                 </Container>
             </TabPanel>
-            <TabPanel name="columns">
+            <TabPanel
+                name="columns"
+                retainMount="lazy"
+            >
                 <Container
                     className={_cs(styles.container, className)}
                     headingSize="small"
@@ -1028,6 +1046,9 @@ function DataInput<K extends string>(props: DataInputProps<K>) {
                         renderer={ColumnInput}
                         rendererParams={columnRendererParams}
                         direction="vertical"
+                        emptyMessage="No columns were found."
+                        messageShown
+                        messageIconShown
                     />
                 </Container>
             </TabPanel>
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/MultiSelectWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/MultiSelectWidgetForm/index.tsx
index b024e32ef1..11ee9ed1d7 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/MultiSelectWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/MultiSelectWidgetForm/index.tsx
@@ -44,7 +44,7 @@ const OPTIONS_LIMIT = 100;
 type FormType = MultiSelectWidget;
 type PartialFormType = PartialForm<
     FormType,
-    'clientId' | 'key' | 'widgetId' | 'order'
+    'clientId' | 'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type FormSchema = ObjectSchema<PartialFormType>;
@@ -102,6 +102,8 @@ const schema: FormSchema = {
         width: [],
 
         properties: dataSchema,
+        conditional: [],
+        version: [],
     }),
 };
 
@@ -328,6 +330,9 @@ function DataInput<K extends string>(props: DataInputProps<K>) {
                     direction="vertical"
                     rendererParams={optionRendererParams}
                     showDragOverlay
+                    emptyMessage="No options were found."
+                    messageShown
+                    messageIconShown
                 />
             </Container>
         </>
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/NumberWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/NumberWidgetForm/index.tsx
index e4ba91770f..439f716e5e 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/NumberWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/NumberWidgetForm/index.tsx
@@ -32,7 +32,7 @@ import styles from './styles.css';
 type FormType = NumberWidget;
 type PartialFormType = PartialForm<
     FormType,
-    'clientId' | 'key' | 'widgetId' | 'order'
+    'clientId' | 'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type FormSchema = ObjectSchema<PartialFormType>;
@@ -79,6 +79,8 @@ const schema: FormSchema = {
         width: [],
 
         properties: dataSchema,
+        conditional: [],
+        version: [],
     }),
 };
 
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/OrganigramWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/OrganigramWidgetForm/index.tsx
index df929ca92b..068e0e5bb0 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/OrganigramWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/OrganigramWidgetForm/index.tsx
@@ -43,7 +43,7 @@ const OPTIONS_LIMIT = 100;
 type FormType = OrganigramWidget;
 type PartialFormType = PartialForm<
 FormType,
-    'clientId' | 'key' | 'widgetId' | 'order'
+    'clientId' | 'key' | 'widgetId' | 'order' | 'conditional'
 >;
 type FormSchema = ObjectSchema<PartialFormType>;
 type FormSchemaFields = ReturnType<FormSchema['fields']>;
@@ -92,6 +92,8 @@ const schema: FormSchema = {
         width: [],
 
         properties: dataSchema,
+        conditional: [],
+        version: [],
     }),
 };
 const defaultNodeVal = (): PartialNodeType => ({
@@ -154,12 +156,18 @@ function NodeInput(props: NodeInputProps) {
                 order: oldNodes.length,
             };
             setExpandedNodeId(newNode.key);
+            onExpansionChange(true, value?.key);
             onFieldChange(
                 [...reorder(oldNodes), newNode],
                 'children' as const,
             );
         },
-        [onFieldChange, value?.children],
+        [
+            onFieldChange,
+            value?.children,
+            onExpansionChange,
+            value?.key,
+        ],
     );
 
     const handleNodeExpansionChange = useCallback(
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/ScaleWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/ScaleWidgetForm/index.tsx
index 6c427c674e..e98d973c2a 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/ScaleWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/ScaleWidgetForm/index.tsx
@@ -47,7 +47,7 @@ const OPTIONS_LIMIT = 20;
 type FormType = ScaleWidget;
 type PartialFormType = PartialForm<
     FormType,
-    'clientId' | 'key' | 'widgetId' | 'order'
+    'clientId' | 'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type FormSchema = ObjectSchema<PartialFormType>;
@@ -106,6 +106,8 @@ const schema: FormSchema = {
         width: [],
 
         properties: dataSchema,
+        conditional: [],
+        version: [],
     }),
 };
 
@@ -383,6 +385,8 @@ function DataInput<K extends string>(props: DataInputProps<K>) {
                     direction="vertical"
                     rendererParams={optionRendererParams}
                     showDragOverlay
+                    messageShown
+                    messageIconShown
                 />
             </Container>
         </>
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/SingleSelectWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/SingleSelectWidgetForm/index.tsx
index ffc5c286f7..6a5ba62e17 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/SingleSelectWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/SingleSelectWidgetForm/index.tsx
@@ -44,7 +44,7 @@ const OPTIONS_LIMIT = 100;
 type FormType = SingleSelectWidget;
 type PartialFormType = PartialForm<
     FormType,
-    'clientId' | 'key' | 'widgetId' | 'order'
+    'clientId' | 'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type FormSchema = ObjectSchema<PartialFormType>;
@@ -102,6 +102,8 @@ const schema: FormSchema = {
         width: [],
 
         properties: dataSchema,
+        conditional: [],
+        version: [],
     }),
 };
 
@@ -327,6 +329,9 @@ function DataInput<K extends string>(props: DataInputProps<K>) {
                     direction="vertical"
                     rendererParams={optionRendererParams}
                     showDragOverlay
+                    emptyMessage="No options were found."
+                    messageShown
+                    messageIconShown
                 />
             </Container>
         </>
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/TextWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/TextWidgetForm/index.tsx
index 5118f56f58..38297b6c14 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/TextWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/TextWidgetForm/index.tsx
@@ -27,7 +27,7 @@ import styles from './styles.css';
 type FormType = TextWidget;
 type PartialFormType = PartialForm<
     FormType,
-    'clientId' | 'key' | 'widgetId' | 'order'
+    'clientId' | 'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type FormSchema = ObjectSchema<PartialFormType>;
@@ -55,6 +55,8 @@ const schema: FormSchema = {
         width: [],
 
         properties: dataSchema,
+        conditional: [],
+        version: [],
     }),
 };
 
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/TimeRangeWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/TimeRangeWidgetForm/index.tsx
index 7e85388ac8..f33d6b151c 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/TimeRangeWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/TimeRangeWidgetForm/index.tsx
@@ -24,7 +24,7 @@ import styles from './styles.css';
 type FormType = TimeRangeWidget;
 type PartialFormType = PartialForm<
     FormType,
-    'clientId' | 'key' | 'widgetId' | 'order'
+    'clientId' | 'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type FormSchema = ObjectSchema<PartialFormType>;
@@ -39,6 +39,8 @@ const schema: FormSchema = {
         widgetId: [],
         order: [],
         width: [],
+        version: [],
+        conditional: [],
     }),
 };
 
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/TimeWidgetForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/TimeWidgetForm/index.tsx
index 337255cbd9..bb5f02971e 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/TimeWidgetForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/TimeWidgetForm/index.tsx
@@ -29,7 +29,7 @@ import styles from './styles.css';
 type FormType = TimeWidget;
 type PartialFormType = PartialForm<
     FormType,
-    'clientId' | 'key' | 'widgetId' | 'order'
+    'clientId' | 'key' | 'widgetId' | 'order' | 'conditional'
 >;
 
 type FormSchema = ObjectSchema<PartialFormType>;
@@ -57,6 +57,8 @@ const schema: FormSchema = {
         width: [],
 
         properties: dataSchema,
+        conditional: [],
+        version: [],
     }),
 };
 
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/index.tsx
index 498c6b9d16..0046cbcc1a 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetEditor/index.tsx
@@ -19,7 +19,7 @@ import GeoLocationWidgetForm from './GeoWidgetForm';
 
 type PartialWidget = PartialForm<
     Widget,
-    'key' | 'widgetId' | 'clientId' | 'order'
+    'key' | 'widgetId' | 'clientId' | 'order' | 'conditional'
 >;
 
 interface Props<T> {
@@ -199,6 +199,7 @@ function WidgetEditor<T>(props: Props<T>) {
             );
         }
         default: {
+            // FIXME: add "not implemented"
             return null;
         }
     }
diff --git a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetList/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetList/index.tsx
index 4a382e8063..16ffa1a2a2 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/components/WidgetList/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/components/WidgetList/index.tsx
@@ -7,7 +7,10 @@ import {
     Element,
 } from '@the-deep/deep-ui';
 
-import { Types } from '#types/newAnalyticalFramework';
+import {
+    Types,
+    getWidgetVersion,
+} from '#types/newAnalyticalFramework';
 import { PartialWidget } from '#components/framework/AttributeInput';
 import styles from './styles.css';
 
@@ -18,6 +21,7 @@ const partialWidgets: PartialWidget[] = [
         clientId: 'random',
         order: -1,
         width: 'FULL',
+        version: getWidgetVersion('TEXT'),
     },
     {
         widgetId: 'NUMBER',
@@ -25,6 +29,7 @@ const partialWidgets: PartialWidget[] = [
         clientId: 'random',
         order: -1,
         width: 'FULL',
+        version: getWidgetVersion('NUMBER'),
     },
     {
         widgetId: 'DATE',
@@ -32,6 +37,7 @@ const partialWidgets: PartialWidget[] = [
         clientId: 'random',
         order: -1,
         width: 'FULL',
+        version: getWidgetVersion('DATE'),
     },
     {
         widgetId: 'DATE_RANGE',
@@ -39,6 +45,7 @@ const partialWidgets: PartialWidget[] = [
         clientId: 'random',
         order: -1,
         width: 'FULL',
+        version: getWidgetVersion('DATE_RANGE'),
     },
     {
         widgetId: 'TIME',
@@ -46,6 +53,7 @@ const partialWidgets: PartialWidget[] = [
         clientId: 'random',
         order: -1,
         width: 'FULL',
+        version: getWidgetVersion('TIME'),
     },
     {
         widgetId: 'TIME_RANGE',
@@ -53,6 +61,7 @@ const partialWidgets: PartialWidget[] = [
         clientId: 'random',
         order: -1,
         width: 'FULL',
+        version: getWidgetVersion('TIME_RANGE'),
     },
     {
         widgetId: 'MATRIX1D',
@@ -60,6 +69,7 @@ const partialWidgets: PartialWidget[] = [
         clientId: 'random',
         order: -1,
         width: 'FULL',
+        version: getWidgetVersion('MATRIX1D'),
     },
     {
         widgetId: 'MATRIX2D',
@@ -67,6 +77,7 @@ const partialWidgets: PartialWidget[] = [
         clientId: 'random',
         order: -1,
         width: 'FULL',
+        version: getWidgetVersion('MATRIX2D'),
     },
     {
         widgetId: 'SCALE',
@@ -74,6 +85,7 @@ const partialWidgets: PartialWidget[] = [
         clientId: 'random',
         order: -1,
         width: 'FULL',
+        version: getWidgetVersion('SELECT'),
     },
     {
         widgetId: 'SELECT',
@@ -81,6 +93,7 @@ const partialWidgets: PartialWidget[] = [
         clientId: 'random',
         order: -1,
         width: 'FULL',
+        version: getWidgetVersion('SELECT'),
     },
     {
         widgetId: 'MULTISELECT',
@@ -88,6 +101,7 @@ const partialWidgets: PartialWidget[] = [
         clientId: 'random',
         order: -1,
         width: 'FULL',
+        version: getWidgetVersion('MULTISELECT'),
     },
     {
         widgetId: 'ORGANIGRAM',
@@ -95,6 +109,7 @@ const partialWidgets: PartialWidget[] = [
         clientId: 'random',
         order: -1,
         width: 'FULL',
+        version: getWidgetVersion('ORGANIGRAM'),
     },
     {
         widgetId: 'GEO',
@@ -102,6 +117,7 @@ const partialWidgets: PartialWidget[] = [
         clientId: 'random',
         order: -1,
         width: 'FULL',
+        version: getWidgetVersion('GEO'),
     },
 ];
 
diff --git a/app/views/AnalyticalFramework/FrameworkForm/index.tsx b/app/views/AnalyticalFramework/FrameworkForm/index.tsx
index a180361bfe..fd5427b3cb 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/index.tsx
+++ b/app/views/AnalyticalFramework/FrameworkForm/index.tsx
@@ -10,13 +10,12 @@ import {
     MultiSelectInput,
     TabPanel,
     Checkbox,
+    PendingMessage,
     Button,
 } from '@the-deep/deep-ui';
 import {
     generatePath,
-    useHistory,
-    useLocation,
-    Prompt,
+    useNavigate,
 } from 'react-router-dom';
 import { isDefined, _cs } from '@togglecorp/fujs';
 import {
@@ -35,14 +34,11 @@ import {
 } from '@apollo/client';
 
 import {
-    SubNavbarIcons,
     SubNavbarActions,
     SubNavbarChildren,
 } from '#components/SubNavbar';
 import BackLink from '#components/BackLink';
 import routes from '#base/configs/routes';
-import Svg from '#components/Svg';
-import deepLogo from '#resources/img/deep-logo-new.svg';
 import {
     FrameworkProperties,
 } from '#types/newAnalyticalFramework';
@@ -93,7 +89,7 @@ function transformFramework(framework: Framework): FrameworkInput {
         properties,
     } = framework;
 
-    return removeNull({
+    const newValues = removeNull({
         title,
         description,
         isPrivate,
@@ -103,6 +99,7 @@ function transformFramework(framework: Framework): FrameworkInput {
         properties,
         isVisualizationEnabled: isDefined(properties),
     });
+    return newValues;
 }
 
 function FrameworkForm(props: FrameworkFormProps) {
@@ -111,11 +108,9 @@ function FrameworkForm(props: FrameworkFormProps) {
         framework,
     } = props;
 
-    const { replace: replacePath } = useHistory();
+    const navigate = useNavigate();
     const alert = useAlert();
 
-    const location = useLocation();
-
     const initialValue = useMemo(
         (): PartialFormType => {
             if (!framework) {
@@ -183,7 +178,7 @@ function FrameworkForm(props: FrameworkFormProps) {
                     setError(formError);
                 } else if (ok && result) {
                     alert.show(
-                        'New analytical framework was successfully created.',
+                        'Successfully created new analytical framework.',
                         {
                             variant: 'success',
                         },
@@ -196,7 +191,7 @@ function FrameworkForm(props: FrameworkFormProps) {
                         routes.analyticalFrameworkEdit.path,
                         { frameworkId: result.id },
                     );
-                    replacePath(path);
+                    navigate(path, { replace: true });
                 }
             },
             onError: (error) => {
@@ -233,7 +228,7 @@ function FrameworkForm(props: FrameworkFormProps) {
                     setError(formError);
                 } else if (ok && result) {
                     alert.show(
-                        'The analytical framework was successfully updated.',
+                        'Successfully updated the analytical framework.',
                         {
                             variant: 'success',
                         },
@@ -285,18 +280,38 @@ function FrameworkForm(props: FrameworkFormProps) {
             const submit = createSubmitHandler(
                 validate,
                 setError,
-                (val) => {
-                    // NOTE: clearing out these data so they don't override
-                    const cleanData = { ...val };
-                    delete cleanData.isVisualizationEnabled;
-
-                    const data = cleanData as AnalysisFrameworkInputType;
-                    if (primaryTaggingPristine) {
-                        delete data.primaryTagging;
-                    }
-                    if (secondaryTaggingPristine) {
-                        delete data.secondaryTagging;
-                    }
+                (val: PartialFormType) => {
+                    const newData = {
+                        ...val,
+                        isVisualizationEnabled: undefined,
+                        primaryTagging: primaryTaggingPristine
+                            ? undefined
+                            : val.primaryTagging?.map((section) => ({
+                                ...section,
+                                widgets: section.widgets?.map((widget) => ({
+                                    ...widget,
+                                    // NOTE: should set conditional to null
+                                    // else it will not be cleared
+                                    conditional: widget.conditional ? {
+                                        ...widget.conditional,
+                                        parentWidgetType: undefined,
+                                    } : null,
+                                })),
+                            })),
+                        secondaryTagging: secondaryTaggingPristine
+                            ? undefined
+                            : val.secondaryTagging?.map((widget) => ({
+                                ...widget,
+                                // NOTE: should set conditional to null else it
+                                // will not be cleared
+                                conditional: widget.conditional ? {
+                                    ...widget.conditional,
+                                    parentWidgetType: undefined,
+                                } : null,
+                            })),
+                    };
+
+                    const data = newData as AnalysisFrameworkInputType;
 
                     if (frameworkId) {
                         updateAnalysisFramework({
@@ -400,6 +415,17 @@ function FrameworkForm(props: FrameworkFormProps) {
         }
     }, [onStatsConfigChange]);
 
+    const allWidgets = useMemo(() => {
+        const widgetsFromPrimary = value.primaryTagging?.flatMap(
+            (item) => (item.widgets ?? []),
+        ) ?? [];
+        const widgetsFromSecondary = value.secondaryTagging ?? [];
+        return [
+            ...widgetsFromPrimary,
+            ...widgetsFromSecondary,
+        ];
+    }, [value.primaryTagging, value.secondaryTagging]);
+
     const {
         matrix1dWidgets,
         matrix2dWidgets,
@@ -408,14 +434,8 @@ function FrameworkForm(props: FrameworkFormProps) {
         organigramWidgets,
         multiSelectWidgets,
     } = useMemo(() => {
-        const widgets = [
-            ...(value.primaryTagging?.map((d) => d.widgets)?.flat() ?? []),
-            ...(value.secondaryTagging ?? []),
-        ];
-
-        const createdWidgets = widgets
-            .filter(isDefined)
-            .filter((w) => isDefined(w?.id))
+        const createdWidgets = allWidgets
+            .filter((w) => isDefined(w.id))
             .map((w) => ({
                 id: +w.id,
                 title: w.title,
@@ -430,32 +450,17 @@ function FrameworkForm(props: FrameworkFormProps) {
             organigramWidgets: createdWidgets.filter((w) => w.widgetId === 'ORGANIGRAM'),
             multiSelectWidgets: createdWidgets.filter((w) => w.widgetId === 'MULTISELECT'),
         });
-    }, [value]);
+    }, [allWidgets]);
 
     return (
         <>
-            <Prompt
-                message={(newLocation) => {
-                    if (newLocation.pathname !== location.pathname && !pristine) {
-                        return _ts('common', 'youHaveUnsavedChanges');
-                    }
-                    return true;
-                }}
-            />
-            <SubNavbarIcons>
-                <div className={styles.appBrand}>
-                    <Svg
-                        src={deepLogo}
-                        className={styles.logo}
-                    />
-                </div>
-            </SubNavbarIcons>
+            {pending && <PendingMessage />}
             <SubNavbarActions>
                 <BackLink
                     defaultLink="/"
                     disabled={isNavigationDisabled}
                 >
-                    {_ts('analyticalFramework', 'closeButtonLabel')}
+                    Close
                 </BackLink>
                 <Button
                     disabled={pristine || pending || isNavigationDisabled}
@@ -509,8 +514,9 @@ function FrameworkForm(props: FrameworkFormProps) {
                 )}
             </SubNavbarChildren>
             <TabPanel
-                className={_cs(styles.tabPanel, styles.detailsTabPanel)}
+                activeClassName={_cs(styles.tabPanel, styles.detailsTabPanel)}
                 name="framework-details"
+                retainMount="lazy"
             >
                 <div className={styles.content}>
                     <div className={styles.details}>
@@ -595,10 +601,12 @@ function FrameworkForm(props: FrameworkFormProps) {
                 )}
             </TabPanel>
             <TabPanel
-                className={styles.tabPanel}
+                activeClassName={styles.tabPanel}
                 name="primary-tagging"
+                retainMount="lazy"
             >
                 <PrimaryTagging
+                    allWidgets={allWidgets}
                     name="primaryTagging"
                     value={value.primaryTagging}
                     onChange={handlePrimaryTaggingChange}
@@ -610,10 +618,12 @@ function FrameworkForm(props: FrameworkFormProps) {
                 />
             </TabPanel>
             <TabPanel
-                className={styles.tabPanel}
+                activeClassName={styles.tabPanel}
                 name="secondary-tagging"
+                retainMount="lazy"
             >
                 <SecondaryTagging
+                    allWidgets={allWidgets}
                     name="secondaryTagging"
                     value={value.secondaryTagging}
                     onChange={handleSecondaryTaggingChange}
@@ -625,8 +635,9 @@ function FrameworkForm(props: FrameworkFormProps) {
                 />
             </TabPanel>
             <TabPanel
-                className={styles.tabPanel}
+                activeClassName={styles.tabPanel}
                 name="review"
+                retainMount="lazy"
             >
                 <Review
                     className={styles.view}
@@ -636,8 +647,9 @@ function FrameworkForm(props: FrameworkFormProps) {
             </TabPanel>
             {value.isVisualizationEnabled && (
                 <TabPanel
-                    className={styles.tabPanel}
+                    activeClassName={styles.tabPanel}
                     name="viz-settings"
+                    retainMount="lazy"
                 >
                     <Container
                         heading="Visualization Settings"
diff --git a/app/views/AnalyticalFramework/FrameworkForm/schema.ts b/app/views/AnalyticalFramework/FrameworkForm/schema.ts
index 9a8ced8a0e..cd6f6e4878 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/schema.ts
+++ b/app/views/AnalyticalFramework/FrameworkForm/schema.ts
@@ -36,11 +36,11 @@ const widgetSchema: WidgetSchema = {
         key: [],
         order: [],
         properties: [],
-        // FIXME: Enable this after this has been implemented on the server side
-        // conditional: [],
+        version: [],
         title: [],
         widgetId: [],
         width: [],
+        conditional: [],
     }),
 };
 
diff --git a/app/views/AnalyticalFramework/FrameworkForm/styles.css b/app/views/AnalyticalFramework/FrameworkForm/styles.css
index 8d09fce7bf..ace3704592 100644
--- a/app/views/AnalyticalFramework/FrameworkForm/styles.css
+++ b/app/views/AnalyticalFramework/FrameworkForm/styles.css
@@ -2,15 +2,6 @@
     color: var(--dui-color-danger);
 }
 
-.app-brand {
-    overflow: auto;
-    color: var(--dui-color-brand);
-
-    .logo {
-        height: var(--dui-font-size-super-large);
-    }
-}
-
 .details-tab-panel {
     display: flex;
     flex-direction: column;
diff --git a/app/views/AnalyticalFramework/index.tsx b/app/views/AnalyticalFramework/index.tsx
index e45ff2f251..81a6bd890d 100644
--- a/app/views/AnalyticalFramework/index.tsx
+++ b/app/views/AnalyticalFramework/index.tsx
@@ -103,6 +103,7 @@ function AnalyticalFramework(props: Props) {
                                 ? _ts('analyticalFramework', 'addNewAnalyticalFramework')
                                 : framework?.title
                         )}
+                        homeLinkShown
                     />
                     {!hasPermission ? (
                         <PreloadMessage
diff --git a/app/views/AnalyticalFramework/queries.ts b/app/views/AnalyticalFramework/queries.ts
index facb0d81d2..357d730d5c 100644
--- a/app/views/AnalyticalFramework/queries.ts
+++ b/app/views/AnalyticalFramework/queries.ts
@@ -9,9 +9,15 @@ const FRAMEWORK = gql`
                 key
                 order
                 properties
+                conditional {
+                    parentWidget
+                    parentWidgetType
+                    conditions
+                }
                 title
                 widgetId
                 width
+                version
             }
             clientId
             id
@@ -26,8 +32,14 @@ const FRAMEWORK = gql`
             order
             title
             properties
+            conditional {
+                parentWidget
+                parentWidgetType
+                conditions
+            }
             widgetId
             width
+            version
         }
         organization {
             id
diff --git a/app/views/AnalyticalFramework/types.tsx b/app/views/AnalyticalFramework/types.tsx
index 631733d549..1249d2249f 100644
--- a/app/views/AnalyticalFramework/types.tsx
+++ b/app/views/AnalyticalFramework/types.tsx
@@ -23,7 +23,7 @@ export type FrameworkRaw = DeepMandatory<NonNullable<CurrentFrameworkQuery['anal
 type FrameworkWithWidgets = DeepReplace<FrameworkRaw, Omit<WidgetRaw, 'widgetIdDisplay' | 'widthDisplay'>, WidgetFromAF>;
 export type Framework = Omit<FrameworkWithWidgets, 'properties'> & { properties?: FrameworkProperties };
 
-export type FrameworkInputRaw = DeepMandatory<PurgeNull<AnalysisFrameworkInputType>, 'clientId' | 'key' | 'widgetId' | 'order'>;
+export type FrameworkInputRaw = DeepMandatory<PurgeNull<AnalysisFrameworkInputType>, 'clientId' | 'key' | 'widgetId' | 'order' | 'conditional'>;
 type FrameworkInputWithWidgets = DeepReplace<FrameworkInputRaw, WidgetInputRaw, WidgetFromAF>;
 export type FrameworkInput = Omit<FrameworkInputWithWidgets, 'properties' | 'previewImage'> & {
     properties?: FrameworkProperties,
diff --git a/app/views/AnalyticalFramework/utils.ts b/app/views/AnalyticalFramework/utils.ts
index d8d70a5981..165372e259 100644
--- a/app/views/AnalyticalFramework/utils.ts
+++ b/app/views/AnalyticalFramework/utils.ts
@@ -157,6 +157,7 @@ export function cloneWidget(
         case 'TEXT':
             return cloneWidgetSuperficially(widget);
         default:
+            // FIXME: add "not implemented" console
             return undefined;
     }
 }
diff --git a/app/views/ExploreDeep/ActionCell/ProjectJoinModal/index.tsx b/app/views/ExploreDeep/ActionCell/ProjectJoinModal/index.tsx
index b29dee330d..72aefb9231 100644
--- a/app/views/ExploreDeep/ActionCell/ProjectJoinModal/index.tsx
+++ b/app/views/ExploreDeep/ActionCell/ProjectJoinModal/index.tsx
@@ -133,7 +133,7 @@ function ProjectJoinModal(props: Props) {
                     [internal]: gqlError.message,
                 });
                 alert.show(
-                    gqlError.message,
+                    'Failed to send join request.',
                     { variant: 'error' },
                 );
             },
@@ -164,6 +164,8 @@ function ProjectJoinModal(props: Props) {
             heading="Send project join request"
             className={_cs(className, styles.projectJoinModal)}
             onCloseButtonClick={onModalClose}
+            size="small"
+            freeHeight
             footerActions={(
                 <>
                     <Button
diff --git a/app/views/ExploreDeep/ActionCell/index.tsx b/app/views/ExploreDeep/ActionCell/index.tsx
index 67a2f764fe..5d79bc0a98 100644
--- a/app/views/ExploreDeep/ActionCell/index.tsx
+++ b/app/views/ExploreDeep/ActionCell/index.tsx
@@ -26,6 +26,7 @@ export interface Props {
     // or rejected
     membershipPending: boolean;
     isMember: boolean;
+    isRejected: boolean;
     onMemberStatusChange: () => void;
     variant?: ButtonProps<string>['variant'];
 }
@@ -47,6 +48,7 @@ function ActionCell(props: Props) {
         disabled,
         membershipPending,
         isMember,
+        isRejected,
         onMemberStatusChange,
         variant,
     } = props;
@@ -63,18 +65,27 @@ function ActionCell(props: Props) {
     ] = useMutation<CancelJoinProjectMutation, CancelJoinProjectMutationVariables>(
         CANCEL_JOIN_PROJECT,
         {
-            onCompleted: () => {
-                alert.show(
-                    'Successfully cancelled project join request.',
-                    {
-                        variant: 'success',
-                    },
-                );
+            onCompleted: (response) => {
+                if (response.projectJoinRequestDelete?.ok) {
+                    alert.show(
+                        'Successfully cancelled project join request.',
+                        {
+                            variant: 'success',
+                        },
+                    );
+                } else {
+                    alert.show(
+                        'Failed to cancel project join request.',
+                        {
+                            variant: 'error',
+                        },
+                    );
+                }
                 onMemberStatusChange();
             },
-            onError: (gqlError) => {
+            onError: () => {
                 alert.show(
-                    gqlError.message,
+                    'Failed to cancel join request.',
                     { variant: 'error' },
                 );
             },
@@ -87,7 +98,7 @@ function ActionCell(props: Props) {
         });
     }, [projectId, cancelJoinProject]);
 
-    if (isMember) {
+    if (isMember || isRejected) {
         return null;
     }
 
@@ -107,6 +118,7 @@ function ActionCell(props: Props) {
                     name={undefined}
                     onConfirm={handleCancelJoinProjectClick}
                     variant="secondary"
+                    message="Are you sure you want to cancel your join request?"
                     disabled={disabled}
                 >
                     Cancel Join
diff --git a/app/views/ExploreDeep/ActiveProject/styles.css b/app/views/ExploreDeep/ActiveProject/styles.css
index 99e1d37058..d420151dd6 100644
--- a/app/views/ExploreDeep/ActiveProject/styles.css
+++ b/app/views/ExploreDeep/ActiveProject/styles.css
@@ -1,4 +1,5 @@
 .active-project {
+    border-bottom: var(--dui-width-separator-thin) solid var(--dui-color-separator);
     padding: var(--dui-spacing-medium);
 
     .project-title {
diff --git a/app/views/ExploreDeep/MapView/ProjectList/index.tsx b/app/views/ExploreDeep/MapView/ProjectList/index.tsx
index 8ace22a756..6b05de1c21 100644
--- a/app/views/ExploreDeep/MapView/ProjectList/index.tsx
+++ b/app/views/ExploreDeep/MapView/ProjectList/index.tsx
@@ -7,11 +7,13 @@ import {
     Container,
     DateOutput,
     ListView,
+    Kraken,
     Footer,
     Pager,
     TextOutput,
 } from '@the-deep/deep-ui';
 
+import FrameworkImageButton from '#components/framework/FrameworkImageButton';
 import { ProjectDetailsForMapViewQuery } from '#generated/types';
 
 import ActionCell from '../../ActionCell';
@@ -24,12 +26,14 @@ interface ProjectListProps {
     projectDetails: ProjectDetail;
     projectTitle: string;
     frameworkTitle?: string;
+    frameworkId?: string;
     description: string;
-    startDate?: string;
+    createdAt?: string;
     numberOfUsers?: number;
     numberOfLeads?: number;
     numberOfEntries?: number;
     expanded: boolean;
+    isRejected: boolean;
     onExpansionChange: (_: boolean, name: string) => void;
     refetchProjectDetails: () => void;
 }
@@ -40,12 +44,14 @@ function ListRenderer(props: ProjectListProps) {
         projectDetails,
         projectTitle,
         frameworkTitle,
-        startDate,
+        frameworkId,
+        createdAt,
         description,
         numberOfEntries,
         numberOfLeads,
         numberOfUsers,
         expanded,
+        isRejected,
         onExpansionChange,
         refetchProjectDetails,
     } = props;
@@ -53,7 +59,7 @@ function ListRenderer(props: ProjectListProps) {
     return (
         <ControlledExpandableContainer
             name={projectId}
-            className={styles.projectListContainer}
+            className={styles.projectContainer}
             spacing="compact"
             headingSize="extraSmall"
             heading={(
@@ -64,7 +70,7 @@ function ListRenderer(props: ProjectListProps) {
             headingDescription={(
                 <DateOutput
                     className={styles.date}
-                    value={startDate}
+                    value={createdAt}
                 />
             )}
             headingClassName={styles.heading}
@@ -91,16 +97,22 @@ function ListRenderer(props: ProjectListProps) {
                     hideLabelColon
                 />
             </div>
-            <TextOutput
-                value={frameworkTitle}
-            />
-            <div>
-                {description}
-            </div>
+            {frameworkTitle && (
+                <FrameworkImageButton
+                    frameworkId={frameworkId}
+                    label={frameworkTitle}
+                />
+            )}
+            {description && (
+                <div>
+                    {description}
+                </div>
+            )}
             <ActionCell
                 className={styles.joinButton}
                 projectId={projectId}
                 membershipPending={projectDetails?.membershipPending}
+                isRejected={isRejected}
                 isMember={!!projectDetails?.currentUserRole}
                 onMemberStatusChange={refetchProjectDetails}
                 variant="primary"
@@ -113,6 +125,7 @@ const keySelector = (d: ProjectDetail) => d.id;
 
 interface Props {
     projectDetails?: ProjectDetail[];
+    projectDetailsPending: boolean;
     page: number;
     pageSize: number;
     setPage: (page: number) => void;
@@ -125,6 +138,7 @@ interface Props {
 function ProjectList(props: Props) {
     const {
         projectDetails,
+        projectDetailsPending,
         page,
         pageSize,
         setPage,
@@ -147,9 +161,11 @@ function ProjectList(props: Props) {
         projectId: datum?.id,
         projectDetails: datum,
         projectTitle: datum?.title,
+        isRejected: datum.isRejected,
         description: datum?.description,
+        frameworkId: datum?.analysisFramework?.id,
         frameworkTitle: datum?.analysisFramework?.title,
-        startDate: datum?.startDate ?? undefined,
+        createdAt: datum?.createdAt ?? undefined,
         numberOfEntries: datum?.stats?.numberOfEntries ?? 0,
         numberOfLeads: datum?.stats?.numberOfLeads ?? 0,
         numberOfUsers: datum?.stats?.numberOfUsers ?? 0,
@@ -166,11 +182,12 @@ function ProjectList(props: Props) {
         <Container
             className={styles.projectList}
             heading={_cs('Projects: ', totalCount.toString())}
-            headingSize="extraSmall"
+            headingSize="small"
             headerActions={(
                 <QuickActionButton
                     name={undefined}
                     onClick={onListCloseButtonClick}
+                    title="Close"
                 >
                     <IoClose />
                 </QuickActionButton>
@@ -183,6 +200,18 @@ function ProjectList(props: Props) {
                 data={projectDetails}
                 renderer={ListRenderer}
                 rendererParams={rendererParams}
+                // NOTE: Nothing to filter here
+                filtered={false}
+                errored={false}
+                pending={projectDetailsPending}
+                emptyIcon={(
+                    <Kraken
+                        variant="skydive"
+                    />
+                )}
+                emptyMessage="No projects found."
+                messageIconShown
+                messageShown
             />
             <Footer
                 className={styles.footer}
diff --git a/app/views/ExploreDeep/MapView/ProjectList/styles.css b/app/views/ExploreDeep/MapView/ProjectList/styles.css
index e56ad6f541..564e8461b0 100644
--- a/app/views/ExploreDeep/MapView/ProjectList/styles.css
+++ b/app/views/ExploreDeep/MapView/ProjectList/styles.css
@@ -4,6 +4,7 @@
     flex-direction: column;
     justify-content: center;
     z-index: 1;
+    border: var(--dui-width-separator-thin) solid var(--dui-color-separator);
     background-color: var(--dui-color-foreground);
     width: 100%;
     max-width: 450px;
@@ -12,9 +13,10 @@
     .list {
         display: flex;
         flex-direction: column;
+        min-height: 100%;
         gap: var(--dui-spacing-small);
 
-        .project-list-container {
+        .project-container {
             .heading {
                 color: var(--dui-color-brand);
             }
@@ -24,13 +26,16 @@
                 color: var(--dui-color-text-description);
                 font-weight: var(--dui-font-weight-regular);
             }
+
             .content {
                 display: flex;
                 flex-direction: column;
                 gap: var(--dui-spacing-medium);
             }
+
             .join-button {
-                justify-content: flex-start;
+                display: flex;
+                justify-content: flex-end;
             }
         }
     }
diff --git a/app/views/ExploreDeep/MapView/index.tsx b/app/views/ExploreDeep/MapView/index.tsx
index 43e73646bd..2b393b8755 100644
--- a/app/views/ExploreDeep/MapView/index.tsx
+++ b/app/views/ExploreDeep/MapView/index.tsx
@@ -109,9 +109,10 @@ const PROJECT_DETAILS = gql`
                 id
                 title
                 description
-                startDate
+                createdAt
                 membershipPending
                 currentUserRole
+                isRejected
                 stats {
                     numberOfUsers
                     numberOfLeads
@@ -160,10 +161,10 @@ function ExploreDeepMapView(props: Props) {
     );
 
     const [clickedFeatureProperties, setClickedFeatureProperties] = useState<string[]>([]);
-    const [clusterClicked, setClusterClicked] = useState<boolean>(false);
+    const [clusterClicked, setClusterClicked] = useState(false);
 
-    const [page, setPage] = useState<number>(1);
-    const [pageSize, setPageSize] = useState<number>(5);
+    const [page, setPage] = useState(1);
+    const [pageSize, setPageSize] = useState(5);
 
     const projectDetailsVariables = useMemo(
         () => ({
@@ -175,7 +176,8 @@ function ExploreDeepMapView(props: Props) {
     );
 
     const {
-        data: projectDetails,
+        previousData,
+        data: projectDetails = previousData,
         loading: projectDetailsPending,
         refetch: refetchProjectDetails,
     } = useQuery<ProjectDetailsForMapViewQuery, ProjectDetailsForMapViewQueryVariables>(
@@ -214,22 +216,22 @@ function ExploreDeepMapView(props: Props) {
         map: mapboxgl.Map,
     ) => {
         interface ClusterProperties {
-            // eslint-disable-next-line camelcase
+
             cluster_id: number;
-            // eslint-disable-next-line camelcase
+
             point_count: number;
         }
 
         if (feature.properties) {
             // eslint-disable-next-line camelcase
             const { cluster_id, point_count } = feature.properties as ClusterProperties;
-            const clusterSource = map.getSource('region');
+            const clusterSource = map.getSource('region') as mapboxgl.GeoJSONSource;
             if (clusterSource) {
                 clusterSource.getClusterLeaves(
                     cluster_id,
                     point_count,
                     0,
-                    (___: unknown, aFeatures: mapboxgl.MapboxGeoJSONFeature[]) => {
+                    (___, aFeatures) => {
                         if (aFeatures) {
                             const projectIds = aFeatures
                                 .map((f) => f?.properties?.projectId)
@@ -240,13 +242,6 @@ function ExploreDeepMapView(props: Props) {
                 );
             }
 
-            /*
-            map.flyTo({
-                // TODO: we should change this to center the tooltip, not the cluster point
-                center: feature.geometry.coordinates,
-            });
-            */
-
             if (feature.properties.projectId) {
                 setClickedFeatureProperties([feature.properties.projectId]);
             } else {
@@ -266,6 +261,7 @@ function ExploreDeepMapView(props: Props) {
             {clusterClicked && (
                 <ProjectList
                     projectDetails={projectDetails?.projects?.results ?? undefined}
+                    projectDetailsPending={projectDetailsPending}
                     onListCloseButtonClick={handleListClose}
                     page={page}
                     pageSize={pageSize}
@@ -275,7 +271,7 @@ function ExploreDeepMapView(props: Props) {
                     refetchProjectDetails={refetchProjectDetails}
                 />
             )}
-            {loading && projectDetailsPending && (<PendingMessage />)}
+            {loading && (<PendingMessage />)}
             <Map
                 mapStyle={process.env.REACT_APP_MAPBOX_STYLE}
                 mapOptions={mapOptions}
diff --git a/app/views/ExploreDeep/ProjectFilterForm/index.tsx b/app/views/ExploreDeep/ProjectFilterForm/index.tsx
index cd7c00baa2..4e0e1b39dd 100644
--- a/app/views/ExploreDeep/ProjectFilterForm/index.tsx
+++ b/app/views/ExploreDeep/ProjectFilterForm/index.tsx
@@ -1,5 +1,8 @@
 import React, { useCallback, useMemo, useEffect, useState } from 'react';
-import { doesObjectHaveNoData } from '@togglecorp/fujs';
+import {
+    _cs,
+    doesObjectHaveNoData,
+} from '@togglecorp/fujs';
 import { IoClose } from 'react-icons/io5';
 import {
     TextInput,
@@ -11,13 +14,13 @@ import {
     useForm,
 } from '@togglecorp/toggle-form';
 
-import OrganizationMultiSelectInput, {
+import PublicOrganizationMultiSelectInput, {
     BasicOrganization,
-} from '#components/selections/NewOrganizationMultiSelectInput';
+} from '#components/selections/PublicOrganizationMultiSelectInput';
 
-import FrameworkMultiSelectInput, {
+import PublicFrameworkMultiSelectInput, {
     AnalysisFramework,
-} from '#components/selections/FrameworkMultiSelectInput';
+} from '#components/selections/PublicFrameworkMultiSelectInput';
 import {
     ProjectListQueryVariables,
 } from '#generated/types';
@@ -41,12 +44,14 @@ const schema: FormSchema = {
 const initialValue: FormType = {};
 
 interface Props {
+    className?: string;
     filters: ProjectListQueryVariables | undefined;
     onFiltersChange: (filters: ProjectListQueryVariables | undefined) => void;
 }
 
 function ProjectFilterForm(props: Props) {
     const {
+        className,
         filters,
         onFiltersChange,
     } = props;
@@ -87,65 +92,61 @@ function ProjectFilterForm(props: Props) {
     }, [onFiltersChange, value]);
 
     return (
-        <div className={styles.content}>
-            <div className={styles.filters}>
-                <TextInput
-                    name="search"
-                    label="Search"
-                    value={value?.search}
-                    onChange={setFieldValue}
-                    placeholder="any"
-                />
-                <DateInput
-                    name="startDate"
-                    label="Start Date"
-                    value={value?.startDate}
-                    onChange={setFieldValue}
-                />
-                <DateInput
-                    name="endDate"
-                    label="End Date"
-                    value={value?.endDate}
-                    onChange={setFieldValue}
-                />
-                <OrganizationMultiSelectInput
-                    name="organizations"
-                    label="Organizations"
-                    value={value?.organizations}
-                    onChange={setFieldValue}
-                    options={organizationOptions}
-                    onOptionsChange={setOrganizationOptions}
-                    placeholder="any"
-                />
-                <FrameworkMultiSelectInput
-                    name="analysisFrameworks"
-                    label="Analysis Frameworks"
-                    placeholder="any"
-                    value={value?.analysisFrameworks}
-                    onChange={setFieldValue}
-                    options={analysisFrameworkOptions}
-                    onOptionsChange={setAnalysisFrameworkOptions}
-                />
-            </div>
-            <div className={styles.buttonContainer}>
-                <Button
-                    name={undefined}
-                    onClick={handleSubmit}
-                    disabled={pristine}
-                    variant="transparent"
-                >
-                    Apply
-                </Button>
-                <Button
-                    name={undefined}
-                    disabled={isClearDisabled}
-                    onClick={handleClearFilters}
-                    actions={<IoClose />}
-                    variant="transparent"
-                >
-                    Clear All
-                </Button>
-            </div>
+        <div className={_cs(styles.content, className)}>
+            <TextInput
+                name="search"
+                label="Search"
+                value={value?.search}
+                onChange={setFieldValue}
+                placeholder="any"
+            />
+            <DateInput
+                name="startDate"
+                label="Start Date"
+                value={value?.startDate}
+                onChange={setFieldValue}
+            />
+            <DateInput
+                name="endDate"
+                label="End Date"
+                value={value?.endDate}
+                onChange={setFieldValue}
+            />
+            <PublicOrganizationMultiSelectInput
+                name="organizations"
+                label="Organizations"
+                value={value?.organizations}
+                onChange={setFieldValue}
+                options={organizationOptions}
+                onOptionsChange={setOrganizationOptions}
+                placeholder="any"
+            />
+            <PublicFrameworkMultiSelectInput
+                name="analysisFrameworks"
+                label="Analysis Frameworks"
+                placeholder="any"
+                value={value?.analysisFrameworks}
+                onChange={setFieldValue}
+                options={analysisFrameworkOptions}
+                onOptionsChange={setAnalysisFrameworkOptions}
+            />
+            <Button
+                name={undefined}
+                onClick={handleSubmit}
+                disabled={pristine}
+                variant="transparent"
+            >
+                Apply
+            </Button>
+            <Button
+                name={undefined}
+                disabled={isClearDisabled}
+                onClick={handleClearFilters}
+                actions={<IoClose />}
+                variant="transparent"
+            >
+                Clear All
+            </Button>
         </div>
     );
 }
diff --git a/app/views/ExploreDeep/ProjectFilterForm/styles.css b/app/views/ExploreDeep/ProjectFilterForm/styles.css
index 48361c605b..730cb1c533 100644
--- a/app/views/ExploreDeep/ProjectFilterForm/styles.css
+++ b/app/views/ExploreDeep/ProjectFilterForm/styles.css
@@ -1,23 +1,7 @@
 .content {
     display: flex;
+    align-items: flex-end;
+    flex-wrap: wrap;
     padding: var(--dui-spacing-medium);
     gap: var(--dui-spacing-medium);
-
-    .filters {
-        display: flex;
-        align-items: center;
-        flex-grow: 1;
-        flex-shrink: 0;
-        flex-wrap: wrap;
-        gap: var(--dui-spacing-medium);
-    }
-
-    .button-container {
-        display: flex;
-        align-items: flex-end;
-        flex-grow: 1;
-        flex-shrink: 0;
-        justify-content: flex-end;
-        gap: var(--dui-spacing-small);
-    }
 }
diff --git a/app/views/ExploreDeep/PublicMapView/ProjectList/index.tsx b/app/views/ExploreDeep/PublicMapView/ProjectList/index.tsx
new file mode 100644
index 0000000000..e281a7deac
--- /dev/null
+++ b/app/views/ExploreDeep/PublicMapView/ProjectList/index.tsx
@@ -0,0 +1,211 @@
+import React, { useCallback, useState } from 'react';
+import { _cs } from '@togglecorp/fujs';
+import { IoClose } from 'react-icons/io5';
+import {
+    QuickActionButton,
+    ControlledExpandableContainer,
+    Container,
+    DateOutput,
+    ListView,
+    Footer,
+    Kraken,
+    Pager,
+    TextOutput,
+} from '@the-deep/deep-ui';
+
+import FrameworkImageButton from '#components/framework/FrameworkImageButton';
+import { PublicProjectDetailsForMapViewQuery } from '#generated/types';
+
+import styles from './styles.css';
+
+type ProjectDetail = NonNullable<NonNullable<NonNullable<PublicProjectDetailsForMapViewQuery['publicProjects']>['results']>[number]>;
+
+interface ProjectListProps {
+    projectId: string;
+    projectTitle: string;
+    frameworkTitle?: string;
+    frameworkPreviewImage?: string;
+    description: string;
+    createdAt?: string;
+    numberOfUsers?: number;
+    numberOfLeads?: number;
+    numberOfEntries?: number;
+    expanded: boolean;
+    onExpansionChange: (_: boolean, name: string) => void;
+}
+
+function ListRenderer(props: ProjectListProps) {
+    const {
+        projectId,
+        projectTitle,
+        frameworkTitle,
+        createdAt,
+        description,
+        numberOfEntries,
+        frameworkPreviewImage,
+        numberOfLeads,
+        numberOfUsers,
+        expanded,
+        onExpansionChange,
+    } = props;
+
+    return (
+        <ControlledExpandableContainer
+            name={projectId}
+            className={styles.projectContainer}
+            spacing="compact"
+            headingSize="extraSmall"
+            heading={(
+                <TextOutput
+                    value={projectTitle}
+                />
+            )}
+            headingDescription={(
+                <DateOutput
+                    className={styles.date}
+                    value={createdAt}
+                />
+            )}
+            headingClassName={styles.heading}
+            contentClassName={styles.content}
+            expansionTriggerArea="arrow"
+            onExpansionChange={onExpansionChange}
+            expanded={expanded}
+            withoutBorder
+        >
+            <div className={styles.inline}>
+                <TextOutput
+                    label="Users"
+                    value={numberOfUsers}
+                    hideLabelColon
+                />
+                <TextOutput
+                    label="Sources"
+                    value={numberOfLeads}
+                    hideLabelColon
+                />
+                <TextOutput
+                    label="Entries"
+                    value={numberOfEntries}
+                    hideLabelColon
+                />
+            </div>
+            {frameworkTitle && (
+                <FrameworkImageButton
+                    image={frameworkPreviewImage}
+                    label={frameworkTitle}
+                />
+            )}
+            {description && (
+                <div>
+                    {description}
+                </div>
+            )}
+        </ControlledExpandableContainer>
+    );
+}
+
+const keySelector = (d: ProjectDetail) => d.id;
+
+interface Props {
+    projectDetails?: ProjectDetail[];
+    page: number;
+    pageSize: number;
+    setPage: (page: number) => void;
+    setPageSize: (pageSize: number) => void;
+    onListCloseButtonClick: () => void;
+    totalCount: number;
+    projectDetailsPending: boolean;
+}
+
+function ProjectList(props: Props) {
+    const {
+        projectDetails,
+        projectDetailsPending,
+        page,
+        pageSize,
+        setPage,
+        setPageSize,
+        onListCloseButtonClick,
+        totalCount,
+    } = props;
+
+    const [
+        expandedProjectId,
+        setExpandedProjectId,
+    ] = useState<string | undefined>();
+
+    const handleExpansionChange = useCallback((projectExpanded: boolean, projectId: string) => {
+        setExpandedProjectId(projectExpanded ? projectId : undefined);
+    }, []);
+
+    const rendererParams = useCallback((_: string, datum: ProjectDetail): ProjectListProps => ({
+        projectId: datum?.id,
+        projectTitle: datum?.title,
+        description: datum?.description,
+        frameworkTitle: datum?.analysisFrameworkTitle ?? undefined,
+        frameworkPreviewImage: datum?.analysisFrameworkPreviewImage ?? undefined,
+        createdAt: datum?.createdAt ?? undefined,
+        numberOfEntries: datum?.numberOfEntries ?? 0,
+        numberOfLeads: datum?.numberOfLeads ?? 0,
+        numberOfUsers: datum?.numberOfUsers ?? 0,
+        onExpansionChange: handleExpansionChange,
+        expanded: expandedProjectId === datum.id,
+    }), [
+        handleExpansionChange,
+        expandedProjectId,
+    ]);
+
+    return (
+        <Container
+            className={styles.projectList}
+            heading={_cs('Projects: ', totalCount.toString())}
+            headingSize="small"
+            headerActions={(
+                <QuickActionButton
+                    name={undefined}
+                    onClick={onListCloseButtonClick}
+                    title="Close"
+                >
+                    <IoClose />
+                </QuickActionButton>
+            )}
+            spacing="loose"
+        >
+            <ListView
+                className={styles.list}
+                keySelector={keySelector}
+                data={projectDetails}
+                renderer={ListRenderer}
+                rendererParams={rendererParams}
+                // NOTE: Nothing to filter here
+                filtered={false}
+                pending={projectDetailsPending}
+                errored={false}
+                emptyIcon={(
+                    <Kraken
+                        variant="skydive"
+                    />
+                )}
+                emptyMessage="No projects found."
+                messageIconShown
+                messageShown
+            />
+            <Footer
+                className={styles.footer}
+            >
+                <Pager
+                    className={styles.pager}
+                    activePage={page}
+                    itemsCount={totalCount}
+                    maxItemsPerPage={pageSize}
+                    onActivePageChange={setPage}
+                    onItemsPerPageChange={setPageSize}
+                    itemsPerPageControlHidden
+                />
+            </Footer>
+        </Container>
+    );
+}
+
+export default ProjectList;
diff --git a/app/views/ExploreDeep/PublicMapView/ProjectList/styles.css b/app/views/ExploreDeep/PublicMapView/ProjectList/styles.css
new file mode 100644
index 0000000000..d9b8e8ff0c
--- /dev/null
+++ b/app/views/ExploreDeep/PublicMapView/ProjectList/styles.css
@@ -0,0 +1,55 @@
+.project-list {
+    display: flex;
+    position: absolute;
+    flex-direction: column;
+    justify-content: center;
+    z-index: 1;
+    border: var(--dui-width-separator-thin) solid var(--dui-color-separator);
+    background-color: var(--dui-color-foreground);
+    width: 100%;
+    max-width: 450px;
+    height: 100%;
+
+    .list {
+        display: flex;
+        flex-direction: column;
+        gap: var(--dui-spacing-small);
+
+        .project-container {
+            .heading {
+                color: var(--dui-color-brand);
+            }
+
+            .date {
+                line-height: 2;
+                color: var(--dui-color-text-description);
+                font-weight: var(--dui-font-weight-regular);
+            }
+
+            .content {
+                display: flex;
+                flex-direction: column;
+                gap: var(--dui-spacing-medium);
+            }
+        }
+    }
+
+    .footer {
+        display: flex;
+        flex-direction: column;
+        flex-wrap: wrap;
+        gap: unset;
+
+        .pager {
+            display: flex;
+            justify-content: center;
+            overflow: auto;
+        }
+    }
+
+    .inline {
+        display: flex;
+        justify-content: space-between;
+        margin: var(--dui-spacing-small) 0;
+    }
+}
diff --git a/app/views/ExploreDeep/PublicMapView/index.tsx b/app/views/ExploreDeep/PublicMapView/index.tsx
new file mode 100644
index 0000000000..f188add904
--- /dev/null
+++ b/app/views/ExploreDeep/PublicMapView/index.tsx
@@ -0,0 +1,301 @@
+import React, { useState, useCallback, useMemo } from 'react';
+import {
+    _cs,
+    isDefined,
+} from '@togglecorp/fujs';
+import { useQuery, gql } from '@apollo/client';
+import {
+    PendingMessage,
+} from '@the-deep/deep-ui';
+import Map, {
+    MapContainer,
+    MapSource,
+    MapLayer,
+} from '@togglecorp/re-map';
+import {
+    MapboxGeoJSONFeature,
+    LngLat,
+    MapboxOptions,
+} from 'mapbox-gl';
+
+import {
+    PublicProjectsByRegionQuery,
+    PublicProjectsByRegionQueryVariables,
+    PublicProjectDetailsForMapViewQuery,
+    PublicProjectDetailsForMapViewQueryVariables,
+    ProjectListQueryVariables,
+} from '#generated/types';
+import { convertDateToIsoDateTime } from '#utils/common';
+
+import ProjectList from './ProjectList';
+import styles from './styles.css';
+
+const sourceOptions: mapboxgl.GeoJSONSourceRaw & { clusterProperties: unknown } = {
+    type: 'geojson',
+    cluster: true,
+    clusterRadius: 100,
+    clusterProperties: {},
+};
+
+const white = '#ffffff';
+
+const clusterPointCirclePaint: mapboxgl.CirclePaint = {
+    'circle-radius': 16,
+    'circle-color': '#1a3ed0',
+};
+
+const clusterPointTextPaint: mapboxgl.SymbolPaint = {
+    'text-color': white,
+    'text-halo-width': 0,
+};
+
+const clusterPointTextLayout: mapboxgl.SymbolLayout = {
+    visibility: 'visible',
+    'symbol-sort-key': [
+        'case',
+        ['has', 'point_count'],
+        ['-', ['get', 'point_count']],
+        -1,
+    ],
+    'text-field': [
+        'case',
+        ['has', 'point_count'],
+        ['get', 'point_count_abbreviated'],
+        '1',
+    ],
+    'text-size': 15,
+};
+
+export const visibleLayout: mapboxgl.LineLayout = {
+    visibility: 'visible',
+};
+
+const mapOptions: Partial<MapboxOptions> = {
+    zoom: 2,
+    center: [50, 10],
+};
+
+const PROJECT_LIST = gql`
+    query PublicProjectsByRegion(
+        $projectFilter: RegionProjectFilterData,
+    ) {
+        publicProjectsByRegion(
+            projectFilter: $projectFilter,
+        ) {
+            results {
+                centroid
+                id
+                projectsId
+            }
+        }
+    }
+`;
+
+const PROJECT_DETAILS = gql`
+    query PublicProjectDetailsForMapView(
+        $projectIdList: [ID!]
+        $page: Int
+        $pageSize: Int
+    ) {
+        publicProjects(
+            ids: $projectIdList,
+            page: $page,
+            pageSize: $pageSize,
+        ) {
+            page
+            pageSize
+            totalCount
+            results {
+                id
+                title
+                description
+                createdAt
+                numberOfUsers
+                numberOfLeads
+                numberOfEntries
+                analysisFrameworkTitle
+                analysisFrameworkPreviewImage
+            }
+        }
+    }
+`;
+
+export type Project = NonNullable<NonNullable<NonNullable<PublicProjectsByRegionQuery['publicProjectsByRegion']>['results']>[number]>;
+
+interface Props {
+    className?: string;
+    filters: ProjectListQueryVariables | undefined;
+}
+
+function ExploreDeepMapView(props: Props) {
+    const {
+        className,
+        filters,
+    } = props;
+
+    // FIXME: rename startDate to createdAtGte
+    // FIXME: rename endDate to createdAtLte
+    const variables = useMemo(() => ({
+        projectFilter: {
+            ...filters,
+            startDate: convertDateToIsoDateTime(filters?.startDate),
+            endDate: convertDateToIsoDateTime(filters?.endDate, { endOfDay: true }),
+        },
+    }), [filters]);
+
+    const {
+        data,
+        loading,
+    } = useQuery<PublicProjectsByRegionQuery, PublicProjectsByRegionQueryVariables>(
+        PROJECT_LIST,
+        {
+            variables,
+        },
+    );
+
+    const [clickedFeatureProperties, setClickedFeatureProperties] = useState<string[]>([]);
+    const [clusterClicked, setClusterClicked] = useState(false);
+
+    const [page, setPage] = useState(1);
+    const [pageSize, setPageSize] = useState(5);
+
+    const projectDetailsVariables = useMemo(
+        () => ({
+            projectIdList: clickedFeatureProperties,
+            page,
+            pageSize,
+        }),
+        [clickedFeatureProperties, page, pageSize],
+    );
+
+    const {
+        previousData,
+        data: projectDetails = previousData,
+        loading: projectDetailsPending,
+    } = useQuery<PublicProjectDetailsForMapViewQuery, PublicProjectDetailsForMapViewQueryVariables>(
+        PROJECT_DETAILS,
+        {
+            variables: projectDetailsVariables,
+        },
+    );
+
+    const geoJson: GeoJSON.FeatureCollection<GeoJSON.Point> | undefined = useMemo(() => {
+        if (!data) {
+            return undefined;
+        }
+        const projects = data.publicProjectsByRegion?.results?.map((projectByRegion) => (
+            projectByRegion.projectsId?.map((project) => ({
+                id: project,
+                type: 'Feature' as const,
+                geometry: projectByRegion.centroid as GeoJSON.Point,
+                properties: {
+                    id: project,
+                    projectId: project,
+                },
+            }))
+        )).flat().filter(isDefined);
+
+        return ({
+            type: 'FeatureCollection',
+            features: projects ?? [],
+        });
+    }, [data]);
+
+    const handleClick = useCallback((
+        feature: MapboxGeoJSONFeature,
+        _: LngLat,
+        __: mapboxgl.Point,
+        map: mapboxgl.Map,
+    ) => {
+        interface ClusterProperties {
+
+            cluster_id: number;
+
+            point_count: number;
+        }
+
+        if (feature.properties) {
+            // eslint-disable-next-line camelcase
+            const { cluster_id, point_count } = feature.properties as ClusterProperties;
+            const clusterSource = map.getSource('region') as mapboxgl.GeoJSONSource;
+            if (clusterSource) {
+                clusterSource.getClusterLeaves(
+                    cluster_id,
+                    point_count,
+                    0,
+                    (___, aFeatures) => {
+                        if (aFeatures) {
+                            const projectIds = aFeatures
+                                .map((f) => f?.properties?.projectId)
+                                .filter(isDefined);
+                            setClickedFeatureProperties(projectIds);
+                        }
+                    },
+                );
+            }
+
+            if (feature.properties.projectId) {
+                setClickedFeatureProperties([feature.properties.projectId]);
+            } else {
+                setClickedFeatureProperties([]);
+            }
+        }
+        setClusterClicked(!clusterClicked);
+        return true;
+    }, [clusterClicked]);
+
+    const handleListClose = useCallback(() => {
+        setClusterClicked(false);
+    }, []);
+
+    return (
+        <div className={_cs(className, styles.mapView)}>
+            {clusterClicked && (
+                <ProjectList
+                    projectDetails={projectDetails?.publicProjects?.results ?? undefined}
+                    onListCloseButtonClick={handleListClose}
+                    page={page}
+                    pageSize={pageSize}
+                    setPage={setPage}
+                    setPageSize={setPageSize}
+                    projectDetailsPending={projectDetailsPending}
+                    totalCount={projectDetails?.publicProjects?.totalCount ?? 0}
+                />
+            )}
+            {loading && (<PendingMessage />)}
+            <Map
+                mapStyle={process.env.REACT_APP_MAPBOX_STYLE}
+                mapOptions={mapOptions}
+                scaleControlShown={false}
+                navControlShown={false}
+            >
+                <MapContainer className={styles.map} />
+                <MapSource
+                    sourceKey="region"
+                    sourceOptions={sourceOptions}
+                    geoJson={geoJson}
+                >
+                    <MapLayer
+                        layerKey="cases-cluster-background"
+                        layerOptions={{
+                            type: 'circle',
+                            paint: clusterPointCirclePaint,
+                            layout: visibleLayout,
+                        }}
+                        onClick={handleClick}
+                    />
+                    <MapLayer
+                        layerKey="cases-cluster-number"
+                        layerOptions={{
+                            type: 'symbol',
+                            paint: clusterPointTextPaint,
+                            layout: clusterPointTextLayout,
+                        }}
+                    />
+                </MapSource>
+            </Map>
+        </div>
+    );
+}
+
+export default ExploreDeepMapView;
diff --git a/app/views/ExploreDeep/PublicMapView/styles.css b/app/views/ExploreDeep/PublicMapView/styles.css
new file mode 100644
index 0000000000..9dbc1b283a
--- /dev/null
+++ b/app/views/ExploreDeep/PublicMapView/styles.css
@@ -0,0 +1,23 @@
+.map-view {
+    display: flex;
+    position: relative;
+    z-index: 0;
+
+    .map {
+        width: 100%;
+        height: 80vh;
+    }
+
+    :global {
+        .mapboxgl-popup {
+            width: 400px;
+            max-width: 400px !important;
+            height: calc(40vh - 100px);
+
+            .mapboxgl-popup-content {
+                overflow-y: auto !important;
+            }
+        }
+    }
+}
+
diff --git a/app/views/ExploreDeep/PublicTableView/index.tsx b/app/views/ExploreDeep/PublicTableView/index.tsx
new file mode 100644
index 0000000000..f46582acca
--- /dev/null
+++ b/app/views/ExploreDeep/PublicTableView/index.tsx
@@ -0,0 +1,179 @@
+import React, { useEffect, useMemo, useState } from 'react';
+import { useQuery, gql } from '@apollo/client';
+import { _cs } from '@togglecorp/fujs';
+import {
+    TableView,
+    Footer,
+    createStringColumn,
+    createNumberColumn,
+    Pager,
+} from '@the-deep/deep-ui';
+
+import {
+    PublicProjectListQuery,
+    PublicProjectListQueryVariables,
+} from '#generated/types';
+import {
+    convertDateToIsoDateTime,
+    isFiltered,
+} from '#utils/common';
+import { createDateColumn } from '#components/tableHelpers';
+
+import styles from './styles.css';
+
+const PROJECT_LIST = gql`
+    query PublicProjectList(
+        $search: String,
+        $organizations: [ID!],
+        $analysisFrameworks: [ID!],
+        $startDate: DateTime,
+        $endDate: DateTime,
+        $page: Int,
+        $pageSize: Int,
+
+    ) {
+        publicProjects(
+            search: $search,
+            organizations: $organizations,
+            analysisFrameworks: $analysisFrameworks,
+            createdAtLte: $endDate,
+            createdAtGte: $startDate,
+            page: $page,
+            pageSize: $pageSize,
+        ) {
+            results {
+                id
+                title
+                createdAt
+                regionsTitle
+                analysisFrameworkTitle
+                analysisFrameworkPreviewImage
+                numberOfLeads
+                numberOfUsers
+                organizationsTitle
+            }
+            totalCount
+        }
+    }
+`;
+export type Project = NonNullable<NonNullable<NonNullable<PublicProjectListQuery['publicProjects']>['results']>[number]>;
+
+const projectKeySelector = (p: Project) => p.id;
+
+interface Props {
+    className?: string;
+    filters: PublicProjectListQueryVariables | undefined;
+}
+
+function ExploreDeepTableView(props: Props) {
+    const {
+        className,
+        filters,
+    } = props;
+
+    const [page, setPage] = useState<number>(1);
+    const [pageSize, setPageSize] = useState<number>(25);
+
+    useEffect(() => {
+        // NOTE: Bring user back to page 1 if filters have changed
+        setPage(1);
+    }, [filters]);
+
+    // FIXME: rename startDate to createdAtGte
+    // FIXME: rename endDate to createdAtLte
+    const variables = useMemo(() => ({
+        ...filters,
+        startDate: convertDateToIsoDateTime(filters?.startDate),
+        endDate: convertDateToIsoDateTime(filters?.endDate, { endOfDay: true }),
+        page,
+        pageSize,
+    }), [page, pageSize, filters]);
+
+    const {
+        previousData,
+        data = previousData,
+        loading,
+    } = useQuery<PublicProjectListQuery, PublicProjectListQueryVariables>(
+        PROJECT_LIST,
+        {
+            variables,
+        },
+    );
+
+    const columns = useMemo(() => ([
+        createStringColumn<Project, string>(
+            'title',
+            'Title',
+            (item) => item.title,
+        ),
+        createStringColumn<Project, string>(
+            'location',
+            'Location',
+            (item) => item?.regionsTitle,
+        ),
+        createDateColumn<Project, string>(
+            'created_at',
+            'Created At',
+            (item) => item?.createdAt,
+            {
+                columnWidth: 116,
+            },
+        ),
+        createStringColumn<Project, string>(
+            'framework',
+            'Analytical Framework',
+            (item) => item?.analysisFrameworkTitle,
+        ),
+        createNumberColumn<Project, string>(
+            'members_count',
+            'Users',
+            (item) => item?.numberOfUsers,
+            {
+                columnWidth: 96,
+            },
+        ),
+        createNumberColumn<Project, string>(
+            'sources_count',
+            'Sources',
+            (item) => item?.numberOfLeads,
+            {
+                columnWidth: 96,
+            },
+        ),
+        createStringColumn<Project, string>(
+            'organizations',
+            'Organizations',
+            (item) => item?.organizationsTitle,
+        ),
+    ]), []);
+
+    return (
+        <>
+            <TableView
+                className={_cs(className, styles.table)}
+                columns={columns}
+                keySelector={projectKeySelector}
+                data={data?.publicProjects?.results}
+                filtered={isFiltered(filters)}
+                pending={loading}
+                errored={false}
+                messageShown
+                messageIconShown
+                emptyMessage="No projects to show."
+            />
+            <Footer
+                actions={(
+                    <Pager
+                        activePage={page}
+                        itemsCount={(data?.publicProjects?.totalCount) ?? 0}
+                        maxItemsPerPage={pageSize}
+                        onActivePageChange={setPage}
+                        onItemsPerPageChange={setPageSize}
+                    />
+                )}
+            />
+        </>
+    );
+}
+
+export default ExploreDeepTableView;
diff --git a/app/views/ExploreDeep/PublicTableView/styles.css b/app/views/ExploreDeep/PublicTableView/styles.css
new file mode 100644
index 0000000000..689deb8cf5
--- /dev/null
+++ b/app/views/ExploreDeep/PublicTableView/styles.css
@@ -0,0 +1,4 @@
+.table {
+    min-height: 30vh;
+    color: inherit;
+}
diff --git a/app/views/ExploreDeep/TableView/index.tsx b/app/views/ExploreDeep/TableView/index.tsx
index 2545120fe0..b84e10c276 100644
--- a/app/views/ExploreDeep/TableView/index.tsx
+++ b/app/views/ExploreDeep/TableView/index.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useMemo, useState } from 'react';
 import { useQuery, gql } from '@apollo/client';
+import { _cs } from '@togglecorp/fujs';
 import {
-    PendingMessage,
     TableView,
     Footer,
     TableColumn,
@@ -17,10 +17,15 @@ import {
     ProjectListQueryVariables,
 } from '#generated/types';
 import FrameworkImageButton, { Props as FrameworkImageButtonProps } from '#components/framework/FrameworkImageButton';
-import { convertDateToIsoDateTime } from '#utils/common';
+import {
+    convertDateToIsoDateTime,
+    isFiltered,
+} from '#utils/common';
 import { createDateColumn } from '#components/tableHelpers';
 import { organizationTitleSelector } from '#components/selections/NewOrganizationSelectInput';
+
 import ActionCell, { Props as ActionCellProps } from '../ActionCell';
+import styles from './styles.css';
 
 const PROJECT_LIST = gql`
     query ProjectList(
@@ -59,6 +64,7 @@ const PROJECT_LIST = gql`
                     numberOfLeads
                     numberOfUsers
                 }
+                isRejected
                 membershipPending
                 organizations {
                     id
@@ -110,7 +116,8 @@ function ExploreDeepTableView(props: Props) {
     }), [page, pageSize, filters]);
 
     const {
-        data,
+        previousData,
+        data = previousData,
         loading,
         refetch,
     } = useQuery<ProjectListQuery, ProjectListQueryVariables>(
@@ -149,6 +156,7 @@ function ExploreDeepTableView(props: Props) {
             cellRenderer: ActionCell,
             cellRendererParams: (projectId, project) => ({
                 projectId,
+                isRejected: project?.isRejected,
                 membershipPending: project?.membershipPending,
                 isMember: !!project?.currentUserRole,
                 onMemberStatusChange: refetch,
@@ -203,12 +211,17 @@ function ExploreDeepTableView(props: Props) {
 
     return (
         <>
-            {loading && (<PendingMessage />)}
             <TableView
-                className={className}
+                className={_cs(className, styles.table)}
                 columns={columns}
                 keySelector={projectKeySelector}
                 data={data?.projects?.results}
+                pending={loading}
+                filtered={isFiltered(filters)}
+                errored={false}
+                messageShown
+                messageIconShown
+                emptyMessage="No projects to show."
             />
             <Footer
                 actions={(
diff --git a/app/views/ExploreDeep/TableView/styles.css b/app/views/ExploreDeep/TableView/styles.css
index f8ca440223..689deb8cf5 100644
--- a/app/views/ExploreDeep/TableView/styles.css
+++ b/app/views/ExploreDeep/TableView/styles.css
@@ -1,3 +1,4 @@
 .table {
+    min-height: 30vh;
     color: inherit;
 }
diff --git a/app/views/ExploreDeep/index.tsx b/app/views/ExploreDeep/index.tsx
index 1de0940e5c..cb403a4602 100644
--- a/app/views/ExploreDeep/index.tsx
+++ b/app/views/ExploreDeep/index.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useCallback, useState } from 'react';
+import React, { useContext, useMemo, useCallback, useState } from 'react';
 import {
     _cs,
 } from '@togglecorp/fujs';
@@ -16,14 +16,15 @@ import {
     IoPersonSharp,
 } from 'react-icons/io5';
 import {
-    Tabs,
     PendingMessage,
     ListView,
+    Tabs,
     Tab,
     TabList,
     TabPanel,
     Card,
     Message,
+    Kraken,
     Container,
     InformationCard,
     CompactInformationCard,
@@ -34,12 +35,18 @@ import {
     ProjectListQueryVariables,
     ProjectExploreStatsQuery,
 } from '#generated/types';
+import SmartButtonLikeLink from '#base/components/SmartButtonLikeLink';
+import routes from '#base/configs/routes';
+import _ts from '#ts';
+import UserContext from '#base/context/UserContext';
 
 import ProjectFilterForm from './ProjectFilterForm';
 import ActiveProjectItem, { Props as ActiveProjectItemProps } from './ActiveProject';
 import ActiveFrameworkItem, { Props as ActiveFrameworkItemProps } from './ActiveFramework';
 import TableView from './TableView';
 import MapView from './MapView';
+import PublicTableView from './PublicTableView';
+import PublicMapView from './PublicMapView';
 
 import styles from './styles.css';
 
@@ -89,6 +96,7 @@ function ExploreDeep(props: Props) {
     } = useQuery<ProjectExploreStatsQuery>(
         PROJECT_EXPLORE_STATS,
     );
+    const { authenticated } = useContext(UserContext);
 
     const [filters, setFilters] = useState<ProjectListQueryVariables | undefined>(undefined);
 
@@ -116,96 +124,138 @@ function ExploreDeep(props: Props) {
     return (
         <Container
             className={_cs(styles.exploreDeep, className)}
+            contentClassName={styles.content}
+            headerClassName={styles.header}
+            headerActions={(
+                <SmartButtonLikeLink
+                    variant="primary"
+                    route={routes.projectCreate}
+                >
+                    {_ts('home', 'setupNewProjectButtonLabel')}
+                </SmartButtonLikeLink>
+            )}
+            headingSize="large"
             heading="Explore DEEP"
         >
             {loading && <PendingMessage />}
             <div className={styles.statsContainer}>
                 <div className={styles.leftContainer}>
-                    <InformationCard
-                        className={styles.infoItem}
-                        icon={<IoDocumentText />}
-                        label="Projects"
-                        value={data?.projectExploreStats?.totalProjects ?? 0}
-                        variant="complement1"
-                        coloredBackground
-                    />
-                    <InformationCard
-                        className={styles.infoItem}
-                        icon={<IoPersonSharp />}
-                        label="Active Users"
-                        value={data?.projectExploreStats?.totalUsers ?? 0}
-                        variant="accent"
-                        coloredBackground
-                    />
-                    <Card className={styles.playbackCard}>
-                        <Message message="DEEP tutorials go here" />
-                    </Card>
-                </div>
-                <div className={styles.midContainer}>
-                    <Card className={styles.statsByTimeContainer}>
-                        <CompactInformationCard
+                    <div className={styles.infoItemsContainer}>
+                        <InformationCard
                             className={styles.infoItem}
-                            icon={<IoBookmarks />}
-                            label="Sources added weekly"
-                            valuePrecision={2}
-                            value={data?.projectExploreStats?.leadsAddedWeekly ?? 0}
+                            icon={<IoDocumentText />}
+                            label="Projects"
+                            value={data?.projectExploreStats?.totalProjects ?? 0}
+                            variant="complement1"
+                            coloredBackground
                         />
-                        <CompactInformationCard
+                        <InformationCard
                             className={styles.infoItem}
-                            icon={<IoPricetag />}
-                            label="Daily average sources tagged per project"
-                            valuePrecision={2}
-                            value={
-                                data?.projectExploreStats?.dailyAverageLeadsTaggedPerProject ?? 0
-                            }
+                            icon={<IoPersonSharp />}
+                            label="Active Users"
+                            value={data?.projectExploreStats?.totalUsers ?? 0}
+                            variant="accent"
+                            coloredBackground
                         />
-                        <CompactInformationCard
-                            className={styles.infoItem}
-                            icon={<IoDocuments />}
-                            label="Generated reports monthly"
-                            valuePrecision={2}
-                            value={data?.projectExploreStats?.generatedExportsMonthly ?? 0}
-                        />
-                    </Card>
-                    <ContainerCard
-                        className={styles.frameworkContainer}
-                        heading="Top 5 most used frameworks"
-                        headingDescription="Last 3 months"
-                        spacing="none"
-                        headingSize="medium"
-                        borderBelowHeader
-                        borderBelowHeaderWidth="thin"
-                        inlineHeadingDescription
-                        headerClassName={styles.header}
-                        headingContainerClassName={styles.heading}
-                        contentClassName={styles.frameworkListContainer}
-                    >
-                        <ListView
-                            data={data?.projectExploreStats?.topActiveFrameworks ?? undefined}
-                            keySelector={activeFrameworkKeySelector}
-                            renderer={ActiveFrameworkItem}
-                            rendererParams={activeFrameworkRendererParams}
-                        />
-                    </ContainerCard>
+                        <Card className={styles.statsByTimeContainer}>
+                            <CompactInformationCard
+                                className={styles.infoItem}
+                                icon={<IoBookmarks />}
+                                label="Sources added weekly"
+                                valuePrecision={0}
+                                value={data?.projectExploreStats?.leadsAddedWeekly ?? 0}
+                            />
+                            <CompactInformationCard
+                                className={styles.infoItem}
+                                icon={<IoPricetag />}
+                                label="Daily average sources tagged per project"
+                                valuePrecision={0}
+                                value={
+                                    data
+                                        ?.projectExploreStats
+                                        ?.dailyAverageLeadsTaggedPerProject ?? 0
+                                }
+                            />
+                            <CompactInformationCard
+                                className={styles.infoItem}
+                                icon={<IoDocuments />}
+                                label="Generated reports monthly"
+                                valuePrecision={0}
+                                value={data?.projectExploreStats?.generatedExportsMonthly ?? 0}
+                            />
+                        </Card>
+                    </div>
+                    <div className={styles.playbackFrameworkContainer}>
+                        <Card className={styles.playbackCard}>
+                            <Message message="DEEP tutorials go here" />
+                        </Card>
+                        <ContainerCard
+                            className={styles.frameworkContainer}
+                            heading="Top 5 most used frameworks"
+                            headingDescription="Last 3 months"
+                            spacing="none"
+                            headingSize="small"
+                            borderBelowHeader
+                            borderBelowHeaderWidth="thin"
+                            inlineHeadingDescription
+                            headerClassName={styles.header}
+                            headingContainerClassName={styles.heading}
+                            contentClassName={styles.frameworkListContainer}
+                        >
+                            <ListView
+                                className={styles.list}
+                                data={data?.projectExploreStats?.topActiveFrameworks ?? undefined}
+                                keySelector={activeFrameworkKeySelector}
+                                renderer={ActiveFrameworkItem}
+                                rendererParams={activeFrameworkRendererParams}
+                                spacing="none"
+                                errored={false}
+                                filtered={false}
+                                pending={loading}
+                                emptyMessage="We couldn&apos;t find what you&apos;re looking for."
+                                emptyIcon={(
+                                    <Kraken
+                                        variant="work"
+                                    />
+                                )}
+                                messageIconShown
+                                messageShown
+                            />
+                        </ContainerCard>
+                    </div>
                 </div>
                 <ContainerCard
                     className={styles.rightContainer}
-                    heading="Top 5 most active project"
-                    headingDescription="Last 3 months"
-                    headingSize="medium"
-                    spacing="none"
                     headerClassName={styles.header}
                     headingContainerClassName={styles.heading}
+                    contentClassName={styles.projectListContainer}
+                    spacing="none"
+                    heading="Top 5 most active projects"
+                    headingDescription="Last 3 months"
+                    headingSize="small"
                     borderBelowHeader
                     borderBelowHeaderWidth="thin"
                     inlineHeadingDescription
-                    contentClassName={styles.projectListContainer}
                 >
                     <ListView
+                        className={styles.list}
                         data={projectList ?? undefined}
                         keySelector={activeProjectKeySelector}
                         renderer={ActiveProjectItem}
                         rendererParams={activeProjectsRendererParams}
+                        errored={false}
+                        spacing="none"
+                        pending={loading}
+                        // NOTE: Nothing to filter here
+                        filtered={false}
+                        emptyMessage="We couldn&apos;t find what you&apos;re looking for."
+                        emptyIcon={(
+                            <Kraken
+                                variant="work"
+                            />
+                        )}
+                        messageIconShown
+                        messageShown
                     />
                 </ContainerCard>
             </div>
@@ -213,43 +263,57 @@ function ExploreDeep(props: Props) {
                 useHash
                 defaultHash="table"
             >
-                <Container
-                    className={styles.tabsContainer}
-                    headerDescription={(
+                <div className={styles.tabsContainer}>
+                    <div className={styles.filtersContainer}>
                         <ProjectFilterForm
+                            className={styles.filters}
                             filters={filters}
                             onFiltersChange={setFilters}
                         />
-                    )}
-                    headerActions={(
-                        <TabList>
+                        <TabList className={styles.tabs}>
                             <Tab
                                 name="table"
+                                className={styles.tab}
                                 transparentBorder
                             >
                                 <IoList />
                             </Tab>
                             <Tab
                                 name="map"
+                                className={styles.tab}
                                 transparentBorder
                             >
                                 <IoMapOutline />
                             </Tab>
                         </TabList>
-                    )}
-                    spacing="compact"
-                >
-                    <TabPanel name="table">
-                        <TableView
-                            filters={filters}
-                        />
+                    </div>
+                    <TabPanel
+                        name="table"
+                    >
+                        {authenticated ? (
+                            <TableView
+                                filters={filters}
+                            />
+                        ) : (
+                            <PublicTableView
+                                filters={filters}
+                            />
+                        )}
                     </TabPanel>
-                    <TabPanel name="map">
-                        <MapView
-                            filters={filters}
-                        />
+                    <TabPanel
+                        name="map"
+                    >
+                        {authenticated ? (
+                            <MapView
+                                filters={filters}
+                            />
+                        ) : (
+                            <PublicMapView
+                                filters={filters}
+                            />
+                        )}
                     </TabPanel>
-                </Container>
+                </div>
             </Tabs>
         </Container>
     );
diff --git a/app/views/ExploreDeep/styles.css b/app/views/ExploreDeep/styles.css
index a120812485..f74da95924 100644
--- a/app/views/ExploreDeep/styles.css
+++ b/app/views/ExploreDeep/styles.css
@@ -1,69 +1,85 @@
 .explore-deep {
-    background-color: var(--dui-color-foreground);
-    padding: var(--dui-spacing-medium) var(--dui-spacing-super-large);
+    padding: var(--dui-spacing-medium) 0 0;
+
+    .header {
+        padding: 0 var(--dui-spacing-super-large);
+    }
+
+    .content {
+        display: flex;
+        flex-direction: column;
+        overflow: unset;
+        gap: var(--dui-spacing-large);
+    }
 
     .stats-container {
         display: flex;
+        padding: 0 var(--dui-spacing-super-large);
         min-height: 40vh;
         gap: var(--dui-spacing-large);
 
         .left-container {
             display: flex;
-            flex-basis: calc(100% / 3 - var(--dui-spacing-large));
-            flex-wrap: wrap;
+            flex-basis: calc(100% / 3 * 2 - var(--dui-spacing-large) / 2);
+            flex-direction: column;
             gap: var(--dui-spacing-large);
 
-            .info-item {
-                flex-basis: calc(100% / 2 - var(--dui-spacing-large));
-            }
+            .info-items-container {
+                display: flex;
+                gap: var(--dui-spacing-large);
 
-            .playback-card {
-                flex-basis: 100%;
-                border: var(--dui-width-separator-thin) solid var(--dui-color-separator);
-                height: 240px;
-            }
-        }
+                .info-item {
+                    flex-basis: calc(25% - var(--dui-spacing-large) / 3 * 2);
+                }
 
-        .header {
-            padding: var(--dui-spacing-medium);
+                .stats-by-time-container {
+                    display: flex;
+                    flex-basis: calc(50% - var(--dui-spacing-large) / 3);
+                    gap: var(--dui-spacing-large);
+                    border: var(--dui-width-separator-thin) solid var(--dui-color-separator);
 
-            .heading {
-                gap: var(--dui-spacing-medium);
+                    .info-item {
+                        flex-basis: calc(100% / 3 - var(--dui-spacing-large));
+                    }
+                }
             }
-        }
-
-        .mid-container {
-            display: flex;
-            flex-basis: calc(100% / 3 - var(--dui-spacing-large));
-            flex-direction: column;
-            gap: var(--dui-spacing-large);
 
-            .stats-by-time-container {
+            .playback-framework-container {
                 display: flex;
+                flex-grow: 1;
                 gap: var(--dui-spacing-large);
-                border: var(--dui-width-separator-thin) solid var(--dui-color-separator);
 
-                .info-item {
-                    flex-basis: calc(100% / 3 - var(--dui-spacing-large));
+                .playback-card {
+                    flex-basis: calc(50% - var(--dui-spacing-large) / 2);
+                    border: var(--dui-width-separator-thin) solid var(--dui-color-separator);
                 }
-            }
 
-            .framework-container {
-                display: flex;
-                border: var(--dui-width-separator-thin) solid var(--dui-color-separator);
-                height: 100%;
-                overflow-y: auto;
+                .framework-container {
+                    display: flex;
+                    flex-basis: calc(50% - var(--dui-spacing-large) / 2);
+                    border: var(--dui-width-separator-thin) solid var(--dui-color-separator);
+                    height: 100%;
+                    overflow-y: auto;
 
-                .framework-list-container {
-                    padding: 0;
-                    gap: var(--dui-spacing-large);
+                    .framework-list-container {
+                        padding: 0;
+                        gap: var(--dui-spacing-large);
+
+                    }
                 }
+            }
+        }
+
+        .header {
+            padding: var(--dui-spacing-medium);
 
+            .heading {
+                gap: var(--dui-spacing-medium);
             }
         }
 
         .right-container {
-            flex-basis: calc(100% / 3 - var(--dui-spacing-large));
+            flex-basis: calc(100% / 3 - var(--dui-spacing-large) / 2);
             border: var(--dui-width-separator-thin) solid var(--dui-color-separator);
 
             .project-list-container {
@@ -72,8 +88,34 @@
         }
     }
 
+    .list {
+        min-height: 100%;
+    }
+
     .tabs-container {
+        display: flex;
+        flex-direction: column;
+        flex-grow: 1;
         background-color: var(--dui-color-foreground);
-        padding: 0;
+        padding: 0 var(--dui-spacing-super-large) var(--dui-spacing-large);
+
+        .filters-container {
+            display: flex;
+            align-items: center;
+            gap: var(--dui-spacing-medium);
+
+            .filters {
+                flex-grow: 1;
+            }
+
+            .tabs {
+                flex-shrink: 0;
+
+                .tab {
+                    padding: var(--dui-spacing-small);
+                    font-size: var(--dui-font-size-extra-large);
+                }
+            }
+        }
     }
 }
diff --git a/app/views/FullPageErrorMessage/index.tsx b/app/views/FullPageErrorMessage/index.tsx
index 5ad6b5845c..bbc3db515f 100644
--- a/app/views/FullPageErrorMessage/index.tsx
+++ b/app/views/FullPageErrorMessage/index.tsx
@@ -1,17 +1,21 @@
 import React from 'react';
 import { _cs } from '@togglecorp/fujs';
 
-import { ButtonLikeLink } from '@the-deep/deep-ui';
+import {
+    ButtonLikeLink,
+    KrakenProps,
+    Kraken,
+    Svg,
+} from '@the-deep/deep-ui';
 
 import deepLogo from '#resources/img/deep-logo-new.svg';
-import Svg from '#components/Svg';
 
 import waterLevelImage from './water-level.png';
 import styles from './styles.css';
 
 interface Props {
     errorTitle?: string;
-    errorImage?: string;
+    krakenVariant?: KrakenProps['variant'];
     errorMessage?: React.ReactNode;
     className?: string;
 }
@@ -20,7 +24,7 @@ function FullPageErrorMessage(props: Props) {
     const {
         errorTitle,
         errorMessage,
-        errorImage,
+        krakenVariant,
         className,
     } = props;
 
@@ -38,10 +42,9 @@ function FullPageErrorMessage(props: Props) {
                     className={styles.backgroundImage}
                     alt=""
                 />
-                <img
+                <Kraken
                     className={styles.kraken}
-                    alt=""
-                    src={errorImage}
+                    variant={krakenVariant}
                 />
                 <div className={styles.content}>
                     <h2 className={styles.errorMessageTitle}>
diff --git a/app/views/FullPageErrorMessage/styles.css b/app/views/FullPageErrorMessage/styles.css
index fabf619172..fa6c6c8205 100644
--- a/app/views/FullPageErrorMessage/styles.css
+++ b/app/views/FullPageErrorMessage/styles.css
@@ -19,6 +19,7 @@ warning. very weird!
     display: flex;
     position: relative;
     flex-direction: column;
+    z-index: 0;
     background-color: var(--dui-color-foreground);
     width: 100vw;
     height: 100vh;
@@ -63,12 +64,14 @@ warning. very weird!
                 transform: scaleX(1);
             }
         }
+
         .kraken {
             display: block;
             position: absolute;
             top: -100px;
             right: 10vh;
             animation: wiggle 4s 1s linear infinite;
+            --height: 24rem;
         }
 
         .content {
diff --git a/app/views/Home/Activity/index.tsx b/app/views/Home/Activity/index.tsx
index 1d4e42eab6..16aafea858 100644
--- a/app/views/Home/Activity/index.tsx
+++ b/app/views/Home/Activity/index.tsx
@@ -1,9 +1,7 @@
 import React, { useMemo } from 'react';
-import { IoStatsChart } from 'react-icons/io5';
 import {
     _cs,
     compareDate,
-    listToGroupList,
 } from '@togglecorp/fujs';
 import {
     AreaChart,
@@ -15,23 +13,42 @@ import {
     ResponsiveContainer,
 } from 'recharts';
 
-import { Card } from '@the-deep/deep-ui';
+import {
+    Card,
+    Message,
+    Kraken,
+} from '@the-deep/deep-ui';
 
 import RechartsLegend from '#components/RechartsLegend';
 import { ProjectRecentActivity } from '#types';
+
 import styles from './styles.css';
 
+function mergeItems<T>(
+    list: T[],
+    keySelector: (a: T) => string | number,
+    merge: (a: T, b: T) => T,
+) {
+    const items: { [key: string]: T } = {
+    };
+    list.forEach((item) => {
+        const key = keySelector(item);
+        const oldItem = items[key];
+        if (oldItem) {
+            items[key] = merge(oldItem, item);
+        } else {
+            items[key] = item;
+        }
+    });
+    return Object.values(items);
+}
+
 const colorScheme = [
     '#a6aff4',
     '#796ec6',
     '#fb8a91',
 ];
 
-interface Props {
-    className?: string;
-    data?: ProjectRecentActivity;
-}
-
 const minTickFormatter = (value: number | string) => {
     const date = new Date(value);
     const format: Intl.DateTimeFormatOptions = {
@@ -49,43 +66,65 @@ const dateFormatter = (value: number | string) => {
     return date.toDateString();
 };
 
+interface Props {
+    className?: string;
+    data?: ProjectRecentActivity;
+}
+
 function Activity(props: Props) {
     const {
         className,
         data,
     } = props;
 
-    const projectList = useMemo(() => {
-        const sortedActivities = data?.activities.map((a) => ({
-            date: new Date(a.date).getTime(),
-            value: a.count,
-            project: a.project,
-        })).sort((a, b) => compareDate(a.date, b.date)) ?? [];
+    const areaData = useMemo(
+        () => {
+            const activitiesByDate: {
+                date: number;
+                [key: number]: number;
+            }[] = data?.activities.map((item) => ({
+                [+item.project]: item.count,
+                date: new Date(item.date).getTime(),
+            })) ?? [];
 
-        const groupedList = listToGroupList(sortedActivities, (d) => d.project, (d) => d);
-        return data?.projects.map((d) => ({
-            id: d.id,
-            title: d.title,
-            data: groupedList[d.id],
-        })) ?? [];
-    }, [data]);
+            // NOTE: using projectId as key to read multiple projects' count
+            return mergeItems(
+                activitiesByDate,
+                (item) => item.date,
+                (foo, bar) => ({
+                    ...foo,
+                    ...bar,
+                }),
+            ).sort((a, b) => compareDate(a.date, b.date));
+        },
+        [data?.activities],
+    );
 
     return (
         <Card className={_cs(className, styles.activity)}>
             <ResponsiveContainer className={styles.container}>
-                { (data?.activities?.length ?? 0) > 0 ? (
-                    <AreaChart>
+                {(areaData.length > 0) ? (
+                    <AreaChart data={areaData}>
                         <defs>
                             {colorScheme.map((color) => (
                                 <linearGradient
+                                    key={color}
                                     id={`${color.substring(1)}-gradient`}
                                     x1="0"
                                     y1="0"
                                     x2="0"
                                     y2="1"
                                 >
-                                    <stop offset="5%" stopColor={color} stopOpacity={0.2} />
-                                    <stop offset="95%" stopColor={color} stopOpacity={0} />
+                                    <stop
+                                        offset="5%"
+                                        stopColor={color}
+                                        stopOpacity={0.2}
+                                    />
+                                    <stop
+                                        offset="95%"
+                                        stopColor={color}
+                                        stopOpacity={0}
+                                    />
                                 </linearGradient>
                             ))}
                         </defs>
@@ -100,10 +139,7 @@ function Activity(props: Props) {
                             interval="preserveStartEnd"
                             padding={{ left: 10, right: 10 }}
                         />
-                        <YAxis
-                            dataKey="value"
-                            hide
-                        />
+                        <YAxis hide />
                         <Tooltip
                             labelFormatter={dateFormatter}
                             isAnimationActive={false}
@@ -113,16 +149,15 @@ function Activity(props: Props) {
                             align="left"
                             content={RechartsLegend}
                         />
-                        {projectList.map((p, index) => {
+                        {data?.projects.map((p, index) => {
                             const color = colorScheme[index % colorScheme.length];
                             const fillColorScheme = `${color.substring(1)}-gradient`;
 
                             return (
                                 <Area
-                                    key={p.id}
-                                    data={p.data}
+                                    key={String(p.id)}
                                     name={p.title}
-                                    dataKey="value"
+                                    dataKey={String(p.id)}
                                     stroke={color}
                                     fillOpacity={1}
                                     fill={`url(#${fillColorScheme})`}
@@ -134,15 +169,12 @@ function Activity(props: Props) {
                         })}
                     </AreaChart>
                 ) : (
-                    <div className={styles.emptyChart}>
-                        <IoStatsChart
-                            className={styles.icon}
-                        />
-                        <div className={styles.text}>
-                            {/* FIXME: use strings with appropriate wording */}
-                            Chart not available
-                        </div>
-                    </div>
+                    <Message
+                        icon={
+                            <Kraken variant="sleep" />
+                        }
+                        message="Chart not available"
+                    />
                 )}
             </ResponsiveContainer>
         </Card>
diff --git a/app/views/Home/Activity/styles.css b/app/views/Home/Activity/styles.css
index 7b71f608c5..cf30e967f3 100644
--- a/app/views/Home/Activity/styles.css
+++ b/app/views/Home/Activity/styles.css
@@ -10,24 +10,4 @@
         width: 100%;
         overflow-y: none;
     }
-
-    .empty-chart {
-        display: flex;
-        align-items: center;
-        flex-direction: column;
-        flex-grow: 1;
-        justify-content: center;
-        color: var(--dui-color-text-watermark);
-
-        .icon {
-            flex-shrink: 0;
-            padding: var(--dui-spacing-small);
-            font-size: 10em;
-        }
-
-        .text {
-            padding: var(--dui-spacing-small);
-            font-size: var(--dui-font-size-large);
-        }
-    }
 }
diff --git a/app/views/Home/Assignment/AssignmentItem/index.tsx b/app/views/Home/Assignment/AssignmentItem/index.tsx
index 1ba53cc26d..64e276638f 100644
--- a/app/views/Home/Assignment/AssignmentItem/index.tsx
+++ b/app/views/Home/Assignment/AssignmentItem/index.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import React, { useMemo, useCallback } from 'react';
 import { IoCheckmarkCircle } from 'react-icons/io5';
 import { generatePath } from 'react-router-dom';
 import {
@@ -9,8 +9,7 @@ import {
 } from '@the-deep/deep-ui';
 
 import { Assignment } from '#types';
-
-import _ts from '#ts';
+import generateString from '#utils/string';
 import routes from '#base/configs/routes';
 
 import styles from './styles.css';
@@ -27,6 +26,7 @@ function AssignmentItem(props: AssignmentItemProps) {
         markAsDonePending,
         createdByDetails,
         contentObjectDetails,
+        contentObjectType,
         projectDetails,
         createdAt,
     } = props;
@@ -35,6 +35,58 @@ function AssignmentItem(props: AssignmentItemProps) {
         handleClickFromProps(id);
     }, [id, handleClickFromProps]);
 
+    const contentLink = useMemo(() => {
+        if (contentObjectType === 'lead') {
+            return (generateString(
+                'lead {link}',
+                {
+                    link: (contentObjectDetails?.id && projectDetails?.id && (
+                        <Link
+                            to={generatePath(routes.entryEdit.path, {
+                                projectId: projectDetails.id,
+                                leadId: contentObjectDetails.id,
+                            })}
+                            className={styles.link}
+                        >
+                            {contentObjectDetails.title}
+                        </Link>
+                    )),
+                },
+            ));
+        }
+        if (contentObjectType === 'entryreviewcomment' || contentObjectType === 'entrycomment') {
+            if (!projectDetails?.id && contentObjectDetails?.lead) {
+                return (
+                    <span>
+                        an entry
+                    </span>
+                );
+            }
+            const editEntryLink = {
+                pathname: (generatePath(routes.entryEdit.path, {
+                    projectId: projectDetails.id,
+                    leadId: contentObjectDetails.lead,
+                })),
+                state: {
+                    entryId: contentObjectDetails.entry,
+                },
+            };
+            return (
+                <Link
+                    className={styles.link}
+                    to={editEntryLink}
+                >
+                    an entry
+                </Link>
+            );
+        }
+        return null;
+    }, [
+        contentObjectType,
+        contentObjectDetails,
+        projectDetails,
+    ]);
+
     return (
         <Element
             className={styles.assignmentItem}
@@ -53,28 +105,24 @@ function AssignmentItem(props: AssignmentItemProps) {
             childrenContainerClassName={styles.mainContent}
         >
             <div className={styles.description}>
-                {createdByDetails.displayName}
-                &nbsp;
-                {_ts('assignment', 'assignedYou')}
-                &nbsp;
-                <Link
-                    to={generatePath(routes.entryEdit.path, {
-                        projectId: projectDetails?.id,
-                        leadId: contentObjectDetails?.id,
-                    })}
-                    className={styles.link}
-                >
-                    {contentObjectDetails?.title}
-                </Link>
-                &nbsp;
-                {_ts('assignment', 'in')}
-                &nbsp;
-                <Link
-                    to={generatePath(routes.tagging.path, { projectId: projectDetails?.id })}
-                    className={styles.link}
-                >
-                    {projectDetails?.title}
-                </Link>
+                {generateString(
+                    '{createdByName} assigned you to {linkToItem} in {project}.',
+                    {
+                        createdByName: createdByDetails.displayName,
+                        linkToItem: contentLink,
+                        project: (
+                            <Link
+                                to={generatePath(
+                                    routes.tagging.path,
+                                    { projectId: projectDetails?.id },
+                                )}
+                                className={styles.link}
+                            >
+                                {projectDetails?.title}
+                            </Link>
+                        ),
+                    },
+                )}
             </div>
             <DateOutput
                 className={styles.createdDate}
diff --git a/app/views/Home/Assignment/AssignmentItem/styles.css b/app/views/Home/Assignment/AssignmentItem/styles.css
index f4049b8b90..2463d283cc 100644
--- a/app/views/Home/Assignment/AssignmentItem/styles.css
+++ b/app/views/Home/Assignment/AssignmentItem/styles.css
@@ -10,17 +10,10 @@
         gap: var(--dui-spacing-small);
 
         .description {
-            display: inline-block;
-
-            >* {
-                display: inline;
-                padding: 0;
-                word-break: break-all;
-
-                >* {
-                    display: inline;
-                    padding: 0;
-                }
+            .link {
+                display: inline-block;
+                color: var(--dui-color-brand);
+                font-weight: var(--dui-font-weight-bold);
             }
         }
 
@@ -29,11 +22,6 @@
             color: var(--dui-color-text-label);
             font-size: var(--dui-font-size-small);
         }
-
-        .link {
-            color: var(--dui-color-brand);
-            font-weight: var(--dui-font-weight-bold);
-        }
     }
 
     .mark-as-done-button {
diff --git a/app/views/Home/Assignment/index.tsx b/app/views/Home/Assignment/index.tsx
index 46ee36fa7c..a74acd9caa 100644
--- a/app/views/Home/Assignment/index.tsx
+++ b/app/views/Home/Assignment/index.tsx
@@ -1,9 +1,8 @@
 import React, { useState, useCallback, useMemo } from 'react';
 import {
     Container,
-    Button,
+    ConfirmButton,
     Pager,
-    Card,
     ListView,
 } from '@the-deep/deep-ui';
 import { IoCheckmarkDone } from 'react-icons/io5';
@@ -48,7 +47,7 @@ function Assignments() {
             url: 'server://assignments/',
             method: 'GET',
             query: assignmentsQuery,
-            failureHeader: _ts('assignment', 'assignmentListFetchFailed'),
+            preserveResponse: true,
         },
     );
 
@@ -63,7 +62,7 @@ function Assignments() {
             onSuccess: () => {
                 getAssignments();
             },
-            failureHeader: _ts('assignment', 'markAsDoneFailed'),
+            failureMessage: _ts('assignment', 'markAsDoneFailed'),
         },
     );
 
@@ -78,7 +77,7 @@ function Assignments() {
             onSuccess: () => {
                 getAssignments();
             },
-            failureHeader: _ts('assignment', 'markBulkAsDoneFailed'),
+            failureMessage: _ts('assignment', 'markBulkAsDoneFailed'),
         },
     );
 
@@ -100,15 +99,16 @@ function Assignments() {
             heading={_ts('assignment', 'myAssignments')}
             headerActions={(
                 assignmentsResponse && assignmentsResponse.count > 0 && (
-                    <Button
+                    <ConfirmButton
                         name={undefined}
-                        onClick={handleBulkActionClick}
+                        onConfirm={handleBulkActionClick}
+                        message="Are you sure you want to clear all your assignments? This cannot be undone."
                         disabled={bulkPending}
                         variant="action"
                         title={_ts('assignment', 'markAllAsDone')}
                     >
                         <IoCheckmarkDone />
-                    </Button>
+                    </ConfirmButton>
                 )
             )}
             className={styles.assignments}
@@ -124,17 +124,22 @@ function Assignments() {
                     hidePrevAndNext
                 />
             )}
+            contentClassName={styles.content}
         >
-            <Card className={styles.content}>
-                <ListView
-                    data={assignmentsResponse?.results}
-                    keySelector={keySelector}
-                    renderer={AssignmentItem}
-                    rendererParams={rendererParams}
-                    emptyMessage="You do not have any assignments."
-                    pending={pending}
-                />
-            </Card>
+            <ListView
+                className={styles.assignmentList}
+                data={assignmentsResponse?.results}
+                keySelector={keySelector}
+                renderer={AssignmentItem}
+                rendererParams={rendererParams}
+                emptyMessage="You do not have any assignments."
+                pending={pending}
+                errored={false}
+                // NOTE: Nothing to filter here
+                filtered={false}
+                messageIconShown
+                messageShown
+            />
         </Container>
     );
 }
diff --git a/app/views/Home/Assignment/styles.css b/app/views/Home/Assignment/styles.css
index f62b17fc2d..e163d69475 100644
--- a/app/views/Home/Assignment/styles.css
+++ b/app/views/Home/Assignment/styles.css
@@ -4,11 +4,19 @@
 
     .content {
         display: flex;
-        position: relative;
         flex-direction: column;
+        border-radius: var(--dui-border-radius-card);
         background-color: var(--dui-color-background-information);
+        padding: var(--dui-spacing-medium);
         height: calc(10em + 25vh);
         overflow-y: auto;
-        gap: var(--dui-spacing-medium);
+
+        .assignment-list {
+            display: flex;
+            position: relative;
+            flex-direction: column;
+            flex-grow: 1;
+            gap: var(--dui-spacing-medium);
+        }
     }
 }
diff --git a/app/views/Home/ProjectItem/index.tsx b/app/views/Home/ProjectItem/index.tsx
index dd0664ace5..d7afd5683e 100644
--- a/app/views/Home/ProjectItem/index.tsx
+++ b/app/views/Home/ProjectItem/index.tsx
@@ -27,6 +27,8 @@ import {
     TextOutput,
     DateOutput,
     DateRangeOutput,
+    Message,
+    Kraken,
 } from '@the-deep/deep-ui';
 
 import SmartButtonLikeLink from '#base/components/SmartButtonLikeLink';
@@ -73,10 +75,10 @@ export interface RecentProjectItemProps {
     totalUsers: number | null | undefined;
     totalSources: number | null | undefined;
     totalSourcesTagged: number | null | undefined;
-    totalSourcesValidated: number | null | undefined;
+    totalSourcesInProgress: number | null | undefined;
     entriesActivity: DateCountType[] | null | undefined;
-    topTaggers: UserEntityCountType[] | null | [] | undefined;
-    topSourcers: UserEntityCountType[] | null | [] | undefined;
+    topTaggers: UserEntityCountType[] | null | undefined;
+    topSourcers: UserEntityCountType[] | null | undefined;
     allowedPermissions: ProjectPermission[] | null | undefined;
 }
 
@@ -95,14 +97,14 @@ function ProjectItem(props: RecentProjectItemProps) {
         totalUsers,
         totalSources = 0,
         totalSourcesTagged = 0,
-        totalSourcesValidated = 0,
+        totalSourcesInProgress = 0,
         topTaggers,
         topSourcers,
         entriesActivity,
         allowedPermissions,
     } = props;
 
-    const topTaggersRendererParams = useCallback((_, data) => ({
+    const topTaggersRendererParams = useCallback((_: unknown, data: UserEntityCountType) => ({
         className: styles.recentlyActiveItem,
         label: data.name,
         labelContainerClassName: styles.recentlyActiveUserName,
@@ -110,14 +112,14 @@ function ProjectItem(props: RecentProjectItemProps) {
         value: (
             <DateOutput
                 className={styles.recentActivityDate}
-                // FIXME: Remove this fallback
-                value={data.date ?? Date.now()}
+                // FIXME: Get this information from server
+                value={null}
                 format="hh:mm aaa, MMM dd, yyyy"
             />
         ),
     }), []);
 
-    const userStatsRendererParams = useCallback((_, data) => ({
+    const userStatsRendererParams = useCallback((_: unknown, data: UserEntityCountType) => ({
         className: styles.recentlyActiveItem,
         label: data.name,
         labelContainerClassName: styles.recentlyActiveUserName,
@@ -240,7 +242,7 @@ function ProjectItem(props: RecentProjectItemProps) {
                             valueContainerClassName={styles.recentlyActiveList}
                             value={(
                                 <List
-                                    data={topTaggers ?? []}
+                                    data={topTaggers ?? undefined}
                                     keySelector={topUserKeySelector}
                                     rendererParams={topTaggersRendererParams}
                                     renderer={TextOutput}
@@ -256,7 +258,7 @@ function ProjectItem(props: RecentProjectItemProps) {
                                     valueContainerClassName={styles.recentlyActiveList}
                                     value={(
                                         <List
-                                            data={topTaggers ?? []}
+                                            data={topTaggers ?? undefined}
                                             keySelector={topUserKeySelector}
                                             rendererParams={userStatsRendererParams}
                                             renderer={TextOutput}
@@ -270,7 +272,7 @@ function ProjectItem(props: RecentProjectItemProps) {
                                     valueContainerClassName={styles.recentlyActiveList}
                                     value={(
                                         <List
-                                            data={topSourcers ?? []}
+                                            data={topSourcers ?? undefined}
                                             keySelector={topUserKeySelector}
                                             rendererParams={userStatsRendererParams}
                                             renderer={TextOutput}
@@ -294,21 +296,21 @@ function ProjectItem(props: RecentProjectItemProps) {
                 />
                 <Card className={styles.progressLines}>
                     <ProgressLine
-                        progress={((totalSourcesValidated ?? 0) / (totalSources ?? 0)) * 100}
-                        title={_ts('home.recentProjects', 'sourcesTaggedValidatedLabel')}
+                        progress={((totalSourcesTagged ?? 0) / (totalSources ?? 0)) * 100}
+                        title="Sources tagged"
                         variant="complement1"
                     />
                     <ProgressLine
-                        progress={((totalSourcesTagged ?? 0) / (totalSources ?? 0)) * 100}
-                        title={_ts('home.recentProjects', 'sourcesTaggedLabel')}
+                        progress={((totalSourcesInProgress ?? 0) / (totalSources ?? 0)) * 100}
+                        title="Sources in progress"
                         variant="complement2"
                     />
                     <ProgressLine
                         progress={
                             // eslint-disable-next-line max-len
-                            (((totalSources ?? 0) - (totalSourcesTagged ?? 0)) / (totalSources ?? 0)) * 100
+                            (((totalSources ?? 0) - (totalSourcesTagged ?? 0) - (totalSourcesInProgress ?? 0)) / (totalSources ?? 0)) * 100
                         }
-                        title={_ts('home.recentProjects', 'sourcesUntaggedLabel')}
+                        title="Sources not tagged"
                         variant="complement3"
                     />
                 </Card>
@@ -319,36 +321,48 @@ function ProjectItem(props: RecentProjectItemProps) {
                     headingSize="extraSmall"
                 >
                     <ResponsiveContainer className={styles.responsiveContainer}>
-                        <AreaChart data={convertedProjectActivity}>
-                            <defs>
-                                <linearGradient id="entriesActivity" x1="0" y1="0" x2="0" y2="1">
-                                    <stop offset="5%" stopColor="var(--dui-color-accent)" stopOpacity={0.2} />
-                                    <stop offset="95%" stopColor="var(--dui-color-accent)" stopOpacity={0} />
-                                </linearGradient>
-                            </defs>
-                            <XAxis
-                                dataKey="date"
-                                type="number"
-                                domain={['dataMin', 'dataMax']}
-                                tick={{ strokeWidth: 1 }}
-                                tickFormatter={minTickFormatter}
-                                padding={{ left: 10, right: 10 }}
-                            />
-                            <YAxis hide />
-                            <Tooltip
-                                labelFormatter={tickFormatter}
-                                isAnimationActive={false}
-                            />
-                            <Area
-                                dataKey="count"
-                                stroke="var(--dui-color-accent)"
-                                fillOpacity={1}
-                                fill="url(#entriesActivity)"
-                                strokeWidth={2}
-                                connectNulls
-                                activeDot
+                        {((convertedProjectActivity?.length ?? 0) > 0) ? (
+                            <AreaChart data={convertedProjectActivity}>
+                                <defs>
+                                    <linearGradient id="entriesActivity" x1="0" y1="0" x2="0" y2="1">
+                                        <stop offset="5%" stopColor="var(--dui-color-accent)" stopOpacity={0.2} />
+                                        <stop offset="95%" stopColor="var(--dui-color-accent)" stopOpacity={0} />
+                                    </linearGradient>
+                                </defs>
+                                <XAxis
+                                    dataKey="date"
+                                    type="number"
+                                    scale="time"
+                                    domain={['dataMin', 'dataMax']}
+                                    allowDuplicatedCategory={false}
+                                    tick={{ strokeWidth: 1 }}
+                                    tickFormatter={minTickFormatter}
+                                    interval="preserveStartEnd"
+                                    padding={{ left: 10, right: 10 }}
+                                />
+                                <YAxis hide />
+                                <Tooltip
+                                    labelFormatter={tickFormatter}
+                                    isAnimationActive={false}
+                                />
+                                <Area
+                                    dataKey="count"
+                                    stroke="var(--dui-color-accent)"
+                                    fillOpacity={1}
+                                    fill="url(#entriesActivity)"
+                                    strokeWidth={2}
+                                    connectNulls
+                                    activeDot
+                                />
+                            </AreaChart>
+                        ) : (
+                            <Message
+                                icon={
+                                    <Kraken variant="sleep" />
+                                }
+                                message="This project does not have any activity."
                             />
-                        </AreaChart>
+                        )}
                     </ResponsiveContainer>
                 </ContainerCard>
             </div>
diff --git a/app/views/Home/ProjectItem/styles.css b/app/views/Home/ProjectItem/styles.css
index 6f36810d77..61c9bc9a65 100644
--- a/app/views/Home/ProjectItem/styles.css
+++ b/app/views/Home/ProjectItem/styles.css
@@ -96,8 +96,7 @@
 
                     .responsive-container {
                         flex-grow: 1;
-                        width: 100%;
-                        overflow: auto;
+                        overflow: hidden;
                     }
                 }
             }
diff --git a/app/views/Home/RecentActivity/ActivityItem/index.tsx b/app/views/Home/RecentActivity/ActivityItem/index.tsx
index 46c01f9eac..fa3f6c4574 100644
--- a/app/views/Home/RecentActivity/ActivityItem/index.tsx
+++ b/app/views/Home/RecentActivity/ActivityItem/index.tsx
@@ -5,17 +5,22 @@ import {
 } from '@the-deep/deep-ui';
 
 import Avatar from '#components/Avatar';
-
-import _ts from '#ts';
+import generateString from '#utils/string';
 
 import styles from './styles.css';
 
+const activityTypeMap = {
+    lead: 'a lead',
+    entry: 'an entry',
+    'entry-comment': 'a comment to an entry',
+};
+
 interface RecentActivityProps {
     projectDisplayName: string;
     createdAt: string;
     createdByDisplayName: string;
     createdByDisplayPicture?: string;
-    type: string;
+    type: 'lead' | 'entry' | 'entry-comment';
 }
 
 function ActivityItem(props: RecentActivityProps) {
@@ -33,24 +38,29 @@ function ActivityItem(props: RecentActivityProps) {
             icons={(
                 <Avatar
                     className={styles.displayPicture}
-                    src={createdByDisplayPicture}
+                    src={createdByDisplayPicture ?? undefined}
+                    name={createdByDisplayName}
                 />
             )}
             childrenContainerClassName={styles.mainContent}
         >
             <div className={styles.description}>
-                <span className={styles.boldText}>
-                    {createdByDisplayName}
-                </span>
-                &nbsp;
-                {(type === 'lead'
-                    ? _ts('recentActivity', 'leadAdded')
-                    : _ts('recentActivity', 'entryCommentAdded')
+                {generateString(
+                    '{createdByDisplayName} added {type} on {projectDisplayName}.',
+                    {
+                        createdByDisplayName: (
+                            <span className={styles.boldText}>
+                                {createdByDisplayName}
+                            </span>
+                        ),
+                        type: activityTypeMap[type],
+                        projectDisplayName: (
+                            <span className={styles.boldText}>
+                                {projectDisplayName}
+                            </span>
+                        ),
+                    },
                 )}
-                &nbsp;
-                <span className={styles.boldText}>
-                    {projectDisplayName}
-                </span>
             </div>
             <DateOutput
                 className={styles.createdDate}
diff --git a/app/views/Home/RecentActivity/ActivityItem/styles.css b/app/views/Home/RecentActivity/ActivityItem/styles.css
index 3f179f891f..6398196fb3 100644
--- a/app/views/Home/RecentActivity/ActivityItem/styles.css
+++ b/app/views/Home/RecentActivity/ActivityItem/styles.css
@@ -41,8 +41,4 @@
             font-weight: var(--dui-font-weight-bold);
         }
     }
-
-    &:hover {
-        background-color: var(--dui-color-background-hover);
-    }
 }
diff --git a/app/views/Home/RecentActivity/index.tsx b/app/views/Home/RecentActivity/index.tsx
index 392f78ff81..eadfc1aba7 100644
--- a/app/views/Home/RecentActivity/index.tsx
+++ b/app/views/Home/RecentActivity/index.tsx
@@ -1,6 +1,5 @@
 import React, { useCallback } from 'react';
 import {
-    Card,
     Container,
     ListView,
 } from '@the-deep/deep-ui';
@@ -24,7 +23,6 @@ function RecentActivities() {
     } = useRequest<MultiResponse<RecentActivityItem>>({
         url: 'server://projects/recent-activities/',
         method: 'GET',
-        failureHeader: _ts('recentActivity', 'recentActivitiesFetchFailed'),
     });
 
     const activityRendererParams = useCallback((_: string, info: RecentActivityItem) => ({
@@ -40,18 +38,21 @@ function RecentActivities() {
         <Container
             className={styles.recentActivity}
             heading={_ts('recentActivity', 'recentActivitiesHeading')}
+            contentClassName={styles.content}
         >
-            <Card className={styles.content}>
-                <ListView
-                    className={styles.activities}
-                    data={recentActivitiesResponse?.results}
-                    renderer={ActivityItem}
-                    keySelector={keySelector}
-                    rendererParams={activityRendererParams}
-                    pending={pending}
-                    emptyMessage="You do not have any recent activity"
-                />
-            </Card>
+            <ListView
+                className={styles.activities}
+                data={recentActivitiesResponse?.results}
+                renderer={ActivityItem}
+                keySelector={keySelector}
+                rendererParams={activityRendererParams}
+                pending={pending}
+                filtered={false}
+                errored={false}
+                emptyMessage="You do not have any recent activities."
+                messageIconShown
+                messageShown
+            />
         </Container>
     );
 }
diff --git a/app/views/Home/RecentActivity/styles.css b/app/views/Home/RecentActivity/styles.css
index a977568213..46f7a9a4e7 100644
--- a/app/views/Home/RecentActivity/styles.css
+++ b/app/views/Home/RecentActivity/styles.css
@@ -3,14 +3,19 @@
     padding: 0;
 
     .content {
+        display: flex;
+        flex-direction: column;
+        border-radius: var(--dui-border-radius-card);
         background-color: var(--dui-color-background-information);
-        max-height: calc(10em + 25vh);
+        padding: var(--dui-spacing-medium);
+        height: calc(10em + 25vh);
         overflow-y: auto;
 
         .activities {
             display: flex;
             position: relative;
             flex-direction: column;
+            min-height: 100%;
             gap: var(--dui-spacing-medium);
         }
     }
diff --git a/app/views/Home/index.tsx b/app/views/Home/index.tsx
index a04c309d4d..93c50e7fa6 100644
--- a/app/views/Home/index.tsx
+++ b/app/views/Home/index.tsx
@@ -2,15 +2,12 @@ import React, { useState, useMemo, useCallback } from 'react';
 import {
     _cs,
 } from '@togglecorp/fujs';
-import { generatePath } from 'react-router-dom';
 import { useQuery, gql } from '@apollo/client';
 import {
-    ButtonLikeLink,
     Container,
-    PendingMessage,
     ListView,
+    Kraken,
 } from '@the-deep/deep-ui';
-import { GiShrug } from 'react-icons/gi';
 
 import { useRequest } from '#base/utils/restRequest';
 
@@ -27,6 +24,7 @@ import {
     FetchProjectQueryVariables,
 } from '#generated/types';
 
+import SmartButtonLikeLink from '#base/components/SmartButtonLikeLink';
 import { ProjectsSummary } from '#types';
 
 import ProjectItem, { RecentProjectItemProps } from './ProjectItem';
@@ -174,12 +172,10 @@ function Home(props: ViewProps) {
     );
 
     const {
-        pending: summaryPending,
         response: summaryResponse,
     } = useRequest<ProjectsSummary>({
         url: 'server://projects-stat/summary/',
         method: 'GET',
-        failureHeader: _ts('home', 'summaryOfMyProjectsHeading'),
     });
 
     const recentProjectsRendererParams = useCallback(
@@ -195,8 +191,8 @@ function Home(props: ViewProps) {
             analysisFramework: data?.analysisFramework?.id,
             totalUsers: data?.stats?.numberOfUsers,
             totalSources: data?.stats?.numberOfLeads,
-            totalSourcesTagged: data?.stats?.numberOfLeadsInProgress,
-            totalSourcesValidated: data?.stats?.numberOfLeadsTagged,
+            totalSourcesInProgress: data?.stats?.numberOfLeadsInProgress,
+            totalSourcesTagged: data?.stats?.numberOfLeadsTagged,
             entriesActivity: data?.stats?.entriesActivity,
             topTaggers: data?.topTaggers,
             topSourcers: data?.topSourcers,
@@ -205,10 +201,6 @@ function Home(props: ViewProps) {
         [],
     );
 
-    const pageDataPending = summaryPending
-    || recentProjectsPending
-    || selectedProjectPending;
-
     const recentProjects: ProjectDetail[] | undefined = useMemo(() => {
         if (selectedProject && selectedProjectResponse?.project) {
             return [selectedProjectResponse.project];
@@ -231,7 +223,6 @@ function Home(props: ViewProps) {
             )}
             mainContentClassName={styles.mainContent}
         >
-            { pageDataPending && <PendingMessage /> }
             <Summary
                 className={styles.summary}
                 summaryResponse={summaryResponse}
@@ -262,12 +253,12 @@ function Home(props: ViewProps) {
                             onChange={setSelectedProject}
                             variant="general"
                         />
-                        <ButtonLikeLink
+                        <SmartButtonLikeLink
                             variant="primary"
-                            to={generatePath(routes.projectCreate.path, {})}
+                            route={routes.projectCreate}
                         >
                             {_ts('home', 'setupNewProjectButtonLabel')}
-                        </ButtonLikeLink>
+                        </SmartButtonLikeLink>
                     </>
                 )}
             >
@@ -276,8 +267,16 @@ function Home(props: ViewProps) {
                     data={recentProjects}
                     rendererParams={recentProjectsRendererParams}
                     renderer={ProjectItem}
+                    pending={selectedProjectPending || recentProjectsPending}
                     keySelector={recentProjectKeySelector}
-                    emptyIcon={(<GiShrug />)}
+                    filtered={false}
+                    errored={false}
+                    emptyIcon={(
+                        <Kraken
+                            variant="search"
+                            size="medium"
+                        />
+                    )}
                     emptyMessage={(
                         <div className={styles.emptyText}>
                             {/* FIXME: use strings with appropriate wording */}
@@ -286,6 +285,8 @@ function Home(props: ViewProps) {
                             please select a project to view it&apos;s details
                         </div>
                     )}
+                    messageIconShown
+                    messageShown
                 />
             </Container>
         </PageContent>
diff --git a/app/views/Home/styles.css b/app/views/Home/styles.css
index 318e34b274..71a27966c1 100644
--- a/app/views/Home/styles.css
+++ b/app/views/Home/styles.css
@@ -4,6 +4,7 @@
     height: 100%;
     overflow-x: hidden;
     overflow-y: auto;
+    scrollbar-gutter: stable;
 
     .main-content {
         display: flex;
@@ -32,6 +33,7 @@
                 display: flex;
                 flex-direction: column;
                 gap: var(--dui-spacing-medium);
+                min-height: 40vh;
             }
 
             .empty-text {
diff --git a/app/views/Login/LoginForm/index.tsx b/app/views/Login/LoginForm/index.tsx
index 6642fba94f..c8bdf9cb93 100644
--- a/app/views/Login/LoginForm/index.tsx
+++ b/app/views/Login/LoginForm/index.tsx
@@ -5,6 +5,7 @@ import { IoChevronForwardSharp } from 'react-icons/io5';
 import { generatePath } from 'react-router-dom';
 import {
     Link,
+    Kraken,
     TextInput,
     Button,
     Container,
@@ -26,6 +27,7 @@ import {
 } from '@togglecorp/toggle-form';
 import Captcha from '@hcaptcha/react-hcaptcha';
 
+import SmartButtonLikeLink from '#base/components/SmartButtonLikeLink';
 import { parseUrlParams } from '#utils/common';
 import { UserContext } from '#base/context/UserContext';
 import { ProjectContext } from '#base/context/ProjectContext';
@@ -34,7 +36,6 @@ import { hidUrl } from '#base/configs/hid';
 import NonFieldError from '#components/NonFieldError';
 import { transformToFormError, ObjectError } from '#base/utils/errorTransform';
 import routes from '#base/configs/routes';
-import flyingKraken from '#resources/img/flying-kraken.png';
 
 import _ts from '#ts';
 import {
@@ -48,12 +49,12 @@ import HCaptchaSiteKey from '#base/configs/hCaptcha';
 import styles from './styles.css';
 
 interface HidQuery {
-    // eslint-disable-next-line camelcase
+
     access_token: string;
-    // eslint-disable-next-line camelcase
+
     expires_in: number;
     state: number;
-    // eslint-disable-next-line camelcase
+
     token_type: string;
 }
 
@@ -246,7 +247,7 @@ function LoginForm(props: Props) {
     useEffect(() => {
         // Get params from the current url
         // NOTE: hid provides query as hash
-        // eslint-disable-next-line camelcase
+
         const query = parseUrlParams(window.location?.hash?.replace('#', '')) as { access_token?: string };
         // Login User with HID access_token
         if (query.access_token) {
@@ -276,11 +277,6 @@ function LoginForm(props: Props) {
 
     const pending = hidLoginPending || loginPending;
 
-    const forgotPasswordLink = useMemo(() => ({
-        pathname: generatePath(routes.forgotPassword.path, {}),
-        state: { email: value?.email },
-    }), [value?.email]);
-
     return (
         <form
             className={_cs(styles.loginForm, className)}
@@ -323,16 +319,17 @@ function LoginForm(props: Props) {
                     placeholder={_ts('explore.login', 'password')}
                     disabled={pending}
                 />
-                <ButtonLikeLink
+                <SmartButtonLikeLink
                     className={styles.forgetPasswordButton}
-                    to={forgotPasswordLink}
+                    route={routes.forgotPassword}
+                    state={{ email: value?.email }}
                     variant="action"
                     actions={(
                         <IoChevronForwardSharp />
                     )}
                 >
                     {_ts('explore.login', 'forgotPasswordButtonLabel')}
-                </ButtonLikeLink>
+                </SmartButtonLikeLink>
                 {captchaRequired && (
                     <HCaptcha
                         name="captcha"
@@ -358,10 +355,10 @@ function LoginForm(props: Props) {
                     {_ts('explore.login', 'loginWithHid')}
                 </ButtonLikeLink>
             </Container>
-            <img
-                alt=""
+            <Kraken
                 className={styles.kraken}
-                src={flyingKraken}
+                variant="skydive"
+                size="large"
             />
         </form>
     );
diff --git a/app/views/Login/LoginForm/styles.css b/app/views/Login/LoginForm/styles.css
index 8f675cec6c..22056ee8a5 100644
--- a/app/views/Login/LoginForm/styles.css
+++ b/app/views/Login/LoginForm/styles.css
@@ -29,10 +29,7 @@
     }
 
     .kraken {
+        align-self: flex-start;
         margin: calc(-1 * var(--dui-spacing-extra-large));
-        width: 200px;
-        height: auto;
-        object-fit: contain;
-        object-position: top;
     }
 }
diff --git a/app/views/MyProfile/ChangePasswordModal/index.tsx b/app/views/MyProfile/ChangePasswordModal/index.tsx
index 19f6891dba..c71a171c5d 100644
--- a/app/views/MyProfile/ChangePasswordModal/index.tsx
+++ b/app/views/MyProfile/ChangePasswordModal/index.tsx
@@ -15,6 +15,7 @@ import {
     Button,
     Modal,
     PasswordInput,
+    useAlert,
 } from '@the-deep/deep-ui';
 
 import NonFieldError from '#components/NonFieldError';
@@ -93,6 +94,7 @@ function ChangePasswordModal(props: Props) {
         setError,
     } = useForm(changePasswordSchema, defaultFormValue);
 
+    const alert = useAlert();
     const error = getErrorObject(riskyError);
 
     const {
@@ -104,6 +106,10 @@ function ChangePasswordModal(props: Props) {
         body: (ctx) => ctx,
         onSuccess: () => {
             onModalClose();
+            alert.show(
+                'Successfully changed password.',
+                { variant: 'success' },
+            );
         },
         onFailure: ({ value: errorValue }) => {
             const {
@@ -114,8 +120,11 @@ function ChangePasswordModal(props: Props) {
                 ...otherErrors,
                 [internal]: $internal,
             });
+            alert.show(
+                'Failed to change password.',
+                { variant: 'error' },
+            );
         },
-        failureHeader: _ts('changePassword', 'title'),
     });
 
     const handleSubmitButtonClick = useCallback(() => {
diff --git a/app/views/MyProfile/index.tsx b/app/views/MyProfile/index.tsx
index 78ae72cc56..130b4365f2 100644
--- a/app/views/MyProfile/index.tsx
+++ b/app/views/MyProfile/index.tsx
@@ -6,9 +6,9 @@ import {
     SelectInput,
     PendingMessage,
     Container,
-    Checkbox,
     Button,
-    List,
+    useAlert,
+    CheckListInput,
 } from '@the-deep/deep-ui';
 import {
     ObjectSchema,
@@ -18,42 +18,39 @@ import {
     defaultEmptyArrayType,
     requiredCondition,
     getErrorObject,
+    removeNull,
+    internal,
+    PartialForm,
 } from '@togglecorp/toggle-form';
+import { useQuery, useMutation, gql } from '@apollo/client';
 
 import Avatar from '#components/Avatar';
-import DeepImageInput from '#components/general/DeepImageInput';
+import DeepImageInput, { Option } from '#components/general/DeepImageInput';
 import NonFieldError from '#components/NonFieldError';
 import _ts from '#ts';
+import {
+    MeDetailsQuery,
+    MeDetailsQueryVariables,
+    UpdateMeMutation,
+    UpdateMeMutationVariables,
+    UserEmailConditionOptOutEnum,
+} from '#generated/types';
 import {
     LanguagePreference,
     MultiResponse,
 } from '#types';
-import { useRequest, useLazyRequest } from '#base/utils/restRequest';
+import { useRequest } from '#base/utils/restRequest';
 import UserContext from '#base/context/UserContext';
+import { transformToFormError, ObjectError } from '#base/utils/errorTransform';
 
 import ChangePasswordButton from './ChangePasswordButton';
 
 import styles from './styles.css';
 
-type EmailOptOut = 'news_and_updates' | 'join_requests' | 'email_comment';
-
-interface User {
-    id: number;
-    username: string;
-    firstName: string;
-    lastName: string;
-    displayName: string;
-    lastActiveProject: number;
-    loginAttempts: number;
-    email: string;
-    organization: string;
-    displayPicture: number;
-    displayPictureUrl: string;
-    language: string;
-    emailOptOuts: EmailOptOut[];
-}
+type FormType = PartialForm<UpdateMeMutationVariables['data']> & {
+    displayPictureUrl?: string;
+};
 
-type FormType = Partial<Pick<User, 'firstName' | 'lastName' | 'organization' | 'language' | 'emailOptOuts' | 'displayPicture' | 'displayPictureUrl'>>;
 type FormSchema = ObjectSchema<FormType>;
 type FormSchemaFields = ReturnType<FormSchema['fields']>;
 
@@ -68,44 +65,82 @@ const schema: FormSchema = {
     }),
 };
 
-type EmailOptOutOption = {
-    key: EmailOptOut;
+interface EmailOptOutOption {
+    key: UserEmailConditionOptOutEnum;
     label: string;
 }
 const emailOptOutsOptions: EmailOptOutOption[] = [
-    { key: 'news_and_updates', label: _ts('userProfile', 'newsAndUpdatesInfo') },
-    { key: 'join_requests', label: _ts('userProfile', 'joinRequestsInfo') },
-    { key: 'email_comment', label: _ts('userProfile', 'entryCommentsInfo') },
+    { key: 'NEWS_AND_UPDATES', label: _ts('userProfile', 'newsAndUpdatesInfo') },
+    { key: 'JOIN_REQUESTS', label: _ts('userProfile', 'joinRequestsInfo') },
+    { key: 'EMAIL_COMMENT', label: _ts('userProfile', 'entryCommentsInfo') },
 ];
 const emailOptOutKeySelector = (d: EmailOptOutOption) => d.key;
+const emailOptOutLabelSelector = (d: EmailOptOutOption) => d.label;
 const languageKeySelector = (d: LanguagePreference) => d.code;
 const languageLabelSelector = (d: LanguagePreference) => d.title;
 
 const initialValue: FormType = {};
 
-interface Option {
-    id: number;
-    title: string;
-    file: string;
-}
-
 interface Props {
     className?: string;
 }
 
+const ME_DETAILS = gql`
+    query MeDetails {
+        me {
+            displayName
+            displayPicture
+            displayPictureUrl
+            emailOptOuts
+            firstName
+            id
+            language
+            organization
+            lastName
+        }
+    }
+`;
+
+const UPDATE_ME = gql`
+    mutation UpdateMe($data: UserMeInputType!) {
+        updateMe(data: $data) {
+            errors
+            ok
+            result {
+                email
+                id
+                displayName
+                displayPictureUrl
+                lastActiveProject {
+                    allowedPermissions
+                    currentUserRole
+                    id
+                    hasAssessmentTemplate
+                    isPrivate
+                    title
+                    isVisualizationEnabled
+                    isVisualizationAvailable
+                }
+            }
+        }
+    }
+`;
+
 function MyProfile(props: Props) {
     const {
         className,
     } = props;
 
     const {
-        user,
         setUser,
     } = useContext(UserContext);
 
+    const alert = useAlert();
+
     const {
         pristine,
         value,
+        setPristine,
         error: riskyError,
         setFieldValue,
         validate,
@@ -116,75 +151,80 @@ function MyProfile(props: Props) {
     const error = getErrorObject(riskyError);
 
     const {
-        pending: userGetPending,
-    } = useRequest<User>({
-        url: user ? `server://users/${user.id}/` : undefined,
-        method: 'GET',
-        onSuccess: (response: User) => {
-            setValue(response);
-            setError({});
-            setUser({
-                id: String(response.id),
-                displayName: response.displayName,
-                displayPictureUrl: response.displayPictureUrl,
-            });
+        loading: userGetPending,
+    } = useQuery<MeDetailsQuery, MeDetailsQueryVariables>(
+        ME_DETAILS,
+        {
+            onCompleted: (response) => {
+                const safeMe = removeNull(response.me);
+                if (safeMe) {
+                    setValue(safeMe);
+                    setUser(safeMe);
+                }
+            },
         },
-        failureHeader: _ts('myProfile', 'myProfileTitle'),
-    });
+    );
+
+    const [
+        updateUser,
+        {
+            loading: userUpdatePending,
+        },
+    ] = useMutation<UpdateMeMutation, UpdateMeMutationVariables>(
+        UPDATE_ME,
+        {
+            onCompleted: (response) => {
+                const { updateMe } = response;
+                if (!updateMe) {
+                    return;
+                }
+
+                const {
+                    errors,
+                    ok,
+                } = updateMe;
+                if (errors) {
+                    const formError = transformToFormError(removeNull(errors) as ObjectError[]);
+                    setError(formError);
+                } else if (ok) {
+                    const safeMe = removeNull(updateMe.result);
+                    setUser(safeMe);
+                    setPristine(true);
+                    alert.show(
+                        'Successfully updated your profile!',
+                        { variant: 'success' },
+                    );
+                }
+            },
+            onError: (errors) => {
+                setError({
+                    [internal]: errors.message,
+                });
+                alert.show(
+                    'There was an error updating your profile!',
+                    { variant: 'error' },
+                );
+            },
+        },
+    );
+
     const {
         pending: languagesPending,
         response: languageResponse,
     } = useRequest<MultiResponse<LanguagePreference>>({
         url: 'server://languages/',
         method: 'GET',
-        failureHeader: _ts('myProfile', 'myProfileTitle'),
     });
 
-    const {
-        pending: userPatchPending,
-        trigger: userPatch,
-    } = useLazyRequest<User, FormType>({
-        url: user ? `server://users/${user.id}/` : undefined,
-        method: 'PATCH',
-        body: (ctx) => ctx,
-        onSuccess: (response) => {
-            setValue(response);
-            setError({});
-            setUser({
-                id: String(response.id),
-                displayName: response.displayName,
-                displayPictureUrl: response.displayPictureUrl,
-            });
-        },
-        failureHeader: _ts('myProfile', 'myProfileTitle'),
-    });
+    const handleSubmit = useCallback((finalValue) => {
+        updateUser({ variables: { data: finalValue } });
+    }, [updateUser]);
 
-    const handleCheck = useCallback((checked: boolean, name: EmailOptOut) => {
-        if (checked) {
-            setFieldValue((oldValue: EmailOptOut[] | undefined) => ([
-                ...(oldValue ?? []),
-                name]), 'emailOptOuts' as const);
-        } else {
-            setFieldValue((oldValue: EmailOptOut[] | undefined) => ([
-                ...(oldValue ?? []).filter((v) => v !== name),
-            ]), 'emailOptOuts' as const);
-        }
+    const handleDisplayPictureOptionChange = useCallback((option: Option<string>) => {
+        setFieldValue(option.file, 'displayPictureUrl' as const);
     }, [setFieldValue]);
 
-    const rowRendererParams = useCallback((key: EmailOptOut, data: EmailOptOutOption) => ({
-        name: key,
-        value: value.emailOptOuts?.some((v) => v === key),
-        onChange: handleCheck,
-        label: data.label,
-    }), [value, handleCheck]);
-
-    const handleSubmit = userPatch;
-
-    const handleDisplayPictureOptionChange = useCallback((option: Option) => {
-        setFieldValue(() => option.file, 'displayPictureUrl' as const);
-    }, [setFieldValue]);
-
-    const disabled = userGetPending || userPatchPending || languagesPending;
+    const disabled = userGetPending || languagesPending || userUpdatePending;
 
     return (
         <form
@@ -221,6 +261,7 @@ function MyProfile(props: Props) {
                         )}
                         fileInputClassName={styles.fileInput}
                         inputSectionClassName={styles.inputSection}
+                        maxFileSize={1}
                         variant="general"
                     >
                         <FiEdit2 />
@@ -284,19 +325,18 @@ function MyProfile(props: Props) {
                             labelSelector={languageLabelSelector}
                             options={languageResponse?.results}
                         />
-                        <Container
+                        <CheckListInput
                             className={styles.emailPreferences}
-                            heading="Email Notifications"
-                            headingSize="extraSmall"
-                            contentClassName={styles.inputContainer}
-                        >
-                            <List // FIXME:  use ListSelection component when available
-                                data={emailOptOutsOptions}
-                                renderer={Checkbox}
-                                keySelector={emailOptOutKeySelector}
-                                rendererParams={rowRendererParams}
-                            />
-                        </Container>
+                            label="Email Notifications"
+                            name="emailOptOuts"
+                            value={value.emailOptOuts}
+                            options={emailOptOutsOptions}
+                            keySelector={emailOptOutKeySelector}
+                            labelSelector={emailOptOutLabelSelector}
+                            onChange={setFieldValue}
+                            disabled={disabled}
+                            error={error?.emailOptOuts}
+                        />
                     </Container>
                 </div>
                 <div className={styles.buttonContainer}>
diff --git a/app/views/MyProfile/styles.css b/app/views/MyProfile/styles.css
index ff636b3d3f..41fe4cd5ce 100644
--- a/app/views/MyProfile/styles.css
+++ b/app/views/MyProfile/styles.css
@@ -58,7 +58,9 @@
                         --spacing: 0;
 
                     }
+
                     .file-input {
+                        align-items: flex-start;
                         padding: 0;
                         --height-border: 0;
                     }
diff --git a/app/views/Project/Analysis/index.tsx b/app/views/Project/Analysis/index.tsx
deleted file mode 100644
index 7a6fcf6c78..0000000000
--- a/app/views/Project/Analysis/index.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-import { _cs } from '@togglecorp/fujs';
-
-import PageContent from '#components/PageContent';
-
-import styles from './styles.css';
-
-interface Props {
-    className?: string;
-}
-
-function Analysis(props: Props) {
-    const {
-        className,
-    } = props;
-
-    return (
-        <PageContent className={_cs(styles.analysis, className)}>
-            Analysis
-        </PageContent>
-    );
-}
-
-export default Analysis;
diff --git a/app/views/Project/Analysis/styles.css b/app/views/Project/Analysis/styles.css
deleted file mode 100644
index f1849351a1..0000000000
--- a/app/views/Project/Analysis/styles.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.analysis {
-    padding: var(--dui-spacing-medium);
-}
diff --git a/app/views/Project/AnalysisModule/Analysis/AnalysisCloneModal/index.tsx b/app/views/Project/AnalysisModule/Analysis/AnalysisCloneModal/index.tsx
index 6d006e5155..b693eb3965 100644
--- a/app/views/Project/AnalysisModule/Analysis/AnalysisCloneModal/index.tsx
+++ b/app/views/Project/AnalysisModule/Analysis/AnalysisCloneModal/index.tsx
@@ -102,7 +102,6 @@ function AnalysisCloneModal(props: Props) {
                 endDate: response.endDate,
             });
         },
-        failureHeader: _ts('analysis.cloneModal', 'anaylsisDetailsFetchFailed'),
     });
 
     const {
@@ -121,7 +120,7 @@ function AnalysisCloneModal(props: Props) {
             );
             onClone();
         },
-        failureHeader: _ts('analysis.cloneModal', 'anaylsisCloneFailed'),
+        failureMessage: _ts('analysis.cloneModal', 'analysisCloneFailed'),
     });
 
     const handleSubmitButtonClick = useCallback(() => {
@@ -140,6 +139,8 @@ function AnalysisCloneModal(props: Props) {
             onCloseButtonClick={onClose}
             heading={_ts('analysis.cloneModal', 'cloneModalHeading')}
             className={styles.modal}
+            size="small"
+            freeHeight
             bodyClassName={styles.body}
             footerActions={(
                 <Button
diff --git a/app/views/Project/AnalysisModule/Analysis/AnalysisPillar/index.tsx b/app/views/Project/AnalysisModule/Analysis/AnalysisPillar/index.tsx
index 90aa1345d9..935f23144c 100644
--- a/app/views/Project/AnalysisModule/Analysis/AnalysisPillar/index.tsx
+++ b/app/views/Project/AnalysisModule/Analysis/AnalysisPillar/index.tsx
@@ -1,12 +1,10 @@
 import React, { useContext, useCallback } from 'react';
 import { _cs } from '@togglecorp/fujs';
-import { generatePath } from 'react-router-dom';
 import {
     NumberOutput,
     Container,
     Tag,
     QuickActionConfirmButton,
-    ButtonLikeLink,
     PendingMessage,
     TextOutput,
     List,
@@ -16,6 +14,7 @@ import {
     IoTrashBinOutline,
 } from 'react-icons/io5';
 
+import SmartButtonLikeLink from '#base/components/SmartButtonLikeLink';
 import {
     PillarSummary,
     AnalyticalStatementSummary,
@@ -64,8 +63,8 @@ function AnalysisPillar(props: Props) {
         project,
     } = useContext(ProjectContext);
 
-    const canTagEntry = project?.analysisFramework?.id
-        && project?.allowedPermissions?.includes('UPDATE_ENTRY');
+    // NOTE: using entry delete permission for analysis pillar
+    const canDeleteAnalysisPillar = project?.allowedPermissions?.includes('DELETE_ENTRY');
 
     const isAnalysisCompleted = analyzedEntries === totalEntries && totalEntries > 0;
     let statusLabel = _ts('analysis', 'inProgressTagLabel');
@@ -75,12 +74,6 @@ function AnalysisPillar(props: Props) {
         statusLabel = _ts('analysis', 'noAnalysisTagLabel');
     }
 
-    const editLink = generatePath(routes.pillarAnalysis.path, {
-        projectId,
-        analysisId,
-        pillarAnalysisId: pillarId,
-    });
-
     const disabled = pendingPillarDelete;
 
     const onDeleteConfirmClick = useCallback(() => {
@@ -112,10 +105,15 @@ function AnalysisPillar(props: Props) {
                 </Tag>
             )}
             inlineHeadingDescription
-            headerActions={canTagEntry && (
+            headerActions={(
                 <>
-                    <ButtonLikeLink
-                        to={editLink}
+                    <SmartButtonLikeLink
+                        route={routes.pillarAnalysis}
+                        attrs={{
+                            projectId,
+                            analysisId,
+                            pillarAnalysisId: pillarId,
+                        }}
                         disabled={disabled}
                         variant="tertiary"
                         icons={(
@@ -123,18 +121,20 @@ function AnalysisPillar(props: Props) {
                         )}
                     >
                         {_ts('analysis', 'continueAnalysisButton')}
-                    </ButtonLikeLink>
-                    <QuickActionConfirmButton
-                        name={pillarId}
-                        onConfirm={onDeleteConfirmClick}
-                        title={_ts('analysis', 'deletePillarButtonTitle')}
-                        message={_ts('analysis', 'deletePillarConfirmMessage')}
-                        disabled={disabled}
-                        showConfirmationInitially={false}
-                        variant="secondary"
-                    >
-                        <IoTrashBinOutline />
-                    </QuickActionConfirmButton>
+                    </SmartButtonLikeLink>
+                    {canDeleteAnalysisPillar && (
+                        <QuickActionConfirmButton
+                            name={pillarId}
+                            onConfirm={onDeleteConfirmClick}
+                            title={_ts('analysis', 'deletePillarButtonTitle')}
+                            message={_ts('analysis', 'deletePillarConfirmMessage')}
+                            disabled={disabled}
+                            showConfirmationInitially={false}
+                            variant="secondary"
+                        >
+                            <IoTrashBinOutline />
+                        </QuickActionConfirmButton>
+                    )}
                 </>
             )}
             headerDescription={(
diff --git a/app/views/Project/AnalysisModule/Analysis/PillarList/index.tsx b/app/views/Project/AnalysisModule/Analysis/PillarList/index.tsx
index 563873b8b6..c2169ed560 100644
--- a/app/views/Project/AnalysisModule/Analysis/PillarList/index.tsx
+++ b/app/views/Project/AnalysisModule/Analysis/PillarList/index.tsx
@@ -4,6 +4,8 @@ import {
     Pager,
     Container,
     ListView,
+    Kraken,
+    useAlert,
 } from '@the-deep/deep-ui';
 
 import { useRequest, useLazyRequest } from '#base/utils/restRequest';
@@ -43,6 +45,8 @@ function AnalysisDetails(props: Props) {
 
     const [activePage, setActivePage] = useState(1);
 
+    const alert = useAlert();
+
     const queryOptions = useMemo(() => ({
         offset: (activePage - 1) * MAX_ITEMS_PER_PAGE,
         limit: MAX_ITEMS_PER_PAGE,
@@ -57,6 +61,7 @@ function AnalysisDetails(props: Props) {
             url: `server://projects/${activeProject}/analysis/${analysisId}/pillars/summary/`,
             method: 'GET',
             query: queryOptions,
+            preserveResponse: true,
         },
     );
 
@@ -78,7 +83,12 @@ function AnalysisDetails(props: Props) {
             onSuccess: () => {
                 onAnalysisPillarDelete();
                 pillarGetTrigger();
+                alert.show(
+                    'Successfully deleted pillar analysis.',
+                    { variant: 'success' },
+                );
             },
+            failureMessage: 'Failed to delete the pillar analysis.',
         },
     );
 
@@ -129,6 +139,16 @@ function AnalysisDetails(props: Props) {
                 pending={pillarPending}
                 renderer={AnalysisPillar}
                 rendererParams={analysisPillarRendererParams}
+                filtered={false}
+                errored={false}
+                emptyIcon={(
+                    <Kraken
+                        variant="exercise"
+                    />
+                )}
+                emptyMessage="This analysis doesn't contain any pillar analysis."
+                messageShown
+                messageIconShown
             />
         </Container>
     );
diff --git a/app/views/Project/AnalysisModule/Analysis/index.tsx b/app/views/Project/AnalysisModule/Analysis/index.tsx
index b748ae69d6..9366a55438 100644
--- a/app/views/Project/AnalysisModule/Analysis/index.tsx
+++ b/app/views/Project/AnalysisModule/Analysis/index.tsx
@@ -13,6 +13,7 @@ import {
     QuickActionConfirmButton,
     QuickActionButton,
     ExpandableContainer,
+    Kraken,
     TextOutput,
     DateRangeOutput,
     PendingMessage,
@@ -90,6 +91,7 @@ interface ComponentProps {
     onDelete: (value: number) => void;
     pendingAnalysisDelete: boolean;
     pillars: PillarSummary[];
+    pillarsPending: boolean;
     totalEntries: number;
     totalSources: number;
     analyzedEntries: number;
@@ -110,6 +112,7 @@ function Analysis(props: ComponentProps) {
         onAnalysisPillarDelete,
         onAnalysisCloseSuccess,
         pillars,
+        pillarsPending,
         createdAt,
         onEdit,
         onDelete,
@@ -123,7 +126,8 @@ function Analysis(props: ComponentProps) {
     const {
         project,
     } = useContext(ProjectContext);
-    const activeProject = project?.id ? +project?.id : undefined;
+
+    const activeProject = project?.id ? +project.id : undefined;
 
     const [
         showCloneModal,
@@ -237,6 +241,17 @@ function Analysis(props: ComponentProps) {
                                 renderer={PillarAssignment}
                                 rendererParams={pillarAssignmentRendererParams}
                                 keySelector={pillarSummaryKeySelector}
+                                filtered={false}
+                                errored={false}
+                                pending={pillarsPending}
+                                emptyIcon={(
+                                    <Kraken
+                                        variant="search"
+                                    />
+                                )}
+                                emptyMessage="No Pillar analyses found under this analysis."
+                                messageShown
+                                messageIconShown
                             />
                         )}
                     />
@@ -312,7 +327,7 @@ function Analysis(props: ComponentProps) {
                 headerClassName={styles.pillarAnalysesHeader}
                 heading={_ts('analysis', 'pillarAnalysisCount', { count: pillars.length })}
                 headingSize="extraSmall"
-                alwaysMountContent={false}
+                alwaysMountedContent={false}
                 contentClassName={styles.pillarAnalysisList}
             >
                 {activeProject && (
diff --git a/app/views/Project/AnalysisModule/AnalysisEditModal/PillarAnalysisRow/index.tsx b/app/views/Project/AnalysisModule/AnalysisEditModal/PillarAnalysisRow/index.tsx
index 3675fd0974..e645329378 100644
--- a/app/views/Project/AnalysisModule/AnalysisEditModal/PillarAnalysisRow/index.tsx
+++ b/app/views/Project/AnalysisModule/AnalysisEditModal/PillarAnalysisRow/index.tsx
@@ -76,6 +76,7 @@ function PillarAnalysisRow(props: Props) {
     return (
         <div className={_cs(className, styles.pillarAnalysisRow)}>
             <TextInput
+                className={styles.input}
                 error={error?.title}
                 label={_ts('analysis.editModal', 'pillarAnalysisTitleLabel')}
                 name="title"
@@ -85,6 +86,7 @@ function PillarAnalysisRow(props: Props) {
                 disabled={pending}
             />
             <SelectInput
+                className={styles.input}
                 error={error?.assignee}
                 keySelector={userKeySelector}
                 label={_ts('analysis.editModal', 'pillarAnalysisAssigneeLabel')}
@@ -97,6 +99,7 @@ function PillarAnalysisRow(props: Props) {
                 disabled={pending}
             />
             <MultiSelectInput
+                className={styles.input}
                 error={getErrorString(error?.filters)}
                 keySelector={idSelector}
                 label={_ts('analysis.editModal', 'pillarAnalysisPillarTitle')}
@@ -113,9 +116,10 @@ function PillarAnalysisRow(props: Props) {
                 optionsPopupContentClassName={styles.optionsPopup}
             />
             <QuickActionButton
-                className={styles.removeButton}
+                className={styles.button}
                 name={index}
                 onClick={onRemove}
+                title="Remove"
                 disabled={pending}
             >
                 <IoClose />
diff --git a/app/views/Project/AnalysisModule/AnalysisEditModal/PillarAnalysisRow/styles.css b/app/views/Project/AnalysisModule/AnalysisEditModal/PillarAnalysisRow/styles.css
index 72541c69f6..1ad4ba0252 100644
--- a/app/views/Project/AnalysisModule/AnalysisEditModal/PillarAnalysisRow/styles.css
+++ b/app/views/Project/AnalysisModule/AnalysisEditModal/PillarAnalysisRow/styles.css
@@ -1,10 +1,18 @@
 .pillar-analysis-row {
     display: flex;
     align-items: flex-start;
+    flex-shrink: 0;
     gap: var(--dui-spacing-medium);
 
-    .remove-button {
-        margin: 0 var(--dui-spacing-small);
+    .input {
+        flex-basis: 30%;
+        flex-grow: 1;
+        flex-shrink: 0;
+    }
+
+    .button {
+        align-self: center;
+        flex-shrink: 0;
     }
 }
 
diff --git a/app/views/Project/AnalysisModule/AnalysisEditModal/index.tsx b/app/views/Project/AnalysisModule/AnalysisEditModal/index.tsx
index 9e55736c6c..53fcbf37e8 100644
--- a/app/views/Project/AnalysisModule/AnalysisEditModal/index.tsx
+++ b/app/views/Project/AnalysisModule/AnalysisEditModal/index.tsx
@@ -27,7 +27,7 @@ import {
     TextInput,
     SelectInput,
     DateInput,
-    List,
+    ListView,
 } from '@the-deep/deep-ui';
 import { IoAdd } from 'react-icons/io5';
 import { gql, useQuery } from '@apollo/client';
@@ -58,6 +58,7 @@ import styles from './styles.css';
 const FRAMEWORK_DETAILS_FOR_ANALYSIS = gql`
     query FrameworkDetailsForAnalysis($projectId: ID!) {
         project(id: $projectId) {
+            id
             analysisFramework {
                 id
                 primaryTagging {
@@ -68,6 +69,12 @@ const FRAMEWORK_DETAILS_FOR_ANALYSIS = gql`
                         title
                         widgetId
                         properties
+                        conditional {
+                            parentWidget
+                            parentWidgetType
+                            conditions
+                        }
+                        version
                     }
                     clientId
                     id
@@ -79,6 +86,12 @@ const FRAMEWORK_DETAILS_FOR_ANALYSIS = gql`
                     title
                     widgetId
                     properties
+                    conditional {
+                        parentWidget
+                        parentWidgetType
+                        conditions
+                    }
+                    version
                 }
             }
         }
@@ -228,13 +241,15 @@ function AnalysisEditModal(props: AnalysisEditModalProps) {
 
     const matrixPillars: MatrixPillar[] = React.useMemo(() => {
         const framework = projectWithFramework?.project?.analysisFramework;
-        const primaryWidgets = framework?.primaryTagging?.map((section) => section.widgets)
-            ?.flat().filter(isDefined);
-        const secondaryWidgets = framework?.secondaryTagging?.filter(isDefined);
-        const matrixItems = getMatrixPillars([
-            ...(primaryWidgets ?? []),
-            ...(secondaryWidgets ?? []),
-        ]);
+        const widgetsFromPrimary = framework?.primaryTagging?.flatMap(
+            (item) => (item.widgets ?? []),
+        ) ?? [];
+        const widgetsFromSecondary = framework?.secondaryTagging ?? [];
+        const allWidgets = [
+            ...widgetsFromPrimary,
+            ...widgetsFromSecondary,
+        ];
+        const matrixItems = getMatrixPillars(allWidgets);
         return flatten(matrixItems, (item) => item, childrenSelector)
             .filter((item) => isDefined(item.key));
     }, [projectWithFramework]);
@@ -248,7 +263,6 @@ function AnalysisEditModal(props: AnalysisEditModalProps) {
         url: `server://projects/${projectId}/members/`,
         query: usersQueryFields,
         method: 'GET',
-        failureHeader: _ts('analysis.editModal', 'usersTitle'),
     });
 
     const {
@@ -266,15 +280,17 @@ function AnalysisEditModal(props: AnalysisEditModalProps) {
             }
             alert.show(
                 isDefined(analysisToEdit)
-                    ? _ts('analysis.editModal', 'analysisEdit')
-                    : _ts('analysis.editModal', 'analysisCreate'),
+                    ? 'Successfully updated analysis.'
+                    : 'Successfully created new analysis.',
                 {
                     variant: 'success',
                 },
             );
             onModalClose();
         },
-        failureHeader: _ts('analysis.editModal', 'anaylsisEditModal'),
+        failureMessage: isDefined(analysisToEdit)
+            ? 'Failed to edit analysis.'
+            : 'Failed to create new analysis',
     });
 
     const pending = pendingFramework || pendingUsersList || pendingAnalysisEdit;
@@ -347,22 +363,21 @@ function AnalysisEditModal(props: AnalysisEditModalProps) {
                     : _ts('analysis.editModal', 'addAnalysisModalHeading')
             }
             onCloseButtonClick={onModalClose}
+            size="large"
             bodyClassName={styles.modalBody}
             footerActions={(
-                <>
-                    <Button
-                        name={undefined}
-                        variant="primary"
-                        disabled={pristine || pendingAnalysisEdit}
-                        onClick={handleSubmitButtonClick}
-                    >
-                        {
-                            isDefined(analysisToEdit)
-                                ? _ts('analysis.editModal', 'editButtonLabel')
-                                : _ts('analysis.editModal', 'createButtonLabel')
-                        }
-                    </Button>
-                </>
+                <Button
+                    name={undefined}
+                    variant="primary"
+                    disabled={pristine || pendingAnalysisEdit}
+                    onClick={handleSubmitButtonClick}
+                >
+                    {
+                        isDefined(analysisToEdit)
+                            ? _ts('analysis.editModal', 'editButtonLabel')
+                            : _ts('analysis.editModal', 'createButtonLabel')
+                    }
+                </Button>
             )}
         >
             {/*
@@ -371,7 +386,6 @@ function AnalysisEditModal(props: AnalysisEditModalProps) {
             {analysisGetPending && <PendingMessage />}
             <NonFieldError error={error} />
             <TextInput
-                className={styles.input}
                 label={_ts('analysis.editModal', 'analysisTitleLabel')}
                 name="title"
                 placeholder={_ts('analysis.editModal', 'analysisTitlePlaceholder')}
@@ -381,7 +395,6 @@ function AnalysisEditModal(props: AnalysisEditModalProps) {
                 onChange={setFieldValue}
             />
             <SelectInput
-                className={styles.input}
                 keySelector={userKeySelector}
                 label={_ts('analysis.editModal', 'teamLeadLabel')}
                 labelSelector={userLabelSelector}
@@ -394,7 +407,6 @@ function AnalysisEditModal(props: AnalysisEditModalProps) {
                 disabled={pending}
             />
             <DateInput
-                className={styles.input}
                 name="startDate"
                 label={_ts('analysis.editModal', 'startDateLabel')}
                 value={value.startDate}
@@ -403,7 +415,6 @@ function AnalysisEditModal(props: AnalysisEditModalProps) {
                 disabled={pending}
             />
             <DateInput
-                className={styles.input}
                 name="endDate"
                 label={_ts('analysis.editModal', 'endDateLabel')}
                 value={value.endDate}
@@ -413,25 +424,26 @@ function AnalysisEditModal(props: AnalysisEditModalProps) {
             />
             <div className={styles.analysisPillarListContainer}>
                 <NonFieldError error={apError} />
-                <div className={styles.analysisPillarList}>
-                    <List
-                        data={value.analysisPillar}
-                        renderer={PillarAnalysisRow}
-                        keySelector={analysisPillarKeySelector}
-                        rendererParams={rowRendererParams}
-                    />
-                </div>
-                <div className={styles.actions}>
-                    <Button
-                        name={undefined}
-                        onClick={handleAddRowButtonClick}
-                        icons={<IoAdd />}
-                        variant="tertiary"
-                        disabled={pending}
-                    >
-                        {_ts('analysis.editModal', 'addAnAnalystButtonLabel')}
-                    </Button>
-                </div>
+                <ListView
+                    className={styles.analysisPillarList}
+                    data={value.analysisPillar}
+                    renderer={PillarAnalysisRow}
+                    keySelector={analysisPillarKeySelector}
+                    rendererParams={rowRendererParams}
+                    pending={pending}
+                    filtered={false}
+                    errored={false}
+                />
+                <Button
+                    className={styles.actionButton}
+                    name={undefined}
+                    onClick={handleAddRowButtonClick}
+                    icons={<IoAdd />}
+                    variant="tertiary"
+                    disabled={pending}
+                >
+                    {_ts('analysis.editModal', 'addAnAnalystButtonLabel')}
+                </Button>
             </div>
         </Modal>
     );
diff --git a/app/views/Project/AnalysisModule/AnalysisEditModal/styles.css b/app/views/Project/AnalysisModule/AnalysisEditModal/styles.css
index 8a2b7fd637..d7c9566fa8 100644
--- a/app/views/Project/AnalysisModule/AnalysisEditModal/styles.css
+++ b/app/views/Project/AnalysisModule/AnalysisEditModal/styles.css
@@ -1,29 +1,30 @@
 .analysis-edit-modal {
     max-height: 800px;
 
-    .input {
-        margin: var(--dui-spacing-medium) 0;
-    }
-
     .modal-body {
         display: flex;
         flex-direction: column;
         overflow: auto;
+        gap: var(--dui-spacing-medium);
 
         .analysis-pillar-list-container {
             display: flex;
             flex-direction: column;
             flex-grow: 1;
             overflow: auto;
+            gap: var(--dui-spacing-medium);
 
             .analysis-pillar-list {
+                display: flex;
+                flex-direction: column;
                 flex-grow: 1;
+                flex-shrink: 0;
                 overflow: auto;
+                gap: var(--dui-spacing-medium);
             }
 
-            .actions {
+            .action-button {
                 flex-shrink: 0;
-                padding: var(--dui-spacing-medium) 0;
             }
         }
     }
diff --git a/app/views/Project/AnalysisModule/index.tsx b/app/views/Project/AnalysisModule/index.tsx
index 78f0d4973d..ccb0450506 100644
--- a/app/views/Project/AnalysisModule/index.tsx
+++ b/app/views/Project/AnalysisModule/index.tsx
@@ -30,6 +30,7 @@ import {
     InformationCard,
     PercentageInformationCard,
     ListView,
+    Kraken,
 } from '@the-deep/deep-ui';
 
 import Timeline from '#components/Timeline';
@@ -133,7 +134,8 @@ function AnalysisModule(props: AnalysisModuleProps) {
     const {
         project,
     } = useContext(ProjectContext);
-    const activeProject = project?.id ? +project?.id : undefined;
+
+    const activeProject = project?.id ? +project.id : undefined;
 
     const [
         showAnalysisAddModal,
@@ -174,7 +176,7 @@ function AnalysisModule(props: AnalysisModuleProps) {
         url: `server://projects/${activeProject}/analysis/summary/`,
         method: 'GET',
         query: analysisQueryOptions,
-        failureHeader: _ts('analysis', 'analysisModule'),
+        preserveResponse: true,
     });
 
     const {
@@ -184,7 +186,6 @@ function AnalysisModule(props: AnalysisModuleProps) {
         {
             url: `server://projects/${activeProject}/analysis-overview/`,
             method: 'GET',
-            failureHeader: _ts('analysis', 'analysisModule'),
         },
     );
 
@@ -210,6 +211,7 @@ function AnalysisModule(props: AnalysisModuleProps) {
                     },
                 );
             },
+            failureMessage: 'Failed to delete analysis.',
         },
     );
 
@@ -255,6 +257,7 @@ function AnalysisModule(props: AnalysisModuleProps) {
         createdAt: data.createdAt,
         modifiedAt: data.modifiedAt,
         pillars: data.pillars,
+        pillarsPending: pendingAnalyses,
         analyzedSources: data.analyzedSources,
         analyzedEntries: data.analyzedEntries,
         totalSources: data.totalSources,
@@ -268,6 +271,7 @@ function AnalysisModule(props: AnalysisModuleProps) {
         handleAnalysisToDeleteClick,
         pendingAnalysisDelete,
         analysisIdToDelete,
+        pendingAnalyses,
     ]);
 
     const canTagEntry = project?.allowedPermissions?.includes('UPDATE_ENTRY');
@@ -437,7 +441,16 @@ function AnalysisModule(props: AnalysisModuleProps) {
                             keySelector={analysisKeySelector}
                             pending={pendingAnalyses}
                             filtered={!!dateRangeFilter}
+                            errored={false}
                             emptyMessage={_ts('analysis', 'noAnalysisCreatedLabel')}
+                            emptyIcon={(
+                                <Kraken
+                                    size="large"
+                                    variant="experiment"
+                                />
+                            )}
+                            messageIconShown
+                            messageShown
                         />
                     </Container>
                     {showAnalysisAddModal && activeProject && (
diff --git a/app/views/Project/AnalysisModule/styles.css b/app/views/Project/AnalysisModule/styles.css
index ade4b0d1c7..d347535c65 100644
--- a/app/views/Project/AnalysisModule/styles.css
+++ b/app/views/Project/AnalysisModule/styles.css
@@ -12,6 +12,7 @@
     .child {
         flex-grow: 1;
         overflow: auto;
+        scrollbar-gutter: stable;
     }
 
     .summary {
@@ -81,6 +82,7 @@
                 .icon {
                     flex-shrink: 0;
                     padding: var(--dui-spacing-small);
+                    color: var(--dui-color-text-disabled);
                     font-size: 10em;
                 }
 
diff --git a/app/views/Project/EditAssessment/index.tsx b/app/views/Project/EditAssessment/index.tsx
new file mode 100644
index 0000000000..bbde6e7215
--- /dev/null
+++ b/app/views/Project/EditAssessment/index.tsx
@@ -0,0 +1,55 @@
+import React, { useContext } from 'react';
+import { useParams } from 'react-router-dom';
+import { _cs } from '@togglecorp/fujs';
+
+import BackLink from '#components/BackLink';
+import SubNavbar from '#components/SubNavbar';
+import ProjectContext from '#base/context/ProjectContext';
+
+import styles from './styles.css';
+
+const aryEndpoint = process.env.REACT_APP_ASSESSMENT_REGISTRY_END;
+
+interface Props {
+    className?: string;
+}
+
+function EditAssessment(props: Props) {
+    const { className } = props;
+
+    const { leadId } = useParams<{ leadId: string }>();
+    const { project } = useContext(ProjectContext);
+
+    const projectId = project?.id;
+
+    const src = aryEndpoint && projectId && leadId
+        ? `${aryEndpoint}/projects/${projectId}/leads/${leadId}/ary/edit/`
+        : undefined;
+
+    return (
+        <div className={_cs(className, styles.editAssessment)}>
+            <SubNavbar
+                className={styles.header}
+                heading="Assessment"
+                homeLinkShown
+                defaultActions={(
+                    <BackLink defaultLink="/">
+                        Close
+                    </BackLink>
+                )}
+            />
+            <div className={styles.container}>
+                {src && (
+                    <iframe
+                        className={styles.iframe}
+                        src={src}
+                        title="editAry"
+                        sandbox="allow-same-origin allow-scripts allow-forms allow-top-navigation"
+                    />
+                )}
+            </div>
+        </div>
+    );
+}
+
+export default EditAssessment;
diff --git a/app/views/Project/EditAssessment/styles.css b/app/views/Project/EditAssessment/styles.css
new file mode 100644
index 0000000000..8ea92c6fdd
--- /dev/null
+++ b/app/views/Project/EditAssessment/styles.css
@@ -0,0 +1,23 @@
+.edit-assessment {
+    display: flex;
+    flex-direction: column;
+    height: 100vh;
+    overflow: auto;
+
+    .header {
+        flex-shrink: 0;
+    }
+
+    .container {
+        display: flex;
+        flex-direction: column;
+        flex-grow: 1;
+
+        .iframe {
+            flex-grow: 1;
+            border: 0;
+            object-fit: contain;
+            object-position: center center;
+        }
+    }
+}
diff --git a/app/views/Project/EditGroupAssessment/index.tsx b/app/views/Project/EditGroupAssessment/index.tsx
new file mode 100644
index 0000000000..95b1c78397
--- /dev/null
+++ b/app/views/Project/EditGroupAssessment/index.tsx
@@ -0,0 +1,55 @@
+import React, { useContext } from 'react';
+import { useParams } from 'react-router-dom';
+import { _cs } from '@togglecorp/fujs';
+
+import BackLink from '#components/BackLink';
+import SubNavbar from '#components/SubNavbar';
+import ProjectContext from '#base/context/ProjectContext';
+
+import styles from './styles.css';
+
+const aryEndpoint = process.env.REACT_APP_ASSESSMENT_REGISTRY_END;
+
+interface Props {
+    className?: string;
+}
+
+function EditGroupAssessment(props: Props) {
+    const { className } = props;
+
+    const { leadGroupId } = useParams<{ leadGroupId: string }>();
+    const { project } = useContext(ProjectContext);
+
+    const projectId = project?.id;
+
+    const src = aryEndpoint && projectId && leadGroupId
+        ? `${aryEndpoint}/projects/${projectId}/lead-groups/${leadGroupId}/ary/edit/`
+        : undefined;
+
+    return (
+        <div className={_cs(className, styles.editAssessment)}>
+            <SubNavbar
+                className={styles.header}
+                heading="Assessment"
+                homeLinkShown
+                defaultActions={(
+                    <BackLink defaultLink="/">
+                        Close
+                    </BackLink>
+                )}
+            />
+            <div className={styles.container}>
+                {src && (
+                    <iframe
+                        className={styles.iframe}
+                        src={src}
+                        title="editAry"
+                        sandbox="allow-same-origin allow-scripts allow-forms allow-top-navigation"
+                    />
+                )}
+            </div>
+        </div>
+    );
+}
+
+export default EditGroupAssessment;
diff --git a/app/views/Project/EditGroupAssessment/styles.css b/app/views/Project/EditGroupAssessment/styles.css
new file mode 100644
index 0000000000..8ea92c6fdd
--- /dev/null
+++ b/app/views/Project/EditGroupAssessment/styles.css
@@ -0,0 +1,23 @@
+.edit-assessment {
+    display: flex;
+    flex-direction: column;
+    height: 100vh;
+    overflow: auto;
+
+    .header {
+        flex-shrink: 0;
+    }
+
+    .container {
+        display: flex;
+        flex-direction: column;
+        flex-grow: 1;
+
+        .iframe {
+            flex-grow: 1;
+            border: 0;
+            object-fit: contain;
+            object-position: center center;
+        }
+    }
+}
diff --git a/app/views/Project/EntryEdit/LeftPane/CanvasDrawModal/index.tsx b/app/views/Project/EntryEdit/LeftPane/CanvasDrawModal/index.tsx
index a10c281321..e447669500 100644
--- a/app/views/Project/EntryEdit/LeftPane/CanvasDrawModal/index.tsx
+++ b/app/views/Project/EntryEdit/LeftPane/CanvasDrawModal/index.tsx
@@ -108,7 +108,10 @@ const drawImage = (
         if (context) {
             context.drawImage(
                 img,
-                0, 0, img.width * scale, img.height * scale,
+                0,
+                0,
+                img.width * scale,
+                img.height * scale,
             );
         }
     }
@@ -231,6 +234,7 @@ function CanvasDraw(props: Props) {
             className={_cs(styles.canvasDrawModal, className)}
             heading={_ts('components.canvasDrawModal', 'modalHeading')}
             onCloseButtonClick={handleCloseButtonClick}
+            size="cover"
             footerActions={(
                 <>
                     <Button
diff --git a/app/views/Project/EntryEdit/LeftPane/EntryItem/index.tsx b/app/views/Project/EntryEdit/LeftPane/EntryItem/index.tsx
index 66ec1e1a91..48cb3b0187 100644
--- a/app/views/Project/EntryEdit/LeftPane/EntryItem/index.tsx
+++ b/app/views/Project/EntryEdit/LeftPane/EntryItem/index.tsx
@@ -18,14 +18,15 @@ import {
     QuickActionDropdownMenu,
     QuickActionDropdownMenuProps,
     Heading,
-    TextArea,
     useInputState,
     Button,
 } from '@the-deep/deep-ui';
 
 import ExcerptInput from '#components/entry/ExcerptInput';
+import ExcerptTextArea from '#components/entry/ExcerptTextArea';
 
 import { PartialEntryType as EntryInput } from '../../schema';
+import EntryCommentWrapper from '#components/entryReview/EntryCommentWrapper';
 import { Entry } from '../../types';
 
 import styles from './styles.css';
@@ -59,7 +60,7 @@ export function ExcerptModal(props: ExcerptModalProps) {
             <Heading size="small">
                 {title}
             </Heading>
-            <TextArea
+            <ExcerptTextArea
                 className={styles.excerptTextArea}
                 name="modified-excerpt"
                 value={excerpt}
@@ -96,16 +97,20 @@ interface EntryItemProps extends EntryInput {
     entryImage: Entry['image'];
     disableClick?: boolean;
     errored?: boolean;
+    projectId: string | undefined;
+    entryServerId: string | undefined;
 }
 
 function EntryItem(props: EntryItemProps) {
     const {
         className,
+        entryServerId,
         droppedExcerpt,
         entryId,
         excerpt,
         isActive,
         onClick,
+        projectId,
         onApproveButtonClick,
         onDiscardButtonClick,
         onExcerptChange,
@@ -150,6 +155,15 @@ function EntryItem(props: EntryItemProps) {
                 className,
                 isActive && styles.active,
             )}
+            headingSectionClassName={styles.headingSection}
+            headerActions={entryServerId && projectId && (
+                <EntryCommentWrapper
+                    // FIXME: Remove cast after entry comments
+                    // is switched to gql
+                    entryId={+entryServerId}
+                    projectId={projectId}
+                />
+            )}
             footerIcons={(
                 <>
                     {excerpt !== droppedExcerpt && (
@@ -186,6 +200,7 @@ function EntryItem(props: EntryItemProps) {
             footerQuickActions={isActive && (
                 <>
                     <QuickActionButton
+                        title="Discard changes"
                         name={entryId}
                         onClick={onDiscardButtonClick}
                         disabled={disableDiscardButton}
@@ -193,6 +208,7 @@ function EntryItem(props: EntryItemProps) {
                         <IoClose />
                     </QuickActionButton>
                     <QuickActionButton
+                        title="Approve changes"
                         name={entryId}
                         onClick={onApproveButtonClick}
                         variant="primary"
@@ -202,26 +218,34 @@ function EntryItem(props: EntryItemProps) {
                     </QuickActionButton>
                     <QuickActionDropdownMenu
                         label={<BsFileDiff />}
-                        disabled={droppedExcerpt === excerpt}
+                        disabled={
+                            droppedExcerpt === excerpt
+                            || (droppedExcerpt?.length ?? 0) > 0
+                            || (excerpt?.length ?? 0) > 0
+                        }
                         popupClassName={styles.diffExcerptPopup}
                         popupContentClassName={styles.content}
                     >
-                        <div className={styles.excerpt}>
-                            <Heading size="small">
-                                Original
-                            </Heading>
-                            <div className={styles.text}>
-                                {droppedExcerpt}
+                        {(droppedExcerpt?.length ?? 0) > 0 && (
+                            <div className={styles.excerpt}>
+                                <Heading size="small">
+                                    Original
+                                </Heading>
+                                <div className={styles.text}>
+                                    {droppedExcerpt}
+                                </div>
                             </div>
-                        </div>
-                        <div className={styles.excerpt}>
-                            <Heading size="small">
-                                Modified
-                            </Heading>
-                            <div className={styles.text}>
-                                {excerpt}
+                        )}
+                        {(excerpt?.length ?? 0) > 0 && (
+                            <div className={styles.excerpt}>
+                                <Heading size="small">
+                                    Modified
+                                </Heading>
+                                <div className={styles.text}>
+                                    {excerpt}
+                                </div>
                             </div>
-                        </div>
+                        )}
                     </QuickActionDropdownMenu>
                     <QuickActionDropdownMenu
                         label={<IoPencil />}
@@ -238,6 +262,7 @@ function EntryItem(props: EntryItemProps) {
                     </QuickActionDropdownMenu>
                     {deleted ? (
                         <QuickActionButton
+                            title="Restore entry"
                             name={entryId}
                             onClick={onEntryRestore}
                         >
@@ -245,6 +270,7 @@ function EntryItem(props: EntryItemProps) {
                         </QuickActionButton>
                     ) : (
                         <QuickActionButton
+                            title="Delete entry"
                             name={entryId}
                             onClick={onEntryDelete}
                         >
@@ -253,9 +279,10 @@ function EntryItem(props: EntryItemProps) {
                     )}
                 </>
             )}
+            contentClassName={styles.content}
         >
             <div
-                className={styles.content}
+                className={styles.clickableArea}
                 onClick={handleClick}
                 role="presentation"
             >
diff --git a/app/views/Project/EntryEdit/LeftPane/EntryItem/styles.css b/app/views/Project/EntryEdit/LeftPane/EntryItem/styles.css
index 04d4ab64e0..48c57d229e 100644
--- a/app/views/Project/EntryEdit/LeftPane/EntryItem/styles.css
+++ b/app/views/Project/EntryEdit/LeftPane/EntryItem/styles.css
@@ -3,10 +3,15 @@
     position: relative;
     border: var(--dui-width-separator-thin) solid var(--dui-color-accent);
     background-color: var(--dui-color-foreground);
-    max-height: 480px;
+    max-height: 360px;
+    overflow-y: auto;
     font-weight: var(--dui-font-weight-bold);
     user-select: none;
 
+    .heading-section {
+        overflow: visible;
+    }
+
     .vertical-border {
         position: absolute;
         top: 0;
@@ -24,7 +29,17 @@
     }
 
     .content {
-        cursor: pointer;
+        display: flex;
+        flex-direction:column;
+        overflow-y: auto;
+
+        .clickable-area {
+            display: flex;
+            flex-direction:column;
+            flex-grow: 1;
+            cursor: pointer;
+            overflow-y: auto;
+        }
     }
 }
 
diff --git a/app/views/Project/EntryEdit/LeftPane/SimplifiedTextView/index.tsx b/app/views/Project/EntryEdit/LeftPane/SimplifiedTextView/index.tsx
index 5ac975f74e..e30434304d 100644
--- a/app/views/Project/EntryEdit/LeftPane/SimplifiedTextView/index.tsx
+++ b/app/views/Project/EntryEdit/LeftPane/SimplifiedTextView/index.tsx
@@ -31,6 +31,7 @@ interface Props {
     disableApproveButton?: boolean;
     disableDiscardButton?: boolean;
     disableAddButton?: boolean;
+    projectId: string | undefined;
 }
 
 function SimplifiedTextView(props: Props) {
@@ -43,6 +44,7 @@ function SimplifiedTextView(props: Props) {
         activeEntryClientId,
         onExcerptClick,
         onApproveButtonClick,
+        projectId,
         onDiscardButtonClick,
         onEntryDelete,
         onEntryRestore,
@@ -74,6 +76,7 @@ function SimplifiedTextView(props: Props) {
                 droppedExcerpt: entry.droppedExcerpt,
                 entryType: entry.entryType,
                 lead: entry.lead,
+                entryServerId: entry.id,
                 clientId: entry.clientId,
                 deleted: entry.deleted,
             });
@@ -82,7 +85,10 @@ function SimplifiedTextView(props: Props) {
             .sort((a: Split, b: Split) => (
                 a.startIndex - b.startIndex
             )) ?? []
-    ), [text, entries]);
+    ), [
+        text,
+        entries,
+    ]);
 
     let children: React.ReactNode = null;
     if (!text || splits.length === 0) {
@@ -107,6 +113,8 @@ function SimplifiedTextView(props: Props) {
                         <EntryItem
                             className={styles.entry}
                             clientId={split.clientId}
+                            entryServerId={split.entryServerId}
+                            projectId={projectId}
                             lead={split.lead}
                             entryId={split.entryId}
                             onClick={onExcerptClick}
@@ -188,6 +196,7 @@ function SimplifiedTextView(props: Props) {
                     style={position ? ({ ...position }) : undefined}
                 >
                     <QuickActionButton
+                        title="Add entry"
                         name={textContent}
                         variant="primary"
                         className={styles.addButton}
diff --git a/app/views/Project/EntryEdit/LeftPane/index.tsx b/app/views/Project/EntryEdit/LeftPane/index.tsx
index 138bb8aa50..315d61d66b 100644
--- a/app/views/Project/EntryEdit/LeftPane/index.tsx
+++ b/app/views/Project/EntryEdit/LeftPane/index.tsx
@@ -1,8 +1,11 @@
-import React, { useMemo } from 'react';
+import React, { useState, useMemo, useEffect, useCallback, useRef } from 'react';
 import {
     _cs,
+    isNotDefined,
+    isDefined,
     randomString,
 } from '@togglecorp/fujs';
+import { gql, useQuery } from '@apollo/client';
 import {
     Tabs,
     Container,
@@ -12,18 +15,22 @@ import {
     TextInput,
     QuickActionButton,
     useBooleanState,
+    Button,
     QuickActionDropdownMenu,
     QuickActionDropdownMenuProps,
     ListView,
+    Kraken,
     useAlert,
     QuickActionLink,
     PendingMessage,
+    Message,
 } from '@the-deep/deep-ui';
 import {
     IoAdd,
     IoOpenOutline,
     IoCameraOutline,
     IoExpand,
+    IoReloadOutline,
     IoClose,
     IoBrush,
     IoCheckmark,
@@ -31,8 +38,10 @@ import {
 
 import LeadPreview from '#components/lead/LeadPreview';
 import Screenshot from '#components/Screenshot';
-import FullScreen from '#components/FullScreen';
-import { useRequest } from '#base/utils/restRequest';
+import {
+    LeadPreviewForTextQuery,
+    LeadPreviewForTextQueryVariables,
+} from '#generated/types';
 
 import { PartialEntryType as EntryInput } from '../schema';
 import CanvasDrawModal from './CanvasDrawModal';
@@ -41,17 +50,25 @@ import SimplifiedTextView from './SimplifiedTextView';
 import EntryItem, { ExcerptModal } from './EntryItem';
 import styles from './styles.css';
 
-const entryKeySelector = (e: EntryInput) => e.clientId;
+const LEAD_PREVIEW = gql`
+    query LeadPreviewForText(
+        $leadId: ID!,
+        $projectId: ID!,
+    ) {
+        project(id: $projectId) {
+            id
+            lead(id: $leadId) {
+                id
+                extractionStatus
+                leadPreview {
+                    textExtract
+                }
+            }
+        }
+    }
+`;
 
-interface LeadPreview {
-    id: number;
-    previewId: number;
-    text?: string;
-    images?: {
-        id: number;
-        file: string;
-    }[];
-}
+const entryKeySelector = (e: EntryInput) => e.clientId;
 
 interface Props {
     className?: string;
@@ -71,6 +88,7 @@ interface Props {
     entryImagesMap: EntryImagesMap | undefined;
     isEntrySelectionActive?: boolean;
     entriesError: Partial<Record<string, boolean>> | undefined;
+    projectId: string | undefined;
     defaultTab?: 'entries' | 'simplified' | 'original';
 }
 
@@ -94,62 +112,79 @@ function LeftPane(props: Props) {
         isEntrySelectionActive,
         entriesError,
         defaultTab = 'simplified',
+        projectId,
     } = props;
 
     const alert = useAlert();
 
-    const [activeTab, setActiveTab] = React.useState<'simplified' | 'original' | 'entries' | undefined>(
+    const [activeTab, setActiveTab] = useState<'simplified' | 'original' | 'entries' | undefined>(
         (hideSimplifiedPreview && defaultTab === 'simplified') || (hideOriginalPreview && defaultTab === 'original')
             ? 'entries'
             : defaultTab,
     );
 
     // FIXME: we shouldn't need these values here
-    const [capturedImageUrl, setCapturedImageUrl] = React.useState<string | undefined>();
+    const [capturedImageUrl, setCapturedImageUrl] = useState<string | undefined>();
 
     const [
         showScreenshot,
         setShowScreenshotTrue,
         setShowScreenshotFalse,
     ] = useBooleanState(false);
-    const [
-        showSourcePreviewInFullScreen,,,,
-        toggleShowSourcePreviewInFullScreen,
-    ] = useBooleanState(false);
     const [
         showCanvasDrawModal,
         setShowCanvasDrawModalTrue,
         setShowCanvasDrawModalFalse,
     ] = useBooleanState(false);
 
-    const editExcerptDropdownRef: QuickActionDropdownMenuProps['componentRef'] = React.useRef(null);
+    const [fullScreenMode, setFullScreenMode] = useState(false);
+
+    const editExcerptDropdownRef: QuickActionDropdownMenuProps['componentRef'] = useRef(null);
+
+    const variables = useMemo(
+        () => ((leadId && projectId) ? ({
+            leadId,
+            projectId,
+        }) : undefined),
+        [leadId, projectId],
+    );
 
     const {
-        pending: leadPreviewPending,
-        response: leadPreview,
-    } = useRequest<LeadPreview>({
-        skip: !lead,
-        url: `server://lead-previews/${leadId}/`,
-    });
-
-    const handleScreenshotCaptureError = React.useCallback((message) => {
+        data: leadPreviewData,
+        loading: leadPreviewPending,
+        refetch,
+    } = useQuery<LeadPreviewForTextQuery, LeadPreviewForTextQueryVariables>(
+        LEAD_PREVIEW,
+        {
+            skip: !variables,
+            variables,
+        },
+    );
+
+    const leadPreview = leadPreviewData?.project?.lead?.leadPreview;
+    const extractionStatus = leadPreviewData?.project?.lead?.extractionStatus;
+
+    const handleScreenshotCaptureError = useCallback((message: React.ReactNode) => {
         alert.show(
             message,
-            { variant: 'error' },
+            {
+                variant: 'error',
+                duration: 8000,
+            },
         );
 
         setShowScreenshotFalse();
     }, [setShowScreenshotFalse, alert]);
 
-    const handleScreenshotCancel = React.useCallback(() => {
+    const handleScreenshotCancel = useCallback(() => {
         setCapturedImageUrl(undefined);
         setShowScreenshotFalse();
     }, [setShowScreenshotFalse]);
 
-    const handleCreateEntryButtonClick = React.useCallback(() => {
-        setCapturedImageUrl(undefined);
+    const handleCreateEntryButtonClick = useCallback(() => {
         setShowCanvasDrawModalFalse();
         setShowScreenshotFalse();
+        setCapturedImageUrl(undefined);
 
         if (onEntryCreate) {
             onEntryCreate({
@@ -161,21 +196,41 @@ function LeftPane(props: Props) {
                 imageRaw: capturedImageUrl,
             });
         }
+        if (fullScreenMode && isDefined(document.exitFullscreen)) {
+            document.exitFullscreen();
+        }
     }, [
+        fullScreenMode,
         capturedImageUrl,
         leadId,
         onEntryCreate,
         setShowCanvasDrawModalFalse,
-        setCapturedImageUrl,
         setShowScreenshotFalse,
     ]);
 
-    const handleCanvasDrawDone = React.useCallback((newImageUrl: string) => {
-        setCapturedImageUrl(newImageUrl);
-        handleCreateEntryButtonClick();
-    }, [handleCreateEntryButtonClick]);
+    const handleCanvasDrawDone = useCallback((newImageUrl: string) => {
+        setShowCanvasDrawModalFalse();
+        setShowScreenshotFalse();
+        setCapturedImageUrl(undefined);
 
-    const handleExcerptAddFromSimplified = React.useCallback((selectedText: string) => {
+        if (onEntryCreate) {
+            onEntryCreate({
+                clientId: randomString(),
+                excerpt: '',
+                droppedExcerpt: '',
+                entryType: 'IMAGE',
+                lead: leadId,
+                imageRaw: newImageUrl,
+            });
+        }
+    }, [
+        leadId,
+        onEntryCreate,
+        setShowCanvasDrawModalFalse,
+        setShowScreenshotFalse,
+    ]);
+
+    const handleExcerptAddFromSimplified = useCallback((selectedText: string) => {
         if (onEntryCreate) {
             onEntryCreate({
                 clientId: randomString(),
@@ -187,7 +242,7 @@ function LeftPane(props: Props) {
         }
     }, [leadId, onEntryCreate]);
 
-    const handleExcerptAddFromOriginal = React.useCallback((selectedText: string | undefined) => {
+    const handleExcerptAddFromOriginal = useCallback((selectedText: string | undefined) => {
         if (onEntryCreate) {
             onEntryCreate({
                 clientId: randomString(),
@@ -204,10 +259,12 @@ function LeftPane(props: Props) {
         }
     }, [leadId, onEntryCreate]);
 
-    const entryItemRendererParams = React.useCallback((entryId: string, entry: EntryInput) => ({
+    const entryItemRendererParams = useCallback((entryId: string, entry: EntryInput) => ({
         ...entry,
         entryId: entry.clientId,
+        entryServerId: entry.id,
         isActive: activeEntry === entry.clientId,
+        projectId,
         onClick: onEntryClick,
         onExcerptChange,
         onEntryDelete,
@@ -218,6 +275,7 @@ function LeftPane(props: Props) {
         disableClick: isEntrySelectionActive,
         errored: entriesError?.[entryId],
     }), [
+        projectId,
         onApproveButtonClick,
         entriesError,
         onDiscardButtonClick,
@@ -237,8 +295,43 @@ function LeftPane(props: Props) {
         activeEntry,
     ]);
 
+    const containerRef = useRef<HTMLDivElement>(null);
+
+    const handleFullScreenChange = useCallback(() => {
+        setFullScreenMode(isDefined(document.fullscreenElement));
+    }, []);
+
+    useEffect(() => {
+        document.addEventListener('fullscreenchange', handleFullScreenChange);
+
+        return (() => {
+            document.removeEventListener('fullscreenchange', handleFullScreenChange);
+        });
+    }, [handleFullScreenChange]);
+
+    const handleFullScreenToggleClick = useCallback(() => {
+        if (isNotDefined(containerRef.current)) {
+            return;
+        }
+        const { current: viewerContainer } = containerRef;
+        if (!fullScreenMode && isDefined(viewerContainer?.requestFullscreen)) {
+            viewerContainer?.requestFullscreen();
+        } else if (fullScreenMode && isDefined(document.exitFullscreen)) {
+            document.exitFullscreen();
+        }
+    }, [fullScreenMode]);
+
+    const handleCanvasDrawClick = useCallback(() => {
+        setShowScreenshotFalse();
+        if (fullScreenMode && isDefined(document.exitFullscreen)) {
+            document.exitFullscreen();
+        }
+        setShowCanvasDrawModalTrue();
+    }, [fullScreenMode, setShowCanvasDrawModalTrue, setShowScreenshotFalse]);
+
     const originalTabContent = (
         <Container
+            elementRef={containerRef}
             className={styles.originalPreviewContainer}
             headingSize="extraSmall"
             headingClassName={styles.leadUrlContainer}
@@ -252,22 +345,25 @@ function LeftPane(props: Props) {
             )}
             headerActions={(
                 <>
-                    <QuickActionDropdownMenu
-                        label={<IoAdd />}
-                        variant="primary"
-                        disabled={showScreenshot || isEntrySelectionActive}
-                        popupClassName={styles.createExcerptPopup}
-                        popupContentClassName={styles.createExcerptContent}
-                        persistent
-                        componentRef={editExcerptDropdownRef}
-                    >
-                        <ExcerptModal
-                            title="Add Excerpt"
-                            excerpt=""
-                            onComplete={handleExcerptAddFromOriginal}
-                        />
-                    </QuickActionDropdownMenu>
+                    {!fullScreenMode && (
+                        <QuickActionDropdownMenu
+                            label={<IoAdd />}
+                            variant="primary"
+                            disabled={showScreenshot || isEntrySelectionActive}
+                            popupClassName={styles.createExcerptPopup}
+                            popupContentClassName={styles.createExcerptContent}
+                            persistent
+                            componentRef={editExcerptDropdownRef}
+                        >
+                            <ExcerptModal
+                                title="Add Excerpt"
+                                excerpt=""
+                                onComplete={handleExcerptAddFromOriginal}
+                            />
+                        </QuickActionDropdownMenu>
+                    )}
                     <QuickActionLink
+                        title="Open external"
                         to={lead?.url || lead?.attachment?.file?.url || ''}
                     >
                         <IoOpenOutline />
@@ -276,6 +372,7 @@ function LeftPane(props: Props) {
                         <>
                             <QuickActionButton
                                 name={undefined}
+                                title="Close"
                                 onClick={setShowScreenshotFalse}
                             >
                                 <IoClose />
@@ -283,13 +380,15 @@ function LeftPane(props: Props) {
                             { capturedImageUrl && (
                                 <>
                                     <QuickActionButton
+                                        title="Draw over screenshot"
                                         name={undefined}
-                                        onClick={setShowCanvasDrawModalTrue}
+                                        onClick={handleCanvasDrawClick}
                                     >
                                         <IoBrush />
                                     </QuickActionButton>
                                     <QuickActionButton
                                         name={undefined}
+                                        title="Finalize screenshot"
                                         onClick={handleCreateEntryButtonClick}
                                     >
                                         <IoCheckmark />
@@ -307,8 +406,9 @@ function LeftPane(props: Props) {
                         </QuickActionButton>
                     )}
                     <QuickActionButton
+                        title={fullScreenMode ? 'Exit fullscreen' : 'Enter fullscreen'}
                         name={undefined}
-                        onClick={toggleShowSourcePreviewInFullScreen}
+                        onClick={handleFullScreenToggleClick}
                     >
                         <IoExpand />
                     </QuickActionButton>
@@ -318,6 +418,8 @@ function LeftPane(props: Props) {
                 <EntryItem
                     {...activeEntryDetails}
                     entryId={activeEntry}
+                    entryServerId={activeEntryDetails?.id}
+                    projectId={projectId}
                     isActive
                     onExcerptChange={onExcerptChange}
                     onEntryDelete={onEntryDelete}
@@ -388,20 +490,18 @@ function LeftPane(props: Props) {
                 {!hideSimplifiedPreview && (
                     <TabPanel
                         name="simplified"
-                        className={styles.simplifiedTab}
+                        activeClassName={styles.simplifiedTab}
+                        retainMount="lazy"
                     >
-                        {leadPreviewPending ? (
-                            <PendingMessage
-                                message="Fetching simplified text"
-                            />
-                        ) : (
+                        {(leadPreview?.textExtract?.length ?? 0) > 0 ? (
                             <SimplifiedTextView
                                 className={styles.simplifiedTextView}
                                 activeEntryClientId={activeEntry}
+                                projectId={projectId}
                                 onExcerptClick={onEntryClick}
                                 entries={entries}
                                 onAddButtonClick={handleExcerptAddFromSimplified}
-                                text={leadPreview?.text}
+                                text={leadPreview?.textExtract}
                                 onExcerptChange={onExcerptChange}
                                 onApproveButtonClick={onApproveButtonClick}
                                 onDiscardButtonClick={onDiscardButtonClick}
@@ -410,13 +510,48 @@ function LeftPane(props: Props) {
                                 disableAddButton={isEntrySelectionActive}
                                 disableExcerptClick={isEntrySelectionActive}
                             />
+                        ) : (
+                            <Message
+                                // NOTE: Pending from server side to get state of extraction
+                                // to properly toggle between whether the source has been
+                                // extracted or not
+                                pending={leadPreviewPending}
+                                pendingMessage="Fetching simplified text"
+                                icon={(
+                                    <Kraken variant="work" />
+                                )}
+                                message={(
+                                    (extractionStatus === 'PENDING'
+                                    || extractionStatus === 'STARTED')
+                                        ? 'Simplified text is currently being extracted from this source. Please retry after few minutes.'
+                                        : 'Oops! Either the source was empty or we couldn\'t extract its text.'
+                                )}
+                                errored={extractionStatus === 'FAILED'}
+                                erroredEmptyIcon={(
+                                    <Kraken variant="work" />
+                                )}
+                                erroredEmptyMessage="There was an when issue extracting simplified
+                                text for this source."
+                                actions={(extractionStatus === 'PENDING' || extractionStatus === 'STARTED') && (
+                                    <Button
+                                        name={undefined}
+                                        variant="secondary"
+                                        onClick={refetch}
+                                        icons={(<IoReloadOutline />)}
+                                        disabled={leadPreviewPending}
+                                    >
+                                        Retry
+                                    </Button>
+                                )}
+                            />
                         )}
                     </TabPanel>
                 )}
                 {!hideOriginalPreview && (
                     <TabPanel
                         name="original"
-                        className={styles.originalTab}
+                        activeClassName={styles.originalTab}
+                        retainMount="lazy"
                     >
                         {leadPreviewPending && (
                             <PendingMessage
@@ -426,14 +561,10 @@ function LeftPane(props: Props) {
                         {originalTabContent}
                     </TabPanel>
                 )}
-                {showSourcePreviewInFullScreen && (
-                    <FullScreen className={styles.originalTab}>
-                        {originalTabContent}
-                    </FullScreen>
-                )}
                 <TabPanel
                     name="entries"
-                    className={styles.entryListTab}
+                    activeClassName={styles.entryListTab}
+                    retainMount="lazy"
                 >
                     <ListView
                         data={entries ?? undefined}
@@ -441,6 +572,17 @@ function LeftPane(props: Props) {
                         rendererParams={entryItemRendererParams}
                         className={styles.entryList}
                         keySelector={entryKeySelector}
+                        filtered={false}
+                        errored={false}
+                        pending={false}
+                        emptyIcon={(
+                            <Kraken
+                                variant="search"
+                            />
+                        )}
+                        emptyMessage="No entries found"
+                        messageShown
+                        messageIconShown
                     />
                 </TabPanel>
             </Tabs>
diff --git a/app/views/Project/EntryEdit/SourceDetails/index.tsx b/app/views/Project/EntryEdit/SourceDetails/index.tsx
index b5a1db3ea9..a12d8997dd 100644
--- a/app/views/Project/EntryEdit/SourceDetails/index.tsx
+++ b/app/views/Project/EntryEdit/SourceDetails/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useCallback, useContext } from 'react';
 import { _cs } from '@togglecorp/fujs';
 import { Card } from '@the-deep/deep-ui';
 import { useQuery, gql } from '@apollo/client';
@@ -12,6 +12,7 @@ import {
     LeadOptionsQuery,
     LeadOptionsQueryVariables,
 } from '#generated/types';
+import { ProjectContext } from '#base/context/ProjectContext';
 import LeadPreview from '#components/lead/LeadPreview';
 import LeadInput from '#components/lead/LeadInput';
 import { PartialFormType } from '#components/lead/LeadInput/schema';
@@ -37,7 +38,7 @@ interface Props {
     pending: boolean;
     leadValue: PartialFormType;
     leadFormError: Error<PartialFormType> | undefined;
-    setValue: (value: SetBaseValueArg<PartialFormType>) => void;
+    setValue: (value: SetBaseValueArg<PartialFormType>, reset?: boolean) => void;
     defaultValue: PartialFormType;
     projectId: string;
     disabled?: boolean;
@@ -77,6 +78,8 @@ function SourceDetails(props: Props) {
         onAssigneeOptionChange,
     } = props;
 
+    const { project } = useContext(ProjectContext);
+
     const {
         loading: leadOptionsLoading,
         data: leadOptions,
@@ -84,6 +87,10 @@ function SourceDetails(props: Props) {
         LEAD_OPTIONS,
     );
 
+    const handleLeadChange = useCallback((newValue: SetBaseValueArg<PartialFormType>) => {
+        setValue(newValue, true);
+    }, [setValue]);
+
     return (
         <div className={_cs(className, styles.sourceDetails)}>
             <Card className={styles.previewContainer}>
@@ -100,7 +107,7 @@ function SourceDetails(props: Props) {
                     value={leadValue}
                     defaultValue={defaultValue}
                     error={leadFormError}
-                    onChange={setValue}
+                    onChange={handleLeadChange}
                     projectId={projectId}
                     disabled={disabled}
                     sourceOrganizationOptions={sourceOrganizationOptions}
@@ -113,6 +120,7 @@ function SourceDetails(props: Props) {
                     onAssigneeOptionChange={onAssigneeOptionChange}
                     attachment={attachment}
                     priorityOptions={leadOptions?.leadPriorityOptions?.enumValues}
+                    hasAssessment={project?.hasAssessmentTemplate}
                 />
             </Card>
         </div>
diff --git a/app/views/Project/EntryEdit/index.tsx b/app/views/Project/EntryEdit/index.tsx
index 5b7b248017..3be1863837 100644
--- a/app/views/Project/EntryEdit/index.tsx
+++ b/app/views/Project/EntryEdit/index.tsx
@@ -2,7 +2,6 @@ import React, { useState, useMemo, useCallback } from 'react';
 import {
     useParams,
     useLocation,
-    Prompt,
 } from 'react-router-dom';
 import {
     isNotDefined,
@@ -15,12 +14,14 @@ import {
 } from '@togglecorp/fujs';
 import {
     PendingMessage,
+    ConfirmButton,
     Button,
     Tabs,
     Tab,
     TabList,
     TabPanel,
-    ListView,
+    VirtualizedListView,
+    Kraken,
     Container,
     useAlert,
 } from '@the-deep/deep-ui';
@@ -37,6 +38,7 @@ import {
 } from '@togglecorp/toggle-form';
 import { useMutation, useQuery } from '@apollo/client';
 
+import { getHiddenWidgetIds, getWidgetVersion } from '#types/newAnalyticalFramework';
 import { GeoArea } from '#components/GeoMultiSelectInput';
 import { transformToFormError, ObjectError } from '#base/utils/errorTransform';
 import ProjectContext from '#base/context/ProjectContext';
@@ -51,19 +53,23 @@ import {
     ProjectFrameworkQueryVariables,
     LeadEntriesQuery,
     LeadEntriesQueryVariables,
+    LeadInputType,
     BulkUpdateEntriesMutation,
     BulkUpdateEntriesMutationVariables,
     LeadUpdateMutation,
     LeadUpdateMutationVariables,
 } from '#generated/types';
-import Svg from '#components/Svg';
-import deepLogo from '#resources/img/deep-logo-new.svg';
 import { BasicOrganization } from '#components/selections/NewOrganizationSelectInput';
 import { BasicProjectUser } from '#components/selections/ProjectUserSelectInput';
 import { BasicLeadGroup } from '#components/selections/LeadGroupSelectInput';
 import EntryInput from '#components/entry/EntryInput';
 import Section from '#components/entry/Section';
 import FrameworkImageButton from '#components/framework/FrameworkImageButton';
+import {
+    CountMap,
+    CommentCountContext,
+    CommentCountContextInterface,
+} from '#components/entryReview/EntryCommentWrapper/CommentContext';
 import _ts from '#ts';
 
 import {
@@ -75,6 +81,7 @@ import {
 
 import SourceDetails from './SourceDetails';
 import LeftPane from './LeftPane';
+import EntryCommentWrapper from '#components/entryReview/EntryCommentWrapper';
 
 import getSchema, { defaultFormValues, PartialEntryType, PartialFormType, PartialAttributeType } from './schema';
 import { Entry, EntryInput as EntryInputType, Framework } from './types';
@@ -91,7 +98,6 @@ function transformEntry(entry: Entry): EntryInputType {
         ...entry,
         lead: entry.lead.id,
         image: entry.image?.id,
-        // FIXME: try to filter out un-necessary attributes
         attributes: entry.attributes?.map((attribute) => ({
             ...attribute,
             // NOTE: we don't need this on form
@@ -108,6 +114,18 @@ function EntryEdit(props: Props) {
     const { className } = props;
     const { project } = React.useContext(ProjectContext);
     const { leadId } = useParams<{ leadId: string }>();
+    const [
+        commentsCountMap,
+        setCommentsCountMap,
+    ] = useState<CountMap>({});
+
+    const [showAllEntriesTab, setShowAllEntriesTab] = useState(false);
+
+    const commentCountContext: CommentCountContextInterface = useMemo(() => ({
+        commentsCountMap,
+        setCommentsCountMap,
+    }), [commentsCountMap]);
+
     const projectId = project ? project.id : undefined;
 
     const [
@@ -169,9 +187,12 @@ function EntryEdit(props: Props) {
     );
 
     const {
+        pristine: leadPristine,
         value: leadValue,
         setValue: setLeadValue,
+        setError: setLeadError,
         error: leadFormError,
+        validate: leadFormValidate,
     } = useForm(leadSchema, leadInitialValue);
 
     // ENTRY FORM
@@ -217,16 +238,32 @@ function EntryEdit(props: Props) {
     // eslint-disable-next-line max-len
     const frameworkDetails = frameworkData?.project?.analysisFramework as Framework | undefined | null;
 
-    // FIXME: memoize this
-    const widgetsMapping = listToMap(
-        [
-            ...(frameworkDetails?.primaryTagging?.flatMap((item) => (item.widgets ?? [])) ?? []),
-            ...(frameworkDetails?.secondaryTagging ?? []),
-        ],
-        (item) => item.id,
-        (item) => item,
+    const allWidgets = useMemo(
+        () => {
+            const widgetsFromPrimary = frameworkDetails?.primaryTagging?.flatMap(
+                (item) => (item.widgets ?? []),
+            ) ?? [];
+            const widgetsFromSecondary = frameworkDetails?.secondaryTagging ?? [];
+            return [
+                ...widgetsFromPrimary,
+                ...widgetsFromSecondary,
+            ];
+        },
+        [frameworkDetails?.primaryTagging, frameworkDetails?.secondaryTagging],
+    );
+
+    const schema = useMemo(
+        () => {
+            const widgetsMapping = listToMap(
+                allWidgets,
+                (item) => item.id,
+                (item) => item,
+            );
+
+            return getSchema(widgetsMapping);
+        },
+        [allWidgets],
     );
-    const schema = getSchema(widgetsMapping);
 
     const {
         value: formValue,
@@ -242,8 +279,12 @@ function EntryEdit(props: Props) {
         error: formError,
     } = useForm(schema, defaultFormValues);
 
-    const formStale = formValue?.entries?.some((entry) => entry.stale) ?? false;
-    const formPristine = !formStale;
+    const entriesFormStale = useMemo(
+        () => (formValue?.entries?.some((entry) => entry.stale) ?? false),
+        [formValue?.entries],
+    );
+
+    const formPristine = !entriesFormStale && leadPristine;
 
     const [staleIdentifiers, setStaleIdentifiers] = useState<string[] | undefined>(undefined);
     const [deleteIdentifiers, setDeleteIdentifiers] = useState<string[] | undefined>(undefined);
@@ -251,7 +292,7 @@ function EntryEdit(props: Props) {
 
     const [
         updateLead,
-        // { loading: leadUpdatePending },
+        { loading: leadUpdatePending },
     ] = useMutation<LeadUpdateMutation, LeadUpdateMutationVariables>(
         UPDATE_LEAD,
         {
@@ -266,14 +307,16 @@ function EntryEdit(props: Props) {
 
                 if (!ok) {
                     alert.show(
-                        'Failed to change lead status!',
+                        isFinalizeClicked ? 'Failed to mark source as tagged!' : 'Failed to update source.',
                         { variant: 'error' },
                     );
+                } else {
+                    alert.show(
+                        isFinalizeClicked ? 'Successfully marked source as tagged!' : 'Successfully updated source.',
+                        { variant: 'success' },
+                    );
                 }
-                alert.show(
-                    'Successfully marked lead as tagged!',
-                    { variant: 'success' },
-                );
+                setIsFinalizeClicked(false);
                 const leadData = removeNull(result);
                 setLeadValue({
                     ...leadData,
@@ -286,16 +329,47 @@ function EntryEdit(props: Props) {
             },
             onError: () => {
                 alert.show(
-                    'Failed to change lead status!',
+                    'Failed to update source!',
                     { variant: 'error' },
                 );
             },
         },
     );
 
+    const handleLeadSave = useCallback((finalized: boolean) => {
+        if (!projectId || (!finalized && leadPristine)) {
+            return;
+        }
+        const submit = createSubmitHandler(
+            leadFormValidate,
+            setLeadError,
+            (val) => {
+                const data = val as LeadInputType;
+                updateLead({
+                    variables: {
+                        data: {
+                            ...data,
+                            status: finalized ? 'TAGGED' : undefined,
+                        },
+                        leadId,
+                        projectId,
+                    },
+                });
+            },
+        );
+        submit();
+    }, [
+        leadFormValidate,
+        setLeadError,
+        leadPristine,
+        leadId,
+        projectId,
+        updateLead,
+    ]);
+
     const [
         bulkUpdateEntries,
-        // { loading: bulkUpdateEntriesPending },
+        { loading: bulkUpdateEntriesPending },
     ] = useMutation<BulkUpdateEntriesMutation, BulkUpdateEntriesMutationVariables>(
         BULK_UPDATE_ENTRIES,
         {
@@ -405,7 +479,7 @@ function EntryEdit(props: Props) {
                 const deleteSuccessCount = entryBulk?.deletedResult?.filter(isDefined).length ?? 0;
                 if (deleteSuccessCount > 0) {
                     alert.show(
-                        `${deleteSuccessCount} entries deleted successfully!`,
+                        `Successfully deleted ${deleteSuccessCount} entry(s)!`,
                         { variant: 'success' },
                     );
                 }
@@ -413,14 +487,14 @@ function EntryEdit(props: Props) {
                 const saveErrorsCount = entryBulk?.result?.filter(isNotDefined).length ?? 0;
                 if (saveErrorsCount > 0) {
                     alert.show(
-                        `Failed to save ${saveErrorsCount} entries!`,
+                        `Failed to save ${saveErrorsCount} entry(s)!`,
                         { variant: 'error' },
                     );
                 }
                 const saveSuccessCount = entryBulk?.result?.filter(isDefined).length ?? 0;
                 if (saveSuccessCount > 0) {
                     alert.show(
-                        `${saveSuccessCount} entries saved successfully!`,
+                        `Successfully saved ${saveSuccessCount} entry(s)!`,
                         { variant: 'success' },
                     );
                 }
@@ -435,21 +509,11 @@ function EntryEdit(props: Props) {
 
                 if (projectId && isFinalizeClicked) {
                     if (saveErrorsCount < 1 && deleteErrorsCount < 1) {
-                        setIsFinalizeClicked(false);
-                        updateLead({
-                            variables: {
-                                data: {
-                                    title: leadValue?.title || '',
-                                    status: 'TAGGED',
-                                },
-                                leadId,
-                                projectId,
-                            },
-                        });
+                        handleLeadSave(true);
                     } else {
-                        setIsFinalizeClicked(false);
+                        handleLeadSave(false);
                         alert.show(
-                            'Failed to change lead status!',
+                            'Source cannot be finalized due to some errors in entries.',
                             { variant: 'error' },
                         );
                     }
@@ -469,6 +533,7 @@ function EntryEdit(props: Props) {
                 // eslint-disable-next-line no-console
                 console.error(gqlError);
 
+                handleLeadSave(isFinalizeClicked);
                 if (isFinalizeClicked) {
                     setIsFinalizeClicked(false);
                     alert.show(
@@ -521,18 +586,28 @@ function EntryEdit(props: Props) {
                             // NOTE: we do not need this filter as entry.id is always defined
                             .filter(isDefined);
 
+                        // FIXME: this is repeated
                         const transformedEntries = staleEntries
-                            .map((entry) => ({
-                                ...entry,
-                                deleted: undefined,
-                                stale: undefined,
-                                attributes: entry.attributes
-                                    ?.filter((attribute) => isDefined(attribute.data))
-                                    .map((attribute) => ({
-                                        ...attribute,
-                                        widgetType: undefined,
-                                    })),
-                            }));
+                            .map((entry) => {
+                                const hiddenWidgetIds = getHiddenWidgetIds(
+                                    allWidgets,
+                                    entry.attributes ?? [],
+                                );
+
+                                return {
+                                    ...entry,
+                                    deleted: undefined,
+                                    stale: undefined,
+                                    attributes: entry.attributes
+                                        ?.filter((attribute) => isDefined(attribute.data))
+                                        .filter((attribute) => !hiddenWidgetIds[attribute.widget])
+                                        .map((attribute) => ({
+                                            ...attribute,
+                                            widgetVersion: attribute.widgetVersion,
+                                            widgetType: undefined,
+                                        })),
+                                };
+                            });
 
                         setIsFinalizeClicked(shouldSetFinalize);
                         bulkUpdateEntries({
@@ -543,8 +618,9 @@ function EntryEdit(props: Props) {
                             },
                         });
                     } else {
+                        handleLeadSave(shouldSetFinalize);
                         alert.show(
-                            'Entries updated successfully!',
+                            'Successfully updated entries!',
                             { variant: 'success' },
                         );
                     }
@@ -553,23 +629,37 @@ function EntryEdit(props: Props) {
             submit();
         },
         [
+            handleLeadSave,
             setFormError,
             formValidate,
             bulkUpdateEntries,
             projectId,
             alert,
             setFormValue,
+            allWidgets,
         ],
     );
 
     const handleSaveClick = useCallback(
-        () => handleSubmit(false),
-        [handleSubmit],
+        () => {
+            if (!entriesFormStale) {
+                handleLeadSave(false);
+            } else {
+                handleSubmit(false);
+            }
+        },
+        [handleSubmit, handleLeadSave, entriesFormStale],
     );
 
     const handleFinalizeClick = useCallback(
-        () => { handleSubmit(true); },
-        [handleSubmit],
+        () => {
+            if (!entriesFormStale) {
+                handleLeadSave(true);
+            } else {
+                handleSubmit(true);
+            }
+        },
+        [handleSubmit, entriesFormStale, handleLeadSave],
     );
 
     const handleEntryClick = useCallback((entryId: string) => {
@@ -618,15 +708,7 @@ function EntryEdit(props: Props) {
 
     const handleEntryCreate = useCallback(
         (newValue: PartialEntryType) => {
-            const widgetsFromPrimary = frameworkDetails?.primaryTagging?.flatMap(
-                (section) => section.widgets,
-            ).filter(isDefined) ?? [];
-            const widgetsFromSecondary = frameworkDetails?.secondaryTagging ?? [];
-
-            const defaultAttributes = [
-                ...widgetsFromPrimary,
-                ...widgetsFromSecondary,
-            ].map((item) => {
+            const defaultAttributes = allWidgets.map((item) => {
                 let attr: PartialAttributeType | undefined;
                 const clientId = randomString();
                 const widget = item.id;
@@ -636,6 +718,7 @@ function EntryEdit(props: Props) {
                         clientId,
                         widget,
                         widgetType: item.widgetId,
+                        widgetVersion: getWidgetVersion(item.widgetId),
                         data: {
                             value: item.properties.defaultValue,
                         },
@@ -645,6 +728,7 @@ function EntryEdit(props: Props) {
                         clientId,
                         widget,
                         widgetType: item.widgetId,
+                        widgetVersion: getWidgetVersion(item.widgetId),
                         data: {
                             value: item.properties.defaultValue,
                         },
@@ -654,6 +738,7 @@ function EntryEdit(props: Props) {
                         clientId,
                         widget,
                         widgetType: item.widgetId,
+                        widgetVersion: getWidgetVersion(item.widgetId),
                         data: {
                             value: item.properties.defaultValue,
                         },
@@ -663,6 +748,7 @@ function EntryEdit(props: Props) {
                         clientId,
                         widget,
                         widgetType: item.widgetId,
+                        widgetVersion: getWidgetVersion(item.widgetId),
                         data: {
                             value: item.properties.defaultValue,
                         },
@@ -672,6 +758,7 @@ function EntryEdit(props: Props) {
                         clientId,
                         widget,
                         widgetType: item.widgetId,
+                        widgetVersion: getWidgetVersion(item.widgetId),
                         data: {
                             value: item.properties.defaultValue,
                         },
@@ -683,12 +770,12 @@ function EntryEdit(props: Props) {
             createRestorePoint();
             setFormFieldValue(
                 (prevValue: PartialFormType['entries']) => [
-                    ...(prevValue ?? []),
                     {
                         ...newValue,
                         stale: true,
                         attributes: defaultAttributes,
                     },
+                    ...(prevValue ?? []),
                 ],
                 'entries',
             );
@@ -697,8 +784,7 @@ function EntryEdit(props: Props) {
         [
             setFormFieldValue,
             createRestorePoint,
-            frameworkDetails?.primaryTagging,
-            frameworkDetails?.secondaryTagging,
+            allWidgets,
         ],
     );
 
@@ -769,6 +855,7 @@ function EntryEdit(props: Props) {
     // ENTRY
     const handleAddButtonClick = useCallback((entryId: string, sectionId?: string) => {
         handleEntryClick(entryId);
+        setShowAllEntriesTab(true);
         if (sectionId) {
             window.location.replace('#/primary-tagging');
             setSelectedSection(sectionId);
@@ -805,6 +892,13 @@ function EntryEdit(props: Props) {
                     const entries = leadFromResponse.entries?.map(
                         (entry) => transformEntry(entry as Entry),
                     );
+                    setCommentsCountMap(
+                        listToMap(
+                            leadFromResponse.entries ?? [],
+                            (entry) => entry.id,
+                            (entry) => entry.reviewCommentsCount,
+                        ),
+                    );
                     const geoData = leadFromResponse.entries
                         ?.map((entry) => entry?.attributes)
                         .flat()
@@ -816,7 +910,9 @@ function EntryEdit(props: Props) {
                     setGeoAreaOptions(uniqueGeoData);
                     setFormValue((oldVal) => ({ ...oldVal, entries }));
                     const imagesMap = listToMap(
-                        leadFromResponse.entries?.map((entry) => entry.image).filter(isDefined),
+                        leadFromResponse.entries
+                            ?.map((entry) => entry.image)
+                            .filter(isDefined),
                         (d) => d.id,
                         (d) => d,
                     );
@@ -868,24 +964,105 @@ function EntryEdit(props: Props) {
         },
     );
 
+    const handleApplyToAll = useCallback(
+        (entryId: string, widgetId: string, applyBelowOnly?: boolean) => {
+            setFormFieldValue(
+                (prevValue: PartialFormType['entries']) => {
+                    if (!prevValue) {
+                        // eslint-disable-next-line no-console
+                        console.error('No entry found');
+                        return prevValue;
+                    }
+                    const referenceEntryIndex = prevValue.findIndex(
+                        (item) => item.clientId === entryId,
+                    );
+                    if (referenceEntryIndex === -1) {
+                        // eslint-disable-next-line no-console
+                        console.error('No entry found');
+                        return prevValue;
+                    }
+                    const referenceEntry = prevValue[referenceEntryIndex];
+                    const referenceAttribute = referenceEntry.attributes?.find(
+                        (item) => item.widget === widgetId,
+                    );
+                    // iterate over entries,
+                    // update stale and inject attributes
+
+                    return prevValue.map((entry, index) => {
+                        if (entry.clientId === entryId) {
+                            return entry;
+                        }
+                        if (applyBelowOnly && index <= referenceEntryIndex) {
+                            return entry;
+                        }
+
+                        const newAttributes = [...(entry.attributes ?? [])];
+
+                        const attributeIndex = newAttributes.findIndex(
+                            (attribute) => attribute.widget === widgetId,
+                        );
+
+                        if (attributeIndex !== -1) {
+                            if (referenceAttribute) {
+                                const oldValue = newAttributes[attributeIndex];
+                                newAttributes.splice(attributeIndex, 1, {
+                                    ...referenceAttribute,
+                                    id: oldValue.id,
+                                    clientId: oldValue.clientId,
+                                });
+                            } else {
+                                delete newAttributes[attributeIndex];
+                            }
+                        } else if (referenceAttribute) {
+                            newAttributes.push({
+                                ...referenceAttribute,
+                                id: undefined,
+                                clientId: randomString(),
+                            });
+                        }
+
+                        return {
+                            ...entry,
+                            stale: true,
+                            attributes: newAttributes,
+                        };
+                    });
+                },
+                'entries',
+            );
+        },
+        [setFormFieldValue],
+    );
+
     const entryDataRendererParams = useCallback(
         (entryId: string, datum: PartialEntryType, index: number) => ({
             value: datum,
             name: index,
+            projectId,
             index,
             onChange: handleEntryChange,
             secondaryTagging: frameworkDetails?.secondaryTagging,
             onAddButtonClick: handleAddButtonClick,
             primaryTagging: frameworkDetails?.primaryTagging,
+            excerptHeaderActions: datum.id && projectId && (
+                <EntryCommentWrapper
+                    // FIXME: Remove cast after entry comments
+                    // is switched to gql
+                    entryId={+datum.id}
+                    projectId={projectId}
+                />
+            ),
             leadId,
-            projectId,
             disabled: !!selectedEntry,
             entryImage: datum?.image ? entryImagesMap?.[datum.image] : undefined,
             error: entriesError?.[entryId],
             geoAreaOptions,
             onGeoAreaOptionsChange: setGeoAreaOptions,
+            onApplyToAll: handleApplyToAll,
+            allWidgets,
         }),
         [
+            allWidgets,
             geoAreaOptions,
             projectId,
             handleAddButtonClick,
@@ -896,22 +1073,47 @@ function EntryEdit(props: Props) {
             leadId,
             selectedEntry,
             entriesError,
+            handleApplyToAll,
         ],
     );
 
     const lead = data?.project?.lead;
-    const loading = frameworkLoading || entriesLoading;
+    const loading = frameworkLoading
+        || entriesLoading
+        || bulkUpdateEntriesPending
+        || leadUpdatePending;
+
+    const disableFinalizeButton = useMemo(() => {
+        if (loading) {
+            return true;
+        }
+
+        // NOTE: If any entry is selected, we'll disable the button
+        if (selectedEntry) {
+            return true;
+        }
+
+        if ((formValue.entries?.length ?? 0) < 1) {
+            return true;
+        }
+
+        // NOTE: If entries form is not edited and lead's status is already tagged
+        // we don't need to finalize the lead
+        if (!entriesFormStale && leadValue.status === 'TAGGED') {
+            return true;
+        }
+
+        return false;
+    }, [
+        selectedEntry,
+        entriesFormStale,
+        loading,
+        leadValue.status,
+        formValue.entries,
+    ]);
 
     return (
         <div className={_cs(styles.entryEdit, className)}>
-            <Prompt
-                message={(newLocation) => {
-                    if (newLocation.pathname !== location.pathname && !formPristine) {
-                        return _ts('common', 'youHaveUnsavedChanges');
-                    }
-                    return true;
-                }}
-            />
             <Tabs
                 useHash
                 defaultHash="source-details"
@@ -920,14 +1122,7 @@ function EntryEdit(props: Props) {
                     className={styles.header}
                     heading="Source"
                     description={lead?.title}
-                    defaultIcons={(
-                        <div className={styles.appBrand}>
-                            <Svg
-                                src={deepLogo}
-                                className={styles.logo}
-                            />
-                        </div>
-                    )}
+                    homeLinkShown
                     defaultActions={(
                         <>
                             <BackLink defaultLink="/">
@@ -935,35 +1130,21 @@ function EntryEdit(props: Props) {
                             </BackLink>
                             <Button
                                 name={undefined}
-                                disabled={formPristine || !!selectedEntry}
+                                disabled={formPristine || !!selectedEntry || loading}
                                 onClick={handleSaveClick}
                             >
                                 Save
                             </Button>
-                            <Button
+                            <ConfirmButton
                                 name={undefined}
-                                disabled={formPristine || !!selectedEntry}
+                                disabled={disableFinalizeButton}
                                 variant="primary"
-                                onClick={handleFinalizeClick}
-                            >
-                                Finalize
-                            </Button>
-                            {/*
-                            <Button
-                                name={undefined}
-                                // NOTE: To be fixed later
-                                disabled
-                            >
-                                Save Source
-                            </Button>
-                            <Button
-                                name={undefined}
-                                // NOTE: To be fixed later
-                                disabled
+                                onConfirm={handleFinalizeClick}
+                                message="Finalizing the source will mark it as tagged.
+                                Are you sure you want to finalize the source and all its entries?"
                             >
                                 Finalize
-                            </Button>
-                            */}
+                            </ConfirmButton>
                         </>
                     )}
                 >
@@ -998,189 +1179,218 @@ function EntryEdit(props: Props) {
                         </Tab>
                     </TabList>
                 </SubNavbar>
-                <div className={styles.tabPanelContainer}>
-                    {loading && <PendingMessage />}
-                    <TabPanel
-                        className={styles.tabPanel}
-                        name="source-details"
-                    >
-                        {projectId && (
-                            <SourceDetails
-                                leadValue={leadValue}
-                                setValue={setLeadValue}
-                                defaultValue={leadInitialValue}
-                                leadFormError={leadFormError}
-                                pending={loading}
-                                projectId={projectId}
-                                sourceOrganizationOptions={sourceOrganizationOptions}
-                                onSourceOrganizationOptionsChange={setSourceOrganizationOptions}
-                                authorOrganizationOptions={authorOrganizationOptions}
-                                onAuthorOrganizationOptionsChange={setAuthorOrganizationOptions}
-                                leadGroupOptions={leadGroupOptions}
-                                onLeadGroupOptionsChange={setLeadGroupOptions}
-                                assigneeOptions={projectUserOptions}
-                                onAssigneeOptionChange={setProjectUserOptions}
-                                attachment={lead?.attachment}
-                            />
-                        )}
-                    </TabPanel>
-                    <TabPanel
-                        className={styles.tabPanel}
-                        name="primary-tagging"
-                    >
-                        {frameworkDetails && (
-                            <div className={styles.primaryTagging}>
-                                <LeftPane
-                                    className={styles.sourcePreview}
-                                    entries={formValue.entries}
-                                    activeEntry={selectedEntry}
-                                    onEntryClick={handleEntryClick}
-                                    onEntryCreate={handleEntryCreate}
-                                    onApproveButtonClick={handleEntryChangeApprove}
-                                    onDiscardButtonClick={handleEntryChangeDiscard}
-                                    onEntryDelete={handleEntryDelete}
-                                    onEntryRestore={handleEntryRestore}
-                                    onExcerptChange={handleExcerptChange}
-                                    lead={lead}
-                                    leadId={leadId}
-                                    entryImagesMap={entryImagesMap}
-                                    isEntrySelectionActive={isEntrySelectionActive}
-                                    entriesError={entriesErrorStateMap}
-                                    // NOTE: If entry Id comes from state, we need to
-                                    // show entries tab as it always has the entry
-                                    defaultTab={!entryIdFromState ? 'entries' : undefined}
+                <CommentCountContext.Provider value={commentCountContext}>
+                    <div className={styles.tabPanelContainer}>
+                        {loading && <PendingMessage />}
+                        <TabPanel
+                            activeClassName={styles.tabPanel}
+                            name="source-details"
+                            retainMount="lazy"
+                        >
+                            {projectId && (
+                                <SourceDetails
+                                    leadValue={leadValue}
+                                    setValue={setLeadValue}
+                                    defaultValue={leadInitialValue}
+                                    leadFormError={leadFormError}
+                                    pending={loading}
+                                    projectId={projectId}
+                                    sourceOrganizationOptions={sourceOrganizationOptions}
+                                    onSourceOrganizationOptionsChange={setSourceOrganizationOptions}
+                                    authorOrganizationOptions={authorOrganizationOptions}
+                                    onAuthorOrganizationOptionsChange={setAuthorOrganizationOptions}
+                                    leadGroupOptions={leadGroupOptions}
+                                    onLeadGroupOptionsChange={setLeadGroupOptions}
+                                    assigneeOptions={projectUserOptions}
+                                    onAssigneeOptionChange={setProjectUserOptions}
+                                    attachment={lead?.attachment}
                                 />
-                                <Container
-                                    className={_cs(className, styles.sections)}
-                                    headerActions={(
-                                        <FrameworkImageButton
-                                            frameworkId={frameworkDetails.id}
-                                            label={_ts('analyticalFramework.primaryTagging', 'viewFrameworkImageButtonLabel')}
-                                            variant="secondary"
-                                        />
-                                    )}
-                                    contentClassName={styles.content}
-                                >
-                                    <Tabs
-                                        value={selectedSection}
-                                        onChange={setSelectedSection}
-                                        variant="step"
+                            )}
+                        </TabPanel>
+                        <TabPanel
+                            activeClassName={styles.tabPanel}
+                            name="primary-tagging"
+                            retainMount="lazy"
+                        >
+                            {frameworkDetails && (
+                                <div className={styles.primaryTagging}>
+                                    <LeftPane
+                                        className={styles.sourcePreview}
+                                        projectId={projectId}
+                                        entries={formValue.entries}
+                                        activeEntry={selectedEntry}
+                                        onEntryClick={handleEntryClick}
+                                        onEntryCreate={handleEntryCreate}
+                                        onApproveButtonClick={handleEntryChangeApprove}
+                                        onDiscardButtonClick={handleEntryChangeDiscard}
+                                        onEntryDelete={handleEntryDelete}
+                                        onEntryRestore={handleEntryRestore}
+                                        onExcerptChange={handleExcerptChange}
+                                        lead={lead}
+                                        leadId={leadId}
+                                        entryImagesMap={entryImagesMap}
+                                        isEntrySelectionActive={isEntrySelectionActive}
+                                        entriesError={entriesErrorStateMap}
+                                        // NOTE: If entry Id comes from state, we need to
+                                        // show entries tab as it always has the entry
+                                        defaultTab={(entryIdFromState || showAllEntriesTab) ? 'entries' : undefined}
+                                    />
+                                    <Container
+                                        className={_cs(className, styles.sections)}
+                                        headerActions={(
+                                            <FrameworkImageButton
+                                                frameworkId={frameworkDetails.id}
+                                                label={_ts('analyticalFramework.primaryTagging', 'viewFrameworkImageButtonLabel')}
+                                                variant="secondary"
+                                            />
+                                        )}
+                                        contentClassName={styles.content}
                                     >
-                                        <TabList className={styles.tabs}>
+                                        <Tabs
+                                            value={selectedSection}
+                                            onChange={setSelectedSection}
+                                            variant="step"
+                                        >
+                                            <TabList className={styles.tabs}>
+                                                {frameworkDetails.primaryTagging?.map((section) => (
+                                                    <Tab
+                                                        key={section.clientId}
+                                                        name={section.clientId}
+                                                        borderWrapperClassName={
+                                                            styles.borderWrapper
+                                                        }
+                                                        className={_cs(
+                                                            styles.tab,
+                                                            // analyzeErrors(
+                                                            // error?.[section.clientId])
+                                                            // && styles.errored,
+                                                        )}
+                                                        title={section.tooltip ?? undefined}
+                                                    >
+                                                        {section.title}
+                                                    </Tab>
+                                                ))}
+                                            </TabList>
                                             {frameworkDetails.primaryTagging?.map((section) => (
-                                                <Tab
+                                                <TabPanel
                                                     key={section.clientId}
                                                     name={section.clientId}
-                                                    borderWrapperClassName={styles.borderWrapper}
-                                                    className={_cs(
-                                                        styles.tab,
-                                                        // analyzeErrors(error?.[section.clientId])
-                                                        // && styles.errored,
-                                                    )}
-                                                    title={section.tooltip ?? undefined}
+                                                    activeClassName={styles.panel}
                                                 >
-                                                    {section.title}
-                                                </Tab>
+                                                    <Section
+                                                        key={selectedEntry}
+                                                        allWidgets={allWidgets}
+                                                        widgets={section.widgets}
+                                                        attributesMap={attributesMap}
+                                                        onAttributeChange={onAttributeChange}
+                                                        readOnly={!currentEntry}
+                                                        error={currentEntryError?.attributes}
+                                                        geoAreaOptions={geoAreaOptions}
+                                                        onGeoAreaOptionsChange={setGeoAreaOptions}
+                                                    />
+                                                </TabPanel>
                                             ))}
-                                        </TabList>
-                                        {frameworkDetails.primaryTagging?.map((section) => (
-                                            <TabPanel
-                                                key={section.clientId}
-                                                name={section.clientId}
-                                                className={styles.panel}
-                                            >
-                                                <Section
-                                                    widgets={section.widgets}
-                                                    attributesMap={attributesMap}
-                                                    onAttributeChange={onAttributeChange}
-                                                    readOnly={!currentEntry}
-                                                    error={currentEntryError?.attributes}
-                                                    geoAreaOptions={geoAreaOptions}
-                                                    onGeoAreaOptionsChange={setGeoAreaOptions}
-                                                />
-                                            </TabPanel>
-                                        ))}
-                                    </Tabs>
-                                </Container>
-                            </div>
-                        )}
-                    </TabPanel>
-                    <TabPanel
-                        className={styles.tabPanel}
-                        name="secondary-tagging"
-                    >
-                        {frameworkDetails && (
-                            <div className={styles.secondaryTagging}>
-                                <LeftPane
-                                    className={styles.sourcePreview}
-                                    entries={formValue.entries}
-                                    activeEntry={selectedEntry}
-                                    onEntryClick={handleEntryClick}
-                                    onEntryCreate={handleEntryCreate}
-                                    onEntryDelete={handleEntryDelete}
-                                    onEntryRestore={handleEntryRestore}
-                                    onExcerptChange={handleExcerptChange}
-                                    onApproveButtonClick={handleEntryChangeApprove}
-                                    onDiscardButtonClick={handleEntryChangeDiscard}
-                                    lead={lead}
-                                    leadId={leadId}
-                                    hideSimplifiedPreview
-                                    hideOriginalPreview
-                                    entryImagesMap={entryImagesMap}
-                                    isEntrySelectionActive={isEntrySelectionActive}
-                                    entriesError={entriesErrorStateMap}
-                                    defaultTab={!entryIdFromState ? 'entries' : undefined}
-                                />
+                                        </Tabs>
+                                    </Container>
+                                </div>
+                            )}
+                        </TabPanel>
+                        <TabPanel
+                            activeClassName={styles.tabPanel}
+                            name="secondary-tagging"
+                            retainMount="lazy"
+                        >
+                            {frameworkDetails && (
+                                <div className={styles.secondaryTagging}>
+                                    <LeftPane
+                                        className={styles.sourcePreview}
+                                        projectId={projectId}
+                                        entries={formValue.entries}
+                                        activeEntry={selectedEntry}
+                                        onEntryClick={handleEntryClick}
+                                        onEntryCreate={handleEntryCreate}
+                                        onEntryDelete={handleEntryDelete}
+                                        onEntryRestore={handleEntryRestore}
+                                        onExcerptChange={handleExcerptChange}
+                                        onApproveButtonClick={handleEntryChangeApprove}
+                                        onDiscardButtonClick={handleEntryChangeDiscard}
+                                        lead={lead}
+                                        leadId={leadId}
+                                        hideSimplifiedPreview
+                                        hideOriginalPreview
+                                        entryImagesMap={entryImagesMap}
+                                        isEntrySelectionActive={isEntrySelectionActive}
+                                        entriesError={entriesErrorStateMap}
+                                        defaultTab={entryIdFromState ? 'entries' : undefined}
+                                    />
+                                    <Container
+                                        className={styles.rightContainer}
+                                        contentClassName={styles.frameworkOutput}
+                                        headerActions={(
+                                            <FrameworkImageButton
+                                                frameworkId={frameworkDetails.id}
+                                                label={_ts('analyticalFramework.primaryTagging', 'viewFrameworkImageButtonLabel')}
+                                                variant="secondary"
+                                            />
+                                        )}
+                                    >
+                                        <Section
+                                            key={selectedEntry}
+                                            allWidgets={allWidgets}
+                                            widgets={frameworkDetails.secondaryTagging}
+                                            attributesMap={attributesMap}
+                                            onAttributeChange={onAttributeChange}
+                                            readOnly={!currentEntry}
+                                            error={currentEntryError?.attributes}
+                                            geoAreaOptions={geoAreaOptions}
+                                            onGeoAreaOptionsChange={setGeoAreaOptions}
+                                        />
+                                    </Container>
+                                </div>
+                            )}
+                        </TabPanel>
+                        <TabPanel
+                            name="review"
+                            activeClassName={styles.tabPanel}
+                            retainMount="lazy"
+                        >
+                            {frameworkDetails && (
                                 <Container
-                                    className={styles.rightContainer}
-                                    contentClassName={styles.frameworkOutput}
+                                    className={styles.review}
                                     headerActions={(
                                         <FrameworkImageButton
                                             frameworkId={frameworkDetails.id}
-                                            label={_ts('analyticalFramework.primaryTagging', 'viewFrameworkImageButtonLabel')}
+                                            label="View framework image for reference"
                                             variant="secondary"
                                         />
                                     )}
+                                    contentClassName={styles.reviewContent}
                                 >
-                                    <Section
-                                        widgets={frameworkDetails.secondaryTagging}
-                                        attributesMap={attributesMap}
-                                        onAttributeChange={onAttributeChange}
-                                        readOnly={!currentEntry}
-                                        error={currentEntryError?.attributes}
-                                        geoAreaOptions={geoAreaOptions}
-                                        onGeoAreaOptionsChange={setGeoAreaOptions}
+                                    <VirtualizedListView
+                                        itemHeight={360}
+                                        keySelector={entryKeySelector}
+                                        renderer={EntryInput}
+                                        data={formValue.entries}
+                                        direction="vertical"
+                                        spacing="comfortable"
+                                        rendererParams={entryDataRendererParams}
+                                        filtered={false}
+                                        errored={false}
+                                        pending={false}
+                                        emptyIcon={(
+                                            <Kraken
+                                                variant="search"
+                                            />
+                                        )}
+                                        emptyMessage="No entries found"
+                                        messageIconShown
+                                        messageShown
                                     />
                                 </Container>
-                            </div>
-                        )}
-                    </TabPanel>
-                    <TabPanel
-                        name="review"
-                        className={styles.tabPanel}
-                    >
-                        {frameworkDetails && (
-                            <Container
-                                className={styles.review}
-                                headerActions={(
-                                    <FrameworkImageButton
-                                        frameworkId={frameworkDetails.id}
-                                        label="View framework image for reference"
-                                        variant="secondary"
-                                    />
-                                )}
-                            >
-                                <ListView
-                                    className={styles.entries}
-                                    keySelector={entryKeySelector}
-                                    renderer={EntryInput}
-                                    data={formValue.entries}
-                                    rendererParams={entryDataRendererParams}
-                                />
-                            </Container>
-                        )}
-                    </TabPanel>
-                </div>
+                            )}
+                        </TabPanel>
+                    </div>
+                </CommentCountContext.Provider>
             </Tabs>
         </div>
     );
diff --git a/app/views/Project/EntryEdit/queries.ts b/app/views/Project/EntryEdit/queries.ts
index 7bf514b004..9f0c306d35 100644
--- a/app/views/Project/EntryEdit/queries.ts
+++ b/app/views/Project/EntryEdit/queries.ts
@@ -7,12 +7,14 @@ const ENTRY_FRAGMENT = gql`
         entryType
         droppedExcerpt
         excerpt
+        reviewCommentsCount
         attributes {
             clientId
             data
             id
             widget
             widgetType
+            widgetVersion
             geoSelectedOptions {
                 id
                 adminLevelTitle
@@ -45,6 +47,7 @@ export const LEAD_ENTRIES = gql`
         project(id: $projectId) {
             id
             lead(id: $leadId) {
+                id
                 title
                 leadGroup {
                     id
@@ -122,9 +125,15 @@ export const PROJECT_FRAMEWORK = gql`
                         key
                         order
                         properties
+                        conditional {
+                            parentWidget
+                            parentWidgetType
+                            conditions
+                        }
                         title
                         widgetId
                         width
+                        version
                     }
                     clientId
                     id
@@ -139,8 +148,14 @@ export const PROJECT_FRAMEWORK = gql`
                     order
                     title
                     properties
+                    conditional {
+                        parentWidget
+                        parentWidgetType
+                        conditions
+                    }
                     widgetId
                     width
+                    version
                 }
             }
         }
@@ -151,6 +166,7 @@ export const BULK_UPDATE_ENTRIES = gql`
     ${ENTRY_FRAGMENT}
     mutation BulkUpdateEntries($projectId:ID!, $deleteIds:[ID!], $entries: [BulkEntryInputType!]) {
         project(id: $projectId) {
+            id
             entryBulk(deleteIds: $deleteIds, items: $entries) {
                 errors
                 result {
@@ -167,6 +183,7 @@ export const BULK_UPDATE_ENTRIES = gql`
 export const UPDATE_LEAD = gql`
     mutation UpdateLead($projectId:ID!, $leadId:ID!, $data: LeadInputType!) {
         project(id: $projectId) {
+            id
             leadUpdate(data: $data, id: $leadId) {
                 result {
                     title,
diff --git a/app/views/Project/EntryEdit/schema.ts b/app/views/Project/EntryEdit/schema.ts
index 4af9533e39..b24e5a6e29 100644
--- a/app/views/Project/EntryEdit/schema.ts
+++ b/app/views/Project/EntryEdit/schema.ts
@@ -20,7 +20,7 @@ type FormType = {
 
 type getType<T, Q> = T extends Q ? T : never;
 
-export type PartialFormType = PartialForm<FormType, 'clientId' | 'widgetType' | 'widget' | 'data' | 'entryType' | 'lead'>;
+export type PartialFormType = PartialForm<FormType, 'clientId' | 'widgetType' | 'widget' | 'data' | 'entryType' | 'lead' | 'widgetVersion'>;
 
 export type PartialEntryType = NonNullable<PartialFormType['entries']>[number];
 
@@ -42,6 +42,7 @@ const getAttributeSchema = (widgets: Partial<Record<string, Widget>>): Attribute
             widget: [],
             data: [],
 
+            widgetVersion: [],
             // NOTE: widgetType this one is not needed on server
             widgetType: [],
         };
diff --git a/app/views/Project/EntryEdit/styles.css b/app/views/Project/EntryEdit/styles.css
index 98a621351e..3cc14e8297 100644
--- a/app/views/Project/EntryEdit/styles.css
+++ b/app/views/Project/EntryEdit/styles.css
@@ -1,12 +1,3 @@
-.app-brand {
-    overflow: auto;
-    color: var(--dui-color-brand);
-
-    .logo {
-        height: var(--dui-font-size-super-large);
-    }
-}
-
 .entry-edit {
     display: flex;
     flex-direction: column;
@@ -58,6 +49,8 @@
                         overflow-y: auto;
 
                         .tabs {
+                            flex-shrink: 0;
+
                             .border-wrapper {
                                 display: flex;
                                 flex-grow: 1;
@@ -105,15 +98,18 @@
             }
 
             .review {
+                display: flex;
+                flex-direction: column;
                 padding-right: var(--dui-spacing-super-large);
                 padding-left: var(--dui-spacing-super-large);
                 width: 100%;
+                overflow: auto;
 
-                .entries {
+                .review-content {
                     display: flex;
                     flex-direction: column;
-                    gap: var(--dui-spacing-large);
-                    overflow-y: auto;
+                    flex-grow: 1;
+                    overflow: auto;
                 }
             }
         }
diff --git a/app/views/Project/PillarAnalysis/AnalyticalStatementInput/AnalyticalNGramsModal/index.tsx b/app/views/Project/PillarAnalysis/AnalyticalStatementInput/AnalyticalNGramsModal/index.tsx
index df25e04dfe..65c5c95920 100644
--- a/app/views/Project/PillarAnalysis/AnalyticalStatementInput/AnalyticalNGramsModal/index.tsx
+++ b/app/views/Project/PillarAnalysis/AnalyticalStatementInput/AnalyticalNGramsModal/index.tsx
@@ -1,15 +1,17 @@
 import React, { useState, useCallback, useMemo, useContext } from 'react';
+import { useQuery, gql } from '@apollo/client';
 import {
     isDefined,
     mapToList,
 } from '@togglecorp/fujs';
 import {
     TextArea,
-    PendingMessage,
     Modal,
     Button,
     ListView,
+    Kraken,
     Container,
+    Message,
 } from '@the-deep/deep-ui';
 import {
     ResponsiveContainer,
@@ -22,18 +24,33 @@ import {
     Legend,
 } from 'recharts';
 
-import { useRequest } from '#base/utils/restRequest';
+import { useLazyRequest } from '#base/utils/restRequest';
 import ExcerptInput from '#components/entry/ExcerptInput';
 
 import {
     PartialAnalyticalStatementType,
 } from '../../schema';
 import EntryContext, { EntryMin } from '../../context';
+import {
+    TokenQuery,
+} from '#generated/types';
 
 import styles from './styles.css';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-function
-function noop() {}
+function noop() { }
+
+const TOKEN = gql`
+    query Token {
+        me {
+            id
+            jwtToken {
+                accessToken
+                expiresIn
+            }
+        }
+    }
+`;
 
 const chartMargins = {
     top: 0,
@@ -56,6 +73,7 @@ interface NgramsResponse {
             [key in string]: number;
         };
     }
+    token: string;
 }
 
 const keySelector = (item: EntryMin) => item.id;
@@ -116,15 +134,36 @@ function AnalyticalNGramsModal(props: Props) {
     }, [entriesForNgrams]);
 
     const {
-        pending,
+        pending: ngramsPending,
         response: ngramsResponse,
-    } = useRequest<NgramsResponse>({
-        url: 'serverless://ngram-process/',
+        trigger: getNgramsData,
+    } = useLazyRequest<NgramsResponse, string>({
         method: 'POST',
+        url: 'serverless://ngram-process/',
         body: entryPayload,
-        failureHeader: 'Failed to get ngrams',
+        other: (ctx) => ({
+            headers: {
+                Authorization: `Bearer ${ctx}`,
+            },
+        }),
     });
 
+    const {
+        loading: pendingUserToken,
+    } = useQuery<TokenQuery>(
+        TOKEN,
+        {
+            fetchPolicy: 'network-only',
+            onCompleted: (data) => {
+                const token = data.me?.jwtToken?.accessToken;
+                if (!token) {
+                    return;
+                }
+                getNgramsData(token);
+            },
+        },
+    );
+
     const {
         unigrams,
         bigrams,
@@ -160,14 +199,16 @@ function AnalyticalNGramsModal(props: Props) {
         onChange: noop,
     }), []);
 
+    const pending = ngramsPending || pendingUserToken;
+
     return (
         <Modal
             className={styles.analyticalModal}
             heading="Data Aggregation Column"
             onCloseButtonClick={onModalClose}
+            size="cover"
             bodyClassName={styles.modalBody}
         >
-            {pending && <PendingMessage />}
             <Container
                 className={styles.topContainer}
                 footerActions={(
@@ -189,112 +230,134 @@ function AnalyticalNGramsModal(props: Props) {
                 />
             </Container>
             <div className={styles.bottomContainer}>
-                <Container
-                    className={styles.entriesContainer}
-                    heading={`Selected Entries ${analyticalEntries?.length ?? 0}`}
-                >
-                    <ListView
-                        className={styles.list}
-                        data={entriesForNgrams}
-                        keySelector={keySelector}
-                        renderer={ExcerptInput}
-                        rendererParams={entriesRendererParams}
+                {entriesForNgrams.length > 0 && (
+                    <Container
+                        className={styles.entriesContainer}
+                        heading={`Selected Entries ${analyticalEntries?.length ?? 0}`}
+                    >
+                        <ListView
+                            className={styles.list}
+                            data={entriesForNgrams}
+                            keySelector={keySelector}
+                            renderer={ExcerptInput}
+                            rendererParams={entriesRendererParams}
+                            filtered={false}
+                            errored={false}
+                            pending={false}
+                        />
+                    </Container>
+                )}
+                {(unigrams.length > 0 || bigrams.length > 0 || trigrams.length > 0) ? (
+                    <div className={styles.chartContainer}>
+                        {unigrams.length > 0 && (
+                            <ResponsiveContainer>
+                                <BarChart
+                                    layout="vertical"
+                                    data={unigrams}
+                                    margin={chartMargins}
+                                >
+                                    <XAxis type="number" />
+                                    <YAxis
+                                        dataKey="name"
+                                        type="category"
+                                        scale="band"
+                                        tickFormatter={emptyTickFormatter}
+                                    />
+                                    <Tooltip />
+                                    <Legend verticalAlign="top" />
+                                    <Bar
+                                        name="Unigrams"
+                                        onClick={handleNgramClick}
+                                        dataKey="count"
+                                        barSize={16}
+                                        fill="#796ec6"
+                                        opacity="0.4"
+                                    >
+                                        <LabelList
+                                            dataKey="name"
+                                            position="insideLeft"
+                                        />
+                                    </Bar>
+                                </BarChart>
+                            </ResponsiveContainer>
+                        )}
+                        {bigrams.length > 0 && (
+                            <ResponsiveContainer>
+                                <BarChart
+                                    layout="vertical"
+                                    data={bigrams}
+                                    margin={chartMargins}
+                                >
+                                    <XAxis type="number" />
+                                    <YAxis
+                                        dataKey="name"
+                                        type="category"
+                                        scale="band"
+                                        tickFormatter={emptyTickFormatter}
+                                    />
+                                    <Tooltip />
+                                    <Legend verticalAlign="top" />
+                                    <Bar
+                                        name="Bigrams"
+                                        onClick={handleNgramClick}
+                                        dataKey="count"
+                                        barSize={16}
+                                        fill="#FB8A91"
+                                        opacity="0.4"
+                                    >
+                                        <LabelList
+                                            dataKey="name"
+                                            position="insideLeft"
+                                        />
+                                    </Bar>
+                                </BarChart>
+                            </ResponsiveContainer>
+                        )}
+                        {trigrams.length > 0 && (
+                            <ResponsiveContainer>
+                                <BarChart
+                                    layout="vertical"
+                                    data={trigrams}
+                                    margin={chartMargins}
+                                >
+                                    <XAxis type="number" />
+                                    <YAxis
+                                        dataKey="name"
+                                        tickFormatter={emptyTickFormatter}
+                                        type="category"
+                                        scale="band"
+                                    />
+                                    <Tooltip />
+                                    <Legend
+                                        verticalAlign="top"
+                                    />
+                                    <Bar
+                                        name="Trigrams"
+                                        onClick={handleNgramClick}
+                                        dataKey="count"
+                                        barSize={16}
+                                        fill="#4CC1B7"
+                                        opacity="0.4"
+                                    >
+                                        <LabelList
+                                            dataKey="name"
+                                            position="insideLeft"
+                                        />
+                                    </Bar>
+                                </BarChart>
+                            </ResponsiveContainer>
+                        )}
+                    </div>
+                ) : (
+                    <Message
+                        className={styles.message}
+                        erroredEmptyMessage="Failed to generate n-grams from provided entries."
+                        errored={entriesForNgrams.length > 0}
+                        message="There are no entries to generate n-grams from."
+                        pending={pending}
+                        icon={(<Kraken />)}
                     />
-                </Container>
-                <div className={styles.chartContainer}>
-                    <ResponsiveContainer>
-                        <BarChart
-                            layout="vertical"
-                            data={unigrams}
-                            margin={chartMargins}
-                        >
-                            <XAxis type="number" />
-                            <YAxis
-                                dataKey="name"
-                                type="category"
-                                scale="band"
-                                tickFormatter={emptyTickFormatter}
-                            />
-                            <Tooltip />
-                            <Legend verticalAlign="top" />
-                            <Bar
-                                name="Unigrams"
-                                onClick={handleNgramClick}
-                                dataKey="count"
-                                barSize={16}
-                                fill="#796ec6"
-                                opacity="0.4"
-                            >
-                                <LabelList
-                                    dataKey="name"
-                                    position="insideLeft"
-                                />
-                            </Bar>
-                        </BarChart>
-                    </ResponsiveContainer>
-                    <ResponsiveContainer>
-                        <BarChart
-                            layout="vertical"
-                            data={bigrams}
-                            margin={chartMargins}
-                        >
-                            <XAxis type="number" />
-                            <YAxis
-                                dataKey="name"
-                                type="category"
-                                scale="band"
-                                tickFormatter={emptyTickFormatter}
-                            />
-                            <Tooltip />
-                            <Legend verticalAlign="top" />
-                            <Bar
-                                name="Bigrams"
-                                onClick={handleNgramClick}
-                                dataKey="count"
-                                barSize={16}
-                                fill="#FB8A91"
-                                opacity="0.4"
-                            >
-                                <LabelList
-                                    dataKey="name"
-                                    position="insideLeft"
-                                />
-                            </Bar>
-                        </BarChart>
-                    </ResponsiveContainer>
-                    <ResponsiveContainer>
-                        <BarChart
-                            layout="vertical"
-                            data={trigrams}
-                            margin={chartMargins}
-                        >
-                            <XAxis type="number" />
-                            <YAxis
-                                dataKey="name"
-                                tickFormatter={emptyTickFormatter}
-                                type="category"
-                                scale="band"
-                            />
-                            <Tooltip />
-                            <Legend
-                                verticalAlign="top"
-                            />
-                            <Bar
-                                name="Trigrams"
-                                onClick={handleNgramClick}
-                                dataKey="count"
-                                barSize={16}
-                                fill="#4CC1B7"
-                                opacity="0.4"
-                            >
-                                <LabelList
-                                    dataKey="name"
-                                    position="insideLeft"
-                                />
-                            </Bar>
-                        </BarChart>
-                    </ResponsiveContainer>
-                </div>
+                )}
             </div>
         </Modal>
     );
diff --git a/app/views/Project/PillarAnalysis/AnalyticalStatementInput/AnalyticalNGramsModal/styles.css b/app/views/Project/PillarAnalysis/AnalyticalStatementInput/AnalyticalNGramsModal/styles.css
index 969306e6a2..4fbade25c5 100644
--- a/app/views/Project/PillarAnalysis/AnalyticalStatementInput/AnalyticalNGramsModal/styles.css
+++ b/app/views/Project/PillarAnalysis/AnalyticalStatementInput/AnalyticalNGramsModal/styles.css
@@ -1,7 +1,4 @@
 .analytical-modal {
-    width: 96vw;
-    height: 96vh;
-
     .modal-body {
         display: flex;
         flex-direction: column;
@@ -45,6 +42,13 @@
                 flex-basis: 75%;
                 overflow-y: auto;
             }
+
+            .message {
+                display: flex;
+                align-items: center;
+                flex-grow: 1;
+                justify-content: center;
+            }
         }
     }
 }
diff --git a/app/views/Project/PillarAnalysis/AnalyticalStatementInput/index.tsx b/app/views/Project/PillarAnalysis/AnalyticalStatementInput/index.tsx
index d44e136214..cc543ff193 100644
--- a/app/views/Project/PillarAnalysis/AnalyticalStatementInput/index.tsx
+++ b/app/views/Project/PillarAnalysis/AnalyticalStatementInput/index.tsx
@@ -210,6 +210,7 @@ function AnalyticalStatementInput(props: AnalyticalStatementInputProps) {
             headerIcons={(
                 <>
                     <QuickActionButton
+                        title="Include in report"
                         name="includeInReport"
                         onClick={handleIncludeInReportChange}
                         big
@@ -220,7 +221,7 @@ function AnalyticalStatementInput(props: AnalyticalStatementInputProps) {
                         )}
                     </QuickActionButton>
                     <QuickActionButton
-                        name="includeInReport"
+                        name="View n-grams analysis"
                         onClick={toggleAnalysisChart}
                         big
                     >
diff --git a/app/views/Project/PillarAnalysis/DiscardedEntries/DiscardedEntry/index.tsx b/app/views/Project/PillarAnalysis/DiscardedEntries/DiscardedEntry/index.tsx
index 171a65eca2..afb2864f31 100644
--- a/app/views/Project/PillarAnalysis/DiscardedEntries/DiscardedEntry/index.tsx
+++ b/app/views/Project/PillarAnalysis/DiscardedEntries/DiscardedEntry/index.tsx
@@ -7,6 +7,7 @@ import {
     PendingMessage,
     Tag,
     QuickActionConfirmButton,
+    useAlert,
 } from '@the-deep/deep-ui';
 
 import { useLazyRequest } from '#base/utils/restRequest';
@@ -18,7 +19,7 @@ import styles from './styles.css';
 
 export interface Props {
     className?: string;
-    entryId: number;
+    discardedEntryId: number;
     pillarId: number;
     tagDisplay: string;
     onEntryUndiscard: () => void;
@@ -31,7 +32,7 @@ export interface Props {
 function DiscardedEntry(props: Props) {
     const {
         className,
-        entryId,
+        discardedEntryId,
         pillarId,
         onEntryUndiscard,
         tagDisplay,
@@ -40,17 +41,23 @@ function DiscardedEntry(props: Props) {
         image,
     } = props;
 
+    const alert = useAlert();
+
     const {
         pending,
         trigger,
     } = useLazyRequest<unknown>({
-        url: `server://analysis-pillar/${pillarId}/discarded-entries/${entryId}/`,
+        url: `server://analysis-pillar/${pillarId}/discarded-entries/${discardedEntryId}/`,
         method: 'DELETE',
-        failureHeader: _ts('pillarAnalysis', 'pillarAnalysisTitle'),
+        failureMessage: 'Failed to undiscarded entry.',
         onSuccess: () => {
             if (onEntryUndiscard) {
                 onEntryUndiscard();
             }
+            alert.show(
+                'Successfully undiscarded the selected entry entry.',
+                { variant: 'success' },
+            );
         },
     });
 
@@ -73,6 +80,7 @@ function DiscardedEntry(props: Props) {
             footerActions={(
                 <QuickActionConfirmButton
                     name="undiscard"
+                    title="Undiscard entry"
                     disabled={pending}
                     onConfirm={handleUndiscardClick}
                     message={_ts('pillarAnalysis', 'confirmUndiscardEntryMessage')}
diff --git a/app/views/Project/PillarAnalysis/DiscardedEntries/index.tsx b/app/views/Project/PillarAnalysis/DiscardedEntries/index.tsx
index eb52b28080..b0b010b96f 100644
--- a/app/views/Project/PillarAnalysis/DiscardedEntries/index.tsx
+++ b/app/views/Project/PillarAnalysis/DiscardedEntries/index.tsx
@@ -2,11 +2,13 @@ import React, { useCallback, useMemo, useState } from 'react';
 import { _cs } from '@togglecorp/fujs';
 import {
     ListView,
+    Kraken,
     MultiSelectInput,
     Pager,
 } from '@the-deep/deep-ui';
 
 import { useRequest } from '#base/utils/restRequest';
+import { isFiltered } from '#utils/common';
 import {
     MultiResponse,
 } from '#types';
@@ -15,8 +17,6 @@ import {
     TabularDataFields,
 } from '#types/entry';
 
-import _ts from '#ts';
-
 import DiscardedEntryItem, { Props as DiscardedEntryProps } from './DiscardedEntry';
 import { DiscardedTags } from '../index';
 import styles from './styles.css';
@@ -87,7 +87,7 @@ function DiscardedEntries(props: Props) {
         onSuccess: (response) => {
             setEntriesCount(response.count);
         },
-        failureHeader: _ts('pillarAnalysis', 'entriesTitle'),
+        preserveResponse: true,
     });
 
     const handleEntryUndiscard = useCallback(() => {
@@ -97,7 +97,7 @@ function DiscardedEntries(props: Props) {
 
     const entryCardRendererParams = useCallback(
         (_: number, data: DiscardedEntry): DiscardedEntryProps => ({
-            entryId: data.entry,
+            discardedEntryId: data.id,
             tagDisplay: data.tagDisplay,
             excerpt: data.entryDetails.excerpt ?? '',
             image: data.entryDetails?.imageDetails?.file ? ({
@@ -140,6 +140,22 @@ function DiscardedEntries(props: Props) {
                 renderer={DiscardedEntryItem}
                 rendererParams={entryCardRendererParams}
                 pending={pendingEntries}
+                emptyIcon={(
+                    <Kraken
+                        variant="experiment"
+                    />
+                )}
+                emptyMessage="There aren't any discarded entries."
+                filteredEmptyMessage="There aren't any discarded entries under selected tag."
+                filtered={isFiltered(selectedDiscardedTag)}
+                errored={false}
+                filteredEmptyIcon={(
+                    <Kraken
+                        variant="search"
+                    />
+                )}
+                messageIconShown
+                messageShown
             />
             <Pager
                 className={styles.footer}
diff --git a/app/views/Project/PillarAnalysis/SourceEntryItem/index.tsx b/app/views/Project/PillarAnalysis/SourceEntryItem/index.tsx
index e45e84e092..4763609b7f 100644
--- a/app/views/Project/PillarAnalysis/SourceEntryItem/index.tsx
+++ b/app/views/Project/PillarAnalysis/SourceEntryItem/index.tsx
@@ -1,12 +1,15 @@
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import {
     _cs,
+    isDefined,
     compareDate,
 } from '@togglecorp/fujs';
 import { IoTrashBinOutline } from 'react-icons/io5';
 import {
     Tag,
     DraggableContent,
+    PendingMessage,
+    useConfirmation,
     QuickActionDropdownMenu,
     DropdownMenuItem,
 } from '@the-deep/deep-ui';
@@ -16,8 +19,10 @@ import ExcerptInput from '#components/entry/ExcerptInput';
 import { useLazyRequest } from '#base/utils/restRequest';
 import { genericMemo } from '#utils/common';
 import _ts from '#ts';
+
 import { EntryMin } from '../context';
 import { DiscardedTags } from '../index';
+
 import styles from './styles.css';
 
 export interface Props {
@@ -51,14 +56,16 @@ function SourceEntryItem(props: Props) {
     } = props;
 
     const value = useMemo(() => ({ entryId }), [entryId]);
+    const [selectedDiscardType, setSelectedDiscardType] = useState<number | undefined>();
 
     const {
+        pending: disardPending,
         trigger,
     } = useLazyRequest<unknown, { entry: number; tag: number }>({
         url: `server://analysis-pillar/${pillarId}/discarded-entries/`,
         method: 'POST',
         body: (ctx) => ctx,
-        failureHeader: _ts('pillarAnalysis', 'pillarAnalysisTitle'),
+        failureMessage: _ts('pillarAnalysis', 'pillarAnalysisTitle'),
         onSuccess: () => {
             if (onEntryDiscard) {
                 onEntryDiscard();
@@ -66,12 +73,29 @@ function SourceEntryItem(props: Props) {
         },
     });
 
-    const handleDiscardClick = useCallback((tagKey: number) => {
-        trigger({
-            entry: +entryId,
-            tag: tagKey,
-        });
-    }, [trigger, entryId]);
+    const handleDiscardConfirm = useCallback(() => {
+        if (isDefined(selectedDiscardType)) {
+            trigger({
+                entry: +entryId,
+                tag: selectedDiscardType,
+            });
+            setSelectedDiscardType(undefined);
+        }
+    }, [trigger, selectedDiscardType, entryId]);
+
+    const [
+        modal,
+        onDiscardButtonClick,
+    ] = useConfirmation<undefined>({
+        showConfirmationInitially: false,
+        onConfirm: handleDiscardConfirm,
+        message: 'Are you sure you want to discard this entry?',
+    });
+
+    const handleDiscardButtonClick = useCallback((tagKey: number) => {
+        setSelectedDiscardType(tagKey);
+        onDiscardButtonClick();
+    }, [onDiscardButtonClick]);
 
     const isNewEntry = compareDate(createdAt, pillarModifiedDate) > 0;
 
@@ -99,12 +123,14 @@ function SourceEntryItem(props: Props) {
             footerActions={(
                 <QuickActionDropdownMenu
                     label={(<IoTrashBinOutline />)}
+                    title="Discard entry"
+                    disabled={disardPending}
                 >
                     {discardedTags && discardedTags.map((tag) => (
                         <DropdownMenuItem
                             key={tag.key}
                             name={tag.key}
-                            onClick={handleDiscardClick}
+                            onClick={handleDiscardButtonClick}
                         >
                             {tag.value}
                         </DropdownMenuItem>
@@ -112,6 +138,7 @@ function SourceEntryItem(props: Props) {
                 </QuickActionDropdownMenu>
             )}
         >
+            {disardPending && <PendingMessage />}
             <ExcerptInput
                 entryType={entryType}
                 image={image}
@@ -120,6 +147,7 @@ function SourceEntryItem(props: Props) {
                 leadImageUrl={undefined}
                 readOnly
             />
+            {modal}
         </DraggableContent>
     );
 }
diff --git a/app/views/Project/PillarAnalysis/index.tsx b/app/views/Project/PillarAnalysis/index.tsx
index 682f753195..1642f764ee 100644
--- a/app/views/Project/PillarAnalysis/index.tsx
+++ b/app/views/Project/PillarAnalysis/index.tsx
@@ -1,8 +1,12 @@
 import React, { useContext, useCallback, useMemo, useState } from 'react';
-import { Prompt, useParams } from 'react-router-dom';
+import {
+    useParams,
+    useLocation,
+} from 'react-router-dom';
 import produce from 'immer';
 import { useQuery, gql } from '@apollo/client';
 import {
+    _cs,
     unique,
     isDefined,
     mapToList,
@@ -27,6 +31,7 @@ import {
     TabList,
     TabPanel,
     ListView,
+    Kraken,
     Pager,
 } from '@the-deep/deep-ui';
 import {
@@ -38,9 +43,10 @@ import {
 } from '@togglecorp/toggle-form';
 
 import SubNavbar from '#components/SubNavbar';
-import Svg from '#components/Svg';
-import deepLogo from '#resources/img/deep-logo-new.svg';
-import { breadcrumb } from '#utils/common';
+import {
+    breadcrumb,
+    isFiltered,
+} from '#utils/common';
 import ProjectContext from '#base/context/ProjectContext';
 import BackLink from '#components/BackLink';
 import NonFieldError from '#components/NonFieldError';
@@ -100,7 +106,6 @@ export const PROJECT_ENTRIES_FOR_ANALYSIS = gql`
             $page: Int,
             $pageSize: Int,
             $authoringOrganizationTypes: [ID!],
-            $commentStatus: EntryFilterCommentStatusEnum,
             $controlled: Boolean,
             $createdAtGte: DateTime,
             $createdAtLte: DateTime,
@@ -115,12 +120,13 @@ export const PROJECT_ENTRIES_FOR_ANALYSIS = gql`
             $leadStatuses: [LeadStatusEnum!],
         ) {
         project(id: $projectId) {
+            id
             analysisPillar(id: $pillarId) {
+                id
                 entries(
                     page: $page,
                     pageSize: $pageSize,
                     authoringOrganizationTypes: $authoringOrganizationTypes,
-                    commentStatus: $commentStatus,
                     controlled: $controlled,
                     createdAtGte: $createdAtGte,
                     createdAtLte: $createdAtLte,
@@ -298,7 +304,8 @@ function PillarAnalysis() {
     );
 
     const {
-        data: projectEntriesResponse,
+        previousData,
+        data: projectEntriesResponse = previousData,
         loading: pendingEntries,
         refetch: getEntries,
     } = useQuery<ProjectEntriesForAnalysisQuery, ProjectEntriesForAnalysisQueryVariables>(
@@ -374,7 +381,6 @@ function PillarAnalysis() {
                 ),
             }));
         },
-        failureHeader: _ts('pillarAnalysis', 'analysisPillarEntriesTitle'),
     });
 
     const {
@@ -480,7 +486,6 @@ function PillarAnalysis() {
                 );
             }
         },
-        failureHeader: _ts('pillarAnalysis', 'pillarAnalysisTitle'),
     });
 
     const {
@@ -509,7 +514,7 @@ function PillarAnalysis() {
                 setError(transformErrorToToggleFormError(schema, ctx, response.value.errors));
             }
         },
-        failureHeader: _ts('pillarAnalysis', 'pillarAnalysisTitle'),
+        failureMessage: 'Failed to update pillar analysis.',
     });
 
     const entriesResponse = useMemo(() => (
@@ -521,7 +526,7 @@ function PillarAnalysis() {
         response: discardedTags,
     } = useRequest<DiscardedTags[]>({
         url: 'server://discarded-entry-options/',
-        failureHeader: _ts('pillarAnalysis', 'entriesTitle'),
+        method: 'GET',
     });
 
     const handleEntryDrop = useCallback(
@@ -664,20 +669,23 @@ function PillarAnalysis() {
         setFieldValue(orderedValues, 'analyticalStatements');
     }, [setFieldValue]);
 
+    const statementsCount = value.analyticalStatements?.length ?? 0;
+
+    const entryContextValue = useMemo(
+        () => ({
+            entries: entriesMapping,
+            setEntries: setEntriesMapping,
+        }),
+        [entriesMapping, setEntriesMapping],
+    );
+
     return (
         <div className={styles.pillarAnalysis}>
             <SubNavbar
                 className={styles.header}
                 heading={project?.title}
                 childrenClassName={styles.breadcrumb}
-                defaultIcons={(
-                    <div className={styles.appBrand}>
-                        <Svg
-                            src={deepLogo}
-                            className={styles.logo}
-                        />
-                    </div>
-                )}
+                homeLinkShown
                 defaultActions={(
                     <>
                         <BackLink
@@ -777,7 +785,7 @@ function PillarAnalysis() {
                         >
                             <TabPanel
                                 name="entries"
-                                className={styles.tabPanel}
+                                activeClassName={styles.tabPanel}
                             >
                                 <ListView
                                     className={styles.entriesList}
@@ -786,6 +794,17 @@ function PillarAnalysis() {
                                     renderer={SourceEntryItem}
                                     rendererParams={entryCardRendererParams}
                                     pending={pendingEntries}
+                                    errored={false}
+                                    filtered={isFiltered(filtersValue)}
+                                    emptyIcon={(
+                                        <Kraken
+                                            variant="experiment"
+                                        />
+                                    )}
+                                    emptyMessage="Entries not found."
+                                    filteredEmptyMessage="No matching entries were found."
+                                    messageIconShown
+                                    messageShown
                                 />
                                 <Pager
                                     className={styles.pager}
@@ -799,7 +818,7 @@ function PillarAnalysis() {
                             </TabPanel>
                             <TabPanel
                                 name="discarded"
-                                className={styles.tabPanel}
+                                activeClassName={styles.tabPanel}
                             >
                                 <DiscardedEntries
                                     className={styles.discardedEntriesContainer}
@@ -811,14 +830,14 @@ function PillarAnalysis() {
                         </CollapsibleContainer>
                     </Tabs>
                     <EntryContext.Provider
-                        value={{
-                            entries: entriesMapping,
-                            setEntries: setEntriesMapping,
-                        }}
+                        value={entryContextValue}
                     >
                         <div className={styles.rightContainer}>
                             <SortableList
-                                className={styles.list}
+                                className={_cs(
+                                    styles.list,
+                                    statementsCount < 1 && styles.empty,
+                                )}
                                 name="analyticalStatements"
                                 onChange={onOrderChange}
                                 data={value.analyticalStatements}
@@ -826,26 +845,38 @@ function PillarAnalysis() {
                                 renderer={AnalyticalStatementInput}
                                 direction="horizontal"
                                 rendererParams={analyticalStatementRendererParams}
-                                emptyMessage={null}
-                                emptyIcon={null}
+                                messageShown
+                                messageIconShown
+                                emptyMessage="Looks like there aren't any analytical statements in this analysis."
+                                messageActions={(
+                                    <Button
+                                        className={styles.addStatementButton}
+                                        name={undefined}
+                                        onClick={handleAnalyticalStatementAdd}
+                                        title={_ts('pillarAnalysis', 'addAnalyticalStatementButtonTitle')}
+                                        variant="primary"
+                                        icons={(<IoAdd />)}
+                                    >
+                                        Add Analytical Statement
+                                    </Button>
+                                )}
                             />
-                            <QuickActionButton
-                                className={styles.addStatementButton}
-                                name={undefined}
-                                onClick={handleAnalyticalStatementAdd}
-                                title={_ts('pillarAnalysis', 'addAnalyticalStatementButtonTitle')}
-                                variant="primary"
-                                disabled={
-                                    (value.analyticalStatements?.length ?? 0) >= STATEMENTS_LIMIT
-                                }
-                            >
-                                <IoAdd />
-                            </QuickActionButton>
+                            {statementsCount > 0 && (
+                                <QuickActionButton
+                                    className={styles.addStatementButton}
+                                    name={undefined}
+                                    onClick={handleAnalyticalStatementAdd}
+                                    title={(statementsCount < STATEMENTS_LIMIT
+                                        ? _ts('pillarAnalysis', 'addAnalyticalStatementButtonTitle')
+                                        : `You cannot add more than ${STATEMENTS_LIMIT} statements.`
+                                    )}
+                                    variant="primary"
+                                    disabled={statementsCount >= STATEMENTS_LIMIT}
+                                >
+                                    <IoAdd />
+                                </QuickActionButton>
+                            )}
                         </div>
-                        <Prompt
-                            when={!pristine}
-                            message={_ts('common', 'youHaveUnsavedChanges')}
-                        />
                     </EntryContext.Provider>
                 </div>
             </div>
diff --git a/app/views/Project/PillarAnalysis/styles.css b/app/views/Project/PillarAnalysis/styles.css
index ccbfcad2c1..e78bfbab1b 100644
--- a/app/views/Project/PillarAnalysis/styles.css
+++ b/app/views/Project/PillarAnalysis/styles.css
@@ -95,6 +95,7 @@
 
                         .entries-list {
                             flex-grow: 1;
+                            min-height: 100%;
                             overflow-y: auto;
                         }
 
@@ -126,6 +127,12 @@
 
                 .list {
                     display: flex;
+
+                    &.empty {
+                        align-items: center;
+                        flex-grow: 1;
+                        justify-content: center;
+                    }
                 }
 
                 .analytical-statement {
@@ -142,13 +149,3 @@
         }
     }
 }
-
-.app-brand {
-    overflow: auto;
-    color: var(--dui-color-brand);
-
-    .logo {
-        height: var(--dui-font-size-super-large);
-    }
-}
-
diff --git a/app/views/Project/Tagging/AryDashboard/index.tsx b/app/views/Project/Tagging/AryDashboard/index.tsx
new file mode 100644
index 0000000000..c92ed7514e
--- /dev/null
+++ b/app/views/Project/Tagging/AryDashboard/index.tsx
@@ -0,0 +1,121 @@
+import React, { useMemo } from 'react';
+import {
+    _cs,
+    isDefined,
+    isNotDefined,
+} from '@togglecorp/fujs';
+import {
+    PendingMessage,
+    Kraken,
+    Message,
+    Container,
+} from '@the-deep/deep-ui';
+import {
+    prepareUrlParams,
+} from '@togglecorp/toggle-request';
+import {
+    gql,
+    useQuery,
+} from '@apollo/client';
+
+import ProjectContext from '#base/context/ProjectContext';
+import {
+    ProjectVizQuery,
+    ProjectVizQueryVariables,
+} from '#generated/types';
+
+import styles from './styles.css';
+
+const vizRendererUrl = process.env.REACT_APP_ASSESSMENT_VIZ_URL || 'https://the-deep.github.io/deepviz-assessments/';
+
+const PROJECT_VIZ = gql`
+    query ProjectViz($projectId: ID!) {
+        project(id: $projectId) {
+            id
+            vizData {
+                dataUrl
+                publicUrl
+                publicShare
+                status
+            }
+        }
+    }
+`;
+
+interface Props {
+    className?: string;
+}
+
+function AryDashboard(props: Props) {
+    const {
+        className,
+    } = props;
+
+    const { project } = React.useContext(ProjectContext);
+    const activeProject = project?.id;
+
+    const variables = useMemo(() => (activeProject ? ({
+        projectId: activeProject,
+    }) : undefined), [activeProject]);
+
+    const {
+        data,
+        loading,
+    } = useQuery<ProjectVizQuery, ProjectVizQueryVariables>(
+        PROJECT_VIZ,
+        {
+            skip: !activeProject,
+            variables,
+        },
+    );
+
+    const vizUrl = useMemo(() => (
+        `${vizRendererUrl}?${prepareUrlParams({ dataUrl: data?.project?.vizData?.dataUrl })}`
+    ), [data]);
+
+    const status = data?.project?.vizData?.status;
+    const dataUrl = data?.project?.vizData?.dataUrl;
+
+    return (
+        <Container
+            className={_cs(styles.dashboard, className)}
+            contentClassName={styles.content}
+        >
+            {loading && <PendingMessage />}
+            {status === 'FAILURE' && (
+                <Message
+                    className={styles.message}
+                    icon={(
+                        <Kraken
+                            variant="experiment"
+                            size="large"
+                        />
+                    )}
+                    message="Oops! DEEP couldn't create the data necessary for visualization."
+                />
+            )}
+            {(status === 'SUCCESS' || (status === 'PENDING' && isDefined(dataUrl))) && (
+                <iframe
+                    className={styles.iframe}
+                    title="Visualization"
+                    src={vizUrl}
+                    sandbox="allow-scripts allow-same-origin allow-downloads"
+                />
+            )}
+            {(status === 'PENDING' && isNotDefined(dataUrl)) && (
+                <Message
+                    className={styles.message}
+                    icon={(
+                        <Kraken
+                            variant="experiment"
+                            size="large"
+                        />
+                    )}
+                    message="DEEP is currently processing your data. Please check again later."
+                />
+            )}
+        </Container>
+    );
+}
+
+export default AryDashboard;
diff --git a/app/views/Project/Tagging/AryDashboard/styles.css b/app/views/Project/Tagging/AryDashboard/styles.css
new file mode 100644
index 0000000000..b9f2cbd3c2
--- /dev/null
+++ b/app/views/Project/Tagging/AryDashboard/styles.css
@@ -0,0 +1,24 @@
+.dashboard {
+    background-color: var(--dui-color-foreground);
+    padding: 0;
+
+    .content {
+        display: flex;
+        flex-grow: 1;
+        padding: 0;
+
+        .iframe {
+            flex-grow: 1;
+            border: 0;
+            object-fit: contain;
+            object-position: center center;
+        }
+
+        .message {
+            display: flex;
+            align-items: center;
+            flex-grow: 1;
+            justify-content: center;
+        }
+    }
+}
diff --git a/app/views/Project/Tagging/Assessments/ActionCell/index.tsx b/app/views/Project/Tagging/Assessments/ActionCell/index.tsx
index 41fb76ab6e..b02b90a93d 100644
--- a/app/views/Project/Tagging/Assessments/ActionCell/index.tsx
+++ b/app/views/Project/Tagging/Assessments/ActionCell/index.tsx
@@ -4,15 +4,16 @@ import { IoTrashBinOutline } from 'react-icons/io5';
 import { FiEdit2 } from 'react-icons/fi';
 import {
     useAlert,
-    QuickActionLink,
     QuickActionConfirmButton,
 } from '@the-deep/deep-ui';
 import { gql, useMutation } from '@apollo/client';
+import routes from '#base/configs/routes';
 
 import {
     AssessmentDeleteMutation,
     AssessmentDeleteMutationVariables,
 } from '#generated/types';
+import SmartQuickActionLink from '#base/components/SmartQuickActionLink';
 
 import styles from './styles.css';
 
@@ -32,6 +33,8 @@ const ASSESSMENT_DELETE = gql`
 export interface Props {
     assessmentId: string;
     projectId?: string;
+    leadId?: string;
+    leadGroupId?: string;
     className?: string;
     disabled?: boolean;
     onDeleteSuccess: () => void;
@@ -41,6 +44,8 @@ function ActionCell(props: Props) {
     const {
         className,
         projectId,
+        leadId,
+        leadGroupId,
         assessmentId,
         onDeleteSuccess,
         disabled,
@@ -62,11 +67,18 @@ function ActionCell(props: Props) {
                             variant: 'success',
                         },
                     );
+                } else {
+                    alert.show(
+                        'Failed to delete assessment.',
+                        {
+                            variant: 'error',
+                        },
+                    );
                 }
             },
-            onError: (gqlError) => {
+            onError: () => {
                 alert.show(
-                    gqlError.message,
+                    'Failed to delete assessment.',
                     { variant: 'error' },
                 );
             },
@@ -86,15 +98,34 @@ function ActionCell(props: Props) {
 
     return (
         <div className={_cs(styles.actionCell, className)}>
-            <QuickActionLink
-                className={styles.button}
-                // TODO: Link this to actual assessment edit page
-                to="#"
-                disabled={disabled}
-                title="Edit"
-            >
-                <FiEdit2 />
-            </QuickActionLink>
+            {leadId && (
+                <SmartQuickActionLink
+                    className={styles.button}
+                    // TODO: Link this to actual assessment edit page
+                    attrs={{
+                        leadId,
+                    }}
+                    route={routes.assessmentEdit}
+                    disabled={disabled}
+                    title="Edit"
+                >
+                    <FiEdit2 />
+                </SmartQuickActionLink>
+            )}
+            {leadGroupId && (
+                <SmartQuickActionLink
+                    className={styles.button}
+                    // TODO: Link this to actual assessment edit page
+                    attrs={{
+                        leadGroupId,
+                    }}
+                    route={routes.groupAssessmentEdit}
+                    disabled={disabled}
+                    title="Edit"
+                >
+                    <FiEdit2 />
+                </SmartQuickActionLink>
+            )}
             <QuickActionConfirmButton
                 className={styles.button}
                 name="deleteButton"
diff --git a/app/views/Project/Tagging/Assessments/index.tsx b/app/views/Project/Tagging/Assessments/index.tsx
index 77d07b8a5b..288150c399 100644
--- a/app/views/Project/Tagging/Assessments/index.tsx
+++ b/app/views/Project/Tagging/Assessments/index.tsx
@@ -1,20 +1,25 @@
 import React, { useMemo, useState, useContext } from 'react';
 import { useQuery, gql } from '@apollo/client';
-import { _cs } from '@togglecorp/fujs';
 import {
-    PendingMessage,
+    _cs,
+} from '@togglecorp/fujs';
+import {
     Container,
     TableView,
     TableColumn,
     TableHeaderCellProps,
     TableHeaderCell,
+    Kraken,
     createStringColumn,
     Pager,
 } from '@the-deep/deep-ui';
 
 import ProjectContext from '#base/context/ProjectContext';
 import { createDateColumn } from '#components/tableHelpers';
-import { convertDateToIsoDateTime } from '#utils/common';
+import {
+    convertDateToIsoDateTime,
+    isFiltered,
+} from '#utils/common';
 import {
     AssessmentListQuery,
     AssessmentListQueryVariables,
@@ -35,6 +40,7 @@ const ASSESSMENT_LIST = gql`
         $projectId: ID!,
     ) {
         project(id: $projectId) {
+            id
             assessments (
                 search: $search,
                 createdAtLte: $endDate,
@@ -48,6 +54,10 @@ const ASSESSMENT_LIST = gql`
                         id
                         title
                     }
+                    leadGroup {
+                        id
+                        title
+                    }
                     createdAt
                     createdBy {
                         displayName
@@ -93,7 +103,8 @@ function Assessments(props: Props) {
     );
 
     const {
-        data,
+        previousData,
+        data = previousData,
         loading,
         refetch,
     } = useQuery<AssessmentListQuery, AssessmentListQueryVariables>(
@@ -121,6 +132,7 @@ function Assessments(props: Props) {
                 assessmentId,
                 projectId: project?.id,
                 leadId: assessment.lead?.id,
+                leadGroupId: assessment.leadGroup?.id,
                 onDeleteSuccess: refetch,
                 disabled: !canEditEntry,
             }),
@@ -130,7 +142,12 @@ function Assessments(props: Props) {
             createStringColumn<Assessment, string>(
                 'title',
                 'Title',
-                (item) => item?.lead?.title,
+                (item) => item?.lead?.title ?? item?.leadGroup?.title,
+            ),
+            createStringColumn<Assessment, string>(
+                'type',
+                'Type',
+                (item) => (item?.lead?.id ? 'Source' : 'Source Group'),
             ),
             createStringColumn<Assessment, string>(
                 'created_by',
@@ -151,7 +168,7 @@ function Assessments(props: Props) {
 
     return (
         <Container
-            className={_cs(styles.analysis, className)}
+            className={_cs(styles.assessments, className)}
             heading="All Assessment Sources"
             headerClassName={styles.header}
             contentClassName={styles.content}
@@ -172,12 +189,31 @@ function Assessments(props: Props) {
                 />
             )}
         >
-            {loading && (<PendingMessage />)}
             <TableView
                 className={styles.table}
                 columns={columns}
                 keySelector={assessmentKeySelector}
                 data={data?.project?.assessments?.results}
+                pending={loading}
+                filtered={isFiltered(filters)}
+                errored={false}
+                filteredEmptyMessage="No matching assessments found."
+                filteredEmptyIcon={(
+                    <Kraken
+                        variant="coffee"
+                        size="large"
+                    />
+                )}
+                rowClassName={styles.tableRow}
+                emptyMessage="No assessments found."
+                emptyIcon={(
+                    <Kraken
+                        size="large"
+                        variant="coffee"
+                    />
+                )}
+                messageShown
+                messageIconShown
             />
         </Container>
     );
diff --git a/app/views/Project/Tagging/Assessments/styles.css b/app/views/Project/Tagging/Assessments/styles.css
index f79e0bb023..11d0fcc577 100644
--- a/app/views/Project/Tagging/Assessments/styles.css
+++ b/app/views/Project/Tagging/Assessments/styles.css
@@ -1,4 +1,4 @@
-.analysis {
+.assessments {
     padding: 0;
 
     .header {
@@ -10,7 +10,11 @@
         padding: var(--dui-spacing-small) var(--dui-spacing-super-large);
 
         .table {
-            background-color: var(--dui-color-foreground);
+            min-height: 50vh;
+
+            .table-row {
+                background-color: var(--dui-color-foreground);
+            }
         }
     }
 
diff --git a/app/views/Project/Tagging/Dashboard/VisualizationShareModal/index.tsx b/app/views/Project/Tagging/Dashboard/VisualizationShareModal/index.tsx
index 02367017ed..9a1068204e 100644
--- a/app/views/Project/Tagging/Dashboard/VisualizationShareModal/index.tsx
+++ b/app/views/Project/Tagging/Dashboard/VisualizationShareModal/index.tsx
@@ -93,9 +93,9 @@ function VisualizationShareModal(props: ShareModalProps) {
                     );
                 }
             },
-            onError: (gqlError) => {
+            onError: () => {
                 alert.show(
-                    gqlError.message,
+                    'Failed to change url status.',
                     { variant: 'error' },
                 );
             },
@@ -124,7 +124,7 @@ function VisualizationShareModal(props: ShareModalProps) {
         navigator.clipboard.writeText(url ?? '');
 
         alert.show(
-            'Url was successfully copied to the clipboard',
+            'Successfully copied URL to clipboard.',
             {
                 variant: 'info',
             },
@@ -136,6 +136,7 @@ function VisualizationShareModal(props: ShareModalProps) {
             className={styles.modal}
             heading="Share Public Link"
             bodyClassName={styles.modalBody}
+            freeHeight
             onCloseButtonClick={onClose}
         >
             <Checkbox
diff --git a/app/views/Project/Tagging/Dashboard/index.tsx b/app/views/Project/Tagging/Dashboard/index.tsx
index f6b102cc34..d5cc974704 100644
--- a/app/views/Project/Tagging/Dashboard/index.tsx
+++ b/app/views/Project/Tagging/Dashboard/index.tsx
@@ -1,8 +1,13 @@
 import React, { useMemo, useState } from 'react';
-import { _cs } from '@togglecorp/fujs';
+import {
+    _cs,
+    isDefined,
+    isNotDefined,
+} from '@togglecorp/fujs';
 import { IoShareSocialOutline } from 'react-icons/io5';
 import {
     PendingMessage,
+    Kraken,
     Message,
     Button,
     Container,
@@ -83,12 +88,13 @@ function Dashboard(props: Props) {
         hideShareModal,
     ] = useModalState(false);
 
+    const status = data?.project?.vizData?.status;
+    const dataUrl = data?.project?.vizData?.dataUrl;
+
     const vizUrl = useMemo(() => (
         `${vizRendererUrl}?${prepareUrlParams({ dataUrl: data?.project?.vizData?.dataUrl })}`
     ), [data]);
 
-    const status = data?.project?.vizData?.status;
-
     return (
         <Container
             className={_cs(styles.dashboard, className)}
@@ -108,10 +114,16 @@ function Dashboard(props: Props) {
             {status === 'FAILURE' && (
                 <Message
                     className={styles.message}
+                    icon={(
+                        <Kraken
+                            variant="experiment"
+                            size="large"
+                        />
+                    )}
                     message="Oops! DEEP couldn't create the data necessary for visualization."
                 />
             )}
-            {status === 'SUCCESS' && (
+            {(status === 'SUCCESS' || (status === 'PENDING' && isDefined(dataUrl))) && (
                 <iframe
                     className={styles.iframe}
                     title="Visualization"
@@ -119,10 +131,16 @@ function Dashboard(props: Props) {
                     sandbox="allow-scripts allow-same-origin allow-downloads"
                 />
             )}
-            {status === 'PENDING' && (
+            {(status === 'PENDING' && isNotDefined(dataUrl)) && (
                 <Message
                     className={styles.message}
                     message="DEEP is currently processing your data. Please check again later."
+                    icon={(
+                        <Kraken
+                            variant="experiment"
+                            size="large"
+                        />
+                    )}
                 />
             )}
             {isShareModalShown && activeProject && publicUrl && (
diff --git a/app/views/Project/Tagging/Export/AssessmentsExportSelection/index.tsx b/app/views/Project/Tagging/Export/AssessmentsExportSelection/index.tsx
index 60886af460..66e8e516e8 100644
--- a/app/views/Project/Tagging/Export/AssessmentsExportSelection/index.tsx
+++ b/app/views/Project/Tagging/Export/AssessmentsExportSelection/index.tsx
@@ -14,7 +14,6 @@ import {
     SourceFilterOptionsQueryVariables,
     ExportDataTypeEnum,
 } from '#generated/types';
-import { generateFilename } from '#utils/common';
 import ProjectContext from '#base/context/ProjectContext';
 import _ts from '#ts';
 
@@ -29,6 +28,7 @@ const CREATE_EXPORT = gql`
         $data: ExportCreateInputType!,
     ) {
         project(id: $projectId) {
+            id
             exportCreate(data: $data) {
                 ok
                 errors
@@ -45,12 +45,14 @@ const CREATE_EXPORT = gql`
 interface Props {
     className?: string;
     projectId: string;
+    onSuccess: () => void;
 }
 
 function AssessmentsExportSelection(props: Props) {
     const {
         className,
         projectId,
+        onSuccess,
     } = props;
 
     const alert = useAlert();
@@ -58,7 +60,7 @@ function AssessmentsExportSelection(props: Props) {
     const { project } = React.useContext(ProjectContext);
     const filterOnlyUnprotected = !!project?.allowedPermissions?.includes('VIEW_ONLY_UNPROTECTED_LEAD');
 
-    const [queryTitle, setQueryTitle] = useState<string>();
+    const [queryTitle, setQueryTitle] = useState<string | undefined>();
     const [previewId, setPreviewId] = useState<string | undefined>(undefined);
     const [selectedLeads, setSelectedLeads] = useState<string[]>([]);
     const [selectAll, setSelectAll] = useState<boolean>(true);
@@ -84,12 +86,20 @@ function AssessmentsExportSelection(props: Props) {
                             _ts('export', 'exportStartedNotifyMessage'),
                             { variant: 'success' },
                         );
+                        onSuccess();
                     }
+                } else {
+                    alert.show(
+                        'Error during export.',
+                        {
+                            variant: 'error',
+                        },
+                    );
                 }
             },
-            onError: (gqlError) => {
+            onError: () => {
                 alert.show(
-                    gqlError.message,
+                    'Error during export.',
                     {
                         variant: 'error',
                     },
@@ -99,7 +109,6 @@ function AssessmentsExportSelection(props: Props) {
     );
 
     const startExport = useCallback((preview: boolean, type: Exclude<ExportDataTypeEnum, 'ENTRIES'>) => {
-        const defaultTitle = generateFilename('Assessments_Export', 'xlsx');
         const data = {
             exportType: 'EXCEL' as const,
             format: 'XLSX' as const,
@@ -110,7 +119,7 @@ function AssessmentsExportSelection(props: Props) {
                 ids: selectedLeads,
                 excludeProvidedLeadsId: selectAll,
             },
-            title: queryTitle ?? defaultTitle,
+            title: queryTitle,
         };
 
         createExport({
@@ -203,8 +212,8 @@ function AssessmentsExportSelection(props: Props) {
                         name="queryTitle"
                         value={queryTitle}
                         onChange={setQueryTitle}
-                        label="Query title"
-                        placeholder="Query title"
+                        label="Assessment export title"
+                        placeholder="Assessment export title"
                     />
                 </ControlledExpandableContainer>
                 <Footer
diff --git a/app/views/Project/Tagging/Export/EntriesExportSelection/ExportTypePane/ExportTypeButton/styles.css b/app/views/Project/Tagging/Export/EntriesExportSelection/ExportTypePane/ExportTypeButton/styles.css
index 00cab06ab6..1b3a4ad634 100644
--- a/app/views/Project/Tagging/Export/EntriesExportSelection/ExportTypePane/ExportTypeButton/styles.css
+++ b/app/views/Project/Tagging/Export/EntriesExportSelection/ExportTypePane/ExportTypeButton/styles.css
@@ -1,14 +1,13 @@
 .export-type-select {
+    opacity: 0.2;
     outline: 0;
     border: 0;
     border-radius: 0.1em;
     cursor: pointer;
     padding: var(--dui-spacing-medium);
-    color: var(--dui-color-text-disabled);
     font-size: var(--dui-font-size-super-large);
 
     &.active {
-        border: var(--dui-width-separator-thin) solid var(--dui-color-accent);
-        color: var(--dui-color-accent);
+        opacity: 1;
     }
 }
diff --git a/app/views/Project/Tagging/Export/EntriesExportSelection/ExportTypePane/index.tsx b/app/views/Project/Tagging/Export/EntriesExportSelection/ExportTypePane/index.tsx
index 2c7bbf43d0..44e51aa7d7 100644
--- a/app/views/Project/Tagging/Export/EntriesExportSelection/ExportTypePane/index.tsx
+++ b/app/views/Project/Tagging/Export/EntriesExportSelection/ExportTypePane/index.tsx
@@ -1,8 +1,8 @@
 import React, { useMemo, useCallback } from 'react';
-import { IoInformationCircleOutline } from 'react-icons/io5';
 import {
     Checkbox,
     List,
+    Card,
     ExpandableContainer,
     Container,
     ContainerCard,
@@ -63,22 +63,22 @@ interface Props {
 const exportTypes: ExportTypeItem[] = [
     {
         key: 'DOCX',
-        icon: <AiFillFileWord />,
+        icon: <AiFillFileWord title="Word export" />,
         title: _ts('export', 'docxLabel'),
     },
     {
         key: 'PDF',
-        icon: <AiFillFilePdf />,
+        icon: <AiFillFilePdf title="PDF export" />,
         title: _ts('export', 'pdfLabel'),
     },
     {
         key: 'XLSX',
-        icon: <AiFillFileExcel />,
+        icon: <AiFillFileExcel title="Excel export" />,
         title: _ts('export', 'xlsxLabel'),
     },
     {
         key: 'JSON',
-        icon: <AiFillFileText />,
+        icon: <AiFillFileText title="JSON Export" />,
         title: _ts('export', 'jsonLabel'),
     },
 ];
@@ -192,12 +192,10 @@ function RenderWordPdfOptions(props: RenderWordProps) {
                         className={styles.checkbox}
                     />
                 </div>
-                <div>
+                <div className={styles.selections}>
                     {contextualWidgets.length > 0 && reportShowEntryWidgetData && (
-                        <>
-                            <Heading
-                                size="extraSmall"
-                            >
+                        <div className={styles.selectionContainer}>
+                            <Heading size="extraSmall">
                                 Contextual Widgets
                             </Heading>
                             <TreeSelection
@@ -206,13 +204,11 @@ function RenderWordPdfOptions(props: RenderWordProps) {
                                 onChange={onSetContextualWidgets}
                                 direction="vertical"
                             />
-                        </>
+                        </div>
                     )}
                     {textWidgets.length > 0 && (
-                        <>
-                            <Heading
-                                size="extraSmall"
-                            >
+                        <div className={styles.selectionContainer}>
+                            <Heading size="extraSmall">
                                 Free Text Widgets
                             </Heading>
                             <TreeSelection
@@ -221,7 +217,7 @@ function RenderWordPdfOptions(props: RenderWordProps) {
                                 onChange={onSetTextWidgets}
                                 direction="vertical"
                             />
-                        </>
+                        </div>
                     )}
                 </div>
             </ContainerCard>
@@ -271,23 +267,18 @@ function RenderExcelOptions(props: RenderExcelProps) {
     } = props;
 
     return (
-        <>
+        <Card className={styles.excelOptions}>
             <Checkbox
                 name="excelDecoupled"
                 label={_ts('export', 'decoupledEntriesLabel')}
                 value={excelDecoupled}
                 onChange={onExcelDecoupledChange}
             />
-            <div
-                key="info"
-            >
-                <IoInformationCircleOutline />
-                <div>
-                    <p>{_ts('export', 'decoupledEntriesTitle2')}</p>
-                    <p>{_ts('export', 'decoupledEntriesTitle')}</p>
-                </div>
+            <div key="info">
+                <p>{_ts('export', 'decoupledEntriesTitle2')}</p>
+                <p>{_ts('export', 'decoupledEntriesTitle')}</p>
             </div>
-        </>
+        </Card>
     );
 }
 
@@ -350,48 +341,45 @@ function ExportTypePane(props: Props) {
                     keySelector={exportTypeKeyExtractor}
                 />
             </Container>
-            <ExpandableContainer
-                className={styles.advanced}
-                headerClassName={styles.header}
-                spacing="compact"
-                headingSize="extraSmall"
-                heading="Advanced"
-            >
-                {(activeExportFormat === 'DOCX' || activeExportFormat === 'PDF') && (
-                    <RenderWordPdfOptions
-                        includeSubSector={includeSubSector}
-                        onIncludeSubSectorChange={onIncludeSubSectorChange}
-                        onReportStructureChange={onReportStructureChange}
-                        onReportStructureVariantChange={onReportStructureVariantChange}
-                        onReportShowGroupsChange={onReportShowGroupsChange}
-                        onReportShowLeadEntryIdChange={onReportShowLeadEntryIdChange}
-                        onReportShowAssessmentDataChange={onReportShowAssessmentDataChange}
-                        onReportShowEntryWidgetDataChange={onReportShowEntryWidgetDataChange}
-                        showMatrix2dOptions={showMatrix2dOptions}
-                        reportStructure={reportStructure}
-                        reportStructureVariant={reportStructureVariant}
-                        reportShowGroups={reportShowGroups}
-                        reportShowLeadEntryId={reportShowLeadEntryId}
-                        reportShowAssessmentData={reportShowAssessmentData}
-                        reportShowEntryWidgetData={reportShowEntryWidgetData}
-                        contextualWidgets={contextualWidgets}
-                        onSetContextualWidgets={onSetContextualWidgets}
-                        textWidgets={textWidgets}
-                        onSetTextWidgets={onSetTextWidgets}
-                    />
-                )}
-                {activeExportFormat === 'XLSX' && (
-                    <RenderExcelOptions
-                        excelDecoupled={excelDecoupled}
-                        onExcelDecoupledChange={onExcelDecoupledChange}
-                    />
-                )}
-                {activeExportFormat === 'JSON' && (
-                    <p>
-                        { _ts('export', 'noOptionsAvailable') }
-                    </p>
-                )}
-            </ExpandableContainer>
+            {activeExportFormat !== 'JSON' && (
+                <ExpandableContainer
+                    className={styles.advanced}
+                    headerClassName={styles.header}
+                    spacing="compact"
+                    headingSize="extraSmall"
+                    heading="Advanced"
+                >
+                    {(activeExportFormat === 'DOCX' || activeExportFormat === 'PDF') && (
+                        <RenderWordPdfOptions
+                            includeSubSector={includeSubSector}
+                            onIncludeSubSectorChange={onIncludeSubSectorChange}
+                            onReportStructureChange={onReportStructureChange}
+                            onReportStructureVariantChange={onReportStructureVariantChange}
+                            onReportShowGroupsChange={onReportShowGroupsChange}
+                            onReportShowLeadEntryIdChange={onReportShowLeadEntryIdChange}
+                            onReportShowAssessmentDataChange={onReportShowAssessmentDataChange}
+                            onReportShowEntryWidgetDataChange={onReportShowEntryWidgetDataChange}
+                            showMatrix2dOptions={showMatrix2dOptions}
+                            reportStructure={reportStructure}
+                            reportStructureVariant={reportStructureVariant}
+                            reportShowGroups={reportShowGroups}
+                            reportShowLeadEntryId={reportShowLeadEntryId}
+                            reportShowAssessmentData={reportShowAssessmentData}
+                            reportShowEntryWidgetData={reportShowEntryWidgetData}
+                            contextualWidgets={contextualWidgets}
+                            onSetContextualWidgets={onSetContextualWidgets}
+                            textWidgets={textWidgets}
+                            onSetTextWidgets={onSetTextWidgets}
+                        />
+                    )}
+                    {activeExportFormat === 'XLSX' && (
+                        <RenderExcelOptions
+                            excelDecoupled={excelDecoupled}
+                            onExcelDecoupledChange={onExcelDecoupledChange}
+                        />
+                    )}
+                </ExpandableContainer>
+            )}
         </section>
     );
 }
diff --git a/app/views/Project/Tagging/Export/EntriesExportSelection/ExportTypePane/styles.css b/app/views/Project/Tagging/Export/EntriesExportSelection/ExportTypePane/styles.css
index bebfdf466a..ac05da53c2 100644
--- a/app/views/Project/Tagging/Export/EntriesExportSelection/ExportTypePane/styles.css
+++ b/app/views/Project/Tagging/Export/EntriesExportSelection/ExportTypePane/styles.css
@@ -5,6 +5,7 @@
     .export-types-container {
         display: flex;
         background-color: var(--dui-color-foreground);
+        color: var(--dui-color-accent);
 
         .content {
             display: flex;
@@ -41,6 +42,18 @@
 
             .metadata-content {
                 display: flex;
+
+                .selections {
+                    display: flex;
+                    flex-direction: column;
+                    gap: var(--dui-spacing-medium);
+
+                    .selection-container {
+                        display: flex;
+                        flex-direction: column;
+                        gap: var(--dui-spacing-small);
+                    }
+                }
             }
         }
 
@@ -59,5 +72,9 @@
                 }
             }
         }
+
+        .excel-options {
+            background-color: var(--dui-color-background-information);
+        }
     }
 }
diff --git a/app/views/Project/Tagging/Export/EntriesExportSelection/index.tsx b/app/views/Project/Tagging/Export/EntriesExportSelection/index.tsx
index cd9c6ff6ce..b9f629fdb4 100644
--- a/app/views/Project/Tagging/Export/EntriesExportSelection/index.tsx
+++ b/app/views/Project/Tagging/Export/EntriesExportSelection/index.tsx
@@ -21,7 +21,6 @@ import {
     ExportExportTypeEnum,
     ExportFormatEnum,
 } from '#generated/types';
-import { generateFilename } from '#utils/common';
 import ProjectContext from '#base/context/ProjectContext';
 import {
     Node,
@@ -34,6 +33,7 @@ import {
     getWidgets,
 } from '../utils';
 import { Widget, Level } from '#types/newAnalyticalFramework';
+import { getProjectSourcesQueryVariables } from '../../Sources/SourcesFilter';
 import ExportPreview from '../ExportPreview';
 import LeadsSelection from '../LeadsSelection';
 import ExportTypePane from './ExportTypePane';
@@ -43,6 +43,7 @@ import styles from './styles.css';
 const PROJECT_FRAMEWORK_DETAILS = gql`
     query ProjectFrameworkDetails($projectId: ID!) {
         project(id: $projectId) {
+            id
             analysisFramework {
                 id
                 exportables {
@@ -61,9 +62,15 @@ const PROJECT_FRAMEWORK_DETAILS = gql`
                         key
                         order
                         properties
+                        conditional {
+                            parentWidget
+                            parentWidgetType
+                            conditions
+                        }
                         title
                         widgetId
                         width
+                        version
                     }
                     clientId
                     id
@@ -78,8 +85,14 @@ const PROJECT_FRAMEWORK_DETAILS = gql`
                     order
                     title
                     properties
+                    conditional {
+                        parentWidget
+                        parentWidgetType
+                        conditions
+                    }
                     widgetId
                     width
+                    version
                 }
             }
         }
@@ -92,6 +105,7 @@ const CREATE_EXPORT = gql`
         $data: ExportCreateInputType!,
     ) {
         project(id: $projectId) {
+            id
             exportCreate(data: $data) {
                 ok
                 errors
@@ -148,6 +162,7 @@ export interface SelectedLead extends Lead {
 interface Props {
     className?: string;
     projectId: string;
+    onSuccess: () => void;
 }
 
 function filterContexualWidgets(widgets: Widget[] | undefined) {
@@ -170,13 +185,15 @@ function EntriesExportSelection(props: Props) {
     const {
         className,
         projectId,
+        onSuccess,
     } = props;
+
     const alert = useAlert();
 
     const { project } = React.useContext(ProjectContext);
     const filterOnlyUnprotected = !!project?.allowedPermissions?.includes('VIEW_ONLY_UNPROTECTED_LEAD');
 
-    const [queryTitle, setQueryTitle] = useState<string>();
+    const [queryTitle, setQueryTitle] = useState<string | undefined>();
     const [previewId, setPreviewId] = useState<string | undefined>(undefined);
     const [activeExportFormat, setActiveExportFormat] = useState<ExportFormatEnum>('DOCX');
     const [excelDecoupled, setExcelDecoupled] = useState<boolean>(true);
@@ -207,6 +224,10 @@ function EntriesExportSelection(props: Props) {
         [projectId],
     );
 
+    const filters = useMemo(() => (
+        getProjectSourcesQueryVariables(filterValues)
+    ), [filterValues]);
+
     const {
         loading: frameworkGetPending,
         data: frameworkResponse,
@@ -252,12 +273,13 @@ function EntriesExportSelection(props: Props) {
                             _ts('export', 'exportStartedNotifyMessage'),
                             { variant: 'success' },
                         );
+                        onSuccess();
                     }
                 }
             },
-            onError: (gqlError) => {
+            onError: () => {
                 alert.show(
-                    gqlError.message,
+                    'Error during export.',
                     {
                         variant: 'error',
                     },
@@ -296,13 +318,12 @@ function EntriesExportSelection(props: Props) {
         const generatedReportStructure = createReportStructureForExport(reportStructure);
         const reportTextWidgetIds = createWidgetIds(textWidgets);
         const reportExportingWidgets = createWidgetIds(contextualWidgets);
-        const defaultTitle = generateFilename('Entries_Export', activeExportFormat.toLowerCase());
 
         const data = {
             excelDecoupled,
             exportType,
             filters: {
-                ...filterValues,
+                ...filters,
                 ids: selectedLeads,
                 excludeProvidedLeadsId: selectAll,
             },
@@ -317,7 +338,7 @@ function EntriesExportSelection(props: Props) {
             reportStructure: generatedReportStructure,
             reportTextWidgetIds,
             type: 'ENTRIES' as const,
-            title: queryTitle ?? defaultTitle,
+            title: queryTitle,
         };
 
         createExport({
@@ -331,7 +352,7 @@ function EntriesExportSelection(props: Props) {
         contextualWidgets,
         createExport,
         excelDecoupled,
-        filterValues,
+        filters,
         queryTitle,
         reportShowAssessmentData,
         reportShowEntryWidgetData,
@@ -466,8 +487,8 @@ function EntriesExportSelection(props: Props) {
                         name="queryTitle"
                         value={queryTitle}
                         onChange={setQueryTitle}
-                        label="Query title"
-                        placeholder="Query title"
+                        label="Export Title"
+                        placeholder="Export Title"
                     />
                 </ControlledExpandableContainer>
                 <Button
diff --git a/app/views/Project/Tagging/Export/ExportHistory/TableActions/index.tsx b/app/views/Project/Tagging/Export/ExportHistory/TableActions/index.tsx
index bb0c667d75..189d303965 100644
--- a/app/views/Project/Tagging/Export/ExportHistory/TableActions/index.tsx
+++ b/app/views/Project/Tagging/Export/ExportHistory/TableActions/index.tsx
@@ -7,35 +7,42 @@ import {
     Button,
     QuickActionConfirmButton,
 } from '@the-deep/deep-ui';
+import {
+    ProjectExportsQuery,
+} from '#generated/types';
 
 import styles from './styles.css';
 
+type ExportItem = NonNullable<NonNullable<NonNullable<NonNullable<ProjectExportsQuery['project']>['exports']>>['results']>[number];
+
 export interface Props {
     className?: string;
-    id: string;
-    onDeleteClick: (key: string) => void;
-    onViewExportClick: (key: string) => void;
+    onDeleteClick: (data: ExportItem) => void;
+    onViewExportClick: (data: ExportItem) => void;
+    viewDisabled: boolean;
     disabled?: boolean;
+
+    data: ExportItem;
 }
 
 function TableActions(props: Props) {
     const {
         className,
-        id,
         disabled,
         onDeleteClick,
         onViewExportClick,
+        viewDisabled,
+        data,
     } = props;
 
     const handleDeleteClick = useCallback(() => {
-        onDeleteClick(id);
-    }, [onDeleteClick, id]);
+        onDeleteClick(data);
+    }, [onDeleteClick, data]);
 
     return (
         <div className={_cs(styles.actions, className)}>
             <QuickActionConfirmButton
-                className={styles.button}
-                name="deleteButton"
+                name={undefined}
                 title="Remove export"
                 onConfirm={handleDeleteClick}
                 message="Are you sure you want to remove this export?"
@@ -45,10 +52,10 @@ function TableActions(props: Props) {
                 <IoTrashBinOutline />
             </QuickActionConfirmButton>
             <Button
-                name="viewExport"
+                name={data}
                 onClick={onViewExportClick}
                 variant="secondary"
-                disabled={disabled}
+                disabled={disabled || viewDisabled}
             >
                 View
             </Button>
diff --git a/app/views/Project/Tagging/Export/ExportHistory/TableActions/styles.css b/app/views/Project/Tagging/Export/ExportHistory/TableActions/styles.css
index c2da70a855..e375dde944 100644
--- a/app/views/Project/Tagging/Export/ExportHistory/TableActions/styles.css
+++ b/app/views/Project/Tagging/Export/ExportHistory/TableActions/styles.css
@@ -2,8 +2,6 @@
     display: flex;
     align-items: center;
     flex-wrap: wrap;
-
-    .button {
-        margin: var(--dui-spacing-extra-small);
-    }
+    gap: var(--dui-spacing-extra-small);
+    justify-content: flex-end;
 }
diff --git a/app/views/Project/Tagging/Export/ExportHistory/index.tsx b/app/views/Project/Tagging/Export/ExportHistory/index.tsx
index b94c22ae0b..f59dfc9e30 100644
--- a/app/views/Project/Tagging/Export/ExportHistory/index.tsx
+++ b/app/views/Project/Tagging/Export/ExportHistory/index.tsx
@@ -1,10 +1,14 @@
-import React, { useState, useMemo, ReactElement, useCallback } from 'react';
+import React, { useState, useMemo, ReactElement, useCallback, useEffect } from 'react';
 import { _cs, isNotDefined, isDefined } from '@togglecorp/fujs';
 import { VscLoading } from 'react-icons/vsc';
-import { IoDocument, IoDownloadOutline, IoClose, IoSearch } from 'react-icons/io5';
-import { RiFileExcel2Fill, RiFileWord2Fill } from 'react-icons/ri';
-import { AiOutlineRedo } from 'react-icons/ai';
-import { FaFilePdf } from 'react-icons/fa';
+import { IoDownloadOutline, IoClose, IoSearch } from 'react-icons/io5';
+import {
+    AiOutlineRedo,
+    AiFillFilePdf,
+    AiFillFileExcel,
+    AiFillFileWord,
+    AiFillFileText,
+} from 'react-icons/ai';
 import {
     Pager,
     TableView,
@@ -18,6 +22,7 @@ import {
     SortContext,
     useSortState,
     IconsProps,
+    Kraken,
     Icons,
     TextInput,
     DateRangeInput,
@@ -68,16 +73,15 @@ const statusLabelMap: Record<ExportItem['status'], string> = {
     CANCELED: 'Canceled',
 };
 const exportFormatIconMap: Record<ExportItem['format'], ReactElement> = {
-    DOCX: <RiFileWord2Fill />,
-    PDF: <FaFilePdf />,
-    XLSX: <RiFileExcel2Fill />,
-    JSON: <IoDocument />,
+    DOCX: <AiFillFileWord title="Word export" className={styles.icon} />,
+    PDF: <AiFillFilePdf title="PDF export" className={styles.icon} />,
+    XLSX: <AiFillFileExcel title="Excel export" className={styles.icon} />,
+    JSON: <AiFillFileText title="JSON export" className={styles.icon} />,
 };
 const maxItemsPerPage = 25;
-const pollInterval = 5000;
 const defaultSorting = {
     name: 'exportedAt',
-    direction: 'asc',
+    direction: 'Descending',
 };
 
 function exportKeySelector(d: ExportItem) {
@@ -101,6 +105,7 @@ const PROJECT_EXPORTS = gql`
         $type: [ExportDataTypeEnum!],
     ) {
         project(id: $projectId) {
+            id
             exports (
                 page: $page,
                 pageSize: $pageSize,
@@ -136,6 +141,7 @@ const DELETE_EXPORT = gql`
         $exportId: ID!,
     ) {
         project(id: $projectId) {
+            id
             exportDelete(id: $exportId) {
                 ok
                 errors
@@ -159,12 +165,22 @@ function ExportHistory(props: Props) {
         type,
     } = props;
 
-    const [selectedExportFile, setSelectedExportFile] = useState<ExportItem['file']>();
+    const [selectedExport, setSelectedExport] = useState<ExportItem>();
     const [activePage, setActivePage] = useState(1);
     const [exportedAt, setExportedAt] = useState<DateRangeValue>();
     const [searchText, setSearchText] = useState<string>();
     const debouncedSearchText = useDebouncedValue(searchText, debounceTime);
 
+    const handleSetSearchText = useCallback((search: string | undefined) => {
+        setSearchText(search);
+        setActivePage(1);
+    }, []);
+
+    const handleSetExportedAt = useCallback((date: DateRangeValue | undefined) => {
+        setExportedAt(date);
+        setActivePage(1);
+    }, []);
+
     const alert = useAlert();
     const sortState = useSortState();
     const { sorting } = sortState;
@@ -202,7 +218,8 @@ function ExportHistory(props: Props) {
     );
 
     const {
-        data: projectExportsResponse,
+        previousData,
+        data: projectExportsResponse = previousData,
         loading: projectExportsPending,
         refetch: getProjectExports,
         startPolling,
@@ -213,15 +230,30 @@ function ExportHistory(props: Props) {
             skip: isNotDefined(variables),
             variables,
             onCompleted: (response) => {
-                if (response.project?.exports?.results?.some((v) => v.status === 'PENDING' || 'STARTED')) {
-                    startPolling(pollInterval);
-                } else {
-                    stopPolling();
+                if ((response.project?.exports?.totalCount ?? 0) < (activePage * maxItemsPerPage)) {
+                    setActivePage(1);
                 }
             },
         },
     );
 
+    // FIXME: memoize this
+    const exports = projectExportsResponse?.project?.exports?.results;
+    const shouldPoll = exports?.some(
+        (v) => (v.status === 'PENDING' || v.status === 'STARTED'),
+    );
+
+    useEffect(
+        () => {
+            if (shouldPoll) {
+                startPolling(5000);
+            } else {
+                stopPolling();
+            }
+        },
+        [shouldPoll, startPolling, stopPolling],
+    );
+
     const [
         deleteExport,
         {
@@ -237,11 +269,18 @@ function ExportHistory(props: Props) {
                         { variant: 'success' },
                     );
                     getProjectExports();
+                } else {
+                    alert.show(
+                        'Failed to delete export.',
+                        {
+                            variant: 'error',
+                        },
+                    );
                 }
             },
-            onError: (gqlError) => {
+            onError: () => {
                 alert.show(
-                    gqlError.message,
+                    'Failed to delete export.',
                     {
                         variant: 'error',
                     },
@@ -250,12 +289,17 @@ function ExportHistory(props: Props) {
         },
     );
 
-    const handleDeleteExport = useCallback((id: string) => deleteExport({
-        variables: {
-            projectId,
-            exportId: id,
-        },
-    }), [deleteExport, projectId]);
+    const handleDeleteExport = useCallback((data: ExportItem) => {
+        if (data.id === selectedExport?.id) {
+            setSelectedExport(undefined);
+        }
+        deleteExport({
+            variables: {
+                projectId,
+                exportId: data.id,
+            },
+        });
+    }, [deleteExport, projectId, selectedExport]);
 
     const columns = useMemo(() => {
         const exportTypeColumn: TableColumn<
@@ -269,6 +313,7 @@ function ExportHistory(props: Props) {
             },
             cellRenderer: Icons,
             cellRendererClassName: styles.icons,
+            columnWidth: '120px',
             cellRendererParams: (_, data) => ({
                 children: (
                     exportFormatIconMap[data.format]
@@ -286,6 +331,7 @@ function ExportHistory(props: Props) {
                 sortable: true,
             },
             cellRenderer: Status,
+            columnWidth: '164px',
             cellRendererParams: (_, data) => ({
                 icon: statusIconMap[data.status],
                 tagVariant: statusVariantMap[data.status],
@@ -304,10 +350,15 @@ function ExportHistory(props: Props) {
                 sortable: false,
             },
             cellRenderer: TableActions,
+            columnWidth: '120px',
             cellRendererParams: (_, data) => ({
-                id: data.id,
-                onDeleteClick: () => handleDeleteExport(data.id),
-                onViewExportClick: () => setSelectedExportFile(data.file),
+                viewDisabled: data.status === 'PENDING'
+                    || data.status === 'STARTED'
+                    || data.status === 'FAILURE'
+                    || data.id === selectedExport?.id,
+                data,
+                onDeleteClick: handleDeleteExport,
+                onViewExportClick: setSelectedExport,
             }),
         };
         return ([
@@ -318,6 +369,7 @@ function ExportHistory(props: Props) {
                 (item) => item.exportedAt,
                 {
                     sortable: true,
+                    columnWidth: '120px',
                 },
             ),
             createStringColumn<ExportItem, string>(
@@ -325,16 +377,16 @@ function ExportHistory(props: Props) {
                 'Title',
                 (item) => item.title,
                 {
-                    columnWidth: 300,
+                    columnWidth: '240px',
                     sortable: true,
                 },
             ),
             statusColumn,
             actionsColumn,
         ]);
-    }, [handleDeleteExport]);
+    }, [handleDeleteExport, selectedExport]);
 
-    const pending = projectExportsPending || deleteExportPending;
+    const pending = deleteExportPending;
 
     return (
         <Container
@@ -349,15 +401,13 @@ function ExportHistory(props: Props) {
                         label="Search"
                         placeholder="Search"
                         value={searchText}
-                        onChange={setSearchText}
-                        disabled={pending}
+                        onChange={handleSetSearchText}
                     />
                     <DateRangeInput
                         name="exportedAt"
                         label="Exported At"
                         value={exportedAt}
-                        onChange={setExportedAt}
-                        disabled={pending}
+                        onChange={handleSetExportedAt}
                     />
                 </div>
             )}
@@ -374,10 +424,29 @@ function ExportHistory(props: Props) {
             {pending && (<PendingMessage />)}
             <SortContext.Provider value={sortState}>
                 <TableView
-                    className={styles.table}
+                    className={styles.tableView}
+                    emptyMessage="Looks like you don't have any exports."
                     data={projectExportsResponse?.project?.exports?.results}
                     keySelector={exportKeySelector}
                     columns={columns}
+                    pending={projectExportsPending}
+                    errored={false}
+                    filtered={isDefined(debouncedSearchText) || isDefined(exportedAt)}
+                    filteredEmptyMessage="No matching exports found."
+                    filteredEmptyIcon={(
+                        <Kraken
+                            variant="search"
+                            size="large"
+                        />
+                    )}
+                    emptyIcon={(
+                        <Kraken
+                            variant="coffee"
+                            size="large"
+                        />
+                    )}
+                    messageShown
+                    messageIconShown
                 />
             </SortContext.Provider>
             <Container
@@ -389,14 +458,14 @@ function ExportHistory(props: Props) {
                 headingClassName={styles.heading}
                 contentClassName={styles.mainContent}
             >
-                {isDefined(selectedExportFile?.url) ? (
+                {isDefined(selectedExport?.file?.url) ? (
                     <LeadPreview
                         className={styles.preview}
-                        url={selectedExportFile?.url}
+                        url={selectedExport?.file?.url}
                     />
                 ) : (
                     <div className={styles.label}>
-                        {selectedExportFile ? 'Preview not available.' : 'Select an export to preview  it.'}
+                        {selectedExport?.file ? 'Preview not available.' : 'Select an export to preview it.'}
                     </div>
                 )}
             </Container>
diff --git a/app/views/Project/Tagging/Export/ExportHistory/styles.css b/app/views/Project/Tagging/Export/ExportHistory/styles.css
index 79fb72eaa7..28e29c3271 100644
--- a/app/views/Project/Tagging/Export/ExportHistory/styles.css
+++ b/app/views/Project/Tagging/Export/ExportHistory/styles.css
@@ -1,5 +1,6 @@
 .export-history-container {
     display: flex;
+    flex-grow: 1;
     background-color: var(--dui-color-foreground);
 
     .header-icons {
@@ -9,17 +10,25 @@
 
     .content {
         display: flex;
+        flex-grow: 1;
         gap: var(--dui-spacing-small);
 
-        .table {
+        .table-view {
             display: flex;
-            align-items: flex-start;
+            position: relative;
+            align-items: center;
             flex-basis: 70%;
+            flex-direction: column;
+            flex-grow: 1;
             overflow-y: auto;
 
             .icons {
                 display: flex;
                 font-size: var(--dui-font-size-super-large);
+
+                .icon {
+                    color: var(--dui-color-accent);
+                }
             }
 
             .status {
@@ -54,8 +63,10 @@
                 }
 
                 .label {
-                    display: flex;
-                    justify-content: center;
+                    margin: auto;
+                    text-align: center;
+                    color: var(--dui-color-text-label);
+                    font-size: var(--dui-font-size-large);
                 }
             }
         }
diff --git a/app/views/Project/Tagging/Export/ExportPreview/index.tsx b/app/views/Project/Tagging/Export/ExportPreview/index.tsx
index ceb70b30f3..e064431946 100644
--- a/app/views/Project/Tagging/Export/ExportPreview/index.tsx
+++ b/app/views/Project/Tagging/Export/ExportPreview/index.tsx
@@ -47,7 +47,7 @@ function ExportPreview(props: OwnProps) {
             const isPending = response?.pending;
             return isPending ? 2000 : -1;
         },
-        failureHeader: 'Export Preview',
+        failureMessage: 'Failed to preview export.',
     });
 
     const handlePreviewClick = useCallback(() => {
@@ -78,18 +78,18 @@ function ExportPreview(props: OwnProps) {
             contentClassName={styles.mainContent}
         >
             {pending && <PendingMessage />}
-            {isDefined(exportResponse) ? (
+            {!pending && isDefined(exportResponse) ? (
                 <LeadPreview
                     className={styles.leadPreview}
                     url={exportResponse?.file}
                 />
-            ) : (
+            ) : (!pending && (
                 <div className={styles.label}>
                     {
-                        error ?? 'Select your desired export settings on the left and click the preview button to see the preview of your document'
+                        error ?? 'Select your desired export settings on the left and click the preview button to see the preview of your document.'
                     }
                 </div>
-            )}
+            ))}
         </Container>
     );
 }
diff --git a/app/views/Project/Tagging/Export/ExportPreview/styles.css b/app/views/Project/Tagging/Export/ExportPreview/styles.css
index 05303055aa..52dcb3eae0 100644
--- a/app/views/Project/Tagging/Export/ExportPreview/styles.css
+++ b/app/views/Project/Tagging/Export/ExportPreview/styles.css
@@ -18,10 +18,10 @@
         background-color: var(--dui-color-foreground);
 
         .label {
-            display: flex;
-            align-self: center;
+            margin: auto;
+            text-align: center;
             color: var(--dui-color-text-label);
-            font-size: var(--dui-font-size-medium);
+            font-size: var(--dui-font-size-large);
         }
 
         .lead-preview {
diff --git a/app/views/Project/Tagging/Export/LeadsSelection/index.tsx b/app/views/Project/Tagging/Export/LeadsSelection/index.tsx
index 81c76f169c..eec8e2abc0 100644
--- a/app/views/Project/Tagging/Export/LeadsSelection/index.tsx
+++ b/app/views/Project/Tagging/Export/LeadsSelection/index.tsx
@@ -1,11 +1,14 @@
 import React, { useCallback, useState, useMemo } from 'react';
-import { _cs, isNotDefined } from '@togglecorp/fujs';
+import {
+    _cs,
+    isNotDefined,
+    isDefined,
+} from '@togglecorp/fujs';
 import {
     DateOutput,
     Pager,
-    Table,
+    TableView,
     TableColumn,
-    PendingMessage,
     TableHeaderCell,
     TableHeaderCellProps,
     createStringColumn,
@@ -24,7 +27,8 @@ import {
     ProjectSourceListQueryVariables,
     SourceFilterOptionsQueryVariables,
 } from '#generated/types';
-import SourcesFilter from '../../Sources/SourcesFilter';
+import { isFiltered } from '#utils/common';
+import SourcesFilter, { getProjectSourcesQueryVariables } from '../../Sources/SourcesFilter';
 import styles from './styles.css';
 
 type Project = NonNullable<ProjectSourceListQuery['project']>;
@@ -32,7 +36,7 @@ type Lead = NonNullable<NonNullable<NonNullable<Project['leads']>['results']>[nu
 
 const defaultSorting = {
     name: 'createdAt',
-    direction: 'Ascending',
+    direction: 'Descending',
 };
 
 function leadsKeySelector(d: Lead) {
@@ -64,6 +68,7 @@ const PROJECT_LEADS = gql`
         $customFilters: LeadCustomFilterEnum,
     ) {
         project(id: $projectId) {
+            id
             leads (
                 page: $page,
                 pageSize: $pageSize,
@@ -90,21 +95,15 @@ const PROJECT_LEADS = gql`
                 pageSize
                 results {
                     id
-                    confidentiality
                     clientId
-                    status
-                    statusDisplay
                     createdAt
                     title
                     publishedOn
-                    priority
                     createdBy {
                         id
                         displayName
                     }
-                    project {
-                        id
-                    }
+                    project
                     authors {
                         id
                         title
@@ -175,21 +174,26 @@ function LeadsSelection(props: Props) {
 
     const [activePage, setActivePage] = useState<number>(1);
 
+    const filters = useMemo(() => (
+        getProjectSourcesQueryVariables(filterValues)
+    ), [filterValues]);
+
     const variables = useMemo(
         (): ProjectSourceListQueryVariables | undefined => (
             (projectId) ? {
-                ...filterValues,
+                ...filters,
                 projectId,
                 page: activePage,
                 pageSize: maxItemsPerPage,
                 ordering,
             } : undefined
         ),
-        [projectId, activePage, ordering, filterValues],
+        [projectId, activePage, ordering, filters],
     );
 
     const {
-        data: projectSourcesResponse,
+        previousData,
+        data: projectSourcesResponse = previousData,
         loading: projectSourcesPending,
     } = useQuery<ProjectSourceListQuery, ProjectSourceListQueryVariables>(
         PROJECT_LEADS,
@@ -281,7 +285,7 @@ function LeadsSelection(props: Props) {
             createStringColumn<Lead, string>(
                 'source',
                 'Publisher',
-                (item) => item.source && organizationTitleSelector(item.source),
+                (item) => (item.source ? organizationTitleSelector(item.source) : undefined),
                 {
                     sortable: true,
                     columnWidth: 160,
@@ -290,7 +294,7 @@ function LeadsSelection(props: Props) {
             createStringColumn<Lead, string>(
                 'authors',
                 'Authors',
-                (item) => item?.authors?.map((v) => organizationTitleSelector(v)).join(','),
+                (item) => item?.authors?.map((v) => organizationTitleSelector(v)).filter(isDefined).join(','),
                 {
                     sortable: false,
                     columnWidth: 144,
@@ -324,13 +328,19 @@ function LeadsSelection(props: Props) {
                 hasAssessment={hasAssessment}
             />
             <div className={styles.tableContainer}>
-                {projectSourcesPending && (<PendingMessage />)}
                 <SortContext.Provider value={sortState}>
-                    <Table
+                    <TableView
                         data={projectSourcesResponse?.project?.leads?.results}
+                        pending={projectSourcesPending}
+                        errored={false}
+                        filtered={isFiltered(filterValues)}
+                        emptyMessage="Looks like there are no sources that match your filtering criteria."
                         keySelector={leadsKeySelector}
                         columns={columns}
                         variant="large"
+                        messageShown
+                        messageIconShown
+                        filteredEmptyMessage="No matching sources found."
                     />
                 </SortContext.Provider>
             </div>
diff --git a/app/views/Project/Tagging/Export/LeadsSelection/styles.css b/app/views/Project/Tagging/Export/LeadsSelection/styles.css
index 272efb6bb7..98f26d0899 100644
--- a/app/views/Project/Tagging/Export/LeadsSelection/styles.css
+++ b/app/views/Project/Tagging/Export/LeadsSelection/styles.css
@@ -18,6 +18,7 @@
 
         .title-column {
             min-width: 120px;
+            min-height: 20vh;
         }
     }
 
diff --git a/app/views/Project/Tagging/Export/index.tsx b/app/views/Project/Tagging/Export/index.tsx
index 9750612f7d..5875d6fed0 100644
--- a/app/views/Project/Tagging/Export/index.tsx
+++ b/app/views/Project/Tagging/Export/index.tsx
@@ -63,12 +63,14 @@ function Export() {
                         >
                             Export History
                         </Tab>
-                        <Tab
-                            name="export-assessment-history"
-                            transparentBorder
-                        >
-                            Export Assessment History
-                        </Tab>
+                        {project?.hasAssessmentTemplate && (
+                            <Tab
+                                name="export-assessment-history"
+                                transparentBorder
+                            >
+                                Export Assessment History
+                            </Tab>
+                        )}
                     </TabList>
                 )}
                 headingContainerClassName={styles.actionButtons}
@@ -82,21 +84,23 @@ function Export() {
                         >
                             New Export
                         </Button>
-                        <Button // TODO: properly check permissions
-                            name="export-assessment"
-                            onClick={showNewAssessmentModal}
-                            icons={<IoAdd />}
-                            variant="secondary"
-                        >
-                            New Assessment Export
-                        </Button>
+                        {project?.hasAssessmentTemplate && (
+                            <Button // TODO: properly check permissions
+                                name="export-assessment"
+                                onClick={showNewAssessmentModal}
+                                icons={<IoAdd />}
+                                variant="secondary"
+                            >
+                                New Assessment Export
+                            </Button>
+                        )}
                     </>
                 )}
                 contentClassName={styles.content}
             >
                 <TabPanel
                     name="export-entry-history"
-                    className={styles.tabPanel}
+                    activeClassName={styles.tabPanel}
                 >
                     {activeProject && (
                         <ExportHistory
@@ -105,33 +109,38 @@ function Export() {
                         />
                     )}
                 </TabPanel>
-                <TabPanel
-                    name="export-assessment-history"
-                    className={styles.tabPanel}
-                >
-                    {activeProject && (
-                        <ExportHistory
-                            projectId={activeProject}
-                            type={assessmentType}
-                        />
-                    )}
-                </TabPanel>
+                {project?.hasAssessmentTemplate && (
+                    <TabPanel
+                        name="export-assessment-history"
+                        activeClassName={styles.tabPanel}
+                    >
+                        {activeProject && (
+                            <ExportHistory
+                                projectId={activeProject}
+                                type={assessmentType}
+                            />
+                        )}
+                    </TabPanel>
+                )}
                 {newExportModalShown && activeProject && (
                     <Modal
                         className={styles.modal}
                         heading="Setup new export file"
+                        size="cover"
                         onCloseButtonClick={hideCreateNewExportModal}
                         bodyClassName={styles.body}
                     >
                         <EntriesExportSelection
                             className={styles.selection}
                             projectId={activeProject}
+                            onSuccess={hideCreateNewExportModal}
                         />
                     </Modal>
                 )}
                 {newAssessmentModalShown && activeProject && (
                     <Modal
                         className={styles.modal}
+                        size="cover"
                         heading="Setup new assessment export file"
                         onCloseButtonClick={hideNewAssessmentModal}
                         bodyClassName={styles.body}
@@ -139,6 +148,7 @@ function Export() {
                         <AssessmentsExportSelection
                             className={styles.selection}
                             projectId={activeProject}
+                            onSuccess={hideNewAssessmentModal}
                         />
                     </Modal>
                 )}
diff --git a/app/views/Project/Tagging/Export/styles.css b/app/views/Project/Tagging/Export/styles.css
index a5fb530fda..d1039429fb 100644
--- a/app/views/Project/Tagging/Export/styles.css
+++ b/app/views/Project/Tagging/Export/styles.css
@@ -32,9 +32,6 @@
 }
 
 .modal {
-    width: 96vw;
-    height: 96vh;
-
     .body {
         display: flex;
         flex-direction: column;
diff --git a/app/views/Project/Tagging/Export/utils.ts b/app/views/Project/Tagging/Export/utils.ts
index cc66850aaf..07616d3133 100644
--- a/app/views/Project/Tagging/Export/utils.ts
+++ b/app/views/Project/Tagging/Export/utils.ts
@@ -78,7 +78,8 @@ function transformLevelsColumnFirst(
 ): Level[] {
     const sectorFirstLevels = matrix2dProperties.columns.map((column) => {
         let sublevels: Level[] = [];
-        if (column.subColumns) {
+        // NOTE: Subcolumns always is an empty list
+        if (column.subColumns.length > 0) {
             sublevels = column.subColumns.map((subColumn) => {
                 const rows = matrix2dProperties.rows.map((row) => {
                     const subRowsLevel = row.subRows.map((subRow) => ({
@@ -162,9 +163,18 @@ export const createReportStructure = (
                 return undefined;
             }
             const { properties } = widget;
-            const newLevels = reportStructureVariant === DIMENSION_FIRST
-                ? transformLevelsRowFirst(properties, includeSubColumn)
-                : transformLevelsColumnFirst(properties);
+
+            let newLevels = exportable?.data?.report?.levels;
+            if (reportStructureVariant === DIMENSION_FIRST) {
+                newLevels = transformLevelsRowFirst(properties, includeSubColumn);
+            } else if (includeSubColumn) {
+                newLevels = transformLevelsColumnFirst(properties);
+            }
+
+            if (!newLevels) {
+                return undefined;
+            }
+
             return {
                 title: widget.title,
                 key: String(exportable.id),
diff --git a/app/views/Project/Tagging/LeadGroups/ActionCell/index.tsx b/app/views/Project/Tagging/LeadGroups/ActionCell/index.tsx
index 928c720ff9..9f6c858e59 100644
--- a/app/views/Project/Tagging/LeadGroups/ActionCell/index.tsx
+++ b/app/views/Project/Tagging/LeadGroups/ActionCell/index.tsx
@@ -1,14 +1,16 @@
 import React, { useCallback } from 'react';
 import { _cs } from '@togglecorp/fujs';
-import { IoTrashBinOutline } from 'react-icons/io5';
+import { IoAdd, IoTrashBinOutline } from 'react-icons/io5';
 import { FiEdit2 } from 'react-icons/fi';
 import {
     useAlert,
-    QuickActionLink,
+    QuickActionButton,
     QuickActionConfirmButton,
 } from '@the-deep/deep-ui';
 import { gql, useMutation } from '@apollo/client';
 
+import SmartButtonLikeLink from '#base/components/SmartButtonLikeLink';
+import routes from '#base/configs/routes';
 import {
     LeadGroupDeleteMutation,
     LeadGroupDeleteMutationVariables,
@@ -34,6 +36,7 @@ export interface Props {
     projectId?: string;
     className?: string;
     disabled?: boolean;
+    onLeadGroupEditClick: (leadGroupToEdit: string) => void;
     onDeleteSuccess: () => void;
 }
 
@@ -43,6 +46,7 @@ function ActionCell(props: Props) {
         projectId,
         leadGroupId,
         onDeleteSuccess,
+        onLeadGroupEditClick,
         disabled,
     } = props;
 
@@ -57,16 +61,23 @@ function ActionCell(props: Props) {
                 if (result?.project?.leadGroupDelete?.ok) {
                     onDeleteSuccess();
                     alert.show(
-                        'Successfully deleted leadGroup.',
+                        'Successfully deleted source group.',
                         {
                             variant: 'success',
                         },
                     );
+                } else {
+                    alert.show(
+                        'Failed to delete source group.',
+                        {
+                            variant: 'error',
+                        },
+                    );
                 }
             },
-            onError: (gqlError) => {
+            onError: () => {
                 alert.show(
-                    gqlError.message,
+                    'Failed to delete sourece group.',
                     { variant: 'error' },
                 );
             },
@@ -86,21 +97,34 @@ function ActionCell(props: Props) {
 
     return (
         <div className={_cs(styles.actionCell, className)}>
-            <QuickActionLink
+            <QuickActionButton
                 className={styles.button}
-                // TODO: Link this to actual leadGroup edit page
-                to="#"
+                name={leadGroupId}
+                onClick={onLeadGroupEditClick}
                 disabled={disabled}
                 title="Edit"
             >
                 <FiEdit2 />
-            </QuickActionLink>
+            </QuickActionButton>
+            <SmartButtonLikeLink
+                className={styles.button}
+                variant="secondary"
+                title="assessment"
+                disabled={disabled}
+                route={routes.groupAssessmentEdit}
+                attrs={{
+                    leadGroupId,
+                }}
+                icons={<IoAdd />}
+            >
+                Assessment
+            </SmartButtonLikeLink>
             <QuickActionConfirmButton
                 className={styles.button}
                 name="deleteButton"
                 title="Delete"
                 onConfirm={handleDeleteLeadGroupClick}
-                message="Are you sure you want to delete this lead group?"
+                message="Are you sure you want to delete this source group?"
                 showConfirmationInitially={false}
                 disabled={disabled}
             >
diff --git a/app/views/Project/Tagging/LeadGroups/index.tsx b/app/views/Project/Tagging/LeadGroups/index.tsx
index 6bfae31f20..562322ab0f 100644
--- a/app/views/Project/Tagging/LeadGroups/index.tsx
+++ b/app/views/Project/Tagging/LeadGroups/index.tsx
@@ -2,9 +2,9 @@ import React, { useCallback, useMemo, useState, useContext } from 'react';
 import { useQuery, gql } from '@apollo/client';
 import { _cs } from '@togglecorp/fujs';
 import {
-    PendingMessage,
     Button,
     Container,
+    Kraken,
     TableView,
     TableColumn,
     TableHeaderCellProps,
@@ -17,7 +17,10 @@ import {
 import ProjectContext from '#base/context/ProjectContext';
 import { createDateColumn } from '#components/tableHelpers';
 import { useModalState } from '#hooks/stateManagement';
-import { convertDateToIsoDateTime } from '#utils/common';
+import {
+    convertDateToIsoDateTime,
+    isFiltered,
+} from '#utils/common';
 import AddLeadGroupModal from '#components/general/AddLeadGroupModal';
 import {
     LeadGroupListQuery,
@@ -39,6 +42,7 @@ const ASSESSMENT_LIST = gql`
         $projectId: ID!,
     ) {
         project(id: $projectId) {
+            id
             leadGroups (
                 search: $search,
                 createdAtLte: $endDate,
@@ -100,7 +104,8 @@ function LeadGroups(props: Props) {
     );
 
     const {
-        data,
+        previousData,
+        data = previousData,
         loading,
         refetch,
     } = useQuery<LeadGroupListQuery, LeadGroupListQueryVariables>(
@@ -113,6 +118,13 @@ function LeadGroups(props: Props) {
 
     const canEditLead = project?.allowedPermissions.includes('UPDATE_LEAD');
 
+    const [leadGroupToEdit, setLeadGroupToEdit] = useState<string | undefined>(undefined);
+
+    const handleLeadGroupEditClick = useCallback((leadGroupId: string | undefined) => {
+        setLeadGroupToEdit(leadGroupId);
+        showAddLeadGroupModal();
+    }, [showAddLeadGroupModal]);
+
     const columns = useMemo(() => {
         const actionColumn: TableColumn<
             LeadGroup, string, ActionCellProps, TableHeaderCellProps
@@ -126,6 +138,7 @@ function LeadGroups(props: Props) {
             cellRenderer: ActionCell,
             cellRendererParams: (leadGroupId) => ({
                 leadGroupId,
+                onLeadGroupEditClick: handleLeadGroupEditClick,
                 projectId: project?.id,
                 onDeleteSuccess: refetch,
                 disabled: !canEditLead,
@@ -145,7 +158,7 @@ function LeadGroups(props: Props) {
             ),
             createNumberColumn<LeadGroup, string>(
                 'leadCounts',
-                'No. of Leads',
+                'No. of Sources',
                 (item) => item?.leadCounts,
             ),
             createDateColumn<LeadGroup, string>(
@@ -158,25 +171,31 @@ function LeadGroups(props: Props) {
             ),
             actionColumn,
         ]);
-    }, [canEditLead, refetch, project?.id]);
+    }, [
+        canEditLead,
+        refetch,
+        project?.id,
+        handleLeadGroupEditClick,
+    ]);
 
     const handleLeadGroupAddSuccess = useCallback(() => {
         refetch();
+        setLeadGroupToEdit(undefined);
     }, [refetch]);
 
     return (
         <Container
-            className={_cs(styles.analysis, className)}
-            heading="Lead Groups"
+            className={_cs(styles.sourceGroups, className)}
+            heading="Source Groups"
             headerClassName={styles.header}
             contentClassName={styles.content}
             footerClassName={styles.footer}
             headerActions={canEditLead && (
                 <Button
                     name={undefined}
-                    onClick={showAddLeadGroupModal}
+                    onClick={handleLeadGroupEditClick}
                 >
-                    Add Lead Group
+                    Add Source Group
                 </Button>
             )}
             headerDescription={(
@@ -195,16 +214,36 @@ function LeadGroups(props: Props) {
                 />
             )}
         >
-            {loading && (<PendingMessage />)}
             <TableView
                 className={styles.table}
                 columns={columns}
                 keySelector={leadGroupKeySelector}
                 data={data?.project?.leadGroups?.results}
+                filtered={isFiltered(filters)}
+                errored={false}
+                filteredEmptyMessage="No matching source groups found."
+                filteredEmptyIcon={(
+                    <Kraken
+                        size="large"
+                        variant="hi"
+                    />
+                )}
+                pending={loading}
+                emptyMessage="No source groups found."
+                rowClassName={styles.tableRow}
+                emptyIcon={(
+                    <Kraken
+                        size="large"
+                        variant="hi"
+                    />
+                )}
+                messageIconShown
+                messageShown
             />
             {addLeadGroupModalShown && (
                 <AddLeadGroupModal
                     onModalClose={hideAddLeadGroupModal}
+                    leadGroupToEdit={leadGroupToEdit}
                     onLeadGroupAdd={handleLeadGroupAddSuccess}
                 />
             )}
diff --git a/app/views/Project/Tagging/LeadGroups/styles.css b/app/views/Project/Tagging/LeadGroups/styles.css
index f79e0bb023..e7801c25c1 100644
--- a/app/views/Project/Tagging/LeadGroups/styles.css
+++ b/app/views/Project/Tagging/LeadGroups/styles.css
@@ -1,4 +1,4 @@
-.analysis {
+.source-groups {
     padding: 0;
 
     .header {
@@ -10,7 +10,11 @@
         padding: var(--dui-spacing-small) var(--dui-spacing-super-large);
 
         .table {
-            background-color: var(--dui-color-foreground);
+            min-height: 50vh;
+
+            .table-row {
+                background-color: var(--dui-color-foreground);
+            }
         }
     }
 
diff --git a/app/views/Project/Tagging/Sources/BulkUpload/FilesUploaded/index.tsx b/app/views/Project/Tagging/Sources/BulkUpload/FilesUploaded/index.tsx
index b4530cd10b..4880cbdfe2 100644
--- a/app/views/Project/Tagging/Sources/BulkUpload/FilesUploaded/index.tsx
+++ b/app/views/Project/Tagging/Sources/BulkUpload/FilesUploaded/index.tsx
@@ -9,6 +9,7 @@ import {
     TextInput,
     Container,
     ListView,
+    Kraken,
 } from '@the-deep/deep-ui';
 import { IoSearch } from 'react-icons/io5';
 import {
@@ -27,6 +28,7 @@ import LeadPreview from '#components/lead/LeadPreview';
 import { BasicOrganization } from '#components/selections/NewOrganizationSelectInput';
 import { BasicProjectUser } from '#components/selections/ProjectUserSelectInput';
 import { BasicLeadGroup } from '#components/selections/LeadGroupSelectInput';
+import { isFiltered } from '#utils/common';
 import {
     LeadType,
     LeadOptionsQuery,
@@ -170,6 +172,23 @@ function FilesUploaded(props: Props) {
                     renderer={FileItem}
                     keySelector={keySelector}
                     rendererParams={fileRendererParams}
+                    errored={false}
+                    pending={false}
+                    emptyIcon={(
+                        <Kraken
+                            variant="exercise"
+                        />
+                    )}
+                    emptyMessage="No files to show."
+                    filtered={isFiltered(searchText)}
+                    filteredEmptyIcon={(
+                        <Kraken
+                            variant="search"
+                        />
+                    )}
+                    filteredEmptyMessage="No match found."
+                    messageIconShown
+                    messageShown
                 />
             </Container>
             <div className={styles.rightPane}>
diff --git a/app/views/Project/Tagging/Sources/BulkUpload/Upload/FilesUpload/index.tsx b/app/views/Project/Tagging/Sources/BulkUpload/Upload/FilesUpload/index.tsx
index f710fc0f9e..28a1a0f925 100644
--- a/app/views/Project/Tagging/Sources/BulkUpload/Upload/FilesUpload/index.tsx
+++ b/app/views/Project/Tagging/Sources/BulkUpload/Upload/FilesUpload/index.tsx
@@ -34,19 +34,19 @@ function FilesUpload(props: Props) {
 
     return (
         <div className={_cs(styles.filesUpload, className)}>
+            <div className={styles.iconContainer}>
+                <IoCloudUpload className={styles.icon} />
+            </div>
             <FileInput
                 className={styles.fileInput}
+                inputSectionClassName={styles.inputSection}
+                inputContainerClassName={styles.inputContainer}
                 name="uploadFiles"
                 value={null}
                 onChange={handleFileInputChange}
-                labelContainerClassName={styles.labelContainer}
-                label={(
-                    <>
-                        <IoCloudUpload className={styles.icon} />
-                        Drag and Drop Files Here
-                    </>
-                )}
-                showStatus={false}
+                status="Drag and drop files here"
+                overrideStatus
+                maxFileSize={100}
                 multiple
             >
                 Browse Files
diff --git a/app/views/Project/Tagging/Sources/BulkUpload/Upload/FilesUpload/styles.css b/app/views/Project/Tagging/Sources/BulkUpload/Upload/FilesUpload/styles.css
index 6ddba78e02..32ac54da84 100644
--- a/app/views/Project/Tagging/Sources/BulkUpload/Upload/FilesUpload/styles.css
+++ b/app/views/Project/Tagging/Sources/BulkUpload/Upload/FilesUpload/styles.css
@@ -1,6 +1,16 @@
 .files-upload {
     display: flex;
-    flex-direction: column;
+    gap: var(--dui-spacing-small);
+
+    .icon-container {
+        padding: var(--dui-spacing-medium) 0;
+
+        .icon {
+            flex-shrink: 0;
+            color: var(--dui-color-text-label);
+            font-size: var(--dui-font-size-super-large);
+        }
+    }
 
     .file-input {
         display: flex;
@@ -9,15 +19,17 @@
         border: none;
         --height-border: 0;
 
-        .label-container {
-            display: flex;
-            align-items: center;
-            font-size: var(--dui-font-size-large);
-            font-weight: var(--dui-font-weight-bold);
+        .input-section {
+            align-items: flex-start;
+            flex-direction: column-reverse;
+
+            .input-container {
+                font-size: var(--dui-font-size-large);
+                font-weight: var(--dui-font-weight-bold);
 
-            .icon {
-                margin-right: var(--dui-spacing-medium);
-                font-size: var(--dui-font-size-super-large);
+                >* {
+                    color: var(--dui-color-text-label);
+                }
             }
         }
     }
diff --git a/app/views/Project/Tagging/Sources/BulkUpload/Upload/UploadItem/index.tsx b/app/views/Project/Tagging/Sources/BulkUpload/Upload/UploadItem/index.tsx
index f870407f54..66ad8a2952 100644
--- a/app/views/Project/Tagging/Sources/BulkUpload/Upload/UploadItem/index.tsx
+++ b/app/views/Project/Tagging/Sources/BulkUpload/Upload/UploadItem/index.tsx
@@ -92,6 +92,7 @@ function UploadItem(props: Props) {
                 onFailure(data.key);
             }
         },
+        failureMessage: 'Upload failed.',
     });
 
     useEffect(() => {
diff --git a/app/views/Project/Tagging/Sources/BulkUpload/index.tsx b/app/views/Project/Tagging/Sources/BulkUpload/index.tsx
index 0a62315c2d..284a95f2f8 100644
--- a/app/views/Project/Tagging/Sources/BulkUpload/index.tsx
+++ b/app/views/Project/Tagging/Sources/BulkUpload/index.tsx
@@ -164,7 +164,7 @@ function BulkUpload(props: Props) {
 
                     if (uploadedLeads.length > 0) {
                         alert.show(
-                            `${uploadedLeads.length} leads were successfully added!`,
+                            `Successfully added ${uploadedLeads.length} sources!`,
                             { variant: 'success' },
                         );
                         setFormFieldValue((oldValues) => (
@@ -172,18 +172,21 @@ function BulkUpload(props: Props) {
                         ), 'leads');
                     }
 
-                    const erroredLeadsCount = result?.length - uploadedLeads.length;
+                    const erroredLeadsCount = (result?.length ?? 0) - uploadedLeads.length;
+
                     if (erroredLeadsCount > 0) {
                         alert.show(
-                            `Failed to add ${erroredLeadsCount} leads!`,
+                            `Failed to add ${erroredLeadsCount} sources!`,
                             { variant: 'error' },
                         );
+                    } else {
+                        onClose();
                     }
                 }
             },
             onError: (gqlError) => {
                 alert.show(
-                    'Failed to add leads!',
+                    'Failed to add sources!',
                     { variant: 'error' },
                 );
                 // eslint-disable-next-line no-console
@@ -291,6 +294,7 @@ function BulkUpload(props: Props) {
         <Modal
             className={_cs(className, styles.bulkUploadModal)}
             heading={_ts('bulkUpload', 'title')}
+            size="cover"
             onCloseButtonClick={onClose}
             bodyClassName={styles.modalBody}
             footerActions={(
diff --git a/app/views/Project/Tagging/Sources/BulkUpload/styles.css b/app/views/Project/Tagging/Sources/BulkUpload/styles.css
index d40c795b9b..3ffd913fbf 100644
--- a/app/views/Project/Tagging/Sources/BulkUpload/styles.css
+++ b/app/views/Project/Tagging/Sources/BulkUpload/styles.css
@@ -1,7 +1,4 @@
 .bulk-upload-modal {
-    width: 90vw;
-    height: 90vh;
-
     .modal-body {
         display: flex;
 
diff --git a/app/views/Project/Tagging/Sources/SourcesGrid/EntryCard/index.tsx b/app/views/Project/Tagging/Sources/EntriesGrid/EntryCard/index.tsx
similarity index 90%
rename from app/views/Project/Tagging/Sources/SourcesGrid/EntryCard/index.tsx
rename to app/views/Project/Tagging/Sources/EntriesGrid/EntryCard/index.tsx
index 0a9cbbe9c8..e397857e20 100644
--- a/app/views/Project/Tagging/Sources/SourcesGrid/EntryCard/index.tsx
+++ b/app/views/Project/Tagging/Sources/EntriesGrid/EntryCard/index.tsx
@@ -34,6 +34,7 @@ import styles from './styles.css';
 const DELETE_ENTRY = gql`
 mutation DeleteEntry($projectId:ID!, $entryId:ID!) {
     project(id: $projectId) {
+        id
         entryDelete(id: $entryId) {
             ok
             errors
@@ -96,18 +97,30 @@ function EntryCard(props: Props) {
     ] = useMutation(
         DELETE_ENTRY,
         {
-            onCompleted: () => {
-                alert.show(
-                    'Successfully deleted entry.',
-                    {
-                        variant: 'success',
-                    },
-                );
-                onEntryDataChange();
+            onCompleted: (response) => {
+                const {
+                    ok,
+                } = response.project.entryDelete;
+                if (ok) {
+                    alert.show(
+                        'Successfully deleted entry.',
+                        {
+                            variant: 'success',
+                        },
+                    );
+                    onEntryDataChange();
+                } else {
+                    alert.show(
+                        'Failed to delete entry.',
+                        {
+                            variant: 'error',
+                        },
+                    );
+                }
             },
-            onError: (gqlError) => {
+            onError: () => {
                 alert.show(
-                    gqlError.message,
+                    'Failed to delete entry.',
                     { variant: 'error' },
                 );
             },
@@ -154,6 +167,7 @@ function EntryCard(props: Props) {
                 footerQuickActions={canEditEntry && (
                     <>
                         <QuickActionLink
+                            title="Edit entry"
                             to={editEntryLink}
                         >
                             <IoPencil />
diff --git a/app/views/Project/Tagging/Sources/SourcesGrid/EntryCard/styles.css b/app/views/Project/Tagging/Sources/EntriesGrid/EntryCard/styles.css
similarity index 100%
rename from app/views/Project/Tagging/Sources/SourcesGrid/EntryCard/styles.css
rename to app/views/Project/Tagging/Sources/EntriesGrid/EntryCard/styles.css
diff --git a/app/views/Project/Tagging/Sources/SourcesGrid/index.tsx b/app/views/Project/Tagging/Sources/EntriesGrid/index.tsx
similarity index 69%
rename from app/views/Project/Tagging/Sources/SourcesGrid/index.tsx
rename to app/views/Project/Tagging/Sources/EntriesGrid/index.tsx
index 6637b1acd8..e30ac7ba67 100644
--- a/app/views/Project/Tagging/Sources/SourcesGrid/index.tsx
+++ b/app/views/Project/Tagging/Sources/EntriesGrid/index.tsx
@@ -2,6 +2,7 @@ import React, { useCallback, useState, useMemo } from 'react';
 import {
     _cs,
     isNotDefined,
+    listToMap,
     isDefined,
     unique,
 } from '@togglecorp/fujs';
@@ -10,6 +11,7 @@ import {
     ListView,
     Pager,
     Container,
+    Kraken,
 } from '@the-deep/deep-ui';
 import {
     Framework,
@@ -19,8 +21,19 @@ import {
 import {
     ProjectEntriesQuery,
     ProjectEntriesQueryVariables,
+    ProjectFrameworkForCardsQuery,
+    ProjectFrameworkForCardsQueryVariables,
 } from '#generated/types';
 import { GeoArea } from '#components/GeoMultiSelectInput';
+import {
+    CountMap,
+    CommentCountContext,
+    CommentCountContextInterface,
+} from '#components/entryReview/EntryCommentWrapper/CommentContext';
+import {
+    isFiltered,
+} from '#utils/common';
+
 import {
     PartialFormType as PartialFilterFormType,
     FormType as FilterFormType,
@@ -40,8 +53,8 @@ export const PROJECT_ENTRIES = gql`
         $projectId: ID!,
         $page: Int,
         $pageSize: Int,
+        $search: String,
         $authoringOrganizationTypes: [ID!],
-        $commentStatus: EntryFilterCommentStatusEnum,
         $controlled: Boolean,
         $createdAtGte: DateTime,
         $createdAtLte: DateTime,
@@ -56,11 +69,12 @@ export const PROJECT_ENTRIES = gql`
         $leadStatuses: [LeadStatusEnum!],
         ) {
         project(id: $projectId) {
+            id
             entries(
                 page: $page,
                 pageSize: $pageSize,
+                search: $search,
                 authoringOrganizationTypes: $authoringOrganizationTypes,
-                commentStatus: $commentStatus,
                 controlled: $controlled,
                 createdAtGte: $createdAtGte,
                 createdAtLte: $createdAtLte,
@@ -81,6 +95,7 @@ export const PROJECT_ENTRIES = gql`
                     entryType
                     droppedExcerpt
                     excerpt
+                    reviewCommentsCount
                     lead {
                         id
                         title
@@ -104,6 +119,7 @@ export const PROJECT_ENTRIES = gql`
                         id
                         widget
                         widgetType
+                        widgetVersion
                         geoSelectedOptions {
                             id
                             adminLevelTitle
@@ -127,6 +143,16 @@ export const PROJECT_ENTRIES = gql`
                     }
                 }
             }
+        }
+    }
+`;
+
+export const PROJECT_FRAMEWORK = gql`
+    query ProjectFrameworkForCards(
+        $projectId: ID!,
+    ) {
+        project(id: $projectId) {
+            id
             analysisFramework {
                 primaryTagging {
                     widgets {
@@ -135,9 +161,15 @@ export const PROJECT_ENTRIES = gql`
                         key
                         order
                         properties
+                        conditional {
+                            parentWidget
+                            parentWidgetType
+                            conditions
+                        }
                         title
                         widgetId
                         width
+                        version
                     }
                     clientId
                     id
@@ -152,8 +184,14 @@ export const PROJECT_ENTRIES = gql`
                     order
                     title
                     properties
+                    conditional {
+                        parentWidget
+                        parentWidgetType
+                        conditions
+                    }
                     widgetId
                     width
+                    version
                 }
                 id
             }
@@ -167,13 +205,23 @@ interface Props {
     filters: PartialFilterFormType;
 }
 
-function SourcesGrid(props: Props) {
+function EntriesGrid(props: Props) {
     const {
         className,
         projectId,
         filters: rawFilters,
     } = props;
 
+    const [
+        commentsCountMap,
+        setCommentsCountMap,
+    ] = useState<CountMap>({});
+
+    const commentCountContext: CommentCountContextInterface = useMemo(() => ({
+        commentsCountMap,
+        setCommentsCountMap,
+    }), [commentsCountMap]);
+
     const entriesFilter = useMemo(() => {
         const transformedFilters = getProjectSourcesQueryVariables(
             rawFilters as Omit<FilterFormType, 'projectId'>,
@@ -200,8 +248,16 @@ function SourcesGrid(props: Props) {
         [projectId, activePage, entriesFilter],
     );
 
+    const frameworkVariables = useMemo(
+        (): ProjectFrameworkForCardsQueryVariables | undefined => (
+            projectId ? ({ projectId }) : undefined
+        ),
+        [projectId],
+    );
+
     const {
-        data: projectEntriesResponse,
+        previousData,
+        data: projectEntriesResponse = previousData,
         loading,
         refetch: getEntries,
     } = useQuery<ProjectEntriesQuery, ProjectEntriesQueryVariables>(
@@ -214,6 +270,13 @@ function SourcesGrid(props: Props) {
                 if (!projectFromResponse) {
                     return;
                 }
+                setCommentsCountMap(
+                    listToMap(
+                        projectFromResponse.entries?.results ?? [],
+                        (entry) => entry.id,
+                        (entry) => entry.reviewCommentsCount,
+                    ),
+                );
                 const geoData = projectFromResponse.entries?.results
                     ?.map((entry) => entry?.attributes)
                     .flat()
@@ -227,8 +290,19 @@ function SourcesGrid(props: Props) {
         },
     );
 
+    const {
+        data: projectFrameworkResponse,
+        loading: projectFrameworkLoading,
+    } = useQuery<ProjectFrameworkForCardsQuery, ProjectFrameworkForCardsQueryVariables>(
+        PROJECT_FRAMEWORK,
+        {
+            skip: isNotDefined(frameworkVariables),
+            variables: frameworkVariables,
+        },
+    );
+
     // eslint-disable-next-line max-len
-    const frameworkDetails = projectEntriesResponse?.project?.analysisFramework as Framework | undefined | null;
+    const frameworkDetails = projectFrameworkResponse?.project?.analysisFramework as Framework | undefined | null;
 
     const entriesResponse = projectEntriesResponse?.project?.entries;
 
@@ -277,16 +351,40 @@ function SourcesGrid(props: Props) {
                 />
             )}
         >
-            <ListView
-                className={_cs(styles.sourcesGrid, className)}
-                data={entries ?? undefined}
-                renderer={EntryCard}
-                rendererParams={entryRendererParams}
-                keySelector={entryKeySelector}
-                pending={loading}
-            />
+            <CommentCountContext.Provider value={commentCountContext}>
+                <ListView
+                    className={_cs(
+                        styles.sourcesGrid,
+                        className,
+                        (entries?.length ?? 0) < 1 && styles.empty,
+                    )}
+                    data={entries ?? undefined}
+                    renderer={EntryCard}
+                    rendererParams={entryRendererParams}
+                    keySelector={entryKeySelector}
+                    pending={loading || projectFrameworkLoading}
+                    filtered={isFiltered(entriesFilter)}
+                    errored={false}
+                    filteredEmptyMessage="No matching entries found."
+                    filteredEmptyIcon={(
+                        <Kraken
+                            size="large"
+                            variant="search"
+                        />
+                    )}
+                    emptyIcon={(
+                        <Kraken
+                            size="large"
+                            variant="work"
+                        />
+                    )}
+                    emptyMessage="No entries found."
+                    messageIconShown
+                    messageShown
+                />
+            </CommentCountContext.Provider>
         </Container>
     );
 }
 
-export default SourcesGrid;
+export default EntriesGrid;
diff --git a/app/views/Project/Tagging/Sources/SourcesGrid/styles.css b/app/views/Project/Tagging/Sources/EntriesGrid/styles.css
similarity index 84%
rename from app/views/Project/Tagging/Sources/SourcesGrid/styles.css
rename to app/views/Project/Tagging/Sources/EntriesGrid/styles.css
index 110c460247..063aaeecaa 100644
--- a/app/views/Project/Tagging/Sources/SourcesGrid/styles.css
+++ b/app/views/Project/Tagging/Sources/EntriesGrid/styles.css
@@ -1,12 +1,15 @@
 .sources-grid {
     --gap: var(--dui-spacing-extra-large);
 
-    display: flex;
-    flex-wrap: wrap;
     padding: var(--dui-spacing-large) 0;
     min-height: 30rem;
     gap: var(--gap);
 
+    &:not(.empty) {
+        display: flex;
+        flex-wrap: wrap;
+    }
+
     .entry {
         flex-basis: calc(100% / 3 - var(--gap));
         max-width: 26rem;
diff --git a/app/views/Project/Tagging/Sources/SourcesGrid/types.ts b/app/views/Project/Tagging/Sources/EntriesGrid/types.ts
similarity index 80%
rename from app/views/Project/Tagging/Sources/SourcesGrid/types.ts
rename to app/views/Project/Tagging/Sources/EntriesGrid/types.ts
index 26f7181042..ab6b85ff40 100644
--- a/app/views/Project/Tagging/Sources/SourcesGrid/types.ts
+++ b/app/views/Project/Tagging/Sources/EntriesGrid/types.ts
@@ -1,5 +1,6 @@
 import {
     ProjectEntriesQuery,
+    ProjectFrameworkForCardsQuery,
     WidgetType as WidgetRaw,
     AttributeType as WidgetAttributeRaw,
 } from '#generated/types';
@@ -11,11 +12,12 @@ import { WidgetAttribute as WidgetAttributeFromEntry } from '#types/newEntry';
 import { Widget as WidgetFromAF } from '#types/newAnalyticalFramework';
 
 type Project = NonNullable<ProjectEntriesQuery['project']>;
+type ProjectForFramework = NonNullable<ProjectFrameworkForCardsQuery['project']>;
 
 export type EntryRaw = NonNullable<NonNullable<NonNullable<Project['entries']>['results']>[number]>;
 export type Entry = DeepReplace<EntryRaw, Omit<WidgetAttributeRaw, 'widgetTypeDisplay' | 'widthTypeDisplay'>, WidgetAttributeFromEntry>;
 
 // FIXME: 'key' is thought to be mandatory from server.
 // Remove this DeepMandatory transformation after server sends key as mandatory
-export type FrameworkRaw = DeepMandatory<NonNullable<Project['analysisFramework']>, 'key'>;
+export type FrameworkRaw = DeepMandatory<NonNullable<ProjectForFramework['analysisFramework']>, 'key'>;
 export type Framework = DeepReplace<FrameworkRaw, Omit<WidgetRaw, 'widgetIdDisplay' | 'widthDisplay'>, WidgetFromAF>;
diff --git a/app/views/Project/Tagging/Sources/LeadEditModal/index.tsx b/app/views/Project/Tagging/Sources/LeadEditModal/index.tsx
index ebbdf240c7..721e8b021c 100644
--- a/app/views/Project/Tagging/Sources/LeadEditModal/index.tsx
+++ b/app/views/Project/Tagging/Sources/LeadEditModal/index.tsx
@@ -58,6 +58,7 @@ const LEAD_OPTIONS = gql`
 const PROJECT_LEAD = gql`
     query ProjectLead($projectId: ID!, $leadId: ID!) {
         project(id: $projectId) {
+            id
             lead (id: $leadId) {
                 id
                 title
@@ -187,6 +188,7 @@ const LEAD_UPDATE = gql`
         $leadId: ID!,
     ) {
         project(id: $projectId) {
+            id
             leadUpdate(id: $leadId, data: $data) {
                 ok
                 errors
@@ -205,6 +207,7 @@ const LEAD_CREATE = gql`
         $data: LeadInputType!,
     ) {
         project(id: $projectId) {
+            id
             leadCreate(data: $data) {
                 ok
                 errors
@@ -266,7 +269,7 @@ function LeadEditModal(props: Props) {
     ] = useState<BasicLeadGroup[] | undefined | null>(undefined);
 
     const {
-        // pristine,
+        pristine,
         value,
         setValue,
         error: riskyError,
@@ -362,7 +365,7 @@ function LeadEditModal(props: Props) {
                     setError(formError);
                 } else if (ok) {
                     alert.show(
-                        'Successfully updated lead!',
+                        'Successfully updated source!',
                         { variant: 'success' },
                     );
                     onLeadSaveSuccess();
@@ -373,7 +376,7 @@ function LeadEditModal(props: Props) {
                     [internal]: errors.message,
                 });
                 alert.show(
-                    'There was an issue updated the selected lead!',
+                    'There was an issue updating the selected source!',
                     { variant: 'error' },
                 );
             },
@@ -403,7 +406,7 @@ function LeadEditModal(props: Props) {
                     setError(formError);
                 } else if (ok) {
                     alert.show(
-                        'Successfully created lead!',
+                        'Successfully created source!',
                         { variant: 'success' },
                     );
                     onLeadSaveSuccess();
@@ -414,7 +417,7 @@ function LeadEditModal(props: Props) {
                     [internal]: errors.message,
                 });
                 alert.show(
-                    'There was an issue creating a new lead!',
+                    'There was an issue creating a new source!',
                     { variant: 'error' },
                 );
             },
@@ -460,14 +463,13 @@ function LeadEditModal(props: Props) {
         <Modal
             className={_cs(className, styles.leadEditModal)}
             onCloseButtonClick={onClose}
-            heading={leadId ? 'Edit source' : 'Add a source'}
+            size="cover"
+            heading={leadId ? 'Edit source' : 'Add a website'}
             bodyClassName={styles.modalBody}
             footerActions={(
                 <Button
                     name="save"
-                    // FIXME: Add disabled during pristine later
-                    // disabled={pristine || pending}
-                    disabled={pending}
+                    disabled={pristine || pending}
                     onClick={handleSubmit}
                 >
                     Save
diff --git a/app/views/Project/Tagging/Sources/SourcesFilter/EntryFilter/FrameworkFilterItem/index.tsx b/app/views/Project/Tagging/Sources/SourcesFilter/EntryFilter/FrameworkFilterItem/index.tsx
index 9905a40279..10c06b9e66 100644
--- a/app/views/Project/Tagging/Sources/SourcesFilter/EntryFilter/FrameworkFilterItem/index.tsx
+++ b/app/views/Project/Tagging/Sources/SourcesFilter/EntryFilter/FrameworkFilterItem/index.tsx
@@ -419,6 +419,7 @@ function FrameworkFilterItem<K extends number>(props: Props<K>) {
             );
         // case 'CONDITIONAL':
         default:
+            // FIXME: add "not implemented" message
             return null;
     }
 }
diff --git a/app/views/Project/Tagging/Sources/SourcesFilter/EntryFilter/index.tsx b/app/views/Project/Tagging/Sources/SourcesFilter/EntryFilter/index.tsx
index f679bd9d7a..5210f921d6 100644
--- a/app/views/Project/Tagging/Sources/SourcesFilter/EntryFilter/index.tsx
+++ b/app/views/Project/Tagging/Sources/SourcesFilter/EntryFilter/index.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useCallback, useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import {
     _cs,
     listToMap,
@@ -6,8 +6,6 @@ import {
 import {
     DateDualRangeInput,
     MultiSelectInput,
-    SelectInput,
-    List,
 } from '@the-deep/deep-ui';
 import {
     useFormArray,
@@ -21,9 +19,6 @@ import {
 } from '#utils/common';
 import ProjectMemberMultiSelectInput, { ProjectMember } from '#components/selections/ProjectMemberMultiSelectInput';
 import BooleanInput, { Option } from '#components/selections/BooleanInput';
-import {
-    FrameworkFilterType,
-} from '#types/newAnalyticalFramework';
 
 import FrameworkFilterItem from './FrameworkFilterItem';
 import { SourceFilterOptions } from '../types';
@@ -32,8 +27,6 @@ import { PartialEntriesFilterDataType } from '../schema';
 
 import styles from './styles.css';
 
-const filterKeySelector = (d: FrameworkFilterType) => d.key;
-
 const controlledStatusOptions: Option[] = [
     {
         key: 'true',
@@ -75,9 +68,12 @@ function EntryFilter<K extends string>(props: Props<K>) {
     const setFieldValue = useFormObject(name, onChange, defaultValue);
 
     const [members, setMembers] = useState<ProjectMember[] | undefined | null>();
+
+    type FilterableData = NonNullable<PartialEntriesFilterDataType['filterableData']>[number];
+
     const {
         setValue: onFrameworkFilterChange,
-    } = useFormArray('filterableData', setFieldValue);
+    } = useFormArray<'filterableData', FilterableData>('filterableData', setFieldValue);
 
     const filterValuesMap = useMemo(() => (
         listToMap(
@@ -90,31 +86,6 @@ function EntryFilter<K extends string>(props: Props<K>) {
         )
     ), [value?.filterableData]);
 
-    const frameworkFilterRendererParams = useCallback(
-        (key: string, data: FrameworkFilterType) => {
-            const filterValue = filterValuesMap[key];
-            return {
-                name: filterValue?.index,
-                title: data.title,
-                value: filterValue?.value,
-                filter: data,
-                projectId,
-                onChange: onFrameworkFilterChange,
-                optionsDisabled,
-                allFiltersVisible,
-                disabled,
-            };
-        },
-        [
-            onFrameworkFilterChange,
-            optionsDisabled,
-            disabled,
-            filterValuesMap,
-            allFiltersVisible,
-            projectId,
-        ],
-    );
-
     return (
         <>
             <ProjectMemberMultiSelectInput
@@ -125,7 +96,7 @@ function EntryFilter<K extends string>(props: Props<K>) {
                 )}
                 name="createdBy"
                 projectId={projectId}
-                value={value?.createdBy} // FIXME: fix type issue from server
+                value={value?.createdBy}
                 onChange={setFieldValue}
                 options={members}
                 onOptionsChange={setMembers}
@@ -149,21 +120,6 @@ function EntryFilter<K extends string>(props: Props<K>) {
                 disabled={disabled}
                 label="Entry created at"
             />
-            <SelectInput
-                className={_cs(
-                    styles.input,
-                    (hasNoData(value?.commentStatus) && !allFiltersVisible)
-                    && styles.hidden,
-                )}
-                name="commentStatus"
-                keySelector={enumKeySelector}
-                labelSelector={enumLabelSelector}
-                value={value?.commentStatus}
-                onChange={setFieldValue}
-                options={options?.commentStatusOptions?.enumValues}
-                label="Entry comment status"
-                disabled={disabled || optionsDisabled}
-            />
             <BooleanInput
                 className={_cs(
                     styles.input,
@@ -177,8 +133,7 @@ function EntryFilter<K extends string>(props: Props<K>) {
                 label="Entry controlled status"
                 disabled={disabled}
             />
-            <MultiSelectInput<string, 'entryTypes', { name: string, description?: string | null }, { containerClassName?: string, title?: string; }>
-                // FIXME: ts couldn't properly infer type for this MultiSelectInput
+            <MultiSelectInput
                 className={_cs(
                     styles.input,
                     (hasNoData(value?.entryTypes) && !allFiltersVisible)
@@ -186,20 +141,32 @@ function EntryFilter<K extends string>(props: Props<K>) {
                 )}
                 name="entryTypes"
                 value={value?.entryTypes}
-                onChange={setFieldValue} // FIXME: fix type issue
+                onChange={setFieldValue}
                 keySelector={enumKeySelector}
                 labelSelector={enumLabelSelector}
                 options={options?.entryTypeOptions?.enumValues}
                 disabled={disabled || optionsDisabled}
                 label="Entry type"
             />
-            <List
-                data={options?.project?.analysisFramework?.filters ?? undefined}
-                keySelector={filterKeySelector}
-                renderer={FrameworkFilterItem}
-                rendererClassName={styles.input}
-                rendererParams={frameworkFilterRendererParams}
-            />
+            {
+                options?.project?.analysisFramework?.filters?.map((filter) => {
+                    const filterValue = filterValuesMap[filter.key];
+                    return (
+                        <FrameworkFilterItem
+                            key={filter.id}
+                            name={filterValue?.index}
+                            title={filter.title}
+                            value={filterValue?.value}
+                            filter={filter}
+                            projectId={projectId}
+                            onChange={onFrameworkFilterChange}
+                            optionsDisabled={optionsDisabled}
+                            allFiltersVisible={allFiltersVisible}
+                            disabled={disabled}
+                        />
+                    );
+                })
+            }
         </>
     );
 }
diff --git a/app/views/Project/Tagging/Sources/SourcesFilter/index.tsx b/app/views/Project/Tagging/Sources/SourcesFilter/index.tsx
index d977d05b04..bdf8ee9e19 100644
--- a/app/views/Project/Tagging/Sources/SourcesFilter/index.tsx
+++ b/app/views/Project/Tagging/Sources/SourcesFilter/index.tsx
@@ -83,7 +83,9 @@ const SOURCE_FILTER_OPTIONS = gql`
             }
         }
         project(id: $projectId) {
+            id
             analysisFramework {
+                id
                 filters {
                     id
                     filterType
@@ -93,7 +95,7 @@ const SOURCE_FILTER_OPTIONS = gql`
                     widgetType
                 }
             }
-        }
+       }
         organizationTypes {
             results {
                 id
@@ -128,13 +130,6 @@ const SOURCE_FILTER_OPTIONS = gql`
                 description
             }
         }
-        commentStatusOptions: __type(name: "EntryFilterCommentStatusEnum") {
-            name
-            enumValues {
-                name
-                description
-            }
-        }
     }
 `;
 
@@ -184,6 +179,7 @@ interface Props {
     filterOnlyUnprotected?: boolean;
     hasAssessment?: boolean;
     onFilterApply: (value: PartialFormType) => void;
+    isEntriesOnlyFilter?: boolean;
 }
 
 function SourcesFilter(props: Props) {
@@ -195,6 +191,7 @@ function SourcesFilter(props: Props) {
         hasAssessment,
         value: valueFromProps,
         disabled,
+        isEntriesOnlyFilter,
     } = props;
 
     const [members, setMembers] = useState<ProjectMember[] | undefined | null>();
@@ -278,7 +275,7 @@ function SourcesFilter(props: Props) {
                     error={error?.search}
                     disabled={disabled}
                     label={_ts('sourcesFilter', 'search')}
-                    placeholder="Lead title or Entry excerpt"
+                    placeholder="Source title or Entry excerpt"
                 />
                 <MultiSelectInput
                     className={styles.input}
@@ -292,21 +289,23 @@ function SourcesFilter(props: Props) {
                     label={_ts('sourcesFilter', 'status')}
                     disabled={disabled || loading || !!sourceFilterOptionsError}
                 />
-                <SelectInput
-                    className={_cs(
-                        styles.input,
-                        (hasNoData(value.exists) && !allFiltersVisible) && styles.hidden,
-                    )}
-                    name="exists"
-                    onChange={setFieldValue}
-                    options={existsOptions}
-                    keySelector={enumKeySelector}
-                    labelSelector={enumLabelSelector}
-                    value={value.exists}
-                    error={error?.exists}
-                    label="Exists"
-                    disabled={disabled || loading || !!sourceFilterOptionsError}
-                />
+                {!isEntriesOnlyFilter && (
+                    <SelectInput
+                        className={_cs(
+                            styles.input,
+                            (hasNoData(value.exists) && !allFiltersVisible) && styles.hidden,
+                        )}
+                        name="exists"
+                        onChange={setFieldValue}
+                        options={existsOptions}
+                        keySelector={enumKeySelector}
+                        labelSelector={enumLabelSelector}
+                        value={value.exists}
+                        error={error?.exists}
+                        label="Exists"
+                        disabled={disabled || loading || !!sourceFilterOptionsError}
+                    />
+                )}
                 <DateDualRangeInput
                     className={styles.input}
                     fromName="publishedOnGte"
diff --git a/app/views/Project/Tagging/Sources/SourcesFilter/schema.ts b/app/views/Project/Tagging/Sources/SourcesFilter/schema.ts
index 9f40c9112f..78e0bb98a6 100644
--- a/app/views/Project/Tagging/Sources/SourcesFilter/schema.ts
+++ b/app/views/Project/Tagging/Sources/SourcesFilter/schema.ts
@@ -46,7 +46,6 @@ type EntriesFilterDataSchema = ObjectSchema<PartialEntriesFilterDataType, Partia
 type EntriesFilterDataFields = ReturnType<EntriesFilterDataSchema['fields']>;
 const entriesFilterDataSchema: EntriesFilterDataSchema = {
     fields: (): EntriesFilterDataFields => ({
-        commentStatus: [],
         controlled: [],
         createdAtGte: [],
         createdAtLte: [],
diff --git a/app/views/Project/Tagging/Sources/SourcesFilter/types.ts b/app/views/Project/Tagging/Sources/SourcesFilter/types.ts
index 7095ec9775..8c10380ed1 100644
--- a/app/views/Project/Tagging/Sources/SourcesFilter/types.ts
+++ b/app/views/Project/Tagging/Sources/SourcesFilter/types.ts
@@ -17,7 +17,6 @@ export type SourcesFilterFields = PurgeNull<EnumFix<ProjectSourcesQueryVariables
     | 'exists'
     | 'priorities'
     | 'statuses'
-    | 'commentStatus'
     | 'entryTypes'
 >>;
 
diff --git a/app/views/Project/Tagging/Sources/SourcesStats/index.tsx b/app/views/Project/Tagging/Sources/SourcesStats/index.tsx
index 4f2c252642..f222f82e4b 100644
--- a/app/views/Project/Tagging/Sources/SourcesStats/index.tsx
+++ b/app/views/Project/Tagging/Sources/SourcesStats/index.tsx
@@ -22,6 +22,7 @@ const PROJECT_SOURCE_STATS = gql`
         $projectId: ID!,
     ) {
         project(id: $projectId) {
+            id
             stats {
                 numberOfEntries
                 numberOfEntriesControlled
@@ -87,7 +88,7 @@ function SourcesStats(props: Props) {
                     // FIXME: Use translation
                     title="Sources In Progress"
                     variant="complement1"
-                    size="small"
+                    size="large"
                 />
                 <ProgressLine
                     progress={calcPercent(
diff --git a/app/views/Project/Tagging/Sources/SourcesTable/Actions/index.tsx b/app/views/Project/Tagging/Sources/SourcesTable/Actions/index.tsx
index afee757d6f..f3e7001dc0 100644
--- a/app/views/Project/Tagging/Sources/SourcesTable/Actions/index.tsx
+++ b/app/views/Project/Tagging/Sources/SourcesTable/Actions/index.tsx
@@ -1,7 +1,4 @@
-import React, { useMemo, useCallback, useContext } from 'react';
-import {
-    generatePath,
-} from 'react-router-dom';
+import React, { useCallback, useContext } from 'react';
 import {
     IoAdd,
     IoEllipsisVerticalSharp,
@@ -12,16 +9,18 @@ import { _cs } from '@togglecorp/fujs';
 import { MdModeEdit } from 'react-icons/md';
 import {
     QuickActionButton,
-    ButtonLikeLink,
     QuickActionDropdownMenu,
     DropdownMenuItem,
     useConfirmation,
     Button,
     RowExpansionContext,
+    useModalState,
 } from '@the-deep/deep-ui';
 
+import SmartButtonLikeLink from '#base/components/SmartButtonLikeLink';
 import { ProjectContext } from '#base/context/ProjectContext';
 import routes from '#base/configs/routes';
+import LeadCopyModal from '../LeadCopyModal';
 
 import styles from './styles.css';
 
@@ -32,8 +31,8 @@ export interface Props<T extends string> {
     onDeleteClick: (key: T) => void;
     disabled?: boolean;
     isAssessmentLead?: boolean;
-    projectId: string;
     entriesCount: number;
+    hasAssessment: boolean;
 }
 
 function Actions<T extends string>(props: Props<T>) {
@@ -44,26 +43,20 @@ function Actions<T extends string>(props: Props<T>) {
         disabled,
         isAssessmentLead,
         onDeleteClick,
-        projectId,
         entriesCount,
+        hasAssessment,
     } = props;
 
     const { project } = useContext(ProjectContext);
 
     const canEditSource = project?.allowedPermissions.includes('UPDATE_LEAD');
     const canDeleteSource = project?.allowedPermissions.includes('DELETE_LEAD');
-    const canEditEntry = project?.allowedPermissions.includes('UPDATE_ENTRY');
 
-    const entryEditLink = useMemo(() => ({
-        pathname: generatePath(
-            routes.entryEdit.path,
-            {
-                projectId,
-                leadId: id,
-            },
-        ),
-        hash: '#/primary-tagging',
-    }), [projectId, id]);
+    const [
+        leadCopyModalShown,
+        showLeadCopyModal,
+        hideLeadCopyModal,
+    ] = useModalState(false);
 
     const handleDeleteConfirm = useCallback(() => {
         onDeleteClick(id);
@@ -90,7 +83,7 @@ function Actions<T extends string>(props: Props<T>) {
     ] = useConfirmation<undefined>({
         showConfirmationInitially: false,
         onConfirm: handleDeleteConfirm,
-        message: 'Are you sure you want to delete this lead?',
+        message: `Are you sure you want to delete this source? ${entriesCount} entry(s) ${hasAssessment ? 'and associated assessment' : ''} will be removed as well.`,
     });
 
     const isExpanded = id === expandedRowKey;
@@ -110,18 +103,20 @@ function Actions<T extends string>(props: Props<T>) {
                         <MdModeEdit />
                     </QuickActionButton>
                 )}
-                {canEditEntry && (
-                    <ButtonLikeLink
-                        className={styles.button}
-                        variant="primary"
-                        title="tag"
-                        disabled={disabled}
-                        to={entryEditLink}
-                        icons={<IoAdd />}
-                    >
-                        Tag
-                    </ButtonLikeLink>
-                )}
+                <SmartButtonLikeLink
+                    className={styles.button}
+                    variant="primary"
+                    title="tag"
+                    disabled={disabled}
+                    route={routes.entryEdit}
+                    attrs={{
+                        leadId: id,
+                    }}
+                    hash="#/primary-tagging"
+                    icons={<IoAdd />}
+                >
+                    Tag
+                </SmartButtonLikeLink>
                 {canDeleteSource && (
                     <QuickActionDropdownMenu
                         label={(
@@ -129,6 +124,12 @@ function Actions<T extends string>(props: Props<T>) {
                         )}
                         variant="secondary"
                     >
+                        <DropdownMenuItem
+                            onClick={showLeadCopyModal}
+                            name={undefined}
+                        >
+                            Move to other project
+                        </DropdownMenuItem>
                         <DropdownMenuItem
                             onClick={onDeleteLeadClick}
                             name={undefined}
@@ -137,17 +138,20 @@ function Actions<T extends string>(props: Props<T>) {
                         </DropdownMenuItem>
                     </QuickActionDropdownMenu>
                 )}
-                {isAssessmentLead && canEditEntry && project?.hasAssessmentTemplate && (
-                    <ButtonLikeLink
+                {isAssessmentLead && (
+                    <SmartButtonLikeLink
                         className={styles.button}
                         variant="secondary"
                         title="assessment"
                         disabled={disabled}
-                        to="#"
+                        route={routes.assessmentEdit}
+                        attrs={{
+                            leadId: id,
+                        }}
                         icons={<IoAdd />}
                     >
                         Assessment
-                    </ButtonLikeLink>
+                    </SmartButtonLikeLink>
                 )}
             </div>
             <div className={styles.row}>
@@ -166,9 +170,15 @@ function Actions<T extends string>(props: Props<T>) {
                     {`${entriesCount} ${entriesCount === 1 ? 'Entry' : 'Entries'}`}
                 </Button>
                 {/* TODO: Update entriesCount when parent has graphql */}
-
             </div>
             {modal}
+            {leadCopyModalShown && project?.id && (
+                <LeadCopyModal
+                    projectId={project.id}
+                    onClose={hideLeadCopyModal}
+                    leadIds={[id]}
+                />
+            )}
         </div>
     );
 }
diff --git a/app/views/Project/Tagging/Sources/SourcesTable/BulkActions/index.tsx b/app/views/Project/Tagging/Sources/SourcesTable/BulkActions/index.tsx
index ff81396b63..6ff8113c67 100644
--- a/app/views/Project/Tagging/Sources/SourcesTable/BulkActions/index.tsx
+++ b/app/views/Project/Tagging/Sources/SourcesTable/BulkActions/index.tsx
@@ -6,15 +6,15 @@ import {
 import {
     IoClose,
     IoTrashBinOutline,
+    IoCopy,
 } from 'react-icons/io5';
 import {
     Button,
     ConfirmButton,
-    PendingMessage,
-    useAlert,
+    useModalState,
 } from '@the-deep/deep-ui';
 
-import { useLazyRequest } from '#base/utils/restRequest';
+import LeadCopyModal from '../LeadCopyModal';
 import { Lead } from '../types';
 import _ts from '#ts';
 
@@ -24,7 +24,7 @@ interface Props {
     selectedLeads: Lead[];
     onClearSelection: () => void;
     activeProject: string;
-    onRemoveSuccess: () => void;
+    onRemoveClick: (leadsToDelete: string[]) => void;
 }
 
 function BulkActions(props: Props) {
@@ -32,47 +32,35 @@ function BulkActions(props: Props) {
         selectedLeads,
         onClearSelection,
         activeProject,
-        onRemoveSuccess,
+        onRemoveClick,
     } = props;
 
-    const alert = useAlert();
-
-    const {
-        pending: bulkDeletePending,
-        trigger: bulkLeadDeleteTrigger,
-    } = useLazyRequest<unknown, string[]>({
-        url: `server://project/${activeProject}/leads/bulk-delete/`,
-        method: 'POST',
-        body: (ctx) => ({ leads: ctx }),
-        onSuccess: () => {
-            alert.show(
-                'Leads deleted successfully!',
-                { variant: 'success' },
-            );
-            onRemoveSuccess();
-        },
-        failureHeader: _ts('leads', 'leads'),
-    });
+    const [
+        leadCopyModalShown,
+        showLeadCopyModal,
+        hideLeadCopyModal,
+    ] = useModalState(false);
 
     const entriesCount = useMemo(() => (
         sum(selectedLeads.map((lead) => lead.entriesCounts?.total).filter(isDefined))
     ), [selectedLeads]);
 
-    /*
-    FIXME: get assessment count
     const assessmentsCount = useMemo(() => (
         selectedLeads.filter((lead) => isDefined(lead.assessmentId)).length
     ), [selectedLeads]);
-    */
-    const assessmentsCount = 'Some';
 
     const onRemoveBulkLead = useCallback(() => {
-        bulkLeadDeleteTrigger(selectedLeads.map((lead) => lead.id));
-    }, [bulkLeadDeleteTrigger, selectedLeads]);
+        if (onRemoveClick) {
+            onRemoveClick(selectedLeads.map((lead) => lead.id));
+        }
+    }, [onRemoveClick, selectedLeads]);
+
+    const selectedLeadsIds = useMemo(() => (
+        selectedLeads.map((lead) => lead.id)
+    ), [selectedLeads]);
 
     return (
         <div className={styles.bulkActionsBar}>
-            {bulkDeletePending && <PendingMessage />}
             <div className={styles.text}>
                 {_ts('leads', 'selectedLeadsCount', { count: selectedLeads.length })}
             </div>
@@ -86,6 +74,15 @@ function BulkActions(props: Props) {
             >
                 {_ts('leads', 'clearSelectionButtonTitle')}
             </Button>
+            <Button
+                name="bulk-copy"
+                title="Copy to Projects"
+                icons={<IoCopy />}
+                variant="general"
+                onClick={showLeadCopyModal}
+            >
+                Copy to Other Projects
+            </Button>
             <ConfirmButton
                 name="bulk-delete"
                 title={_ts('leads', 'removeLeadLeadButtonTitle')}
@@ -96,23 +93,30 @@ function BulkActions(props: Props) {
                 message={_ts('leads', 'removeMultipleLeadsConfirm', {
                     leadsCount: (
                         <b>
-                            {`${selectedLeads.length} Leads`}
+                            {`${selectedLeads.length} Source(s)`}
                         </b>
                     ),
                     entriesCount: (
                         <b>
-                            {`${entriesCount} Entries`}
+                            {`${entriesCount} Entry(s)`}
                         </b>
                     ),
                     assessmentsCount: (
                         <b>
-                            {`${assessmentsCount} Assessments`}
+                            {`${assessmentsCount} Assessment(s)`}
                         </b>
                     ),
                 })}
             >
                 {_ts('leads', 'bulkDeleteButtonText')}
             </ConfirmButton>
+            {leadCopyModalShown && (
+                <LeadCopyModal
+                    projectId={activeProject}
+                    onClose={hideLeadCopyModal}
+                    leadIds={selectedLeadsIds}
+                />
+            )}
         </div>
     );
 }
diff --git a/app/views/Project/Tagging/Sources/SourcesTable/BulkActions/styles.css b/app/views/Project/Tagging/Sources/SourcesTable/BulkActions/styles.css
index 166e59f157..bf8fbcaebb 100644
--- a/app/views/Project/Tagging/Sources/SourcesTable/BulkActions/styles.css
+++ b/app/views/Project/Tagging/Sources/SourcesTable/BulkActions/styles.css
@@ -9,8 +9,9 @@
     border-radius: 5px;
     background-color: var(--dui-color-accent);
     padding: var(--dui-spacing-medium) var(--dui-spacing-large);
-    min-width: 30rem;
+    min-width: 40rem;
     color: var(--dui-color-text-on-accent);
+    gap: var(--dui-spacing-small);
 
     .text {
         flex-grow: 1;
@@ -18,6 +19,5 @@
 
     .button {
         flex-shrink: 0;
-        margin: 0 var(--dui-spacing-extra-small);
     }
 }
diff --git a/app/views/Project/Tagging/Sources/SourcesTable/EntryList/index.tsx b/app/views/Project/Tagging/Sources/SourcesTable/EntryList/index.tsx
index 2062057c61..d6fc0acf01 100644
--- a/app/views/Project/Tagging/Sources/SourcesTable/EntryList/index.tsx
+++ b/app/views/Project/Tagging/Sources/SourcesTable/EntryList/index.tsx
@@ -1,7 +1,8 @@
-import React, { useMemo, useCallback, useState } from 'react';
+import React, { useMemo, useCallback, useState, createRef } from 'react';
 import {
     _cs,
     isNotDefined,
+    listToMap,
     isDefined,
     unique,
 } from '@togglecorp/fujs';
@@ -9,6 +10,7 @@ import { useQuery, gql } from '@apollo/client';
 import {
     Container,
     ListView,
+    Kraken,
     Pager,
 } from '@the-deep/deep-ui';
 import {
@@ -16,10 +18,17 @@ import {
 } from '@togglecorp/toggle-form';
 
 import { PartialEntryType as EntryInputType } from '#views/Project/EntryEdit/schema';
+import {
+    CountMap,
+    CommentCountContext,
+    CommentCountContextInterface,
+} from '#components/entryReview/EntryCommentWrapper/CommentContext';
 import {
     EntriesByLeadQuery,
     EntriesByLeadQueryVariables,
     LeadEntriesQueryVariables,
+    ProjectFrameworkForCardsQuery,
+    ProjectFrameworkForCardsQueryVariables,
 } from '#generated/types';
 import { GeoArea } from '#components/GeoMultiSelectInput';
 
@@ -51,7 +60,6 @@ export const LEAD_ENTRIES = gql`
         $page: Int,
         $pageSize: Int,
         $authoringOrganizationTypes: [ID!],
-        $commentStatus: EntryFilterCommentStatusEnum,
         $controlled: Boolean,
         $createdAtGte: DateTime,
         $createdAtLte: DateTime,
@@ -66,12 +74,12 @@ export const LEAD_ENTRIES = gql`
         $leadStatuses: [LeadStatusEnum!],
         ) {
         project(id: $projectId) {
+            id
             entries(
                 leads: [$leadId],
                 page: $page,
                 pageSize: $pageSize,
                 authoringOrganizationTypes: $authoringOrganizationTypes,
-                commentStatus: $commentStatus,
                 controlled: $controlled,
                 createdAtGte: $createdAtGte,
                 createdAtLte: $createdAtLte,
@@ -90,6 +98,7 @@ export const LEAD_ENTRIES = gql`
                     clientId
                     id
                     entryType
+                    reviewCommentsCount
                     droppedExcerpt
                     excerpt
                     lead {
@@ -115,6 +124,7 @@ export const LEAD_ENTRIES = gql`
                         id
                         widget
                         widgetType
+                        widgetVersion
                         geoSelectedOptions {
                             id
                             adminLevelTitle
@@ -138,6 +148,16 @@ export const LEAD_ENTRIES = gql`
                     }
                 }
             }
+        }
+    }
+`;
+
+export const PROJECT_FRAMEWORK = gql`
+    query ProjectFrameworkForCards(
+        $projectId: ID!,
+    ) {
+        project(id: $projectId) {
+            id
             analysisFramework {
                 primaryTagging {
                     widgets {
@@ -146,9 +166,15 @@ export const LEAD_ENTRIES = gql`
                         key
                         order
                         properties
+                        conditional {
+                            parentWidget
+                            parentWidgetType
+                            conditions
+                        }
                         title
                         widgetId
                         width
+                        version
                     }
                     clientId
                     id
@@ -163,8 +189,14 @@ export const LEAD_ENTRIES = gql`
                     order
                     title
                     properties
+                    conditional {
+                        parentWidget
+                        parentWidgetType
+                        conditions
+                    }
                     widgetId
                     width
+                    version
                 }
                 id
             }
@@ -180,6 +212,7 @@ interface Props {
     leadId: string;
     projectId: string;
     filters: Omit<LeadEntriesQueryVariables, 'projectId' | 'leadId'>
+    getProjectSources: () => void;
 }
 
 function EntryList(props: Props) {
@@ -188,6 +221,7 @@ function EntryList(props: Props) {
         projectId,
         className,
         filters,
+        getProjectSources,
     } = props;
 
     const [
@@ -195,6 +229,18 @@ function EntryList(props: Props) {
         setGeoAreaOptions,
     ] = useState<GeoArea[] | undefined | null>(undefined);
 
+    const ref = createRef<HTMLDivElement>();
+
+    const [
+        commentsCountMap,
+        setCommentsCountMap,
+    ] = useState<CountMap>({});
+
+    const commentCountContext: CommentCountContextInterface = useMemo(() => ({
+        commentsCountMap,
+        setCommentsCountMap,
+    }), [commentsCountMap]);
+
     const [activePage, setActivePage] = useState(1);
     const variables = useMemo(
         (): EntriesByLeadQueryVariables | undefined => (
@@ -217,7 +263,8 @@ function EntryList(props: Props) {
     );
 
     const {
-        data: leadEntriesResponse,
+        previousData,
+        data: leadEntriesResponse = previousData,
         loading: entryListPending,
         refetch: getEntries,
     } = useQuery<EntriesByLeadQuery, EntriesByLeadQueryVariables>(
@@ -230,6 +277,13 @@ function EntryList(props: Props) {
                 if (!projectFromResponse) {
                     return;
                 }
+                setCommentsCountMap(
+                    listToMap(
+                        projectFromResponse.entries?.results ?? [],
+                        (entry) => entry.id,
+                        (entry) => entry.reviewCommentsCount,
+                    ),
+                );
                 const geoData = projectFromResponse.entries?.results
                     ?.map((entry) => entry?.attributes)
                     .flat()
@@ -243,8 +297,39 @@ function EntryList(props: Props) {
         },
     );
 
+    const frameworkVariables = useMemo(
+        (): ProjectFrameworkForCardsQueryVariables | undefined => (
+            projectId ? ({ projectId }) : undefined
+        ),
+        [projectId],
+    );
+
+    const {
+        data: projectFrameworkResponse,
+        loading: projectFrameworkLoading,
+    } = useQuery<ProjectFrameworkForCardsQuery, ProjectFrameworkForCardsQueryVariables>(
+        PROJECT_FRAMEWORK,
+        {
+            skip: isNotDefined(frameworkVariables),
+            variables: frameworkVariables,
+        },
+    );
+
+    const handleSetActivePage = useCallback((page: number) => {
+        setActivePage(page);
+        ref.current?.scrollIntoView({
+            behavior: 'smooth',
+            block: 'start',
+        });
+    }, [ref]);
+
+    const handleEntryDataChange = useCallback(() => {
+        getProjectSources();
+        getEntries();
+    }, [getEntries, getProjectSources]);
+
     // eslint-disable-next-line max-len
-    const frameworkDetails = leadEntriesResponse?.project?.analysisFramework as Framework | undefined | null;
+    const frameworkDetails = projectFrameworkResponse?.project?.analysisFramework as Framework | undefined | null;
 
     const entriesResponse = leadEntriesResponse?.project?.entries;
     const entries = entriesResponse?.results as Entry[] | undefined | null;
@@ -259,42 +344,58 @@ function EntryList(props: Props) {
         controlled: data.controlled,
         verifiedBy: data.verifiedBy,
         entryImage: data.image,
-        onEntryDataChange: getEntries,
+        onEntryDataChange: handleEntryDataChange,
         geoAreaOptions,
         onGeoAreaOptionsChange: setGeoAreaOptions,
+        firstElementRef: data.id === entries?.[0].id ? ref : undefined,
     }), [
         geoAreaOptions,
-        getEntries,
         leadId,
         projectId,
         frameworkDetails,
+        handleEntryDataChange,
+        entries,
+        ref,
     ]);
 
     return (
         <Container
             className={_cs(className, styles.entryListContainer)}
             contentClassName={styles.content}
-            spacing="compact"
+            spacing="none"
+            footerClassName={styles.footer}
             footerActions={(
                 <Pager
                     activePage={activePage}
                     itemsCount={entriesResponse?.totalCount ?? 0}
                     maxItemsPerPage={maxItemsPerPage}
-                    onActivePageChange={setActivePage}
+                    onActivePageChange={handleSetActivePage}
                     itemsPerPageControlHidden
                     hideInfo
                 />
             )}
         >
-            <ListView
-                className={styles.entryList}
-                keySelector={entryKeySelector}
-                renderer={EditableEntry}
-                data={entries ?? undefined}
-                rendererParams={entryDataRendererParams}
-                rendererClassName={styles.entryItem}
-                pending={entryListPending}
-            />
+            <CommentCountContext.Provider value={commentCountContext}>
+                <ListView
+                    className={styles.entryList}
+                    keySelector={entryKeySelector}
+                    renderer={EditableEntry}
+                    data={entries ?? undefined}
+                    rendererParams={entryDataRendererParams}
+                    errored={false}
+                    rendererClassName={styles.entryItem}
+                    filtered={false}
+                    pending={entryListPending || projectFrameworkLoading}
+                    emptyIcon={(
+                        <Kraken
+                            variant="work"
+                        />
+                    )}
+                    emptyMessage="Couldn't find any entries to show."
+                    messageIconShown
+                    messageShown
+                />
+            </CommentCountContext.Provider>
         </Container>
     );
 }
diff --git a/app/views/Project/Tagging/Sources/SourcesTable/EntryList/styles.css b/app/views/Project/Tagging/Sources/SourcesTable/EntryList/styles.css
index 9d6310d0a4..92a2b69e77 100644
--- a/app/views/Project/Tagging/Sources/SourcesTable/EntryList/styles.css
+++ b/app/views/Project/Tagging/Sources/SourcesTable/EntryList/styles.css
@@ -1,6 +1,10 @@
 .entry-list-container {
     background-color: var(--dui-color-white);
 
+    .footer {
+        padding: var(--dui-spacing-small);
+    }
+
     .content {
         display: flex;
 
diff --git a/app/views/Project/Tagging/Sources/SourcesTable/EntryList/types.ts b/app/views/Project/Tagging/Sources/SourcesTable/EntryList/types.ts
index 40f87b547f..63c057ec64 100644
--- a/app/views/Project/Tagging/Sources/SourcesTable/EntryList/types.ts
+++ b/app/views/Project/Tagging/Sources/SourcesTable/EntryList/types.ts
@@ -1,5 +1,6 @@
 import {
     EntriesByLeadQuery,
+    ProjectFrameworkForCardsQuery,
     WidgetType as WidgetRaw,
     AttributeType as WidgetAttributeRaw,
 } from '#generated/types';
@@ -11,10 +12,11 @@ import { WidgetAttribute as WidgetAttributeFromEntry } from '#types/newEntry';
 import { Widget as WidgetFromAF } from '#types/newAnalyticalFramework';
 
 type Project = NonNullable<EntriesByLeadQuery['project']>;
+type ProjectForFramework = NonNullable<ProjectFrameworkForCardsQuery['project']>;
 export type EntryRaw = NonNullable<NonNullable<NonNullable<Project['entries']>['results']>[number]>;
 export type Entry = DeepReplace<EntryRaw, Omit<WidgetAttributeRaw, 'widgetTypeDisplay' | 'widthTypeDisplay'>, WidgetAttributeFromEntry>;
 
 // FIXME: 'key' is thought to be mandatory from server.
 // Remove this DeepMandatory transformation after server sends key as mandatory
-export type FrameworkRaw = DeepMandatory<NonNullable<Project['analysisFramework']>, 'key'>;
+export type FrameworkRaw = DeepMandatory<NonNullable<ProjectForFramework['analysisFramework']>, 'key'>;
 export type Framework = DeepReplace<FrameworkRaw, Omit<WidgetRaw, 'widgetIdDisplay' | 'widthDisplay'>, WidgetFromAF>;
diff --git a/app/views/Project/Tagging/Sources/SourcesTable/LeadCopyModal/index.tsx b/app/views/Project/Tagging/Sources/SourcesTable/LeadCopyModal/index.tsx
new file mode 100644
index 0000000000..58b2ed3685
--- /dev/null
+++ b/app/views/Project/Tagging/Sources/SourcesTable/LeadCopyModal/index.tsx
@@ -0,0 +1,150 @@
+import React, { useState, useCallback } from 'react';
+import { useMutation, gql } from '@apollo/client';
+import {
+    Modal,
+    TextOutput,
+    PendingMessage,
+    ConfirmButton,
+    useAlert,
+} from '@the-deep/deep-ui';
+
+import ProjectMultiSelectInput, { BasicProject } from '#components/selections/ProjectMultiSelectInput';
+import {
+    LeadCopyMutation,
+    LeadCopyMutationVariables,
+} from '#generated/types';
+
+import styles from './styles.css';
+
+const LEAD_COPY = gql`
+    mutation LeadCopy(
+        $activeProjectId: ID!,
+        $projectIds: [ID!]!,
+        $leadIds: [ID!]!,
+    ) {
+        project(id: $activeProjectId) {
+            leadCopy(data: {
+                projects: $projectIds,
+                leads: $leadIds,
+            }) {
+                errors
+                ok
+            }
+        }
+    }
+`;
+
+interface Props {
+    onClose: () => void;
+    leadIds: string[];
+    projectId: string;
+}
+
+function LeadCopyModal(props: Props) {
+    const {
+        onClose,
+        projectId,
+        leadIds,
+    } = props;
+
+    const alert = useAlert();
+
+    const [selectedProjects, setSelectedProjects] = useState<string[]>([]);
+    const [projectOptions, setProjectOptions] = useState<BasicProject[] | undefined | null>([]);
+
+    const [
+        leadCopy,
+        {
+            loading,
+        },
+    ] = useMutation<LeadCopyMutation, LeadCopyMutationVariables>(
+        LEAD_COPY,
+        {
+            onCompleted: (response) => {
+                if (!response?.project?.leadCopy) {
+                    return;
+                }
+                const {
+                    ok,
+                } = response.project.leadCopy;
+
+                if (!ok) {
+                    alert.show(
+                        'Failed to move sources to desired projects.',
+                        {
+                            variant: 'error',
+                        },
+                    );
+                } else {
+                    alert.show(
+                        `Successfully copied desired sources to ${selectedProjects.length.toString()} projects.`,
+                        {
+                            variant: 'success',
+                        },
+                    );
+                    onClose();
+                }
+            },
+            onError: () => {
+                alert.show(
+                    'Failed to move sources to desired projects.',
+                    {
+                        variant: 'error',
+                    },
+                );
+            },
+        },
+    );
+
+    const handleCopyLeadsClick = useCallback(() => {
+        leadCopy({
+            variables: {
+                activeProjectId: projectId,
+                leadIds,
+                projectIds: selectedProjects,
+            },
+        });
+    }, [leadIds, selectedProjects, leadCopy, projectId]);
+
+    return (
+        <Modal
+            className={styles.leadCopyModal}
+            onCloseButtonClick={onClose}
+            heading="Copy sources to projects"
+            size="small"
+            footerActions={(
+                <ConfirmButton
+                    name={undefined}
+                    title="Export selected sources to selected project(s)"
+                    onConfirm={handleCopyLeadsClick}
+                    message={`
+                        Are you sure you want to copy
+                        ${leadIds?.length.toString()} source(s) to
+                        ${selectedProjects?.length.toString()} project(s)?
+                    `}
+                >
+                    Export
+                </ConfirmButton>
+            )}
+        >
+            {loading && <PendingMessage />}
+            <TextOutput
+                label="No. of sources to be copied"
+                value={leadIds?.length ?? 0}
+            />
+            <ProjectMultiSelectInput
+                name="searchProjects"
+                excludedProjects={[projectId]}
+                value={selectedProjects}
+                className={styles.searchInput}
+                onChange={setSelectedProjects}
+                options={projectOptions}
+                onOptionsChange={setProjectOptions}
+                selectionListShown
+                permissionAccess="CREATE_LEAD"
+                myProjectsShown
+            />
+        </Modal>
+    );
+}
+export default LeadCopyModal;
diff --git a/app/views/Project/Tagging/Sources/SourcesTable/LeadCopyModal/styles.css b/app/views/Project/Tagging/Sources/SourcesTable/LeadCopyModal/styles.css
new file mode 100644
index 0000000000..13f7c68b19
--- /dev/null
+++ b/app/views/Project/Tagging/Sources/SourcesTable/LeadCopyModal/styles.css
@@ -0,0 +1,12 @@
+.lead-copy-modal {
+    display: flex;
+    flex-direction: column;
+    width: 40vw;
+    height: 40vh;
+    gap: var(--dui-spacing-large);
+
+    .search-input {
+        display: flex;
+        margin: var(--dui-spacing-large) 0;
+    }
+}
diff --git a/app/views/Project/Tagging/Sources/SourcesTable/index.tsx b/app/views/Project/Tagging/Sources/SourcesTable/index.tsx
index d2528f074c..0a95ae8b17 100644
--- a/app/views/Project/Tagging/Sources/SourcesTable/index.tsx
+++ b/app/views/Project/Tagging/Sources/SourcesTable/index.tsx
@@ -11,10 +11,9 @@ import {
     Container,
     DateOutput,
     DateOutputProps,
+    Kraken,
     Link,
-    LinkProps,
     Pager,
-    PendingMessage,
     SortContext,
     TableView,
     TableColumn,
@@ -44,11 +43,12 @@ import {
     DeleteLeadMutationVariables,
 } from '#generated/types';
 import _ts from '#ts';
+import { useLazyRequest } from '#base/utils/restRequest';
 import { organizationTitleSelector } from '#components/selections/NewOrganizationSelectInput';
 import ProgressLine, { Props as ProgressLineProps } from '#components/ProgressLine';
 import {
     calcPercent,
-    convertDateToIsoDateTime,
+    isFiltered,
 } from '#utils/common';
 
 import { transformSourcesFilterToEntriesFilter } from '../utils';
@@ -62,6 +62,7 @@ import Actions, { Props as ActionsProps } from './Actions';
 import LeadEditModal from '../LeadEditModal';
 import BulkActions from './BulkActions';
 import EntryList from './EntryList';
+
 import styles from './styles.css';
 
 function sourcesKeySelector(d: Lead) {
@@ -84,7 +85,7 @@ const maxItemsPerPage = 10;
 
 const defaultSorting = {
     name: 'createdAt',
-    direction: 'Ascending',
+    direction: 'Descending',
 };
 
 export const PROJECT_SOURCES = gql`
@@ -111,6 +112,7 @@ export const PROJECT_SOURCES = gql`
         $customFilters: LeadCustomFilterEnum,
     ) {
         project(id: $projectId) {
+            id
             leads (
                 page: $page,
                 pageSize: $pageSize,
@@ -145,13 +147,13 @@ export const PROJECT_SOURCES = gql`
                     title
                     publishedOn
                     priority
+                    priorityDisplay
+                    assessmentId
                     createdBy {
                         id
                         displayName
                     }
-                    project {
-                        id
-                    }
+                    project
                     authors {
                         id
                         title
@@ -187,12 +189,39 @@ export const PROJECT_SOURCES = gql`
     }
 `;
 
+interface SourceLinkProps {
+    title?: string;
+    link?: string;
+}
+
+function SourceLink(props: SourceLinkProps) {
+    const {
+        link,
+        title,
+    } = props;
+
+    if (!link) {
+        return (
+            <div>{title}</div>
+        );
+    }
+
+    return (
+        <Link
+            to={link}
+        >
+            {title}
+        </Link>
+    );
+}
+
 const DELETE_LEAD = gql`
     mutation DeleteLead(
         $projectId: ID!,
         $leadId: ID!,
     ) {
         project(id: $projectId) {
+            id
             leadDelete(id: $leadId) {
                 ok
                 errors
@@ -205,6 +234,8 @@ interface Props {
     className?: string;
     projectId: string;
     filters: PartialFilterFormType;
+    activePage: number;
+    setActivePage: React.Dispatch<React.SetStateAction<number>>;
 }
 
 function SourcesTable(props: Props) {
@@ -212,6 +243,8 @@ function SourcesTable(props: Props) {
         className,
         projectId,
         filters: rawFilters,
+        activePage,
+        setActivePage,
     } = props;
 
     const filters = useMemo(() => (
@@ -220,7 +253,6 @@ function SourcesTable(props: Props) {
         )
     ), [rawFilters]);
 
-    const [activePage, setActivePage] = useState<number>(1);
     const [selectedLeads, setSelectedLeads] = useState<Lead[]>([]);
     const [leadToEdit, setLeadToEdit] = useState<string | undefined>();
     const alert = useAlert();
@@ -239,8 +271,6 @@ function SourcesTable(props: Props) {
             }
             return ({
                 ...filters,
-                createdAtGte: convertDateToIsoDateTime(filters.createdAtGte),
-                createdAtLte: convertDateToIsoDateTime(filters.createdAtLte, { endOfDay: true }),
                 projectId,
                 page: activePage,
                 pageSize: maxItemsPerPage,
@@ -251,7 +281,8 @@ function SourcesTable(props: Props) {
     );
 
     const {
-        data: projectSourcesResponse,
+        previousData,
+        data: projectSourcesResponse = previousData,
         loading: projectSourcesPending,
         refetch: getProjectSources,
     } = useQuery<ProjectSourcesQuery, ProjectSourcesQueryVariables>(
@@ -264,6 +295,9 @@ function SourcesTable(props: Props) {
 
     const [
         deleteLead,
+        {
+            loading: leadDeletePending,
+        },
     ] = useMutation<DeleteLeadMutation, DeleteLeadMutationVariables>(
         DELETE_LEAD,
         {
@@ -276,11 +310,18 @@ function SourcesTable(props: Props) {
                         },
                     );
                     getProjectSources();
+                } else {
+                    alert.show(
+                        'Failed to delete lead.',
+                        {
+                            variant: 'error',
+                        },
+                    );
                 }
             },
-            onError: (gqlError) => {
+            onError: () => {
                 alert.show(
-                    gqlError.message,
+                    'Failed to delete lead.',
                     {
                         variant: 'error',
                     },
@@ -292,19 +333,10 @@ function SourcesTable(props: Props) {
     const sourcesResponse = projectSourcesResponse?.project?.leads;
     const sources = sourcesResponse?.results;
 
-    const handlePageChange = useCallback((page: number) => {
-        setActivePage(page);
-    }, []);
-
     const clearSelection = useCallback(() => {
         setSelectedLeads([]);
     }, []);
 
-    const handleBulkSourcesRemoveSuccess = useCallback(() => {
-        setSelectedLeads([]);
-        getProjectSources();
-    }, [getProjectSources]);
-
     const handleSelectAll = useCallback((value: boolean) => {
         setSelectedLeads((oldLeads) => {
             if (value) {
@@ -332,13 +364,20 @@ function SourcesTable(props: Props) {
         expandedRowKey,
         setExpandedRowKey,
     ] = useRowExpansion<Lead, string>(
-        ({ datum }) => (
-            <EntryList
-                leadId={datum.id}
-                projectId={datum.project.id}
-                filters={entriesFilter}
-            />
-        ),
+        ({ datum }) => {
+            if ((datum?.entriesCounts?.total ?? 0) > 0) {
+                return (
+                    <EntryList
+                        key={datum.id}
+                        leadId={datum.id}
+                        projectId={datum.project}
+                        filters={entriesFilter}
+                        getProjectSources={getProjectSources}
+                    />
+                );
+            }
+            return null;
+        },
         {
             expandedRowClassName: styles.expandedRow,
             expandedCellClassName: styles.expandedCell,
@@ -370,6 +409,24 @@ function SourcesTable(props: Props) {
         setShowSingleSourceModalTrue();
     }, [setShowSingleSourceModalTrue]);
 
+    const {
+        pending: bulkDeletePending,
+        trigger: bulkLeadDeleteTrigger,
+    } = useLazyRequest<unknown, string[]>({
+        url: `server://project/${projectId}/leads/bulk-delete/`,
+        method: 'POST',
+        body: (ctx) => ({ leads: ctx }),
+        onSuccess: () => {
+            alert.show(
+                'Successfully deleted sources!',
+                { variant: 'success' },
+            );
+            setSelectedLeads([]);
+            getProjectSources();
+        },
+        failureMessage: 'Failed to delete leads.',
+    });
+
     const columns = useMemo(() => {
         const selectedLeadsMap = listToMap(selectedLeads, (d) => d.id, () => true);
         const selectAllCheckValue = sources?.some((d) => selectedLeadsMap[d.id]);
@@ -446,7 +503,7 @@ function SourcesTable(props: Props) {
             columnWidth: 144,
         };
         const publisherColumn: TableColumn<
-            Lead, string, LinkProps, TableHeaderCellProps
+            Lead, string, SourceLinkProps, TableHeaderCellProps
         > = {
             id: 'source',
             title: _ts('sourcesTable', 'publisher'),
@@ -454,11 +511,10 @@ function SourcesTable(props: Props) {
             headerCellRendererParams: {
                 sortable: true,
             },
-            cellRenderer: Link,
+            cellRenderer: SourceLink,
             cellRendererParams: (_, data) => ({
-                linkElementClassName: _cs(!data.source?.url && styles.emptyLink),
-                children: data.source?.title,
-                to: data.source?.url ?? '#',
+                title: data.source ? organizationTitleSelector(data.source) : undefined,
+                link: data.source?.url,
             }),
             columnWidth: 160,
         };
@@ -493,10 +549,11 @@ function SourcesTable(props: Props) {
             cellRenderer: Actions,
             cellRendererParams: (_, data) => ({
                 id: data.id,
+                title: data.title,
                 onEditClick: handleEdit,
                 onDeleteClick: handleDelete,
                 entriesCount: data.entriesCounts?.total ?? 0,
-                projectId: data.project.id,
+                hasAssessment: !!data.assessmentId,
                 isAssessmentLead: data.isAssessmentLead,
             }),
             columnWidth: 196,
@@ -559,7 +616,7 @@ function SourcesTable(props: Props) {
             createStringColumn<Lead, string>(
                 'priority',
                 _ts('sourcesTable', 'priority'),
-                (item) => item.priority,
+                (item) => item.priorityDisplay,
                 {
                     sortable: true,
                     columnWidth: 96,
@@ -581,7 +638,12 @@ function SourcesTable(props: Props) {
         setShowSingleSourceModalFalse();
     }, [setShowSingleSourceModalFalse]);
 
-    const pending = projectSourcesPending;
+    const pending = projectSourcesPending || bulkDeletePending || leadDeletePending;
+
+    const expandedContextValue = useMemo(
+        () => ({ expandedRowKey, setExpandedRowKey }),
+        [expandedRowKey, setExpandedRowKey],
+    );
 
     return (
         <>
@@ -593,14 +655,13 @@ function SourcesTable(props: Props) {
                         activePage={activePage}
                         itemsCount={sourcesResponse?.totalCount ?? 0}
                         maxItemsPerPage={maxItemsPerPage}
-                        onActivePageChange={handlePageChange}
+                        onActivePageChange={setActivePage}
                         itemsPerPageControlHidden
                     />
                 )}
             >
-                {pending && (<PendingMessage />)}
                 <RowExpansionContext.Provider
-                    value={{ expandedRowKey, setExpandedRowKey }}
+                    value={expandedContextValue}
                 >
                     <SortContext.Provider value={sortState}>
                         <TableView
@@ -611,6 +672,25 @@ function SourcesTable(props: Props) {
                             columns={columns}
                             rowModifier={rowModifier}
                             variant="large"
+                            pending={pending}
+                            filtered={isFiltered(entriesFilter)}
+                            errored={false}
+                            filteredEmptyMessage="No matching sources found."
+                            filteredEmptyIcon={(
+                                <Kraken
+                                    size="large"
+                                    variant="search"
+                                />
+                            )}
+                            emptyMessage="No sources found."
+                            emptyIcon={(
+                                <Kraken
+                                    size="large"
+                                    variant="sleep"
+                                />
+                            )}
+                            messageShown
+                            messageIconShown
                         />
                     </SortContext.Provider>
                 </RowExpansionContext.Provider>
@@ -623,11 +703,11 @@ function SourcesTable(props: Props) {
                     />
                 )}
             </Container>
-            {selectedLeads.length > 0 && (
+            {(selectedLeads.length > 0 && !bulkDeletePending) && (
                 <BulkActions
                     selectedLeads={selectedLeads}
                     activeProject={projectId}
-                    onRemoveSuccess={handleBulkSourcesRemoveSuccess}
+                    onRemoveClick={bulkLeadDeleteTrigger}
                     onClearSelection={clearSelection}
                 />
             )}
diff --git a/app/views/Project/Tagging/Sources/SourcesTable/styles.css b/app/views/Project/Tagging/Sources/SourcesTable/styles.css
index 47b304bed1..94b0b1b9e8 100644
--- a/app/views/Project/Tagging/Sources/SourcesTable/styles.css
+++ b/app/views/Project/Tagging/Sources/SourcesTable/styles.css
@@ -5,7 +5,6 @@
     flex-shrink: 0;
     z-index: 0;
     padding: 0;
-    min-height: 50vh;
 
     .content {
         display: flex;
@@ -14,6 +13,7 @@
 
         .table {
             width: 100%;
+            min-height: 50vh;
 
             .title-column {
                 min-width: 196px;
@@ -23,14 +23,6 @@
                 background-color: var(--dui-color-foreground);
             }
 
-            .empty-link {
-                color: var(--dui-color-text);
-
-                &:hover {
-                    text-decoration: none;
-                }
-            }
-
             .expanded-row {
                 .expanded-cell {
                     border-bottom: 0;
diff --git a/app/views/Project/Tagging/Sources/components/EditableEntry/index.tsx b/app/views/Project/Tagging/Sources/components/EditableEntry/index.tsx
index 94e8489872..87e1ac813b 100644
--- a/app/views/Project/Tagging/Sources/components/EditableEntry/index.tsx
+++ b/app/views/Project/Tagging/Sources/components/EditableEntry/index.tsx
@@ -5,7 +5,7 @@ import {
     removeNull,
 } from '@togglecorp/toggle-form';
 import {
-    useHistory,
+    useNavigate,
     generatePath,
 } from 'react-router-dom';
 import { gql, useMutation } from '@apollo/client';
@@ -37,11 +37,11 @@ import {
     UpdateEntryMutationVariables,
 } from '#generated/types';
 import { transformToFormError, ObjectError } from '#base/utils/errorTransform';
-import { Widget } from '#types/newAnalyticalFramework';
+import { getHiddenWidgetIds, Widget } from '#types/newAnalyticalFramework';
 import { GeoArea } from '#components/GeoMultiSelectInput';
 import routes from '#base/configs/routes';
 import EntryInput from '#components/entry/EntryInput';
-import EntryComments from '#components/entryReview/EntryComments';
+import EntryCommentWrapper from '#components/entryReview/EntryCommentWrapper';
 import EntryControl from '#components/entryReview/EntryControl';
 import EntryVerification from '#components/entryReview/EntryVerification';
 import ProjectContext from '#base/context/ProjectContext';
@@ -53,6 +53,7 @@ type Section = NonNullable<Framework['primaryTagging']>[number];
 const UPDATE_ENTRY = gql`
 mutation UpdateEntry($projectId:ID!, $entryId:ID!, $entryData: EntryInputType!) {
     project(id: $projectId) {
+        id
         entryUpdate(id: $entryId, data: $entryData) {
             ok
             errors
@@ -64,6 +65,7 @@ mutation UpdateEntry($projectId:ID!, $entryId:ID!, $entryData: EntryInputType!)
 const DELETE_ENTRY = gql`
 mutation DeleteEntry($projectId:ID!, $entryId:ID!) {
     project(id: $projectId) {
+        id
         entryDelete(id: $entryId) {
             ok
             errors
@@ -89,6 +91,7 @@ interface Props {
     onEntryDataChange: () => void;
     geoAreaOptions: GeoArea[] | undefined | null;
     onGeoAreaOptionsChange: React.Dispatch<React.SetStateAction<GeoArea[] | undefined | null>>;
+    firstElementRef?: React.RefObject<HTMLDivElement>;
 }
 
 function EditableEntry(props: Props) {
@@ -107,23 +110,35 @@ function EditableEntry(props: Props) {
         onEntryDataChange,
         geoAreaOptions,
         onGeoAreaOptionsChange,
+        firstElementRef,
     } = props;
 
-    const history = useHistory();
+    const navigate = useNavigate();
+
+    const allWidgets = useMemo(
+        () => {
+            const widgetsFromPrimary = primaryTagging?.flatMap(
+                (item) => (item.widgets ?? []),
+            ) ?? [];
+            const widgetsFromSecondary = secondaryTagging ?? [];
+            return [
+                ...widgetsFromPrimary,
+                ...widgetsFromSecondary,
+            ];
+        },
+        [primaryTagging, secondaryTagging],
+    );
 
     const schema = useMemo(
         () => {
             const widgetsMapping = listToMap(
-                [
-                    ...(primaryTagging?.flatMap((item) => (item.widgets ?? [])) ?? []),
-                    ...(secondaryTagging ?? []),
-                ],
+                allWidgets,
                 (item) => item.id,
                 (item) => item,
             );
             return getEntrySchema(widgetsMapping);
         },
-        [primaryTagging, secondaryTagging],
+        [allWidgets],
     );
 
     const alert = useAlert();
@@ -145,6 +160,7 @@ function EditableEntry(props: Props) {
     ] = useMutation<UpdateEntryMutation, UpdateEntryMutationVariables>(
         UPDATE_ENTRY,
         {
+            refetchQueries: ['ProjectSources'],
             onCompleted: (gqlResponse) => {
                 const response = gqlResponse?.project?.entryUpdate;
                 if (!response) {
@@ -153,7 +169,7 @@ function EditableEntry(props: Props) {
 
                 if (response.ok) {
                     alert.show(
-                        'Tags updated successfully!',
+                        'Successfully updated tags!',
                         { variant: 'success' },
                     );
                     // FIXME: update form data from server
@@ -188,18 +204,31 @@ function EditableEntry(props: Props) {
     ] = useMutation(
         DELETE_ENTRY,
         {
-            onCompleted: () => {
-                alert.show(
-                    'Successfully deleted entry.',
-                    {
-                        variant: 'success',
-                    },
-                );
-                onEntryDataChange();
+            refetchQueries: ['ProjectSources'],
+            onCompleted: (response) => {
+                const {
+                    ok,
+                } = response.project.entryDelete;
+                if (ok) {
+                    alert.show(
+                        'Successfully deleted entry.',
+                        {
+                            variant: 'success',
+                        },
+                    );
+                    onEntryDataChange();
+                } else {
+                    alert.show(
+                        'Failed to delete entry.',
+                        {
+                            variant: 'error',
+                        },
+                    );
+                }
             },
-            onError: (gqlError) => {
+            onError: () => {
                 alert.show(
-                    gqlError.message,
+                    'Failed to delete entry.',
                     { variant: 'error' },
                 );
             },
@@ -223,14 +252,22 @@ function EditableEntry(props: Props) {
             validate,
             setError,
             (entryData) => {
+                // FIXME: this is repeated
+                const hiddenWidgetIds = getHiddenWidgetIds(
+                    allWidgets,
+                    entry.attributes ?? [],
+                );
+
                 const transformedEntryData = {
                     ...entryData,
                     deleted: undefined,
                     stale: undefined,
                     attributes: entryData.attributes
                         ?.filter((attribute) => isDefined(attribute.data))
+                        .filter((attribute) => !hiddenWidgetIds[attribute.widget])
                         .map((attribute) => ({
                             ...attribute,
+                            widgetVersion: attribute.widgetVersion,
                             widgetType: undefined,
                         })),
                 };
@@ -250,7 +287,7 @@ function EditableEntry(props: Props) {
             },
         );
         submit();
-    }, [projectId, validate, setError, updateEntry, entry.id]);
+    }, [allWidgets, projectId, validate, setError, updateEntry, entry.id, entry.attributes]);
 
     const verifiedByIds = useMemo(() => (
         verifiedBy?.map((v) => +v.id) ?? []
@@ -261,11 +298,13 @@ function EditableEntry(props: Props) {
             projectId,
             leadId,
         });
-        history.push(`${link}${sectionId ? '#/primary-tagging' : '#/secondary-tagging'}`, {
-            entryId: entryIdToAdd,
-            sectionId,
+        navigate(`${link}${sectionId ? '#/primary-tagging' : '#/secondary-tagging'}`, {
+            state: {
+                entryId: entryIdToAdd,
+                sectionId,
+            },
         });
-    }, [projectId, leadId, history]);
+    }, [projectId, leadId, navigate]);
 
     const saveButton = (
         <Button
@@ -290,12 +329,14 @@ function EditableEntry(props: Props) {
             primaryTagging={primaryTagging}
             secondaryTagging={secondaryTagging}
             readOnly={!editMode}
+            emptyValueHidden={!editMode}
             compact={compact}
             leadId={leadId}
             entryImage={entryImage}
             error={error}
             geoAreaOptions={geoAreaOptions}
             onGeoAreaOptionsChange={onGeoAreaOptionsChange}
+            allWidgets={allWidgets}
         />
     );
 
@@ -321,7 +362,7 @@ function EditableEntry(props: Props) {
     );
 
     const entryComments = (
-        <EntryComments
+        <EntryCommentWrapper
             // FIXME: Remove cast after entry comments
             // is switched to gql
             entryId={+entryId}
@@ -371,16 +412,13 @@ function EditableEntry(props: Props) {
     if (compact) {
         return (
             <Container
+                elementRef={firstElementRef}
                 className={className}
-                footerActions={(
+                footerActions={canEditEntry && (
                     <>
-                        {canEditEntry && (
-                            <>
-                                {editMode ? saveButton : editTagsButton}
-                                {entryComments}
-                                {entryVerification}
-                            </>
-                        )}
+                        {editMode ? saveButton : editTagsButton}
+                        {entryComments}
+                        {entryVerification}
                     </>
                 )}
             >
@@ -391,6 +429,7 @@ function EditableEntry(props: Props) {
 
     return (
         <Container
+            elementRef={firstElementRef}
             className={className}
             headerIcons={(
                 <>
diff --git a/app/views/Project/Tagging/Sources/index.tsx b/app/views/Project/Tagging/Sources/index.tsx
index 17068c26d0..37ff1910d1 100644
--- a/app/views/Project/Tagging/Sources/index.tsx
+++ b/app/views/Project/Tagging/Sources/index.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useState, useCallback } from 'react';
 import { _cs } from '@togglecorp/fujs';
 import {
     IoGridOutline,
@@ -6,7 +6,11 @@ import {
 } from 'react-icons/io5';
 import {
     Header,
-    QuickActionButton,
+    useHash,
+    Tabs,
+    Tab,
+    TabList,
+    TabPanel,
 } from '@the-deep/deep-ui';
 import _ts from '#ts';
 import ProjectContext from '#base/context/ProjectContext';
@@ -17,7 +21,8 @@ import {
     PartialFormType as PartialFilterFormType,
 } from './SourcesFilter/schema';
 import SourcesTable from './SourcesTable';
-import SourcesGrid from './SourcesGrid';
+import EntriesGrid from './EntriesGrid';
+
 import styles from './styles.css';
 
 interface Props {
@@ -32,84 +37,85 @@ function Sources(props: Props) {
     const { project } = React.useContext(ProjectContext);
     const activeProject = project?.id;
     const [sourcesFilters, setSourcesFilters] = useState<PartialFilterFormType>({});
+    const [activePage, setActivePage] = useState<number>(1);
+    const activeView = useHash();
 
-    const [activeView, setActiveView] = React.useState<'table' | 'grid'>('table');
-
-    const handleGridButtonClick = React.useCallback(() => {
-        setActiveView('grid');
-    }, []);
-
-    const handleTableButtonClick = React.useCallback(() => {
-        setActiveView('table');
+    const handleSetSourcesFilters = useCallback((filters: PartialFilterFormType) => {
+        setSourcesFilters(filters);
+        setActivePage(1);
     }, []);
 
     return (
         <div className={_cs(styles.sources, className)}>
-            <div className={styles.topSection}>
-                {activeProject && (
-                    <SourcesStats
-                        className={styles.stats}
-                        projectId={activeProject}
+            <Tabs
+                useHash
+                defaultHash="table"
+            >
+                <div className={styles.topSection}>
+                    {activeProject && (
+                        <SourcesStats
+                            className={styles.stats}
+                            projectId={activeProject}
+                        />
+                    )}
+                    <Header
+                        heading={_ts('sourcesFilter', 'title')}
+                        headingSize="medium"
+                        actions={(
+                            <TabList className={styles.tabs}>
+                                <Tab
+                                    name="table"
+                                    className={styles.tab}
+                                    title="Sources Table"
+                                    transparentBorder
+                                >
+                                    <IoList />
+                                </Tab>
+                                <Tab
+                                    name="grid"
+                                    className={styles.tab}
+                                    title="Entries Cards"
+                                    transparentBorder
+                                >
+                                    <IoGridOutline />
+                                </Tab>
+                            </TabList>
+                        )}
                     />
-                )}
-                <Header
-                    heading={_ts('sourcesFilter', 'title')}
-                    headingSize="medium"
-                    actions={(
-                        <>
-                            <QuickActionButton
-                                className={_cs(
-                                    styles.switchButton,
-                                    activeView === 'table' && styles.active,
-                                )}
-                                title="Table View"
-                                name="switch"
-                                variant="action"
-                                onClick={handleTableButtonClick}
-                                big
-                            >
-                                <IoList />
-                            </QuickActionButton>
-                            <QuickActionButton
-                                name="switch"
-                                title="Grid View"
-                                className={_cs(
-                                    styles.switchButton,
-                                    activeView === 'grid' && styles.active,
-                                )}
-                                variant="action"
-                                onClick={handleGridButtonClick}
-                                big
-                            >
-                                <IoGridOutline />
-                            </QuickActionButton>
-                        </>
+                    {activeProject && (
+                        <SourcesFilter
+                            className={styles.filter}
+                            value={sourcesFilters}
+                            onFilterApply={handleSetSourcesFilters}
+                            projectId={activeProject}
+                            isEntriesOnlyFilter={activeView === 'grid'}
+                        />
                     )}
-                />
+                </div>
                 {activeProject && (
-                    <SourcesFilter
-                        className={styles.filter}
-                        value={sourcesFilters}
-                        onFilterApply={setSourcesFilters}
-                        projectId={activeProject}
-                    />
-                )}
-            </div>
-            <div className={styles.leads}>
-                {activeView === 'table' && activeProject && (
-                    <SourcesTable
-                        className={styles.table}
-                        filters={sourcesFilters}
-                        projectId={activeProject}
-                    />
-                )}
-                {activeView === 'grid' && activeProject && (
-                    <SourcesGrid
-                        projectId={String(activeProject)}
-                        filters={sourcesFilters}
-                    />
+                    <div className={styles.leads}>
+                        <TabPanel
+                            name="table"
+                        >
+                            <SourcesTable
+                                className={styles.table}
+                                filters={sourcesFilters}
+                                projectId={activeProject}
+                                activePage={activePage}
+                                setActivePage={setActivePage}
+                            />
+                        </TabPanel>
+                        <TabPanel
+                            name="grid"
+                        >
+                            <EntriesGrid
+                                projectId={String(activeProject)}
+                                filters={sourcesFilters}
+                            />
+                        </TabPanel>
+                    </div>
                 )}
-            </div>
+            </Tabs>
         </div>
     );
 }
diff --git a/app/views/Project/Tagging/Sources/styles.css b/app/views/Project/Tagging/Sources/styles.css
index cf25489956..38153f5d2c 100644
--- a/app/views/Project/Tagging/Sources/styles.css
+++ b/app/views/Project/Tagging/Sources/styles.css
@@ -2,12 +2,6 @@
     display: flex;
     flex-direction: column;
 
-    .switch-button {
-        &.active {
-            color: var(--dui-color-accent);
-        }
-    }
-
     .top-section {
         display: flex;
         flex-direction: column;
@@ -26,7 +20,17 @@
         }
     }
 
+    .tabs {
+        flex-shrink: 0;
+
+        .tab {
+            padding: var(--dui-spacing-small);
+            font-size: var(--dui-font-size-extra-large);
+        }
+    }
+
     .leads {
+        flex-grow: 1;
         background-color: var(--dui-color-background);
         padding: var(--dui-spacing-medium) var(--dui-spacing-super-large);
 
diff --git a/app/views/Project/Tagging/Sources/utils.tsx b/app/views/Project/Tagging/Sources/utils.tsx
index 6c2da6b557..292cddad4e 100644
--- a/app/views/Project/Tagging/Sources/utils.tsx
+++ b/app/views/Project/Tagging/Sources/utils.tsx
@@ -17,10 +17,14 @@ export function transformSourcesFilterToEntriesFilter(filters: FaramValues) {
         entriesFilterData,
         createdAtGte,
         createdAtLte,
+        search,
     } = filters;
 
     return {
         ...entriesFilterData,
+        filterableData: (entriesFilterData?.filterableData?.length ?? 0) > 0
+            ? entriesFilterData?.filterableData
+            : undefined,
         createdAtGte: convertDateToIsoDateTime(createdAtGte),
         createdAtLte: convertDateToIsoDateTime(createdAtLte, { endOfDay: true }),
 
@@ -32,5 +36,6 @@ export function transformSourcesFilterToEntriesFilter(filters: FaramValues) {
         leadPublishedOnGte: publishedOnGte,
         leadPublishedOnLte: publishedOnLte,
         leadStatuses: statuses,
+        search,
     };
 }
diff --git a/app/views/Project/Tagging/index.tsx b/app/views/Project/Tagging/index.tsx
index 2fc594a3e0..c6b991fd22 100644
--- a/app/views/Project/Tagging/index.tsx
+++ b/app/views/Project/Tagging/index.tsx
@@ -1,8 +1,8 @@
 import React, { Suspense, useMemo, useState, useCallback } from 'react';
 import {
-    Switch,
+    Routes,
     Route,
-    Redirect,
+    Navigate,
     generatePath,
 } from 'react-router-dom';
 import { _cs } from '@togglecorp/fujs';
@@ -98,63 +98,56 @@ function Tagging(props: Props) {
                     className={styles.subNavbar}
                 >
                     <SmartNavLink
-                        exact
                         route={routes.sources}
                         className={styles.link}
                     />
                     <SmartNavLink
-                        exact
+                        route={routes.dashboard}
+                        className={styles.link}
+                    />
+                    <SmartNavLink
                         route={routes.leadGroups}
                         className={styles.link}
                     />
                     <SmartNavLink
-                        exact
                         route={routes.assessments}
                         className={styles.link}
                     />
                     <SmartNavLink
-                        exact
-                        route={routes.dashboard}
+                        route={routes.aryDashboard}
                         className={styles.link}
                     />
                     <SmartNavLink
-                        exact
                         route={routes.export}
                         className={styles.link}
                     />
                 </SubNavbar>
-                <Switch>
+                <Routes>
                     <Route
-                        exact
-                        path={routes.sources.path}
-                    >
-                        {subNavbarComponents}
-                    </Route>
+                        path={routes.sources.pathForRoute}
+                        element={subNavbarComponents}
+                    />
                     <Route
-                        exact
-                        path={routes.assessments.path}
-                    >
-                        {subNavbarComponents}
-                    </Route>
+                        path={routes.assessments.pathForRoute}
+                        element={subNavbarComponents}
+                    />
                     <Route
-                        exact
-                        path={routes.leadGroups.path}
-                    >
-                        {subNavbarComponents}
-                    </Route>
+                        path={routes.leadGroups.pathForRoute}
+                        element={subNavbarComponents}
+                    />
                     <Route
-                        exact
-                        path={routes.dashboard.path}
-                    >
-                        {subNavbarComponents}
-                    </Route>
+                        path={routes.dashboard.pathForRoute}
+                        element={subNavbarComponents}
+                    />
                     <Route
-                        exact
-                        path={routes.export.path}
-                    >
-                        {subNavbarComponents}
-                    </Route>
-                </Switch>
+                        path={routes.aryDashboard.pathForRoute}
+                        element={subNavbarComponents}
+                    />
+                    <Route
+                        path={routes.export.pathForRoute}
+                        element={subNavbarComponents}
+                    />
+                </Routes>
                 <Suspense
                     fallback={(
                         <PreloadMessage
@@ -163,50 +156,40 @@ function Tagging(props: Props) {
                         />
                     )}
                 >
-                    <Switch>
+                    <Routes>
                         <Route
-                            exact
-                            path={routes.tagging.path}
-                        >
-                            <Redirect to={defaultRoute} />
-                        </Route>
+                            path=""
+                            element={<Navigate to={defaultRoute} />}
+                        />
                         <Route
-                            exact
-                            path={routes.sources.path}
-                        >
-                            {routes.sources.load({ className: styles.childView })}
-                        </Route>
+                            path={routes.sources.pathForRoute}
+                            element={routes.sources.load({ className: styles.childView })}
+                        />
                         <Route
-                            exact
-                            path={routes.assessments.path}
-                        >
-                            {routes.assessments.load({ className: styles.childView })}
-                        </Route>
+                            path={routes.assessments.pathForRoute}
+                            element={routes.assessments.load({ className: styles.childView })}
+                        />
                         <Route
-                            exact
-                            path={routes.leadGroups.path}
-                        >
-                            {routes.leadGroups.load({ className: styles.childView })}
-                        </Route>
+                            path={routes.leadGroups.pathForRoute}
+                            element={routes.leadGroups.load({ className: styles.childView })}
+                        />
+                        <Route
+                            path={routes.dashboard.pathForRoute}
+                            element={routes.dashboard.load({ className: styles.childView })}
+                        />
                         <Route
-                            exact
-                            path={routes.dashboard.path}
-                        >
-                            {routes.dashboard.load({ className: styles.childView })}
-                        </Route>
+                            path={routes.aryDashboard.pathForRoute}
+                            element={routes.aryDashboard.load({ className: styles.childView })}
+                        />
                         <Route
-                            exact
-                            path={routes.export.path}
-                        >
-                            {routes.export.load({ className: styles.childView })}
-                        </Route>
+                            path={routes.export.pathForRoute}
+                            element={routes.export.load({ className: styles.childView })}
+                        />
                         <Route
-                            exact
-                            path={routes.fourHundredFour.path}
-                        >
-                            {routes.fourHundredFour.load({ className: styles.childView })}
-                        </Route>
-                    </Switch>
+                            path={routes.fourHundredFour.pathForRoute}
+                            element={routes.fourHundredFour.load({ className: styles.childView })}
+                        />
+                    </Routes>
                 </Suspense>
             </div>
             {isSingleSourceModalShown && project?.id && (
diff --git a/app/views/Project/Tagging/styles.css b/app/views/Project/Tagging/styles.css
index 8aee8bb38a..89902099f1 100644
--- a/app/views/Project/Tagging/styles.css
+++ b/app/views/Project/Tagging/styles.css
@@ -14,5 +14,6 @@
     .child-view {
         flex-grow: 1;
         overflow: auto;
+        scrollbar-gutter: stable;
     }
 }
diff --git a/app/views/Project/index.tsx b/app/views/Project/index.tsx
index 353546f9b0..e8f4be3328 100644
--- a/app/views/Project/index.tsx
+++ b/app/views/Project/index.tsx
@@ -1,5 +1,5 @@
 import React, { useMemo, useContext, Suspense } from 'react';
-import { Switch, Route, useParams } from 'react-router-dom';
+import { Routes, Route, useParams } from 'react-router-dom';
 import { useQuery, gql, useMutation } from '@apollo/client';
 
 import PreloadMessage from '#base/components/PreloadMessage';
@@ -74,9 +74,7 @@ function Project(props: Props) {
                         variables: { id: data.project.id },
                     });
                 }
-                // FIXME: handle failure
             },
-            // FIXME: handle failure
         },
     );
 
@@ -110,42 +108,40 @@ function Project(props: Props) {
                 />
             )}
         >
-            <Switch>
+            <Routes>
                 <Route
-                    exact
-                    path={routes.entryEdit.path}
-                >
-                    {routes.entryEdit.load({ className })}
-                </Route>
+                    path={routes.entryEdit.pathForRoute}
+                    element={routes.entryEdit.load({ className })}
+                />
+                <Route
+                    path={routes.tagging.pathForRoute}
+                    element={routes.tagging.load({ className })}
+                />
+                <Route
+                    path={routes.analysis.pathForRoute}
+                    element={routes.analysis.load({ className })}
+                />
                 <Route
-                    path={routes.tagging.path}
-                >
-                    {routes.tagging.load({ className })}
-                </Route>
+                    path={routes.pillarAnalysis.pathForRoute}
+                    element={routes.pillarAnalysis.load({ className })}
+                />
                 <Route
-                    exact
-                    path={routes.analysis.path}
-                >
-                    {routes.analysis.load({ className })}
-                </Route>
+                    path={routes.assessmentEdit.pathForRoute}
+                    element={routes.assessmentEdit.load({ className })}
+                />
                 <Route
-                    exact
-                    path={routes.pillarAnalysis.path}
-                >
-                    {routes.pillarAnalysis.load({ className })}
-                </Route>
+                    path={routes.groupAssessmentEdit.pathForRoute}
+                    element={routes.groupAssessmentEdit.load({ className })}
+                />
                 <Route
-                    path={routes.projectEdit.path}
-                >
-                    {routes.projectEdit.load({ className })}
-                </Route>
+                    path={routes.projectEdit.pathForRoute}
+                    element={routes.projectEdit.load({ className })}
+                />
                 <Route
-                    exact
-                    path={routes.fourHundredFour.path}
-                >
-                    {routes.fourHundredFour.load({ className })}
-                </Route>
-            </Switch>
+                    path={routes.fourHundredFour.pathForRoute}
+                    element={routes.fourHundredFour.load({})}
+                />
+            </Routes>
         </Suspense>
     );
 }
diff --git a/app/views/ProjectEdit/Framework/AddFrameworkModal/styles.css b/app/views/ProjectEdit/Framework/AddFrameworkModal/styles.css
deleted file mode 100644
index 848a107d6b..0000000000
--- a/app/views/ProjectEdit/Framework/AddFrameworkModal/styles.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.modal {
-    .modal-body {
-        display: flex;
-        flex-direction: column;
-        padding: calc(var(--dui-spacing-large) - var(--dui-spacing-medium));
-        width: clamp(480px, 50vh, 720px);
-
-        .input {
-            margin: var(--dui-spacing-medium);
-        }
-    }
-}
diff --git a/app/views/ProjectEdit/Framework/AddFrameworkModal/index.tsx b/app/views/ProjectEdit/Framework/CloneFrameworkModal/index.tsx
similarity index 75%
rename from app/views/ProjectEdit/Framework/AddFrameworkModal/index.tsx
rename to app/views/ProjectEdit/Framework/CloneFrameworkModal/index.tsx
index ff5af68c0f..1513a092e7 100644
--- a/app/views/ProjectEdit/Framework/AddFrameworkModal/index.tsx
+++ b/app/views/ProjectEdit/Framework/CloneFrameworkModal/index.tsx
@@ -53,32 +53,27 @@ interface ValueToSend {
 
 interface Props {
     className?: string;
-    frameworkToClone?: FormType;
-    onActionSuccess: (newFrameworkId: string) => void;
+    frameworkToClone: string;
+    frameworkTitle?: string;
+    frameworkDescription?: string;
+    onCloneSuccess: (newFrameworkId: string) => void;
     onModalClose: () => void;
 }
 
-function addCloneLabel(details: FormType | undefined) {
-    if (!details) {
-        return undefined;
-    }
-
-    return ({
-        title: `${details.title} (cloned)`,
-        description: details.description,
-    });
-}
-
-function AddFrameworkModal(props: Props) {
+function CloneFrameworkModal(props: Props) {
     const {
         className,
         frameworkToClone,
-        onActionSuccess,
+        frameworkTitle,
+        frameworkDescription,
+        onCloneSuccess,
         onModalClose,
     } = props;
 
-    const formValueFromProps: PartialForm<FormType> = addCloneLabel(frameworkToClone)
-        ?? defaultFormValue;
+    const formValueFromProps: PartialForm<FormType> = frameworkTitle ? {
+        title: `${frameworkTitle} (cloned)`,
+        description: frameworkDescription,
+    } : defaultFormValue;
 
     const {
         pristine,
@@ -93,23 +88,20 @@ function AddFrameworkModal(props: Props) {
     const error = getErrorObject(riskyError);
 
     const {
-        pending: pendingAddAction,
+        pending: pendingCloneAction,
         trigger: triggerCreateFramework,
     } = useLazyRequest<Framework, ValueToSend>({
-        url: 'server://analysis-frameworks/',
+        url: `server://clone-analysis-framework/${frameworkToClone}/`,
         method: 'POST',
         body: (ctx) => ctx,
         onSuccess: (response) => {
-            onActionSuccess(String(response.id));
-            const message = isDefined(frameworkToClone)
-                ? _ts('projectEdit', 'cloneFrameworkSuccessMessage')
-                : _ts('projectEdit', 'createFrameworkSuccessMessage');
+            onCloneSuccess(String(response.id));
             alert.show(
-                message,
+                _ts('projectEdit', 'cloneFrameworkSuccessMessage'),
                 { variant: 'success' },
             );
         },
-        failureHeader: _ts('projectEdit', 'projectMembershipPostFailed'),
+        failureMessage: _ts('projectEdit', 'projectMembershipPostFailed'),
     });
 
     const handleSubmit = useCallback(
@@ -124,11 +116,13 @@ function AddFrameworkModal(props: Props) {
         [setError, validate, triggerCreateFramework],
     );
 
-    const pendingRequests = pendingAddAction;
+    const pendingRequests = pendingCloneAction;
 
     return (
         <Modal
             className={_cs(className, styles.modal)}
+            size="small"
+            freeHeight
             heading={
                 isDefined(frameworkToClone)
                     ? _ts('projectEdit', 'cloneFrameworkHeading')
@@ -141,7 +135,7 @@ function AddFrameworkModal(props: Props) {
                     name="submit"
                     variant="primary"
                     type="submit"
-                    disabled={pristine || pendingAddAction}
+                    disabled={pristine || pendingCloneAction}
                     onClick={handleSubmit}
                 >
                     {_ts('projectEdit', 'submitLabel')}
@@ -151,7 +145,6 @@ function AddFrameworkModal(props: Props) {
             {pendingRequests && <PendingMessage />}
             <TextInput
                 name="title"
-                className={styles.input}
                 onChange={setFieldValue}
                 value={value.title}
                 label={_ts('projectEdit', 'titleLabel')}
@@ -162,7 +155,6 @@ function AddFrameworkModal(props: Props) {
             <TextArea
                 name="description"
                 rows={5}
-                className={styles.input}
                 onChange={setFieldValue}
                 value={value.description}
                 label={_ts('projectEdit', 'descriptionLabel')}
@@ -174,4 +166,4 @@ function AddFrameworkModal(props: Props) {
     );
 }
 
-export default AddFrameworkModal;
+export default CloneFrameworkModal;
diff --git a/app/views/ProjectEdit/Framework/CloneFrameworkModal/styles.css b/app/views/ProjectEdit/Framework/CloneFrameworkModal/styles.css
new file mode 100644
index 0000000000..0dbf944803
--- /dev/null
+++ b/app/views/ProjectEdit/Framework/CloneFrameworkModal/styles.css
@@ -0,0 +1,7 @@
+.modal {
+    .modal-body {
+        display: flex;
+        flex-direction: column;
+        gap: var(--dui-spacing-medium);
+    }
+}
diff --git a/app/views/ProjectEdit/Framework/FrameworkDetail/index.tsx b/app/views/ProjectEdit/Framework/FrameworkDetail/index.tsx
index 0983e72cdf..d9f6358fb1 100644
--- a/app/views/ProjectEdit/Framework/FrameworkDetail/index.tsx
+++ b/app/views/ProjectEdit/Framework/FrameworkDetail/index.tsx
@@ -6,7 +6,6 @@ import {
 import { generatePath } from 'react-router-dom';
 import { gql, useQuery } from '@apollo/client';
 import {
-    IoEarth,
     IoCopyOutline,
     IoCheckmark,
 } from 'react-icons/io5';
@@ -15,6 +14,7 @@ import {
     Card,
     Tabs,
     Tab,
+    Kraken,
     TabList,
     Message,
     TabPanel,
@@ -50,7 +50,7 @@ import {
     WidgetType as WidgetRaw,
 } from '#generated/types';
 
-import AddFrameworkModal from '../AddFrameworkModal';
+import CloneFrameworkModal from '../CloneFrameworkModal';
 import styles from './styles.css';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -80,9 +80,15 @@ const FRAMEWORK_DETAILS = gql`
                     key
                     order
                     properties
+                    conditional {
+                        parentWidget
+                        parentWidgetType
+                        conditions
+                    }
                     title
                     widgetId
                     width
+                    version
                 }
                 clientId
                 id
@@ -97,8 +103,14 @@ const FRAMEWORK_DETAILS = gql`
                 order
                 title
                 properties
+                conditional {
+                    parentWidget
+                    parentWidgetType
+                    conditions
+                }
                 widgetId
                 width
+                version
             }
         }
     }
@@ -186,23 +198,19 @@ function FrameworkDetail(props: Props) {
                 });
             });
         },
-        failureHeader: _ts('projectEdit', 'projectDetailsLabel'),
+        failureMessage: _ts('projectEdit', 'projectDetailsLabel'),
     });
 
     const itemRendererParams = useCallback((_, data) => ({
         className: styles.projectTitle,
         children: data.title,
-        to: '',
+        to: generatePath(routes.tagging.path, { projectId: data.id }),
     }), []);
 
-    const [frameworkToClone, setFrameworkToClone] = useState<
-        { title: string; description?: string } | undefined
-    >();
-
     const [
-        frameworkAddModalShown,
-        showFrameworkAddModal,
-        hideFrameworkAddModal,
+        frameworkCloneModalShown,
+        showFrameworkCloneModal,
+        hideFrameworkCloneModal,
     ] = useModalState(false);
 
     const handleUseFrameworkClick = useCallback(() => {
@@ -210,15 +218,13 @@ function FrameworkDetail(props: Props) {
     }, [projectPatch]);
 
     const handleNewFrameworkAddSuccess = useCallback((newFrameworkId: string) => {
-        setFrameworkToClone(undefined);
         onFrameworkCreate(newFrameworkId);
-        hideFrameworkAddModal();
-    }, [hideFrameworkAddModal, onFrameworkCreate]);
+        hideFrameworkCloneModal();
+    }, [hideFrameworkCloneModal, onFrameworkCreate]);
 
     const handleFrameworkCloneClick = useCallback(() => {
-        setFrameworkToClone(frameworkDetails);
-        showFrameworkAddModal();
-    }, [frameworkDetails, showFrameworkAddModal]);
+        showFrameworkCloneModal();
+    }, [showFrameworkCloneModal]);
 
     const disableAllButtons = projectPatchPending;
     const frameworkRoute = generatePath(routes.analyticalFrameworkEdit.path, {
@@ -371,7 +377,8 @@ function FrameworkDetail(props: Props) {
                     <Card className={styles.preview}>
                         <TabPanel
                             name="primary"
-                            className={styles.tabPanel}
+                            activeClassName={styles.tabPanel}
+                            retainMount="lazy"
                         >
                             <Tabs
                                 value={selectedSection}
@@ -398,9 +405,10 @@ function FrameworkDetail(props: Props) {
                                                 <TabPanel
                                                     key={section.clientId}
                                                     name={section.clientId}
-                                                    className={styles.panel}
+                                                    activeClassName={styles.panel}
                                                 >
                                                     <Section
+                                                        allWidgets={undefined}
                                                         widgets={section.widgets}
                                                         onAttributeChange={noop}
                                                         attributesMap={emptyObject}
@@ -416,15 +424,22 @@ function FrameworkDetail(props: Props) {
                                 ) : (
                                     <Message
                                         icon={(
-                                            <IoEarth />
+                                            <Kraken
+                                                size="large"
+                                                variant="sleep"
+                                            />
                                         )}
-                                        message="There are no sections in this framework"
+                                        message="There are no sections in this framework."
                                     />
                                 )}
                             </Tabs>
                         </TabPanel>
-                        <TabPanel name="secondary">
+                        <TabPanel
+                            name="secondary"
+                            retainMount="lazy"
+                        >
                             <Section
+                                allWidgets={undefined}
                                 widgets={frameworkDetails?.secondaryTagging}
                                 onAttributeChange={noop}
                                 attributesMap={emptyObject}
@@ -437,11 +452,13 @@ function FrameworkDetail(props: Props) {
                     </Card>
                 </ContainerCard>
             </Tabs>
-            {frameworkAddModalShown && (
-                <AddFrameworkModal
-                    frameworkToClone={frameworkToClone}
-                    onActionSuccess={handleNewFrameworkAddSuccess}
-                    onModalClose={hideFrameworkAddModal}
+            {frameworkCloneModalShown && (
+                <CloneFrameworkModal
+                    frameworkToClone={frameworkId}
+                    frameworkTitle={frameworkDetails?.title}
+                    frameworkDescription={frameworkDetails?.description}
+                    onCloneSuccess={handleNewFrameworkAddSuccess}
+                    onModalClose={hideFrameworkCloneModal}
                 />
             )}
         </div>
diff --git a/app/views/ProjectEdit/Framework/FrameworkDetail/styles.css b/app/views/ProjectEdit/Framework/FrameworkDetail/styles.css
index 937c101878..db27d0ea0b 100644
--- a/app/views/ProjectEdit/Framework/FrameworkDetail/styles.css
+++ b/app/views/ProjectEdit/Framework/FrameworkDetail/styles.css
@@ -83,6 +83,8 @@
                 }
 
                 .tabs {
+                    flex-shrink: 0;
+
                     .border-wrapper {
                         display: flex;
                         flex-grow: 1;
diff --git a/app/views/ProjectEdit/Framework/index.tsx b/app/views/ProjectEdit/Framework/index.tsx
index 52c0e0d56f..2aff1a3eac 100644
--- a/app/views/ProjectEdit/Framework/index.tsx
+++ b/app/views/ProjectEdit/Framework/index.tsx
@@ -8,8 +8,7 @@ import {
 import {
     Container,
     Button,
-    List,
-    PendingMessage,
+    ListView,
     RawButton,
     TextInput,
     SelectInput,
@@ -29,10 +28,12 @@ import { useRequest } from '#base/utils/restRequest';
 import SmartButtonLikeLink from '#base/components/SmartButtonLikeLink';
 import useDebouncedValue from '#hooks/useDebouncedValue';
 import ProjectContext from '#base/context/ProjectContext';
+import { isFiltered } from '#utils/common';
 import routes from '#base/configs/routes';
 import _ts from '#ts';
 
 import FrameworkDetail from './FrameworkDetail';
+
 import styles from './styles.css';
 
 interface FrameworkMini {
@@ -186,7 +187,6 @@ function ProjectFramework(props: Props) {
                 ...response.results,
             ]);
         },
-        failureHeader: _ts('projectEdit', 'frameworkDetails'),
         preserveResponse: true,
     });
 
@@ -216,6 +216,8 @@ function ProjectFramework(props: Props) {
         offset,
     ]);
 
+    const totalFrameworksCount = frameworksResponse?.count ?? 0;
+
     return (
         <div className={_cs(styles.framework, className)}>
             <div className={styles.leftContainer}>
@@ -237,37 +239,36 @@ function ProjectFramework(props: Props) {
                         placeholder={_ts('projectEdit', 'searchLabel')}
                     />
                 </div>
-                <div className={styles.frameworkList}>
-                    {frameworksGetPending && <PendingMessage />}
-                    {frameworkList.length > 0 ? (
-                        <>
-                            <List
-                                data={frameworkList}
-                                keySelector={frameworkKeySelector}
-                                renderer={Item}
-                                rendererParams={frameworksRendererParams}
-                            />
-                            {(frameworkList.length < (frameworksResponse?.count ?? 0)) && (
-                                <Button
-                                    className={styles.showMoreButton}
-                                    variant="action"
-                                    name="showMore"
-                                    onClick={handleShowMoreButtonClick}
-                                    actions={(
-                                        <IoChevronForward />
-                                    )}
-                                >
-                                    {/* TODO: Might move to component library, no need to use ts */}
-                                    Show More
-                                </Button>
+                <div className={styles.bottomContent}>
+                    <ListView
+                        className={styles.frameworkList}
+                        pending={frameworksGetPending}
+                        errored={false}
+                        data={frameworkList}
+                        keySelector={frameworkKeySelector}
+                        renderer={Item}
+                        filtered={isFiltered(value)}
+                        rendererParams={frameworksRendererParams}
+                        messageShown
+                        messageIconShown
+                    />
+                    {(
+                        totalFrameworksCount > 0
+                        && (frameworkList.length < totalFrameworksCount)
+                    ) && (
+                        <Button
+                            className={styles.showMoreButton}
+                            variant="action"
+                            name={undefined}
+                            onClick={handleShowMoreButtonClick}
+                            disabled={frameworksGetPending}
+                            actions={(
+                                <IoChevronForward />
                             )}
-                        </>
-                    ) : (
-                        !frameworksGetPending && (
-                            <div className={styles.emptyContainer}>
-                                {_ts('projectEdit', 'noFrameworks')}
-                            </div>
-                        )
+                        >
+                            {/* TODO: Might move to component library, no need to use ts */}
+                            Show More
+                        </Button>
                     )}
                 </div>
             </div>
diff --git a/app/views/ProjectEdit/Framework/styles.css b/app/views/ProjectEdit/Framework/styles.css
index 830053d6bb..6a68ca980f 100644
--- a/app/views/ProjectEdit/Framework/styles.css
+++ b/app/views/ProjectEdit/Framework/styles.css
@@ -7,6 +7,8 @@
     --width-left-container: 320px;
 
     .left-container {
+        display: flex;
+        flex-direction: column;
         flex-shrink: 0;
         background-color: var(--dui-color-background-information);
         padding-left: var(--dui-spacing-super-large);
@@ -17,43 +19,43 @@
         .filters {
             display: flex;
             flex-direction: column;
+            flex-shrink: 0;
             padding: var(--dui-spacing-medium) 0;
             padding-right: var(--dui-spacing-medium);
             overflow-y: auto;
             gap: var(--dui-spacing-medium);
         }
 
-        .framework-list {
-            display: flex;
-            align-items: center;
-            flex-direction: column;
+        .bottom-content {
             flex-grow: 1;
-            justify-content: center;
-            padding: var(--dui-spacing-medium) 0;
-            overflow-x: unset;
-            overflow-y: auto;
 
-            .item {
-                display: flex;
-                flex-direction: column;
-                border-bottom: var(--dui-width-separator-thin) solid var(--dui-color-separator);
-                background-color: var(--dui-color-background-information);
-                padding: var(--dui-spacing-small) var(--dui-spacing-medium);
-                gap: var(--dui-spacing-small);
-                width: 100%;
-                text-align: left;
+            .framework-list {
+                padding: var(--dui-spacing-medium) 0;
+                overflow-x: unset;
+                overflow-y: auto;
 
-                .title {
-                    font-weight: var(--dui-font-weight-bold);
-                }
+                .item {
+                    display: flex;
+                    flex-direction: column;
+                    border-bottom: var(--dui-width-separator-thin) solid var(--dui-color-separator);
+                    background-color: var(--dui-color-background-information);
+                    padding: var(--dui-spacing-small) var(--dui-spacing-medium);
+                    gap: var(--dui-spacing-small);
+                    width: 100%;
+                    text-align: left;
 
-                .created-on {
-                    color: var(--dui-color-text-description);
-                    font-size: var(--dui-font-size-small);
-                }
+                    .title {
+                        font-weight: var(--dui-font-weight-bold);
+                    }
 
-                &.selected {
-                    background-color: var(--dui-color-surface-information);
+                    .created-on {
+                        color: var(--dui-color-text-description);
+                        font-size: var(--dui-font-size-small);
+                    }
+
+                    &.selected {
+                        background-color: var(--dui-color-surface-information);
+                    }
                 }
             }
 
@@ -62,13 +64,6 @@
                 padding: var(--dui-spacing-small) var(--dui-spacing-medium);
                 color: var(--dui-color-accent);
             }
-
-            .empty-container {
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                min-height: clamp(320px, 70vh, 720px);
-            }
         }
     }
 
diff --git a/app/views/ProjectEdit/GeoAreas/CustomGeoAddModal/index.tsx b/app/views/ProjectEdit/GeoAreas/CustomGeoAddModal/index.tsx
index 9424b24327..411648bbeb 100644
--- a/app/views/ProjectEdit/GeoAreas/CustomGeoAddModal/index.tsx
+++ b/app/views/ProjectEdit/GeoAreas/CustomGeoAddModal/index.tsx
@@ -105,6 +105,8 @@ function CustomGeoAddModal(props: Props) {
         <Modal
             heading="Add Custom Geo Area"
             onCloseButtonClick={onModalClose}
+            size="small"
+            freeHeight
             footerActions={(
                 <Button
                     name="submit"
@@ -116,9 +118,7 @@ function CustomGeoAddModal(props: Props) {
                 </Button>
             )}
         >
-            <NonFieldError
-                error={error}
-            />
+            <NonFieldError error={error} />
             <div className={styles.row}>
                 <TextInput
                     name="title"
diff --git a/app/views/ProjectEdit/GeoAreas/RegionCard/AddAdminLevelPane/AddAdminLevelForm/index.tsx b/app/views/ProjectEdit/GeoAreas/RegionCard/AddAdminLevelPane/AddAdminLevelForm/index.tsx
index 8b0c1a1938..d83c8634da 100644
--- a/app/views/ProjectEdit/GeoAreas/RegionCard/AddAdminLevelPane/AddAdminLevelForm/index.tsx
+++ b/app/views/ProjectEdit/GeoAreas/RegionCard/AddAdminLevelPane/AddAdminLevelForm/index.tsx
@@ -10,6 +10,8 @@ import {
     TextInput,
     SelectInput,
     ContainerCard,
+    ConfirmButton,
+    useAlert,
 } from '@the-deep/deep-ui';
 import {
     ObjectSchema,
@@ -85,11 +87,13 @@ function AddAdminLevelForm(props: Props) {
         value,
         error: riskyError,
         setFieldValue,
+        setPristine,
         validate,
         setError,
     } = useForm(schema, valueFromProps);
 
     const error = getErrorObject(riskyError);
+    const alert = useAlert();
 
     const {
         pending,
@@ -104,17 +108,19 @@ function AddAdminLevelForm(props: Props) {
         body: (ctx) => ctx,
         onSuccess: (response) => {
             onSave(response);
+            setPristine(true);
+            alert.show(
+                isDefined(valueFromProps.id)
+                    ? 'Successfully updated admin level.'
+                    : 'Successfully created admin level.',
+                { variant: 'success' },
+            );
         },
-        failureHeader: isDefined(valueFromProps.id)
+        failureMessage: isDefined(valueFromProps.id)
             ? 'Failed to  update admin level'
             : 'Failed to create admin level',
     });
 
-    const handleDelete = useCallback(() => {
-        // NOTE: if no id is defined, just remove the temporary form
-        onDelete(valueFromProps.id);
-    }, [onDelete, valueFromProps.id]);
-
     const handleSubmit = useCallback(() => {
         const submit = createSubmitHandler(
             validate,
@@ -126,19 +132,24 @@ function AddAdminLevelForm(props: Props) {
 
     const parentOptions = adminLevelOptions?.filter((v) => v.id !== valueFromProps.id);
 
+    const handleAdminLevelDelete = useCallback(() => {
+        onDelete(valueFromProps.id);
+    }, [onDelete, valueFromProps.id]);
+
     return (
         <ContainerCard
             className={styles.form}
             footerActions={!isPublished && (
                 <>
-                    <Button
-                        name="delete"
-                        onClick={handleDelete}
+                    <ConfirmButton
+                        name={undefined}
+                        onConfirm={handleAdminLevelDelete}
+                        message="Are you sure you want to remove this admin level?"
                         disabled={pending}
                         variant="transparent"
                     >
                         {value.id ? 'Delete' : 'Cancel'}
-                    </Button>
+                    </ConfirmButton>
                     <Button
                         name="submit"
                         onClick={handleSubmit}
@@ -151,19 +162,22 @@ function AddAdminLevelForm(props: Props) {
             )}
         >
             <NonFieldError error={error} />
-            <DeepFileInput
-                name="geoShapeFile"
-                className={styles.input}
-                label="Upload a file and select the corresponding field names from your file"
-                onChange={setFieldValue}
-                option={fileUploadOption}
-                setOption={setFileUploadOption}
-                value={value.geoShapeFile}
-                readOnly={isPublished}
-                disabled={pending}
-            >
-                <MdFileUpload />
-            </DeepFileInput>
+            {!isPublished && (
+                <DeepFileInput
+                    name="geoShapeFile"
+                    className={styles.input}
+                    label="Upload a file and select the corresponding field names from your file"
+                    onChange={setFieldValue}
+                    option={fileUploadOption}
+                    setOption={setFileUploadOption}
+                    value={value.geoShapeFile}
+                    readOnly={isPublished}
+                    disabled={pending}
+                    maxFileSize={25}
+                >
+                    <MdFileUpload />
+                </DeepFileInput>
+            )}
             <div className={styles.row}>
                 <NumberInput
                     name="level"
diff --git a/app/views/ProjectEdit/GeoAreas/RegionCard/index.tsx b/app/views/ProjectEdit/GeoAreas/RegionCard/index.tsx
index b8723221b3..41a23c3421 100644
--- a/app/views/ProjectEdit/GeoAreas/RegionCard/index.tsx
+++ b/app/views/ProjectEdit/GeoAreas/RegionCard/index.tsx
@@ -6,9 +6,12 @@ import {
 import { PartialForm } from '@togglecorp/toggle-form';
 import {
     IoTrashBinOutline,
+    IoInformationCircleOutline,
     IoAdd,
 } from 'react-icons/io5';
 import {
+    ListView,
+    Message,
     ControlledExpandableContainer,
     QuickActionConfirmButton,
     ContainerCard,
@@ -19,12 +22,13 @@ import {
     Tab,
     List,
 } from '@the-deep/deep-ui';
-import { useRequest } from '#base/utils/restRequest';
+import {
+    useRequest,
+    useLazyRequest,
+} from '#base/utils/restRequest';
 
-import _ts from '#ts';
 import {
     BasicRegion,
-    Region,
     MultiResponse,
     AdminLevelGeoArea,
 } from '#types';
@@ -42,6 +46,8 @@ const tabKeySelector = (d: AdminLevel) => d.clientId;
 interface Props {
     region: BasicRegion;
     className?: string;
+    regions?: BasicRegion[];
+    activeProject: string;
     isExpanded: boolean;
     handleExpansion: (_: boolean, name: string) => void;
     activeAdminLevel: string | undefined;
@@ -50,20 +56,28 @@ interface Props {
     onTempAdminLevelChange?: (value: PartialAdminLevel | undefined) => void;
     onAdminLevelUpdate?: () => void;
     navigationDisabled?: boolean;
+    isPublished: boolean;
+    onRegionPublishSuccess: () => void;
+    onRegionRemoveSuccess: () => void;
 }
 
 function RegionCard(props: Props) {
     const {
+        regions,
         handleExpansion,
         isExpanded,
+        isPublished,
         className,
         region,
         activeAdminLevel,
         onActiveAdminLevelChange,
+        activeProject,
         tempAdminLevel,
         onTempAdminLevelChange,
         navigationDisabled,
         onAdminLevelUpdate,
+        onRegionPublishSuccess,
+        onRegionRemoveSuccess,
     } = props;
 
     // setting this so that when user add an admin level, it is updated
@@ -89,17 +103,6 @@ function RegionCard(props: Props) {
         ? tempAdminLevel.clientId
         : activeAdminLevel;
 
-    // FIXME: we don't even need this request when moving to gql
-    const {
-        response: regionResponse,
-        pending: regionPending,
-    } = useRequest<Region>({
-        url: `server://regions/${region.id}/`,
-        skip: !isExpanded,
-        method: 'GET',
-        failureHeader: _ts('geoAreas', 'title'),
-    });
-
     const adminLevelQuery = useMemo(
         () => ({
             region: region.id,
@@ -108,15 +111,15 @@ function RegionCard(props: Props) {
     );
 
     const {
-        response: adminLevelsResponse,
         pending: adminLevelsPending,
+        retrigger: getAdminLevels,
     } = useRequest<MultiResponse<AdminLevelGeoArea>>({
         url: 'server://admin-levels/',
         skip: !isExpanded,
         query: adminLevelQuery,
         method: 'GET',
         onSuccess: (response) => {
-            if (response.results.length <= 0) {
+            if (response.results.length < 0) {
                 return;
             }
             // NOTE: this will be fixed on graphql endpoint
@@ -126,21 +129,53 @@ function RegionCard(props: Props) {
             }));
             setAdminLevels(adminLevelsWithClientId);
 
-            if (!activeAdminLevel && onActiveAdminLevelChange) {
+            if (onActiveAdminLevelChange) {
                 const [first] = adminLevelsWithClientId;
-                onActiveAdminLevelChange(first.id.toString());
+                if (first) {
+                    onActiveAdminLevelChange(first.id.toString());
+                }
+            }
+        },
+    });
+
+    const {
+        pending: deleteAdminLevelPending,
+        trigger: deleteAdminLevel,
+    } = useLazyRequest<unknown, number>({
+        url: (ctx) => `server://admin-levels/${ctx}/`,
+        method: 'DELETE',
+        onSuccess: () => {
+            getAdminLevels();
+            if (onAdminLevelUpdate) {
+                onAdminLevelUpdate();
             }
         },
-        failureHeader: 'Failed to fetch admin levels',
+    });
+
+    const {
+        trigger: removeRegion,
+    } = useLazyRequest<unknown, unknown>({
+        url: `server://projects/${activeProject}/`,
+        method: 'PATCH',
+        body: () => ({
+            regions: regions
+                ?.filter((r) => r.id !== region.id)
+                ?.map((r) => ({
+                    id: r.id,
+                })),
+        }),
+        onSuccess: () => {
+            onRegionRemoveSuccess();
+        },
     });
 
     const handleDeleteRegionClick = useCallback(
         () => {
-            // TODO: this will be added later
-            // eslint-disable-next-line no-console
-            console.warn('to be implemented');
+            if (regions) {
+                removeRegion(null);
+            }
         },
-        [],
+        [removeRegion, regions],
     );
 
     const handleAdminLevelAdd = useCallback(
@@ -198,37 +233,29 @@ function RegionCard(props: Props) {
                 if (onTempAdminLevelChange) {
                     onTempAdminLevelChange(undefined);
                 }
+            } else {
+                deleteAdminLevel(id);
             }
-            /*
-            // TODO: actually delete admin level
-            else {
-                setAdminLevels((oldAdminLevels) => {
-                    const newAdminLevels = [
-                        ...oldAdminLevels,
-                    ];
-                    const index = newAdminLevels.findIndex(item => item.id === id);
-                    if (index !== -1) {
-                        newAdminLevels.splice(index);
-                    }
-                    return newAdminLevels;
-                });
-                if (onAdminLevelUpdate) {
-                    onAdminLevelUpdate();
-                }
-            }
-             */
         },
-        [onTempAdminLevelChange],
+        [onTempAdminLevelChange, deleteAdminLevel],
     );
 
-    const handlePublishGeoArea = useCallback(
-        () => {
-            // TODO add this later
-            // eslint-disable-next-line no-console
-            console.warn('to be implemented');
+    const {
+        pending: pendingPublishRegion,
+        trigger: publishRegion,
+    } = useLazyRequest<unknown>({
+        url: `server://regions/${region.id}/publish/`,
+        body: {},
+        method: 'POST',
+        onSuccess: () => {
+            onRegionPublishSuccess();
         },
-        [],
-    );
+        failureMessage: 'Failed to publish selected region.',
+    });
+
+    const handlePublishRegionClick = useCallback(() => {
+        publishRegion(null);
+    }, [publishRegion]);
 
     const tabListRendererParams = useCallback(
         (key: string, data: PartialAdminLevel) => ({
@@ -245,93 +272,124 @@ function RegionCard(props: Props) {
             value: data,
             onSave: handleAdminLevelSave,
             onDelete: handleAdminLevelDelete,
-            isPublished: regionResponse?.isPublished,
+            isPublished,
             adminLevelOptions: adminLevels,
         }),
         [
-            regionResponse?.isPublished,
+            isPublished,
             adminLevels,
             handleAdminLevelSave,
             handleAdminLevelDelete,
         ],
     );
 
+    const pending = adminLevelsPending || pendingPublishRegion || deleteAdminLevelPending;
+
     return (
         <ControlledExpandableContainer
             name={region.id.toString()}
             className={_cs(className, styles.region)}
-            heading={region.title}
-            contentAlwaysMounted={false}
+            headingClassName={styles.heading}
+            heading={(
+                <>
+                    {region.title}
+                    {!isPublished && (
+                        <span className={styles.headingDescription}>
+                            (In progress)
+                        </span>
+                    )}
+                </>
+            )}
+            alwaysMountedContent={false}
             expanded={isExpanded}
             withoutBorder
             disabled={navigationDisabled}
             onExpansionChange={handleExpansion}
+            expansionTriggerArea="arrow"
             headerActions={(
                 <QuickActionConfirmButton
                     name="deleteButton"
-                    title={_ts('geoAreas', 'deleteGeoArea')}
+                    title="Remove geo area from this project"
                     onConfirm={handleDeleteRegionClick}
-                    message={_ts('geoAreas', 'deleteGeoAreaConfirm')}
+                    message="Removing the geo area will remove all the tagged geo data under your project.
+                    The removal of tags cannot be undone.
+                    Are you sure you want to remove this geo area from the project?"
                     showConfirmationInitially={false}
-                    disabled
-                    // disabled={navigationDisabled}
+                    disabled={navigationDisabled}
                 >
                     <IoTrashBinOutline />
                 </QuickActionConfirmButton>
             )}
         >
-            {regionResponse && adminLevelsResponse && !regionPending && !adminLevelsPending && (
-                <ContainerCard
-                    className={_cs(className, styles.addAdminLevel)}
-                    heading="Custom Admin Levels"
-                    headingSize="extraSmall"
-                    contentClassName={styles.content}
-                    headerActions={!regionResponse.isPublished && (
-                        <Button
-                            name="addAdminLevel"
-                            className={styles.submit}
-                            onClick={handleAdminLevelAdd}
-                            variant="tertiary"
-                            icons={<IoAdd />}
-                            disabled={navigationDisabled}
-                        >
-                            Add Admin Level
-                        </Button>
-                    )}
-                    footerActions={!regionResponse.isPublished && (
-                        <ConfirmButton
-                            name="submit"
-                            onClick={handlePublishGeoArea}
-                            variant="secondary"
-                            disabled
-                            // disabled={navigationDisabled}
-                        >
-                            Publish Area
-                        </ConfirmButton>
-                    )}
-                >
-                    <Tabs
-                        onChange={onActiveAdminLevelChange}
-                        value={activeAdminLevelWithTempAdminLevel}
+            {!isPublished && (
+                <Message
+                    icon={(<IoInformationCircleOutline />)}
+                    message="This geo area has not been published yet.
+                    You won't see this geo area in your project while tagging."
+                    className={styles.message}
+                    compact
+                />
+            )}
+            <ContainerCard
+                className={_cs(className, styles.addAdminLevel)}
+                heading="Custom Admin Levels"
+                headingSize="extraSmall"
+                contentClassName={styles.content}
+                headerActions={!isPublished && (
+                    <Button
+                        name="addAdminLevel"
+                        className={styles.submit}
+                        onClick={handleAdminLevelAdd}
+                        variant="tertiary"
+                        icons={<IoAdd />}
                         disabled={navigationDisabled}
                     >
-                        <TabList className={styles.tabs}>
-                            <List
-                                data={adminLevelsWithTempAdminLevel}
-                                keySelector={tabKeySelector}
-                                rendererParams={tabListRendererParams}
-                                renderer={Tab}
-                            />
-                        </TabList>
+                        Add Admin Level
+                    </Button>
+                )}
+                footerActions={!isPublished && (
+                    <ConfirmButton
+                        name={undefined}
+                        onConfirm={handlePublishRegionClick}
+                        message="Are you sure you want to publish this geo area?
+                        After you publish the geo area you cannot make any changes to the admin levels."
+                        disabled={(
+                            navigationDisabled
+                            || pendingPublishRegion
+                            || adminLevels.length < 1
+                        )}
+                    >
+                        Publish Area
+                    </ConfirmButton>
+                )}
+            >
+                <Tabs
+                    onChange={onActiveAdminLevelChange}
+                    value={activeAdminLevelWithTempAdminLevel}
+                    disabled={navigationDisabled}
+                >
+                    <TabList className={styles.tabs}>
                         <List
                             data={adminLevelsWithTempAdminLevel}
                             keySelector={tabKeySelector}
-                            rendererParams={tabPanelRendererParams}
-                            renderer={AddAdminLevelPane}
+                            rendererParams={tabListRendererParams}
+                            renderer={Tab}
                         />
-                    </Tabs>
-                </ContainerCard>
-            )}
+                    </TabList>
+                    <ListView
+                        data={adminLevelsWithTempAdminLevel}
+                        keySelector={tabKeySelector}
+                        errored={false}
+                        rendererParams={tabPanelRendererParams}
+                        pending={pending}
+                        filtered={false}
+                        messageShown
+                        messageIconShown
+                        emptyMessage="There are no admin levels in this region."
+                        renderer={AddAdminLevelPane}
+                    />
+                </Tabs>
+            </ContainerCard>
         </ControlledExpandableContainer>
     );
 }
diff --git a/app/views/ProjectEdit/GeoAreas/RegionCard/styles.css b/app/views/ProjectEdit/GeoAreas/RegionCard/styles.css
index d48675fa84..3ccdde3458 100644
--- a/app/views/ProjectEdit/GeoAreas/RegionCard/styles.css
+++ b/app/views/ProjectEdit/GeoAreas/RegionCard/styles.css
@@ -1,10 +1,30 @@
 .region {
     background-color: var(--dui-color-background);
 
+    .heading {
+        display: flex;
+        align-items: center;
+        gap: var(--dui-spacing-small);
+
+        .heading-description {
+            display: flex;
+            align-items: flex-end;
+            gap: var(--dui-spacing-extra-small);
+            color: var(--dui-color-text-disabled);
+            font-size: var(--dui-font-size-small);
+            font-style: italic;
+        }
+    }
+
+    .message {
+        text-align: left;
+    }
+
     .add-admin-level {
         display: flex;
         flex-grow: 1;
         background-color: var(--dui-color-background);
+        min-height: 30vh;
 
         .content {
             display: flex;
diff --git a/app/views/ProjectEdit/GeoAreas/RegionsMap/RegionTabPanel/index.tsx b/app/views/ProjectEdit/GeoAreas/RegionsMap/RegionTabPanel/index.tsx
index a0b626db8e..41c919d05d 100644
--- a/app/views/ProjectEdit/GeoAreas/RegionsMap/RegionTabPanel/index.tsx
+++ b/app/views/ProjectEdit/GeoAreas/RegionsMap/RegionTabPanel/index.tsx
@@ -28,7 +28,7 @@ function RegionTabPanel(props: Props) {
 
     return (
         <TabPanel
-            className={_cs(styles.tabPanel, className)}
+            activeClassName={_cs(styles.tabPanel, className)}
             name={id}
         >
             <RegionMap
@@ -39,6 +39,8 @@ function RegionTabPanel(props: Props) {
                 onAdminLevelChange={onActiveAdminLevelChange}
                 navigationDisabled={navigationDisabled}
                 triggerId={triggerId}
+                geoAreaOptions={undefined}
+                onGeoAreaOptionsChange={undefined}
             />
         </TabPanel>
     );
diff --git a/app/views/ProjectEdit/GeoAreas/RegionsMap/index.tsx b/app/views/ProjectEdit/GeoAreas/RegionsMap/index.tsx
index e775920da3..2bb21a75fc 100644
--- a/app/views/ProjectEdit/GeoAreas/RegionsMap/index.tsx
+++ b/app/views/ProjectEdit/GeoAreas/RegionsMap/index.tsx
@@ -78,7 +78,7 @@ function RegionsMap(props: Props) {
         body: (ctx) => ctx.body,
         onSuccess: (_, ctx) => {
             alert.show(
-                'Successfully added regions',
+                'Successfully added geo area to the project.',
                 { variant: 'success' },
             );
             onActiveRegionChange(ctx.newRegion.toString());
@@ -109,7 +109,7 @@ function RegionsMap(props: Props) {
     ] = useConfirmation<number>({
         showConfirmationInitially: false,
         onConfirm: handleAddRegionConfirm,
-        message: 'Are you sure you want to add this region?',
+        message: 'Are you sure you want to add this geo area to the project?',
     });
 
     const tabRendererParams = useCallback(
diff --git a/app/views/ProjectEdit/GeoAreas/RegionsMap/styles.css b/app/views/ProjectEdit/GeoAreas/RegionsMap/styles.css
index 09c18a07dc..1b63612bfc 100644
--- a/app/views/ProjectEdit/GeoAreas/RegionsMap/styles.css
+++ b/app/views/ProjectEdit/GeoAreas/RegionsMap/styles.css
@@ -44,17 +44,11 @@
         }
     }
 
-    .region {
-        position: absolute;
-        top: var(--dui-spacing-large);
-        left: var(--dui-spacing-large);
-        z-index: 1;
-    }
-
     .tab-panel-container {
         display: flex;
         position: relative;
         flex-grow: 1;
+        z-index: 0;
         padding: 0;
         overflow-y: auto;
 
@@ -63,6 +57,13 @@
             height: 100%;
             overflow-y: auto;
         }
+
+        .region {
+            position: absolute;
+            top: var(--dui-spacing-large);
+            left: var(--dui-spacing-large);
+            z-index: 1;
+        }
     }
 }
 
diff --git a/app/views/ProjectEdit/GeoAreas/index.tsx b/app/views/ProjectEdit/GeoAreas/index.tsx
index 9ca9366c12..816890dc21 100644
--- a/app/views/ProjectEdit/GeoAreas/index.tsx
+++ b/app/views/ProjectEdit/GeoAreas/index.tsx
@@ -73,7 +73,6 @@ function GeoAreas(props: Props) {
     } = useRequest<{ regions: Region[] }>({
         url: `server://projects/${activeProject}/regions/`,
         method: 'GET',
-        failureHeader: 'Regions List',
         preserveResponse: true,
     });
 
@@ -114,19 +113,23 @@ function GeoAreas(props: Props) {
                 region: data,
                 activeProject,
                 isExpanded,
+                isPublished: data.isPublished,
                 handleExpansion,
                 onActiveAdminLevelChange: isExpanded ? setActiveAdminLevel : undefined,
                 activeAdminLevel: isExpanded ? activeAdminLevel : undefined,
                 tempAdminLevel: isExpanded ? tempAdminLevel : undefined,
                 onTempAdminLevelChange: isExpanded ? setTempAdminLevel : undefined,
                 onAdminLevelUpdate: isExpanded ? updateMapTriggerId : undefined,
+                onRegionPublishSuccess: regionsGetTrigger,
+                onRegionRemoveSuccess: regionsGetTrigger,
+                regions: regionResponse?.regions,
                 navigationDisabled,
             };
         },
         [
             activeProject, activeRegion, activeAdminLevel,
             handleExpansion, tempAdminLevel, navigationDisabled,
-            updateMapTriggerId,
+            updateMapTriggerId, regionsGetTrigger, regionResponse?.regions,
         ],
     );
 
diff --git a/app/views/ProjectEdit/ProjectDetailsForm/RequestPrivateProjectButton/index.tsx b/app/views/ProjectEdit/ProjectDetailsForm/RequestPrivateProjectButton/index.tsx
index 148c66883d..5f083beb61 100644
--- a/app/views/ProjectEdit/ProjectDetailsForm/RequestPrivateProjectButton/index.tsx
+++ b/app/views/ProjectEdit/ProjectDetailsForm/RequestPrivateProjectButton/index.tsx
@@ -80,6 +80,8 @@ function RequestPrivateProjectButton(props: Props) {
                 <Modal
                     className={styles.requestPrivateProjectModal}
                     heading={_ts('requestPrivateProject', 'title')}
+                    size="small"
+                    freeHeight
                     bodyClassName={styles.modalBody}
                     onCloseButtonClick={hideModal}
                     footerActions={(
diff --git a/app/views/ProjectEdit/ProjectDetailsForm/StakeholderList/index.tsx b/app/views/ProjectEdit/ProjectDetailsForm/StakeholderList/index.tsx
index b3a007c9c5..e255a8b943 100644
--- a/app/views/ProjectEdit/ProjectDetailsForm/StakeholderList/index.tsx
+++ b/app/views/ProjectEdit/ProjectDetailsForm/StakeholderList/index.tsx
@@ -56,12 +56,14 @@ const stakeholderDetailsRendererParams = (_: number, d: BasicOrganization) => ({
 interface Props {
     className?: string;
     data?: BasicOrganization[];
+    dataPending: boolean;
     title: string;
 }
 function StakeholderList(props: Props) {
     const {
         data,
         title,
+        dataPending,
         className,
     } = props;
 
@@ -74,12 +76,16 @@ function StakeholderList(props: Props) {
         >
             <ListView
                 className={styles.content}
+                errored={false}
                 data={data}
                 renderer={StakeholderDetail}
                 keySelector={stakeholderDetailsKeySelector}
-                emptyIcon={null}
-                emptyMessage={null}
                 rendererParams={stakeholderDetailsRendererParams}
+                compactAndVerticalEmptyMessage
+                pending={dataPending}
+                filtered={false}
+                emptyMessage="No organizations were added"
+                messageShown
             />
         </ContainerCard>
     );
diff --git a/app/views/ProjectEdit/ProjectDetailsForm/index.tsx b/app/views/ProjectEdit/ProjectDetailsForm/index.tsx
index 4068a1c101..6fc4738485 100644
--- a/app/views/ProjectEdit/ProjectDetailsForm/index.tsx
+++ b/app/views/ProjectEdit/ProjectDetailsForm/index.tsx
@@ -1,7 +1,6 @@
 import React, { useContext, useEffect, useState, useCallback, useMemo } from 'react';
 import {
-    Prompt,
-    useHistory,
+    useNavigate,
     generatePath,
 } from 'react-router-dom';
 import {
@@ -19,6 +18,7 @@ import {
     ListView,
     SegmentInput,
     Modal,
+    useAlert,
 } from '@the-deep/deep-ui';
 import {
     isDefined,
@@ -36,10 +36,12 @@ import {
     getErrorObject,
     createSubmitHandler,
 } from '@togglecorp/toggle-form';
+import { useLazyQuery, gql } from '@apollo/client';
 
 import { SubNavbarActions } from '#components/SubNavbar';
 import NonFieldError from '#components/NonFieldError';
 import UserContext from '#base/context/UserContext';
+import ProjectContext from '#base/context/ProjectContext';
 import AddStakeholderButton from '#components/general/AddStakeholderButton';
 import { BasicProjectOrganization } from '#components/general/AddStakeholderModal';
 import {
@@ -48,6 +50,10 @@ import {
     ProjectDetails,
     OrganizationTypes,
 } from '#types';
+import {
+    UserLastActiveProjectQuery,
+    UserLastActiveProjectQueryVariables,
+} from '#generated/types';
 import routes from '#base/configs/routes';
 import { useModalState } from '#hooks/stateManagement';
 
@@ -178,6 +184,32 @@ const initialValue: FormType = {
     hasAssessments: false,
 };
 
+const LAST_ACTIVE_PROJECT = gql`
+    query UserLastActiveProject {
+        me {
+            id
+            displayName
+            displayPictureUrl
+            accessibleFeatures {
+                key
+            }
+            lastActiveProject {
+                allowedPermissions
+                hasAssessmentTemplate
+                analysisFramework {
+                    id
+                }
+                currentUserRole
+                id
+                isPrivate
+                title
+                isVisualizationEnabled
+                isVisualizationAvailable
+            }
+        }
+    }
+`;
+
 interface Props {
     projectId: string | undefined;
     onCreate: (value: ProjectDetails) => void;
@@ -189,7 +221,7 @@ function ProjectDetailsForm(props: Props) {
         onCreate,
     } = props;
 
-    const history = useHistory();
+    const navigate = useNavigate();
 
     const {
         pristine,
@@ -202,9 +234,12 @@ function ProjectDetailsForm(props: Props) {
         setValue,
     } = useForm(schema, initialValue);
 
+    const alert = useAlert();
+
     const {
         user,
     } = useContext(UserContext);
+    const { setProject } = React.useContext(ProjectContext);
 
     const accessPrivateProject = !!user?.accessibleFeatures?.some((f) => f.key === 'PRIVATE_PROJECT');
 
@@ -247,7 +282,6 @@ function ProjectDetailsForm(props: Props) {
             setStakeholderOptions(options);
             setError({});
         },
-        failureHeader: _ts('projectEdit', 'projectDetailsLabel'),
     });
 
     const {
@@ -268,10 +302,35 @@ function ProjectDetailsForm(props: Props) {
                 const options = getOrganizationOptions(response);
                 setStakeholderOptions(options);
             }
+            alert.show(
+                projectId
+                    ? 'Successfully updated changes.'
+                    : 'Successfully created project.',
+                { variant: 'success' },
+            );
         },
-        failureHeader: _ts('projectEdit', 'projectDetailsLabel'),
+        failureMessage: projectId
+            ? 'Failed to update changes.'
+            : 'Failed to create project.',
     });
 
+    const [
+        getUserLastActiveProject,
+        {
+            loading: userLastActiveProjectPending,
+        },
+    ] = useLazyQuery<UserLastActiveProjectQuery, UserLastActiveProjectQueryVariables>(
+        LAST_ACTIVE_PROJECT,
+        {
+            onCompleted: (response) => {
+                setProject(response.me?.lastActiveProject ?? undefined);
+                const homePath = generatePath(routes.home.path, {});
+                // NOTE: Pristine is set as if the project is deleted, we don't want confirm prompt
+                setPristine(true);
+                navigate(homePath, { replace: true });
+            },
+        },
+    );
     const {
         pending: projectDeletePending,
         trigger: triggerProjectDelete,
@@ -279,12 +338,13 @@ function ProjectDetailsForm(props: Props) {
         url: projectId ? `server://projects/${projectId}/` : undefined,
         method: 'DELETE',
         onSuccess: () => {
-            const homePath = generatePath(routes.home.path, {});
-            // NOTE: Pristine is set as if the project is deleted, we don't want confirm prompt
-            setPristine(true);
-            history.replace(homePath);
+            alert.show(
+                'Successfully deleted project.',
+                { variant: 'success' },
+            );
+            getUserLastActiveProject();
         },
-        failureHeader: _ts('projectEdit', 'deleteProject'),
+        failureMessage: 'Failed to delete project.',
     });
 
     const handleProjectDeleteConfirmCancel = useCallback(() => {
@@ -314,12 +374,13 @@ function ProjectDetailsForm(props: Props) {
                     ?.map((o) => stakeholderOptions.find((option) => option.id === o))
                     .filter(isDefined),
                 title: v.label,
+                dataPending: pendingProjectDetailsGet,
             };
         },
-        [groupedStakeholders, stakeholderOptions],
+        [groupedStakeholders, stakeholderOptions, pendingProjectDetailsGet],
     );
 
-    const pending = pendingProjectDetailsGet || projectPatchPending || projectDeletePending;
+    const pending = pendingProjectDetailsGet || projectPatchPending;
     const disabled = pending;
 
     const handleSubmit = useCallback(
@@ -410,11 +471,14 @@ function ProjectDetailsForm(props: Props) {
                     >
                         <ListView
                             className={styles.organizationsContainer}
+                            errored={false}
                             data={stakeholderTypes}
                             rendererParams={organizationListRendererParams}
                             renderer={StakeholderList}
                             rendererClassName={styles.organizations}
                             keySelector={stakeholderTypeKeySelector}
+                            pending={false}
+                            filtered={false}
                         />
                     </ContainerCard>
                 </div>
@@ -486,7 +550,11 @@ function ProjectDetailsForm(props: Props) {
                     </div>
                     <Button
                         name="deleteProject"
-                        disabled={!projectId || projectDeletePending}
+                        disabled={(
+                            !projectId
+                            || projectDeletePending
+                            || userLastActiveProjectPending
+                        )}
                         onClick={showDeleteProjectConfirmation}
                         icons={(
                             <IoTrashBinOutline />
@@ -498,11 +566,14 @@ function ProjectDetailsForm(props: Props) {
                         <Modal
                             onCloseButtonClick={handleProjectDeleteConfirmCancel}
                             heading={_ts('projectEdit', 'deleteProject')}
+                            size="small"
+                            freeHeight
                             footerActions={(
                                 <>
                                     <Button
                                         name="cancel"
                                         onClick={handleProjectDeleteConfirmCancel}
+                                        disabled={projectDeletePending}
                                         variant="secondary"
                                     >
                                         {_ts('projectEdit', 'cancelButtonLabel')}
@@ -510,13 +581,18 @@ function ProjectDetailsForm(props: Props) {
                                     <Button
                                         name="delete"
                                         onClick={handleProjectDeleteConfirm}
-                                        disabled={projectDetails?.title !== projectTitleToDelete}
+                                        disabled={projectDetails?.title !== projectTitleToDelete
+                                        || projectDeletePending}
                                     >
                                         {_ts('projectEdit', 'deleteProjectButtonLabel')}
                                     </Button>
                                 </>
                             )}
                         >
+                            {
+                                (projectDeletePending || userLastActiveProjectPending)
+                                && <PendingMessage />
+                            }
                             <p>
                                 {_ts(
                                     'projectEdit',
@@ -540,10 +616,6 @@ function ProjectDetailsForm(props: Props) {
                     )}
                 </div>
             </div>
-            <Prompt
-                when={!pristine}
-                message={_ts('common', 'youHaveUnsavedChanges')}
-            />
         </div>
     );
 }
diff --git a/app/views/ProjectEdit/Users/UserGroupList/AddUserGroupModal/index.tsx b/app/views/ProjectEdit/Users/UserGroupList/AddUserGroupModal/index.tsx
index 5da1277d44..4ca0db6902 100644
--- a/app/views/ProjectEdit/Users/UserGroupList/AddUserGroupModal/index.tsx
+++ b/app/views/ProjectEdit/Users/UserGroupList/AddUserGroupModal/index.tsx
@@ -16,6 +16,7 @@ import {
     SelectInput,
     Button,
     PendingMessage,
+    useAlert,
 } from '@the-deep/deep-ui';
 
 import { useRequest, useLazyRequest } from '#base/utils/restRequest';
@@ -94,6 +95,7 @@ function AddUserGroupModal(props: Props) {
     } = props;
 
     const formValue: PartialForm<FormType> = usergroupValue ?? defaultFormValue;
+    const alert = useAlert();
 
     const {
         pristine,
@@ -116,7 +118,6 @@ function AddUserGroupModal(props: Props) {
     } = useRequest<MultiResponse<ProjectRole>>({
         url: 'server://project-roles/',
         method: 'GET',
-        failureHeader: _ts('projectEdit', 'projectRoleFetchFailed'),
     });
 
     const {
@@ -126,7 +127,6 @@ function AddUserGroupModal(props: Props) {
         url: 'server://user-groups/',
         method: 'GET',
         query: queryForUsergroups,
-        failureHeader: _ts('projectEdit', 'usergroupFetchFailed'),
     });
 
     const {
@@ -143,8 +143,16 @@ function AddUserGroupModal(props: Props) {
         onSuccess: () => {
             onTableReload();
             onModalClose();
+            alert.show(
+                isDefined(usergroupValue)
+                    ? 'Successfully updated user group.'
+                    : 'Successfully added user group.',
+                { variant: 'success' },
+            );
         },
-        failureHeader: _ts('projectEdit', 'projectUsergroupPostFailedLabel'),
+        failureMessage: isDefined(usergroupValue)
+            ? 'Failed to update user group.'
+            : 'Failed to create user group.',
     });
 
     const handleSubmit = useCallback(
@@ -183,6 +191,8 @@ function AddUserGroupModal(props: Props) {
     return (
         <Modal
             className={styles.modal}
+            freeHeight
+            size="small"
             heading={
                 isDefined(usergroupValue)
                     ? _ts('projectEdit', 'editUsergroupHeading')
diff --git a/app/views/ProjectEdit/Users/UserGroupList/index.tsx b/app/views/ProjectEdit/Users/UserGroupList/index.tsx
index 406d8a7e68..c3362c7c80 100644
--- a/app/views/ProjectEdit/Users/UserGroupList/index.tsx
+++ b/app/views/ProjectEdit/Users/UserGroupList/index.tsx
@@ -12,13 +12,14 @@ import {
     Container,
     Button,
     Link,
+    Kraken,
     Pager,
     TableView,
     TableColumn,
     TableHeaderCell,
     TableHeaderCellProps,
     createStringColumn,
-    PendingMessage,
+    useAlert,
 } from '@the-deep/deep-ui';
 
 import { createDateColumn } from '#components/tableHelpers';
@@ -52,11 +53,12 @@ function UserGroupList(props: Props) {
         className,
         projectId,
         activeUserRoleLevel,
-        pending,
+        pending = false,
     } = props;
 
     const [activePage, setActivePage] = useState<number>(1);
     const [usergroupIdToEdit, setUsergroupIdToEdit] = useState<number | undefined>(undefined);
+    const alert = useAlert();
 
     const [
         showAddUserGroupModal,
@@ -82,7 +84,7 @@ function UserGroupList(props: Props) {
         url: `server://projects/${projectId}/project-usergroups/`,
         method: 'GET',
         query: queryForRequest,
-        failureHeader: _ts('projectEdit', 'usergroupFetchFailed'),
+        preserveResponse: true,
     });
 
     const {
@@ -92,8 +94,12 @@ function UserGroupList(props: Props) {
         method: 'DELETE',
         onSuccess: () => {
             triggerUsergroupResponse();
+            alert.show(
+                'Successfully deleted user group.',
+                { variant: 'success' },
+            );
         },
-        failureHeader: _ts('projectEdit', 'usergroupDeleteFailed'),
+        failureMessage: 'Failed to delete user group.',
     });
 
     const handleEditUsergroupClick = useCallback((usergroupId) => {
@@ -196,13 +202,22 @@ function UserGroupList(props: Props) {
                 </Button>
             )}
         >
-            {(usergroupPending || pending) && (<PendingMessage />)}
             <TableView
                 data={usergroupResponse?.results}
                 keySelector={usergroupKeySelector}
                 columns={columns}
                 emptyMessage={_ts('projectEdit', 'emptyUsergroupTableMessage')}
                 rowClassName={styles.tableRow}
+                filtered={false}
+                errored={false}
+                pending={usergroupPending || pending}
+                emptyIcon={(
+                    <Kraken
+                        variant="standby"
+                    />
+                )}
+                messageShown
+                messageIconShown
             />
             <Pager
                 activePage={activePage}
diff --git a/app/views/ProjectEdit/Users/UserList/AddUserModal/index.tsx b/app/views/ProjectEdit/Users/UserList/AddUserModal/index.tsx
index 8bbbfd9f1c..f58cb01d7b 100644
--- a/app/views/ProjectEdit/Users/UserList/AddUserModal/index.tsx
+++ b/app/views/ProjectEdit/Users/UserList/AddUserModal/index.tsx
@@ -80,6 +80,7 @@ const USER_BADGE_OPTIONS = gql`
 const PROJECT_MEMBERSHIP_BULK = gql`
     mutation ProjectMembershipBulkUpdate($projectId:ID!, $items: [BulkProjectMembershipInputType!]) {
         project(id: $projectId) {
+            id
             projectUserMembershipBulk(items: $items) {
                 errors
                 result {
@@ -143,7 +144,6 @@ function AddUserModal(props: Props) {
     } = useRequest<MultiResponse<ProjectRole>>({
         url: 'server://project-roles/',
         method: 'GET',
-        failureHeader: _ts('projectEdit', 'projectRoleFetchFailed'),
     });
 
     const {
@@ -175,11 +175,17 @@ function AddUserModal(props: Props) {
                 if (err) {
                     const formError = transformToFormError(removeNull(err) as ObjectError[]);
                     setError(formError);
+                    alert.show(
+                        projectUserToEdit
+                            ? 'Failed to update member.'
+                            : 'Failed to add member.',
+                        { variant: 'error' },
+                    );
                 } else if (user) {
                     alert.show(
                         projectUserToEdit
-                            ? `Successfully updated ${user.member.displayName}`
-                            : `Successfully added ${user.member.displayName}`,
+                            ? `Successfully updated ${user.member.displayName}.`
+                            : `Successfully added ${user.member.displayName}.`,
                         { variant: 'success' },
                     );
                     onProjectUserChange();
@@ -191,7 +197,9 @@ function AddUserModal(props: Props) {
                     [internal]: gqlError.message,
                 });
                 alert.show(
-                    gqlError.message,
+                    projectUserToEdit
+                        ? 'Failed to update member.'
+                        : 'Failed to add member.',
                     { variant: 'error' },
                 );
             },
@@ -239,6 +247,7 @@ function AddUserModal(props: Props) {
                     : _ts('projectEdit', 'addUserHeading')
             }
             onCloseButtonClick={onModalClose}
+            freeHeight
             bodyClassName={styles.modalBody}
             footerActions={(
                 <Button
diff --git a/app/views/ProjectEdit/Users/UserList/index.tsx b/app/views/ProjectEdit/Users/UserList/index.tsx
index 0e5244bb85..f2e56f6e64 100644
--- a/app/views/ProjectEdit/Users/UserList/index.tsx
+++ b/app/views/ProjectEdit/Users/UserList/index.tsx
@@ -5,8 +5,8 @@ import {
     Container,
     Button,
     Pager,
+    Kraken,
     TableView,
-    PendingMessage,
     TableColumn,
     TableHeaderCell,
     TableHeaderCellProps,
@@ -37,6 +37,7 @@ import styles from './styles.css';
 const PROJECT_MEMBERSHIP_BULK_REMOVE = gql`
     mutation ProjectMembershipBulkRemove($projectId:ID!, $deleteIds: [ID!]) {
         project(id: $projectId) {
+            id
             projectUserMembershipBulk(deleteIds: $deleteIds) {
                 errors
                 deletedResult {
@@ -58,6 +59,7 @@ const PROJECT_USERS = gql`
         $pageSize: Int,
     ) {
         project(id: $projectId) {
+            id
             userMembers(page: $page, pageSize: $pageSize) {
                 results {
                     badges
@@ -129,7 +131,7 @@ function UserList(props: Props) {
         className,
         activeUserId,
         activeUserRoleLevel,
-        pending,
+        pending = false,
     } = props;
 
     const [activePage, setActivePage] = useState<number>(1);
@@ -156,7 +158,8 @@ function UserList(props: Props) {
     ), [projectId, activePage]);
 
     const {
-        data: projectUsersResponse,
+        previousData,
+        data: projectUsersResponse = previousData,
         loading: projectUsersPending,
         refetch,
     } = useQuery<ProjectUsersQuery, ProjectUsersQueryVariables>(
@@ -200,9 +203,9 @@ function UserList(props: Props) {
                     refetch();
                 }
             },
-            onError: (gqlError) => {
+            onError: () => {
                 alert.show(
-                    gqlError.message,
+                    'Failed to delete membership(s).',
                     { variant: 'error' },
                 );
             },
@@ -328,13 +331,22 @@ function UserList(props: Props) {
                 </Button>
             )}
         >
-            {(projectUsersPending || pending) && (<PendingMessage />)}
             <TableView
                 data={projectUsersResponse?.project?.userMembers?.results}
                 keySelector={userKeySelector}
                 emptyMessage={_ts('projectEdit', 'emptyUserTableMessage')}
                 rowClassName={styles.tableRow}
                 columns={columns}
+                filtered={false}
+                errored={false}
+                pending={projectUsersPending || pending}
+                emptyIcon={(
+                    <Kraken
+                        variant="standby"
+                    />
+                )}
+                messageShown
+                messageIconShown
             />
             <Pager
                 activePage={activePage}
diff --git a/app/views/ProjectEdit/Users/index.tsx b/app/views/ProjectEdit/Users/index.tsx
index 9a91b5613e..c0afce9a5b 100644
--- a/app/views/ProjectEdit/Users/index.tsx
+++ b/app/views/ProjectEdit/Users/index.tsx
@@ -4,7 +4,6 @@ import { isNotDefined } from '@togglecorp/fujs';
 import { useRequest } from '#base/utils/restRequest';
 import { ProjectMemberships } from '#types/project';
 import { MultiResponse } from '#types';
-import _ts from '#ts';
 
 import UserList from './UserList';
 import UserGroupList from './UserGroupList';
@@ -33,7 +32,6 @@ function Users(props: Props) {
             member: activeUserId,
         },
         method: 'GET',
-        failureHeader: _ts('projectEdit', 'projectMembershipFetchFailed'),
     });
 
     const activeUserMembership = projectMembershipsResponse?.results?.[0];
diff --git a/app/views/ProjectEdit/index.tsx b/app/views/ProjectEdit/index.tsx
index a4b5433308..55aa344cf9 100644
--- a/app/views/ProjectEdit/index.tsx
+++ b/app/views/ProjectEdit/index.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useCallback, useContext, useMemo } from 'react';
 import { isNotDefined } from '@togglecorp/fujs';
 import {
-    useHistory,
+    useNavigate,
     generatePath,
     useParams,
 } from 'react-router-dom';
@@ -13,11 +13,8 @@ import {
 } from '@the-deep/deep-ui';
 
 import SubNavbar, {
-    SubNavbarIcons,
     SubNavbarChildren,
 } from '#components/SubNavbar';
-import Svg from '#components/Svg';
-import deepLogo from '#resources/img/deep-logo-new.svg';
 import SubNavbarContext from '#components/SubNavbar/context';
 import { UserContext } from '#base/context/UserContext';
 import { ProjectContext } from '#base/context/ProjectContext';
@@ -51,7 +48,7 @@ function ProjectEdit() {
         [childrenNode, actionsNode, iconsNode],
     );
 
-    const history = useHistory();
+    const navigate = useNavigate();
 
     const { projectId } = useParams<{ projectId: string | undefined }>();
     const userId = user?.id;
@@ -59,11 +56,14 @@ function ProjectEdit() {
     const handleCreate = useCallback(
         (response: ProjectDetails) => {
             const { id } = response;
-            history.replace(generatePath(routes.projectEdit.path, {
-                projectId: id,
-            }));
+            navigate(generatePath(routes.projectEdit.path), {
+                replace: true,
+                state: {
+                    projectId: id,
+                },
+            });
         },
-        [history],
+        [navigate],
     );
 
     const heading = project && project.id === projectId
@@ -80,6 +80,7 @@ function ProjectEdit() {
                     <SubNavbar
                         className={styles.header}
                         heading={heading}
+                        homeLinkShown
                         defaultActions={(
                             <BackLink
                                 defaultLink="/"
@@ -88,14 +89,6 @@ function ProjectEdit() {
                             </BackLink>
                         )}
                     />
-                    <SubNavbarIcons>
-                        <div className={styles.appBrand}>
-                            <Svg
-                                className={styles.logo}
-                                src={deepLogo}
-                            />
-                        </div>
-                    </SubNavbarIcons>
                     <SubNavbarChildren>
                         <TabList className={styles.tabList}>
                             <Tab
@@ -133,7 +126,7 @@ function ProjectEdit() {
                     </SubNavbarChildren>
                     <div className={styles.tabPanelContainer}>
                         <TabPanel
-                            className={styles.tabPanel}
+                            activeClassName={styles.tabPanel}
                             name="general"
                         >
                             <ProjectDetailsForm
@@ -143,7 +136,7 @@ function ProjectEdit() {
                             />
                         </TabPanel>
                         <TabPanel
-                            className={styles.tabPanel}
+                            activeClassName={styles.tabPanel}
                             name="geo-areas"
                         >
                             {projectId && (
@@ -154,7 +147,7 @@ function ProjectEdit() {
                         </TabPanel>
                         <TabPanel
                             name="users"
-                            className={styles.tabPanel}
+                            activeClassName={styles.tabPanel}
                         >
                             {projectId && (
                                 <Users
@@ -165,7 +158,7 @@ function ProjectEdit() {
                         </TabPanel>
                         <TabPanel
                             name="framework"
-                            className={styles.tabPanel}
+                            activeClassName={styles.tabPanel}
                         >
                             {projectId && (
                                 <Framework
diff --git a/app/views/ProjectEdit/styles.css b/app/views/ProjectEdit/styles.css
index 82de824b4e..5c4b08918b 100644
--- a/app/views/ProjectEdit/styles.css
+++ b/app/views/ProjectEdit/styles.css
@@ -1,12 +1,3 @@
-.app-brand {
-    overflow: auto;
-    color: var(--dui-color-brand);
-
-    .logo {
-        height: var(--dui-font-size-super-large);
-    }
-}
-
 .project-edit {
     display: flex;
     flex-direction: column;
diff --git a/app/views/Register/RegisterForm/index.tsx b/app/views/Register/RegisterForm/index.tsx
index 8b050b578d..a1b807f497 100644
--- a/app/views/Register/RegisterForm/index.tsx
+++ b/app/views/Register/RegisterForm/index.tsx
@@ -1,53 +1,64 @@
 import React, { useState, useRef, useCallback } from 'react';
 import { _cs } from '@togglecorp/fujs';
+import { useMutation, gql } from '@apollo/client';
 import {
     TextInput,
     Link,
     Button,
     PendingMessage,
     Container,
+    Kraken,
 } from '@the-deep/deep-ui';
 import { generatePath } from 'react-router-dom';
 import {
     ObjectSchema,
     useForm,
     emailCondition,
+    removeNull,
     createSubmitHandler,
     requiredStringCondition,
     internal,
     getErrorObject,
 } from '@togglecorp/toggle-form';
 import Captcha from '@hcaptcha/react-hcaptcha';
-import { useLazyRequest } from '#base/utils/restRequest';
+
+import { transformToFormError, ObjectError } from '#base/utils/errorTransform';
 import HCaptcha from '#components/HCaptcha';
 import NonFieldError from '#components/NonFieldError';
 import HCaptchaSiteKey from '#base/configs/hCaptcha';
 import routes from '#base/configs/routes';
-import balloonKraken from '#resources/img/balloon-kraken.png';
 
 import _ts from '#ts';
 
-import styles from './styles.css';
+import {
+    RegisterMutation,
+    RegisterMutationVariables,
+    RegisterInputType,
+} from '#generated/types';
 
-interface RegisterFields {
-    username: string;
-    firstName: string;
-    lastName: string;
-    organization: string;
-    hcaptchaResponse: string;
-}
+import styles from './styles.css';
 
-type FormType = Partial<RegisterFields>;
+const REGISTER = gql`
+    mutation Register($input: RegisterInputType!) {
+        register(data: $input) {
+            captchaRequired
+            errors
+            ok
+        }
+    }
+`;
+
+type FormType = Partial<RegisterInputType>;
 type FormSchema = ObjectSchema<FormType>;
 type FormSchemaFields = ReturnType<FormSchema['fields']>;
 
 const schema: FormSchema = {
     fields: (): FormSchemaFields => ({
-        username: [emailCondition, requiredStringCondition],
+        email: [emailCondition, requiredStringCondition],
         firstName: [requiredStringCondition],
         lastName: [requiredStringCondition],
         organization: [requiredStringCondition],
-        hcaptchaResponse: [requiredStringCondition],
+        captcha: [requiredStringCondition],
     }),
 };
 
@@ -74,40 +85,40 @@ function RegisterModal(props: Props) {
 
     const error = getErrorObject(riskyError);
 
-    const {
-        pending: registerPending,
-        trigger: triggerRegister,
-        context,
-    } = useLazyRequest<unknown, RegisterFields>({
-        url: 'server://users/',
-        method: 'POST',
-        body: (ctx) => ctx,
-        onSuccess: () => {
-            setSuccess(true);
-        },
-        onFailure: ({ errorCode, value: errorValue }) => {
-            const {
-                $internal,
-                ...otherErrors
-            } = errorValue.faramErrors;
-
-            if (errorCode === 4004) {
+    const [
+        triggerRegister,
+        { loading: registerPending },
+    ] = useMutation<RegisterMutation, RegisterMutationVariables>(
+        REGISTER,
+        {
+            onCompleted: (response) => {
+                const { register: registerRes } = response;
+                if (!registerRes) {
+                    return;
+                }
+                const {
+                    errors,
+                    ok,
+                } = registerRes;
+
+                if (errors) {
+                    const formError = transformToFormError(removeNull(errors) as ObjectError[]);
+                    setError(formError);
+                } else if (ok) {
+                    setSuccess(true);
+                }
+            },
+            onError: (errors) => {
                 setError({
-                    ...otherErrors,
-                    [internal]: _ts('explore.register', 'retryRecaptcha'),
+                    [internal]: errors.message,
                 });
-            } else {
-                setError({
-                    ...otherErrors,
-                    [internal]: $internal,
-                });
-            }
+            },
         },
-    });
+    );
 
     const handleSubmit = useCallback((finalValue) => {
         elementRef.current?.resetCaptcha();
-        triggerRegister(finalValue);
+        triggerRegister({ variables: { input: finalValue } });
     }, [triggerRegister]);
 
     return (
@@ -136,7 +147,7 @@ function RegisterModal(props: Props) {
             >
                 {success ? (
                     <div className={styles.registerSuccess}>
-                        {_ts('explore.register', 'checkYourEmailText', { email: context?.username })}
+                        {_ts('explore.register', 'checkYourEmailText', { email: value?.email })}
                     </div>
                 ) : (
                     <>
@@ -166,19 +177,19 @@ function RegisterModal(props: Props) {
                             disabled={registerPending}
                         />
                         <TextInput
-                            name="username"
+                            name="email"
                             onChange={setFieldValue}
-                            value={value?.username}
-                            error={error?.username}
+                            value={value?.email}
+                            error={error?.email}
                             placeholder={_ts('explore.register', 'emailPlaceholder')}
                             disabled={registerPending}
                         />
                         <HCaptcha
-                            name="hcaptchaResponse"
+                            name="captcha"
                             elementRef={elementRef}
                             siteKey={HCaptchaSiteKey}
                             onChange={setFieldValue}
-                            error={error?.hcaptchaResponse}
+                            error={error?.captcha}
                             disabled={registerPending}
                         />
                         <Button
@@ -192,10 +203,10 @@ function RegisterModal(props: Props) {
                     </>
                 )}
             </Container>
-            <img
-                alt=""
+            <Kraken
                 className={styles.kraken}
-                src={balloonKraken}
+                variant="ballon"
+                size="extraLarge"
             />
         </form>
     );
diff --git a/app/views/Register/RegisterForm/styles.css b/app/views/Register/RegisterForm/styles.css
index 11480597ec..f3e1ffc685 100644
--- a/app/views/Register/RegisterForm/styles.css
+++ b/app/views/Register/RegisterForm/styles.css
@@ -31,10 +31,7 @@
     }
 
     .kraken {
+        align-self: flex-end;
         margin: calc(-1 * var(--dui-spacing-extra-large));
-        width: 200px;
-        height: auto;
-        object-fit: contain;
-        object-position: bottom;
     }
 }
diff --git a/app/views/UserGroup/AddUserModal/styles.css b/app/views/UserGroup/AddUserModal/styles.css
deleted file mode 100644
index 92f90cdd48..0000000000
--- a/app/views/UserGroup/AddUserModal/styles.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.modal {
-    display: flex;
-
-    .modal-body {
-        display: flex;
-        align-items: flex-end;
-
-        .input {
-            padding: var(--spacing-medium);
-        }
-    }
-}
diff --git a/app/views/UserGroup/AddUsergroupModal/index.tsx b/app/views/UserGroup/AddUsergroupModal/index.tsx
index 01f44c7254..4552bebbfb 100644
--- a/app/views/UserGroup/AddUsergroupModal/index.tsx
+++ b/app/views/UserGroup/AddUsergroupModal/index.tsx
@@ -5,6 +5,7 @@ import {
     Button,
     PendingMessage,
     TextInput,
+    useAlert,
 } from '@the-deep/deep-ui';
 import {
     ObjectSchema,
@@ -30,17 +31,17 @@ type FormType = {
 };
 
 export interface Membership {
-    id: number;
-    member: number;
+    id: string;
+    member: string;
     memberName: string;
     memberEmail: string;
     role: 'admin' | 'normal';
-    group: number;
+    group: string;
     joinedAt: string;
 }
 
 export interface UserGroup {
-    id: number;
+    id: string;
     title: string;
     description: string;
     role: 'admin' | 'normal';
@@ -64,7 +65,7 @@ const defaultFormValue: PartialForm<FormType> = {};
 
 interface Props {
     onModalClose: () => void;
-    onSuccess: (userGroupId: number) => void;
+    onSuccess: (userGroupId: string) => void;
     value?: UserGroup,
 }
 function AddUserGroupModal(props: Props) {
@@ -74,6 +75,8 @@ function AddUserGroupModal(props: Props) {
         value: initialValue,
     } = props;
 
+    const alert = useAlert();
+
     const [initialFormValue] = useState<PartialForm<FormType>>(
         isDefined(initialValue) ? ({
             title: initialValue.title,
@@ -105,9 +108,33 @@ function AddUserGroupModal(props: Props) {
         onSuccess: (response) => {
             onSuccess(response.id);
             onModalClose();
+            if (isDefined(initialValue?.id)) {
+                alert.show(
+                    'Successfully edited user group.',
+                    { variant: 'success' },
+                );
+            } else {
+                alert.show(
+                    'Successfully created user group.',
+                    { variant: 'success' },
+                );
+            }
+        },
+        onFailure: () => {
+            if (isDefined(initialValue?.id)) {
+                alert.show(
+                    'Failed to edit user group.',
+                    { variant: 'error' },
+                );
+            } else {
+                alert.show(
+                    'Failed to create user group.',
+                    { variant: 'error' },
+                );
+            }
         },
-        failureHeader: _ts('usergroup.editModal', 'addUsergroupFailed'),
     });
+
     const handleSubmit = useCallback(() => {
         const submit = createSubmitHandler(
             validate,
@@ -121,6 +148,8 @@ function AddUserGroupModal(props: Props) {
         <Modal
             heading={_ts('usergroup.editModal', 'addUsergroupHeading')}
             onCloseButtonClick={onModalClose}
+            size="extraSmall"
+            freeHeight
             footerActions={(
                 <Button
                     name="submit"
@@ -142,6 +171,7 @@ function AddUserGroupModal(props: Props) {
                 onChange={setFieldValue}
                 label="Title"
                 placeholder={_ts('usergroup.editModal', 'usergroupTitlePlaceholder')}
+                autoFocus
             />
         </Modal>
     );
diff --git a/app/views/UserGroup/Memberships/index.tsx b/app/views/UserGroup/Memberships/index.tsx
deleted file mode 100644
index 10b9299b06..0000000000
--- a/app/views/UserGroup/Memberships/index.tsx
+++ /dev/null
@@ -1,197 +0,0 @@
-import React, { useMemo, useState, useCallback } from 'react';
-import {
-    Pager,
-    PendingMessage,
-    Container,
-    TableView,
-    TableColumn,
-    TableHeaderCellProps,
-    TableHeaderCell,
-    createStringColumn,
-} from '@the-deep/deep-ui';
-
-import {
-    useLazyRequest,
-    useRequest,
-} from '#base/utils/restRequest';
-import { createDateColumn } from '#components/tableHelpers';
-
-import { useModalState } from '#hooks/stateManagement';
-import { MultiResponse } from '#types';
-import _ts from '#ts';
-
-import AddUserModal from '../AddUserModal';
-import { Membership } from '../AddUsergroupModal';
-import MembershipActionCell, { Props as MembershipActionCellProps } from '../MembershipActionCell';
-
-import styles from './styles.css';
-
-const MAX_ITEMS_PER_PAGE = 20;
-const membershipKeySelector = (d: Membership) => d.id;
-
-interface User {
-    id: number;
-    member: number;
-    role: 'admin' | 'normal';
-}
-
-interface Props {
-    userGroup?: number;
-    canEdit: boolean;
-    activeUserId?: number;
-    onUserDeleteSuccess: () => void;
-}
-
-function Memberships(props: Props) {
-    const {
-        userGroup,
-        canEdit,
-        activeUserId,
-        onUserDeleteSuccess,
-    } = props;
-
-    const [activePage, setActivePage] = useState<number>(1);
-
-    const [userToEdit, setUserToEdit] = useState<User | undefined>();
-    const query = useMemo(() => ({
-        offset: (activePage - 1) * MAX_ITEMS_PER_PAGE,
-        limit: MAX_ITEMS_PER_PAGE,
-    }), [activePage]);
-
-    const {
-        pending: membershipsPending,
-        response: memberships,
-        retrigger: usersGetTrigger,
-    } = useRequest<MultiResponse<Membership>>({
-        url: `server://user-groups/${userGroup}/memberships/`,
-        query,
-        method: 'GET',
-        failureHeader: 'User group memberships',
-    });
-
-    const {
-        trigger: memberDeleteTrigger,
-    } = useLazyRequest<unknown, number>({
-        url: (ctx) => `server://group-memberships/${ctx}/`,
-        method: 'DELETE',
-        onSuccess: () => {
-            usersGetTrigger();
-            onUserDeleteSuccess();
-        },
-        failureHeader: _ts('usergroup', 'memberDeleteFailed'),
-    });
-
-    const [
-        showAddUserModal,
-        setUserModalShow,
-        setUserModalHidden,
-    ] = useModalState(false);
-
-    const handleEditMemberClick = useCallback((
-        value: {
-            id: number;
-            member: number;
-            role: 'admin' | 'normal';
-        },
-    ) => {
-        setUserToEdit(value);
-        setUserModalShow();
-    }, [setUserModalShow]);
-
-    const membersColumns = useMemo(() => {
-        const actionColumn: TableColumn<
-            Membership,
-            number,
-            MembershipActionCellProps,
-            TableHeaderCellProps
-        > = {
-            id: 'action',
-            title: '',
-            headerCellRenderer: TableHeaderCell,
-            headerCellRendererParams: {
-                sortable: false,
-            },
-            cellRenderer: MembershipActionCell,
-            cellRendererParams: (passedUserId, data) => ({
-                member: data.member,
-                memberRole: data.role,
-                groupKey: data.group,
-                itemKey: passedUserId,
-                onEditClick: handleEditMemberClick,
-                onDeleteClick: memberDeleteTrigger,
-                editButtonTitle: _ts('usergroup', 'editMemberLabel'),
-                deleteButtonTitle: _ts('usergroup', 'deleteMemberLabel'),
-                deleteConfirmationMessage: _ts('usergroup', 'deleteMemberConfirmMessage'),
-                disabled: !canEdit || data.member === activeUserId,
-            }),
-            columnWidth: 96,
-        };
-
-        return ([
-            createStringColumn<Membership, number>(
-                'name',
-                _ts('usergroup', 'nameLabel'),
-                (item) => item.memberName,
-            ),
-            createStringColumn<Membership, number>(
-                'email',
-                _ts('usergroup', 'emailLabel'),
-                (item) => item.memberEmail,
-            ),
-            createDateColumn<Membership, number>(
-                'joinedAt',
-                _ts('usergroup', 'addedOnLabel'),
-                (item) => item.joinedAt,
-            ),
-            createStringColumn<Membership, number>(
-                'role',
-                _ts('usergroup', 'roleLabel'),
-                (item) => item.role,
-            ),
-            actionColumn,
-        ]);
-    }, [activeUserId, canEdit, handleEditMemberClick, memberDeleteTrigger]);
-
-    const users = useMemo(() => (
-        memberships?.results.map((d) => ({
-            id: d.member,
-            displayName: d.memberName,
-        }))
-    ), [memberships?.results]);
-
-    return (
-        <Container
-            className={styles.membershipsContainer}
-            footerActions={(
-                <Pager
-                    activePage={activePage}
-                    itemsCount={memberships?.count ?? 0}
-                    onActivePageChange={setActivePage}
-                    maxItemsPerPage={MAX_ITEMS_PER_PAGE}
-                    itemsPerPageControlHidden
-                />
-            )}
-            contentClassName={styles.content}
-        >
-            {membershipsPending && <PendingMessage />}
-            <TableView
-                className={styles.expandedTable}
-                columns={membersColumns}
-                keySelector={membershipKeySelector}
-                headerCellClassName={styles.headerCell}
-                data={memberships?.results}
-            />
-            {showAddUserModal && userGroup && (
-                <AddUserModal
-                    onModalClose={setUserModalHidden}
-                    group={userGroup}
-                    onUserAddSuccess={usersGetTrigger}
-                    userToEdit={userToEdit}
-                    users={users}
-                />
-            )}
-        </Container>
-    );
-}
-
-export default Memberships;
diff --git a/app/views/UserGroup/Memberships/styles.css b/app/views/UserGroup/Memberships/styles.css
deleted file mode 100644
index 939b6c38f5..0000000000
--- a/app/views/UserGroup/Memberships/styles.css
+++ /dev/null
@@ -1,16 +0,0 @@
-.memberships-container {
-    background-color: var(--dui-color-foreground);
-    padding: 0;
-
-    .header-cell {
-        background-color: var(--dui-color-foreground);
-    }
-
-    .content {
-        padding: 0;
-    }
-
-    .expanded-table {
-        width: 100%;
-    }
-}
diff --git a/app/views/UserGroup/AddUserModal/index.tsx b/app/views/UserGroup/UserGroupItem/AddUserModal/index.tsx
similarity index 73%
rename from app/views/UserGroup/AddUserModal/index.tsx
rename to app/views/UserGroup/UserGroupItem/AddUserModal/index.tsx
index 7617c26391..614d64cade 100644
--- a/app/views/UserGroup/AddUserModal/index.tsx
+++ b/app/views/UserGroup/UserGroupItem/AddUserModal/index.tsx
@@ -1,13 +1,11 @@
 import React, { useMemo, useCallback, useState } from 'react';
-
 import { isDefined } from '@togglecorp/fujs';
-
 import {
     Modal,
     Button,
     SelectInput,
+    useAlert,
 } from '@the-deep/deep-ui';
-
 import {
     ObjectSchema,
     PartialForm,
@@ -19,18 +17,15 @@ import {
 
 import _ts from '#ts';
 import { useLazyRequest } from '#base/utils/restRequest';
-import UserSelectInput from '#components/selections/UserSelectInput';
-import {
-    BasicUser,
-} from '#types';
+import NewUserSelectInput, { User } from '#components/selections/NewUserSelectInput';
 
-import { Membership } from '../AddUsergroupModal';
+import { Membership } from '../../AddUsergroupModal';
 import styles from './styles.css';
 
 type FormType = {
-    member: number;
+    member: string;
     role: string;
-    group?: number;
+    group?: string;
 };
 
 type FormSchema = ObjectSchema<PartialForm<FormType>>;
@@ -65,32 +60,33 @@ const labelSelector = (d: Role) => d.title;
 
 interface Props {
     onModalClose: () => void;
-    group: number;
+    userGroupId: string;
     onUserAddSuccess: () => void;
     userToEdit?: {
-        id: number;
-        member: number;
+        id: string;
+        member: string;
         role: 'admin' | 'normal';
     };
-    users?: BasicUser[];
+    users?: User[];
 }
 
 function AddUserModal(props: Props) {
     const {
         onModalClose,
-        group,
+        userGroupId,
         onUserAddSuccess,
         userToEdit,
         users,
     } = props;
 
-    const [userOptions, setUserOptions] = useState<BasicUser[] | null | undefined>(users);
+    const alert = useAlert();
+    const [userOptions, setUserOptions] = useState<User[] | null | undefined>(users);
 
     const formValue: PartialForm<FormType> = useMemo(() => ({
-        group,
+        group: userGroupId,
         member: userToEdit?.member,
         role: userToEdit?.role,
-    }), [userToEdit, group]);
+    }), [userToEdit, userGroupId]);
 
     const {
         pristine,
@@ -117,8 +113,31 @@ function AddUserModal(props: Props) {
         onSuccess: () => {
             onUserAddSuccess();
             onModalClose();
+            if (isDefined(userToEdit?.id)) {
+                alert.show(
+                    'Successfully edited user membership.',
+                    { variant: 'success' },
+                );
+            } else {
+                alert.show(
+                    'Successfully added user to user group.',
+                    { variant: 'success' },
+                );
+            }
+        },
+        onFailure: () => {
+            if (isDefined(userToEdit?.id)) {
+                alert.show(
+                    'Failed to change user membership.',
+                    { variant: 'error' },
+                );
+            } else {
+                alert.show(
+                    'Failed to add user to user group.',
+                    { variant: 'error' },
+                );
+            }
         },
-        failureHeader: _ts('usergroup.memberEditModal', 'memberAddFailed'),
     });
 
     const handleSubmit = useCallback(() => {
@@ -138,6 +157,8 @@ function AddUserModal(props: Props) {
             )}
             onCloseButtonClick={onModalClose}
             className={styles.modal}
+            size="small"
+            freeHeight
             bodyClassName={styles.modalBody}
             footerActions={(
                 <Button
@@ -151,8 +172,7 @@ function AddUserModal(props: Props) {
                 </Button>
             )}
         >
-            <UserSelectInput
-                className={styles.input}
+            <NewUserSelectInput
                 name="member"
                 value={value.member}
                 onChange={setFieldValue}
@@ -162,13 +182,14 @@ function AddUserModal(props: Props) {
                 disabled={pendingAddMember || isDefined(userToEdit)}
                 label={_ts('usergroup.memberEditModal', 'addMemberLabel')}
                 placeholder={_ts('usergroup.memberEditModal', 'addMemberPlaceholderLabel')}
+                membersExcludeUsergroup={userGroupId}
             />
             <SelectInput
                 name="role"
-                className={styles.input}
                 labelSelector={labelSelector}
                 keySelector={keySelector}
                 options={roles}
+                label={_ts('usergroup.memberEditModal', 'roleLabel')}
                 placeholder={_ts('usergroup.memberEditModal', 'roleLabel')}
                 onChange={setFieldValue}
                 value={value.role}
diff --git a/app/views/UserGroup/UserGroupItem/AddUserModal/styles.css b/app/views/UserGroup/UserGroupItem/AddUserModal/styles.css
new file mode 100644
index 0000000000..0ba21ed54f
--- /dev/null
+++ b/app/views/UserGroup/UserGroupItem/AddUserModal/styles.css
@@ -0,0 +1,10 @@
+.modal {
+    display: flex;
+
+    .modal-body {
+        display: flex;
+        align-items: flex-start;
+        flex-grow: 1;
+        gap: var(--dui-spacing-large);
+    }
+}
diff --git a/app/views/UserGroup/MembershipActionCell/index.tsx b/app/views/UserGroup/UserGroupItem/MembershipActionCell/index.tsx
similarity index 70%
rename from app/views/UserGroup/MembershipActionCell/index.tsx
rename to app/views/UserGroup/UserGroupItem/MembershipActionCell/index.tsx
index fc41a735c6..0598c315a1 100644
--- a/app/views/UserGroup/MembershipActionCell/index.tsx
+++ b/app/views/UserGroup/UserGroupItem/MembershipActionCell/index.tsx
@@ -11,48 +11,42 @@ import styles from './styles.css';
 
 export interface Props {
     className?: string;
-    itemKey: number;
-    groupKey: number;
-    member: number;
+    membershipId: string;
+    groupKey: string;
+    member: string;
     memberRole: 'admin' | 'normal';
     onAddClick?: (key: number) => void;
     onEditClick: (
-        user: { id: number; member: number; role: 'admin' | 'normal' },
-        group: number,
+        user: { id: string; member: string; role: 'admin' | 'normal' },
+        group: string,
     ) => void;
-    onDeleteClick: (key: number) => void;
+    onDeleteClick: (key: string) => void;
     disabled?: boolean;
-    editButtonTitle?: string;
-    deleteButtonTitle?: string;
-    deleteConfirmationMessage?: string;
 }
 
 function ActionCell(props: Props) {
     const {
         className,
-        itemKey,
+        membershipId,
         groupKey,
         member,
         onEditClick,
         onDeleteClick,
         disabled,
-        editButtonTitle,
-        deleteButtonTitle,
-        deleteConfirmationMessage,
         memberRole,
     } = props;
 
     const handleEditButtonClick = useCallback(() => {
         onEditClick({
-            id: itemKey,
+            id: membershipId,
             member,
             role: memberRole,
         }, groupKey);
-    }, [itemKey, onEditClick, groupKey, member, memberRole]);
+    }, [membershipId, onEditClick, groupKey, member, memberRole]);
 
     const handleDeleteUserGroupClick = useCallback(() => {
-        onDeleteClick(itemKey);
-    }, [itemKey, onDeleteClick]);
+        onDeleteClick(membershipId);
+    }, [membershipId, onDeleteClick]);
 
     return (
         <div className={_cs(styles.actionCell, className)}>
@@ -61,16 +55,16 @@ function ActionCell(props: Props) {
                 name="editButton"
                 onClick={handleEditButtonClick}
                 disabled={disabled}
-                title={editButtonTitle}
+                title="Edit user"
             >
                 <FiEdit2 />
             </QuickActionButton>
             <QuickActionConfirmButton
                 className={styles.button}
                 name="deleteButton"
-                title={deleteButtonTitle}
+                title="Remove user"
                 onConfirm={handleDeleteUserGroupClick}
-                message={deleteConfirmationMessage}
+                message="Are you sure you want to remove this member from this user group?"
                 showConfirmationInitially={false}
                 disabled={disabled}
             >
diff --git a/app/views/UserGroup/MembershipActionCell/styles.css b/app/views/UserGroup/UserGroupItem/MembershipActionCell/styles.css
similarity index 100%
rename from app/views/UserGroup/MembershipActionCell/styles.css
rename to app/views/UserGroup/UserGroupItem/MembershipActionCell/styles.css
diff --git a/app/views/UserGroup/UserGroupActionCell/index.tsx b/app/views/UserGroup/UserGroupItem/UserGroupActionCell/index.tsx
similarity index 80%
rename from app/views/UserGroup/UserGroupActionCell/index.tsx
rename to app/views/UserGroup/UserGroupItem/UserGroupActionCell/index.tsx
index 3e8903210f..950991d6f4 100644
--- a/app/views/UserGroup/UserGroupActionCell/index.tsx
+++ b/app/views/UserGroup/UserGroupItem/UserGroupActionCell/index.tsx
@@ -11,11 +11,11 @@ import styles from './styles.css';
 
 export interface Props {
     className?: string;
-    itemKey: number;
-    member?: number;
-    onAddClick?: (key: number) => void;
-    onEditClick: (group: number) => void;
-    onDeleteClick: (key: number) => void;
+    itemKey: string;
+    member?: string;
+    onAddClick?: () => void;
+    onEditClick: (group: string) => void;
+    onDeleteClick: (key: string) => void;
     disabled?: boolean;
     addButtonTitle?: string;
     editButtonTitle?: string;
@@ -31,17 +31,13 @@ function UserGroupActionCell(props: Props) {
         onEditClick,
         onDeleteClick,
         disabled,
-        addButtonTitle,
-        editButtonTitle,
-        deleteButtonTitle,
-        deleteConfirmationMessage,
     } = props;
 
     const handleAddButtonClick = useCallback(() => {
         if (onAddClick) {
-            onAddClick(itemKey);
+            onAddClick();
         }
-    }, [itemKey, onAddClick]);
+    }, [onAddClick]);
 
     const handleEditButtonClick = useCallback(() => {
         onEditClick(itemKey);
@@ -59,7 +55,7 @@ function UserGroupActionCell(props: Props) {
                     name="addButton"
                     onClick={handleAddButtonClick}
                     disabled={disabled}
-                    title={addButtonTitle}
+                    title="Add user group member"
                 >
                     <IoAdd />
                 </QuickActionButton>
@@ -69,16 +65,16 @@ function UserGroupActionCell(props: Props) {
                 name="editButton"
                 onClick={handleEditButtonClick}
                 disabled={disabled}
-                title={editButtonTitle}
+                title="Edit user group"
             >
                 <FiEdit2 />
             </QuickActionButton>
             <QuickActionConfirmButton
                 className={styles.button}
                 name="deleteButton"
-                title={deleteButtonTitle}
+                title="Delete user group"
                 onConfirm={handleDeleteUserGroupClick}
-                message={deleteConfirmationMessage}
+                message="Are you sure you want to delete this user group?"
                 showConfirmationInitially={false}
                 disabled={disabled}
             >
diff --git a/app/views/UserGroup/UserGroupActionCell/styles.css b/app/views/UserGroup/UserGroupItem/UserGroupActionCell/styles.css
similarity index 100%
rename from app/views/UserGroup/UserGroupActionCell/styles.css
rename to app/views/UserGroup/UserGroupItem/UserGroupActionCell/styles.css
diff --git a/app/views/UserGroup/UserGroupItem/index.tsx b/app/views/UserGroup/UserGroupItem/index.tsx
new file mode 100644
index 0000000000..1813f8a359
--- /dev/null
+++ b/app/views/UserGroup/UserGroupItem/index.tsx
@@ -0,0 +1,305 @@
+import React, { useMemo, useState, useCallback } from 'react';
+import { _cs } from '@togglecorp/fujs';
+import {
+    Pager,
+    Container,
+    TableView,
+    TextOutput,
+    NumberOutput,
+    DateOutput,
+    ControlledExpandableContainer,
+    TableColumn,
+    TableHeaderCellProps,
+    TableHeaderCell,
+    TableCell,
+    TableCellProps,
+    createStringColumn,
+    useAlert,
+} from '@the-deep/deep-ui';
+import _ts from '#ts';
+import {
+    useLazyRequest,
+    useRequest,
+} from '#base/utils/restRequest';
+import { createDateColumn } from '#components/tableHelpers';
+import { useModalState } from '#hooks/stateManagement';
+import { MultiResponse } from '#types';
+
+import { UserGroup as UserGroupType, Membership } from '../AddUsergroupModal';
+import AddUserModal from './AddUserModal';
+import MembershipActionCell, { Props as MembershipActionCellProps } from './MembershipActionCell';
+import UserGroupActionCell from './UserGroupActionCell';
+import styles from './styles.css';
+
+const MAX_ITEMS_PER_PAGE = 20;
+const membershipKeySelector = (d: Membership) => d.id;
+
+interface User {
+    id: string;
+    member: string;
+    role: 'admin' | 'normal';
+}
+
+interface Props {
+    className?: string;
+    activeUserGroupId?: string;
+    userGroupId: string;
+    activeUserId?: string;
+    onUserDeleteSuccess: () => void;
+    onEditClick: (id: string) => void;
+    onDeleteClick: (id: string) => void;
+    userGroup: UserGroupType;
+    onExpansionChange: (usergroupExpanded: boolean, usergroupId: string) => void;
+    expanded?: boolean;
+    autoFocus?: boolean;
+}
+
+function UserGroupItem(props: Props) {
+    const {
+        className,
+        activeUserGroupId,
+        userGroupId,
+        onEditClick,
+        onDeleteClick,
+        userGroup,
+        activeUserId,
+        onUserDeleteSuccess,
+        onExpansionChange,
+        expanded,
+        autoFocus,
+    } = props;
+
+    const [activePage, setActivePage] = useState<number>(1);
+    const alert = useAlert();
+
+    const [userToEdit, setUserToEdit] = useState<User | undefined>();
+    const query = useMemo(() => ({
+        offset: (activePage - 1) * MAX_ITEMS_PER_PAGE,
+        limit: MAX_ITEMS_PER_PAGE,
+    }), [activePage]);
+
+    const {
+        pending: membershipsPending,
+        response: memberships,
+        retrigger: usersGetTrigger,
+    } = useRequest<MultiResponse<Membership>>({
+        url: `server://user-groups/${userGroupId}/memberships/`,
+        skip: activeUserGroupId !== userGroupId,
+        query,
+        method: 'GET',
+        preserveResponse: true,
+    });
+
+    const {
+        trigger: memberDeleteTrigger,
+    } = useLazyRequest<unknown, string>({
+        url: (ctx) => `server://group-memberships/${ctx}/`,
+        method: 'DELETE',
+        onSuccess: () => {
+            usersGetTrigger();
+            onUserDeleteSuccess();
+            alert.show(
+                'Successfully removed user from user group.',
+                { variant: 'success' },
+            );
+        },
+        onFailure: () => {
+            alert.show(
+                'Failed to  remove user from user group.',
+                { variant: 'error' },
+            );
+        },
+    });
+
+    const [
+        showAddUserModal,
+        setUserModalShow,
+        setUserModalHidden,
+    ] = useModalState(false);
+
+    const handleAddMemberClick = useCallback(() => {
+        onExpansionChange(true, userGroupId);
+        setUserToEdit(undefined);
+        setUserModalShow();
+    }, [setUserModalShow, onExpansionChange, userGroupId]);
+
+    const handleEditMemberClick = useCallback((
+        value: {
+            id: string;
+            member: string;
+            role: 'admin' | 'normal';
+        },
+    ) => {
+        setUserToEdit(value);
+        setUserModalShow();
+    }, [setUserModalShow]);
+
+    const membersColumns = useMemo(() => {
+        const actionColumn: TableColumn<
+            Membership,
+            string,
+            MembershipActionCellProps,
+            TableHeaderCellProps
+        > = {
+            id: 'action',
+            title: '',
+            headerCellRenderer: TableHeaderCell,
+            headerCellRendererParams: {
+                sortable: false,
+            },
+            cellRenderer: MembershipActionCell,
+            cellRendererParams: (membershipId, data) => ({
+                member: data.member,
+                memberRole: data.role,
+                groupKey: data.group,
+                membershipId,
+                onEditClick: handleEditMemberClick,
+                onDeleteClick: memberDeleteTrigger,
+                disabled: (userGroup.role !== 'admin') || String(data.member) === activeUserId,
+            }),
+            columnWidth: 96,
+        };
+        const roleColumn: TableColumn<
+            Membership,
+            string,
+            TableCellProps<string>,
+            TableHeaderCellProps
+        > = {
+            id: 'role',
+            title: 'Role',
+            headerCellRenderer: TableHeaderCell,
+            headerCellRendererParams: {
+                sortable: false,
+            },
+            cellRenderer: TableCell,
+            cellRendererClassName: styles.role,
+            cellRendererParams: (_, data) => ({
+                value: data.role,
+            }),
+        };
+        return ([
+            createStringColumn<Membership, string>(
+                'name',
+                _ts('usergroup', 'nameLabel'),
+                (item) => item.memberName,
+            ),
+            createStringColumn<Membership, string>(
+                'email',
+                _ts('usergroup', 'emailLabel'),
+                (item) => item.memberEmail,
+            ),
+            createDateColumn<Membership, string>(
+                'joinedAt',
+                _ts('usergroup', 'addedOnLabel'),
+                (item) => item.joinedAt,
+            ),
+            roleColumn,
+            actionColumn,
+        ]);
+    }, [activeUserId, handleEditMemberClick, memberDeleteTrigger, userGroup]);
+
+    const users = useMemo(() => (
+        (memberships?.results ?? []).map((d) => ({
+            id: d.member,
+            displayName: d.memberName,
+            firstName: d.memberName,
+            lastName: '',
+        }))
+    ), [memberships?.results]);
+
+    return (
+        <ControlledExpandableContainer
+            name={userGroupId}
+            className={_cs(styles.userGroupItem, className)}
+            heading={userGroup.title}
+            autoFocus={autoFocus}
+            withoutBorder
+            spacing="comfortable"
+            expansionTriggerArea="arrow"
+            onExpansionChange={onExpansionChange}
+            expanded={expanded}
+            inlineHeadingDescription
+            headerClassName={styles.userGroupHeader}
+            headingContainerClassName={styles.headingContainer}
+            headingClassName={styles.heading}
+            headerDescriptionClassName={styles.headingDescriptionContainer}
+            contentClassName={styles.userGroupContent}
+            headingDescription={(
+                <>
+                    <TextOutput
+                        label="Created On"
+                        value={(
+                            <DateOutput
+                                value={userGroup.createdAt}
+                                format="hh:mm aaa, MMM dd, yyyy"
+                            />
+                        )}
+                        hideLabelColon
+                    />
+                    <TextOutput
+                        label="Members"
+                        labelContainerClassName={styles.membersLabel}
+                        valueContainerClassName={styles.membersValue}
+                        value={(
+                            <NumberOutput
+                                value={userGroup.membersCount ?? 0}
+                            />
+                        )}
+                        hideLabelColon
+                    />
+                </>
+            )}
+            headerActions={(
+                <UserGroupActionCell
+                    itemKey={userGroupId}
+                    onEditClick={onEditClick}
+                    onDeleteClick={onDeleteClick}
+                    onAddClick={handleAddMemberClick}
+                    addButtonTitle={_ts('usergroup', 'addMemberLabel')}
+                    editButtonTitle={_ts('usergroup', 'editUserGroupLabel')}
+                    deleteButtonTitle={_ts('usergroup', 'deleteUserGroupLabel')}
+                    deleteConfirmationMessage={_ts('usergroup', 'deleteUsergroupConfirmMessage')}
+                    disabled={userGroup.role === 'normal'}
+                />
+            )}
+        >
+            <Container
+                className={styles.membershipsContainer}
+                footerActions={(
+                    <Pager
+                        activePage={activePage}
+                        itemsCount={memberships?.count ?? 0}
+                        onActivePageChange={setActivePage}
+                        maxItemsPerPage={MAX_ITEMS_PER_PAGE}
+                        itemsPerPageControlHidden
+                    />
+                )}
+                contentClassName={styles.content}
+            >
+                <TableView
+                    className={styles.expandedTable}
+                    columns={membersColumns}
+                    keySelector={membershipKeySelector}
+                    headerCellClassName={styles.headerCell}
+                    data={memberships?.results}
+                    errored={false}
+                    filtered={false}
+                    pending={membershipsPending}
+                    messageShown
+                    messageIconShown
+                />
+                {showAddUserModal && (
+                    <AddUserModal
+                        onModalClose={setUserModalHidden}
+                        userGroupId={userGroupId}
+                        onUserAddSuccess={usersGetTrigger}
+                        userToEdit={userToEdit}
+                        users={users}
+                    />
+                )}
+            </Container>
+        </ControlledExpandableContainer>
+    );
+}
+
+export default UserGroupItem;
diff --git a/app/views/UserGroup/UserGroupItem/styles.css b/app/views/UserGroup/UserGroupItem/styles.css
new file mode 100644
index 0000000000..a3a7622f57
--- /dev/null
+++ b/app/views/UserGroup/UserGroupItem/styles.css
@@ -0,0 +1,55 @@
+.user-group-item {
+    gap: 0;
+
+    .user-group-header {
+        border: none;
+        background-color: var(--dui-color-background);
+
+        .heading-container {
+            .heading {
+                width: auto;
+                color: var(--dui-color-text);
+            }
+        }
+    }
+
+    .heading-description-container {
+        display: flex;
+        align-items: center;
+        gap: var(--dui-spacing-large);
+
+        .members-value {
+            order: 1;
+        }
+        .members-label {
+            order: 2;
+        }
+    }
+
+    .user-group-content {
+        border: none;
+        padding: 0;
+
+        .memberships-container {
+            background-color: var(--dui-color-foreground);
+            padding: 0;
+
+            .header-cell {
+                background-color: var(--dui-color-foreground);
+            }
+
+            .content {
+                padding: 0;
+            }
+
+            .expanded-table {
+                width: 100%;
+                min-height: 30vh;
+
+                .role {
+                    text-transform: capitalize;
+                }
+            }
+        }
+    }
+}
diff --git a/app/views/UserGroup/index.tsx b/app/views/UserGroup/index.tsx
index c8177f0f91..15da5de7a8 100644
--- a/app/views/UserGroup/index.tsx
+++ b/app/views/UserGroup/index.tsx
@@ -4,12 +4,9 @@ import {
     Button,
     Container,
     Pager,
-    PendingMessage,
     ListView,
-    TextOutput,
-    NumberOutput,
-    DateOutput,
-    ControlledExpandableContainer,
+    Kraken,
+    useAlert,
 } from '@the-deep/deep-ui';
 import {
     IoAdd,
@@ -25,108 +22,13 @@ import UserContext from '#base/context/UserContext';
 import _ts from '#ts';
 
 import AddUserGroupModal, { UserGroup as UserGroupType } from './AddUsergroupModal';
-import AddUserModal from './AddUserModal';
-import Memberships from './Memberships';
-import UserGroupActionCell from './UserGroupActionCell';
+import UserGroupItem from './UserGroupItem';
 
 import styles from './styles.css';
 
 const MAX_ITEMS_PER_PAGE = 10;
 const usergroupKeySelector = (d: UserGroupType) => d.id;
 
-interface UserGroupItemProps {
-    userGroupId: number;
-    activeUserId?: number;
-    onUserDeleteSuccess: () => void;
-    onEditClick: (id: number) => void;
-    onDeleteClick: (id: number) => void;
-    onAddClick: (id: number) => void;
-    data: UserGroupType;
-    onExpansionChange: (usergroupExpanded: boolean, usergroupId: number) => void;
-    expanded?: boolean;
-    autoFocus?: boolean;
-}
-
-function UserGroupItem(props: UserGroupItemProps) {
-    const {
-        userGroupId,
-        onEditClick,
-        onDeleteClick,
-        onAddClick,
-        data,
-        activeUserId,
-        onUserDeleteSuccess,
-        onExpansionChange,
-        expanded,
-        autoFocus,
-    } = props;
-
-    return (
-        <ControlledExpandableContainer
-            name={userGroupId}
-            className={styles.userGroupItem}
-            heading={data.title}
-            autoFocus={autoFocus}
-            withoutBorder
-            spacing="comfortable"
-            expansionTriggerArea="arrow"
-            onExpansionChange={onExpansionChange}
-            expanded={expanded}
-            inlineHeadingDescription
-            headerClassName={styles.userGroupHeader}
-            headingContainerClassName={styles.headingContainer}
-            headingClassName={styles.heading}
-            headerDescriptionClassName={styles.headingDescriptionContainer}
-            contentClassName={styles.userGroupContent}
-            headingDescription={(
-                <>
-                    <TextOutput
-                        label="Created On"
-                        value={(
-                            <DateOutput
-                                value={data.createdAt}
-                                format="hh:mm aaa, MMM dd, yyyy"
-                            />
-                        )}
-                        hideLabelColon
-                    />
-                    <TextOutput
-                        label="Members"
-                        labelContainerClassName={styles.membersLabel}
-                        valueContainerClassName={styles.membersValue}
-                        value={(
-                            <NumberOutput
-                                value={data.membersCount ?? 0}
-                            />
-                        )}
-                        hideLabelColon
-                    />
-                </>
-            )}
-            headerActions={(
-                <UserGroupActionCell
-                    itemKey={userGroupId}
-                    onEditClick={onEditClick}
-                    onDeleteClick={onDeleteClick}
-                    onAddClick={onAddClick}
-                    addButtonTitle={_ts('usergroup', 'addMemberLabel')}
-                    editButtonTitle={_ts('usergroup', 'editUserGroupLabel')}
-                    deleteButtonTitle={_ts('usergroup', 'deleteUserGroupLabel')}
-                    deleteConfirmationMessage={_ts('usergroup', 'deleteUserGroupConfirmMessage')}
-                    disabled={data.role === 'normal'}
-                />
-            )}
-        >
-            <Memberships
-                userGroup={userGroupId}
-                canEdit={data.role === 'admin'}
-                activeUserId={activeUserId}
-                onUserDeleteSuccess={onUserDeleteSuccess}
-            />
-        </ControlledExpandableContainer>
-    );
-}
-
 interface Props {
     className?: string;
 }
@@ -139,14 +41,14 @@ function UserGroup(props: Props) {
     const {
         user,
     } = useContext(UserContext);
+    const alert = useAlert();
 
-    const userId = user ? +user?.id : undefined;
+    const userId = user ? user?.id : undefined;
 
     const [activePage, setActivePage] = useState<number>(1);
-    const [expandedUserGroupId, setExpandedUserGroupId] = useState<number | undefined>();
+    const [expandedUserGroupId, setExpandedUserGroupId] = useState<string>();
 
-    const [activeUserGroupId, setActiveUserGroupId] = useState<number | undefined>();
-    const [usergroupToEdit, setUserGroupToEdit] = useState<number | undefined>();
+    const [userGroupToEdit, setUserGroupToEdit] = useState<string>();
 
     const [
         showAddUserGroupModal,
@@ -154,12 +56,6 @@ function UserGroup(props: Props) {
         setUserGroupModalHidden,
     ] = useModalState(false);
 
-    const [
-        showAddUserModal,
-        setUserModalShow,
-        setUserModalHidden,
-    ] = useModalState(false);
-
     const usergroupQuery = useMemo(() => ({
         user: user?.id,
         offset: (activePage - 1) * MAX_ITEMS_PER_PAGE,
@@ -176,28 +72,37 @@ function UserGroup(props: Props) {
     const {
         pending: usergroupGetPending,
         response: usergroupResponse,
-        retrigger: usergroupResponseTrigger,
+        retrigger: usergroupGetRetrigger,
     } = useRequest<MultiResponse<UserGroupType>>({
         url: 'server://user-groups/member-of/',
         method: 'GET',
         query: usergroupQuery,
-        failureHeader: _ts('usergroup', 'fetchUserGroupFailed'),
+        preserveResponse: true,
     });
 
     const {
         trigger: usergroupDeleteTrigger,
-    } = useLazyRequest<unknown, number>({
+    } = useLazyRequest<unknown, string>({
         url: (ctx) => `server://user-groups/${ctx}/`,
         method: 'DELETE',
         onSuccess: () => {
-            usergroupResponseTrigger();
+            usergroupGetRetrigger();
+            alert.show(
+                'Successfully deleted user group.',
+                { variant: 'success' },
+            );
+        },
+        onFailure: () => {
+            alert.show(
+                'Failed to delete user group.',
+                { variant: 'error' },
+            );
         },
-        failureHeader: _ts('usergroup', 'usergroupDeleteFailed'),
     });
 
     const usergroupObjectToEdit = useMemo(() => (
-        usergroupResponse?.results?.find((a) => a.id === usergroupToEdit)
-    ), [usergroupResponse?.results, usergroupToEdit]);
+        usergroupResponse?.results?.find((a) => a.id === userGroupToEdit)
+    ), [usergroupResponse?.results, userGroupToEdit]);
 
     const handleAddUserGroupClick = useCallback(() => {
         setUserGroupToEdit(undefined);
@@ -209,41 +114,35 @@ function UserGroup(props: Props) {
         setUserGroupModalShow();
     }, [setUserGroupModalShow]);
 
-    const [autoFocusUserGroup, setAutoFocusUserGroup] = useState<number>();
+    const [autoFocusUserGroup, setAutoFocusUserGroup] = useState<string>();
 
-    const handleEditUserGroupSuccess = useCallback((newItemId: number) => {
+    const handleEditUserGroupSuccess = useCallback((newItemId: string) => {
         setAutoFocusUserGroup(newItemId);
-        usergroupResponseTrigger();
+        usergroupGetRetrigger();
         setUserGroupModalHidden();
-    }, [setUserGroupModalHidden, usergroupResponseTrigger]);
-
-    const handleMemberAddClick = useCallback((value) => {
-        setActiveUserGroupId(value);
-        setUserModalShow();
-    }, [setUserModalShow]);
+    }, [setUserGroupModalHidden, usergroupGetRetrigger]);
 
-    const handleExpansionChange = useCallback((usergroupExpanded: boolean, usergroupId: number) => {
+    const handleExpansionChange = useCallback((usergroupExpanded: boolean, usergroupId: string) => {
         setExpandedUserGroupId(usergroupExpanded ? usergroupId : undefined);
     }, []);
 
-    const userGroupRendererParams = useCallback((key: number, datum: UserGroupType) => ({
+    const userGroupRendererParams = useCallback((key: string, datum: UserGroupType) => ({
+        activeUserGroupId: expandedUserGroupId,
         userGroupId: key,
         activeUserId: userId,
-        onUserDeleteSuccess: usergroupResponseTrigger,
+        onUserDeleteSuccess: usergroupGetRetrigger,
         onDeleteClick: usergroupDeleteTrigger,
         onEditClick: handleEditUserGroupClick,
-        onAddClick: handleMemberAddClick,
-        data: datum,
+        userGroup: datum,
         onExpansionChange: handleExpansionChange,
         autoFocus: autoFocusUserGroup === datum.id,
         expanded: expandedUserGroupId === datum.id,
     }), [
         autoFocusUserGroup,
         userId,
-        usergroupResponseTrigger,
+        usergroupGetRetrigger,
         usergroupDeleteTrigger,
         handleEditUserGroupClick,
-        handleMemberAddClick,
         handleExpansionChange,
         expandedUserGroupId,
     ]);
@@ -272,13 +171,25 @@ function UserGroup(props: Props) {
             )}
             contentClassName={styles.content}
         >
-            {usergroupGetPending && <PendingMessage />}
             <ListView
                 className={styles.userGroupList}
                 keySelector={usergroupKeySelector}
                 data={usergroupResponse?.results}
                 renderer={UserGroupItem}
                 rendererParams={userGroupRendererParams}
+                rendererClassName={styles.userGroupItem}
+                filtered={false}
+                pending={usergroupGetPending}
+                errored={false}
+                emptyIcon={(
+                    <Kraken
+                        size="large"
+                        variant="experiment"
+                    />
+                )}
+                emptyMessage="No user groups found."
+                messageIconShown
+                messageShown
             />
             {showAddUserGroupModal && (
                 <AddUserGroupModal
@@ -287,13 +198,6 @@ function UserGroup(props: Props) {
                     value={usergroupObjectToEdit}
                 />
             )}
-            {showAddUserModal && activeUserGroupId && (
-                <AddUserModal
-                    onModalClose={setUserModalHidden}
-                    group={activeUserGroupId}
-                    onUserAddSuccess={usergroupResponseTrigger}
-                />
-            )}
         </Container>
     );
 }
diff --git a/app/views/UserGroup/styles.css b/app/views/UserGroup/styles.css
index 69b60aec4a..5bef0e6387 100644
--- a/app/views/UserGroup/styles.css
+++ b/app/views/UserGroup/styles.css
@@ -7,42 +7,22 @@
     overflow-y: auto;
 
     .content {
+        display: flex;
+        flex-direction: column;
+        flex-grow: 1;
         background-color: var(--dui-color-foreground);
         padding: var(--dui-spacing-large);
+        overflow-y: auto;
 
         .user-group-list {
-            .user-group-item {
-                gap: 0;
-
-                .user-group-header {
-                    border: none;
-                    background-color: var(--dui-color-background);
-
-                    .heading-container {
-                        .heading {
-                            width: auto;
-                            color: var(--dui-color-text);
-                        }
-                    }
-                }
+            display: flex;
+            flex-direction: column;
+            flex-grow: 1;
+            gap: var(--dui-spacing-small);
+            overflow-y: auto;
 
-                .heading-description-container {
-                    display: flex;
-                    align-items: center;
-                    gap: var(--dui-spacing-large);
-
-                    .members-value {
-                        order: 1;
-                    }
-                    .members-label {
-                        order: 2;
-                    }
-                }
-
-                .user-group-content {
-                    border: none;
-                    padding: 0;
-                }
+            .user-group-item {
+                flex-shrink: 0;
             }
         }
     }
diff --git a/package.json b/package.json
index 92f10610b5..37a72a5660 100644
--- a/package.json
+++ b/package.json
@@ -34,41 +34,34 @@
     },
     "homepage": "https://github.com/the-deep/client#readme",
     "dependencies": {
-        "@apollo/client": "^3.3.21",
-        "@dnd-kit/core": "^3.1.1",
-        "@dnd-kit/modifiers": "^3.0.0",
-        "@dnd-kit/sortable": "^4.0.0",
-        "@dnd-kit/utilities": "^2.0.0",
+        "@apollo/client": "^3.5.6",
+        "@babel/runtime": "^7.11.2",
+        "@dnd-kit/core": "^4.0.3",
+        "@dnd-kit/modifiers": "^4.0.0",
+        "@dnd-kit/sortable": "^5.1.0",
+        "@dnd-kit/utilities": "^3.0.2",
         "@hcaptcha/react-hcaptcha": "^0.3.6",
         "@mapbox/mapbox-gl-draw": "^1.3.0",
-        "@sentry/react": "^6.9.0",
-        "@sentry/tracing": "^6.9.0",
-        "@the-deep/deep-ui": "^1.5.12",
+        "@sentry/react": "^6.16.0",
+        "@sentry/tracing": "^6.16.0",
+        "@the-deep/deep-ui": "^1.5.20",
         "@togglecorp/fujs": "^1.9.2",
         "@togglecorp/re-map": "^0.1.3",
-        "@togglecorp/toggle-form": "^1.2.1",
-        "@togglecorp/toggle-request": "^0.0.1",
-        "@types/chrome": "^0.0.153",
-        "@types/d3-brush": "^3.0.1",
-        "@types/dropbox-chooser": "^1.0.3",
-        "@types/gapi": "^0.0.41",
-        "@types/gapi.auth2": "^0.0.55",
-        "@types/google.picker": "^0.0.39",
-        "@types/mapbox-gl": "^1.10.1",
-        "@types/recharts": "^2.0.0",
-        "@types/svg-injector": "^0.0.29",
+        "@togglecorp/toggle-form": "^1.2.2-beta.2",
+        "@togglecorp/toggle-request": "^0.0.2",
         "abort-controller": "^3.0.0",
         "apollo-link": "^1.2.14",
         "apollo-link-batch-http": "^1.2.14",
         "apollo-link-rest": "^0.8.0-beta.0",
         "apollo-link-retry": "^2.2.16",
-        "apollo-upload-client": "^16.0.0",
+        "apollo-upload-client": "^17.0.0",
         "core-js": "3",
         "d3-brush": "^3.0.0",
         "d3-selection": "^3.0.0",
-        "graphql": "^15.5.1",
+        "graphql": "^16.2.0",
         "graphql-anywhere": "^4.2.7",
         "immer": "^9.0.5",
+        "localforage": "^1.10.0",
         "mapbox-gl": "^2.4.1",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
@@ -76,75 +69,79 @@
         "react-icons": "^4.2.0",
         "react-org-tree": "^1.0.0",
         "react-resize-detector": "^6.7.4",
-        "recharts": "^2.1.0",
-        "svg-injector": "^1.1.3"
+        "react-router-dom": "^6.2.1",
+        "recharts": "^2.1.6"
     },
     "devDependencies": {
-        "@babel/core": "^7.13.10",
-        "@babel/plugin-proposal-do-expressions": "^7.14.5",
+        "@babel/core": "^7.16.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-transform-react-constant-elements": "^7.14.5",
-        "@babel/plugin-transform-react-inline-elements": "^7.14.5",
-        "@babel/plugin-transform-runtime": "^7.14.5",
-        "@babel/preset-env": "^7.13.10",
-        "@babel/preset-react": "^7.12.13",
-        "@babel/preset-typescript": "^7.14.5",
-        "@graphql-codegen/cli": "^1.21.7",
-        "@graphql-codegen/introspection": "^1.18.2",
-        "@graphql-codegen/typescript": "^1.23.0",
-        "@graphql-codegen/typescript-operations": "^1.18.4",
-        "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
+        "@babel/plugin-transform-react-constant-elements": "^7.16.5",
+        "@babel/plugin-transform-runtime": "^7.16.5",
+        "@babel/preset-env": "^7.16.5",
+        "@babel/preset-react": "^7.16.5",
+        "@babel/preset-typescript": "^7.16.5",
+        "@graphql-codegen/cli": "^2.3.0",
+        "@graphql-codegen/introspection": "^2.1.0",
+        "@graphql-codegen/typescript": "^2.4.1",
+        "@graphql-codegen/typescript-operations": "^2.2.1",
+        "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
         "@types/apollo-upload-client": "^14.1.0",
-        "@types/react": "^17.0.14",
-        "@types/react-dom": "^17.0.9",
-        "@types/react-router-dom": "^5.1.8",
-        "@typescript-eslint/eslint-plugin": "^4.28.3",
-        "@typescript-eslint/parser": "^4.28.3",
-        "babel-loader": "^8.2.2",
+        "@types/chrome": "^0.0.171",
+        "@types/d3-brush": "^3.0.1",
+        "@types/dropbox-chooser": "^1.0.3",
+        "@types/gapi": "^0.0.41",
+        "@types/gapi.auth2": "^0.0.55",
+        "@types/google.picker": "^0.0.39",
+        "@types/mapbox-gl": "^2.6.0",
+        "@types/react": "^17.0.37",
+        "@types/react-dom": "^17.0.11",
+        "@types/react-router-dom": "^5.3.2",
+        "@types/svg-injector": "^0.0.29",
+        "@typescript-eslint/eslint-plugin": "^5.8.0",
+        "@typescript-eslint/parser": "^5.8.0",
+        "babel-loader": "^8.2.3",
         "babel-plugin-graphql-tag": "^3.3.0",
         "babel-plugin-module-resolver": "^4.1.0",
-        "babel-plugin-polyfill-corejs3": "^0.2.3",
-        "babel-plugin-polyfill-regenerator": "^0.2.2",
+        "babel-plugin-polyfill-corejs3": "^0.4.0",
+        "babel-plugin-polyfill-regenerator": "^0.3.0",
         "circular-dependency-plugin": "^5.2.2",
-        "compression-webpack-plugin": "^8.0.1",
-        "css-loader": "^5.1.3",
-        "css-minimizer-webpack-plugin": "^3.0.2",
+        "compression-webpack-plugin": "^9.2.0",
+        "css-loader": "^6.5.1",
+        "css-minimizer-webpack-plugin": "^3.3.0",
         "dotenv-webpack": "^7.0.3",
-        "eslint": "^7.30.0",
-        "eslint-config-airbnb": "^18.2.1",
-        "eslint-config-airbnb-base": "^14.2.1",
+        "eslint": "^8.5.0",
+        "eslint-config-airbnb": "^19.0.2",
+        "eslint-config-airbnb-base": "^15.0.0",
         "eslint-import-resolver-babel-module": "^5.3.1",
         "eslint-plugin-graphql": "^4.0.0",
-        "eslint-plugin-import": "^2.23.4",
-        "eslint-plugin-jsx-a11y": "^6.4.1",
-        "eslint-plugin-postcss-modules": "^1.2.1",
-        "eslint-plugin-react": "^7.24.0",
-        "eslint-plugin-react-hooks": "^4.2.0",
-        "eslint-webpack-plugin": "^2.5.4",
+        "eslint-plugin-import": "^2.25.3",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
+        "eslint-plugin-postcss-modules": "^2.0.0",
+        "eslint-plugin-react": "^7.27.1",
+        "eslint-plugin-react-hooks": "^4.3.0",
+        "eslint-webpack-plugin": "^3.1.1",
         "file-loader": "^6.2.0",
         "git-revision-webpack-plugin": "^5.0.0",
-        "history": "^4.9.0",
-        "html-webpack-plugin": "^5.3.1",
-        "mini-css-extract-plugin": "^2.1.0",
-        "postcss-loader": "^4.0.3",
-        "postcss-nested": "^4.2.1",
-        "postcss-normalize": "^9.0.0",
-        "postcss-preset-env": "^6.7.0",
-        "react-refresh": "^0.10.0",
-        "react-router-dom": "^5.2.0",
+        "html-webpack-plugin": "^5.5.0",
+        "mini-css-extract-plugin": "^2.4.5",
+        "postcss-loader": "^6.2.1",
+        "postcss-nested": "^5.0.6",
+        "postcss-normalize": "^10.0.1",
+        "postcss-preset-env": "^7.0.2",
+        "react-refresh": "^0.11.0",
         "resource-hints-webpack-plugin": "^0.0.2",
-        "style-loader": "^2.0.0",
-        "stylelint": "^13.13.1",
+        "style-loader": "^3.3.1",
+        "stylelint": "^14.2.0",
         "stylelint-config-concentric": "^2.0.2",
-        "stylelint-config-recommended": "^5.0.0",
-        "stylelint-webpack-plugin": "^2.2.2",
-        "terser-webpack-plugin": "^5.1.4",
-        "typescript": "^4.3.5",
-        "webpack": "^5.27.0",
-        "webpack-cli": "^4.5.0",
-        "webpack-dev-server": "^3.11.3",
+        "stylelint-config-recommended": "^6.0.0",
+        "stylelint-webpack-plugin": "^3.1.0",
+        "terser-webpack-plugin": "^5.3.0",
+        "typescript": "^4.5.4",
+        "webpack": "^5.65.0",
+        "webpack-cli": "^4.9.1",
+        "webpack-dev-server": "^4.6.0",
         "webpack-merge": "^5.8.0",
         "webpack-pwa-manifest": "^4.3.0",
-        "workbox-webpack-plugin": "^6.1.5"
+        "workbox-webpack-plugin": "^6.4.2"
     }
 }
diff --git a/src/redux/initial-state/dev-lang.json b/src/redux/initial-state/dev-lang.json
index 77ceda7ecf..4960bfe349 100644
--- a/src/redux/initial-state/dev-lang.json
+++ b/src/redux/initial-state/dev-lang.json
@@ -10,7 +10,7 @@
         "9": "Search",
         "10": "Apply filter",
         "11": "Clear filter",
-        "12": "Add leads",
+        "12": "Add sources",
         "13": "Title",
         "14": "Any",
         "15": "Entries",
@@ -33,7 +33,7 @@
         "37": "Local disk",
         "38": "Select one",
         "39": "e.g. Nepal Monitoring",
-        "40": "e.g. Lead 12:21:00 PM",
+        "40": "e.g. Source 12:21:00 PM",
         "41": "e.g. https://bbc.com",
         "44": "e.g. 12/12/2012",
         "45": "Enter text description here",
@@ -107,20 +107,20 @@
         "120": "Level",
         "123": "Admin levels",
         "125": "Load GEO shape file",
-        "129": "Extract lead information from URL",
+        "129": "Extract source information from URL",
         "130": "Apply this value to all elements.",
         "131": "Apply this value to all elements below.",
         "132": "Preview not available",
-        "133": "Are you sure you want to discard this lead?",
+        "133": "Are you sure you want to discard this source?",
         "134": "Are you sure you want to delete this assessment?",
-        "135": "Search similar lead",
-        "136": "Edit lead",
-        "137": "Remove lead",
-        "138": "Add entry from this lead",
+        "135": "Search similar source",
+        "136": "Edit source",
+        "137": "Remove source",
+        "138": "Add entry from this source",
         "139": "Add subcategory",
-        "141": "Are you sure you want to remove this lead? The lead along with all the associated entries and assessment will be removed.",
+        "141": "Are you sure you want to remove this source? The source along with all the associated entries and assessment will be removed.",
         "142": "Tabular",
-        "143": "Add assessment from this lead",
+        "143": "Add assessment from this source",
         "144": "No assessment template found for this project.",
         "145": "No analysis framework found.",
         "150": "First name",
@@ -135,16 +135,16 @@
         "163": "Created at",
         "164": "Last modified at",
         "166": "Members",
-        "167": "View usergroup",
-        "168": "Edit usergroup",
-        "169": "Delete usergroup",
+        "167": "View user group",
+        "168": "Edit user group",
+        "169": "Delete user group",
         "170": "View project",
         "171": "Edit project",
         "172": "Delete project",
         "173": "Projects",
         "174": "Add project",
         "175": "Groups",
-        "176": "Usergroup title",
+        "176": "User group title",
         "177": "Failed to add members.",
         "178": "e.g. ACAPS",
         "179": "Create",
@@ -156,23 +156,23 @@
         "188": "Revoke admin rights",
         "189": "Grant admin rights",
         "190": "Delete member",
-        "191": "Delete lead",
+        "191": "Delete source",
         "192": "Member",
-        "194": "Are you sure you want to delete the usergroup {title}?",
+        "194": "Are you sure you want to delete the user group {title}?",
         "195": "Are you sure you want to revoke admin rights form {memberName}?",
         "196": "Are you sure your want to grant admin rights to {memberName}?",
         "197": "Are you sure you want to remove the member {memberName}?",
-        "198": "Usergroup not found",
+        "198": "User group not found",
         "199": "User not found",
         "200": "Description",
-        "201": "Usergroup",
+        "201": "User group",
         "202": "Activity log",
-        "204": "Failed to save usergroup.",
+        "204": "Failed to save user group.",
         "205": "Geo area remove",
-        "206": "Geo area removed successfully.",
+        "206": "Successfully removed geo area.",
         "207": "Cannot remove geo area.",
         "208": "Cannot remove geo area. Please check your network connection and try again",
-        "209": "Show lead preview",
+        "209": "Show source preview",
         "251": "DEEP supports .json, .geojson and shapefiles compressed in .zip",
         "253": "Under construction",
         "301": "Add",
@@ -186,7 +186,7 @@
         "334": "End date",
         "335": "Enter project end date",
         "336": "Geo areas",
-        "338": "Usergroups",
+        "338": "User groups",
         "341": "Search geo areas",
         "342": "Add geo area",
         "343": "There are no geo areas in this project.",
@@ -250,7 +250,7 @@
         "506": "Show suggestions for :",
         "508": "Entities",
         "512": "Entry",
-        "513": "There was a problem while fetching leads.",
+        "513": "There was a problem while fetching sources.",
         "514": "Excerpt",
         "517": "Assisted",
         "518": "Original",
@@ -285,11 +285,11 @@
         "634": "Decoupled entries",
         "635": "Note that by selecting this option, it can greatly increase the amount of time to generate the export.",
         "636": "Disaggregate data for any list values (i.e. multiple administrative areas or multiple select fields).",
-        "637": "Your export has been started.\nPlease go to view all exports page for further information on export.",
+        "637": "Your export has started",
         "638": "You don't have any matrices in your analysis framework.",
         "639": "Framework sections",
         "640": "No export options available",
-        "641": "Leads",
+        "641": "Sources",
         "643": "Select",
         "644": "Unselect",
         "648": "Couldn't load analysis framework",
@@ -361,52 +361,52 @@
         "894": "Verify you are a human",
         "900": "User profile edit",
         "901": "User edit successful",
-        "904": "Usergroup delete",
-        "905": "Usergroup successfully deleted",
-        "906": "Usergroup deletion failure",
-        "907": "Usergroup deletion failure. Please check your network connection and try again",
-        "908": "Usergroup add",
-        "909": "Usergroup successfully created",
-        "913": "Project successfully deleted",
+        "904": "User group delete",
+        "905": "Successfully deleted user group.",
+        "906": "User group deletion failure",
+        "907": "User group deletion failure. Please check your network connection and try again",
+        "908": "User group add",
+        "909": "Successfully created user group.",
+        "913": "Successfully deleted project.",
         "915": "Project deletion failure. Please check your network connection and try again",
         "916": "User project add",
-        "917": "Project successfully created",
+        "917": "Successfully created project.",
         "920": "Add user membership ",
-        "921": "User added successfully ",
+        "921": "Successfully added user",
         "924": "Remove user membership",
-        "925": "User removed successfully ",
+        "925": "Successfully removed user",
         "926": "Cannot remove user",
         "927": "Cannot remove user. Please check your network connection and try again",
         "928": "Membership role",
-        "929": "User role successfully updated",
+        "929": "Successfully updated user role.",
         "930": "User role update failure.",
         "931": "Cannot update user role. Please check your network connection and try again",
-        "932": "Usergroup edit",
-        "933": "Name updated successfully",
+        "932": "User group edit",
+        "933": "Successfully updated name.",
         "937": "Country delete successful",
         "938": "Cannot delete country.",
         "939": "Cannot delete country. Please check your network connection and try again",
         "940": "Add country",
-        "941": "Country added successfully",
+        "941": "Successfully added country.",
         "942": "Cannot add country.",
         "943": "Cannot add country. Please check your network connection and try again",
         "948": "Delete admin level",
-        "949": "Admin level successfully deleted",
+        "949": "Successfully deleted admin level.",
         "950": "Cannot delete admin level.",
         "951": "Cannot delete admin level. Please check your network connection and try again",
-        "953": "Admin level successfully added",
+        "953": "Successfully added admin level.",
         "954": "Cannot add admin level.",
         "955": "Cannot add admin level. Please check your network connection and try again",
         "956": "Edit admin level",
-        "957": "Admin level successfully updated",
-        "965": "Analytical framework successfully added",
+        "957": "Successfully updated admin level",
+        "965": "Successfully added analytical framework.",
         "967": "Cannot add analysis framework. Please check your network connection and try again",
-        "972": "Save lead",
-        "973": "Lead save successful",
-        "974": "{errorCount} lead(s) could not be saved.",
-        "977": "Lead successfully deleted",
-        "978": "Lead file not found",
-        "979": "Lead delete failed. Please check your network connection and try again",
+        "972": "Save source",
+        "973": "Source save successful",
+        "974": "{errorCount} source(s) could not be saved.",
+        "977": "Successfully deleted source.",
+        "978": "Source file not found",
+        "979": "Source delete failed. Please check your network connection and try again",
         "981": "Analytical framework was updated in server.",
         "982": "Your copy was overridden by server's copy",
         "983": "Successfully saved the framework.",
@@ -415,19 +415,19 @@
         "986": "Drag and drop are only valid from extracted words.",
         "987": "Some entries were updated in server.",
         "988": "Save entry",
-        "989": "Entries successfully saved",
+        "989": "Successfully saved entries.",
         "990": "{errorCount} entries could not be saved.",
         "991": "Failed to load analysis framework",
-        "993": "Lead successfully removed",
-        "994": "Remove leads",
-        "995": "Leads successfully removed",
+        "993": "Successfully removed source.",
+        "994": "Remove sources",
+        "995": "Successfully removed sources.",
         "996": "Geo area details were updated in server.",
-        "997": "Geo area details successfully saved.",
+        "997": "Successfully saved geo area details.",
         "998": "Save geo area",
         "999": "There was an error while fetching existing users",
         "1000": "to",
         "1003": "Failed to save geo area detail.",
-        "1004": "Please wait while we process the text for this lead. It can take some time depending on the size of the lead.",
+        "1004": "Please wait while we process the text for this source. It can take some time depending on the size of the source.",
         "1006": "No of entries",
         "1007": "There should be at least one item.",
         "1008": "Duplicate items are not allowed: {duplicates}.",
@@ -439,7 +439,7 @@
         "1104": "Source type",
         "1105": "RSS feed",
         "1106": "Connector create",
-        "1107": "Connector was successfully created.",
+        "1107": "Successfully created connector.",
         "1109": "Connector sources",
         "1110": "There was a problem while fetching connector sources.",
         "1111": "Select a connector to view its details.",
@@ -447,7 +447,7 @@
         "1114": "The connector you are looking for does not exist.",
         "1115": "There are no connectors.",
         "1116": "Failed to patch connector.",
-        "1117": "Connector details were saved successfully.",
+        "1117": "Successfully saved connector details.",
         "1118": "Failed to create connector.",
         "1119": "Users",
         "1120": "Visibility",
@@ -459,14 +459,14 @@
         "1127": "Failed to create new category editor.",
         "1129": "Groups",
         "1130": "Progress reports of June",
-        "1131": "Add lead group",
-        "1132": "Failed to create lead group",
-        "1133": "Lead group",
-        "1134": "Lead group created successfully.",
+        "1131": "Add source group",
+        "1132": "Failed to create source group",
+        "1133": "Source group",
+        "1134": "Successfully created source group.",
         "1135": "Test",
         "1136": "This url is already added.",
         "1137": "Failed to test connector.",
-        "1138": "{title} sample leads",
+        "1138": "{title} sample sources",
         "1139": "Filters not available",
         "1200": "User",
         "1206": "Search gallery files",
@@ -510,8 +510,8 @@
         "2000": "Browser extension",
         "2001": "Your extension has been successfully set up.",
         "2002": "An error occurred while setting up the extension. Please make sure you have installed and enabled the extension.",
-        "2003": "Do you want to apply this value to all leads?",
-        "2004": "Do you want to apply this value to all leads below?",
+        "2003": "Do you want to apply this value to all sources?",
+        "2004": "Do you want to apply this value to all sources below?",
         "2005": "Do you want to apply this value to all entries?",
         "2006": "Do you want to apply this value to all entries below?",
         "2007": "Discard",
@@ -525,11 +525,11 @@
         "3000": "Cluster Visualization",
         "3004": "Cannot initialize cluster creation for project. Please check your network connection and try again",
         "3005": "Cannot fetch data for given cluster. Please check your network connection and try again",
-        "3006": "Cannot fetch leads data for given documents",
-        "3009": "Showing {noOfClusters} clusters from {noOfLeads} leads",
+        "3006": "Cannot fetch sources data for given documents",
+        "3009": "Showing {noOfClusters} clusters from {noOfSources} sources",
         "3010": "Cluster-{clusterIndex}",
         "3011": "Keywords",
-        "3012": "{leadsCount} leads",
+        "3012": "{leadsCount} sources",
         "4001": "Sunburst",
         "4002": "Correlation matrix",
         "4007": "Chord diagram",
@@ -542,7 +542,7 @@
         "5557": "File selection",
         "5558": "Password reset",
         "5559": "Home",
-        "5561": "Leads visualization",
+        "5561": "Sources visualization",
         "5562": "Assessments",
         "5563": "Edit assessment",
         "5566": "User profile",
@@ -556,9 +556,9 @@
         "7039": "Sub-columns",
         "7500": "Couldn't upload image",
         "7501": "Couldn't upload file",
-        "7628": "Discover Usergroups",
+        "7628": "Discover User groups",
         "7629": "Discover Projects",
-        "7630": "Leads activity",
+        "7630": "Sources activity",
         "7631": "Entries activity",
         "7632": "Discover",
         "7636": "Join",
@@ -567,8 +567,8 @@
         "7639": "You request to join the {projectName} project has been canceled.",
         "8003": "Scale {index}",
         "8004": "Remove Scale Unit",
-        "8050": "Failed to change lead status.",
-        "8051": "Lead status changed successfully.",
+        "8050": "Failed to change source status.",
+        "8051": "Successfully changed source status.",
         "8061": "Collapsible tree view",
         "8064": "Keyword correlation",
         "8065": "Radial dendrogram",
@@ -581,7 +581,7 @@
         "8076": "Failed to get topic modeling",
         "8101": "Delete this assessment",
         "8102": "Edit this assessment",
-        "8501": "Select a source to add new lead",
+        "8501": "Select a source to add new source",
         "9000": "Priority humanitarian access issues",
         "9001": "Settings facing most humanitarian access issues",
         "9002": "Population with limited/intermittent access",
@@ -619,13 +619,13 @@
         "9039": "Main sectoral outcomes",
         "9040": "Main sectoral underlying factors",
         "9920": "Report this error",
-        "11000": "Lead groups",
-        "11001": "Show lead groups",
-        "11002": "No of leads",
-        "11003": "Lead group deleted successfully.",
-        "11004": "Are you sure you want to delete this lead group?",
-        "11006": "Failed to delete lead group.",
-        "12000": "Goto edit entries page for the lead",
+        "11000": "Source groups",
+        "11001": "Show source groups",
+        "11002": "No of sources",
+        "11003": "Successfully deleted source group.",
+        "11004": "Are you sure you want to delete this source group?",
+        "11006": "Failed to delete source group.",
+        "12000": "Goto edit entries page for the source",
         "12001": "Development Language Save",
         "12002": "Hurray!! Development Language Successfully Saved",
         "12500": "Frameworks",
@@ -633,7 +633,7 @@
         "12502": "Clone framework",
         "12503": "Word categories",
         "12504": "Clone category editor",
-        "12507": "No matching user / usergroup found",
+        "12507": "No matching user / user group found",
         "12508": "Start typing and results will be returned by their relevance to you",
         "12509": "Role",
         "12510": "Are you sure you want to remove membership of {memberName}({memberEmail}) from this project?",
@@ -642,15 +642,15 @@
         "13000": "Sorted By",
         "13001": "Words",
         "13002": "Pages",
-        "13003": "Showing {leadsCount} leads out of {totalLeadsCount}",
+        "13003": "Showing {leadsCount} sources out of {totalLeadsCount}",
         "15001": "Are you sure you want to delete these tabular sheets? {count} entries will be deleted.",
         "15003": "Separator",
         "15004": "Delimiter",
         "15008": "Reset sort",
         "15009": "Skip sheet",
         "15010": "Header row",
-        "15011": "Number of entries from this lead",
-        "-4983139": "Remove lead group",
+        "15011": "Number of entries from this source",
+        "-4983139": "Remove source group",
         "-49385196": "Save screenshot",
         "-42880698": "Discard screenshot",
         "-7205609": "Take screenshot",
@@ -661,7 +661,7 @@
         "-22182314": "Remove widget",
         "-26255030": "This widget was added from {addedFrom} page",
         "-59086768": "Edit Framework",
-        "-3048933": "Cannot find lead inside current project.",
+        "-3048933": "Cannot find source inside current project.",
         "-85998802": "Edit entry",
         "-22730741": "Delete entry",
         "-39451070": "Excerpt {index}",
@@ -689,9 +689,9 @@
         "-13931386": "Sub-column {index}",
         "-24172161": "Remove sub-column",
         "-66570762": "Number of Entries",
-        "-43947547": "Number of Leads",
-        "-35157722": "Well done! Lead has been marked as processed.",
-        "-74575009": "Lead has been marked as pending.",
+        "-43947547": "Number of Sources",
+        "-35157722": "Well done! Source has been marked as processed.",
+        "-74575009": "Source has been marked as pending.",
         "-56080300": "Min value (optional)",
         "-86245438": "Max value (optional)",
         "-18776228": "Just me",
@@ -708,14 +708,14 @@
         "-53914293": "Are you sure you want to remove the connector {connector}?",
         "-94736495": "Delete",
         "-22187575": "Failed to delete connector.",
-        "-96949624": "There are currently not enough leads in your project to view clusters. You can add them in the {addLeads} and then comeback and the clusters will appear here.",
+        "-96949624": "There are currently not enough sources in your project to view clusters. You can add them in the {addLeads} and then comeback and the clusters will appear here.",
         "-86309773": "Join our slack channel",
         "-28004665": "Join our skype group",
         "-76332316": "Do you want to format all excerpts?",
         "-83635501": "Format all excerpts",
         "-71533605": "Failed to save user information.",
         "-5184045": "Failed to retrieve user's projects.",
-        "-59897985": "Failed to retrieve user's Usergroups.",
+        "-59897985": "Failed to retrieve user's User groups.",
         "-86548021": "Conditional",
         "-99261665": "Condition type",
         "-5699457": "Remove condition",
@@ -729,31 +729,31 @@
         "-17297015": "Link widgets",
         "-59940596": "No project found",
         "-24077239": "You can add the following types of widgets inside a conditional widget.",
-        "-77657645": "Failed to fetch lead groups.",
+        "-77657645": "Failed to fetch source groups.",
         "-80733191": "The order of the widgets below represents the order in which the conditions are checked.",
         "-17190550": "You can add conditions from these widgets that are currently in your framework.",
         "-50186668": "Geo",
         "-15095273": "Select Gallery Files",
         "-75331863": "Fatal error occurred while getting users gallery files",
         "-41121825": "Failed to get user gallery files",
-        "-54185786": "Users/Usergroups",
-        "-17852758": "Search Users/Usergroups",
+        "-54185786": "Users/User groups",
+        "-17852758": "Search Users/User groups",
         "-1045504": "Go back",
         "-7863682": "Entries activity - Last 3 months",
-        "-88399268": "Leads activity - Last 3 months",
+        "-88399268": "Sources activity - Last 3 months",
         "-13293319": "Project status",
         "-24496925": "Top sourcers",
         "-62830931": "Top taggers",
         "-89597029": "Total entries",
-        "-71534972": "Total leads",
+        "-71534972": "Total sources",
         "-50725969": "Total users",
         "-48325375": "Entries: {entries}",
-        "-24966730": "Leads: {leads}",
+        "-24966730": "Sources: {leads}",
         "-47407911": "Date: {date}",
         "-74417500": "{field} was changed from {oldValue} to {newValue}.",
         "-68605986": "{field} was set to {newValue}.",
         "-63520825": "{fields} were modified.",
-        "-30665346": "Are you sure you want to remove the Usergroup {title}? All users in this project who are associated with the group will also be removed.  If you would like to keep these users, please unassign them from {title}.",
+        "-30665346": "Are you sure you want to remove the User group {title}? All users in this project who are associated with the group will also be removed.  If you would like to keep these users, please unassign them from {title}.",
         "-42425639": "Linked group",
         "-99213668": "Independent member",
         "-557230": "Time range",
@@ -772,13 +772,13 @@
         "-14675920": "Are you sure you want to leave? Any unsaved changes will be lost.",
         "-14456695": "{title} Overview",
         "-86091592": "Looks like your project doesn't have any entries.",
-        "-15556514": "Go to leads to add some entries.",
+        "-15556514": "Go to sources to add some entries.",
         "-21972443": "Looks like there are no entries that match your filtering criteria. Try changing what you're looking for and search again.",
-        "-59957290": "Looks like there are no leads that match your filtering criteria. Try changing what you're looking for and search again.",
-        "-52516388": "Looks like your project doesn't have any leads. Click on {addLeadButtonLabel} to add some to your project.",
+        "-59957290": "Looks like there are no sources that match your filtering criteria. Try changing what you're looking for and search again.",
+        "-52516388": "Looks like your project doesn't have any sources. Click on {addLeadButtonLabel} to add some to your project.",
         "-94305439": "Looks like there are no assessments that match your filtering criteria. Try changing what you're looking for and search again.",
         "-97447888": "Looks like your project doesn't have any assessments.",
-        "-52524002": "Add some assessments from the lead page to get started.",
+        "-52524002": "Add some assessments from the source page to get started.",
         "-7027140": "Looks like there are no projects that match your filtering criteria. Try changing what you're looking for and search again.",
         "-5727164": "Looks like there are no projects right now to discover. Why not add one?",
         "-18730432": "Matrices",
@@ -788,7 +788,7 @@
         "-4183681": "Swap values",
         "-25265886": "All required",
         "-72702692": "Invalid range",
-        "-10595927": "No Users or Usergroups found",
+        "-10595927": "No Users or User groups found",
         "-48490028": "Looks like you don't have access to this project or it doesn't exist!",
         "-69684282": "Please contact your project administrator to be granted the needed rights, or if you think this is a bug please notify the DEEP administrators using the Feedback button",
         "-84343027": "Please contact the project administrator to be added, or if you think this is a bug please notify the DEEP administrators using the Feedback button",
@@ -802,7 +802,7 @@
         "-50010134": "Add cells from",
         "-11147231": "Feedback or Bug?",
         "-81583708": "Submit any feedback or bug you encountered.",
-        "-75360665": "no lead activity in past {days} days",
+        "-75360665": "no source activity in past {days} days",
         "-30036120": "no entry activity in past {days} days",
         "-44064706": "Help",
         "-72856110": "Add / edit the help link",
@@ -815,12 +815,12 @@
         "-14465545": "Do you want to logout? This will clear out all of your local changes.",
         "-10995037": "Geo areas",
         "-67487923": "Geo area",
-        "-61370018": "some lead activity in past {days} days",
+        "-61370018": "some source activity in past {days} days",
         "-881890": "some entry activity in past {days} days",
         "-45914563": "Project with {value: and }",
         "-2861291": "Project with {value: or }",
         "-96311582": "Add user",
-        "-91114337": "Add usergroup",
+        "-91114337": "Add user group",
         "-50532935": "Miscellaneous",
         "-61910224": "This action will affect the entries tagged with geo areas of this geo area.",
         "-63188496": "Couldn't read tabular data.",
@@ -845,8 +845,8 @@
         "-62030461": "Start page",
         "-93329065": "Drop file(s) here to upload",
         "-16421564": "Uploading file(s)",
-        "-50910995": "Looks like your project doesn't have any lead groups.",
-        "-27964979": "Looks like there are no lead groups that match your filtering criteria. Try changing what you're looking for and search again.",
+        "-50910995": "Looks like your project doesn't have any source groups.",
+        "-27964979": "Looks like there are no source groups that match your filtering criteria. Try changing what you're looking for and search again.",
         "-26016239": "Show other sheets",
         "-206854": "Saving...",
         "-6746951": "Restore deleted fields",
@@ -898,10 +898,10 @@
         "-38465658": "Failed to create tabular.",
         "-64655622": "This is a private project and is only visible to project members.",
         "-57055647": "Project Visibility",
-        "-16703906": "Export leads to other projects",
-        "-86428588": "Are you sure you want to export {countLeads} leads to {countProjects} projects?",
-        "-78373067": "Failed to extract leads to other projects.",
-        "-69982235": "Successfully created {leadsCount} leads in {projectsCount} projects.",
+        "-16703906": "Export sources to other projects",
+        "-86428588": "Are you sure you want to export {countLeads} sources to {countProjects} projects?",
+        "-78373067": "Failed to extract sources to other projects.",
+        "-69982235": "Successfully created {leadsCount} sources in {projectsCount} projects.",
         "-59667485": "Note: Framework visibility cannot be changed once the framework is created.",
         "-13698917": "This is a private framework and is only visible to framework members.",
         "-8045218": "Successfully cloned the selected framework.",
@@ -974,7 +974,7 @@
         "-27756095": "e.g. UN OCHA",
         "-12306980": "Logo",
         "-91474494": "e.g. People In Need",
-        "-24340518": "No leads can be returned with your settings. Try adding a valid URL and try again.",
+        "-24340518": "No sources can be returned with your settings. Try adding a valid URL and try again.",
         "-24511724": "No matching results were found. Add a new {title} using the add button.",
         "-91461742": "Are you sure you want to leave? You will lose your unsaved changes.",
         "-9524324": "Failed to load entries visualization data. ",
@@ -1030,7 +1030,7 @@
         "-94407945": "Mark current entry group for removal",
         "-79810915": "Unmark current entry group for removal",
         "-19337357": "Save Entry Group",
-        "-24270008": "Entry groups successfully saved",
+        "-24270008": "Successfully saved entry groups.",
         "-86483548": "{errorCount} entry groups could not be saved.",
         "-93218852": "Some entry groups were updated in server.",
         "-84182062": "Hide Highlight",
@@ -1044,7 +1044,7 @@
         "-18186537": "Delete Entry Group",
         "-48762166": "Create Entry Group",
         "-24599331": "Entry groups - quick add",
-        "-19686228": "There are no entry groups in this lead.",
+        "-19686228": "There are no entry groups in this source.",
         "-1797082": "Free Text Widgets",
         "-1797083": "Additional metadata",
         "-48510558": "Free text",
@@ -1075,11 +1075,11 @@
         "-59460837": "This framework is used by private projects you are not a part of.",
         "-61550815": "Widgets Preview",
         "-40186961": "View Details",
-        "-91728706": "Extract lead information from attached document\t",
+        "-91728706": "Extract source information from attached document\t",
         "-59171199": "Copy Assessment to Other Projects",
         "-3021496": "You've successfully copied this assessment to {projectsCount} projects.",
         "-51126708": "You've successfully copied this assessment to selected projects.",
-        "-54496992": "Lead Status",
+        "-54496992": "Source Status",
         "-42205095": "Priority",
         "-17130420": "Assessment couldn't be copied.",
         "-55355663": "30d",
@@ -1092,8 +1092,8 @@
         "-33843532": "Mark as completed",
         "-43430452": "Failed to load assessments visualization data.",
         "-17560008": "Assessments Visualization",
-        "-25520086": "This lead is in the Assessment Registry.",
-        "-27768788": "Lead successfully edited.",
+        "-25520086": "This source is in the Assessment Registry.",
+        "-27768788": "Successfully edited source.",
         "-39063797": "Published On",
         "-11231231": "Send Request",
         "-10909809": "Request to join {projectName}",
@@ -1112,7 +1112,7 @@
         "-12312311": "Are you sure you want to delete this entry?",
         "-12312312": "Warning!",
         "-12312313": "Delete Entry",
-        "-12435324": "Entry successfully deleted",
+        "-12435324": "Successfully deleted entry.",
         "-90809809": "Entry delete failed. Please check your network connection and try again",
         "-6144826": "Hey DEEP user - it seems you're not using Google Chrome as your browser! DEEP is only supported on the latest versions of Chrome, which you can download {chromeUrl}. If you continue using your browser, you may face some unexpected issues.",
         "-40128868": "here",
@@ -1126,30 +1126,30 @@
         "-31875190": "Draw over screenshot",
         "-5492927": "Export to image",
         "-7637573": "Draw tools",
-        "-16575221": "Lead confidentiality",
-        "-78757252": "Lead priority",
-        "-15193425": "Lead published on",
+        "-16575221": "Source confidentiality",
+        "-78757252": "Source priority",
+        "-15193425": "Source published on",
         "-26861463": "Donors",
         "-86018902": "Government",
         "-30025571": "International Partners",
         "-49224651": "National Partners",
-        "-78808098": "Lead Organization",
+        "-78808098": "Source Organization",
         "-41977678": "Project stakeholders",
         "-435034987": "Searching",
         "-79879798": "Image",
         "-42342342": "Entry Type",
         "-43286063": "Quantitative",
         "-68991934": "Author(s): {authors}",
-        "-45253596": "Number of pages in Lead document",
+        "-45253596": "Number of pages in Source document",
         "-6895713": "Publisher: {leadSource}",
         "-79339447": "Entry created on",
-        "-7036637": "Lead created by: {user}",
-        "-66548496": "Assessment saved successfully.",
-        "-36063988": "Are you sure you want to remove the selected leads? {leadsCount} along with their associated {entriesCount} and {assessmentsCount} will be removed.",
-        "-91590870": "Bulk Delete Leads",
-        "-86276092": "{count} leads selected",
+        "-7036637": "Source created by: {user}",
+        "-66548496": "Successfully saved assessment.",
+        "-36063988": "Are you sure you want to remove the selected sources? {leadsCount} along with their associated {entriesCount} and {assessmentsCount} will be removed.",
+        "-91590870": "Bulk Delete Sources",
+        "-86276092": "{count} sources selected",
         "-22337727": "Clear all selected items",
-        "-86792115": "Lead filters",
+        "-86792115": "Source filters",
         "-86210237": "Entry filters",
         "-69483734": "Widget filters",
         "-71515950": "Filtered by:",
@@ -1158,7 +1158,7 @@
         "-10912171": "No stakeholders are selected.",
         "-13101548": "Please add your stakeholders.",
         "-79879777": "Looks like the framework in use doesn't have matrix1D and matrix2D widgets.",
-        "-987979879": "Leads",
+        "-987979879": "Sources",
         "-987979871": "Sources",
         "-879879798": "Unverified entries",
         "-897879798": "Verified entries",
@@ -1172,22 +1172,22 @@
         "-19695002": "Show table of contents",
         "-81087776": "{verifiedCount} verified out of {entriesCount} entries",
         "-38882854": "Mark as validated",
-        "-65674515": "Lead has been marked as validated!",
+        "-65674515": "Source has been marked as validated!",
         "-60769703": "Authoring Organization Type",
         "-87098708": "Any Organization Type",
         "-89081134": "Organization Type",
         "-89798798": "Include sub-sector layer for matrix2D",
         "-68982194": "more",
         "-75616009": "Less",
-        "-12398709": "Export deleted successfully",
+        "-12398709": "Successfully deleted export.",
         "-5650209": "Are you sure you want to delete this export?",
         "-69879791": "Archive",
         "-12797797": "Are you sure you want to archive this export?",
         "-80808081": "Exports in progress",
         "-80981123": "Recent exports",
         "-87908082": "Archive",
-        "-12234798": "Export archived successfully",
-        "-79797981": "Export unarchived successfully",
+        "-12234798": "Successfully archived export.",
+        "-79797981": "Successfully unarchived export.",
         "-80808108": "Unarchive",
         "-80870871": "Are you sure you want to unarchive this export?",
         "-26654172": "Customize exported document",
@@ -1203,7 +1203,7 @@
         "-79711343": "Author",
         "-19712331": "Original Date",
         "-12317797": "No of entries",
-        "-87971232": "Lead Options",
+        "-87971232": "Source Options",
         "-79121234": "Entry Options",
         "-77124728": "Hide all filters",
         "-44015188": "Show all filters",
@@ -1237,7 +1237,7 @@
         "-49181354": "Failed to fetch Assignment List",
         "-97660055": "Failed to mark the assignment as Done",
         "-88394931": "Failed to mark bulk assignments as  Done",
-        "-39611284": "Lead assigned to",
+        "-39611284": "Source assigned to",
         "-55670188": "Analysis",
         "-69223329": "Analyses overview",
         "-75339790": "Sources analyzed",
@@ -1249,7 +1249,7 @@
         "-33667410": "In Progress",
         "-10701106": "Creation Date",
         "-30498150": "Analyst",
-        "-50636670": "Team Lead",
+        "-50636670": "Team lead",
         "-31952614": "Pillar Assignments",
         "-30091387": "Edit Analysis",
         "-91939891": "Pillar analysis required",
@@ -1268,7 +1268,7 @@
         "-79488121": "Share",
         "-99801867": "Share public link",
         "-8913126": "Enable public link",
-        "-98563490": "added a lead on",
+        "-98563490": "added a source on",
         "-76639539": "added a comment on",
         "-14680704": "Recent Activity",
         "-46268038": "Recent Activities Fetch Failed",
@@ -1296,21 +1296,21 @@
         "-89045904": "Remove analytical statement",
         "-451230": "Failed to fetch Project Roles",
         "-12814500": "Failed to post Project Membership",
-        "-14727630": "Failed to post Project Usergroups",
-        "-55358986": "Failed to fetch usergroups",
+        "-14727630": "Failed to post Project User groups",
+        "-55358986": "Failed to fetch user groups",
         "-93154523": "Failed to fetch users list",
         "-76480274": "Delete user from project",
         "-75535574": "Edit User",
-        "-70353397": "No usergroups added",
+        "-70353397": "No user groups added",
         "-98959986": "No users added",
         "-30147930": "Failed to Delete user membership",
         "-53750920": "Select Role",
         "-18211847": "Select User",
-        "-14111698": "Select Usergroup",
+        "-14111698": "Select User group",
         "-67231440": "Edit user membership",
-        "-31585106": "Edit usergroup membership",
+        "-31585106": "Edit user group membership",
         "-30397704": "Pillar Analysis Entries",
-        "-33611896": "Pillar Analysis successfully updated.",
+        "-33611896": "Successfully updated pillar analysis.",
         "-80810293": "Add new framework",
         "-81092939": "Save and select",
         "-99938191": "1. Framework Details",
@@ -1343,8 +1343,8 @@
         "-28777942": "Framework users",
         "-89164075": "Failed to fetch framework roles.",
         "-26472388": "Are you sure you want to remove this user from the framework?",
-        "-53075174": "Are you sure you want to remove this entry from discarded entries list?",
-        "-810289191": "User Profile",
+        "-53075174": "Are you sure you want to remove this entry from discarded entry(s) list?",
+        "-810289191": "My Profile",
         "-91292812": "Add Stakeholder",
         "-91928382": "Edit Stakeholder",
         "-91293882": "Search Stakeholder",
@@ -1374,7 +1374,7 @@
         "-48751509": "New",
         "-20774380": "Deleting an analysis will delete all its containing pillar analyses. Are you sure you want to delete this analysis and its pillar analyses?",
         "-1510570": "Are you sure you want to delete this pillar analysis?",
-        "-94802963": "Continue Analysis",
+        "-94802963": "Analyze",
         "-7668049": "Framework Overview",
         "-68241766": "Continue Tagging",
         "-32431240": "View Tagging",
@@ -1390,11 +1390,11 @@
         "-16156610": "If you want to explore Deep, simply close this window.",
         "-12448542": "Forgot your password?",
         "-31997661": "Reset your password",
-        "-79060215": "Are you sure you want to delete this usergroup?",
-        "-25752304": "Are you sure you want to remove this member from this usergroup?",
+        "-79060215": "Are you sure you want to delete this user group?",
+        "-25752304": "Are you sure you want to remove this member from this user group?",
         "-57329096": "Edit member",
-        "-69672375": "Failed to add usergroups",
-        "-60399046": "Failed to delete usergroup",
+        "-69672375": "Failed to add user groups",
+        "-60399046": "Failed to delete user group",
         "-183108101": "Tagging",
         "-818201101": "Sources",
         "-9188181010": "Dashboard",
@@ -1459,11 +1459,11 @@
         "-26439393": "Failed to fetch analysis details.",
         "-13538555": "Save and next",
         "-49068653": "Tagging Flow",
-        "-53188551": "Add Leadgroup",
-        "-23690221": "Create new Analysis",
-        "-25519176": "Successfully created Analysis ",
-        "-47459866": "Analysis successfully edited.",
-        "-82264498": "Analysis successfully deleted."
+        "-53188551": "Add Source Group",
+        "-23690221": "Create new analysis",
+        "-25519176": "Successfully created analysis ",
+        "-47459866": "Successfully edited analysis.",
+        "-82264498": "Successfully deleted analysis."
     },
     "links": {
         "browserExtension": {
@@ -3816,7 +3816,7 @@
             "usersTitle": 1119,
             "pillarAnalysisTitlePlaceholder": 14,
             "addAnAnalystButtonLabel": -76422871,
-            "anaylsisEditModal": -88197654,
+            "analysisEditModal": -88197654,
             "editButtonLabel": 363,
             "editAnalysisModalHeading": -30091387,
             "pillarAnalysisRequired": -91939891,
@@ -4228,13 +4228,13 @@
             "analysisCloneStartDateLabel": 185,
             "analysisCloneTitleLabel": 13,
             "analysisCloneTitlePlaceholder": 13,
-            "anaylsisCloneFailed": -77826051,
+            "analysisCloneFailed": -77826051,
             "cloneButtonLabel": 826,
             "cloneModalHeading": -94707190,
             "endDateGreaterThanStartDate": -46389656,
             "analysisClone": -48458934,
             "analysisCloneSuccessful": -53893586,
-            "anaylsisDetailsFetchFailed": -26439393
+            "analysisDetailsFetchFailed": -26439393
         },
         "bulkUpload": {
             "title": -198131283,
diff --git a/src/views/Export/LeadsSelection/index.tsx b/src/views/Export/LeadsSelection/index.tsx
index 7b05fd69ce..6f6bca164f 100644
--- a/src/views/Export/LeadsSelection/index.tsx
+++ b/src/views/Export/LeadsSelection/index.tsx
@@ -333,13 +333,14 @@ function LeadsSelection(props: ComponentProps) {
                 hasAssessment={hasAssessment}
             />
             <RawTable
-                data={leadsResponse?.results ?? []}
+                data={leadsResponse?.results ?? undefined}
                 dataModifier={dataModifier}
                 headerModifier={headerModifier}
                 headers={headers}
                 onHeaderClick={handleTableHeaderClick}
                 keySelector={leadKeyExtractor}
                 className={styles.table}
+                // FIXME: this is not how we identify pending status
                 pending={leadsPending && (leadsResponse?.results ?? []).length < 1}
             />
             <Pager
diff --git a/webpack.config.js b/webpack.config.js
index f8580bf43c..732371a2bd 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,7 +1,7 @@
 const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const { HotModuleReplacementPlugin, EnvironmentPlugin } = require('webpack');
+const { EnvironmentPlugin } = require('webpack');
 const Dotenv = require('dotenv-webpack');
 const { GitRevisionPlugin } = require('git-revision-webpack-plugin');
 const WebpackPwaManifest = require('webpack-pwa-manifest');
@@ -253,22 +253,31 @@ module.exports = () => {
     return merge(
         config,
         {
+            /*
+            watchOptions: {
+                ignored: /node_modules/,
+            },
+            watchContentBase: true,
+            */
             devServer: {
                 host: '0.0.0.0',
                 port: 3000,
-                watchContentBase: true,
-                overlay: true,
                 hot: true,
                 liveReload: false,
                 historyApiFallback: true,
-                watchOptions: {
-                    ignored: /node_modules/,
+                client: {
+                    overlay: {
+                        warnings: false,
+                        errors: true
+                    },
+                    logging: 'none',
+                },
+                static: {
+                    directory: getPath('build/'),
+                    publicPath: '/',
                 },
-                clientLogLevel: 'none',
-                publicPath: '/',
             },
             plugins: [
-                new HotModuleReplacementPlugin(),
                 new ReactRefreshWebpackPlugin(),
             ],
             /*
diff --git a/yarn.lock b/yarn.lock
index 6de161b59e..4334b0c2fa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,7 +2,16 @@
 # yarn lockfile v1
 
 
-"@apollo/client@^3.1.3", "@apollo/client@^3.3.21":
+"@apideck/better-ajv-errors@^0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.1.tgz#a8d4ef3ce67c418b8b24f2b76b6bc84eb547baf7"
+  integrity sha512-6RMV31esAxqlDIvVCG/CJxY/s8dFNVOI5w8RWIfDMhjg/iwqnawko9tJXau/leqC4+T1Bu8et99QVWCwU5wk+g==
+  dependencies:
+    json-schema "^0.4.0"
+    jsonpointer "^5.0.0"
+    leven "^3.1.0"
+
+"@apollo/client@^3.1.3":
   version "3.3.21"
   resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.3.21.tgz#2862baa4e1ced8c5e89ebe6fc52877fc64a726aa"
   integrity sha512-RAmZReFuKCKx0Rs5C0nVJwKomAHUHn+gGP/YvbEsXQWu0sXoncEUZa71UqlfCPVXa/0MkYOIbCXSQdOcuRrHgw==
@@ -21,6 +30,24 @@
     tslib "^1.10.0"
     zen-observable "^0.8.14"
 
+"@apollo/client@^3.5.6":
+  version "3.5.6"
+  resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.5.6.tgz#911929df073280689efd98e5603047b79e0c39a2"
+  integrity sha512-XHoouuEJ4L37mtfftcHHO1caCRrKKAofAwqRoq28UQIPMJk+e7n3X9OtRRNXKk/9tmhNkwelSary+EilfPwI7A==
+  dependencies:
+    "@graphql-typed-document-node/core" "^3.0.0"
+    "@wry/context" "^0.6.0"
+    "@wry/equality" "^0.5.0"
+    "@wry/trie" "^0.3.0"
+    graphql-tag "^2.12.3"
+    hoist-non-react-statics "^3.3.2"
+    optimism "^0.16.1"
+    prop-types "^15.7.2"
+    symbol-observable "^4.0.0"
+    ts-invariant "^0.9.4"
+    tslib "^2.3.0"
+    zen-observable-ts "^1.2.0"
+
 "@ardatan/aggregate-error@0.0.6":
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/@ardatan/aggregate-error/-/aggregate-error-0.0.6.tgz#fe6924771ea40fc98dc7a7045c2e872dc8527609"
@@ -28,26 +55,31 @@
   dependencies:
     tslib "~2.0.1"
 
-"@babel/code-frame@7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
-  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
-  dependencies:
-    "@babel/highlight" "^7.10.4"
-
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
   integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==
   dependencies:
     "@babel/highlight" "^7.14.5"
 
+"@babel/code-frame@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431"
+  integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==
+  dependencies:
+    "@babel/highlight" "^7.16.0"
+
 "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.5", "@babel/compat-data@^7.14.7":
   version "7.14.7"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz#7b047d7a3a89a67d2258dc61f604f098f1bc7e08"
   integrity sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw==
 
-"@babel/core@>=7.9.0", "@babel/core@^7.0.0", "@babel/core@^7.11.1", "@babel/core@^7.13.10":
+"@babel/compat-data@^7.16.0", "@babel/compat-data@^7.16.4":
+  version "7.16.4"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e"
+  integrity sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==
+
+"@babel/core@^7.11.1":
   version "7.14.6"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.6.tgz#e0814ec1a950032ff16c13a2721de39a8416fcab"
   integrity sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA==
@@ -68,7 +100,37 @@
     semver "^6.3.0"
     source-map "^0.5.0"
 
-"@babel/generator@^7.12.13", "@babel/generator@^7.14.5", "@babel/generator@^7.5.0":
+"@babel/core@^7.14.0", "@babel/core@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.5.tgz#924aa9e1ae56e1e55f7184c8bf073a50d8677f5c"
+  integrity sha512-wUcenlLzuWMZ9Zt8S0KmFwGlH6QKRh3vsm/dhDA3CHkiTA45YuG1XkHRcNRl73EFPXDp/d5kVOU0/y7x2w6OaQ==
+  dependencies:
+    "@babel/code-frame" "^7.16.0"
+    "@babel/generator" "^7.16.5"
+    "@babel/helper-compilation-targets" "^7.16.3"
+    "@babel/helper-module-transforms" "^7.16.5"
+    "@babel/helpers" "^7.16.5"
+    "@babel/parser" "^7.16.5"
+    "@babel/template" "^7.16.0"
+    "@babel/traverse" "^7.16.5"
+    "@babel/types" "^7.16.0"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.1.2"
+    semver "^6.3.0"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.14.0", "@babel/generator@^7.16.0", "@babel/generator@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.5.tgz#26e1192eb8f78e0a3acaf3eede3c6fc96d22bedf"
+  integrity sha512-kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA==
+  dependencies:
+    "@babel/types" "^7.16.0"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.5.tgz#848d7b9f031caca9d0cd0af01b063f226f52d785"
   integrity sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA==
@@ -84,6 +146,13 @@
   dependencies:
     "@babel/types" "^7.14.5"
 
+"@babel/helper-annotate-as-pure@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d"
+  integrity sha512-ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz#b939b43f8c37765443a19ae74ad8b15978e0a191"
@@ -92,13 +161,13 @@
     "@babel/helper-explode-assignable-expression" "^7.14.5"
     "@babel/types" "^7.14.5"
 
-"@babel/helper-builder-react-jsx@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.14.5.tgz#87620c97a8729e91caf9e6f0d324fff23e90bb5d"
-  integrity sha512-LT/856RUBXAHjmvJuLuI6XYZZAZNMSS+N2Yf5EUoHgSWtiWrAaGh7t5saP7sPCq07uvWVxxK3gwwm3weA9gKLg==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.5.tgz#a8429d064dce8207194b8bf05a70a9ea828746af"
+  integrity sha512-3JEA9G5dmmnIWdzaT9d0NmFRgYnWUThLsDaL7982H0XqqWr56lRrsmwheXFMjR+TMl7QMBb6mzy9kvgr1lRLUA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.14.5"
-    "@babel/types" "^7.14.5"
+    "@babel/helper-explode-assignable-expression" "^7.16.0"
+    "@babel/types" "^7.16.0"
 
 "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5":
   version "7.14.5"
@@ -110,7 +179,17 @@
     browserslist "^4.16.6"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.14.6":
+"@babel/helper-compilation-targets@^7.16.3":
+  version "7.16.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0"
+  integrity sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA==
+  dependencies:
+    "@babel/compat-data" "^7.16.0"
+    "@babel/helper-validator-option" "^7.14.5"
+    browserslist "^4.17.5"
+    semver "^6.3.0"
+
+"@babel/helper-create-class-features-plugin@^7.14.5":
   version "7.14.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.6.tgz#f114469b6c06f8b5c59c6c4e74621f5085362542"
   integrity sha512-Z6gsfGofTxH/+LQXqYEK45kxmcensbzmk/oi8DmaQytlQCgqNZt9XQF8iqlI/SeXWVjaMNxvYvzaYw+kh42mDg==
@@ -122,6 +201,19 @@
     "@babel/helper-replace-supers" "^7.14.5"
     "@babel/helper-split-export-declaration" "^7.14.5"
 
+"@babel/helper-create-class-features-plugin@^7.16.0", "@babel/helper-create-class-features-plugin@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.5.tgz#5d1bcd096792c1ebec6249eebc6358eec55d0cad"
+  integrity sha512-NEohnYA7mkB8L5JhU7BLwcBdU3j83IziR9aseMueWGeAjblbul3zzb8UvJ3a1zuBiqCMObzCJHFqKIQE6hTVmg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.0"
+    "@babel/helper-environment-visitor" "^7.16.5"
+    "@babel/helper-function-name" "^7.16.0"
+    "@babel/helper-member-expression-to-functions" "^7.16.5"
+    "@babel/helper-optimise-call-expression" "^7.16.0"
+    "@babel/helper-replace-supers" "^7.16.5"
+    "@babel/helper-split-export-declaration" "^7.16.0"
+
 "@babel/helper-create-regexp-features-plugin@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz#c7d5ac5e9cf621c26057722fb7a8a4c5889358c4"
@@ -130,6 +222,14 @@
     "@babel/helper-annotate-as-pure" "^7.14.5"
     regexpu-core "^4.7.1"
 
+"@babel/helper-create-regexp-features-plugin@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff"
+  integrity sha512-3DyG0zAFAZKcOp7aVr33ddwkxJ0Z0Jr5V99y3I690eYLpukJsJvAbzTy1ewoCqsML8SbIrjH14Jc/nSQ4TvNPA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.0"
+    regexpu-core "^4.7.1"
+
 "@babel/helper-define-polyfill-provider@^0.2.2":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz#0525edec5094653a282688d34d846e4c75e9c0b6"
@@ -144,6 +244,27 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
+"@babel/helper-define-polyfill-provider@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.0.tgz#c5b10cf4b324ff840140bb07e05b8564af2ae971"
+  integrity sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.13.0"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/traverse" "^7.13.0"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
+
+"@babel/helper-environment-visitor@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.5.tgz#f6a7f38b3c6d8b07c88faea083c46c09ef5451b8"
+  integrity sha512-ODQyc5AnxmZWm/R2W7fzhamOk1ey8gSguo5SGvF0zcB3uUzRpTRmM/jmLSm9bDMyPlvbyJ+PwPEK0BWIoZ9wjg==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
 "@babel/helper-explode-assignable-expression@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz#8aa72e708205c7bb643e45c73b4386cdf2a1f645"
@@ -151,7 +272,14 @@
   dependencies:
     "@babel/types" "^7.14.5"
 
-"@babel/helper-function-name@^7.12.13", "@babel/helper-function-name@^7.14.5":
+"@babel/helper-explode-assignable-expression@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.0.tgz#753017337a15f46f9c09f674cff10cee9b9d7778"
+  integrity sha512-Hk2SLxC9ZbcOhLpg/yMznzJ11W++lg5GMbxt1ev6TXUiJB0N42KPC+7w8a+eWGuqDnUYuwStJoZHM7RgmIOaGQ==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-function-name@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4"
   integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==
@@ -160,6 +288,15 @@
     "@babel/template" "^7.14.5"
     "@babel/types" "^7.14.5"
 
+"@babel/helper-function-name@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481"
+  integrity sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.16.0"
+    "@babel/template" "^7.16.0"
+    "@babel/types" "^7.16.0"
+
 "@babel/helper-get-function-arity@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815"
@@ -167,6 +304,13 @@
   dependencies:
     "@babel/types" "^7.14.5"
 
+"@babel/helper-get-function-arity@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa"
+  integrity sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
 "@babel/helper-hoist-variables@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"
@@ -174,6 +318,13 @@
   dependencies:
     "@babel/types" "^7.14.5"
 
+"@babel/helper-hoist-variables@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a"
+  integrity sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
 "@babel/helper-member-expression-to-functions@^7.14.5":
   version "7.14.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz#97e56244beb94211fe277bd818e3a329c66f7970"
@@ -181,6 +332,13 @@
   dependencies:
     "@babel/types" "^7.14.5"
 
+"@babel/helper-member-expression-to-functions@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.5.tgz#1bc9f7e87354e86f8879c67b316cb03d3dc2caab"
+  integrity sha512-7fecSXq7ZrLE+TWshbGT+HyCLkxloWNhTbU2QM1NTI/tDqyf0oZiMcEfYtDuUDCo528EOlt39G1rftea4bRZIw==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
 "@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3"
@@ -188,6 +346,13 @@
   dependencies:
     "@babel/types" "^7.14.5"
 
+"@babel/helper-module-imports@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3"
+  integrity sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
 "@babel/helper-module-transforms@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz#7de42f10d789b423eb902ebd24031ca77cb1e10e"
@@ -202,6 +367,20 @@
     "@babel/traverse" "^7.14.5"
     "@babel/types" "^7.14.5"
 
+"@babel/helper-module-transforms@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.5.tgz#530ebf6ea87b500f60840578515adda2af470a29"
+  integrity sha512-CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.16.5"
+    "@babel/helper-module-imports" "^7.16.0"
+    "@babel/helper-simple-access" "^7.16.0"
+    "@babel/helper-split-export-declaration" "^7.16.0"
+    "@babel/helper-validator-identifier" "^7.15.7"
+    "@babel/template" "^7.16.0"
+    "@babel/traverse" "^7.16.5"
+    "@babel/types" "^7.16.0"
+
 "@babel/helper-optimise-call-expression@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c"
@@ -209,11 +388,23 @@
   dependencies:
     "@babel/types" "^7.14.5"
 
+"@babel/helper-optimise-call-expression@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz#cecdb145d70c54096b1564f8e9f10cd7d193b338"
+  integrity sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
 "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
   integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
 
+"@babel/helper-plugin-utils@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.5.tgz#afe37a45f39fce44a3d50a7958129ea5b1a5c074"
+  integrity sha512-59KHWHXxVA9K4HNF4sbHCf+eJeFe0Te/ZFGqBT4OjXhrwvA04sGfaEGsVTdsjoszq0YTP49RC9UKe5g8uN2RwQ==
+
 "@babel/helper-remap-async-to-generator@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz#51439c913612958f54a987a4ffc9ee587a2045d6"
@@ -223,6 +414,15 @@
     "@babel/helper-wrap-function" "^7.14.5"
     "@babel/types" "^7.14.5"
 
+"@babel/helper-remap-async-to-generator@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.5.tgz#e706646dc4018942acb4b29f7e185bc246d65ac3"
+  integrity sha512-X+aAJldyxrOmN9v3FKp+Hu1NO69VWgYgDGq6YDykwRPzxs5f2N+X988CBXS7EQahDU+Vpet5QYMqLk+nsp+Qxw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.0"
+    "@babel/helper-wrap-function" "^7.16.5"
+    "@babel/types" "^7.16.0"
+
 "@babel/helper-replace-supers@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz#0ecc0b03c41cd567b4024ea016134c28414abb94"
@@ -233,6 +433,17 @@
     "@babel/traverse" "^7.14.5"
     "@babel/types" "^7.14.5"
 
+"@babel/helper-replace-supers@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.5.tgz#96d3988bd0ab0a2d22c88c6198c3d3234ca25326"
+  integrity sha512-ao3seGVa/FZCMCCNDuBcqnBFSbdr8N2EW35mzojx3TwfIbdPmNK+JV6+2d5bR0Z71W5ocLnQp9en/cTF7pBJiQ==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.16.5"
+    "@babel/helper-member-expression-to-functions" "^7.16.5"
+    "@babel/helper-optimise-call-expression" "^7.16.0"
+    "@babel/traverse" "^7.16.5"
+    "@babel/types" "^7.16.0"
+
 "@babel/helper-simple-access@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz#66ea85cf53ba0b4e588ba77fc813f53abcaa41c4"
@@ -240,6 +451,13 @@
   dependencies:
     "@babel/types" "^7.14.5"
 
+"@babel/helper-simple-access@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517"
+  integrity sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
 "@babel/helper-skip-transparent-expression-wrappers@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz#96f486ac050ca9f44b009fbe5b7d394cab3a0ee4"
@@ -247,18 +465,37 @@
   dependencies:
     "@babel/types" "^7.14.5"
 
-"@babel/helper-split-export-declaration@^7.12.13", "@babel/helper-split-export-declaration@^7.14.5":
+"@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09"
+  integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-split-export-declaration@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a"
   integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==
   dependencies:
     "@babel/types" "^7.14.5"
 
-"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.14.5":
+"@babel/helper-split-export-declaration@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438"
+  integrity sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-validator-identifier@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz#d0f0e277c512e0c938277faa85a3968c9a44c0e8"
   integrity sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==
 
+"@babel/helper-validator-identifier@^7.15.7":
+  version "7.15.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
+  integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
+
 "@babel/helper-validator-option@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
@@ -274,6 +511,16 @@
     "@babel/traverse" "^7.14.5"
     "@babel/types" "^7.14.5"
 
+"@babel/helper-wrap-function@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.5.tgz#0158fca6f6d0889c3fee8a6ed6e5e07b9b54e41f"
+  integrity sha512-2J2pmLBqUqVdJw78U0KPNdeE2qeuIyKoG4mKV7wAq3mc4jJG282UgjZw4ZYDnqiWQuS3Y3IYdF/AQ6CpyBV3VA==
+  dependencies:
+    "@babel/helper-function-name" "^7.16.0"
+    "@babel/template" "^7.16.0"
+    "@babel/traverse" "^7.16.5"
+    "@babel/types" "^7.16.0"
+
 "@babel/helpers@^7.14.6":
   version "7.14.6"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.6.tgz#5b58306b95f1b47e2a0199434fa8658fa6c21635"
@@ -283,7 +530,16 @@
     "@babel/traverse" "^7.14.5"
     "@babel/types" "^7.14.5"
 
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5":
+"@babel/helpers@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.5.tgz#29a052d4b827846dd76ece16f565b9634c554ebd"
+  integrity sha512-TLgi6Lh71vvMZGEkFuIxzaPsyeYCHQ5jJOOX1f0xXn0uciFuE8cEk0wyBquMcCxBXZ5BJhE2aUB7pnWTD150Tw==
+  dependencies:
+    "@babel/template" "^7.16.0"
+    "@babel/traverse" "^7.16.5"
+    "@babel/types" "^7.16.0"
+
+"@babel/highlight@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9"
   integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==
@@ -292,16 +548,37 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@7.12.16":
-  version "7.12.16"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.16.tgz#cc31257419d2c3189d394081635703f549fc1ed4"
-  integrity sha512-c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw==
+"@babel/highlight@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a"
+  integrity sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.15.7"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/parser@7.16.4":
+  version "7.16.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.4.tgz#d5f92f57cf2c74ffe9b37981c0e72fee7311372e"
+  integrity sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.6", "@babel/parser@^7.12.13", "@babel/parser@^7.14.5", "@babel/parser@^7.14.6", "@babel/parser@^7.14.7", "@babel/parser@^7.3.2":
+"@babel/parser@^7.1.6", "@babel/parser@^7.14.5", "@babel/parser@^7.14.6", "@babel/parser@^7.14.7", "@babel/parser@^7.3.2":
   version "7.14.7"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.7.tgz#6099720c8839ca865a2637e6c85852ead0bdb595"
   integrity sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA==
 
+"@babel/parser@^7.14.0", "@babel/parser@^7.16.0", "@babel/parser@^7.16.3", "@babel/parser@^7.16.5":
+  version "7.16.6"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.6.tgz#8f194828193e8fa79166f34a4b4e52f3e769a314"
+  integrity sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ==
+
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.2":
+  version "7.16.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2.tgz#2977fca9b212db153c195674e57cfab807733183"
+  integrity sha512-h37CvpLSf8gb2lIJ2CgC3t+EjFbi0t8qS7LCS1xcJIlEXE4czlofwaW7W1HA8zpgOCzI9C1nmoqNR1zWkk0pQg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz#4b467302e1548ed3b1be43beae2cc9cf45e0bb7e"
@@ -311,6 +588,15 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
     "@babel/plugin-proposal-optional-chaining" "^7.14.5"
 
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0.tgz#358972eaab006f5eb0826183b0c93cbcaf13e1e2"
+  integrity sha512-4tcFwwicpWTrpl9qjf7UsoosaArgImF85AxqCRZlgc3IQDvkUHjJpruXAL58Wmj+T6fypWTC/BakfEkwIL/pwA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/plugin-proposal-optional-chaining" "^7.16.0"
+
 "@babel/plugin-proposal-async-generator-functions@^7.14.7":
   version "7.14.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz#784a48c3d8ed073f65adcf30b57bcbf6c8119ace"
@@ -320,6 +606,15 @@
     "@babel/helper-remap-async-to-generator" "^7.14.5"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
+"@babel/plugin-proposal-async-generator-functions@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.5.tgz#fd3bd7e0d98404a3d4cbca15a72d533f8c9a2f67"
+  integrity sha512-C/FX+3HNLV6sz7AqbTQqEo1L9/kfrKjxcVtgyBCmvIgOjvuBVUWooDoi7trsLxOzCEo5FccjRvKHkfDsJFZlfA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-remap-async-to-generator" "^7.16.5"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+
 "@babel/plugin-proposal-class-properties@^7.0.0", "@babel/plugin-proposal-class-properties@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz#40d1ee140c5b1e31a350f4f5eed945096559b42e"
@@ -328,6 +623,14 @@
     "@babel/helper-create-class-features-plugin" "^7.14.5"
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-proposal-class-properties@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.5.tgz#3269f44b89122110f6339806e05d43d84106468a"
+  integrity sha512-pJD3HjgRv83s5dv1sTnDbZOaTjghKEz8KUn1Kbh2eAIRhGuyQ1XSeI4xVXU3UlIEVA3DAyIdxqT1eRn7Wcn55A==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-proposal-class-static-block@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz#158e9e10d449c3849ef3ecde94a03d9f1841b681"
@@ -337,13 +640,14 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-proposal-do-expressions@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-do-expressions/-/plugin-proposal-do-expressions-7.14.5.tgz#a15e0b262a98f732d81581b1bb5f52cee1e7eb07"
-  integrity sha512-i40m/CLe5WBGYMZL/SC3xtjJ/B0i+XblaonSsinumgfNIqmBOf4LEcZJXijoQeQbQVl55PyM0siWSWWJ9lV7cA==
+"@babel/plugin-proposal-class-static-block@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.5.tgz#df58ab015a7d3b0963aafc8f20792dcd834952a9"
+  integrity sha512-EEFzuLZcm/rNJ8Q5krK+FRKdVkd6FjfzT9tuSZql9sQn64K0hHA2KLJ0DqVot9/iV6+SsuadC5yI39zWnm+nmQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/plugin-syntax-do-expressions" "^7.14.5"
+    "@babel/helper-create-class-features-plugin" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
 "@babel/plugin-proposal-dynamic-import@^7.14.5":
   version "7.14.5"
@@ -353,6 +657,14 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
+"@babel/plugin-proposal-dynamic-import@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.5.tgz#2e0d19d5702db4dcb9bc846200ca02f2e9d60e9e"
+  integrity sha512-P05/SJZTTvHz79LNYTF8ff5xXge0kk5sIIWAypcWgX4BTRUgyHc8wRxJ/Hk+mU0KXldgOOslKaeqnhthcDJCJQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+
 "@babel/plugin-proposal-export-namespace-from@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz#dbad244310ce6ccd083072167d8cea83a52faf76"
@@ -361,6 +673,14 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
+"@babel/plugin-proposal-export-namespace-from@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.5.tgz#3b4dd28378d1da2fea33e97b9f25d1c2f5bf1ac9"
+  integrity sha512-i+sltzEShH1vsVydvNaTRsgvq2vZsfyrd7K7vPLUU/KgS0D5yZMe6uipM0+izminnkKrEfdUnz7CxMRb6oHZWw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
 "@babel/plugin-proposal-json-strings@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz#38de60db362e83a3d8c944ac858ddf9f0c2239eb"
@@ -369,6 +689,14 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
+"@babel/plugin-proposal-json-strings@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.5.tgz#1e726930fca139caab6b084d232a9270d9d16f9c"
+  integrity sha512-QQJueTFa0y9E4qHANqIvMsuxM/qcLQmKttBACtPCQzGUEizsXDACGonlPiSwynHfOa3vNw0FPMVvQzbuXwh4SQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+
 "@babel/plugin-proposal-logical-assignment-operators@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz#6e6229c2a99b02ab2915f82571e0cc646a40c738"
@@ -377,6 +705,14 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
+"@babel/plugin-proposal-logical-assignment-operators@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.5.tgz#df1f2e4b5a0ec07abf061d2c18e53abc237d3ef5"
+  integrity sha512-xqibl7ISO2vjuQM+MzR3rkd0zfNWltk7n9QhaD8ghMmMceVguYrNDt7MikRyj4J4v3QehpnrU8RYLnC7z/gZLA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
 "@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz#ee38589ce00e2cc59b299ec3ea406fcd3a0fdaf6"
@@ -385,6 +721,14 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.5.tgz#652555bfeeeee2d2104058c6225dc6f75e2d0f07"
+  integrity sha512-YwMsTp/oOviSBhrjwi0vzCUycseCYwoXnLiXIL3YNjHSMBHicGTz7GjVU/IGgz4DtOEXBdCNG72pvCX22ehfqg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+
 "@babel/plugin-proposal-numeric-separator@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz#83631bf33d9a51df184c2102a069ac0c58c05f18"
@@ -393,6 +737,14 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
+"@babel/plugin-proposal-numeric-separator@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.5.tgz#edcb6379b6cf4570be64c45965d8da7a2debf039"
+  integrity sha512-DvB9l/TcsCRvsIV9v4jxR/jVP45cslTVC0PMVHvaJhhNuhn2Y1SOhCSFlPK777qLB5wb8rVDaNoqMTyOqtY5Iw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+
 "@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.14.7":
   version "7.14.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz#5920a2b3df7f7901df0205974c0641b13fd9d363"
@@ -404,6 +756,17 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-transform-parameters" "^7.14.5"
 
+"@babel/plugin-proposal-object-rest-spread@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.5.tgz#f30f80dacf7bc1404bf67f99c8d9c01665e830ad"
+  integrity sha512-UEd6KpChoyPhCoE840KRHOlGhEZFutdPDMGj+0I56yuTTOaT51GzmnEl/0uT41fB/vD2nT+Pci2KjezyE3HmUw==
+  dependencies:
+    "@babel/compat-data" "^7.16.4"
+    "@babel/helper-compilation-targets" "^7.16.3"
+    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.16.5"
+
 "@babel/plugin-proposal-optional-catch-binding@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz#939dd6eddeff3a67fdf7b3f044b5347262598c3c"
@@ -412,6 +775,14 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
+"@babel/plugin-proposal-optional-catch-binding@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.5.tgz#1a5405765cf589a11a33a1fd75b2baef7d48b74e"
+  integrity sha512-ihCMxY1Iljmx4bWy/PIMJGXN4NS4oUj1MKynwO07kiKms23pNvIn1DMB92DNB2R0EA882sw0VXIelYGdtF7xEQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+
 "@babel/plugin-proposal-optional-chaining@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz#fa83651e60a360e3f13797eef00b8d519695b603"
@@ -421,6 +792,15 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
+"@babel/plugin-proposal-optional-chaining@^7.16.0", "@babel/plugin-proposal-optional-chaining@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.5.tgz#a5fa61056194d5059366c0009cb9a9e66ed75c1f"
+  integrity sha512-kzdHgnaXRonttiTfKYnSVafbWngPPr2qKw9BWYBESl91W54e+9R5pP70LtWxV56g0f05f/SQrwHYkfvbwcdQ/A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
 "@babel/plugin-proposal-private-methods@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz#37446495996b2945f30f5be5b60d5e2aa4f5792d"
@@ -429,6 +809,14 @@
     "@babel/helper-create-class-features-plugin" "^7.14.5"
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-proposal-private-methods@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.5.tgz#2086f7d78c1b0c712d49b5c3fbc2d1ca21a7ee12"
+  integrity sha512-+yFMO4BGT3sgzXo+lrq7orX5mAZt57DwUK6seqII6AcJnJOIhBJ8pzKH47/ql/d426uQ7YhN8DpUFirQzqYSUA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-proposal-private-property-in-object@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz#9f65a4d0493a940b4c01f8aa9d3f1894a587f636"
@@ -439,6 +827,16 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
+"@babel/plugin-proposal-private-property-in-object@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.5.tgz#a42d4b56005db3d405b12841309dbca647e7a21b"
+  integrity sha512-+YGh5Wbw0NH3y/E5YMu6ci5qTDmAEVNoZ3I54aB6nVEOZ5BQ7QJlwKq5pYVucQilMByGn/bvX0af+uNaPRCabA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.0"
+    "@babel/helper-create-class-features-plugin" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+
 "@babel/plugin-proposal-unicode-property-regex@^7.14.5", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz#0f95ee0e757a5d647f378daa0eca7e93faa8bbe8"
@@ -447,6 +845,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.14.5"
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-proposal-unicode-property-regex@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.5.tgz#35fe753afa7c572f322bd068ff3377bde0f37080"
+  integrity sha512-s5sKtlKQyFSatt781HQwv1hoM5BQ9qRH30r+dK56OLDsHmV74mzwJNX7R1yMuE7VZKG5O6q/gmOGSAO6ikTudg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
@@ -468,13 +874,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-do-expressions@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-do-expressions/-/plugin-syntax-do-expressions-7.14.5.tgz#d32be33bb0ea7c16cf2265f097864c363690954a"
-  integrity sha512-IpVyxRlfFCU2emBiq2OxUX10PD6FoGZ30yWwGt1qdkIPUDhAodG5Il1LStODgATndKRhQgqT21ksqA5fd39AwA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
@@ -510,6 +909,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-syntax-jsx@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.5.tgz#bf255d252f78bc8b77a17cadc37d1aa5b8ed4394"
+  integrity sha512-42OGssv9NPk4QHKVgIHlzeLgPOW5rGgfV5jzG90AhcXXIv6hu/eqj63w4VgvRxdvZY3AlYeDgPiSJ3BqAd1Y6Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
@@ -566,12 +972,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz#b82c6ce471b165b5ce420cf92914d6fb46225716"
-  integrity sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==
+"@babel/plugin-syntax-typescript@^7.16.0":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.5.tgz#f47a33e4eee38554f00fb6b2f894fa1f5649b0b3"
+  integrity sha512-/d4//lZ1Vqb4mZ5xTep3dDK888j7BGM/iKqBmndBaoYAFPlPKrGU608VVBz5JeyAb6YQDjRu1UKqj86UhwWVgw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.5"
 
 "@babel/plugin-transform-arrow-functions@^7.0.0", "@babel/plugin-transform-arrow-functions@^7.14.5":
   version "7.14.5"
@@ -580,6 +986,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-transform-arrow-functions@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.5.tgz#04c18944dd55397b521d9d7511e791acea7acf2d"
+  integrity sha512-8bTHiiZyMOyfZFULjsCnYOWG059FVMes0iljEHSfARhNgFfpsqE92OrCffv3veSw9rwMkYcFe9bj0ZoXU2IGtQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-transform-async-to-generator@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz#72c789084d8f2094acb945633943ef8443d39e67"
@@ -589,6 +1002,15 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/helper-remap-async-to-generator" "^7.14.5"
 
+"@babel/plugin-transform-async-to-generator@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.5.tgz#89c9b501e65bb14c4579a6ce9563f859de9b34e4"
+  integrity sha512-TMXgfioJnkXU+XRoj7P2ED7rUm5jbnDWwlCuFVTpQboMfbSya5WrmubNBAMlk7KXvywpo8rd8WuYZkis1o2H8w==
+  dependencies:
+    "@babel/helper-module-imports" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-remap-async-to-generator" "^7.16.5"
+
 "@babel/plugin-transform-block-scoped-functions@^7.0.0", "@babel/plugin-transform-block-scoped-functions@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz#e48641d999d4bc157a67ef336aeb54bc44fd3ad4"
@@ -596,6 +1018,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-transform-block-scoped-functions@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.5.tgz#af087494e1c387574260b7ee9b58cdb5a4e9b0b0"
+  integrity sha512-BxmIyKLjUGksJ99+hJyL/HIxLIGnLKtw772zYDER7UuycDZ+Xvzs98ZQw6NGgM2ss4/hlFAaGiZmMNKvValEjw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-transform-block-scoping@^7.0.0", "@babel/plugin-transform-block-scoping@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz#8cc63e61e50f42e078e6f09be775a75f23ef9939"
@@ -603,6 +1032,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-transform-block-scoping@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.5.tgz#b91f254fe53e210eabe4dd0c40f71c0ed253c5e7"
+  integrity sha512-JxjSPNZSiOtmxjX7PBRBeRJTUKTyJ607YUYeT0QJCNdsedOe+/rXITjP08eG8xUpsLfPirgzdCFN+h0w6RI+pQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-transform-classes@^7.0.0", "@babel/plugin-transform-classes@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.5.tgz#0e98e82097b38550b03b483f9b51a78de0acb2cf"
@@ -616,6 +1052,20 @@
     "@babel/helper-split-export-declaration" "^7.14.5"
     globals "^11.1.0"
 
+"@babel/plugin-transform-classes@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.5.tgz#6acf2ec7adb50fb2f3194dcd2909dbd056dcf216"
+  integrity sha512-DzJ1vYf/7TaCYy57J3SJ9rV+JEuvmlnvvyvYKFbk5u46oQbBvuB9/0w+YsVsxkOv8zVWKpDmUoj4T5ILHoXevA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.0"
+    "@babel/helper-environment-visitor" "^7.16.5"
+    "@babel/helper-function-name" "^7.16.0"
+    "@babel/helper-optimise-call-expression" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-replace-supers" "^7.16.5"
+    "@babel/helper-split-export-declaration" "^7.16.0"
+    globals "^11.1.0"
+
 "@babel/plugin-transform-computed-properties@^7.0.0", "@babel/plugin-transform-computed-properties@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz#1b9d78987420d11223d41195461cc43b974b204f"
@@ -623,6 +1073,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-transform-computed-properties@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.5.tgz#2af91ebf0cceccfcc701281ada7cfba40a9b322a"
+  integrity sha512-n1+O7xtU5lSLraRzX88CNcpl7vtGdPakKzww74bVwpAIRgz9JVLJJpOLb0uYqcOaXVM0TL6X0RVeIJGD2CnCkg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-transform-destructuring@^7.0.0", "@babel/plugin-transform-destructuring@^7.14.7":
   version "7.14.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz#0ad58ed37e23e22084d109f185260835e5557576"
@@ -630,6 +1087,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-transform-destructuring@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.5.tgz#89ebc87499ac4a81b897af53bb5d3eed261bd568"
+  integrity sha512-GuRVAsjq+c9YPK6NeTkRLWyQskDC099XkBSVO+6QzbnOnH2d/4mBVXYStaPrZD3dFRfg00I6BFJ9Atsjfs8mlg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-transform-dotall-regex@^7.14.5", "@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz#2f6bf76e46bdf8043b4e7e16cf24532629ba0c7a"
@@ -638,6 +1102,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.14.5"
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-transform-dotall-regex@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.5.tgz#b40739c00b6686820653536d6d143e311de67936"
+  integrity sha512-iQiEMt8Q4/5aRGHpGVK2Zc7a6mx7qEAO7qehgSug3SDImnuMzgmm/wtJALXaz25zUj1PmnNHtShjFgk4PDx4nw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-transform-duplicate-keys@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz#365a4844881bdf1501e3a9f0270e7f0f91177954"
@@ -645,6 +1117,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-transform-duplicate-keys@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.5.tgz#2450f2742325412b746d7d005227f5e8973b512a"
+  integrity sha512-81tijpDg2a6I1Yhj4aWY1l3O1J4Cg/Pd7LfvuaH2VVInAkXtzibz9+zSPdUM1WvuUi128ksstAP0hM5w48vQgg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-transform-exponentiation-operator@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz#5154b8dd6a3dfe6d90923d61724bd3deeb90b493"
@@ -653,6 +1132,14 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.14.5"
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-transform-exponentiation-operator@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.5.tgz#36e261fa1ab643cfaf30eeab38e00ed1a76081e2"
+  integrity sha512-12rba2HwemQPa7BLIKCzm1pT2/RuQHtSFHdNl41cFiC6oi4tcrp7gjB07pxQvFpcADojQywSjblQth6gJyE6CA==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-transform-flow-strip-types@^7.0.0":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.14.5.tgz#0dc9c1d11dcdc873417903d6df4bed019ef0f85e"
@@ -668,6 +1155,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-transform-for-of@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.5.tgz#9b544059c6ca11d565457c0ff1f08e13ce225261"
+  integrity sha512-+DpCAJFPAvViR17PIMi9x2AE34dll5wNlXO43wagAX2YcRGgEVHCNFC4azG85b4YyyFarvkc/iD5NPrz4Oneqw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-transform-function-name@^7.0.0", "@babel/plugin-transform-function-name@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz#e81c65ecb900746d7f31802f6bed1f52d915d6f2"
@@ -676,6 +1170,14 @@
     "@babel/helper-function-name" "^7.14.5"
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-transform-function-name@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.5.tgz#6896ebb6a5538a75d6a4086a277752f655a7bd15"
+  integrity sha512-Fuec/KPSpVLbGo6z1RPw4EE1X+z9gZk1uQmnYy7v4xr4TO9p41v1AoUuXEtyqAI7H+xNJYSICzRqZBhDEkd3kQ==
+  dependencies:
+    "@babel/helper-function-name" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-transform-literals@^7.0.0", "@babel/plugin-transform-literals@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz#41d06c7ff5d4d09e3cf4587bd3ecf3930c730f78"
@@ -683,6 +1185,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-transform-literals@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.5.tgz#af392b90e3edb2bd6dc316844cbfd6b9e009d320"
+  integrity sha512-B1j9C/IfvshnPcklsc93AVLTrNVa69iSqztylZH6qnmiAsDDOmmjEYqOm3Ts2lGSgTSywnBNiqC949VdD0/gfw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-transform-member-expression-literals@^7.0.0", "@babel/plugin-transform-member-expression-literals@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz#b39cd5212a2bf235a617d320ec2b48bcc091b8a7"
@@ -690,6 +1199,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-transform-member-expression-literals@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.5.tgz#4bd6ecdc11932361631097b779ca5c7570146dd5"
+  integrity sha512-d57i3vPHWgIde/9Y8W/xSFUndhvhZN5Wu2TjRrN1MVz5KzdUihKnfDVlfP1U7mS5DNj/WHHhaE4/tTi4hIyHwQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-transform-modules-amd@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz#4fd9ce7e3411cb8b83848480b7041d83004858f7"
@@ -699,6 +1215,15 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     babel-plugin-dynamic-import-node "^2.3.3"
 
+"@babel/plugin-transform-modules-amd@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.5.tgz#92c0a3e83f642cb7e75fada9ab497c12c2616527"
+  integrity sha512-oHI15S/hdJuSCfnwIz+4lm6wu/wBn7oJ8+QrkzPPwSFGXk8kgdI/AIKcbR/XnD1nQVMg/i6eNaXpszbGuwYDRQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.16.5"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
 "@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz#7aaee0ea98283de94da98b28f8c35701429dad97"
@@ -709,6 +1234,16 @@
     "@babel/helper-simple-access" "^7.14.5"
     babel-plugin-dynamic-import-node "^2.3.3"
 
+"@babel/plugin-transform-modules-commonjs@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.5.tgz#4ee03b089536f076b2773196529d27c32b9d7bde"
+  integrity sha512-ABhUkxvoQyqhCWyb8xXtfwqNMJD7tx+irIRnUh6lmyFud7Jln1WzONXKlax1fg/ey178EXbs4bSGNd6PngO+SQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-simple-access" "^7.16.0"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
 "@babel/plugin-transform-modules-systemjs@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz#c75342ef8b30dcde4295d3401aae24e65638ed29"
@@ -720,6 +1255,17 @@
     "@babel/helper-validator-identifier" "^7.14.5"
     babel-plugin-dynamic-import-node "^2.3.3"
 
+"@babel/plugin-transform-modules-systemjs@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.5.tgz#07078ba2e3cc94fbdd06836e355c246e98ad006b"
+  integrity sha512-53gmLdScNN28XpjEVIm7LbWnD/b/TpbwKbLk6KV4KqC9WyU6rq1jnNmVG6UgAdQZVVGZVoik3DqHNxk4/EvrjA==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.16.0"
+    "@babel/helper-module-transforms" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-validator-identifier" "^7.15.7"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
 "@babel/plugin-transform-modules-umd@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz#fb662dfee697cce274a7cda525190a79096aa6e0"
@@ -728,6 +1274,14 @@
     "@babel/helper-module-transforms" "^7.14.5"
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-transform-modules-umd@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.5.tgz#caa9c53d636fb4e3c99fd35a4c9ba5e5cd7e002e"
+  integrity sha512-qTFnpxHMoenNHkS3VoWRdwrcJ3FhX567GvDA3hRZKF0Dj8Fmg0UzySZp3AP2mShl/bzcywb/UWAMQIjA1bhXvw==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.16.5"
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-transform-named-capturing-groups-regex@^7.14.7":
   version "7.14.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.7.tgz#60c06892acf9df231e256c24464bfecb0908fd4e"
@@ -735,6 +1289,13 @@
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.14.5"
 
+"@babel/plugin-transform-named-capturing-groups-regex@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.5.tgz#4afd8cdee377ce3568f4e8a9ee67539b69886a3c"
+  integrity sha512-/wqGDgvFUeKELW6ex6QB7dLVRkd5ehjw34tpXu1nhKC0sFfmaLabIswnpf8JgDyV2NeDmZiwoOb0rAmxciNfjA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.16.0"
+
 "@babel/plugin-transform-new-target@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz#31bdae8b925dc84076ebfcd2a9940143aed7dbf8"
@@ -742,6 +1303,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-transform-new-target@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.5.tgz#759ea9d6fbbc20796056a5d89d13977626384416"
+  integrity sha512-ZaIrnXF08ZC8jnKR4/5g7YakGVL6go6V9ql6Jl3ecO8PQaQqFE74CuM384kezju7Z9nGCCA20BqZaR1tJ/WvHg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-transform-object-super@^7.0.0", "@babel/plugin-transform-object-super@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz#d0b5faeac9e98597a161a9cf78c527ed934cdc45"
@@ -750,6 +1318,14 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/helper-replace-supers" "^7.14.5"
 
+"@babel/plugin-transform-object-super@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.5.tgz#8ccd9a1bcd3e7732ff8aa1702d067d8cd70ce380"
+  integrity sha512-tded+yZEXuxt9Jdtkc1RraW1zMF/GalVxaVVxh41IYwirdRgyAxxxCKZ9XB7LxZqmsjfjALxupNE1MIz9KH+Zg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-replace-supers" "^7.16.5"
+
 "@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz#49662e86a1f3ddccac6363a7dfb1ff0a158afeb3"
@@ -757,6 +1333,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-transform-parameters@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.5.tgz#4fc74b18a89638bd90aeec44a11793ecbe031dde"
+  integrity sha512-B3O6AL5oPop1jAVg8CV+haeUte9oFuY85zu0jwnRNZZi3tVAbJriu5tag/oaO2kGaQM/7q7aGPBlTI5/sr9enA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-transform-property-literals@^7.0.0", "@babel/plugin-transform-property-literals@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz#0ddbaa1f83db3606f1cdf4846fa1dfb473458b34"
@@ -764,36 +1347,42 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-react-constant-elements@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.14.5.tgz#41790d856f7c5cec82d2bcf5d0e5064d682522ed"
-  integrity sha512-NBqLEx1GxllIOXJInJAQbrnwwYJsV3WaMHIcOwD8rhYS0AabTWn7kHdHgPgu5RmHLU0q4DMxhAMu8ue/KampgQ==
+"@babel/plugin-transform-property-literals@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.5.tgz#58f1465a7202a2bb2e6b003905212dd7a79abe3f"
+  integrity sha512-+IRcVW71VdF9pEH/2R/Apab4a19LVvdVsr/gEeotH00vSDVlKD+XgfSIw+cgGWsjDB/ziqGv/pGoQZBIiQVXHg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.5"
+
+"@babel/plugin-transform-react-constant-elements@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.16.5.tgz#4b01ea6b14bd4e55ca92bb2d6c28dd9957118924"
+  integrity sha512-fdc1s5npHMZ9A+w9bYbrZu4499WyYPVaTTsRO8bU0GJcMuK4ejIX4lyjnpvi+YGLK/EhFQxWszqylO0vaMciFw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
 
-"@babel/plugin-transform-react-display-name@^7.0.0", "@babel/plugin-transform-react-display-name@^7.14.5":
+"@babel/plugin-transform-react-display-name@^7.0.0":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.5.tgz#baa92d15c4570411301a85a74c13534873885b65"
   integrity sha512-07aqY1ChoPgIxsuDviptRpVkWCSbXWmzQqcgy65C6YSFOfPFvb/DX3bBRHh7pCd/PMEEYHYWUTSVkCbkVainYQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-react-inline-elements@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-inline-elements/-/plugin-transform-react-inline-elements-7.14.5.tgz#5e2c8ad96612f1a86484b291df5216cc6a6cffb6"
-  integrity sha512-RsdXYEbicGlg9WBvanlndPqCxrG9hV86lPjObbsTzA5hkrfScoECP5NWEJFUrtE/NVFu81OcPu6pQVVQtOX20Q==
+"@babel/plugin-transform-react-display-name@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.5.tgz#d5e910327d7931fb9f8f9b6c6999473ceae5a286"
+  integrity sha512-dHYCOnzSsXFz8UcdNQIHGvg94qPL/teF7CCiCEMRxmA1G2p5Mq4JnKVowCDxYfiQ9D7RstaAp9kwaSI+sXbnhw==
   dependencies:
-    "@babel/helper-builder-react-jsx" "^7.14.5"
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.5"
 
-"@babel/plugin-transform-react-jsx-development@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.14.5.tgz#1a6c73e2f7ed2c42eebc3d2ad60b0c7494fcb9af"
-  integrity sha512-rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ==
+"@babel/plugin-transform-react-jsx-development@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.5.tgz#87da9204c275ffb57f45d192a1120cf104bc1e86"
+  integrity sha512-uQSLacMZSGLCxOw20dzo1dmLlKkd+DsayoV54q3MHXhbqgPzoiGerZQgNPl/Ro8/OcXV2ugfnkx+rxdS0sN5Uw==
   dependencies:
-    "@babel/plugin-transform-react-jsx" "^7.14.5"
+    "@babel/plugin-transform-react-jsx" "^7.16.5"
 
-"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.14.5":
+"@babel/plugin-transform-react-jsx@^7.0.0":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.5.tgz#39749f0ee1efd8a1bd729152cf5f78f1d247a44a"
   integrity sha512-7RylxNeDnxc1OleDm0F5Q/BSL+whYRbOAR+bwgCxIr0L32v7UFh/pz1DLMZideAUxKT6eMoS2zQH6fyODLEi8Q==
@@ -804,13 +1393,24 @@
     "@babel/plugin-syntax-jsx" "^7.14.5"
     "@babel/types" "^7.14.5"
 
-"@babel/plugin-transform-react-pure-annotations@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.14.5.tgz#18de612b84021e3a9802cbc212c9d9f46d0d11fc"
-  integrity sha512-3X4HpBJimNxW4rhUy/SONPyNQHp5YRr0HhJdT2OH1BRp0of7u3Dkirc7x9FRJMKMqTBI079VZ1hzv7Ouuz///g==
+"@babel/plugin-transform-react-jsx@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.5.tgz#5298aedc5f81e02b1cb702e597e8d6a346675765"
+  integrity sha512-+arLIz1d7kmwX0fKxTxbnoeG85ONSnLpvdODa4P3pc1sS7CV1hfmtYWufkW/oYsPnkDrEeQFxhUWcFnrXW7jQQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.14.5"
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-annotate-as-pure" "^7.16.0"
+    "@babel/helper-module-imports" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/plugin-syntax-jsx" "^7.16.5"
+    "@babel/types" "^7.16.0"
+
+"@babel/plugin-transform-react-pure-annotations@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.5.tgz#6535d0fe67c7a3a26c5105f92c8cbcbe844cd94b"
+  integrity sha512-0nYU30hCxnCVCbRjSy9ahlhWZ2Sn6khbY4FqR91W+2RbSqkWEbVu2gXh45EqNy4Bq7sRU+H4i0/6YKwOSzh16A==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.16.5"
 
 "@babel/plugin-transform-regenerator@^7.14.5":
   version "7.14.5"
@@ -819,6 +1419,13 @@
   dependencies:
     regenerator-transform "^0.14.2"
 
+"@babel/plugin-transform-regenerator@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.5.tgz#704cc6d8dd3dd4758267621ab7b36375238cef13"
+  integrity sha512-2z+it2eVWU8TtQQRauvGUqZwLy4+7rTfo6wO4npr+fvvN1SW30ZF3O/ZRCNmTuu4F5MIP8OJhXAhRV5QMJOuYg==
+  dependencies:
+    regenerator-transform "^0.14.2"
+
 "@babel/plugin-transform-reserved-words@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz#c44589b661cfdbef8d4300dcc7469dffa92f8304"
@@ -826,16 +1433,23 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-runtime@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.5.tgz#30491dad49c6059f8f8fa5ee8896a0089e987523"
-  integrity sha512-fPMBhh1AV8ZyneiCIA+wYYUH1arzlXR1UMcApjvchDhfKxhy2r2lReJv8uHEyihi4IFIGlr1Pdx7S5fkESDQsg==
+"@babel/plugin-transform-reserved-words@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.5.tgz#db95e98799675e193dc2b47d3e72a7c0651d0c30"
+  integrity sha512-aIB16u8lNcf7drkhXJRoggOxSTUAuihTSTfAcpynowGJOZiGf+Yvi7RuTwFzVYSYPmWyARsPqUGoZWWWxLiknw==
   dependencies:
-    "@babel/helper-module-imports" "^7.14.5"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    babel-plugin-polyfill-corejs2 "^0.2.2"
-    babel-plugin-polyfill-corejs3 "^0.2.2"
-    babel-plugin-polyfill-regenerator "^0.2.2"
+    "@babel/helper-plugin-utils" "^7.16.5"
+
+"@babel/plugin-transform-runtime@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.5.tgz#0cc3f01d69f299d5a42cd9ec43b92ea7a777b8db"
+  integrity sha512-gxpfS8XQWDbQ8oP5NcmpXxtEgCJkbO+W9VhZlOhr0xPyVaRjAQPOv7ZDj9fg0d5s9+NiVvMCE6gbkEkcsxwGRw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.16.5"
+    babel-plugin-polyfill-corejs2 "^0.3.0"
+    babel-plugin-polyfill-corejs3 "^0.4.0"
+    babel-plugin-polyfill-regenerator "^0.3.0"
     semver "^6.3.0"
 
 "@babel/plugin-transform-shorthand-properties@^7.0.0", "@babel/plugin-transform-shorthand-properties@^7.14.5":
@@ -845,6 +1459,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-transform-shorthand-properties@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.5.tgz#ccb60b1a23b799f5b9a14d97c5bc81025ffd96d7"
+  integrity sha512-ZbuWVcY+MAXJuuW7qDoCwoxDUNClfZxoo7/4swVbOW1s/qYLOMHlm9YRWMsxMFuLs44eXsv4op1vAaBaBaDMVg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-transform-spread@^7.0.0", "@babel/plugin-transform-spread@^7.14.6":
   version "7.14.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz#6bd40e57fe7de94aa904851963b5616652f73144"
@@ -853,6 +1474,14 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
 
+"@babel/plugin-transform-spread@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.5.tgz#912b06cff482c233025d3e69cf56d3e8fa166c29"
+  integrity sha512-5d6l/cnG7Lw4tGHEoga4xSkYp1euP7LAtrah1h1PgJ3JY7yNsjybsxQAnVK4JbtReZ/8z6ASVmd3QhYYKLaKZw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+
 "@babel/plugin-transform-sticky-regex@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz#5b617542675e8b7761294381f3c28c633f40aeb9"
@@ -860,6 +1489,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-transform-sticky-regex@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.5.tgz#593579bb2b5a8adfbe02cb43823275d9098f75f9"
+  integrity sha512-usYsuO1ID2LXxzuUxifgWtJemP7wL2uZtyrTVM4PKqsmJycdS4U4mGovL5xXkfUheds10Dd2PjoQLXw6zCsCbg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-transform-template-literals@^7.0.0", "@babel/plugin-transform-template-literals@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz#a5f2bc233937d8453885dc736bdd8d9ffabf3d93"
@@ -867,6 +1503,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-transform-template-literals@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.5.tgz#343651385fd9923f5aa2275ca352c5d9183e1773"
+  integrity sha512-gnyKy9RyFhkovex4BjKWL3BVYzUDG6zC0gba7VMLbQoDuqMfJ1SDXs8k/XK41Mmt1Hyp4qNAvGFb9hKzdCqBRQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-transform-typeof-symbol@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz#39af2739e989a2bd291bf6b53f16981423d457d4"
@@ -874,14 +1517,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-typescript@^7.14.5":
-  version "7.14.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.6.tgz#6e9c2d98da2507ebe0a883b100cde3c7279df36c"
-  integrity sha512-XlTdBq7Awr4FYIzqhmYY80WN0V0azF74DMPyFqVHBvf81ZUgc4X7ZOpx6O8eLDK6iM5cCQzeyJw0ynTaefixRA==
+"@babel/plugin-transform-typeof-symbol@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.5.tgz#a1d1bf2c71573fe30965d0e4cd6a3291202e20ed"
+  integrity sha512-ldxCkW180qbrvyCVDzAUZqB0TAeF8W/vGJoRcaf75awm6By+PxfJKvuqVAnq8N9wz5Xa6mSpM19OfVKKVmGHSQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.14.6"
+    "@babel/helper-plugin-utils" "^7.16.5"
+
+"@babel/plugin-transform-typescript@^7.16.1":
+  version "7.16.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.1.tgz#cc0670b2822b0338355bc1b3d2246a42b8166409"
+  integrity sha512-NO4XoryBng06jjw/qWEU2LhcLJr1tWkhpMam/H4eas/CDKMX/b2/Ylb6EI256Y7+FVPCawwSM1rrJNOpDiz+Lg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.16.0"
     "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/plugin-syntax-typescript" "^7.14.5"
+    "@babel/plugin-syntax-typescript" "^7.16.0"
 
 "@babel/plugin-transform-unicode-escapes@^7.14.5":
   version "7.14.5"
@@ -890,6 +1540,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-transform-unicode-escapes@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.5.tgz#80507c225af49b4f4ee647e2a0ce53d2eeff9e85"
+  integrity sha512-shiCBHTIIChGLdyojsKQjoAyB8MBwat25lKM7MJjbe1hE0bgIppD+LX9afr41lLHOhqceqeWl4FkLp+Bgn9o1Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
+
 "@babel/plugin-transform-unicode-regex@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz#4cd09b6c8425dd81255c7ceb3fb1836e7414382e"
@@ -898,7 +1555,15 @@
     "@babel/helper-create-regexp-features-plugin" "^7.14.5"
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.13.10":
+"@babel/plugin-transform-unicode-regex@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.5.tgz#ac84d6a1def947d71ffb832426aa53b83d7ed49e"
+  integrity sha512-GTJ4IW012tiPEMMubd7sD07iU9O/LOo8Q/oU4xNhcaq0Xn8+6TcUQaHtC8YxySo1T+ErQ8RaWogIEeFhKGNPzw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.16.5"
+
+"@babel/preset-env@^7.11.0":
   version "7.14.7"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.7.tgz#5c70b22d4c2d893b03d8c886a5c17422502b932a"
   integrity sha512-itOGqCKLsSUl0Y+1nSfhbuuOlTs0MJk2Iv7iSH+XT/mR8U1zRLO7NjWlYXB47yhK4J/7j+HYty/EhFZDYKa/VA==
@@ -977,6 +1642,86 @@
     core-js-compat "^3.15.0"
     semver "^6.3.0"
 
+"@babel/preset-env@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.5.tgz#2e94d922f4a890979af04ffeb6a6b4e44ba90847"
+  integrity sha512-MiJJW5pwsktG61NDxpZ4oJ1CKxM1ncam9bzRtx9g40/WkLRkxFP6mhpkYV0/DxcciqoiHicx291+eUQrXb/SfQ==
+  dependencies:
+    "@babel/compat-data" "^7.16.4"
+    "@babel/helper-compilation-targets" "^7.16.3"
+    "@babel/helper-plugin-utils" "^7.16.5"
+    "@babel/helper-validator-option" "^7.14.5"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.2"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.0"
+    "@babel/plugin-proposal-async-generator-functions" "^7.16.5"
+    "@babel/plugin-proposal-class-properties" "^7.16.5"
+    "@babel/plugin-proposal-class-static-block" "^7.16.5"
+    "@babel/plugin-proposal-dynamic-import" "^7.16.5"
+    "@babel/plugin-proposal-export-namespace-from" "^7.16.5"
+    "@babel/plugin-proposal-json-strings" "^7.16.5"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.16.5"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.5"
+    "@babel/plugin-proposal-numeric-separator" "^7.16.5"
+    "@babel/plugin-proposal-object-rest-spread" "^7.16.5"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.16.5"
+    "@babel/plugin-proposal-optional-chaining" "^7.16.5"
+    "@babel/plugin-proposal-private-methods" "^7.16.5"
+    "@babel/plugin-proposal-private-property-in-object" "^7.16.5"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.16.5"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+    "@babel/plugin-syntax-top-level-await" "^7.14.5"
+    "@babel/plugin-transform-arrow-functions" "^7.16.5"
+    "@babel/plugin-transform-async-to-generator" "^7.16.5"
+    "@babel/plugin-transform-block-scoped-functions" "^7.16.5"
+    "@babel/plugin-transform-block-scoping" "^7.16.5"
+    "@babel/plugin-transform-classes" "^7.16.5"
+    "@babel/plugin-transform-computed-properties" "^7.16.5"
+    "@babel/plugin-transform-destructuring" "^7.16.5"
+    "@babel/plugin-transform-dotall-regex" "^7.16.5"
+    "@babel/plugin-transform-duplicate-keys" "^7.16.5"
+    "@babel/plugin-transform-exponentiation-operator" "^7.16.5"
+    "@babel/plugin-transform-for-of" "^7.16.5"
+    "@babel/plugin-transform-function-name" "^7.16.5"
+    "@babel/plugin-transform-literals" "^7.16.5"
+    "@babel/plugin-transform-member-expression-literals" "^7.16.5"
+    "@babel/plugin-transform-modules-amd" "^7.16.5"
+    "@babel/plugin-transform-modules-commonjs" "^7.16.5"
+    "@babel/plugin-transform-modules-systemjs" "^7.16.5"
+    "@babel/plugin-transform-modules-umd" "^7.16.5"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.5"
+    "@babel/plugin-transform-new-target" "^7.16.5"
+    "@babel/plugin-transform-object-super" "^7.16.5"
+    "@babel/plugin-transform-parameters" "^7.16.5"
+    "@babel/plugin-transform-property-literals" "^7.16.5"
+    "@babel/plugin-transform-regenerator" "^7.16.5"
+    "@babel/plugin-transform-reserved-words" "^7.16.5"
+    "@babel/plugin-transform-shorthand-properties" "^7.16.5"
+    "@babel/plugin-transform-spread" "^7.16.5"
+    "@babel/plugin-transform-sticky-regex" "^7.16.5"
+    "@babel/plugin-transform-template-literals" "^7.16.5"
+    "@babel/plugin-transform-typeof-symbol" "^7.16.5"
+    "@babel/plugin-transform-unicode-escapes" "^7.16.5"
+    "@babel/plugin-transform-unicode-regex" "^7.16.5"
+    "@babel/preset-modules" "^0.1.5"
+    "@babel/types" "^7.16.0"
+    babel-plugin-polyfill-corejs2 "^0.3.0"
+    babel-plugin-polyfill-corejs3 "^0.4.0"
+    babel-plugin-polyfill-regenerator "^0.3.0"
+    core-js-compat "^3.19.1"
+    semver "^6.3.0"
+
 "@babel/preset-modules@^0.1.4":
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
@@ -988,26 +1733,37 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/preset-react@^7.12.13":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.14.5.tgz#0fbb769513f899c2c56f3a882fa79673c2d4ab3c"
-  integrity sha512-XFxBkjyObLvBaAvkx1Ie95Iaq4S/GUEIrejyrntQ/VCMKUYvKLoyKxOBzJ2kjA3b6rC9/KL6KXfDC2GqvLiNqQ==
+"@babel/preset-modules@^0.1.5":
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
+  integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+    "@babel/plugin-transform-dotall-regex" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    esutils "^2.0.2"
+
+"@babel/preset-react@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.5.tgz#09df3b7a6522cb3e6682dc89b4dfebb97d22031b"
+  integrity sha512-3kzUOQeaxY/2vhPDS7CX/KGEGu/1bOYGvdRDJ2U5yjEz5o5jmIeTPLoiQBPGjfhPascLuW5OlMiPzwOOuB6txg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.5"
     "@babel/helper-validator-option" "^7.14.5"
-    "@babel/plugin-transform-react-display-name" "^7.14.5"
-    "@babel/plugin-transform-react-jsx" "^7.14.5"
-    "@babel/plugin-transform-react-jsx-development" "^7.14.5"
-    "@babel/plugin-transform-react-pure-annotations" "^7.14.5"
+    "@babel/plugin-transform-react-display-name" "^7.16.5"
+    "@babel/plugin-transform-react-jsx" "^7.16.5"
+    "@babel/plugin-transform-react-jsx-development" "^7.16.5"
+    "@babel/plugin-transform-react-pure-annotations" "^7.16.5"
 
-"@babel/preset-typescript@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.14.5.tgz#aa98de119cf9852b79511f19e7f44a2d379bcce0"
-  integrity sha512-u4zO6CdbRKbS9TypMqrlGH7sd2TAJppZwn3c/ZRLeO/wGsbddxgbPDUZVNrie3JWYLQ9vpineKlsrWFvO6Pwkw==
+"@babel/preset-typescript@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.16.5.tgz#b86a5b0ae739ba741347d2f58c52f52e63cf1ba1"
+  integrity sha512-lmAWRoJ9iOSvs3DqOndQpj8XqXkzaiQs50VG/zESiI9D3eoZhGriU675xNCr0UwvsuXrhMAGvyk1w+EVWF3u8Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.5"
     "@babel/helper-validator-option" "^7.14.5"
-    "@babel/plugin-transform-typescript" "^7.14.5"
+    "@babel/plugin-transform-typescript" "^7.16.1"
 
 "@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.11.2":
   version "7.14.7"
@@ -1017,13 +1773,34 @@
     core-js-pure "^3.15.0"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.14.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.7", "@babel/runtime@^7.8.4":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.14.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.7", "@babel/runtime@^7.8.4":
   version "7.14.6"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.6.tgz#535203bc0892efc7dec60bdc27b2ecf6e409062d"
   integrity sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==
   dependencies:
     regenerator-runtime "^0.13.4"
 
+"@babel/runtime@^7.1.2":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.5.tgz#7f3e34bf8bdbbadf03fbb7b1ea0d929569c9487a"
+  integrity sha512-TXWihFIS3Pyv5hzR7j6ihmeLkZfrXGxAr5UfSl8CHf+6q/wpiYDkUau0czckpYG8QmnCIuPpdLtuA9VmuGGyMA==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/runtime@^7.16.3":
+  version "7.16.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5"
+  integrity sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/runtime@^7.16.5", "@babel/runtime@^7.7.6":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.7.tgz#03ff99f64106588c9c403c6ecb8c3bafbbdff1fa"
+  integrity sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/template@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"
@@ -1033,22 +1810,31 @@
     "@babel/parser" "^7.14.5"
     "@babel/types" "^7.14.5"
 
-"@babel/traverse@7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.13.tgz#689f0e4b4c08587ad26622832632735fb8c4e0c0"
-  integrity sha512-3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.12.13"
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/parser" "^7.12.13"
-    "@babel/types" "^7.12.13"
+"@babel/template@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6"
+  integrity sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==
+  dependencies:
+    "@babel/code-frame" "^7.16.0"
+    "@babel/parser" "^7.16.0"
+    "@babel/types" "^7.16.0"
+
+"@babel/traverse@7.16.3":
+  version "7.16.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.3.tgz#f63e8a938cc1b780f66d9ed3c54f532ca2d14787"
+  integrity sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag==
+  dependencies:
+    "@babel/code-frame" "^7.16.0"
+    "@babel/generator" "^7.16.0"
+    "@babel/helper-function-name" "^7.16.0"
+    "@babel/helper-hoist-variables" "^7.16.0"
+    "@babel/helper-split-export-declaration" "^7.16.0"
+    "@babel/parser" "^7.16.3"
+    "@babel/types" "^7.16.0"
     debug "^4.1.0"
     globals "^11.1.0"
-    lodash "^4.17.19"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.6", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5":
+"@babel/traverse@^7.1.6", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5":
   version "7.14.7"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.7.tgz#64007c9774cfdc3abd23b0780bc18a3ce3631753"
   integrity sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ==
@@ -1063,16 +1849,31 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.13.tgz#8be1aa8f2c876da11a9cf650c0ecf656913ad611"
-  integrity sha512-oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ==
+"@babel/traverse@^7.14.0", "@babel/traverse@^7.16.5":
+  version "7.16.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.5.tgz#d7d400a8229c714a59b87624fc67b0f1fbd4b2b3"
+  integrity sha512-FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ==
+  dependencies:
+    "@babel/code-frame" "^7.16.0"
+    "@babel/generator" "^7.16.5"
+    "@babel/helper-environment-visitor" "^7.16.5"
+    "@babel/helper-function-name" "^7.16.0"
+    "@babel/helper-hoist-variables" "^7.16.0"
+    "@babel/helper-split-export-declaration" "^7.16.0"
+    "@babel/parser" "^7.16.5"
+    "@babel/types" "^7.16.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/types@7.16.0", "@babel/types@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba"
+  integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
-    lodash "^4.17.19"
+    "@babel/helper-validator-identifier" "^7.15.7"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.1.6", "@babel/types@^7.12.13", "@babel/types@^7.14.5", "@babel/types@^7.4.4":
+"@babel/types@^7.0.0", "@babel/types@^7.1.6", "@babel/types@^7.14.5", "@babel/types@^7.4.4":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.5.tgz#3bb997ba829a2104cedb20689c4a5b8121d383ff"
   integrity sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg==
@@ -1080,11 +1881,6 @@
     "@babel/helper-validator-identifier" "^7.14.5"
     to-fast-properties "^2.0.0"
 
-"@csstools/convert-colors@^1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
-  integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
-
 "@csstools/normalize.css@*":
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-11.0.1.tgz#31ffab0bff5f4f09551e059359bc1977ac83a974"
@@ -1102,35 +1898,35 @@
   dependencies:
     tslib "^2.0.0"
 
-"@dnd-kit/core@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@dnd-kit/core/-/core-3.1.1.tgz#c5ad6665931f5a51e74226220e58ac7514f3faf0"
-  integrity sha512-18YY5+1lTqJbGSg6JBSa/fjAOTUYAysFrQ5Ti8oppEPHFacQbC+owM51y2z2KN0LkDHBfGZKw2sFT7++ttwfpA==
+"@dnd-kit/core@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@dnd-kit/core/-/core-4.0.3.tgz#49abe3c9b481b6e07909df1781e88b20f3dd25b0"
+  integrity sha512-uT1uHZxKx3iEkupmLfknMIvbykMJSetoXXmra6sGGvtWy+OMKrWm3axH2c90+JC/q6qaeKs2znd3Qs8GLnCa5Q==
   dependencies:
     "@dnd-kit/accessibility" "^3.0.0"
-    "@dnd-kit/utilities" "^2.0.0"
+    "@dnd-kit/utilities" "^3.0.1"
     tslib "^2.0.0"
 
-"@dnd-kit/modifiers@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@dnd-kit/modifiers/-/modifiers-3.0.0.tgz#d6fc85f31d634d856edbc23f623d63890f5a8616"
-  integrity sha512-CmskqOcW4Bw61JP1Lqkx7cRzv9xQS/5seI+Q5eKhx+mS/MA5IrX2jgtMxvQ6PKYDnx2v/uHxqLNVhlvumtBTSQ==
+"@dnd-kit/modifiers@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@dnd-kit/modifiers/-/modifiers-4.0.0.tgz#d1577b806b2319f14a1a0a155f270e672cfca636"
+  integrity sha512-4OkNTamneH9u3YMJqG6yJ6cwFoEd/4yY9BF39TgmDh9vyMK2MoPZFVAV0vOEm193ZYsPczq3Af5tJFtJhR9jJQ==
   dependencies:
-    "@dnd-kit/utilities" "^2.0.0"
+    "@dnd-kit/utilities" "^3.0.0"
     tslib "^2.0.0"
 
-"@dnd-kit/sortable@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@dnd-kit/sortable/-/sortable-4.0.0.tgz#81dd2b014a16527cf89602dc40060d9ee4dad352"
-  integrity sha512-teYVFy6mQG/u6F6CaGxAkzPfiNJvguFzWfJ/zonYQRxfANHX6QJ6GziMG9KON/Ae9Q2ODJP8vib+guWJrDXeGg==
+"@dnd-kit/sortable@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@dnd-kit/sortable/-/sortable-5.1.0.tgz#f30ec12c95ca5aa90e2e4d9ef3dbe16b3eb26d69"
+  integrity sha512-CPyiUHbTrSYzhddfgdeoX0ERg/dEyVKIWx9+4O6uqpoppo84SXCBHVFiFBRVpQ9wtpsXs7prtUAnAUTcvFQTZg==
   dependencies:
-    "@dnd-kit/utilities" "^2.0.0"
+    "@dnd-kit/utilities" "^3.0.0"
     tslib "^2.0.0"
 
-"@dnd-kit/utilities@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@dnd-kit/utilities/-/utilities-2.0.0.tgz#a8462dff65c6f606ecbe95273c7e263b14a1ab97"
-  integrity sha512-bjs49yMNzMM+BYRsBUhTqhTk6HEvhuY3leFt6Em6NaYGgygaMbtGbbXof/UXBv7rqyyi0OkmBBnrCCcxqS2t/g==
+"@dnd-kit/utilities@^3.0.0", "@dnd-kit/utilities@^3.0.1", "@dnd-kit/utilities@^3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@dnd-kit/utilities/-/utilities-3.0.2.tgz#24fd796491a85c2904e9c97f1fdb42005df645f2"
+  integrity sha512-J4WpZXKbLJzBkuALqsIy5KmQr6PQk86ixoPKoixzjWj1+XGE5KdA2vga9Vf43EB/Ewpng+E5SmXVLfTs7ukbhw==
   dependencies:
     tslib "^2.0.0"
 
@@ -1246,38 +2042,38 @@
     ts-node "^9"
     tslib "^2"
 
-"@eslint/eslintrc@^0.4.2":
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz#f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179"
-  integrity sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==
+"@eslint/eslintrc@^1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.5.tgz#33f1b838dbf1f923bfa517e008362b78ddbbf318"
+  integrity sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==
   dependencies:
     ajv "^6.12.4"
-    debug "^4.1.1"
-    espree "^7.3.0"
+    debug "^4.3.2"
+    espree "^9.2.0"
     globals "^13.9.0"
     ignore "^4.0.6"
     import-fresh "^3.2.1"
-    js-yaml "^3.13.1"
+    js-yaml "^4.1.0"
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@graphql-codegen/cli@^1.21.7":
-  version "1.21.7"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/cli/-/cli-1.21.7.tgz#ac90afdf0d166bc725c60d2269482e65af1c7848"
-  integrity sha512-6EOS3hMDFeLPO6OopASvXbQirhrHjFd0Qb4iGLnueW/WIETk8mOsbyfqlBnm6uehW6bUjdLDu25MUjo+4rkOvA==
-  dependencies:
-    "@graphql-codegen/core" "1.17.10"
-    "@graphql-codegen/plugin-helpers" "^1.18.8"
-    "@graphql-tools/apollo-engine-loader" "^6.2.5"
-    "@graphql-tools/code-file-loader" "^6.3.1"
-    "@graphql-tools/git-loader" "^6.2.6"
-    "@graphql-tools/github-loader" "^6.2.5"
-    "@graphql-tools/graphql-file-loader" "^6.2.7"
-    "@graphql-tools/json-file-loader" "^6.2.6"
-    "@graphql-tools/load" "^6.2.8"
-    "@graphql-tools/prisma-loader" "^6.3.0"
-    "@graphql-tools/url-loader" "^6.10.1"
-    "@graphql-tools/utils" "^7.9.1"
+"@graphql-codegen/cli@^2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/cli/-/cli-2.3.0.tgz#07ef86eea6d42c56f9c7118871115d779dee49f3"
+  integrity sha512-5pgrcnBFeOJbDGfZwhnytwMqpwFDrmdaAgD6HYywT9Fggsrx2yWSkVrxoAjEcbDMFLhxzjxECwfJYklm967AKA==
+  dependencies:
+    "@graphql-codegen/core" "2.3.0"
+    "@graphql-codegen/plugin-helpers" "^2.3.0"
+    "@graphql-tools/apollo-engine-loader" "^7.0.5"
+    "@graphql-tools/code-file-loader" "^7.0.6"
+    "@graphql-tools/git-loader" "^7.0.5"
+    "@graphql-tools/github-loader" "^7.0.5"
+    "@graphql-tools/graphql-file-loader" "^7.0.5"
+    "@graphql-tools/json-file-loader" "^7.1.2"
+    "@graphql-tools/load" "^7.3.0"
+    "@graphql-tools/prisma-loader" "^7.0.6"
+    "@graphql-tools/url-loader" "^7.0.11"
+    "@graphql-tools/utils" "^8.1.1"
     ansi-escapes "^4.3.1"
     chalk "^4.1.0"
     change-case-all "1.0.14"
@@ -1288,7 +2084,8 @@
     dependency-graph "^0.11.0"
     detect-indent "^6.0.0"
     glob "^7.1.6"
-    graphql-config "^3.3.0"
+    globby "^11.0.4"
+    graphql-config "^4.1.0"
     inquirer "^7.3.3"
     is-glob "^4.0.1"
     json-to-pretty-yaml "^1.2.2"
@@ -1306,65 +2103,76 @@
     yaml "^1.10.0"
     yargs "^17.0.0"
 
-"@graphql-codegen/core@1.17.10":
-  version "1.17.10"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/core/-/core-1.17.10.tgz#3b85b5bc2e84fcacbd25fced5af47a4bb2d7a8bd"
-  integrity sha512-RA3umgVDs/RI/+ztHh+H4GfJxrJUfWJQqoAkMfX4qPTVO5qsy3R4vPudE0oP8w+kFbL8dFsRfAAPUZxI4jV/hQ==
+"@graphql-codegen/core@2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/core/-/core-2.3.0.tgz#0903b315e90a1b7575b5684401c8d0c26256ff4f"
+  integrity sha512-dGBd5DEOB1hJ3Ddd6l+3U4cbDZ91e0BIJQGTyZPLRYyffqJP+Y7IEYm4lMaBNY9m6qVXeGq+fgCS2SXlXEzJoA==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^1.18.7"
-    "@graphql-tools/merge" "^6.2.14"
-    "@graphql-tools/utils" "^7.9.1"
-    tslib "~2.2.0"
+    "@graphql-codegen/plugin-helpers" "^2.3.0"
+    "@graphql-tools/schema" "^8.1.2"
+    "@graphql-tools/utils" "^8.1.1"
+    tslib "~2.3.0"
 
-"@graphql-codegen/introspection@^1.18.2":
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/introspection/-/introspection-1.18.2.tgz#1b4b5e23cc59c2828a073caccf66c556885d5dd6"
-  integrity sha512-1SuhWu6nbOIOSZdQLNmHHVN8VsTavUQUD6OWjUuR3Bjpw9jfykNYXPpGGQxdCa5hmiWvn2JQU+qtgtERzz4+rg==
+"@graphql-codegen/introspection@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/introspection/-/introspection-2.1.0.tgz#07c7a321e69a053fbd2d80ec8d7a32b3ce28ca30"
+  integrity sha512-seGWZaX9vUd1RxSs+MBa9WOU+PCl8DNeScsOmxQP4qRC6rCle7y8pjeLKGduRarucIbO+nzY9jqaTAiMUogo8g==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^1.18.5"
-    tslib "~2.2.0"
+    "@graphql-codegen/plugin-helpers" "^2.1.0"
+    tslib "~2.3.0"
 
-"@graphql-codegen/plugin-helpers@^1.18.5", "@graphql-codegen/plugin-helpers@^1.18.7", "@graphql-codegen/plugin-helpers@^1.18.8":
-  version "1.18.8"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-1.18.8.tgz#39aac745b9e22e28c781cc07cf74836896a3a905"
-  integrity sha512-mb4I9j9lMGqvGggYuZ0CV+Hme08nar68xkpPbAVotg/ZBmlhZIok/HqW2BcMQi7Rj+Il5HQMeQ1wQ1M7sv/TlQ==
+"@graphql-codegen/plugin-helpers@^2.1.0", "@graphql-codegen/plugin-helpers@^2.3.0":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-2.3.1.tgz#b66c742d3209a85bc2f72f9e2eceb6b08fc81f85"
+  integrity sha512-rWH7igcjYqZ6rqNFTb4Wyp31863fRmmVpsRN8VHzBCltrepOO97jwTwB93aAw+T6Dm8aZto3QFfDIC79u8wA2Q==
   dependencies:
-    "@graphql-tools/utils" "^7.9.1"
+    "@graphql-tools/utils" "^8.5.2"
+    change-case-all "1.0.14"
     common-tags "1.8.0"
     import-from "4.0.0"
     lodash "~4.17.0"
     tslib "~2.3.0"
 
-"@graphql-codegen/typescript-operations@^1.18.4":
-  version "1.18.4"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-1.18.4.tgz#78149af3a949b760a7af7526593f2b7269a6841a"
-  integrity sha512-bxeRaCCwu2rUXkRj6WwMVazlMignemeUJfDjrK7d4z9o9tyjlrGWnbsjeZI7M17GNCARU9Vkr6XH94wEyooSsA==
+"@graphql-codegen/schema-ast@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/schema-ast/-/schema-ast-2.4.0.tgz#a41fdf2bacf88ec8318c78fdf03f19e620e5534a"
+  integrity sha512-xsLd4mF0H3mPp7Z2PHZ2Sv1KKIb/FOORqhDc9XHCnHJJ/h9nmaleKSTxTGzSUfIAQ1aCNzVilcaUwlenK+MMBQ==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^1.18.8"
-    "@graphql-codegen/typescript" "^1.23.0"
-    "@graphql-codegen/visitor-plugin-common" "1.22.0"
+    "@graphql-codegen/plugin-helpers" "^2.3.0"
+    "@graphql-tools/utils" "^8.1.1"
+    tslib "~2.3.0"
+
+"@graphql-codegen/typescript-operations@^2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-2.2.1.tgz#78a4ca25fa7d82ef259791f7b8a5a146f9e89830"
+  integrity sha512-f1Y/qhn6yCGGVE8cAL2xzFryW4UQjnYS+vHYEKvr2X0DeMoMhp/5QCJ07HGWbjHYGBy4L5FhND/6lCbsJxG2EQ==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^2.3.0"
+    "@graphql-codegen/typescript" "^2.4.1"
+    "@graphql-codegen/visitor-plugin-common" "2.5.1"
     auto-bind "~4.0.0"
     tslib "~2.3.0"
 
-"@graphql-codegen/typescript@^1.23.0":
-  version "1.23.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-1.23.0.tgz#48a5372bcbe81a442c71c1bb032c312c6586a59a"
-  integrity sha512-ZfFgk5mGfuOy4kEpy+dcuvJMphigMfJ4AkiP1qWmWFufDW3Sg2yayTSNmzeFdcXMrWGgfNW2dKtuuTmbmQhS5g==
+"@graphql-codegen/typescript@^2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-2.4.1.tgz#96d427993982edc27c50c4cd8841bdbbe26689d9"
+  integrity sha512-1+dZ0Qar+jGISXTdm7nWpv7Agt5uRj3q2GtpTJ92aA/AEHh+MTharanYcExEbdqNQm7b859MusI+Jo1Hlqsfmw==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^1.18.8"
-    "@graphql-codegen/visitor-plugin-common" "1.22.0"
+    "@graphql-codegen/plugin-helpers" "^2.3.0"
+    "@graphql-codegen/schema-ast" "^2.4.0"
+    "@graphql-codegen/visitor-plugin-common" "2.5.1"
     auto-bind "~4.0.0"
     tslib "~2.3.0"
 
-"@graphql-codegen/visitor-plugin-common@1.22.0":
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-1.22.0.tgz#75fc8b580143bccbec411eb92d5fef715ed22e42"
-  integrity sha512-2afJGb6d8iuZl9KizYsexPwraEKO1lAvt5eVHNM5Xew4vwz/AUHeqDR2uOeQgVV+27EzjjzSDd47IEdH0dLC2w==
+"@graphql-codegen/visitor-plugin-common@2.5.1":
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-2.5.1.tgz#4401bc401ff501b9b9330d1681e64685f519b327"
+  integrity sha512-hLnVB6u7qB1rIh9oJnGVWQmrUsXw3nEUMF+LGdf4b5qEWh5f9HSzciWMS6M47h4fSqpLyW4qgk2glH/DKwFgRA==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^1.18.8"
+    "@graphql-codegen/plugin-helpers" "^2.3.0"
     "@graphql-tools/optimize" "^1.0.1"
-    "@graphql-tools/relay-operation-optimizer" "^6.3.0"
-    array.prototype.flatmap "^1.2.4"
+    "@graphql-tools/relay-operation-optimizer" "^6.3.7"
+    "@graphql-tools/utils" "^8.3.0"
     auto-bind "~4.0.0"
     change-case-all "1.0.14"
     dependency-graph "^0.11.0"
@@ -1372,14 +2180,15 @@
     parse-filepath "^1.0.2"
     tslib "~2.3.0"
 
-"@graphql-tools/apollo-engine-loader@^6.2.5":
-  version "6.2.5"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/apollo-engine-loader/-/apollo-engine-loader-6.2.5.tgz#b9e65744f522bb9f6ca50651e5622820c4f059a8"
-  integrity sha512-CE4uef6PyxtSG+7OnLklIr2BZZDgjO89ZXK47EKdY7jQy/BQD/9o+8SxPsgiBc+2NsDJH2I6P/nqoaJMOEat6g==
+"@graphql-tools/apollo-engine-loader@^7.0.5":
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/apollo-engine-loader/-/apollo-engine-loader-7.2.1.tgz#14e5d0b1032a7d882d22a7533c8969ee3fa797f2"
+  integrity sha512-Fj/A8+9SXPTXkpKqhcSq7O9WZuMdy5zynGrnMyewbCuw1kSfzgC4pJB76ILSPa5ajOcC5bBmmvXm+yVFVRgVMg==
   dependencies:
-    "@graphql-tools/utils" "^7.0.0"
-    cross-fetch "3.0.6"
-    tslib "~2.0.1"
+    "@graphql-tools/utils" "^8.5.1"
+    cross-undici-fetch "^0.0.20"
+    sync-fetch "0.3.1"
+    tslib "~2.3.0"
 
 "@graphql-tools/batch-execute@^7.1.2":
   version "7.1.2"
@@ -1391,14 +2200,26 @@
     tslib "~2.2.0"
     value-or-promise "1.0.6"
 
-"@graphql-tools/code-file-loader@^6.3.1":
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/code-file-loader/-/code-file-loader-6.3.1.tgz#42dfd4db5b968acdb453382f172ec684fa0c34ed"
-  integrity sha512-ZJimcm2ig+avgsEOWWVvAaxZrXXhiiSZyYYOJi0hk9wh5BxZcLUNKkTp6EFnZE/jmGUwuos3pIjUD3Hwi3Bwhg==
+"@graphql-tools/batch-execute@^8.3.1":
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-8.3.1.tgz#0b74c54db5ac1c5b9a273baefc034c2343ebbb74"
+  integrity sha512-63kHY8ZdoO5FoeDXYHnAak1R3ysMViMPwWC2XUblFckuVLMUPmB2ONje8rjr2CvzWBHAW8c1Zsex+U3xhKtGIA==
   dependencies:
-    "@graphql-tools/graphql-tag-pluck" "^6.5.1"
-    "@graphql-tools/utils" "^7.0.0"
-    tslib "~2.1.0"
+    "@graphql-tools/utils" "^8.5.1"
+    dataloader "2.0.0"
+    tslib "~2.3.0"
+    value-or-promise "1.0.11"
+
+"@graphql-tools/code-file-loader@^7.0.6":
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/code-file-loader/-/code-file-loader-7.2.3.tgz#b53e8809528da07911423c3a511e5fccf9121a12"
+  integrity sha512-aNVG3/VG5cUpS389rpCum+z7RY98qvPwOzd+J4LVr+f5hWQbDREnSFM+5RVTDfULujrsi7edKaGxGKp68pGmAA==
+  dependencies:
+    "@graphql-tools/graphql-tag-pluck" "^7.1.3"
+    "@graphql-tools/utils" "^8.5.1"
+    globby "^11.0.3"
+    tslib "~2.3.0"
+    unixify "^1.0.0"
 
 "@graphql-tools/delegate@^7.0.1", "@graphql-tools/delegate@^7.1.5":
   version "7.1.5"
@@ -1413,26 +2234,42 @@
     tslib "~2.2.0"
     value-or-promise "1.0.6"
 
-"@graphql-tools/git-loader@^6.2.6":
-  version "6.2.6"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/git-loader/-/git-loader-6.2.6.tgz#c2226f4b8f51f1c05c9ab2649ba32d49c68cd077"
-  integrity sha512-ooQTt2CaG47vEYPP3CPD+nbA0F+FYQXfzrB1Y1ABN9K3d3O2RK3g8qwslzZaI8VJQthvKwt0A95ZeE4XxteYfw==
+"@graphql-tools/delegate@^8.4.1", "@graphql-tools/delegate@^8.4.2":
+  version "8.4.3"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-8.4.3.tgz#ad73ed7cc3b4cad9242c6d4835a5ae0b640f7164"
+  integrity sha512-hKTJdJXJnKL0+2vpU+Kt7OHQTIXZ9mBmNBwHsYiG5WNArz/vNI7910r6TC2XMf/e7zhyyK+mXxMDBmDQkkJagA==
   dependencies:
-    "@graphql-tools/graphql-tag-pluck" "^6.2.6"
-    "@graphql-tools/utils" "^7.0.0"
-    tslib "~2.1.0"
+    "@graphql-tools/batch-execute" "^8.3.1"
+    "@graphql-tools/schema" "^8.3.1"
+    "@graphql-tools/utils" "^8.5.4"
+    dataloader "2.0.0"
+    tslib "~2.3.0"
+    value-or-promise "1.0.11"
 
-"@graphql-tools/github-loader@^6.2.5":
-  version "6.2.5"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/github-loader/-/github-loader-6.2.5.tgz#460dff6f5bbaa26957a5ea3be4f452b89cc6a44b"
-  integrity sha512-DLuQmYeNNdPo8oWus8EePxWCfCAyUXPZ/p1PWqjrX/NGPyH2ZObdqtDAfRHztljt0F/qkBHbGHCEk2TKbRZTRw==
+"@graphql-tools/git-loader@^7.0.5":
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/git-loader/-/git-loader-7.1.2.tgz#7a7b5fc366bcc9e2e14e0463ff73f1a19aafabbd"
+  integrity sha512-vIMrISQPKQgHS893b8K/pEE1InPV+7etzFhHoyQRhYkVHXP2RBkfI64Wq9bNPezF8Ss/dwIjI/keLaPp9EQDmA==
   dependencies:
-    "@graphql-tools/graphql-tag-pluck" "^6.2.6"
-    "@graphql-tools/utils" "^7.0.0"
-    cross-fetch "3.0.6"
-    tslib "~2.0.1"
+    "@graphql-tools/graphql-tag-pluck" "^7.1.3"
+    "@graphql-tools/utils" "^8.5.1"
+    is-glob "4.0.3"
+    micromatch "^4.0.4"
+    tslib "~2.3.0"
+    unixify "^1.0.0"
+
+"@graphql-tools/github-loader@^7.0.5":
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/github-loader/-/github-loader-7.2.1.tgz#53ce2bf215a0eb083ff985b213402a24f1302da2"
+  integrity sha512-vqwh2H11ZkAATDam/JqiP0CSqQRPUbjgCDxPdUu/xvST2QKyA4+uVXLBcpBRJc5kJCQjELijeRWVHSk9oN1q6g==
+  dependencies:
+    "@graphql-tools/graphql-tag-pluck" "^7.1.3"
+    "@graphql-tools/utils" "^8.5.1"
+    cross-undici-fetch "^0.0.20"
+    sync-fetch "0.3.1"
+    tslib "~2.3.0"
 
-"@graphql-tools/graphql-file-loader@^6.0.0", "@graphql-tools/graphql-file-loader@^6.2.7":
+"@graphql-tools/graphql-file-loader@^6.0.0":
   version "6.2.7"
   resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.7.tgz#d3720f2c4f4bb90eb2a03a7869a780c61945e143"
   integrity sha512-5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ==
@@ -1441,16 +2278,27 @@
     "@graphql-tools/utils" "^7.0.0"
     tslib "~2.1.0"
 
-"@graphql-tools/graphql-tag-pluck@^6.2.6", "@graphql-tools/graphql-tag-pluck@^6.5.1":
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-6.5.1.tgz#5fb227dbb1e19f4b037792b50f646f16a2d4c686"
-  integrity sha512-7qkm82iFmcpb8M6/yRgzjShtW6Qu2OlCSZp8uatA3J0eMl87TxyJoUmL3M3UMMOSundAK8GmoyNVFUrueueV5Q==
+"@graphql-tools/graphql-file-loader@^7.0.5", "@graphql-tools/graphql-file-loader@^7.3.2":
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.3.tgz#7cee2f84f08dc13fa756820b510248b857583d36"
+  integrity sha512-6kUJZiNpYKVhum9E5wfl5PyLLupEDYdH7c8l6oMrk6c7EPEVs6iSUyB7yQoWrtJccJLULBW2CRQ5IHp5JYK0mA==
   dependencies:
-    "@babel/parser" "7.12.16"
-    "@babel/traverse" "7.12.13"
-    "@babel/types" "7.12.13"
-    "@graphql-tools/utils" "^7.0.0"
-    tslib "~2.1.0"
+    "@graphql-tools/import" "^6.5.7"
+    "@graphql-tools/utils" "^8.5.1"
+    globby "^11.0.3"
+    tslib "~2.3.0"
+    unixify "^1.0.0"
+
+"@graphql-tools/graphql-tag-pluck@^7.1.3":
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-7.1.4.tgz#174b69d40988c3450d310173c5be5af894929c41"
+  integrity sha512-0V2AY68ip3YmJ9rnIwQGxXsokCeGD9FTQOeSLzpwG74U0VY6bphfaCp5KVGW+W5sGJchTj3HvnmvdmWZnEZWZA==
+  dependencies:
+    "@babel/parser" "7.16.4"
+    "@babel/traverse" "7.16.3"
+    "@babel/types" "7.16.0"
+    "@graphql-tools/utils" "^8.5.1"
+    tslib "~2.3.0"
 
 "@graphql-tools/import@^6.2.6":
   version "6.3.1"
@@ -1460,7 +2308,16 @@
     resolve-from "5.0.0"
     tslib "~2.2.0"
 
-"@graphql-tools/json-file-loader@^6.0.0", "@graphql-tools/json-file-loader@^6.2.6":
+"@graphql-tools/import@^6.5.7":
+  version "6.6.3"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/import/-/import-6.6.3.tgz#e2983d9623d4abd7a5ef2f65f7cc8ff745a1a691"
+  integrity sha512-k/QkWCZ5rPVgFw1eE4GXPXltw9/mEiJj6F6bJvFKJr1C6im8Y60pl0Pv+SByGZQGuukXE0uR16Mv4OFGSMQIaQ==
+  dependencies:
+    "@graphql-tools/utils" "8.5.5"
+    resolve-from "5.0.0"
+    tslib "~2.3.0"
+
+"@graphql-tools/json-file-loader@^6.0.0":
   version "6.2.6"
   resolved "https://registry.yarnpkg.com/@graphql-tools/json-file-loader/-/json-file-loader-6.2.6.tgz#830482cfd3721a0799cbf2fe5b09959d9332739a"
   integrity sha512-CnfwBSY5926zyb6fkDBHnlTblHnHI4hoBALFYXnrg0Ev4yWU8B04DZl/pBRUc459VNgO2x8/mxGIZj2hPJG1EA==
@@ -1468,7 +2325,17 @@
     "@graphql-tools/utils" "^7.0.0"
     tslib "~2.0.1"
 
-"@graphql-tools/load@^6.0.0", "@graphql-tools/load@^6.2.8":
+"@graphql-tools/json-file-loader@^7.1.2", "@graphql-tools/json-file-loader@^7.3.2":
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/json-file-loader/-/json-file-loader-7.3.3.tgz#45cfde77b9dc4ab6c21575305ae537d2814d237f"
+  integrity sha512-CN2Qk9rt+Gepa3rb3X/mpxYA5MIYLwZBPj2Njw6lbZ6AaxG+O1ArDCL5ACoiWiBimn1FCOM778uhRM9znd0b3Q==
+  dependencies:
+    "@graphql-tools/utils" "^8.5.1"
+    globby "^11.0.3"
+    tslib "~2.3.0"
+    unixify "^1.0.0"
+
+"@graphql-tools/load@^6.0.0":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@graphql-tools/load/-/load-6.2.8.tgz#16900fb6e75e1d075cad8f7ea439b334feb0b96a"
   integrity sha512-JpbyXOXd8fJXdBh2ta0Q4w8ia6uK5FHzrTNmcvYBvflFuWly2LDTk2abbSl81zKkzswQMEd2UIYghXELRg8eTA==
@@ -1483,7 +2350,17 @@
     unixify "1.0.0"
     valid-url "1.0.9"
 
-"@graphql-tools/merge@^6.0.0", "@graphql-tools/merge@^6.2.12", "@graphql-tools/merge@^6.2.14":
+"@graphql-tools/load@^7.3.0", "@graphql-tools/load@^7.4.1":
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/load/-/load-7.5.0.tgz#cede03b1222a01c55f5e8a85f099444cf0a98785"
+  integrity sha512-f0k12xZzxfV4BxWyvt/f8opqICXvz4WzDrVVG4udHFgUJIjhGeE67SRTWFAK/jlIp4QgaDux7L1DXQkJnmx64w==
+  dependencies:
+    "@graphql-tools/schema" "8.3.1"
+    "@graphql-tools/utils" "^8.5.5"
+    p-limit "3.1.0"
+    tslib "~2.3.0"
+
+"@graphql-tools/merge@^6.0.0", "@graphql-tools/merge@^6.2.12":
   version "6.2.14"
   resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-6.2.14.tgz#694e2a2785ba47558e5665687feddd2935e9d94e"
   integrity sha512-RWT4Td0ROJai2eR66NHejgf8UwnXJqZxXgDWDI+7hua5vNA2OW8Mf9K1Wav1ZkjWnuRp4ztNtkZGie5ISw55ow==
@@ -1492,6 +2369,14 @@
     "@graphql-tools/utils" "^7.7.0"
     tslib "~2.2.0"
 
+"@graphql-tools/merge@^8.2.1":
+  version "8.2.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.2.1.tgz#bf83aa06a0cfc6a839e52a58057a84498d0d51ff"
+  integrity sha512-Q240kcUszhXiAYudjuJgNuLgy9CryDP3wp83NOZQezfA6h3ByYKU7xI6DiKrdjyVaGpYN3ppUmdj0uf5GaXzMA==
+  dependencies:
+    "@graphql-tools/utils" "^8.5.1"
+    tslib "~2.3.0"
+
 "@graphql-tools/optimize@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@graphql-tools/optimize/-/optimize-1.0.1.tgz#9933fffc5a3c63f95102b1cb6076fb16ac7bb22d"
@@ -1499,22 +2384,21 @@
   dependencies:
     tslib "~2.0.1"
 
-"@graphql-tools/prisma-loader@^6.3.0":
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/prisma-loader/-/prisma-loader-6.3.0.tgz#c907e17751ff2b26e7c2bc75d0913ebf03f970da"
-  integrity sha512-9V3W/kzsFBmUQqOsd96V4a4k7Didz66yh/IK89B1/rrvy9rYj+ULjEqR73x9BYZ+ww9FV8yP8LasWAJwWaqqJQ==
+"@graphql-tools/prisma-loader@^7.0.6":
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/prisma-loader/-/prisma-loader-7.1.1.tgz#2a769919c97a3f7f7807668d3155c47999b0965c"
+  integrity sha512-9hVpG3BNsXAYMLPlZhSHubk6qBmiHLo/UlU0ldL100sMpqI46iBaHNhTNXZCSdd81hT+4HNqaDXNFqyKJ22OGQ==
   dependencies:
-    "@graphql-tools/url-loader" "^6.8.2"
-    "@graphql-tools/utils" "^7.0.0"
-    "@types/http-proxy-agent" "^2.0.2"
+    "@graphql-tools/url-loader" "^7.4.2"
+    "@graphql-tools/utils" "^8.5.1"
     "@types/js-yaml" "^4.0.0"
     "@types/json-stable-stringify" "^1.0.32"
     "@types/jsonwebtoken" "^8.5.0"
     chalk "^4.1.0"
     debug "^4.3.1"
-    dotenv "^8.2.0"
+    dotenv "^10.0.0"
     graphql-request "^3.3.0"
-    http-proxy-agent "^4.0.1"
+    http-proxy-agent "^5.0.0"
     https-proxy-agent "^5.0.0"
     isomorphic-fetch "^3.0.0"
     js-yaml "^4.0.0"
@@ -1523,17 +2407,27 @@
     lodash "^4.17.20"
     replaceall "^0.1.6"
     scuid "^1.1.0"
-    tslib "~2.1.0"
+    tslib "~2.3.0"
     yaml-ast-parser "^0.0.43"
 
-"@graphql-tools/relay-operation-optimizer@^6.3.0":
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-6.3.0.tgz#f8c7f6c8aa4a9cf50ab151fbc5db4f4282a79532"
-  integrity sha512-Or3UgRvkY9Fq1AAx7q38oPqFmTepLz7kp6wDHKyR0ceG7AvHv5En22R12mAeISInbhff4Rpwgf6cE8zHRu6bCw==
+"@graphql-tools/relay-operation-optimizer@^6.3.7":
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-6.4.1.tgz#28572444e2c00850c889a84472f3cc7405dc1ad8"
+  integrity sha512-2b9D5L+31sIBnvmcmIW5tfvNUV+nJFtbHpUyarTRDmFT6EZ2cXo4WZMm9XJcHQD/Z5qvMXfPHxzQ3/JUs4xI+w==
   dependencies:
-    "@graphql-tools/utils" "^7.1.0"
-    relay-compiler "10.1.0"
-    tslib "~2.0.1"
+    "@graphql-tools/utils" "^8.5.1"
+    relay-compiler "12.0.0"
+    tslib "~2.3.0"
+
+"@graphql-tools/schema@8.3.1", "@graphql-tools/schema@^8.1.2", "@graphql-tools/schema@^8.3.1":
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.3.1.tgz#1ee9da494d2da457643b3c93502b94c3c4b68c74"
+  integrity sha512-3R0AJFe715p4GwF067G5i0KCr/XIdvSfDLvTLEiTDQ8V/hwbOHEKHKWlEBHGRQwkG5lwFQlW1aOn7VnlPERnWQ==
+  dependencies:
+    "@graphql-tools/merge" "^8.2.1"
+    "@graphql-tools/utils" "^8.5.1"
+    tslib "~2.3.0"
+    value-or-promise "1.0.11"
 
 "@graphql-tools/schema@^7.0.0", "@graphql-tools/schema@^7.1.5":
   version "7.1.5"
@@ -1544,7 +2438,7 @@
     tslib "~2.2.0"
     value-or-promise "1.0.6"
 
-"@graphql-tools/url-loader@^6.0.0", "@graphql-tools/url-loader@^6.10.1", "@graphql-tools/url-loader@^6.8.2":
+"@graphql-tools/url-loader@^6.0.0":
   version "6.10.1"
   resolved "https://registry.yarnpkg.com/@graphql-tools/url-loader/-/url-loader-6.10.1.tgz#dc741e4299e0e7ddf435eba50a1f713b3e763b33"
   integrity sha512-DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw==
@@ -1569,7 +2463,39 @@
     valid-url "1.0.9"
     ws "7.4.5"
 
-"@graphql-tools/utils@^7.0.0", "@graphql-tools/utils@^7.1.0", "@graphql-tools/utils@^7.1.2", "@graphql-tools/utils@^7.5.0", "@graphql-tools/utils@^7.7.0", "@graphql-tools/utils@^7.7.1", "@graphql-tools/utils@^7.8.1", "@graphql-tools/utils@^7.9.0", "@graphql-tools/utils@^7.9.1":
+"@graphql-tools/url-loader@^7.0.11", "@graphql-tools/url-loader@^7.4.2":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/url-loader/-/url-loader-7.7.0.tgz#504f0030c75b61bca4ac07da49e8cd872c316972"
+  integrity sha512-mBBb+aJqI4E0MVEzyfi76Pi/G6lGxGTVt/tP1YtKJly7UnonNoWOtDusdL3zIVAGhGgLsNrLbGhLDbwSd6TV6A==
+  dependencies:
+    "@graphql-tools/delegate" "^8.4.1"
+    "@graphql-tools/utils" "^8.5.1"
+    "@graphql-tools/wrap" "^8.3.1"
+    "@n1ru4l/graphql-live-query" "^0.9.0"
+    "@types/websocket" "^1.0.4"
+    "@types/ws" "^8.0.0"
+    cross-undici-fetch "^0.1.4"
+    dset "^3.1.0"
+    extract-files "^11.0.0"
+    graphql-sse "^1.0.1"
+    graphql-ws "^5.4.1"
+    isomorphic-ws "^4.0.1"
+    meros "^1.1.4"
+    subscriptions-transport-ws "^0.11.0"
+    sync-fetch "^0.3.1"
+    tslib "^2.3.0"
+    valid-url "^1.0.9"
+    value-or-promise "^1.0.11"
+    ws "^8.3.0"
+
+"@graphql-tools/utils@8.5.5", "@graphql-tools/utils@^8.1.1", "@graphql-tools/utils@^8.3.0", "@graphql-tools/utils@^8.5.1", "@graphql-tools/utils@^8.5.2", "@graphql-tools/utils@^8.5.3", "@graphql-tools/utils@^8.5.4", "@graphql-tools/utils@^8.5.5":
+  version "8.5.5"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.5.5.tgz#019ddb99719feb19602afdb537c06e463df674a9"
+  integrity sha512-y7zRXWIUI73X+9/rf/0KzrNFMlpRKFfzLiwdbIeWwgLs+NV9vfUOoVkX8luXX6LwQxhSypHATMiwZGM2ro/wJA==
+  dependencies:
+    tslib "~2.3.0"
+
+"@graphql-tools/utils@^7.0.0", "@graphql-tools/utils@^7.1.2", "@graphql-tools/utils@^7.5.0", "@graphql-tools/utils@^7.7.0", "@graphql-tools/utils@^7.7.1", "@graphql-tools/utils@^7.8.1", "@graphql-tools/utils@^7.9.0":
   version "7.10.0"
   resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-7.10.0.tgz#07a4cb5d1bec1ff1dc1d47a935919ee6abd38699"
   integrity sha512-d334r6bo9mxdSqZW6zWboEnnOOFRrAPVQJ7LkU8/6grglrbcu6WhwCLzHb90E94JI3TD3ricC3YGbUqIi9Xg0w==
@@ -1589,67 +2515,40 @@
     tslib "~2.2.0"
     value-or-promise "1.0.6"
 
-"@graphql-typed-document-node/core@^3.0.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.1.0.tgz#0eee6373e11418bfe0b5638f654df7a4ca6a3950"
-  integrity sha512-wYn6r8zVZyQJ6rQaALBEln5B1pzxb9shV5Ef97kTvn6yVGrqyXVnDqnU24MXnFubR+rZjBY9NWuxX3FB2sTsjg==
-
-"@hapi/address@^2.1.2":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"
-  integrity sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==
-
-"@hapi/formula@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@hapi/formula/-/formula-1.2.0.tgz#994649c7fea1a90b91a0a1e6d983523f680e10cd"
-  integrity sha512-UFbtbGPjstz0eWHb+ga/GM3Z9EzqKXFWIbSOFURU0A/Gku0Bky4bCk9/h//K2Xr3IrCfjFNhMm4jyZ5dbCewGA==
-
-"@hapi/hoek@^8.2.4", "@hapi/hoek@^8.3.0":
-  version "8.5.1"
-  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.1.tgz#fde96064ca446dec8c55a8c2f130957b070c6e06"
-  integrity sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==
-
-"@hapi/joi@^16.1.8":
-  version "16.1.8"
-  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-16.1.8.tgz#84c1f126269489871ad4e2decc786e0adef06839"
-  integrity sha512-wAsVvTPe+FwSrsAurNt5vkg3zo+TblvC5Bb1zMVK6SJzZqw9UrJnexxR+76cpePmtUZKHAPxcQ2Bf7oVHyahhg==
+"@graphql-tools/wrap@^8.3.1":
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-8.3.2.tgz#d3bcecb7529d071e4ecc4dfc75b9566e3da79d4f"
+  integrity sha512-7DcOBFB+Dd84x9dxSm7qS4iJONMyfLnCJb8A19vGPffpu4SMJ3sFcgwibKFu5l6mMUiigKgXna2RRgWI+02bKQ==
   dependencies:
-    "@hapi/address" "^2.1.2"
-    "@hapi/formula" "^1.2.0"
-    "@hapi/hoek" "^8.2.4"
-    "@hapi/pinpoint" "^1.0.2"
-    "@hapi/topo" "^3.1.3"
-
-"@hapi/pinpoint@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@hapi/pinpoint/-/pinpoint-1.0.2.tgz#025b7a36dbbf4d35bf1acd071c26b20ef41e0d13"
-  integrity sha512-dtXC/WkZBfC5vxscazuiJ6iq4j9oNx1SHknmIr8hofarpKUZKmlUVYVIhNVzIEgK5Wrc4GMHL5lZtt1uS2flmQ==
+    "@graphql-tools/delegate" "^8.4.2"
+    "@graphql-tools/schema" "^8.3.1"
+    "@graphql-tools/utils" "^8.5.3"
+    tslib "~2.3.0"
+    value-or-promise "1.0.11"
 
-"@hapi/topo@^3.1.3":
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.6.tgz#68d935fa3eae7fdd5ab0d7f953f3205d8b2bfc29"
-  integrity sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==
-  dependencies:
-    "@hapi/hoek" "^8.3.0"
+"@graphql-typed-document-node/core@^3.0.0":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.1.1.tgz#076d78ce99822258cf813ecc1e7fa460fa74d052"
+  integrity sha512-NQ17ii0rK1b34VZonlmT2QMJFI70m0TRwbknO/ihlbatXyaktDhN/98vBiUU6kNBPljqGqyIrl2T4nY2RpFANg==
 
 "@hcaptcha/react-hcaptcha@^0.3.6":
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/@hcaptcha/react-hcaptcha/-/react-hcaptcha-0.3.6.tgz#cbbb9abdaea451a4df408bc9d476e8b17f0b63f4"
-  integrity sha512-DQ5nvGVbbhd2IednxRhCV9wiPcCmclEV7bH98yGynGCXzO5XftO/XC0a1M1kEf9Ee+CLO/u+1HM/uE/PSrC3vQ==
+  version "0.3.10"
+  resolved "https://registry.yarnpkg.com/@hcaptcha/react-hcaptcha/-/react-hcaptcha-0.3.10.tgz#42d0562dcc579c4034724b6b6da8677a0bb36148"
+  integrity sha512-lpxQGKFFPf5fzieY6Z1Hik5zGvXu6GGUnZdmjeGWB+OjzY2ucTPxfN3biPCfy18Od6YKdkkSUZUyteVLdUbigA==
 
-"@humanwhocodes/config-array@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
-  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+"@humanwhocodes/config-array@^0.9.2":
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.2.tgz#68be55c737023009dfc5fe245d51181bb6476914"
+  integrity sha512-UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA==
   dependencies:
-    "@humanwhocodes/object-schema" "^1.2.0"
+    "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
     minimatch "^3.0.4"
 
-"@humanwhocodes/object-schema@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf"
-  integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==
+"@humanwhocodes/object-schema@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
+  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
 "@iarna/toml@^2.2.5":
   version "2.2.5"
@@ -1986,7 +2885,7 @@
   resolved "https://registry.yarnpkg.com/@mapbox/geojson-normalize/-/geojson-normalize-0.0.1.tgz#1da1e6b3a7add3ad29909b30f438f60581b7cd80"
   integrity sha1-HaHms6et060pkJsw9Dj2BYG3zYA=
 
-"@mapbox/geojson-rewind@^0.5.0":
+"@mapbox/geojson-rewind@^0.5.1":
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.5.1.tgz#adbe16dc683eb40e90934c51a5e28c7bbf44f4e1"
   integrity sha512-eL7fMmfTBKjrb+VFHXCGv9Ot0zc3C0U+CwXo1IrP+EPwDczLoXv34Tgq3y+2mPSFNVUXgU42ILWJTC7145KPTA==
@@ -2018,19 +2917,19 @@
     xtend "^4.0.2"
 
 "@mapbox/mapbox-gl-supported@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-2.0.0.tgz#bb133cd91e562c006713fbc83f21e4b6f711a388"
-  integrity sha512-zu4udqYiBrKMQKwpKJ4hhPON7tz0QR/JZ3iGpHnNWFmH3Sv/ysxlICATUtGCFpsyJf2v1WpFhlzaZ3GhhKmPMA==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-2.0.1.tgz#c15367178d8bfe4765e6b47b542fe821ce259c7b"
+  integrity sha512-HP6XvfNIzfoMVfyGjBckjiAOQK9WfX0ywdLubuPMPv+Vqf5fj0uCbgBQYpiqcWZT6cbyyRnTSXDheT1ugvF6UQ==
 
 "@mapbox/point-geometry@0.1.0", "@mapbox/point-geometry@^0.1.0", "@mapbox/point-geometry@~0.1.0":
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz#8a83f9335c7860effa2eeeca254332aa0aeed8f2"
   integrity sha1-ioP5M1x4YO/6Lu7KJUMyqgru2PI=
 
-"@mapbox/tiny-sdf@^1.2.5":
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/@mapbox/tiny-sdf/-/tiny-sdf-1.2.5.tgz#424c620a96442b20402552be70a7f62a8407cc59"
-  integrity sha512-cD8A/zJlm6fdJOk6DqPUV8mcpyJkRz2x2R+/fYcWDYG3oWbG7/L7Yl/WqQ1VZCjnL9OTIMAn6c+BC5Eru4sQEw==
+"@mapbox/tiny-sdf@^2.0.2":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@mapbox/tiny-sdf/-/tiny-sdf-2.0.4.tgz#497d7153a61b7cef4638b9e9e91cd37403dead07"
+  integrity sha512-CBtL2rhZiYmdIryksp0zh4Mmx54iClYfNb0mpYeHrZnq4z84lVjre7LBWGPEjWspEn6AiF0lxC1HaZDye89m3g==
 
 "@mapbox/unitbezier@^0.0.0":
   version "0.0.0"
@@ -2054,6 +2953,11 @@
   resolved "https://registry.yarnpkg.com/@microsoft/fetch-event-source/-/fetch-event-source-2.0.1.tgz#9ceecc94b49fbaa15666e38ae8587f64acce007d"
   integrity sha512-W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA==
 
+"@n1ru4l/graphql-live-query@^0.9.0":
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/@n1ru4l/graphql-live-query/-/graphql-live-query-0.9.0.tgz#defaebdd31f625bee49e6745934f36312532b2bc"
+  integrity sha512-BTpWy1e+FxN82RnLz4x1+JcEewVdfmUhV1C6/XYD5AjS7PQp9QFF7K8bCD6gzPTr2l+prvqOyVueQhFJxB1vfg==
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -2075,16 +2979,19 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@pmmmwh/react-refresh-webpack-plugin@^0.4.3":
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.4.3.tgz#1eec460596d200c0236bf195b078a5d1df89b766"
-  integrity sha512-br5Qwvh8D2OQqSXpd1g/xqXKnK0r+Jz6qVKBbWmpUcrbGOxUrf39V5oZ1876084CGn18uMdR5uvPqBv9UqtBjQ==
+"@pmmmwh/react-refresh-webpack-plugin@^0.5.3":
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.3.tgz#b8f0e035f6df71b5c4126cb98de29f65188b9e7b"
+  integrity sha512-OoTnFb8XEYaOuMNhVDsLRnAO6MCYHNs1g6d8pBcHhDFsi1P3lPbq/IklwtbAx9cG0W4J9KswxZtwGnejrnxp+g==
   dependencies:
-    ansi-html "^0.0.7"
+    ansi-html-community "^0.0.8"
+    common-path-prefix "^3.0.0"
+    core-js-pure "^3.8.1"
     error-stack-parser "^2.0.6"
-    html-entities "^1.2.1"
-    native-url "^0.2.6"
-    schema-utils "^2.6.5"
+    find-up "^5.0.0"
+    html-entities "^2.1.0"
+    loader-utils "^2.0.0"
+    schema-utils "^3.0.0"
     source-map "^0.7.3"
 
 "@reach/router@^1.3.4":
@@ -2141,79 +3048,79 @@
   dependencies:
     any-observable "^0.3.0"
 
-"@sentry/browser@6.9.0":
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.9.0.tgz#b75ac1a6ff8fe60d451b14aea94d66f9dcd5570f"
-  integrity sha512-4JnEPcwoNs6JqeEd4wscBq+hxpotEJ0DJ4eOIsaNZIMyqEHXBHTXCk/gfrSsiZFrkHM4PgvUHOxaC0HcZ92oBA==
+"@sentry/browser@6.16.1":
+  version "6.16.1"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.16.1.tgz#4270ab0fbd1de425e339b3e7a364feb09f470a87"
+  integrity sha512-F2I5RL7RTLQF9CccMrqt73GRdK3FdqaChED3RulGQX5lH6U3exHGFxwyZxSrY4x6FedfBFYlfXWWCJXpLnFkow==
   dependencies:
-    "@sentry/core" "6.9.0"
-    "@sentry/types" "6.9.0"
-    "@sentry/utils" "6.9.0"
+    "@sentry/core" "6.16.1"
+    "@sentry/types" "6.16.1"
+    "@sentry/utils" "6.16.1"
     tslib "^1.9.3"
 
-"@sentry/core@6.9.0":
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.9.0.tgz#43b25290f3b1eb2c23f665e1c0fcbadd06d06012"
-  integrity sha512-oFX2qQcMLujCeIuCQGlhpTUIOXiU5n6V2lqDnvMXUV8gKpplBPalwdlR9bgbSi+VO8u7LjHR1IKM0RAPWgNHWw==
+"@sentry/core@6.16.1":
+  version "6.16.1"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.16.1.tgz#d9f7a75f641acaddf21b6aafa7a32e142f68f17c"
+  integrity sha512-UFI0264CPUc5cR1zJH+S2UPOANpm6dLJOnsvnIGTjsrwzR0h8Hdl6rC2R/GPq+WNbnipo9hkiIwDlqbqvIU5vw==
   dependencies:
-    "@sentry/hub" "6.9.0"
-    "@sentry/minimal" "6.9.0"
-    "@sentry/types" "6.9.0"
-    "@sentry/utils" "6.9.0"
+    "@sentry/hub" "6.16.1"
+    "@sentry/minimal" "6.16.1"
+    "@sentry/types" "6.16.1"
+    "@sentry/utils" "6.16.1"
     tslib "^1.9.3"
 
-"@sentry/hub@6.9.0":
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.9.0.tgz#21068e12769cc745825e8d122c7e81858f609708"
-  integrity sha512-5mors7ojbo7G85ZmoVPQBgFBMONAJwyZfV0LNLy14GenoaVNuxTPyvAQiJb1FYq+x6YZ3CvqGX6r74KRKQU87w==
+"@sentry/hub@6.16.1":
+  version "6.16.1"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.16.1.tgz#526e19db51f4412da8634734044c605b936a7b80"
+  integrity sha512-4PGtg6AfpqMkreTpL7ymDeQ/U1uXv03bKUuFdtsSTn/FRf9TLS4JB0KuTZCxfp1IRgAA+iFg6B784dDkT8R9eg==
   dependencies:
-    "@sentry/types" "6.9.0"
-    "@sentry/utils" "6.9.0"
+    "@sentry/types" "6.16.1"
+    "@sentry/utils" "6.16.1"
     tslib "^1.9.3"
 
-"@sentry/minimal@6.9.0":
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.9.0.tgz#e6201eb237753994be83ec33866e3fdae9a79bf3"
-  integrity sha512-GBZ6wG2Rc1wInYEl2BZTZc/t57O1Da876ifLsSPpEQAEnGWbqZWb8RLjZskH09ZIL/K4XCIDDi5ySzN8kFUWJw==
+"@sentry/minimal@6.16.1":
+  version "6.16.1"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.16.1.tgz#6a9506a92623d2ff1fc17d60989688323326772e"
+  integrity sha512-dq+mI1EQIvUM+zJtGCVgH3/B3Sbx4hKlGf2Usovm9KoqWYA+QpfVBholYDe/H2RXgO7LFEefDLvOdHDkqeJoyA==
   dependencies:
-    "@sentry/hub" "6.9.0"
-    "@sentry/types" "6.9.0"
+    "@sentry/hub" "6.16.1"
+    "@sentry/types" "6.16.1"
     tslib "^1.9.3"
 
-"@sentry/react@^6.9.0":
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/@sentry/react/-/react-6.9.0.tgz#2db02de48481f3680e21e52a0821fd28e90f8347"
-  integrity sha512-ccMhpL+YHcq171EhSHU02IYh476mBjPfK1zq+vW2fJkaigg+mEqbOHnQV0Uu3zFYHGqVg4CZKZc6v92cvbBwEg==
+"@sentry/react@^6.16.0":
+  version "6.16.1"
+  resolved "https://registry.yarnpkg.com/@sentry/react/-/react-6.16.1.tgz#d4930c4b23bcd307306a0549d20964d98caed38c"
+  integrity sha512-n8fOEKbym4kBi946q3AWXBNy1UKTmABj/hE2nAJbTWhi5IwdM7WBG6QCT2yq7oTHLuTxQrAwgKQc+A6zFTyVHg==
   dependencies:
-    "@sentry/browser" "6.9.0"
-    "@sentry/minimal" "6.9.0"
-    "@sentry/types" "6.9.0"
-    "@sentry/utils" "6.9.0"
+    "@sentry/browser" "6.16.1"
+    "@sentry/minimal" "6.16.1"
+    "@sentry/types" "6.16.1"
+    "@sentry/utils" "6.16.1"
     hoist-non-react-statics "^3.3.2"
     tslib "^1.9.3"
 
-"@sentry/tracing@^6.9.0":
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.9.0.tgz#5dff993af253ee31e62c5f84ab21b008df7d0841"
-  integrity sha512-gogVTypolhPazXr3Lue8HgzBg5Sy1cQpEp5Iq9LtECs+TlOlxJ+S+P+EIjEZ0f1AHVu706jr5cY2G2Shluli9g==
+"@sentry/tracing@^6.16.0":
+  version "6.16.1"
+  resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.16.1.tgz#32fba3e07748e9a955055afd559a65996acb7d71"
+  integrity sha512-MPSbqXX59P+OEeST+U2V/8Hu/8QjpTUxTNeNyTHWIbbchdcMMjDbXTS3etCgajZR6Ro+DHElOz5cdSxH6IBGlA==
   dependencies:
-    "@sentry/hub" "6.9.0"
-    "@sentry/minimal" "6.9.0"
-    "@sentry/types" "6.9.0"
-    "@sentry/utils" "6.9.0"
+    "@sentry/hub" "6.16.1"
+    "@sentry/minimal" "6.16.1"
+    "@sentry/types" "6.16.1"
+    "@sentry/utils" "6.16.1"
     tslib "^1.9.3"
 
-"@sentry/types@6.9.0":
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.9.0.tgz#ef1a541c4240df6a7c6f5f31d7cdddd7d92c15f1"
-  integrity sha512-v52HJqLoLapEnqS2NdVtUXPvT+aezQgNXQkp8hiQ3RUdTm5cffwBVG7wlbpE6OsOOIZxd6p1zKylFkwCypiIIA==
+"@sentry/types@6.16.1":
+  version "6.16.1"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.16.1.tgz#4917607115b30315757c2cf84f80bac5100b8ac0"
+  integrity sha512-Wh354g30UsJ5kYJbercektGX4ZMc9MHU++1NjeN2bTMnbofEcpUDWIiKeulZEY65IC1iU+1zRQQgtYO+/hgCUQ==
 
-"@sentry/utils@6.9.0":
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.9.0.tgz#6bf0bf290a6d37a27078b7c1331a06d8a7e313c5"
-  integrity sha512-PimDr6KAi4cCp5hQZ8Az2/pDcdfhTu7WAU30Dd9MZwknpHSTmD4G6QvkdrB5er6kMMnNQOC7rMo6w/Do3m6X3w==
+"@sentry/utils@6.16.1":
+  version "6.16.1"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.16.1.tgz#1b9e14c2831b6e8b816f7021b9876133bf2be008"
+  integrity sha512-7ngq/i4R8JZitJo9Sl8PDnjSbDehOxgr1vsoMmerIsyRZ651C/8B+jVkMhaAPgSdyJ0AlE3O7DKKTP1FXFw9qw==
   dependencies:
-    "@sentry/types" "6.9.0"
+    "@sentry/types" "6.16.1"
     tslib "^1.9.3"
 
 "@sindresorhus/is@^0.14.0":
@@ -2372,28 +3279,15 @@
     resolve-from "^5.0.0"
     ts-dedent "^2.0.0"
 
-"@stylelint/postcss-css-in-js@^0.37.2":
-  version "0.37.2"
-  resolved "https://registry.yarnpkg.com/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz#7e5a84ad181f4234a2480803422a47b8749af3d2"
-  integrity sha512-nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA==
-  dependencies:
-    "@babel/core" ">=7.9.0"
-
-"@stylelint/postcss-markdown@^0.36.2":
-  version "0.36.2"
-  resolved "https://registry.yarnpkg.com/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz#0a540c4692f8dcdfc13c8e352c17e7bfee2bb391"
-  integrity sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==
-  dependencies:
-    remark "^13.0.0"
-    unist-util-find-all-after "^3.0.2"
-
-"@surma/rollup-plugin-off-main-thread@^1.4.1":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-1.4.2.tgz#e6786b6af5799f82f7ab3a82e53f6182d2b91a58"
-  integrity sha512-yBMPqmd1yEJo/280PAMkychuaALyQ9Lkb5q1ck3mjJrFuEobIfhnQ4J3mbvBoISmR3SWMWV+cGB/I0lCQee79A==
+"@surma/rollup-plugin-off-main-thread@^2.2.3":
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz#ee34985952ca21558ab0d952f00298ad2190c053"
+  integrity sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==
   dependencies:
-    ejs "^2.6.1"
+    ejs "^3.1.6"
+    json5 "^2.2.0"
     magic-string "^0.25.0"
+    string.prototype.matchall "^4.0.6"
 
 "@szmarczak/http-timer@^1.1.2":
   version "1.1.2"
@@ -2402,20 +3296,28 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
-"@the-deep/deep-ui@^1.5.12":
-  version "1.5.12"
-  resolved "https://registry.yarnpkg.com/@the-deep/deep-ui/-/deep-ui-1.5.12.tgz#685db5ecaaf75cb62ab9b1ab95a4a949ece6dd1b"
-  integrity sha512-d6nCv/9giCoLtIZUUPe8doGcwIhBM8U6LTkOIx3xd9iUdhnP8gICb7d7Ka9rI71fRiBdN5Sj2QLT99Qv9zNjHg==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.11.2"
-    "@storybook/client-api" "^6.0.21"
-    "@togglecorp/fujs" "^1.9.2-beta.0"
-    "@types/react-color" "^3.0.5"
-    "@types/requestidlecallback" "^0.3.1"
-    d3-shape "^2.1.0"
+"@tanem/svg-injector@^10.1.14":
+  version "10.1.14"
+  resolved "https://registry.yarnpkg.com/@tanem/svg-injector/-/svg-injector-10.1.14.tgz#e42f5defb524551770c1a583f950d4bc89e6fd73"
+  integrity sha512-VjcuoKb2jCyx7FeOoz+p3LfH+V2HYXpPPVbTqWdHNV4R8d6DtHYNfQWPivSVcNi0cAtkLnDuEE+2c714YA2l5A==
+  dependencies:
+    "@babel/runtime" "^7.16.5"
+    content-type "^1.0.4"
+    tslib "^2.3.1"
+
+"@the-deep/deep-ui@^1.5.20":
+  version "1.5.20"
+  resolved "https://registry.yarnpkg.com/@the-deep/deep-ui/-/deep-ui-1.5.20.tgz#52da34b0e50a36c2f60d0da2a9d44d87549c9fc3"
+  integrity sha512-k66Jb1jhAiOkZx+aRUv0Z6LC8w3W8kgShnusmDAwV0dV/c4OMOyF4cHn1pN7E4gZQ1hlHR0JbDuv5DLGEMAUEg==
+  dependencies:
+    "@tanem/svg-injector" "^10.1.14"
+    "@togglecorp/fujs" "^1.9.3"
+    "@types/react-color" "^3.0.6"
+    "@types/requestidlecallback" "^0.3.4"
+    d3-shape "^3.0.1"
     react-color "^2.19.3"
-    react-icons "^4.2.0"
-    react-zoom-pan-pinch "^1.6.1"
+    react-icons "^4.3.1"
+    react-zoom-pan-pinch "^2.1.3"
     resize-observer-polyfill "^1.5.1"
 
 "@togglecorp/fujs@^1.8.0":
@@ -2439,6 +3341,11 @@
   dependencies:
     "@babel/runtime" "^7.7.7"
 
+"@togglecorp/fujs@^1.9.3":
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/@togglecorp/fujs/-/fujs-1.9.3.tgz#d795d7dedc1ae7ee81437cdec78e272f6b871c2f"
+  integrity sha512-gPoQwZ5+CbDxXrLyHhGIAHq2HNba1ifZQizpspyWO8cOuhYyCihOAlBS3fH+WewlCvPiQiOD/FkxCnNQAG3lOg==
+
 "@togglecorp/re-map@^0.1.3":
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/@togglecorp/re-map/-/re-map-0.1.3.tgz#2e2a8b13b65116bf0af484b651e58d4b0a1538f7"
@@ -2448,28 +3355,28 @@
     immer "^7.0.5"
     resize-observer-polyfill "^1.5.1"
 
-"@togglecorp/toggle-form@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@togglecorp/toggle-form/-/toggle-form-1.2.1.tgz#43145c3e61bf910916edb73fd735eb2dd5cdbef6"
-  integrity sha512-YzjbiC2+E6aZOb2T57bkhcTG7Iq03dn53Yw/Ve2k/rBY6BNLLrFJaePbfAXe5on7rO+57/RVkqpO46FTFAjfRw==
+"@togglecorp/toggle-form@^1.2.2-beta.2":
+  version "1.2.2-beta.2"
+  resolved "https://registry.yarnpkg.com/@togglecorp/toggle-form/-/toggle-form-1.2.2-beta.2.tgz#904bc7b540d4dd5e532497b64d838ded4edd32cb"
+  integrity sha512-9mK+lu7ZBruIcGE9AWmHyUIF8u1uyTzdTyRNskvSGiuymm2JkVhZeZJUy0b3uTzVkpRBbfHIP6ackAn6hYpDSw==
   dependencies:
     "@babel/runtime-corejs3" "^7.11.2"
     "@storybook/client-api" "^6.0.21"
     "@togglecorp/fujs" "^1.9.2-beta.0"
 
-"@togglecorp/toggle-request@^0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@togglecorp/toggle-request/-/toggle-request-0.0.1.tgz#ff2808ceb47897b8d53b39003fd413cb443d4dfc"
-  integrity sha512-qPrg8BkGJCkS/6SuD4gOyEneJwz//s/GROl3yH+gPc27WwOKrV9354xq1VQseNWp/DYFeN+he73mVAhQ7esv/w==
+"@togglecorp/toggle-request@^0.0.2":
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/@togglecorp/toggle-request/-/toggle-request-0.0.2.tgz#8155573541bbe4985bb8576aeed94d1dba06e019"
+  integrity sha512-1SAMp3qpj7RQXLRNtfGn6+vyUCNgOkE9MICNS65KigrC9pBMon8qIjP8eUTu555YXZAtTv9eV7KhVai1gTNoxA==
   dependencies:
     "@babel/runtime-corejs3" "^7.11.2"
     "@togglecorp/fujs" "^1.9.2-beta.0"
     abort-controller "^3.0.0"
 
-"@tootallnate/once@1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
-  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
+"@tootallnate/once@2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
 
 "@trysound/sax@0.1.1":
   version "0.1.1"
@@ -2485,14 +3392,51 @@
     "@types/extract-files" "*"
     graphql "^15.3.0"
 
-"@types/chrome@^0.0.153":
-  version "0.0.153"
-  resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.153.tgz#6c3009eb7be1d0fbace82be159122fd99e4a6465"
-  integrity sha512-J8VrwjuJLh6BPmUTmZQd41zJJjVpRnnMZ/E9uHfQZ3RRAESVqYxin8YeCdZUak7+5dUI6wr8Sr6UfR3dehLIdQ==
+"@types/body-parser@*":
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
+  integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==
+  dependencies:
+    "@types/connect" "*"
+    "@types/node" "*"
+
+"@types/bonjour@^3.5.9":
+  version "3.5.9"
+  resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.9.tgz#3cc4e5135dbb5940fc6051604809234612f89cb4"
+  integrity sha512-VkZUiYevvtPyFu5XtpYw9a8moCSzxgjs5PAFF4yXjA7eYHvzBlXe+eJdqBBNWWVzI1r7Ki0KxMYvaQuhm+6f5A==
+  dependencies:
+    "@types/node" "*"
+
+"@types/chrome@^0.0.171":
+  version "0.0.171"
+  resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.171.tgz#6ee9aca52fabbe645372088fcc86b33cff33fcba"
+  integrity sha512-CnCwFKI3COygib3DNJrCjePeoU2OCDGGbUcmftXtQ3loMABsLgwpG8z+LxV4kjQJFzmJDqOyhCSsbY9yyEfapQ==
   dependencies:
     "@types/filesystem" "*"
     "@types/har-format" "*"
 
+"@types/connect-history-api-fallback@^1.3.5":
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae"
+  integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==
+  dependencies:
+    "@types/express-serve-static-core" "*"
+    "@types/node" "*"
+
+"@types/connect@*":
+  version "3.4.35"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
+  integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/cssnano@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@types/cssnano/-/cssnano-4.0.1.tgz#67fa912753d80973a016e7684a47fedf338aacff"
+  integrity sha512-hGOroxRTBkYl5gSBRJOffhV4+io+Y2bFX1VP7LgKEVHJt/LPPJaWUIuDAz74Vlp7l7hCDZfaDi7iPxwNwuVA4Q==
+  dependencies:
+    postcss "5 - 7"
+
 "@types/d3-brush@^3.0.1":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@types/d3-brush/-/d3-brush-3.0.1.tgz#ae5f17ce391935ca88b29000e60ee20452c6357c"
@@ -2500,6 +3444,18 @@
   dependencies:
     "@types/d3-selection" "*"
 
+"@types/d3-color@^2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-2.0.3.tgz#8bc4589073c80e33d126345542f588056511fe82"
+  integrity sha512-+0EtEjBfKEDtH9Rk3u3kLOUXM5F+iZK+WvASPb0MhIZl8J8NUvGeZRwKCXl+P3HkYx5TdU4YtcibpqHkSR9n7w==
+
+"@types/d3-interpolate@^2.0.0":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@types/d3-interpolate/-/d3-interpolate-2.0.2.tgz#78eddf7278b19e48e8652603045528d46897aba0"
+  integrity sha512-lElyqlUfIPyWG/cD475vl6msPL4aMU7eJvx1//Q177L8mdXoVPFl1djIESF2FKnc0NyaHvQlJpWwKJYwAhUoCw==
+  dependencies:
+    "@types/d3-color" "^2"
+
 "@types/d3-path@^2":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/d3-path/-/d3-path-2.0.1.tgz#ca03dfa8b94d8add97ad0cd97e96e2006b4763cb"
@@ -2542,7 +3498,7 @@
     "@types/eslint" "*"
     "@types/estree" "*"
 
-"@types/eslint@*", "@types/eslint@^7.2.6":
+"@types/eslint@*":
   version "7.28.0"
   resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a"
   integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==
@@ -2550,6 +3506,14 @@
     "@types/estree" "*"
     "@types/json-schema" "*"
 
+"@types/eslint@^7.28.2":
+  version "7.29.0"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.29.0.tgz#e56ddc8e542815272720bb0b4ccc2aff9c3e1c78"
+  integrity sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==
+  dependencies:
+    "@types/estree" "*"
+    "@types/json-schema" "*"
+
 "@types/estree@*", "@types/estree@^0.0.50":
   version "0.0.50"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
@@ -2560,6 +3524,25 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
+"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
+  version "4.17.26"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.26.tgz#5d9a8eeecb9d5f9d7fc1d85f541512a84638ae88"
+  integrity sha512-zeu3tpouA043RHxW0gzRxwCHchMgftE8GArRsvYT0ByDMbn19olQHx5jLue0LxWY6iYtXb7rXmuVtSkhy9YZvQ==
+  dependencies:
+    "@types/node" "*"
+    "@types/qs" "*"
+    "@types/range-parser" "*"
+
+"@types/express@*":
+  version "4.17.13"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034"
+  integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "^4.17.18"
+    "@types/qs" "*"
+    "@types/serve-static" "*"
+
 "@types/extract-files@*":
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/@types/extract-files/-/extract-files-8.1.1.tgz#11b67e795ad2c8b483431e8d4f190db2fd22944b"
@@ -2591,16 +3574,8 @@
 
 "@types/geojson@*":
   version "7946.0.8"
-  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca"
-  integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==
-
-"@types/glob@^7.1.1":
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz#ea59e21d2ee5c517914cb4bc8e4153b99e566672"
-  integrity sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==
-  dependencies:
-    "@types/minimatch" "*"
-    "@types/node" "*"
+  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca"
+  integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==
 
 "@types/google.picker@^0.0.39":
   version "0.0.39"
@@ -2617,15 +3592,15 @@
   resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.9.tgz#1cfb6d60ef3822c589f18e70f8b12f9a28ce8724"
   integrity sha512-MUc6zSmU3tEVnkQ78q0peeEjKWPUADMlC/t++2bI8WnAG2tvYRPIgHG8lWkXwqc8MsUF6Z2MOf+Mh5sazOmhiQ==
 
-"@types/html-minifier-terser@^5.0.0":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz#693b316ad323ea97eed6b38ed1a3cc02b1672b57"
-  integrity sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w==
+"@types/html-minifier-terser@^6.0.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35"
+  integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==
 
-"@types/http-proxy-agent@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@types/http-proxy-agent/-/http-proxy-agent-2.0.2.tgz#942c1f35c7e1f0edd1b6ffae5d0f9051cfb32be1"
-  integrity sha512-2S6IuBRhqUnH1/AUx9k8KWtY3Esg4eqri946MnxTG5HwehF1S5mqLln8fcyMiuQkY72p2gH3W+rIPqp5li0LyQ==
+"@types/http-proxy@^1.17.5":
+  version "1.17.8"
+  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.8.tgz#968c66903e7e42b483608030ee85800f22d03f55"
+  integrity sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA==
   dependencies:
     "@types/node" "*"
 
@@ -2644,11 +3619,21 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.8.tgz#edf1bf1dbf4e04413ca8e5b17b3b7d7d54b59818"
   integrity sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==
 
+"@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+  version "7.0.9"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
+  integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
+
 "@types/json-stable-stringify@^1.0.32":
   version "1.0.33"
   resolved "https://registry.yarnpkg.com/@types/json-stable-stringify/-/json-stable-stringify-1.0.33.tgz#099b0712d824d15e2660c20e1c16e6a8381f308c"
   integrity sha512-qEWiQff6q2tA5gcJGWwzplQcXdJtm+0oy6IHGHzlOf3eFAkGE/FIPXZK9ofWgNSHVp8AFFI33PJJshS0ei3Gvw==
 
+"@types/json5@^0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
+  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+
 "@types/jsonwebtoken@^8.5.0":
   version "8.5.4"
   resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-8.5.4.tgz#50ccaf0aa6f5d7b9956e70fe323b76e582991913"
@@ -2656,24 +3641,17 @@
   dependencies:
     "@types/node" "*"
 
-"@types/mapbox-gl@^1.10.1":
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-1.13.2.tgz#d20959d02b9ca17a2a3244387f1da763992ed11d"
-  integrity sha512-sv69WkijddNCIdLLyUsG90+X3Lh67a26lKsqaL8WbmXMkWITDrshe+sc9BI8oUV7sh+XD0jraI3qBe0NtJs7dw==
+"@types/mapbox-gl@^2.6.0":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-2.6.0.tgz#f9e8e963d5a11eba9d914d95ef8a00d015ca8732"
+  integrity sha512-lHdITzC0IVn9+Pq6WFkkK0N6rUKIqxsdrNeixiQdvROFn2Aeu3TDvhpuag1IdengL5WGGRuEhK6m6HB916ReLw==
   dependencies:
     "@types/geojson" "*"
 
-"@types/mdast@^3.0.0":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.4.tgz#8ee6b5200751b6cadb9a043ca39612693ad6cb9e"
-  integrity sha512-gIdhbLDFlspL53xzol2hVzrXAbzt71erJHoOwQZWssjaiouOotf03lNtMmFm9VfFkvnLWccSVjUAZGQ5Kqw+jA==
-  dependencies:
-    "@types/unist" "*"
-
-"@types/minimatch@*":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
-  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
+"@types/mime@^1":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
+  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
 "@types/minimist@^1.2.0":
   version "1.2.2"
@@ -2700,11 +3678,16 @@
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11"
   integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==
 
-"@types/qs@^6.9.5":
+"@types/qs@*", "@types/qs@^6.9.5":
   version "6.9.7"
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
   integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
 
+"@types/range-parser@*":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
+  integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
+
 "@types/reach__router@^1.3.7":
   version "1.3.9"
   resolved "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.9.tgz#d3aaac0072665c81063cc6c557c18dadd642b226"
@@ -2712,25 +3695,25 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-color@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@types/react-color/-/react-color-3.0.5.tgz#b8bdf8df7085bd1577658fb37d9a18d7ba3963bb"
-  integrity sha512-0VZy8Uq5x04cW5QFz24Qw8MMMlsMi8Bb+XG5h59ATqPnWVq6OheHtrwv5LeakdTRDaECQnExJNSFOsSe4Eo/zQ==
+"@types/react-color@^3.0.6":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@types/react-color/-/react-color-3.0.6.tgz#602fed023802b2424e7cd6ff3594ccd3d5055f9a"
+  integrity sha512-OzPIO5AyRmLA7PlOyISlgabpYUa3En74LP8mTMa0veCA719SvYQov4WLMsHvCgXP+L+KI9yGhYnqZafVGG0P4w==
   dependencies:
     "@types/react" "*"
     "@types/reactcss" "*"
 
-"@types/react-dom@^17.0.9":
-  version "17.0.9"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.9.tgz#441a981da9d7be117042e1a6fd3dac4b30f55add"
-  integrity sha512-wIvGxLfgpVDSAMH5utdL9Ngm5Owu0VsGmldro3ORLXV8CShrL8awVj06NuEXFQ5xyaYfdca7Sgbk/50Ri1GdPg==
+"@types/react-dom@^17.0.11":
+  version "17.0.11"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.11.tgz#e1eadc3c5e86bdb5f7684e00274ae228e7bcc466"
+  integrity sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q==
   dependencies:
     "@types/react" "*"
 
-"@types/react-router-dom@^5.1.8":
-  version "5.1.8"
-  resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.1.8.tgz#bf3e1c8149b3d62eaa206d58599de82df0241192"
-  integrity sha512-03xHyncBzG0PmDmf8pf3rehtjY0NpUj7TIN46FrT5n1ZWHPZvXz32gUyNboJ+xsL8cpg8bQVLcllptcQHvocrw==
+"@types/react-router-dom@^5.3.2":
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.3.2.tgz#ebd8e145cf056db5c66eb1dac63c72f52e8542ee"
+  integrity sha512-ELEYRUie2czuJzaZ5+ziIp9Hhw+juEw8b7C11YNA4QdLCVbQ3qLi2l4aq8XnlqM7V31LZX8dxUuFUCrzHm6sqQ==
   dependencies:
     "@types/history" "*"
     "@types/react" "*"
@@ -2744,7 +3727,7 @@
     "@types/history" "*"
     "@types/react" "*"
 
-"@types/react@*", "@types/react@^17.0.14":
+"@types/react@*":
   version "17.0.14"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.14.tgz#f0629761ca02945c4e8fea99b8177f4c5c61fb0f"
   integrity sha512-0WwKHUbWuQWOce61UexYuWTGuGY/8JvtUe/dtQ6lR4sZ3UiylHotJeWpf3ArP9+DSGUoLY3wbU59VyMrJps5VQ==
@@ -2753,6 +3736,15 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
+"@types/react@^17.0.37":
+  version "17.0.37"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.37.tgz#6884d0aa402605935c397ae689deed115caad959"
+  integrity sha512-2FS1oTqBGcH/s0E+CjrCCR9+JMpsu9b69RTFO+40ua43ZqP5MmQ4iUde/dMjWR909KxZwmOQIFq6AV6NjEG5xg==
+  dependencies:
+    "@types/prop-types" "*"
+    "@types/scheduler" "*"
+    csstype "^3.0.2"
+
 "@types/reactcss@*":
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/@types/reactcss/-/reactcss-1.2.4.tgz#66c5f6afe123ffa1a50dbe724aa1fe68eb9fab00"
@@ -2760,19 +3752,12 @@
   dependencies:
     "@types/react" "*"
 
-"@types/recharts@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/recharts/-/recharts-2.0.0.tgz#2fe20913b5d69b0fc0202c32ee7d9ffbfb36ac7a"
-  integrity sha512-O9iWQ9y0nu/EFslfBed6fZYJGzyjeSV+nv6S5UTLcoPVpeCUBJ1gap6VGfbYJJ59n+xQpVQnkaYZzhWmg8hifw==
-  dependencies:
-    recharts "*"
-
-"@types/requestidlecallback@^0.3.1":
+"@types/requestidlecallback@^0.3.4":
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/@types/requestidlecallback/-/requestidlecallback-0.3.4.tgz#819e22b8994cf547e1f17f9cb79805a5a3bb1db5"
   integrity sha512-aTSyiZuRemRLTQkJPb25L7A4/eR2Teo5l4yJ1V6P3+MFxEZckTDkNKNtr/V1zEOMzS6H8DgxF22U6jPAPrzQvw==
 
-"@types/resize-observer-browser@^0.1.5":
+"@types/resize-observer-browser@^0.1.6":
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/@types/resize-observer-browser/-/resize-observer-browser-0.1.6.tgz#d8e6c2f830e2650dc06fe74464472ff64b54a302"
   integrity sha512-61IfTac0s9jvNtBCpyo86QeaN8qqpMGHdK0uGKCCIy2dt5/Yk84VduHIdWAcmkC5QvdkPL0p5eWYgUZtHKKUVg==
@@ -2784,15 +3769,42 @@
   dependencies:
     "@types/node" "*"
 
+"@types/retry@^0.12.0":
+  version "0.12.1"
+  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065"
+  integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==
+
 "@types/scheduler@*":
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
   integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
 
-"@types/stylelint@^13.13.0":
-  version "13.13.1"
-  resolved "https://registry.yarnpkg.com/@types/stylelint/-/stylelint-13.13.1.tgz#c7534ccf35efc019f29d883e2655c651dc3c9b7b"
-  integrity sha512-CBXFUqaMwCw0PX/sVSlT4JR+wTXJ3rv67cdhIH4EoekbrlNeNw8Dx791p2cTTozYJItMOZJa4/j7Br1mmUHdCw==
+"@types/serve-index@^1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278"
+  integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==
+  dependencies:
+    "@types/express" "*"
+
+"@types/serve-static@*":
+  version "1.13.10"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"
+  integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==
+  dependencies:
+    "@types/mime" "^1"
+    "@types/node" "*"
+
+"@types/sockjs@^0.3.33":
+  version "0.3.33"
+  resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f"
+  integrity sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==
+  dependencies:
+    "@types/node" "*"
+
+"@types/stylelint@^13.13.3":
+  version "13.13.3"
+  resolved "https://registry.yarnpkg.com/@types/stylelint/-/stylelint-13.13.3.tgz#29ba9b7179e5632b12853252da191443607d32fc"
+  integrity sha512-xvYwobi9L69FXbJTimKYRNHyMwtmcJxMd1woI3U822rkW/f7wcZ6fsV1DqYPT+sNaO0qUtngiBhTQfMeItUvUA==
   dependencies:
     globby "11.x.x"
     postcss "7.x.x"
@@ -2802,10 +3814,10 @@
   resolved "https://registry.yarnpkg.com/@types/svg-injector/-/svg-injector-0.0.29.tgz#308477f6ef0eeb80d6370e2e9c766d438efa0c26"
   integrity sha512-tNvoN0Xk2si6IfxQI/PqInipOuCyXkDZhCh9Vc4aFv/l1DhIBfTFbXRXYUHBAGXaUNMOCHEtg9475O9J+4NXOg==
 
-"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2":
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d"
-  integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==
+"@types/trusted-types@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.2.tgz#fc25ad9943bcac11cceb8168db4f275e0e72e756"
+  integrity sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==
 
 "@types/webpack-env@^1.16.0":
   version "1.16.2"
@@ -2819,6 +3831,20 @@
   dependencies:
     "@types/node" "*"
 
+"@types/websocket@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@types/websocket/-/websocket-1.0.4.tgz#1dc497280d8049a5450854dd698ee7e6ea9e60b8"
+  integrity sha512-qn1LkcFEKK8RPp459jkjzsfpbsx36BBt3oC3pITYtkoBw/aVX+EZFa5j3ThCRTNpLFvIMr5dSTD4RaMdilIOpA==
+  dependencies:
+    "@types/node" "*"
+
+"@types/ws@^8.0.0", "@types/ws@^8.2.2":
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.2.2.tgz#7c5be4decb19500ae6b3d563043cd407bf366c21"
+  integrity sha512-NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/zen-observable@0.8.0":
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d"
@@ -2829,74 +3855,75 @@
   resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.3.tgz#781d360c282436494b32fe7d9f7f8e64b3118aa3"
   integrity sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw==
 
-"@typescript-eslint/eslint-plugin@^4.28.3":
-  version "4.28.3"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.3.tgz#36cdcd9ca6f9e5cb49b9f61b970b1976708d084b"
-  integrity sha512-jW8sEFu1ZeaV8xzwsfi6Vgtty2jf7/lJmQmDkDruBjYAbx5DA8JtbcMnP0rNPUG+oH5GoQBTSp+9613BzuIpYg==
+"@typescript-eslint/eslint-plugin@^5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.8.0.tgz#52cd9305ceef98a5333f9492d519e6c6c7fe7d43"
+  integrity sha512-spu1UW7QuBn0nJ6+psnfCc3iVoQAifjKORgBngKOmC8U/1tbe2YJMzYQqDGYB4JCss7L8+RM2kKLb1B1Aw9BNA==
   dependencies:
-    "@typescript-eslint/experimental-utils" "4.28.3"
-    "@typescript-eslint/scope-manager" "4.28.3"
-    debug "^4.3.1"
+    "@typescript-eslint/experimental-utils" "5.8.0"
+    "@typescript-eslint/scope-manager" "5.8.0"
+    debug "^4.3.2"
     functional-red-black-tree "^1.0.1"
-    regexpp "^3.1.0"
+    ignore "^5.1.8"
+    regexpp "^3.2.0"
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/experimental-utils@4.28.3":
-  version "4.28.3"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.3.tgz#976f8c1191b37105fd06658ed57ddfee4be361ca"
-  integrity sha512-zZYl9TnrxwEPi3FbyeX0ZnE8Hp7j3OCR+ELoUfbwGHGxWnHg9+OqSmkw2MoCVpZksPCZYpQzC559Ee9pJNHTQw==
+"@typescript-eslint/experimental-utils@5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.8.0.tgz#0916ffe98d34b3c95e3652efa0cace61a7b25728"
+  integrity sha512-KN5FvNH71bhZ8fKtL+lhW7bjm7cxs1nt+hrDZWIqb6ViCffQcWyLunGrgvISgkRojIDcXIsH+xlFfI4RCDA0xA==
   dependencies:
-    "@types/json-schema" "^7.0.7"
-    "@typescript-eslint/scope-manager" "4.28.3"
-    "@typescript-eslint/types" "4.28.3"
-    "@typescript-eslint/typescript-estree" "4.28.3"
+    "@types/json-schema" "^7.0.9"
+    "@typescript-eslint/scope-manager" "5.8.0"
+    "@typescript-eslint/types" "5.8.0"
+    "@typescript-eslint/typescript-estree" "5.8.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/parser@^4.28.3":
-  version "4.28.3"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.3.tgz#95f1d475c08268edffdcb2779993c488b6434b44"
-  integrity sha512-ZyWEn34bJexn/JNYvLQab0Mo5e+qqQNhknxmc8azgNd4XqspVYR5oHq9O11fLwdZMRcj4by15ghSlIEq+H5ltQ==
+"@typescript-eslint/parser@^5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.8.0.tgz#b39970b21c1d7bc4a6018507fb29b380328d2587"
+  integrity sha512-Gleacp/ZhRtJRYs5/T8KQR3pAQjQI89Dn/k+OzyCKOsLiZH2/Vh60cFBTnFsHNI6WAD+lNUo/xGZ4NeA5u0Ipw==
   dependencies:
-    "@typescript-eslint/scope-manager" "4.28.3"
-    "@typescript-eslint/types" "4.28.3"
-    "@typescript-eslint/typescript-estree" "4.28.3"
-    debug "^4.3.1"
+    "@typescript-eslint/scope-manager" "5.8.0"
+    "@typescript-eslint/types" "5.8.0"
+    "@typescript-eslint/typescript-estree" "5.8.0"
+    debug "^4.3.2"
 
-"@typescript-eslint/scope-manager@4.28.3":
-  version "4.28.3"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.3.tgz#c32ad4491b3726db1ba34030b59ea922c214e371"
-  integrity sha512-/8lMisZ5NGIzGtJB+QizQ5eX4Xd8uxedFfMBXOKuJGP0oaBBVEMbJVddQKDXyyB0bPlmt8i6bHV89KbwOelJiQ==
+"@typescript-eslint/scope-manager@5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.8.0.tgz#2371095b4fa4c7be6a80b380f4e1b49c715e16f4"
+  integrity sha512-x82CYJsLOjPCDuFFEbS6e7K1QEWj7u5Wk1alw8A+gnJiYwNnDJk0ib6PCegbaPMjrfBvFKa7SxE3EOnnIQz2Gg==
   dependencies:
-    "@typescript-eslint/types" "4.28.3"
-    "@typescript-eslint/visitor-keys" "4.28.3"
+    "@typescript-eslint/types" "5.8.0"
+    "@typescript-eslint/visitor-keys" "5.8.0"
 
-"@typescript-eslint/types@4.28.3":
-  version "4.28.3"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.3.tgz#8fffd436a3bada422c2c1da56060a0566a9506c7"
-  integrity sha512-kQFaEsQBQVtA9VGVyciyTbIg7S3WoKHNuOp/UF5RG40900KtGqfoiETWD/v0lzRXc+euVE9NXmfer9dLkUJrkA==
+"@typescript-eslint/types@5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.8.0.tgz#e7fa74ec35d9dbe3560d039d3d8734986c3971e0"
+  integrity sha512-LdCYOqeqZWqCMOmwFnum6YfW9F3nKuxJiR84CdIRN5nfHJ7gyvGpXWqL/AaW0k3Po0+wm93ARAsOdzlZDPCcXg==
 
-"@typescript-eslint/typescript-estree@4.28.3":
-  version "4.28.3"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.3.tgz#253d7088100b2a38aefe3c8dd7bd1f8232ec46fb"
-  integrity sha512-YAb1JED41kJsqCQt1NcnX5ZdTA93vKFCMP4lQYG6CFxd0VzDJcKttRlMrlG+1qiWAw8+zowmHU1H0OzjWJzR2w==
+"@typescript-eslint/typescript-estree@5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.8.0.tgz#900469ba9d5a37f4482b014ecce4a5dbb86cb4dd"
+  integrity sha512-srfeZ3URdEcUsSLbkOFqS7WoxOqn8JNil2NSLO9O+I2/Uyc85+UlfpEvQHIpj5dVts7KKOZnftoJD/Fdv0L7nQ==
   dependencies:
-    "@typescript-eslint/types" "4.28.3"
-    "@typescript-eslint/visitor-keys" "4.28.3"
-    debug "^4.3.1"
-    globby "^11.0.3"
-    is-glob "^4.0.1"
+    "@typescript-eslint/types" "5.8.0"
+    "@typescript-eslint/visitor-keys" "5.8.0"
+    debug "^4.3.2"
+    globby "^11.0.4"
+    is-glob "^4.0.3"
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/visitor-keys@4.28.3":
-  version "4.28.3"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.3.tgz#26ac91e84b23529968361045829da80a4e5251c4"
-  integrity sha512-ri1OzcLnk1HH4gORmr1dllxDzzrN6goUIz/P4MHFV0YZJDCADPR3RvYNp0PW2SetKTThar6wlbFTL00hV2Q+fg==
+"@typescript-eslint/visitor-keys@5.8.0":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.8.0.tgz#22d4ed96fe2451135299239feedb9fe1dcec780c"
+  integrity sha512-+HDIGOEMnqbxdAHegxvnOqESUH6RWFRR2b8qxP1W9CZnnYh4Usz6MBL+2KMAgPk/P0o9c1HqnYtwzVH6GTIqug==
   dependencies:
-    "@typescript-eslint/types" "4.28.3"
-    eslint-visitor-keys "^2.0.0"
+    "@typescript-eslint/types" "5.8.0"
+    eslint-visitor-keys "^3.0.0"
 
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
@@ -3019,29 +4046,29 @@
     "@webassemblyjs/ast" "1.11.1"
     "@xtuc/long" "4.2.2"
 
-"@webpack-cli/configtest@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.4.tgz#f03ce6311c0883a83d04569e2c03c6238316d2aa"
-  integrity sha512-cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ==
+"@webpack-cli/configtest@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.0.tgz#8342bef0badfb7dfd3b576f2574ab80c725be043"
+  integrity sha512-ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg==
 
-"@webpack-cli/info@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.3.0.tgz#9d78a31101a960997a4acd41ffd9b9300627fe2b"
-  integrity sha512-ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w==
+"@webpack-cli/info@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.0.tgz#b9179c3227ab09cbbb149aa733475fcf99430223"
+  integrity sha512-F6b+Man0rwE4n0409FyAJHStYA5OIZERxmnUfLVwv0mc0V1wLad3V7jqRlMkgKBeAq07jUvglacNaa6g9lOpuw==
   dependencies:
     envinfo "^7.7.3"
 
-"@webpack-cli/serve@^1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.5.1.tgz#b5fde2f0f79c1e120307c415a4c1d5eb15a6f278"
-  integrity sha512-4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw==
+"@webpack-cli/serve@^1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.0.tgz#2c275aa05c895eccebbfc34cfb223c6e8bd591a2"
+  integrity sha512-ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA==
 
 "@wry/context@^0.6.0":
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.6.0.tgz#f903eceb89d238ef7e8168ed30f4511f92d83e06"
-  integrity sha512-sAgendOXR8dM7stJw3FusRxFHF/ZinU0lffsA2YTyyIOfic86JX02qlPqPVqJNZJPAxFt+2EE8bvq6ZlS0Kf+Q==
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.6.1.tgz#c3c29c0ad622adb00f6a53303c4f965ee06ebeb2"
+  integrity sha512-LOmVnY1iTU2D8tv4Xf6MVMZZ+juIJ87Kt/plMijjN20NMAXGmH4u8bS1t0uT74cZ5gwpocYueV58YwyI8y+GKw==
   dependencies:
-    tslib "^2.1.0"
+    tslib "^2.3.0"
 
 "@wry/equality@^0.1.2":
   version "0.1.11"
@@ -3051,18 +4078,18 @@
     tslib "^1.9.3"
 
 "@wry/equality@^0.5.0":
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.5.1.tgz#b22e4e1674d7bf1439f8ccdccfd6a785f6de68b0"
-  integrity sha512-FZKbdpbcVcbDxQrKcaBClNsQaMg9nof1RKM7mReJe5DKUzM5u8S7T+PqwNqvib5O2j2xxF1R4p5O3+b6baTrbw==
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.5.2.tgz#72c8a7a7d884dff30b612f4f8464eba26c080e73"
+  integrity sha512-oVMxbUXL48EV/C0/M7gLVsoK6qRHPS85x8zECofEZOVvxGmIPLA9o5Z27cc2PoAyZz1S2VoM2A7FLAnpfGlneA==
   dependencies:
-    tslib "^2.1.0"
+    tslib "^2.3.0"
 
 "@wry/trie@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@wry/trie/-/trie-0.3.0.tgz#3245e74988c4e3033299e479a1bf004430752463"
-  integrity sha512-Yw1akIogPhAT6XPYsRHlZZIS0tIGmAl9EYXHi2scf7LPKKqdqmow/Hu4kEqP2cJR3EjaU/9L0ZlAjFf3hFxmug==
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@wry/trie/-/trie-0.3.1.tgz#2279b790f15032f8bcea7fc944d27988e5b3b139"
+  integrity sha512-WwB53ikYudh9pIorgxrkHKrQZcCqNM/Q/bDzZBffEaGUKGuHrRb3zZUT9Sh2qw9yogC7SsdRmQ1ER0pqvd3bfw==
   dependencies:
-    tslib "^2.1.0"
+    tslib "^2.3.0"
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
@@ -3089,21 +4116,26 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
     mime-types "~2.1.24"
     negotiator "0.6.2"
 
+acorn-import-assertions@^1.7.6:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
+  integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
+
 acorn-jsx@^5.3.1:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^7.4.0:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-
 acorn@^8.4.1:
   version "8.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c"
   integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==
 
+acorn@^8.6.0:
+  version "8.6.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.6.0.tgz#e3692ba0eb1a0c83eaa4f37f5fa7368dd7142895"
+  integrity sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==
+
 agent-base@6:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
@@ -3111,17 +4143,34 @@ agent-base@6:
   dependencies:
     debug "4"
 
-ajv-errors@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
-  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
+aggregate-error@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
+  dependencies:
+    clean-stack "^2.0.0"
+    indent-string "^4.0.0"
+
+ajv-formats@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
+  integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
+  dependencies:
+    ajv "^8.0.0"
 
-ajv-keywords@^3.1.0, ajv-keywords@^3.5.2:
+ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
+ajv-keywords@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
+  integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
+ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -3131,6 +4180,16 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^8.0.0, ajv@^8.6.0, ajv@^8.8.0:
+  version "8.8.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.8.2.tgz#01b4fef2007a28bf75f0b7fc009f62679de4abbb"
+  integrity sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
 ajv@^8.0.1:
   version "8.6.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.1.tgz#ae65764bf1edde8cd861281cda5057852364a295"
@@ -3146,11 +4205,6 @@ alphanum-sort@^1.0.2:
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
   integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
 
-ansi-colors@^3.0.0:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
-  integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
-
 ansi-colors@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
@@ -3168,16 +4222,11 @@ ansi-escapes@^4.2.1, ansi-escapes@^4.3.1:
   dependencies:
     type-fest "^0.21.3"
 
-ansi-html-community@0.0.8:
+ansi-html-community@^0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
   integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
 
-ansi-html@^0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
-  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
-
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -3188,22 +4237,27 @@ ansi-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
-ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
-
 ansi-regex@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
   integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
 
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
+ansi-regex@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
+  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
   integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
@@ -3227,14 +4281,6 @@ any-observable@^0.3.0:
   resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
   integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==
 
-anymatch@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
-  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
-  dependencies:
-    micromatch "^3.1.4"
-    normalize-path "^2.1.1"
-
 anymatch@^3.0.0, anymatch@~3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
@@ -3271,9 +4317,9 @@ apollo-link-http-common@^0.2.16:
     tslib "^1.9.3"
 
 apollo-link-rest@^0.8.0-beta.0:
-  version "0.8.0-beta.0"
-  resolved "https://registry.yarnpkg.com/apollo-link-rest/-/apollo-link-rest-0.8.0-beta.0.tgz#435055d4bee82182c17974df5a9a606c4edf62a1"
-  integrity sha512-+/cHVXz0jF4SOg3bIVPxCArnpp7ojwhLarT9MLzbAuoaI+Uq+pU9Ob8Xmq4BS3Z+mIdVmnrIyw8EvqEzP7RL0w==
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/apollo-link-rest/-/apollo-link-rest-0.8.0.tgz#c61df3a795e1509a01a86e87472a9ad8425d4bef"
+  integrity sha512-jSpcp2KsWaCqkCw+B0vzfgghsbfKBhftgDuvxkdDAQYVW4Vcst8tm9qNgUXiyRdQcfcd19kEFCEk7w2AcB6dUg==
 
 apollo-link-retry@^2.2.16:
   version "2.2.16"
@@ -3294,10 +4340,10 @@ apollo-link@^1.2.14:
     tslib "^1.9.3"
     zen-observable-ts "^0.8.21"
 
-apollo-upload-client@^16.0.0:
-  version "16.0.0"
-  resolved "https://registry.yarnpkg.com/apollo-upload-client/-/apollo-upload-client-16.0.0.tgz#704c9bc21e12bd4687172876eb927cf756b2e524"
-  integrity sha512-aLhYucyA0T8aBEQ5g+p13qnR9RUyL8xqb8FSZ7e/Kw2KUOsotLUlFluLobqaE7JSUFwc6sKfXIcwB7y4yEjbZg==
+apollo-upload-client@^17.0.0:
+  version "17.0.0"
+  resolved "https://registry.yarnpkg.com/apollo-upload-client/-/apollo-upload-client-17.0.0.tgz#d9baaff8d14e54510de9f2855b487e75ca63b392"
+  integrity sha512-pue33bWVbdlXAGFPkgz53TTmxVMrKeQr0mdRcftNY+PoHIdbGZD0hoaXHvO6OePJAkFz7OiCFUf98p1G/9+Ykw==
   dependencies:
     extract-files "^11.0.0"
 
@@ -3316,13 +4362,6 @@ arg@^4.1.0:
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
   integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -3336,21 +4375,6 @@ aria-query@^4.2.2:
     "@babel/runtime" "^7.10.2"
     "@babel/runtime-corejs3" "^7.10.2"
 
-arr-diff@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
-
-arr-flatten@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-
-arr-union@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
-
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
@@ -3361,7 +4385,7 @@ array-flatten@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
-array-includes@^3.1.1, array-includes@^3.1.2, array-includes@^3.1.3:
+array-includes@^3.1.2, array-includes@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a"
   integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==
@@ -3372,67 +4396,50 @@ array-includes@^3.1.1, array-includes@^3.1.2, array-includes@^3.1.3:
     get-intrinsic "^1.1.1"
     is-string "^1.0.5"
 
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
+array-includes@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9"
+  integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==
   dependencies:
-    array-uniq "^1.0.1"
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.1"
+    get-intrinsic "^1.1.1"
+    is-string "^1.0.7"
 
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
-
-array-unique@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
-
-array.prototype.flat@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123"
-  integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==
+array.prototype.flat@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz#07e0975d84bbc7c48cd1879d609e682598d33e13"
+  integrity sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
+    es-abstract "^1.19.0"
 
-array.prototype.flatmap@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz#94cfd47cc1556ec0747d97f7c7738c58122004c9"
-  integrity sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==
+array.prototype.flatmap@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446"
+  integrity sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==
   dependencies:
     call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
-    function-bind "^1.1.1"
+    es-abstract "^1.19.0"
 
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
-arrify@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
-  integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
-
 asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
-assign-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
-
 ast-types-flow@^0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
@@ -3443,15 +4450,10 @@ astral-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
-async-each@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
-  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
-
-async-limiter@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
-  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
+async@0.9.x:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
+  integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=
 
 async@^2.6.2:
   version "2.6.3"
@@ -3470,33 +4472,27 @@ at-least-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-atob@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
-  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-
 auto-bind@~4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-4.0.0.tgz#e3589fc6c2da8f7ca43ba9f84fa52a744fc997fb"
   integrity sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==
 
-autoprefixer@^9.6.1, autoprefixer@^9.8.6:
-  version "9.8.6"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f"
-  integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==
+autoprefixer@^10.4.0:
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.0.tgz#c3577eb32a1079a440ec253e404eaf1eb21388c8"
+  integrity sha512-7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA==
   dependencies:
-    browserslist "^4.12.0"
-    caniuse-lite "^1.0.30001109"
-    colorette "^1.2.1"
+    browserslist "^4.17.5"
+    caniuse-lite "^1.0.30001272"
+    fraction.js "^4.1.1"
     normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^7.0.32"
+    picocolors "^1.0.0"
     postcss-value-parser "^4.1.0"
 
-axe-core@^4.0.2:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.1.tgz#0c6a076e4a1c3e0544ba6a9479158f9be7a7928e"
-  integrity sha512-3WVgVPs/7OnKU3s+lqMtkv3wQlg3WxK1YifmpJSDO0E1aPBrZWlrrTO6cxRqCXLuX2aYgCljqXIQd0VnRidV0g==
+axe-core@^4.3.5:
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.5.tgz#78d6911ba317a8262bfee292aeafcc1e04b49cc5"
+  integrity sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==
 
 axobject-query@^2.2.0:
   version "2.2.0"
@@ -3512,10 +4508,10 @@ babel-literal-to-ast@^2.1.0:
     "@babel/traverse" "^7.1.6"
     "@babel/types" "^7.1.6"
 
-babel-loader@^8.2.2:
-  version "8.2.2"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
-  integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==
+babel-loader@^8.2.3:
+  version "8.2.3"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d"
+  integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==
   dependencies:
     find-cache-dir "^3.3.1"
     loader-utils "^1.4.0"
@@ -3584,7 +4580,16 @@ babel-plugin-polyfill-corejs2@^0.2.2:
     "@babel/helper-define-polyfill-provider" "^0.2.2"
     semver "^6.1.1"
 
-babel-plugin-polyfill-corejs3@^0.2.2, babel-plugin-polyfill-corejs3@^0.2.3:
+babel-plugin-polyfill-corejs2@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.0.tgz#407082d0d355ba565af24126fb6cb8e9115251fd"
+  integrity sha512-wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA==
+  dependencies:
+    "@babel/compat-data" "^7.13.11"
+    "@babel/helper-define-polyfill-provider" "^0.3.0"
+    semver "^6.1.1"
+
+babel-plugin-polyfill-corejs3@^0.2.2:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.3.tgz#72add68cf08a8bf139ba6e6dfc0b1d504098e57b"
   integrity sha512-rCOFzEIJpJEAU14XCcV/erIf/wZQMmMT5l5vXOpL5uoznyOGfDIjPj6FVytMvtzaKSTSVKouOCTPJ5OMUZH30g==
@@ -3592,6 +4597,14 @@ babel-plugin-polyfill-corejs3@^0.2.2, babel-plugin-polyfill-corejs3@^0.2.3:
     "@babel/helper-define-polyfill-provider" "^0.2.2"
     core-js-compat "^3.14.0"
 
+babel-plugin-polyfill-corejs3@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.4.0.tgz#0b571f4cf3d67f911512f5c04842a7b8e8263087"
+  integrity sha512-YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.3.0"
+    core-js-compat "^3.18.0"
+
 babel-plugin-polyfill-regenerator@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz#b310c8d642acada348c1fa3b3e6ce0e851bee077"
@@ -3599,6 +4612,13 @@ babel-plugin-polyfill-regenerator@^0.2.2:
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.2.2"
 
+babel-plugin-polyfill-regenerator@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.0.tgz#9ebbcd7186e1a33e21c5e20cae4e7983949533be"
+  integrity sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.3.0"
+
 babel-plugin-syntax-jsx@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
@@ -3609,7 +4629,7 @@ babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0:
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz#aa213c1435e2bffeb6fca842287ef534ad05d5cf"
   integrity sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ==
 
-babel-preset-fbjs@^3.3.0:
+babel-preset-fbjs@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.4.0.tgz#38a14e5a7a3b285a3f3a86552d650dca5cf6111c"
   integrity sha512-9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow==
@@ -3647,11 +4667,6 @@ backo2@^1.0.2:
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
   integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
 
-bail@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776"
-  integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==
-
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -3667,19 +4682,6 @@ base64-js@^1.3.1:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-base@^0.11.1:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
-  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
-  dependencies:
-    cache-base "^1.0.1"
-    class-utils "^0.3.5"
-    component-emitter "^1.2.1"
-    define-property "^1.0.0"
-    isobject "^3.0.1"
-    mixin-deep "^1.2.0"
-    pascalcase "^0.1.1"
-
 batch@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
@@ -3690,11 +4692,6 @@ big.js@^5.2.2:
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
-binary-extensions@^1.0.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
-  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
-
 binary-extensions@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
@@ -3753,22 +4750,6 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^2.3.1, braces@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
-  dependencies:
-    arr-flatten "^1.1.0"
-    array-unique "^0.3.2"
-    extend-shallow "^2.0.1"
-    fill-range "^4.0.0"
-    isobject "^3.0.1"
-    repeat-element "^1.1.2"
-    snapdragon "^0.8.1"
-    snapdragon-node "^2.0.1"
-    split-string "^3.0.2"
-    to-regex "^3.0.1"
-
 braces@^3.0.1, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
@@ -3776,7 +4757,7 @@ braces@^3.0.1, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.16.6, browserslist@^4.6.4:
+browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.16.6:
   version "4.16.6"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
   integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
@@ -3787,6 +4768,17 @@ browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4
     escalade "^3.1.1"
     node-releases "^1.1.71"
 
+browserslist@^4.17.5, browserslist@^4.19.1:
+  version "4.19.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3"
+  integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==
+  dependencies:
+    caniuse-lite "^1.0.30001286"
+    electron-to-chromium "^1.4.17"
+    escalade "^3.1.1"
+    node-releases "^2.0.1"
+    picocolors "^1.0.0"
+
 bser@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
@@ -3837,21 +4829,6 @@ bytes@3.1.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
   integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
-cache-base@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
-  dependencies:
-    collection-visit "^1.0.0"
-    component-emitter "^1.2.1"
-    get-value "^2.0.6"
-    has-value "^1.0.0"
-    isobject "^3.0.1"
-    set-value "^2.0.0"
-    to-object-path "^0.3.0"
-    union-value "^1.0.0"
-    unset-value "^1.0.0"
-
 cacheable-request@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
@@ -3873,31 +4850,12 @@ call-bind@^1.0.0, call-bind@^1.0.2:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.2"
 
-caller-callsite@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
-  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
-  dependencies:
-    callsites "^2.0.0"
-
-caller-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
-  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
-  dependencies:
-    caller-callsite "^2.0.0"
-
-callsites@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
-  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
-
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camel-case@4.1.2, camel-case@^4.1.1, camel-case@^4.1.2:
+camel-case@4.1.2, camel-case@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a"
   integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==
@@ -3934,11 +4892,16 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001219:
   version "1.0.30001245"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001245.tgz#45b941bbd833cb0fa53861ff2bae746b3c6ca5d4"
   integrity sha512-768fM9j1PKXpOCKws6eTo3RHmvTUsG9UrpT4WoREFeZgJBTi4/X9g565azS/rVUGtqb8nt7FjLeF5u4kukERnA==
 
+caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001287:
+  version "1.0.30001291"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001291.tgz#08a8d2cfea0b2cf2e1d94dd795942d0daef6108c"
+  integrity sha512-roMV5V0HNGgJ88s42eE70sstqGW/gwFndosYrikHthw98N5tLnOTxFqMLQjZVRxTWFlJ4rn+MsgXrR7MDPY4jA==
+
 capital-case@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/capital-case/-/capital-case-1.0.4.tgz#9d130292353c9249f6b00fa5852bee38a717e669"
@@ -3968,7 +4931,7 @@ chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
+chalk@^4.0.0, chalk@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
   integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
@@ -4010,45 +4973,11 @@ change-case@^4.1.2:
     snake-case "^3.0.4"
     tslib "^2.0.3"
 
-character-entities-legacy@^1.0.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1"
-  integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==
-
-character-entities@^1.0.0:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b"
-  integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==
-
-character-reference-invalid@^1.0.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
-  integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
-
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chokidar@^2.1.8:
-  version "2.1.8"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
-  integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
-  dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.1"
-    braces "^2.3.2"
-    glob-parent "^3.1.0"
-    inherits "^2.0.3"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    normalize-path "^3.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.2.1"
-    upath "^1.1.1"
-  optionalDependencies:
-    fsevents "^1.2.7"
-
 chokidar@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
@@ -4074,28 +5003,23 @@ circular-dependency-plugin@^5.2.2:
   resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz#39e836079db1d3cf2f988dc48c5188a44058b600"
   integrity sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ==
 
-class-utils@^0.3.5:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
-  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
-  dependencies:
-    arr-union "^3.1.0"
-    define-property "^0.2.5"
-    isobject "^3.0.0"
-    static-extend "^0.1.1"
-
 classnames@^2.2.5, classnames@^2.2.6:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
   integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==
 
-clean-css@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
-  integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
+clean-css@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.2.2.tgz#d3a7c6ee2511011e051719838bdcf8314dc4548d"
+  integrity sha512-/eR8ru5zyxKzpBLv9YZvMXgTSSQn7AdkMItMYynsFgGwTveCRVam9IUPFloE85B4vAIj05IuKmmEoV7/AQjT0w==
   dependencies:
     source-map "~0.6.0"
 
+clean-stack@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+
 cli-cursor@^2.0.0, cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
@@ -4123,15 +5047,6 @@ cli-width@^3.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
-cliui@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
-  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
-  dependencies:
-    string-width "^3.1.0"
-    strip-ansi "^5.2.0"
-    wrap-ansi "^5.1.0"
-
 cliui@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
@@ -4178,14 +5093,6 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-collection-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
-  dependencies:
-    map-visit "^1.0.0"
-    object-visit "^1.0.0"
-
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -4215,11 +5122,21 @@ colord@^2.0.1:
   resolved "https://registry.yarnpkg.com/colord/-/colord-2.1.0.tgz#28cd9d6ac874dff97ef5ec1432c5c0b4e58e49c7"
   integrity sha512-H5sDP9XDk2uP+x/xSGkgB9SEFc1bojdI5DMKU0jmSXQtml2GIe48dj1DcSS0e53QQAHn+JKqUXbGeGX24xWD7w==
 
-colorette@^1.2.1, colorette@^1.2.2:
+colord@^2.9.2:
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz#25e2bacbbaa65991422c07ea209e2089428effb1"
+  integrity sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==
+
+colorette@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
   integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
 
+colorette@^2.0.10, colorette@^2.0.14:
+  version "2.0.16"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
+  integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
+
 combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -4232,16 +5149,21 @@ commander@^2.20.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
-  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
-
 commander@^7.0.0, commander@^7.1.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
+commander@^8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
+  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
+
+common-path-prefix@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0"
+  integrity sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==
+
 common-tags@1.8.0, common-tags@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
@@ -4252,11 +5174,6 @@ commondir@^1.0.1:
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
-component-emitter@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
-  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
-
 compressible@~2.0.16:
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
@@ -4264,12 +5181,12 @@ compressible@~2.0.16:
   dependencies:
     mime-db ">= 1.43.0 < 2"
 
-compression-webpack-plugin@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-8.0.1.tgz#13b34403029760e66007f0bac8cf892a2009a3f4"
-  integrity sha512-VWDXcOgEafQDMFXEnoia0VBXJ+RMw81pmqe/EBiOIBnMfY8pG26eqwIS/ytGpzy1rozydltL0zL6KDH9XNWBxQ==
+compression-webpack-plugin@^9.2.0:
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-9.2.0.tgz#57fd539d17c5907eebdeb4e83dcfe2d7eceb9ef6"
+  integrity sha512-R/Oi+2+UHotGfu72fJiRoVpuRifZT0tTC6UqFD/DUo+mv8dbOow9rVOuTvDv5nPPm3GZhHL/fKkwxwIHnJ8Nyw==
   dependencies:
-    schema-utils "^3.0.0"
+    schema-utils "^4.0.0"
     serialize-javascript "^6.0.0"
 
 compression@^1.7.4:
@@ -4316,7 +5233,7 @@ content-disposition@0.5.3:
   dependencies:
     safe-buffer "5.1.2"
 
-content-type@~1.0.4:
+content-type@^1.0.4, content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
@@ -4338,11 +5255,6 @@ cookie@0.4.0:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
   integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
 
-copy-descriptor@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-
 core-js-compat@^3.14.0, core-js-compat@^3.15.0:
   version "3.15.2"
   resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.15.2.tgz#47272fbb479880de14b4e6081f71f3492f5bd3cb"
@@ -4351,12 +5263,30 @@ core-js-compat@^3.14.0, core-js-compat@^3.15.0:
     browserslist "^4.16.6"
     semver "7.0.0"
 
+core-js-compat@^3.18.0, core-js-compat@^3.19.1:
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.20.0.tgz#fd704640c5a213816b6d10ec0192756111e2c9d1"
+  integrity sha512-relrah5h+sslXssTTOkvqcC/6RURifB0W5yhYBdBkaPYa5/2KBMiog3XiD+s3TwEHWxInWVv4Jx2/Lw0vng+IQ==
+  dependencies:
+    browserslist "^4.19.1"
+    semver "7.0.0"
+
 core-js-pure@^3.15.0:
   version "3.15.2"
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.15.2.tgz#c8e0874822705f3385d3197af9348f7c9ae2e3ce"
   integrity sha512-D42L7RYh1J2grW8ttxoY1+17Y4wXZeKe7uyplAI3FkNQyI5OgBIAjUfFiTPfL1rs0qLpxaabITNbjKl1Sp82tA==
 
-core-js@3, core-js@^3.6.5, core-js@^3.8.2:
+core-js-pure@^3.8.1:
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.20.0.tgz#7253feccf8bb05b72c153ddccdbe391ddbffbe03"
+  integrity sha512-qsrbIwWSEEYOM7z616jAVgwhuDDtPLwZSpUsU3vyUkHYqKTf/uwOJBZg2V7lMurYWkpVlaVOxBrfX0Q3ppvjfg==
+
+core-js@3:
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.20.0.tgz#1c5ac07986b8d15473ab192e45a2e115a4a95b79"
+  integrity sha512-KjbKU7UEfg4YPpskMtMXPhUKn7m/1OdTHTVjy09ScR2LVaoUXe8Jh0UdvN2EKUR6iKTJph52SJP95mAB0MnVLQ==
+
+core-js@^3.6.5, core-js@^3.8.2:
   version "3.15.2"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61"
   integrity sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q==
@@ -4384,15 +5314,16 @@ cosmiconfig@7.0.0, cosmiconfig@^7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
-cosmiconfig@^5.0.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
-  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
+cosmiconfig@7.0.1, cosmiconfig@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
+  integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
   dependencies:
-    import-fresh "^2.0.0"
-    is-directory "^0.3.1"
-    js-yaml "^3.13.1"
-    parse-json "^4.0.0"
+    "@types/parse-json" "^4.0.0"
+    import-fresh "^3.2.1"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+    yaml "^1.10.0"
 
 cosmiconfig@^6.0.0:
   version "6.0.0"
@@ -4418,13 +5349,6 @@ create-require@^1.1.0:
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
-cross-fetch@3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.0.6.tgz#3a4040bc8941e653e0e9cf17f29ebcd177d3365c"
-  integrity sha512-KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ==
-  dependencies:
-    node-fetch "2.6.1"
-
 cross-fetch@3.1.4, cross-fetch@^3.0.4, cross-fetch@^3.0.6:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.4.tgz#9723f3a3a247bf8b89039f3a380a9244e8fa2f39"
@@ -4432,17 +5356,6 @@ cross-fetch@3.1.4, cross-fetch@^3.0.4, cross-fetch@^3.0.6:
   dependencies:
     node-fetch "2.6.1"
 
-cross-spawn@^6.0.0:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
 cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -4452,17 +5365,38 @@ cross-spawn@^7.0.2, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
+cross-undici-fetch@^0.0.20:
+  version "0.0.20"
+  resolved "https://registry.yarnpkg.com/cross-undici-fetch/-/cross-undici-fetch-0.0.20.tgz#6b7c5ac82a3601edd439f37275ac0319d77a120a"
+  integrity sha512-5d3WBC4VRHpFndECK9bx4TngXrw0OUXdhX561Ty1ZoqMASz9uf55BblhTC1CO6GhMWnvk9SOqYEXQliq6D2P4A==
+  dependencies:
+    abort-controller "^3.0.0"
+    form-data "^4.0.0"
+    node-fetch "^2.6.5"
+    undici "^4.9.3"
+
+cross-undici-fetch@^0.1.4:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/cross-undici-fetch/-/cross-undici-fetch-0.1.12.tgz#2985bdbb28c182eae1744832c087559083ac06db"
+  integrity sha512-JNUr0ANEwc3MEUT5xBl2fVnCJqcPa7hpQfEYNsrCG/7/M4pUH5W0nQOe6FKAQGB6SqFPyAeoEn8G375QXWxwWQ==
+  dependencies:
+    abort-controller "^3.0.0"
+    form-data-encoder "^1.7.1"
+    formdata-node "^4.3.1"
+    node-fetch "^2.6.5"
+    undici "^4.9.3"
+
 crypto-random-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
   integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
 
-css-blank-pseudo@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz#dfdefd3254bf8a82027993674ccf35483bfcb3c5"
-  integrity sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w==
+css-blank-pseudo@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-3.0.0.tgz#c40a428886b600ee8a1622231f6cb22c13518d9e"
+  integrity sha512-lBG90FEc4A2lZeRoFkJHYnJlQFgR49hTo3E8HA6oGN+mN66EIslimxtcAYx4xlkBR0c3eNCOjqQ2ACHaav+7Qw==
   dependencies:
-    postcss "^7.0.5"
+    postcss-selector-parser "^6.0.7"
 
 css-color-names@1.0.1, css-color-names@^1.0.1:
   version "1.0.1"
@@ -4481,49 +5415,44 @@ css-declaration-sorter@^6.0.3:
   dependencies:
     timsort "^0.3.0"
 
-css-has-pseudo@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz#3c642ab34ca242c59c41a125df9105841f6966ee"
-  integrity sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ==
+css-has-pseudo@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-3.0.0.tgz#f791f2d578557b22e60842e06d630bd8b8b1a9d3"
+  integrity sha512-1LlqZebDVJXvLPP0RZ8U1jrpFEHWqttBlWz46PVNN6tD65O3IgooDkGEAhfhHTJUGHJHrXzH+ANIC0/1bD9l+A==
   dependencies:
-    postcss "^7.0.6"
-    postcss-selector-parser "^5.0.0-rc.4"
+    postcss-selector-parser "^6.0.7"
 
-css-loader@^5.1.3:
-  version "5.2.7"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae"
-  integrity sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg==
+css-loader@^6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.5.1.tgz#0c43d4fbe0d97f699c91e9818cb585759091d1b1"
+  integrity sha512-gEy2w9AnJNnD9Kuo4XAP9VflW/ujKoS9c/syO+uWMlm5igc7LysKzPXaDoR2vroROkSwsTS2tGr1yGGEbZOYZQ==
   dependencies:
     icss-utils "^5.1.0"
-    loader-utils "^2.0.0"
     postcss "^8.2.15"
     postcss-modules-extract-imports "^3.0.0"
     postcss-modules-local-by-default "^4.0.0"
     postcss-modules-scope "^3.0.0"
     postcss-modules-values "^4.0.0"
     postcss-value-parser "^4.1.0"
-    schema-utils "^3.0.0"
     semver "^7.3.5"
 
-css-minimizer-webpack-plugin@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.0.2.tgz#8fadbdf10128cb40227bff275a4bb47412534245"
-  integrity sha512-B3I5e17RwvKPJwsxjjWcdgpU/zqylzK1bPVghcmpFHRL48DXiBgrtqz1BJsn68+t/zzaLp9kYAaEDvQ7GyanFQ==
+css-minimizer-webpack-plugin@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.3.0.tgz#e61515072e788c4134b9ca395adc56243cf4d3e1"
+  integrity sha512-+SU5aHgGZkk2kxKsq/BZXnYee2cjHIiFARF2gGaG6gIFtLJ87330GeafqhxAemwi/WgQ40v0OQ7pBVljKAMoXg==
   dependencies:
+    "@types/cssnano" "^4.0.1"
     cssnano "^5.0.6"
     jest-worker "^27.0.2"
-    p-limit "^3.0.2"
     postcss "^8.3.5"
-    schema-utils "^3.0.0"
+    schema-utils "^4.0.0"
     serialize-javascript "^6.0.0"
     source-map "^0.6.1"
 
-css-prefers-color-scheme@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz#6f830a2714199d4f0d0d0bb8a27916ed65cff1f4"
-  integrity sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg==
-  dependencies:
-    postcss "^7.0.5"
+css-prefers-color-scheme@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.0.tgz#f4742655bacfcb79503ee797b32a088e1bcaf4e9"
+  integrity sha512-Ko2uKO81GbDgV1DG0OywofFy8Oz3/beGryi3ohmXAGo3duZI2HCz6MCQq85WdiKhWE7N3pMjUByIh137Xp5v6g==
 
 css-select@^4.1.3:
   version "4.1.3"
@@ -4559,15 +5488,10 @@ csscolorparser@~1.0.3:
   resolved "https://registry.yarnpkg.com/csscolorparser/-/csscolorparser-1.0.3.tgz#b34f391eea4da8f3e98231e2ccd8df9c041f171b"
   integrity sha1-s085HupNqPPpgjHizNjfnAQfFxs=
 
-cssdb@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-4.4.0.tgz#3bf2f2a68c10f5c6a08abd92378331ee803cddb0"
-  integrity sha512-LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ==
-
-cssesc@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"
-  integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==
+cssdb@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-5.0.0.tgz#96db23e70dda3d03a32346de611f0e79fee68b7f"
+  integrity sha512-Q7982SynYCtcLUBCPgUPFy2TZmDiFyimpdln8K2v4w2c07W4rXL7q5F1ksVAqOAQfxKyyUGCKSsioezKT5bU1Q==
 
 cssesc@^3.0.0:
   version "3.0.0"
@@ -4698,7 +5622,7 @@ d3-brush@^3.0.0:
   dependencies:
     d3-color "1 - 3"
 
-"d3-interpolate@1.2.0 - 2", d3-interpolate@^2.0.1:
+"d3-interpolate@1.2.0 - 2", d3-interpolate@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-2.0.1.tgz#98be499cfb8a3b94d4ff616900501a64abc91163"
   integrity sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==
@@ -4710,7 +5634,12 @@ d3-brush@^3.0.0:
   resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-2.0.0.tgz#55d86ac131a0548adae241eebfb56b4582dd09d8"
   integrity sha512-ZwZQxKhBnv9yHaiWd6ZU4x5BtCQ7pXszEV9CU6kRgwIQVQGLMv1oiL4M+MK/n79sYzsj+gcgpPQSctJUsLN7fA==
 
-d3-scale@^3.2.3:
+"d3-path@1 - 3":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-3.0.1.tgz#f09dec0aaffd770b7995f1a399152bf93052321e"
+  integrity sha512-gq6gZom9AFZby0YLduxT1qmrp4xpBA1YZr19OI717WIdKE2OM5ETq5qrHLb301IgxhLwcuxvGZVLeeWc/k1I6w==
+
+d3-scale@^3.0.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-3.3.0.tgz#28c600b29f47e5b9cd2df9749c206727966203f3"
   integrity sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==
@@ -4726,13 +5655,20 @@ d3-selection@3, d3-selection@^3.0.0:
   resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-3.0.0.tgz#c25338207efa72cc5b9bd1458a1a41901f1e1b31"
   integrity sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==
 
-d3-shape@^2.0.0, d3-shape@^2.1.0:
+d3-shape@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-2.1.0.tgz#3b6a82ccafbc45de55b57fcf956c584ded3b666f"
   integrity sha512-PnjUqfM2PpskbSLTJvAzp2Wv4CZsnAgTfcVRTwW03QR3MkXF8Uo7B1y/lWkAsmbKwuecto++4NlsYcvYpXpTHA==
   dependencies:
     d3-path "1 - 2"
 
+d3-shape@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-3.0.1.tgz#9ccdfb28fd9b0d12f2d8aec234cd5c4a9ea27931"
+  integrity sha512-HNZNEQoDhuCrDWEc/BMbF/hKtzMZVoe64TvisFLDp2Iyj0UShB/E6/lBsLlJTfBMbYgftHj90cXJ0SEitlE6Xw==
+  dependencies:
+    d3-path "1 - 3"
+
 "d3-time-format@2 - 3":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-3.0.0.tgz#df8056c83659e01f20ac5da5fdeae7c08d5f1bb6"
@@ -4763,7 +5699,7 @@ d3-transition@3:
     d3-interpolate "1 - 3"
     d3-timer "1 - 3"
 
-damerau-levenshtein@^1.0.6:
+damerau-levenshtein@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz#64368003512a1a6992593741a09a9d31a836f55d"
   integrity sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==
@@ -4779,9 +5715,9 @@ date-fns@^1.27.2:
   integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
 
 deasync@^0.1.0:
-  version "0.1.21"
-  resolved "https://registry.yarnpkg.com/deasync/-/deasync-0.1.21.tgz#bb11eabd4466c0d8776f0d82deb8a6126460d30f"
-  integrity sha512-kUmM8Y+PZpMpQ+B4AuOW9k2Pfx/mSupJtxOsLzmnHY2WqZUYRFccFn2RhzPAqt3Xb+sorK/badW2D4zNzqZz5w==
+  version "0.1.24"
+  resolved "https://registry.yarnpkg.com/deasync/-/deasync-0.1.24.tgz#6ecc9c6ff9eba64a4f4572ae3c4db77fed09268a"
+  integrity sha512-i98vg42xNfRZCymummMAN0rIcQ1gZFinSe3btvPIvy6JFTaeHcumeKybRo2HTv86nasfmT0nEgAn2ggLZhOCVA==
   dependencies:
     bindings "^1.5.0"
     node-addon-api "^1.7.1"
@@ -4791,27 +5727,34 @@ debounce@^1.2.0:
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
   integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
 
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
+debug@2.6.9, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
   integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
   dependencies:
     ms "2.1.2"
 
-debug@^3.1.1, debug@^3.2.6, debug@^3.2.7:
+debug@^3.1.1, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   dependencies:
     ms "^2.1.1"
 
+debug@^4.3.2, debug@^4.3.3:
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
+  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
+  dependencies:
+    ms "2.1.2"
+
 decamelize-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -4830,11 +5773,6 @@ decimal.js-light@^2.4.1:
   resolved "https://registry.yarnpkg.com/decimal.js-light/-/decimal.js-light-2.5.1.tgz#134fd32508f19e208f4fb2f8dac0d2626a867934"
   integrity sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==
 
-decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
-
 decompress-response@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
@@ -4874,19 +5812,23 @@ deepmerge@^4.2.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
-default-gateway@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
-  integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
+default-gateway@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71"
+  integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==
   dependencies:
-    execa "^1.0.0"
-    ip-regex "^2.1.0"
+    execa "^5.0.0"
 
 defer-to-connect@^1.0.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
   integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
 
+define-lazy-prop@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
+  integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
+
 define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -4894,40 +5836,19 @@ define-properties@^1.1.3:
   dependencies:
     object-keys "^1.0.12"
 
-define-property@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
-  dependencies:
-    is-descriptor "^0.1.0"
-
-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
-  dependencies:
-    is-descriptor "^1.0.0"
-
-define-property@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
-  dependencies:
-    is-descriptor "^1.0.2"
-    isobject "^3.0.1"
-
-del@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
-  integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==
+del@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952"
+  integrity sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==
   dependencies:
-    "@types/glob" "^7.1.1"
-    globby "^6.1.0"
-    is-path-cwd "^2.0.0"
-    is-path-in-cwd "^2.0.0"
-    p-map "^2.0.0"
-    pify "^4.0.1"
-    rimraf "^2.6.3"
+    globby "^11.0.1"
+    graceful-fs "^4.2.4"
+    is-glob "^4.0.1"
+    is-path-cwd "^2.2.0"
+    is-path-inside "^3.0.2"
+    p-map "^4.0.0"
+    rimraf "^3.0.2"
+    slash "^3.0.0"
 
 delayed-stream@~1.0.0:
   version "1.0.0"
@@ -5019,14 +5940,6 @@ dom-helpers@^3.4.0:
   dependencies:
     "@babel/runtime" "^7.1.2"
 
-dom-serializer@0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
-  integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
-  dependencies:
-    domelementtype "^2.0.1"
-    entities "^2.0.0"
-
 dom-serializer@^1.0.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91"
@@ -5041,23 +5954,11 @@ dom-walk@^0.1.0:
   resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
   integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==
 
-domelementtype@1, domelementtype@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
-  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
-
 domelementtype@^2.0.1, domelementtype@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
   integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
 
-domhandler@^2.3.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
-  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
-  dependencies:
-    domelementtype "1"
-
 domhandler@^4.0.0, domhandler@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059"
@@ -5065,14 +5966,6 @@ domhandler@^4.0.0, domhandler@^4.2.0:
   dependencies:
     domelementtype "^2.2.0"
 
-domutils@^1.5.1:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
-  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
-
 domutils@^2.5.2, domutils@^2.6.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.7.0.tgz#8ebaf0c41ebafcf55b0b72ec31c56323712c5442"
@@ -5104,17 +5997,27 @@ dotenv-webpack@^7.0.3:
   dependencies:
     dotenv-defaults "^2.0.2"
 
+dotenv@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
+  integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
+
 dotenv@^8.2.0:
   version "8.6.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
   integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==
 
+dset@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/dset/-/dset-3.1.1.tgz#07de5af7a8d03eab337ad1a8ba77fe17bba61a8c"
+  integrity sha512-hYf+jZNNqJBD2GiMYb+5mqOIX4R4RRHXU3qWMWYN+rqcR2/YpRL2bUHr8C8fU+5DNvqYjJ8YvMGSLuVPWU1cNg==
+
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
   integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
 
-earcut@^2.2.2:
+earcut@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.2.3.tgz#d44ced2ff5a18859568e327dd9c7d46b16f55cf4"
   integrity sha512-iRDI1QeCQIhMCZk48DRDMVgQSSBDmbzzNhnxIo+pwx3swkfjMh6vh0nWLq1NdvGHLKH6wIrAM3vQWeTj6qeoug==
@@ -5131,32 +6034,34 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-ejs@^2.6.1:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
-  integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
+ejs@^3.1.6:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a"
+  integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==
+  dependencies:
+    jake "^10.6.1"
 
 electron-to-chromium@^1.3.723:
   version "1.3.776"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.776.tgz#33f6e2423b61f1bdaa8d2a103aae78a09764a75f"
   integrity sha512-V0w7eFSBoFPpdw4xexjVPZ770UDZIevSwkkj4W97XbE3IsCsTRFpa7/yXGZ88EOQAUEA09JMMsWK0xsw0kRAYw==
 
+electron-to-chromium@^1.4.17:
+  version "1.4.25"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.25.tgz#ce95e6678f8c6893ae892c7e95a5000e83f1957f"
+  integrity sha512-bTwub9Y/76EiNmfaiJih+hAy6xn7Ns95S4KvI2NuKNOz8TEEKKQUu44xuy0PYMudjM9zdjKRS1bitsUvHTfuUg==
+
 elegant-spinner@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
   integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
 
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emoji-regex@^9.0.0:
+emoji-regex@^9.2.2:
   version "9.2.2"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
   integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
@@ -5187,10 +6092,10 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^5.8.0:
-  version "5.8.2"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz#15ddc779345cbb73e97c611cd00c01c1e7bf4d8b"
-  integrity sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==
+enhanced-resolve@^5.8.3:
+  version "5.8.3"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0"
+  integrity sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -5202,11 +6107,6 @@ enquirer@^2.3.5:
   dependencies:
     ansi-colors "^4.1.1"
 
-entities@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
-  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
-
 entities@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
@@ -5217,13 +6117,6 @@ envinfo@^7.7.3:
   resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
   integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
 
-errno@^0.1.3:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
-  integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
-  dependencies:
-    prr "~1.0.1"
-
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
@@ -5238,7 +6131,7 @@ error-stack-parser@^2.0.6:
   dependencies:
     stackframe "^1.1.1"
 
-es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2:
+es-abstract@^1.18.0-next.2:
   version "1.18.3"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz#25c4c3380a27aa203c44b2b685bba94da31b63e0"
   integrity sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==
@@ -5260,10 +6153,36 @@ es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2:
     string.prototype.trimstart "^1.0.4"
     unbox-primitive "^1.0.1"
 
-es-module-lexer@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.7.1.tgz#c2c8e0f46f2df06274cdaf0dd3f3b33e0a0b267d"
-  integrity sha512-MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw==
+es-abstract@^1.19.0, es-abstract@^1.19.1:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"
+  integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==
+  dependencies:
+    call-bind "^1.0.2"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    get-intrinsic "^1.1.1"
+    get-symbol-description "^1.0.0"
+    has "^1.0.3"
+    has-symbols "^1.0.2"
+    internal-slot "^1.0.3"
+    is-callable "^1.2.4"
+    is-negative-zero "^2.0.1"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.1"
+    is-string "^1.0.7"
+    is-weakref "^1.0.1"
+    object-inspect "^1.11.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.1"
+
+es-module-lexer@^0.9.0:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
+  integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
 
 es-to-primitive@^1.2.1:
   version "1.2.1"
@@ -5294,23 +6213,24 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-config-airbnb-base@^14.2.1:
-  version "14.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.1.tgz#8a2eb38455dc5a312550193b319cdaeef042cd1e"
-  integrity sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA==
+eslint-config-airbnb-base@^15.0.0:
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz#6b09add90ac79c2f8d723a2580e07f3925afd236"
+  integrity sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==
   dependencies:
     confusing-browser-globals "^1.0.10"
     object.assign "^4.1.2"
-    object.entries "^1.1.2"
+    object.entries "^1.1.5"
+    semver "^6.3.0"
 
-eslint-config-airbnb@^18.2.1:
-  version "18.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-18.2.1.tgz#b7fe2b42f9f8173e825b73c8014b592e449c98d9"
-  integrity sha512-glZNDEZ36VdlZWoxn/bUR1r/sdFKPd1mHPbqUtkctgNG4yT2DLLtJ3D+yCV+jzZCc2V1nBVkmdknOJBZ5Hc0fg==
+eslint-config-airbnb@^19.0.2:
+  version "19.0.2"
+  resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-19.0.2.tgz#3a1681e39b68cc6abeae58300014ed5d5706b625"
+  integrity sha512-4v5DEMVSl043LaCT+gsxPcoiIk0iYG5zxJKKjIy80H/D//2E0vtuOBWkb0CBDxjF+y26yQzspIXYuY6wMmt9Cw==
   dependencies:
-    eslint-config-airbnb-base "^14.2.1"
+    eslint-config-airbnb-base "^15.0.0"
     object.assign "^4.1.2"
-    object.entries "^1.1.2"
+    object.entries "^1.1.5"
 
 eslint-import-resolver-babel-module@^5.3.1:
   version "5.3.1"
@@ -5320,20 +6240,21 @@ eslint-import-resolver-babel-module@^5.3.1:
     pkg-up "^3.1.0"
     resolve "^1.20.0"
 
-eslint-import-resolver-node@^0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
-  integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==
+eslint-import-resolver-node@^0.3.6:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"
+  integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==
   dependencies:
-    debug "^2.6.9"
-    resolve "^1.13.1"
+    debug "^3.2.7"
+    resolve "^1.20.0"
 
-eslint-module-utils@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz#b51be1e473dd0de1c5ea638e22429c2490ea8233"
-  integrity sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A==
+eslint-module-utils@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz#b435001c9f8dd4ab7f6d0efcae4b9696d4c24b7c"
+  integrity sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ==
   dependencies:
     debug "^3.2.7"
+    find-up "^2.1.0"
     pkg-dir "^2.0.0"
 
 eslint-plugin-graphql@^4.0.0:
@@ -5346,82 +6267,82 @@ eslint-plugin-graphql@^4.0.0:
     lodash.flatten "^4.4.0"
     lodash.without "^4.4.0"
 
-eslint-plugin-import@^2.23.4:
-  version "2.23.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz#8dceb1ed6b73e46e50ec9a5bb2411b645e7d3d97"
-  integrity sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ==
+eslint-plugin-import@^2.25.3:
+  version "2.25.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.3.tgz#a554b5f66e08fb4f6dc99221866e57cfff824766"
+  integrity sha512-RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg==
   dependencies:
-    array-includes "^3.1.3"
-    array.prototype.flat "^1.2.4"
+    array-includes "^3.1.4"
+    array.prototype.flat "^1.2.5"
     debug "^2.6.9"
     doctrine "^2.1.0"
-    eslint-import-resolver-node "^0.3.4"
-    eslint-module-utils "^2.6.1"
-    find-up "^2.0.0"
+    eslint-import-resolver-node "^0.3.6"
+    eslint-module-utils "^2.7.1"
     has "^1.0.3"
-    is-core-module "^2.4.0"
+    is-core-module "^2.8.0"
+    is-glob "^4.0.3"
     minimatch "^3.0.4"
-    object.values "^1.1.3"
-    pkg-up "^2.0.0"
-    read-pkg-up "^3.0.0"
+    object.values "^1.1.5"
     resolve "^1.20.0"
-    tsconfig-paths "^3.9.0"
+    tsconfig-paths "^3.11.0"
 
-eslint-plugin-jsx-a11y@^6.4.1:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz#a2d84caa49756942f42f1ffab9002436391718fd"
-  integrity sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg==
+eslint-plugin-jsx-a11y@^6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz#cdbf2df901040ca140b6ec14715c988889c2a6d8"
+  integrity sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==
   dependencies:
-    "@babel/runtime" "^7.11.2"
+    "@babel/runtime" "^7.16.3"
     aria-query "^4.2.2"
-    array-includes "^3.1.1"
+    array-includes "^3.1.4"
     ast-types-flow "^0.0.7"
-    axe-core "^4.0.2"
+    axe-core "^4.3.5"
     axobject-query "^2.2.0"
-    damerau-levenshtein "^1.0.6"
-    emoji-regex "^9.0.0"
+    damerau-levenshtein "^1.0.7"
+    emoji-regex "^9.2.2"
     has "^1.0.3"
-    jsx-ast-utils "^3.1.0"
+    jsx-ast-utils "^3.2.1"
     language-tags "^1.0.5"
+    minimatch "^3.0.4"
 
-eslint-plugin-postcss-modules@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-postcss-modules/-/eslint-plugin-postcss-modules-1.2.1.tgz#3da8916cf094a898da4b73d25d6372049b2452fe"
-  integrity sha512-LundCw/mNhvohMNKpFKmXw/VKIcECBdOKSgOrIhnfkgMp3xpRmHux1SewdruYdfNGt1eb+wHbkEPNfts0zDe0Q==
+"eslint-plugin-postcss-modules@git+https://github.com/toggle-corp/eslint-plugin-postcss-modules.git#develop":
+  version "2.0.0"
+  resolved "git+https://github.com/toggle-corp/eslint-plugin-postcss-modules.git#86003f8f438278943cfacb889b6a4168a2cfbb42"
   dependencies:
     anymatch "^3.0.0"
     camelcase "^6.0.0"
     deasync "^0.1.0"
-    icss-utils "^4.1.0"
-    postcss "^7.0.0"
-    postcss-load-config "^2.1.0"
-    postcss-modules-extract-imports "~2.0.0"
-    postcss-modules-local-by-default "^3.0.2"
-    postcss-modules-scope "^2.1.0"
-    postcss-modules-values "^3.0.0"
+    icss-utils "^5.1.0"
+    postcss "^8.3.0"
+    postcss-load-config "^3.1.0"
+    postcss-modules-extract-imports "~3.0.0"
+    postcss-modules-local-by-default "^4.0.0"
+    postcss-modules-scope "^3.0.0"
+    postcss-modules-values "^4.0.0"
 
-eslint-plugin-react-hooks@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz#8c229c268d468956334c943bb45fc860280f5556"
-  integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==
+eslint-plugin-react-hooks@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz#318dbf312e06fab1c835a4abef00121751ac1172"
+  integrity sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==
 
-eslint-plugin-react@^7.24.0:
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz#eadedfa351a6f36b490aa17f4fa9b14e842b9eb4"
-  integrity sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q==
+eslint-plugin-react@^7.27.1:
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.27.1.tgz#469202442506616f77a854d91babaae1ec174b45"
+  integrity sha512-meyunDjMMYeWr/4EBLTV1op3iSG3mjT/pz5gti38UzfM4OPpNc2m0t2xvKCOMU5D6FSdd34BIMFOvQbW+i8GAA==
   dependencies:
-    array-includes "^3.1.3"
-    array.prototype.flatmap "^1.2.4"
+    array-includes "^3.1.4"
+    array.prototype.flatmap "^1.2.5"
     doctrine "^2.1.0"
-    has "^1.0.3"
+    estraverse "^5.3.0"
     jsx-ast-utils "^2.4.1 || ^3.0.0"
     minimatch "^3.0.4"
-    object.entries "^1.1.4"
-    object.fromentries "^2.0.4"
-    object.values "^1.1.4"
+    object.entries "^1.1.5"
+    object.fromentries "^2.0.5"
+    object.hasown "^1.1.0"
+    object.values "^1.1.5"
     prop-types "^15.7.2"
     resolve "^2.0.0-next.3"
-    string.prototype.matchall "^4.0.5"
+    semver "^6.3.0"
+    string.prototype.matchall "^4.0.6"
 
 eslint-scope@5.1.1, eslint-scope@^5.1.1:
   version "5.1.1"
@@ -5431,12 +6352,13 @@ eslint-scope@5.1.1, eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
-  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
+eslint-scope@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.0.tgz#c1f6ea30ac583031f203d65c73e723b01298f153"
+  integrity sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==
   dependencies:
-    eslint-visitor-keys "^1.1.0"
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
 
 eslint-utils@^3.0.0:
   version "3.0.0"
@@ -5445,59 +6367,57 @@ eslint-utils@^3.0.0:
   dependencies:
     eslint-visitor-keys "^2.0.0"
 
-eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
-  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
-
 eslint-visitor-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-webpack-plugin@^2.5.4:
-  version "2.5.4"
-  resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-2.5.4.tgz#473b84932f1a8e2c2b8e66a402d0497bf440b986"
-  integrity sha512-7rYh0m76KyKSDE+B+2PUQrlNS4HJ51t3WKpkJg6vo2jFMbEPTG99cBV0Dm7LXSHucN4WGCG65wQcRiTFrj7iWw==
+eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz#eee4acea891814cda67a7d8812d9647dd0179af2"
+  integrity sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==
+
+eslint-webpack-plugin@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-3.1.1.tgz#83dad2395e5f572d6f4d919eedaa9cf902890fcb"
+  integrity sha512-xSucskTN9tOkfW7so4EaiFIkulWLXwCB/15H917lR6pTv0Zot6/fetFucmENRb7J5whVSFKIvwnrnsa78SG2yg==
   dependencies:
-    "@types/eslint" "^7.2.6"
-    arrify "^2.0.1"
-    jest-worker "^26.6.2"
-    micromatch "^4.0.2"
+    "@types/eslint" "^7.28.2"
+    jest-worker "^27.3.1"
+    micromatch "^4.0.4"
     normalize-path "^3.0.0"
-    schema-utils "^3.0.0"
+    schema-utils "^3.1.1"
 
-eslint@^7.30.0:
-  version "7.30.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.30.0.tgz#6d34ab51aaa56112fd97166226c9a97f505474f8"
-  integrity sha512-VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg==
+eslint@^8.5.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.5.0.tgz#ddd2c1afd8f412036f87ae2a063d2aa296d3175f"
+  integrity sha512-tVGSkgNbOfiHyVte8bCM8OmX+xG9PzVG/B4UCF60zx7j61WIVY/AqJECDgpLD4DbbESD0e174gOg3ZlrX15GDg==
   dependencies:
-    "@babel/code-frame" "7.12.11"
-    "@eslint/eslintrc" "^0.4.2"
-    "@humanwhocodes/config-array" "^0.5.0"
+    "@eslint/eslintrc" "^1.0.5"
+    "@humanwhocodes/config-array" "^0.9.2"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
-    debug "^4.0.1"
+    debug "^4.3.2"
     doctrine "^3.0.0"
     enquirer "^2.3.5"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^2.1.0"
-    eslint-visitor-keys "^2.0.0"
-    espree "^7.3.1"
+    eslint-scope "^7.1.0"
+    eslint-utils "^3.0.0"
+    eslint-visitor-keys "^3.1.0"
+    espree "^9.2.0"
     esquery "^1.4.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
     functional-red-black-tree "^1.0.1"
-    glob-parent "^5.1.2"
+    glob-parent "^6.0.1"
     globals "^13.6.0"
     ignore "^4.0.6"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
-    js-yaml "^3.13.1"
+    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
@@ -5505,27 +6425,21 @@ eslint@^7.30.0:
     natural-compare "^1.4.0"
     optionator "^0.9.1"
     progress "^2.0.0"
-    regexpp "^3.1.0"
+    regexpp "^3.2.0"
     semver "^7.2.1"
-    strip-ansi "^6.0.0"
+    strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
-    table "^6.0.9"
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
-espree@^7.3.0, espree@^7.3.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
-  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+espree@^9.2.0:
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.2.0.tgz#c50814e01611c2d0f8bd4daa83c369eabba80dbc"
+  integrity sha512-oP3utRkynpZWF/F2x/HZJ+AGtnIclaR7z1pYPxy7NYM2fSO6LgK/Rkny8anRSPK/VwEA1eqm2squui0T7ZMOBg==
   dependencies:
-    acorn "^7.4.0"
+    acorn "^8.6.0"
     acorn-jsx "^5.3.1"
-    eslint-visitor-keys "^1.3.0"
-
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+    eslint-visitor-keys "^3.1.0"
 
 esquery@^1.4.0:
   version "1.4.0"
@@ -5551,6 +6465,11 @@ estraverse@^5.1.0, estraverse@^5.2.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
   integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
 
+estraverse@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
+
 estree-walker@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
@@ -5586,26 +6505,6 @@ events@^3.2.0:
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-eventsource@^1.0.7:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf"
-  integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==
-  dependencies:
-    original "^1.0.0"
-
-execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 execa@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
@@ -5633,19 +6532,6 @@ exif-parser@^0.1.12:
   resolved "https://registry.yarnpkg.com/exif-parser/-/exif-parser-0.1.12.tgz#58a9d2d72c02c1f6f02a0ef4a9166272b7760922"
   integrity sha1-WKnS1ywCwfbwKg70qRZicrd2CSI=
 
-expand-brackets@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
-  dependencies:
-    debug "^2.3.3"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    posix-character-classes "^0.1.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
 express@^4.17.1:
   version "4.17.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
@@ -5682,26 +6568,6 @@ express@^4.17.1:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend-shallow@^3.0.0, extend-shallow@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
-  dependencies:
-    assign-symbols "^1.0.0"
-    is-extendable "^1.0.1"
-
-extend@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
 external-editor@^3.0.3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
@@ -5711,20 +6577,6 @@ external-editor@^3.0.3:
     iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
-extglob@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
-  dependencies:
-    array-unique "^0.3.2"
-    define-property "^1.0.0"
-    expand-brackets "^2.1.4"
-    extend-shallow "^2.0.1"
-    fragment-cache "^0.2.1"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
 extract-files@9.0.0, extract-files@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-9.0.0.tgz#8a7744f2437f81f5ed3250ed9f1550de902fe54a"
@@ -5741,11 +6593,11 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-equals@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-2.0.3.tgz#7039b0a039909f345a2ce53f6202a14e5f392efc"
-  integrity sha512-0EMw4TTUxsMDpDkCg0rXor2gsg+npVrMIHbEhvD0HZyIhUX6AktC/yasm+qKwfyswd06Qy95ZKk8p2crTo0iPA==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-2.0.4.tgz#3add9410585e2d7364c2deeb6a707beadb24b927"
+  integrity sha512-caj/ZmjHljPrZtbzJ3kfH5ia/k4mTJe/qSiXAGzxZWRZgsgDV0cvNaQULqUX8t0/JVlzzEdYOwCN5DmzTxoD4w==
 
-fast-glob@^3.1.1, fast-glob@^3.2.5:
+fast-glob@^3.1.1, fast-glob@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
   integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
@@ -5857,15 +6709,12 @@ file-uri-to-path@1.0.0:
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
   integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
-fill-range@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+filelist@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b"
+  integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==
   dependencies:
-    extend-shallow "^2.0.1"
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-    to-regex-range "^2.1.0"
+    minimatch "^3.0.4"
 
 fill-range@^7.0.1:
   version "7.0.1"
@@ -5909,7 +6758,7 @@ find-root@^1.1.0:
   resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
   integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
 
-find-up@^2.0.0, find-up@^2.1.0:
+find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
@@ -5931,6 +6780,14 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
 flat-cache@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
@@ -5944,22 +6801,17 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.1.tgz#bbef080d95fca6709362c73044a1634f7c6e7d05"
   integrity sha512-OMQjaErSFHmHqZe+PSidH5n8j3O0F2DdnVh8JB4j4eUQ2k6KvB0qGfrKIhapvez5JerBbmWkaLYUYWISaESoXg==
 
-flatten@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
-  integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==
-
 follow-redirects@^1.0.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
   integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
 
-for-in@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+form-data-encoder@^1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-1.7.1.tgz#ac80660e4f87ee0d3d3c3638b7da8278ddb8ec96"
+  integrity sha512-EFRDrsMm/kyqbTQocNvRXMLjc7Es2Vk+IQFx/YW7hkUH1eBl4J1fqiP34l74Yt0pFLCNpc06fkbVk00008mzjg==
 
-form-data@4.0.0:
+form-data@4.0.0, form-data@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
   integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
@@ -5977,17 +6829,23 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+formdata-node@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/formdata-node/-/formdata-node-4.3.1.tgz#e7b78a2a51f524ccc483b4d223c89690fd22061d"
+  integrity sha512-8xKSa9et4zb+yziWsD/bI+EYjdg1z2p9EpKr+o+Yk12F/wP66bmDdvjj2ZXd2K/MJlR3HBzWnuV7f82jzHRqCA==
+  dependencies:
+    node-domexception "1.0.0"
+    web-streams-polyfill "4.0.0-beta.1"
+
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
   integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
-fragment-cache@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
-  dependencies:
-    map-cache "^0.2.2"
+fraction.js@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.1.2.tgz#13e420a92422b6cf244dff8690ed89401029fbe8"
+  integrity sha512-o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA==
 
 fresh@0.5.2:
   version "0.5.2"
@@ -6004,19 +6862,16 @@ fs-extra@^9.0.1:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
+fs-monkey@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
+  integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^1.2.7:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
-  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
-  dependencies:
-    bindings "^1.5.0"
-    nan "^2.12.1"
-
 fsevents@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
@@ -6079,7 +6934,7 @@ get-stdin@^8.0.0:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
   integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
 
-get-stream@^4.0.0, get-stream@^4.1.0:
+get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
   integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
@@ -6098,10 +6953,13 @@ get-stream@^6.0.0, get-stream@^6.0.1:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
-get-value@^2.0.3, get-value@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+get-symbol-description@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
+  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.1"
 
 gifwrap@^0.9.2:
   version "0.9.2"
@@ -6117,17 +6975,9 @@ git-revision-webpack-plugin@^5.0.0:
   integrity sha512-RptQN/4UKcEPkCBmRy8kLPo5i8MnF8+XfAgFYN9gbwmKLTLx4YHsQw726H+C5+sIGDixDkmGL3IxPA2gKo+u4w==
 
 gl-matrix@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-3.3.0.tgz#232eef60b1c8b30a28cbbe75b2caf6c48fd6358b"
-  integrity sha512-COb7LDz+SXaHtl/h4LeaFcNdJdAQSDeVqjiIihSXNrkWObZLhDI4hIkZC11Aeqp7bcE72clzB0BnDXr2SmslRA==
-
-glob-parent@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-3.4.3.tgz#fc1191e8320009fd4d20e9339595c6041ddc22c9"
+  integrity sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA==
 
 glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
@@ -6136,12 +6986,19 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
+glob-parent@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+
 glob-to-regexp@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^7.0.3, glob@^7.1.1, glob@^7.1.3, glob@^7.1.6:
+glob@^7.1.1, glob@^7.1.3, glob@^7.1.6:
   version "7.1.7"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
   integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
@@ -6201,7 +7058,7 @@ globby@11.0.3:
     merge2 "^1.3.0"
     slash "^3.0.0"
 
-globby@11.x.x, globby@^11.0.3, globby@^11.0.4:
+globby@11.x.x, globby@^11.0.1, globby@^11.0.3, globby@^11.0.4:
   version "11.0.4"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
   integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
@@ -6213,29 +7070,11 @@ globby@11.x.x, globby@^11.0.3, globby@^11.0.4:
     merge2 "^1.3.0"
     slash "^3.0.0"
 
-globby@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
-  dependencies:
-    array-union "^1.0.1"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
 globjoin@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
   integrity sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=
 
-gonzales-pe@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.3.0.tgz#fe9dec5f3c557eead09ff868c65826be54d067b3"
-  integrity sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==
-  dependencies:
-    minimist "^1.2.5"
-
 got@^9.6.0:
   version "9.6.0"
   resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
@@ -6253,11 +7092,16 @@ got@^9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
   version "4.2.6"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
   integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
 
+graceful-fs@^4.2.6:
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
+  integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
+
 graphql-anywhere@^4.2.7:
   version "4.2.7"
   resolved "https://registry.yarnpkg.com/graphql-anywhere/-/graphql-anywhere-4.2.7.tgz#c06fb40b1d62b39470c80e3731478dbbef060067"
@@ -6267,7 +7111,7 @@ graphql-anywhere@^4.2.7:
     ts-invariant "^0.3.2"
     tslib "^1.10.0"
 
-graphql-config@^3.0.2, graphql-config@^3.3.0:
+graphql-config@^3.0.2:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-3.3.0.tgz#24c3672a427cb67c0c717ca3b9d70e9f0c9e752b"
   integrity sha512-mSQIsPMssr7QrgqhnjI+CyVH6oQgCrgS6irHsTvwf7RFDRnR2k9kqpQOQgVoOytBSn0DOYryS0w0SAg9xor/Jw==
@@ -6284,6 +7128,23 @@ graphql-config@^3.0.2, graphql-config@^3.3.0:
     minimatch "3.0.4"
     string-env-interpolation "1.0.1"
 
+graphql-config@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-4.1.0.tgz#a3b28d3fb537952ebeb69c75e4430605a10695e3"
+  integrity sha512-Myqay6pmdcmX3KqoH+bMbeKZ1cTODpHS2CxF1ZzNnfTE+YUpGTcp01bOw6LpzamRb0T/WTYtGFbZeXGo9Hab2Q==
+  dependencies:
+    "@endemolshinegroup/cosmiconfig-typescript-loader" "3.0.2"
+    "@graphql-tools/graphql-file-loader" "^7.3.2"
+    "@graphql-tools/json-file-loader" "^7.3.2"
+    "@graphql-tools/load" "^7.4.1"
+    "@graphql-tools/merge" "^8.2.1"
+    "@graphql-tools/url-loader" "^7.4.2"
+    "@graphql-tools/utils" "^8.5.1"
+    cosmiconfig "7.0.1"
+    cosmiconfig-toml-loader "1.0.0"
+    minimatch "3.0.4"
+    string-env-interpolation "1.0.1"
+
 graphql-request@^3.3.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-3.4.0.tgz#3a400cd5511eb3c064b1873afb059196bbea9c2b"
@@ -6293,23 +7154,45 @@ graphql-request@^3.3.0:
     extract-files "^9.0.0"
     form-data "^3.0.0"
 
-graphql-tag@^2.11.0, graphql-tag@^2.12.0:
+graphql-sse@^1.0.1:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/graphql-sse/-/graphql-sse-1.0.6.tgz#4f98e0a06f2020542ed054399116108491263224"
+  integrity sha512-y2mVBN2KwNrzxX2KBncQ6kzc6JWvecxuBernrl0j65hsr6MAS3+Yn8PTFSOgRmtolxugepxveyZVQEuaNEbw3w==
+
+graphql-tag@^2.11.0:
   version "2.12.5"
   resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.5.tgz#5cff974a67b417747d05c8d9f5f3cb4495d0db8f"
   integrity sha512-5xNhP4063d16Pz3HBtKprutsPrmHZi5IdUGOWRxA2B6VF7BIRGOHZ5WQvDmJXZuPcBg7rYwaFxvQYjqkSdR3TQ==
   dependencies:
     tslib "^2.1.0"
 
+graphql-tag@^2.12.0, graphql-tag@^2.12.3:
+  version "2.12.6"
+  resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1"
+  integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==
+  dependencies:
+    tslib "^2.1.0"
+
 graphql-ws@^4.4.1:
   version "4.9.0"
   resolved "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-4.9.0.tgz#5cfd8bb490b35e86583d8322f5d5d099c26e365c"
   integrity sha512-sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag==
 
-graphql@^15.3.0, graphql@^15.5.1:
+graphql-ws@^5.4.1:
+  version "5.5.5"
+  resolved "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-5.5.5.tgz#f375486d3f196e2a2527b503644693ae3a8670a9"
+  integrity sha512-hvyIS71vs4Tu/yUYHPvGXsTgo0t3arU820+lT5VjZS2go0ewp2LqyCgxEN56CzOG7Iys52eRhHBiD1gGRdiQtw==
+
+graphql@^15.3.0:
   version "15.5.1"
   resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.5.1.tgz#f2f84415d8985e7b84731e7f3536f8bb9d383aad"
   integrity sha512-FeTRX67T3LoE3LWAxxOlW2K3Bz+rMYAC18rRguK4wgXaTZMiJwSUwDmPFo3UadAKbzirKIg5Qy+sNJXbpPRnQw==
 
+graphql@^16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.2.0.tgz#de3150e80f1fc009590b92a9d16ab1b46e12b656"
+  integrity sha512-MuQd7XXrdOcmfwuLwC2jNvx0n3rxIuNYOxUtiee5XOmfrWo613ar2U8pE7aHAKh8VwfpifubpD9IP+EdEAEOsA==
+
 grid-index@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/grid-index/-/grid-index-1.1.0.tgz#97f8221edec1026c8377b86446a7c71e79522ea7"
@@ -6357,36 +7240,12 @@ has-symbols@^1.0.1, has-symbols@^1.0.2:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
   integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
 
-has-value@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
-  dependencies:
-    get-value "^2.0.3"
-    has-values "^0.1.4"
-    isobject "^2.0.0"
-
-has-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
-  dependencies:
-    get-value "^2.0.6"
-    has-values "^1.0.0"
-    isobject "^3.0.0"
-
-has-values@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
-
-has-values@^1.0.0:
+has-tostringtag@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
+  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
   dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
+    has-symbols "^1.0.2"
 
 has@^1.0.3:
   version "1.0.3"
@@ -6418,19 +7277,14 @@ hex-color-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
-history@^4.9.0:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"
-  integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==
+history@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/history/-/history-5.2.0.tgz#7cdd31cf9bac3c5d31f09c231c9928fad0007b7c"
+  integrity sha512-uPSF6lAJb3nSePJ43hN3eKj1dTWpN9gMod0ZssbFTIsen+WehTmEadgL+kg78xLJFdRfrrC//SavDzmRVdE+Ig==
   dependencies:
-    "@babel/runtime" "^7.1.2"
-    loose-envify "^1.2.0"
-    resolve-pathname "^3.0.0"
-    tiny-invariant "^1.0.2"
-    tiny-warning "^1.0.0"
-    value-equal "^1.0.1"
+    "@babel/runtime" "^7.7.6"
 
-hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -6469,52 +7323,40 @@ hsla-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"
   integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg=
 
-html-entities@^1.2.1, html-entities@^1.3.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc"
-  integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==
+html-entities@^2.1.0, html-entities@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488"
+  integrity sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==
 
-html-minifier-terser@^5.0.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054"
-  integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==
+html-minifier-terser@^6.0.2:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#bfc818934cc07918f6b3669f5774ecdfd48f32ab"
+  integrity sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==
   dependencies:
-    camel-case "^4.1.1"
-    clean-css "^4.2.3"
-    commander "^4.1.1"
+    camel-case "^4.1.2"
+    clean-css "^5.2.2"
+    commander "^8.3.0"
     he "^1.2.0"
-    param-case "^3.0.3"
+    param-case "^3.0.4"
     relateurl "^0.2.7"
-    terser "^4.6.3"
+    terser "^5.10.0"
 
 html-tags@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
   integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==
 
-html-webpack-plugin@^5.3.1:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.3.2.tgz#7b04bf80b1f6fe84a6d3f66c8b79d64739321b08"
-  integrity sha512-HvB33boVNCz2lTyBsSiMffsJ+m0YLIQ+pskblXgN9fnjS1BgEcuAfdInfXfGrkdXV406k9FiDi86eVCDBgJOyQ==
+html-webpack-plugin@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50"
+  integrity sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==
   dependencies:
-    "@types/html-minifier-terser" "^5.0.0"
-    html-minifier-terser "^5.0.1"
+    "@types/html-minifier-terser" "^6.0.0"
+    html-minifier-terser "^6.0.2"
     lodash "^4.17.21"
-    pretty-error "^3.0.4"
+    pretty-error "^4.0.0"
     tapable "^2.0.0"
 
-htmlparser2@^3.10.0:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
-  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
-  dependencies:
-    domelementtype "^1.3.1"
-    domhandler "^2.3.0"
-    domutils "^1.5.1"
-    entities "^1.1.1"
-    inherits "^2.0.1"
-    readable-stream "^3.1.1"
-
 htmlparser2@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
@@ -6572,26 +7414,27 @@ http-parser-js@>=0.5.1:
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
   integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
 
-http-proxy-agent@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
-  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
+http-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
   dependencies:
-    "@tootallnate/once" "1"
+    "@tootallnate/once" "2"
     agent-base "6"
     debug "4"
 
-http-proxy-middleware@0.19.1:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
-  integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
+http-proxy-middleware@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz#7ef3417a479fb7666a571e09966c66a39bd2c15f"
+  integrity sha512-cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg==
   dependencies:
-    http-proxy "^1.17.0"
-    is-glob "^4.0.0"
-    lodash "^4.17.11"
-    micromatch "^3.1.10"
+    "@types/http-proxy" "^1.17.5"
+    http-proxy "^1.18.1"
+    is-glob "^4.0.1"
+    is-plain-obj "^3.0.0"
+    micromatch "^4.0.2"
 
-http-proxy@^1.17.0:
+http-proxy@^1.18.1:
   version "1.18.1"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
   integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
@@ -6620,18 +7463,16 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-icss-utils@^4.0.0, icss-utils@^4.1.0, icss-utils@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467"
-  integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==
-  dependencies:
-    postcss "^7.0.14"
-
 icss-utils@^5.0.0, icss-utils@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
   integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
 
+idb@^6.1.4:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/idb/-/idb-6.1.5.tgz#dbc53e7adf1ac7c59f9b2bf56e00b4ea4fce8c7b"
+  integrity sha512-IJtugpKkiVXQn5Y+LteyBCNk1N8xpGV3wWZk9EVtZWH8DYkjBn0bX1XnGP9RkyZF0sAcywa6unHqSWKe7q4LGw==
+
 ieee754@^1.1.12, ieee754@^1.1.13:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
@@ -6647,40 +7488,42 @@ ignore@^5.1.4, ignore@^5.1.8:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
 
+ignore@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
+  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
+
 image-q@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/image-q/-/image-q-1.1.1.tgz#fc84099664460b90ca862d9300b6bfbbbfbf8056"
   integrity sha1-/IQJlmRGC5DKhi2TALa/u7+/gFY=
 
+immediate@~3.0.5:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
+  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
+
 immer@^7.0.5:
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/immer/-/immer-7.0.15.tgz#dc3bc6db87401659d2e737c67a21b227c484a4ad"
   integrity sha512-yM7jo9+hvYgvdCQdqvhCNRRio0SCXc8xDPzA25SvKWa7b1WVPjLwQs1VYU5JPXjcJPTqAa5NP5dqpORGYBQ2AA==
 
 immer@^9.0.5:
-  version "9.0.5"
-  resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.5.tgz#a7154f34fe7064f15f00554cc94c66cc0bf453ec"
-  integrity sha512-2WuIehr2y4lmYz9gaQzetPR2ECniCifk4ORaQbU3g5EalLt+0IVTosEPJ5BoYl/75ky2mivzdRzV8wWgQGOSYQ==
+  version "9.0.7"
+  resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.7.tgz#b6156bd7db55db7abc73fd2fdadf4e579a701075"
+  integrity sha512-KGllzpbamZDvOIxnmJ0jI840g7Oikx58lBPWV0hUh7dtAyZpFqqrBZdKka5GlTwMTZ1Tjc/bKKW4VSFAt6BqMA==
 
 immutable@~3.7.6:
   version "3.7.6"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.7.6.tgz#13b4d3cb12befa15482a26fe1b2ebae640071e4b"
   integrity sha1-E7TTyxK++hVIKib+Gy665kAHHks=
 
-import-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
-  integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=
-  dependencies:
-    import-from "^2.1.0"
-
-import-fresh@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
-  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
+import-cwd@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-3.0.0.tgz#20845547718015126ea9b3676b7592fb8bd4cf92"
+  integrity sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==
   dependencies:
-    caller-path "^2.0.0"
-    resolve-from "^3.0.0"
+    import-from "^3.0.0"
 
 import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
   version "3.3.0"
@@ -6690,7 +7533,7 @@ import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
-import-from@3.0.0:
+import-from@3.0.0, import-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/import-from/-/import-from-3.0.0.tgz#055cfec38cd5a27d8057ca51376d7d3bf0891966"
   integrity sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==
@@ -6702,26 +7545,11 @@ import-from@4.0.0:
   resolved "https://registry.yarnpkg.com/import-from/-/import-from-4.0.0.tgz#2710b8d66817d232e16f4166e319248d3d5492e2"
   integrity sha512-P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ==
 
-import-from@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
-  integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
-  dependencies:
-    resolve-from "^3.0.0"
-
 import-lazy@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153"
   integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
 
-import-local@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
-  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
-  dependencies:
-    pkg-dir "^3.0.0"
-    resolve-cwd "^2.0.0"
-
 import-local@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6"
@@ -6745,11 +7573,6 @@ indent-string@^4.0.0:
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
-indexes-of@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
-  integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
-
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -6758,7 +7581,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -6792,14 +7615,6 @@ inquirer@^7.3.3:
     strip-ansi "^6.0.0"
     through "^2.3.6"
 
-internal-ip@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
-  integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
-  dependencies:
-    default-gateway "^4.2.0"
-    ipaddr.js "^1.9.0"
-
 internal-slot@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
@@ -6819,28 +7634,28 @@ interpret@^2.2.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
-invariant@^2.2.3:
+invariant@^2.2.3, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
   dependencies:
     loose-envify "^1.0.0"
 
-ip-regex@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
-  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
-
-ip@^1.1.0, ip@^1.1.5:
+ip@^1.1.0:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
   integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
 
-ipaddr.js@1.9.1, ipaddr.js@^1.9.0:
+ipaddr.js@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
+ipaddr.js@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0"
+  integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==
+
 is-absolute-url@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698"
@@ -6854,33 +7669,6 @@ is-absolute@^1.0.0:
     is-relative "^1.0.0"
     is-windows "^1.0.1"
 
-is-accessor-descriptor@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-accessor-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-alphabetical@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d"
-  integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==
-
-is-alphanumerical@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf"
-  integrity sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==
-  dependencies:
-    is-alphabetical "^1.0.0"
-    is-decimal "^1.0.0"
-
 is-arguments@^1.0.4:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9"
@@ -6898,13 +7686,6 @@ is-bigint@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a"
   integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==
 
-is-binary-path@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
-  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
-  dependencies:
-    binary-extensions "^1.0.0"
-
 is-binary-path@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
@@ -6919,21 +7700,16 @@ is-boolean-object@^1.1.0:
   dependencies:
     call-bind "^1.0.2"
 
-is-buffer@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-buffer@^2.0.0:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
-  integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
-
 is-callable@^1.1.4, is-callable@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e"
   integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==
 
+is-callable@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
+  integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
+
 is-color-stop@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345"
@@ -6946,73 +7722,31 @@ is-color-stop@^1.1.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
-is-core-module@^2.2.0, is-core-module@^2.4.0:
+is-core-module@^2.2.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491"
   integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==
   dependencies:
     has "^1.0.3"
 
-is-data-descriptor@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-data-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
+is-core-module@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"
+  integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==
   dependencies:
-    kind-of "^6.0.0"
+    has "^1.0.3"
 
 is-date-object@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5"
   integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==
 
-is-decimal@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"
-  integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==
-
-is-descriptor@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
-  dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
-
-is-descriptor@^1.0.0, is-descriptor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
-  dependencies:
-    is-accessor-descriptor "^1.0.0"
-    is-data-descriptor "^1.0.0"
-    kind-of "^6.0.2"
-
-is-directory@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
-  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
-
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-
-is-extendable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
-  dependencies:
-    is-plain-object "^2.0.4"
+is-docker@^2.0.0, is-docker@^2.1.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
+  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
-is-extglob@^2.1.0, is-extglob@^2.1.1:
+is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
@@ -7046,17 +7780,12 @@ is-glob@4.0.1, is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
+is-glob@4.0.3, is-glob@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
   dependencies:
-    is-extglob "^2.1.0"
-
-is-hexadecimal@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
-  integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==
+    is-extglob "^2.1.1"
 
 is-lower-case@^2.0.2:
   version "2.0.2"
@@ -7080,13 +7809,6 @@ is-number-object@^1.0.4:
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb"
   integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==
 
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
-  dependencies:
-    kind-of "^3.0.2"
-
 is-number@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
@@ -7104,42 +7826,38 @@ is-observable@^1.1.0:
   dependencies:
     symbol-observable "^1.1.0"
 
-is-path-cwd@^2.0.0:
+is-path-cwd@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
   integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
 
-is-path-in-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
-  integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
-  dependencies:
-    is-path-inside "^2.1.0"
-
-is-path-inside@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2"
-  integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==
-  dependencies:
-    path-is-inside "^1.0.2"
+is-path-inside@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
 is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
-is-plain-obj@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
-  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
+is-plain-obj@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
+  integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==
 
-is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
+is-plain-object@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
+
 is-promise@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-4.0.0.tgz#42ff9f84206c1991d26debf520dd5c01042dd2f3"
@@ -7158,6 +7876,14 @@ is-regex@^1.0.4, is-regex@^1.1.2, is-regex@^1.1.3:
     call-bind "^1.0.2"
     has-symbols "^1.0.2"
 
+is-regex@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
+  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
+  dependencies:
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
+
 is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
@@ -7180,6 +7906,11 @@ is-resolvable@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
   integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
 
+is-shared-array-buffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
+  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
+
 is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -7195,6 +7926,13 @@ is-string@^1.0.5, is-string@^1.0.6:
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f"
   integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==
 
+is-string@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
+  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
 is-symbol@^1.0.2, is-symbol@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
@@ -7226,22 +7964,26 @@ is-upper-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
-is-windows@^1.0.1, is-windows@^1.0.2:
+is-weakref@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
+  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
+  dependencies:
+    call-bind "^1.0.2"
+
+is-windows@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
-is-wsl@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
-
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+is-wsl@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
+  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
+  dependencies:
+    is-docker "^2.0.0"
 
-isarray@1.0.0, isarray@~1.0.0:
+isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
@@ -7251,14 +7993,7 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
-  dependencies:
-    isarray "1.0.0"
-
-isobject@^3.0.0, isobject@^3.0.1:
+isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
@@ -7276,7 +8011,7 @@ isomorphic-fetch@^3.0.0:
     node-fetch "^2.6.1"
     whatwg-fetch "^3.4.1"
 
-isomorphic-ws@4.0.1:
+isomorphic-ws@4.0.1, isomorphic-ws@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc"
   integrity sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==
@@ -7286,7 +8021,17 @@ iterall@^1.2.1:
   resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea"
   integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==
 
-jest-worker@^26.2.1, jest-worker@^26.6.2:
+jake@^10.6.1:
+  version "10.8.2"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"
+  integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==
+  dependencies:
+    async "0.9.x"
+    chalk "^2.4.2"
+    filelist "^1.0.1"
+    minimatch "^3.0.4"
+
+jest-worker@^26.2.1:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
   integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
@@ -7304,6 +8049,15 @@ jest-worker@^27.0.2:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
+jest-worker@^27.3.1, jest-worker@^27.4.1:
+  version "27.4.5"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.5.tgz#d696e3e46ae0f24cff3fa7195ffba22889262242"
+  integrity sha512-f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^8.0.0"
+
 jimp@0.16.1:
   version "0.16.1"
   resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.16.1.tgz#192f851a30e5ca11112a3d0aa53137659a78ca7a"
@@ -7325,15 +8079,7 @@ jpeg-js@0.4.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-js-yaml@^4.0.0:
+js-yaml@^4.0.0, js-yaml@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
   integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
@@ -7355,7 +8101,7 @@ json-buffer@3.0.0:
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
   integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
 
-json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
+json-parse-better-errors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
@@ -7375,6 +8121,11 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
+json-schema@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
+  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
+
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
@@ -7395,11 +8146,6 @@ json-to-pretty-yaml@^1.2.2:
     remedial "^1.0.7"
     remove-trailing-spaces "^1.0.6"
 
-json3@^3.3.3:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
-  integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
-
 json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
@@ -7433,6 +8179,11 @@ jsonify@~0.0.0:
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
   integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
 
+jsonpointer@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.0.tgz#f802669a524ec4805fa7389eadbc9921d5dc8072"
+  integrity sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg==
+
 jsonwebtoken@^8.5.1:
   version "8.5.1"
   resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d"
@@ -7449,7 +8200,7 @@ jsonwebtoken@^8.5.1:
     ms "^2.1.1"
     semver "^5.6.0"
 
-"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.1.0:
+"jsx-ast-utils@^2.4.1 || ^3.0.0":
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz#41108d2cec408c3453c1bbe8a4aae9e1e2bd8f82"
   integrity sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q==
@@ -7457,6 +8208,14 @@ jsonwebtoken@^8.5.1:
     array-includes "^3.1.2"
     object.assign "^4.1.2"
 
+jsx-ast-utils@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b"
+  integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==
+  dependencies:
+    array-includes "^3.1.3"
+    object.assign "^4.1.2"
+
 jwa@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
@@ -7486,44 +8245,20 @@ keyv@^3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
-killable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
-  integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
-
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
-
-kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
+kind-of@^6.0.2, kind-of@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-klona@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"
-  integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==
+klona@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
+  integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
 
-known-css-properties@^0.21.0:
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.21.0.tgz#15fbd0bbb83447f3ce09d8af247ed47c68ede80d"
-  integrity sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw==
+known-css-properties@^0.24.0:
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.24.0.tgz#19aefd85003ae5698a5560d2b55135bf5432155c"
+  integrity sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==
 
 language-subtag-registry@~0.3.2:
   version "0.3.21"
@@ -7544,6 +8279,11 @@ latest-version@5.1.0:
   dependencies:
     package-json "^6.3.0"
 
+leven@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
+
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -7552,6 +8292,18 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
+lie@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
+  integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=
+  dependencies:
+    immediate "~3.0.5"
+
+lilconfig@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082"
+  integrity sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==
+
 lines-and-columns@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@@ -7615,16 +8367,6 @@ load-bmfont@^1.3.1, load-bmfont@^1.4.0:
     xhr "^2.0.1"
     xtend "^4.0.0"
 
-load-json-file@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
-    strip-bom "^3.0.0"
-
 loader-runner@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
@@ -7648,6 +8390,13 @@ loader-utils@^2.0.0:
     emojis-list "^3.0.0"
     json5 "^2.1.2"
 
+localforage@^1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz#5c465dc5f62b2807c3a84c0c6a1b1b3212781dd4"
+  integrity sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==
+  dependencies:
+    lie "3.1.1"
+
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -7671,16 +8420,18 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
 lodash-es@^4.17.15:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
   integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
 
-lodash.clonedeep@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
-
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
@@ -7771,7 +8522,7 @@ lodash.without@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac"
   integrity sha1-PNRXSgC2e643OpS3SHcmQFB7eqw=
 
-lodash@4.17.21, lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@~4.17.0:
+lodash@4.17.21, lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@~4.17.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -7783,7 +8534,7 @@ log-symbols@^1.0.2:
   dependencies:
     chalk "^1.0.0"
 
-log-symbols@^4.0.0, log-symbols@^4.1.0:
+log-symbols@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
   integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
@@ -7800,17 +8551,7 @@ log-update@^2.3.0:
     cli-cursor "^2.0.0"
     wrap-ansi "^3.0.1"
 
-loglevel@^1.6.8:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
-  integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
-
-longest-streak@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4"
-  integrity sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==
-
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
   integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
@@ -7867,7 +8608,7 @@ make-error@^1, make-error@^1.1.1:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
-map-cache@^0.2.0, map-cache@^0.2.2:
+map-cache@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
   integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
@@ -7887,29 +8628,22 @@ map-or-similar@^1.5.0:
   resolved "https://registry.yarnpkg.com/map-or-similar/-/map-or-similar-1.5.0.tgz#6de2653174adfb5d9edc33c69d3e92a1b76faf08"
   integrity sha1-beJlMXSt+12e3DPGnT6Sobdvrwg=
 
-map-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
-  dependencies:
-    object-visit "^1.0.0"
-
 mapbox-gl@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-2.4.1.tgz#cd17d35bd4262bc6a9e0e49fef165f8f0dbf6fef"
-  integrity sha512-iTF5UPm63ojEi91A2lSpM5wDfnttuPXJmJRwD65R4n2mAYoQjjRwXvXIgcxKDnZDpdczF1jIFeS1R+H8jp1NCQ==
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-2.6.1.tgz#de8aadeb16b157b732d174b51aeaba0223ab71bb"
+  integrity sha512-faGbSZfcFuZ4GWwkWnJrRD3oICZAt/mVKnGuOmeBobCj9onfTRz270qSoOXeRBKd3po5VA2cCPI91YwA8DsAoQ==
   dependencies:
-    "@mapbox/geojson-rewind" "^0.5.0"
+    "@mapbox/geojson-rewind" "^0.5.1"
     "@mapbox/geojson-types" "^1.0.2"
     "@mapbox/jsonlint-lines-primitives" "^2.0.2"
     "@mapbox/mapbox-gl-supported" "^2.0.0"
     "@mapbox/point-geometry" "^0.1.0"
-    "@mapbox/tiny-sdf" "^1.2.5"
+    "@mapbox/tiny-sdf" "^2.0.2"
     "@mapbox/unitbezier" "^0.0.0"
     "@mapbox/vector-tile" "^1.3.1"
     "@mapbox/whoots-js" "^3.1.0"
     csscolorparser "~1.0.3"
-    earcut "^2.2.2"
+    earcut "^2.2.3"
     geojson-vt "^3.2.1"
     gl-matrix "^3.3.0"
     grid-index "^1.1.0"
@@ -7919,9 +8653,9 @@ mapbox-gl@^2.4.1:
     potpack "^1.0.1"
     quickselect "^2.0.0"
     rw "^1.3.3"
-    supercluster "^7.1.3"
+    supercluster "^7.1.4"
     tinyqueue "^2.0.3"
-    vt-pbf "^3.1.1"
+    vt-pbf "^3.1.3"
 
 material-colors@^1.2.1:
   version "1.2.6"
@@ -7933,34 +8667,6 @@ mathml-tag-names@^2.1.3:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-mdast-util-from-markdown@^0.8.0:
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz#d1ef2ca42bc377ecb0463a987910dae89bd9a28c"
-  integrity sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    mdast-util-to-string "^2.0.0"
-    micromark "~2.11.0"
-    parse-entities "^2.0.0"
-    unist-util-stringify-position "^2.0.0"
-
-mdast-util-to-markdown@^0.6.0:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz#b33f67ca820d69e6cc527a93d4039249b504bebe"
-  integrity sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    longest-streak "^2.0.0"
-    mdast-util-to-string "^2.0.0"
-    parse-entities "^2.0.0"
-    repeat-string "^1.0.0"
-    zwitch "^1.0.0"
-
-mdast-util-to-string@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b"
-  integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==
-
 mdn-data@2.0.14:
   version "2.0.14"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
@@ -7971,6 +8677,13 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
+memfs@^3.2.2:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.0.tgz#8bc12062b973be6b295d4340595736a656f0a257"
+  integrity sha512-o/RfP0J1d03YwsAxyHxAYs2kyJp55AFkMazlFAZFR2I2IXkxiUTXRabJ6RmNNCQ83LAD2jy52Khj0m3OffpNdA==
+  dependencies:
+    fs-monkey "1.0.3"
+
 memoizerific@^1.11.3:
   version "1.11.3"
   resolved "https://registry.yarnpkg.com/memoizerific/-/memoizerific-1.11.3.tgz#7c87a4646444c32d75438570905f2dbd1b1a805a"
@@ -7978,14 +8691,6 @@ memoizerific@^1.11.3:
   dependencies:
     map-or-similar "^1.5.0"
 
-memory-fs@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
-  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
 meow@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"
@@ -8019,7 +8724,7 @@ merge2@^1.3.0:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-meros@1.1.4:
+meros@1.1.4, meros@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/meros/-/meros-1.1.4.tgz#c17994d3133db8b23807f62bec7f0cb276cfd948"
   integrity sha512-E9ZXfK9iQfG9s73ars9qvvvbSIkJZF5yOo9j4tcwM5tN8mUKfj/EKN5PzOr3ZH0y5wL7dLAHw3RVEfpQV9Q7VQ==
@@ -8029,33 +8734,6 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-micromark@~2.11.0:
-  version "2.11.4"
-  resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.4.tgz#d13436138eea826383e822449c9a5c50ee44665a"
-  integrity sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==
-  dependencies:
-    debug "^4.0.0"
-    parse-entities "^2.0.0"
-
-micromatch@^3.1.10, micromatch@^3.1.4:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.1"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    extglob "^2.0.4"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.2"
-    nanomatch "^1.2.9"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.2"
-
 micromatch@^4.0.2, micromatch@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
@@ -8069,6 +8747,11 @@ mime-db@1.48.0, "mime-db@>= 1.43.0 < 2":
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d"
   integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==
 
+mime-db@1.51.0:
+  version "1.51.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
+  integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
+
 mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.24:
   version "2.1.31"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b"
@@ -8076,6 +8759,13 @@ mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.24:
   dependencies:
     mime-db "1.48.0"
 
+mime-types@^2.1.31:
+  version "2.1.34"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
+  integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
+  dependencies:
+    mime-db "1.51.0"
+
 mime@1.6.0, mime@^1.3.4:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
@@ -8086,11 +8776,6 @@ mime@2.4.6:
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
   integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
 
-mime@^2.4.4:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"
-  integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==
-
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
@@ -8118,20 +8803,12 @@ min-indent@^1.0.0:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
-mini-create-react-context@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e"
-  integrity sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ==
-  dependencies:
-    "@babel/runtime" "^7.12.1"
-    tiny-warning "^1.0.3"
-
-mini-css-extract-plugin@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.1.0.tgz#4aa6558b527ad4c168fee4a20b6092ebe9f98309"
-  integrity sha512-SV1GgjMcfqy6hW07rAniUbQE4qS3inh3v4rZEUySkPRWy3vMbS3jUCjMOvNI4lUnDlQYJEmuUqKktTCNY5koFQ==
+mini-css-extract-plugin@^2.4.5:
+  version "2.4.5"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.5.tgz#191d6c170226037212c483af1180b4010b7b9eef"
+  integrity sha512-oEIhRucyn1JbT/1tU2BhnwO6ft1jjH1iCX9Gc59WFMg0n5773rQU0oyQ0zzeYFFuBfONaRbQJyGoPtuNseMxjA==
   dependencies:
-    schema-utils "^3.0.0"
+    schema-utils "^4.0.0"
 
 minimalistic-assert@^1.0.0:
   version "1.0.1"
@@ -8159,14 +8836,6 @@ minimist@^1.2.0, minimist@^1.2.5:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-mixin-deep@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
-  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
-  dependencies:
-    for-in "^1.0.2"
-    is-extendable "^1.0.1"
-
 mkdirp@^0.5.1, mkdirp@^0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
@@ -8222,39 +8891,15 @@ mute-stream@0.0.8:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-nan@^2.12.1:
-  version "2.14.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
-  integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
-
 nanoid@^3.1.23:
   version "3.1.23"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
   integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==
 
-nanomatch@^1.2.9:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
-  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    fragment-cache "^0.2.1"
-    is-windows "^1.0.2"
-    kind-of "^6.0.2"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-native-url@^0.2.6:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/native-url/-/native-url-0.2.6.tgz#ca1258f5ace169c716ff44eccbddb674e10399ae"
-  integrity sha512-k4bDC87WtgrdD362gZz6zoiXQrl40kYlBmpfmSjwRO1VU0V5ccwJTlxuE72F6m3V0vc1xOf6n3UCP9QyerRqmA==
-  dependencies:
-    querystring "^0.2.0"
+nanoid@^3.1.30:
+  version "3.1.30"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362"
+  integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==
 
 natural-compare@^1.4.0:
   version "1.4.0"
@@ -8271,11 +8916,6 @@ neo-async@^2.6.2:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
 no-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
@@ -8289,11 +8929,23 @@ node-addon-api@^1.7.1:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d"
   integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==
 
+node-domexception@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
+  integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==
+
 node-fetch@2.6.1, node-fetch@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
   integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
 
+node-fetch@^2.6.5:
+  version "2.6.6"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89"
+  integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==
+  dependencies:
+    whatwg-url "^5.0.0"
+
 node-forge@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
@@ -8309,7 +8961,12 @@ node-releases@^1.1.71:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20"
   integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
+node-releases@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
+  integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==
+
+normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -8361,13 +9018,6 @@ normalize-url@^6.0.1:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
   integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
-  dependencies:
-    path-key "^2.0.0"
-
 npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
@@ -8387,35 +9037,26 @@ nullthrows@^1.1.1:
   resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1"
   integrity sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==
 
-num2fraction@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
-  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
-
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
-object-copy@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
-  dependencies:
-    copy-descriptor "^0.1.0"
-    define-property "^0.2.5"
-    kind-of "^3.0.3"
-
 object-inspect@^1.10.3, object-inspect@^1.9.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
   integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
 
+object-inspect@^1.11.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
+  integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
+
 object-is@^1.0.1:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
@@ -8429,13 +9070,6 @@ object-keys@^1.0.12, object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object-visit@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
-  dependencies:
-    isobject "^3.0.0"
-
 object.assign@^4.1.0, object.assign@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
@@ -8446,40 +9080,40 @@ object.assign@^4.1.0, object.assign@^4.1.2:
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
-object.entries@^1.1.2, object.entries@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.4.tgz#43ccf9a50bc5fd5b649d45ab1a579f24e088cafd"
-  integrity sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA==
+object.entries@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861"
+  integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.2"
+    es-abstract "^1.19.1"
 
-object.fromentries@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.4.tgz#26e1ba5c4571c5c6f0890cef4473066456a120b8"
-  integrity sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ==
+object.fromentries@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251"
+  integrity sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.2"
-    has "^1.0.3"
+    es-abstract "^1.19.1"
 
-object.pick@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+object.hasown@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz#7232ed266f34d197d15cac5880232f7a4790afe5"
+  integrity sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg==
   dependencies:
-    isobject "^3.0.1"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.1"
 
-object.values@^1.1.3, object.values@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30"
-  integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==
+object.values@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
+  integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.2"
+    es-abstract "^1.19.1"
 
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
@@ -8524,14 +9158,16 @@ onetime@^5.1.0, onetime@^5.1.2:
   dependencies:
     mimic-fn "^2.1.0"
 
-opn@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
-  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
+open@^8.0.9:
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8"
+  integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==
   dependencies:
-    is-wsl "^1.1.0"
+    define-lazy-prop "^2.0.0"
+    is-docker "^2.1.1"
+    is-wsl "^2.2.0"
 
-optimism@^0.16.0:
+optimism@^0.16.0, optimism@^0.16.1:
   version "0.16.1"
   resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.16.1.tgz#7c8efc1f3179f18307b887e18c15c5b7133f6e7d"
   integrity sha512-64i+Uw3otrndfq5kaoGNoY7pvOhSsjFEN4bdEFh80MWVk/dbgJfMv7VFDeCT8LxNAlEVhQmdVEbfE7X2nWNIIg==
@@ -8551,13 +9187,6 @@ optionator@^0.9.1:
     type-check "^0.4.0"
     word-wrap "^1.2.3"
 
-original@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
-  integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
-  dependencies:
-    url-parse "^1.4.3"
-
 os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -8568,11 +9197,6 @@ p-cancelable@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
   integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
 
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
-
 p-limit@3.1.0, p-limit@^3.0.2, p-limit@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
@@ -8615,17 +9239,32 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
 p-map@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
   integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
-p-retry@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328"
-  integrity sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==
+p-map@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
+  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
+  dependencies:
+    aggregate-error "^3.0.0"
+
+p-retry@^4.5.0:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c"
+  integrity sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==
   dependencies:
-    retry "^0.12.0"
+    "@types/retry" "^0.12.0"
+    retry "^0.13.1"
 
 p-try@^1.0.0:
   version "1.0.0"
@@ -8652,7 +9291,7 @@ pako@^1.0.5:
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
   integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
 
-param-case@^3.0.3, param-case@^3.0.4:
+param-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5"
   integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==
@@ -8685,18 +9324,6 @@ parse-bmfont-xml@^1.1.4:
     xml-parse-from-string "^1.0.0"
     xml2js "^0.4.5"
 
-parse-entities@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8"
-  integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==
-  dependencies:
-    character-entities "^1.0.0"
-    character-entities-legacy "^1.0.0"
-    character-reference-invalid "^1.0.0"
-    is-alphanumerical "^1.0.0"
-    is-decimal "^1.0.0"
-    is-hexadecimal "^1.0.0"
-
 parse-filepath@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
@@ -8711,14 +9338,6 @@ parse-headers@^2.0.0:
   resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.3.tgz#5e8e7512383d140ba02f0c7aa9f49b4399c92515"
   integrity sha512-QhhZ+DCCit2Coi2vmAKbq5RGTRcQUOE2+REgv8vdyu7MnYx2eZztegqtTx99TZ86GTIwqiy3+4nQTWZ2tgmdCA==
 
-parse-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
-  dependencies:
-    error-ex "^1.3.1"
-    json-parse-better-errors "^1.0.1"
-
 parse-json@^5.0.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
@@ -8742,11 +9361,6 @@ pascal-case@^3.1.2:
     no-case "^3.0.4"
     tslib "^2.0.3"
 
-pascalcase@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
-
 path-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/path-case/-/path-case-3.0.4.tgz#9168645334eb942658375c56f80b4c0cb5f82c6f"
@@ -8755,11 +9369,6 @@ path-case@^3.0.4:
     dot-case "^3.0.4"
     tslib "^2.0.3"
 
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -8775,16 +9384,6 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
-
-path-key@^2.0.0, path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
-
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
@@ -8812,20 +9411,6 @@ path-to-regexp@0.1.7:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
   integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
-path-to-regexp@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
-  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
-  dependencies:
-    isarray "0.0.1"
-
-path-type@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
-  dependencies:
-    pify "^3.0.0"
-
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
@@ -8849,38 +9434,21 @@ phin@^2.9.1:
   resolved "https://registry.yarnpkg.com/phin/-/phin-2.9.3.tgz#f9b6ac10a035636fb65dfc576aaaa17b8743125c"
   integrity sha512-CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA==
 
+picocolors@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
+  integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
+
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
   integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
 
-pify@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
-
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
-
-pify@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
-  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
 pixelmatch@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-4.0.2.tgz#8f47dcec5011b477b67db03c243bc1f3085e8854"
@@ -8895,13 +9463,6 @@ pkg-dir@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
-pkg-dir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
-  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
-  dependencies:
-    find-up "^3.0.0"
-
 pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
@@ -8909,13 +9470,6 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
-  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
-  dependencies:
-    find-up "^2.1.0"
-
 pkg-up@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
@@ -8935,7 +9489,7 @@ polished@^4.0.5:
   dependencies:
     "@babel/runtime" "^7.14.0"
 
-portfinder@^1.0.26:
+portfinder@^1.0.28:
   version "1.0.28"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
   integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
@@ -8944,25 +9498,17 @@ portfinder@^1.0.26:
     debug "^3.1.1"
     mkdirp "^0.5.5"
 
-posix-character-classes@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
-
-postcss-attribute-case-insensitive@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz#d93e46b504589e94ac7277b0463226c68041a880"
-  integrity sha512-clkFxk/9pcdb4Vkn0hAHq3YnxBQ2p0CGD1dy24jN+reBck+EWxMbxSUqN4Yj7t0w8csl87K6p0gxBe1utkJsYA==
+postcss-attribute-case-insensitive@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.0.tgz#39cbf6babf3ded1e4abf37d09d6eda21c644105c"
+  integrity sha512-b4g9eagFGq9T5SWX4+USfVyjIb3liPnjhHHRMP7FMB2kFVpYyfEscV0wP3eaXhKlcHKUut8lt5BGoeylWA/dBQ==
   dependencies:
-    postcss "^7.0.2"
     postcss-selector-parser "^6.0.2"
 
-postcss-browser-comments@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-browser-comments/-/postcss-browser-comments-3.0.0.tgz#1248d2d935fb72053c8e1f61a84a57292d9f65e9"
-  integrity sha512-qfVjLfq7HFd2e0HW4s1dvU8X080OZdG46fFbIBFjW7US7YPDcWfRvdElvwMJr2LI6hMmD+7LnH2HcmXTs+uOig==
-  dependencies:
-    postcss "^7"
+postcss-browser-comments@^4:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz#bcfc86134df5807f5d3c0eefa191d42136b5e72a"
+  integrity sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg==
 
 postcss-calc@^8.0.0:
   version "8.0.0"
@@ -8972,47 +9518,26 @@ postcss-calc@^8.0.0:
     postcss-selector-parser "^6.0.2"
     postcss-value-parser "^4.0.2"
 
-postcss-color-functional-notation@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz#5efd37a88fbabeb00a2966d1e53d98ced93f74e0"
-  integrity sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g==
-  dependencies:
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
-
-postcss-color-gray@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz#532a31eb909f8da898ceffe296fdc1f864be8547"
-  integrity sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw==
-  dependencies:
-    "@csstools/convert-colors" "^1.4.0"
-    postcss "^7.0.5"
-    postcss-values-parser "^2.0.0"
-
-postcss-color-hex-alpha@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz#a8d9ca4c39d497c9661e374b9c51899ef0f87388"
-  integrity sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw==
+postcss-color-functional-notation@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-4.1.0.tgz#4593ea50d61f1a8bd55fa8c165304badd6383433"
+  integrity sha512-bBB64p3Fzo0DaxGfVp6ELRjOx+MysN1DlvkWtXwZr25i8SZLAEL+QAV6ttX5iraN+e3fdCxaVm7sHobNyy6qug==
   dependencies:
-    postcss "^7.0.14"
-    postcss-values-parser "^2.0.1"
+    postcss-value-parser "^4.2.0"
 
-postcss-color-mod-function@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz#816ba145ac11cc3cb6baa905a75a49f903e4d31d"
-  integrity sha512-YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ==
+postcss-color-hex-alpha@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.1.tgz#ba0fbc4246a92c51a23b7ecbf66f7d9a956d246c"
+  integrity sha512-kzp95xRLSFnFdmVIWwbWa3QohE3v/G/wNBvW4U66Lt4wq119I6Bz1EVErrARWZ5+7HskgQ6M4mpiwjo+jOdApA==
   dependencies:
-    "@csstools/convert-colors" "^1.4.0"
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
+    postcss-value-parser "^4.2.0"
 
-postcss-color-rebeccapurple@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz#c7a89be872bb74e45b1e3022bfe5748823e6de77"
-  integrity sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g==
+postcss-color-rebeccapurple@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.0.1.tgz#59a9f5493dd7912079eac2aaeebccb076a6abdf8"
+  integrity sha512-uA5MAOoCwCK32VgYXWwPD3vBDDOi1oMOkLnO+U1Af6ex7JOE0xHVJqnc9w5QS+fPJ9yveXeHKVtdVqzP2WiCsQ==
   dependencies:
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
+    postcss-value-parser "^4.2.0"
 
 postcss-colormin@^5.2.0:
   version "5.2.0"
@@ -9031,36 +9556,31 @@ postcss-convert-values@^5.0.1:
   dependencies:
     postcss-value-parser "^4.1.0"
 
-postcss-custom-media@^7.0.8:
-  version "7.0.8"
-  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz#fffd13ffeffad73621be5f387076a28b00294e0c"
-  integrity sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg==
-  dependencies:
-    postcss "^7.0.14"
+postcss-custom-media@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-8.0.0.tgz#1be6aff8be7dc9bf1fe014bde3b71b92bb4552f1"
+  integrity sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==
 
-postcss-custom-properties@^8.0.11:
-  version "8.0.11"
-  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz#2d61772d6e92f22f5e0d52602df8fae46fa30d97"
-  integrity sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA==
+postcss-custom-properties@^12.0.1:
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-12.0.1.tgz#9aab8686e73a899de9440ce27cc10595ad3b0e22"
+  integrity sha512-Z3WjuML7qn6ehesWD4vDqOmM5CZO/qfVknpI9/gDOwMNhcLg3OSgT5wENR4kFDZtCricAE7cxL97bsj5lFnuZQ==
   dependencies:
-    postcss "^7.0.17"
-    postcss-values-parser "^2.0.1"
+    postcss-value-parser "^4.2.0"
 
-postcss-custom-selectors@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz#64858c6eb2ecff2fb41d0b28c9dd7b3db4de7fba"
-  integrity sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w==
+postcss-custom-selectors@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-6.0.0.tgz#022839e41fbf71c47ae6e316cb0e6213012df5ef"
+  integrity sha512-/1iyBhz/W8jUepjGyu7V1OPcGbc636snN1yXEQCinb6Bwt7KxsiU7/bLQlp8GwAXzCh7cobBU5odNn/2zQWR8Q==
   dependencies:
-    postcss "^7.0.2"
-    postcss-selector-parser "^5.0.0-rc.3"
+    postcss-selector-parser "^6.0.4"
 
-postcss-dir-pseudo-class@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz#6e3a4177d0edb3abcc85fdb6fbb1c26dabaeaba2"
-  integrity sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw==
+postcss-dir-pseudo-class@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.1.tgz#90958de910870b9c20bff4279a0b74d54c880224"
+  integrity sha512-nA6+XVUc5VDe6LrJ5KWFqJ05dxZXzoYiUQJFZSuwLW/8aI462w7gCEhB+RnOA+N3dtrj8B2WTSfcjCac6RJW0A==
   dependencies:
-    postcss "^7.0.2"
-    postcss-selector-parser "^5.0.0-rc.3"
+    postcss-selector-parser "^6.0.7"
 
 postcss-discard-comments@^5.0.1:
   version "5.0.1"
@@ -9082,120 +9602,90 @@ postcss-discard-overridden@^5.0.1:
   resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6"
   integrity sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q==
 
-postcss-double-position-gradients@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz#fc927d52fddc896cb3a2812ebc5df147e110522e"
-  integrity sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA==
-  dependencies:
-    postcss "^7.0.5"
-    postcss-values-parser "^2.0.0"
-
-postcss-env-function@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-2.0.2.tgz#0f3e3d3c57f094a92c2baf4b6241f0b0da5365d7"
-  integrity sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw==
-  dependencies:
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
-
-postcss-focus-visible@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz#477d107113ade6024b14128317ade2bd1e17046e"
-  integrity sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g==
+postcss-double-position-gradients@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-3.0.3.tgz#4c528dacfe3b7a52ea99665866912072184322b0"
+  integrity sha512-x3DYDhCsKS/sjH6t+sM9R+pq4lCwdHGVeUOpE/gDybfY33acJJie+NzRigKJVze7E/jH/1WGl/qPRV90Lso7Mg==
   dependencies:
-    postcss "^7.0.2"
+    postcss-value-parser "^4.2.0"
 
-postcss-focus-within@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz#763b8788596cee9b874c999201cdde80659ef680"
-  integrity sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w==
+postcss-env-function@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-4.0.3.tgz#cd56e3898d87b69c35d9b44b1df050a59757b803"
+  integrity sha512-RQ0CwXX161FLuC525Lx7VqsHXSPQvgErgOMcbfuAKPq1hgHDPJLemowVaPuWF4E3IO8rgUbStaRLGTM5VlN/vw==
   dependencies:
-    postcss "^7.0.2"
+    postcss-value-parser "^4.2.0"
 
-postcss-font-variant@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-4.0.1.tgz#42d4c0ab30894f60f98b17561eb5c0321f502641"
-  integrity sha512-I3ADQSTNtLTTd8uxZhtSOrTCQ9G4qUVKPjHiDk0bV75QSxXjVWiJVJ2VLdspGUi9fbW9BcjKJoRvxAH1pckqmA==
+postcss-focus-visible@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-6.0.2.tgz#b5034899d098c26c68e6f901e2674c88ee1aaede"
+  integrity sha512-KYztrdQRRr+pPJQRAyr9HAEr8I8TUfpSyqOo8qddrjtMLap7Ud1FAF8szi4ZWrhMmch3EwL4RQMqsneOByWZIA==
   dependencies:
-    postcss "^7.0.2"
+    postcss-selector-parser "^6.0.7"
 
-postcss-gap-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz#431c192ab3ed96a3c3d09f2ff615960f902c1715"
-  integrity sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg==
+postcss-focus-within@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-5.0.2.tgz#ba9229b68c03ad65aa4ead81ca29717b5b4dbf62"
+  integrity sha512-0zm8gM/fpFZtWM8drbj5M6HKVztHgLqtHygCMB494SOkudtnePpq5nv0ie2Jx/BrD+A5nhj0uK3tuMnEpjKonA==
   dependencies:
-    postcss "^7.0.2"
+    postcss-selector-parser "^6.0.7"
 
-postcss-html@^0.36.0:
-  version "0.36.0"
-  resolved "https://registry.yarnpkg.com/postcss-html/-/postcss-html-0.36.0.tgz#b40913f94eaacc2453fd30a1327ad6ee1f88b204"
-  integrity sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==
-  dependencies:
-    htmlparser2 "^3.10.0"
+postcss-font-variant@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz#efd59b4b7ea8bb06127f2d031bfbb7f24d32fa66"
+  integrity sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==
 
-postcss-image-set-function@^3.0.1:
+postcss-gap-properties@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz#28920a2f29945bed4c3198d7df6496d410d3f288"
-  integrity sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw==
-  dependencies:
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-3.0.1.tgz#c663a2f116d980d8901f33c583e7205109acc87f"
+  integrity sha512-t7ztwUmG17KQRTHDWeekeSQ41ZsjYK+OJagee3E3hFS46n9RD5QcT/NRxwbc2DWjVSL5GQf46al3wEiH6FRSKg==
 
-postcss-initial@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.4.tgz#9d32069a10531fe2ecafa0b6ac750ee0bc7efc53"
-  integrity sha512-3RLn6DIpMsK1l5UUy9jxQvoDeUN4gP939tDcKUHD/kM8SGSKbFAnvkpFpj3Bhtz3HGk1jWY5ZNWX6mPta5M9fg==
+postcss-image-set-function@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-4.0.3.tgz#1be9324adf679226980c554542ea3fe5d056856f"
+  integrity sha512-+EZRaCg/MzsKW2ggTy26mG/uoHnEAjCcGICCkUYgg2PPguZaRjSBKY4KHiWcdH6ydsR7enlnO3i7bQ+Fpbx7vQ==
   dependencies:
-    postcss "^7.0.2"
+    postcss-value-parser "^4.2.0"
 
-postcss-lab-function@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz#bb51a6856cd12289ab4ae20db1e3821ef13d7d2e"
-  integrity sha512-whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg==
-  dependencies:
-    "@csstools/convert-colors" "^1.4.0"
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
+postcss-initial@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-4.0.1.tgz#529f735f72c5724a0fb30527df6fb7ac54d7de42"
+  integrity sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==
 
-postcss-less@^3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-3.1.4.tgz#369f58642b5928ef898ffbc1a6e93c958304c5ad"
-  integrity sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==
+postcss-lab-function@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-4.0.2.tgz#6b91acb5f44e3ddc283c2c593b8858e5c261bda4"
+  integrity sha512-IkX1S1CROQF9uCu5F4/Ib5SRFDJXlJg3ig9x4OJkKIF16y0o7WRKfFje2ym+yThfwYjozwHZgf37Xwbnscpipg==
   dependencies:
-    postcss "^7.0.14"
+    postcss-value-parser "^4.2.0"
 
-postcss-load-config@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz#c5ea504f2c4aef33c7359a34de3573772ad7502a"
-  integrity sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==
+postcss-load-config@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.0.tgz#d39c47091c4aec37f50272373a6a648ef5e97829"
+  integrity sha512-ipM8Ds01ZUophjDTQYSVP70slFSYg3T0/zyfII5vzhN6V57YSxMgG5syXuwi5VtS8wSf3iL30v0uBdoIVx4Q0g==
   dependencies:
-    cosmiconfig "^5.0.0"
-    import-cwd "^2.0.0"
+    import-cwd "^3.0.0"
+    lilconfig "^2.0.3"
+    yaml "^1.10.2"
 
-postcss-loader@^4.0.3:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.3.0.tgz#2c4de9657cd4f07af5ab42bd60a673004da1b8cc"
-  integrity sha512-M/dSoIiNDOo8Rk0mUqoj4kpGq91gcxCfb9PoyZVdZ76/AuhxylHDYZblNE8o+EQ9AMSASeMFEKxZf5aU6wlx1Q==
+postcss-loader@^6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.1.tgz#0895f7346b1702103d30fdc66e4d494a93c008ef"
+  integrity sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==
   dependencies:
     cosmiconfig "^7.0.0"
-    klona "^2.0.4"
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
-    semver "^7.3.4"
+    klona "^2.0.5"
+    semver "^7.3.5"
 
-postcss-logical@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-3.0.0.tgz#2495d0f8b82e9f262725f75f9401b34e7b45d5b5"
-  integrity sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA==
-  dependencies:
-    postcss "^7.0.2"
+postcss-logical@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-5.0.1.tgz#48dcdfca520d00ac5a450289d37d5db8f532de70"
+  integrity sha512-cKekWCoZrxdQktbj8PyCOqQWxsYAPyHjoeBPedkQzfWuEqRm0KVFRHypsHAiH2dDVUae52yx8PBtWS+V3BqT5w==
 
-postcss-media-minmax@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz#b75bb6cbc217c8ac49433e12f22048814a4f5ed5"
-  integrity sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw==
-  dependencies:
-    postcss "^7.0.2"
+postcss-media-minmax@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz#7140bddec173e2d6d657edbd8554a55794e2a5b5"
+  integrity sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==
 
 postcss-media-query-parser@^0.2.3:
   version "0.2.3"
@@ -9257,28 +9747,11 @@ postcss-minify-selectors@^5.1.0:
     alphanum-sort "^1.0.2"
     postcss-selector-parser "^6.0.5"
 
-postcss-modules-extract-imports@^3.0.0:
+postcss-modules-extract-imports@^3.0.0, postcss-modules-extract-imports@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
   integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
 
-postcss-modules-extract-imports@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e"
-  integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==
-  dependencies:
-    postcss "^7.0.5"
-
-postcss-modules-local-by-default@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0"
-  integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==
-  dependencies:
-    icss-utils "^4.1.1"
-    postcss "^7.0.32"
-    postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.1.0"
-
 postcss-modules-local-by-default@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
@@ -9288,14 +9761,6 @@ postcss-modules-local-by-default@^4.0.0:
     postcss-selector-parser "^6.0.2"
     postcss-value-parser "^4.1.0"
 
-postcss-modules-scope@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee"
-  integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==
-  dependencies:
-    postcss "^7.0.6"
-    postcss-selector-parser "^6.0.0"
-
 postcss-modules-scope@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06"
@@ -9303,14 +9768,6 @@ postcss-modules-scope@^3.0.0:
   dependencies:
     postcss-selector-parser "^6.0.4"
 
-postcss-modules-values@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz#5b5000d6ebae29b4255301b4a3a54574423e7f10"
-  integrity sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==
-  dependencies:
-    icss-utils "^4.0.0"
-    postcss "^7.0.6"
-
 postcss-modules-values@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"
@@ -9318,20 +9775,19 @@ postcss-modules-values@^4.0.0:
   dependencies:
     icss-utils "^5.0.0"
 
-postcss-nested@^4.2.1:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-4.2.3.tgz#c6f255b0a720549776d220d00c4b70cd244136f6"
-  integrity sha512-rOv0W1HquRCamWy2kFl3QazJMMe1ku6rCFoAAH+9AcxdbpDeBr6k968MLWuLjvjMcGEip01ak09hKOEgpK9hvw==
+postcss-nested@^5.0.6:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc"
+  integrity sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==
   dependencies:
-    postcss "^7.0.32"
-    postcss-selector-parser "^6.0.2"
+    postcss-selector-parser "^6.0.6"
 
-postcss-nesting@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-7.0.1.tgz#b50ad7b7f0173e5b5e3880c3501344703e04c052"
-  integrity sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg==
+postcss-nesting@^10.0.3:
+  version "10.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-10.0.3.tgz#f19288ad07ef5ee47eb86991580b5d7b16a7f5ca"
+  integrity sha512-Dshtj57d5ytK1AeVNpQHp8gINgdjsRJaRjH1QmJHGcfOQIP4TNtlrrrh5o3i3bBTwge2+nh1D9xbI2wrckz5Xw==
   dependencies:
-    postcss "^7.0.2"
+    postcss-selector-parser "^6.0.7"
 
 postcss-normalize-charset@^5.0.1:
   version "5.0.1"
@@ -9400,14 +9856,13 @@ postcss-normalize-whitespace@^5.0.1:
   dependencies:
     postcss-value-parser "^4.1.0"
 
-postcss-normalize@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize/-/postcss-normalize-9.0.0.tgz#3b551279f78ec3b2e151bc8cf52ff6e46c4cc60c"
-  integrity sha512-//kq5O1xkygzN1iCioFIBtzyVTgB6ce9+Hu0mNHuUhPn+FnnFSPybe5kBemnUPPqd7QrHc+kdX6GVECUWdU2uQ==
+postcss-normalize@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize/-/postcss-normalize-10.0.1.tgz#464692676b52792a06b06880a176279216540dd7"
+  integrity sha512-+5w18/rDev5mqERcG3W5GZNMJa1eoYYNGo8gB7tEwaos0ajk3ZXAI4mHGcNT47NE+ZnZD1pEpUOFLvltIwmeJA==
   dependencies:
     "@csstools/normalize.css" "*"
-    postcss "^7.0.27"
-    postcss-browser-comments "^3.0.0"
+    postcss-browser-comments "^4"
     sanitize.css "*"
 
 postcss-ordered-values@^5.0.2:
@@ -9418,78 +9873,68 @@ postcss-ordered-values@^5.0.2:
     cssnano-utils "^2.0.1"
     postcss-value-parser "^4.1.0"
 
-postcss-overflow-shorthand@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz#31ecf350e9c6f6ddc250a78f0c3e111f32dd4c30"
-  integrity sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g==
-  dependencies:
-    postcss "^7.0.2"
+postcss-overflow-shorthand@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.1.tgz#d0d0a9e2bbf3428a31e0a9d81e4a0dc1164ce356"
+  integrity sha512-/ajDNoTF+LiuhIZjenjb/ndBoKP/WYy/dTT8BCCtLU1wrezkax+lXw5r3c5qR4cadNNMbksAnhWJXNjd9xNTHA==
 
-postcss-page-break@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-2.0.0.tgz#add52d0e0a528cabe6afee8b46e2abb277df46bf"
-  integrity sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ==
-  dependencies:
-    postcss "^7.0.2"
+postcss-page-break@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-3.0.4.tgz#7fbf741c233621622b68d435babfb70dd8c1ee5f"
+  integrity sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==
 
-postcss-place@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-4.0.1.tgz#e9f39d33d2dc584e46ee1db45adb77ca9d1dcc62"
-  integrity sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg==
+postcss-place@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-7.0.2.tgz#f54e971a348e8fa76d65d94420a83302fc9416e1"
+  integrity sha512-XsZCU8X8M9dHKGlxdycihxPajSkRd4u+cIUJz/FgC61Mr/swStI3xAvsYai9Fh22kU+VVAn7ihoZk8h9pQhDfA==
   dependencies:
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
+    postcss-value-parser "^4.2.0"
 
-postcss-preset-env@^6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz#c34ddacf8f902383b35ad1e030f178f4cdf118a5"
-  integrity sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg==
-  dependencies:
-    autoprefixer "^9.6.1"
-    browserslist "^4.6.4"
-    caniuse-lite "^1.0.30000981"
-    css-blank-pseudo "^0.1.4"
-    css-has-pseudo "^0.10.0"
-    css-prefers-color-scheme "^3.1.1"
-    cssdb "^4.4.0"
-    postcss "^7.0.17"
-    postcss-attribute-case-insensitive "^4.0.1"
-    postcss-color-functional-notation "^2.0.1"
-    postcss-color-gray "^5.0.0"
-    postcss-color-hex-alpha "^5.0.3"
-    postcss-color-mod-function "^3.0.3"
-    postcss-color-rebeccapurple "^4.0.1"
-    postcss-custom-media "^7.0.8"
-    postcss-custom-properties "^8.0.11"
-    postcss-custom-selectors "^5.1.2"
-    postcss-dir-pseudo-class "^5.0.0"
-    postcss-double-position-gradients "^1.0.0"
-    postcss-env-function "^2.0.2"
-    postcss-focus-visible "^4.0.0"
-    postcss-focus-within "^3.0.0"
-    postcss-font-variant "^4.0.0"
-    postcss-gap-properties "^2.0.0"
-    postcss-image-set-function "^3.0.1"
-    postcss-initial "^3.0.0"
-    postcss-lab-function "^2.0.1"
-    postcss-logical "^3.0.0"
-    postcss-media-minmax "^4.0.0"
-    postcss-nesting "^7.0.0"
-    postcss-overflow-shorthand "^2.0.0"
-    postcss-page-break "^2.0.0"
-    postcss-place "^4.0.1"
-    postcss-pseudo-class-any-link "^6.0.0"
-    postcss-replace-overflow-wrap "^3.0.0"
-    postcss-selector-matches "^4.0.0"
-    postcss-selector-not "^4.0.0"
-
-postcss-pseudo-class-any-link@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz#2ed3eed393b3702879dec4a87032b210daeb04d1"
-  integrity sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew==
+postcss-preset-env@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-7.0.2.tgz#f143d4aa2eb0f13a50f20bbcff8b3bb3413e7bc6"
+  integrity sha512-xgmkS+H2xhjPQWewnH4ViKBCHIZ15FfpldGZuBFaBIi/iipxHTLnBHKtkCp1L531SdNEPwo9md2psjOU1G77lw==
+  dependencies:
+    autoprefixer "^10.4.0"
+    browserslist "^4.19.1"
+    caniuse-lite "^1.0.30001287"
+    css-blank-pseudo "^3.0.0"
+    css-has-pseudo "^3.0.0"
+    css-prefers-color-scheme "^6.0.0"
+    cssdb "^5.0.0"
+    postcss-attribute-case-insensitive "^5.0.0"
+    postcss-color-functional-notation "^4.1.0"
+    postcss-color-hex-alpha "^8.0.1"
+    postcss-color-rebeccapurple "^7.0.1"
+    postcss-custom-media "^8.0.0"
+    postcss-custom-properties "^12.0.1"
+    postcss-custom-selectors "^6.0.0"
+    postcss-dir-pseudo-class "^6.0.1"
+    postcss-double-position-gradients "^3.0.3"
+    postcss-env-function "^4.0.3"
+    postcss-focus-visible "^6.0.2"
+    postcss-focus-within "^5.0.2"
+    postcss-font-variant "^5.0.0"
+    postcss-gap-properties "^3.0.1"
+    postcss-image-set-function "^4.0.3"
+    postcss-initial "^4.0.1"
+    postcss-lab-function "^4.0.2"
+    postcss-logical "^5.0.1"
+    postcss-media-minmax "^5.0.0"
+    postcss-nesting "^10.0.3"
+    postcss-overflow-shorthand "^3.0.1"
+    postcss-page-break "^3.0.4"
+    postcss-place "^7.0.2"
+    postcss-pseudo-class-any-link "^7.0.1"
+    postcss-replace-overflow-wrap "^4.0.0"
+    postcss-selector-not "^5.0.0"
+
+postcss-pseudo-class-any-link@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.0.1.tgz#9b7b3572b78b0d6e2016bcc8762b254e341ebdde"
+  integrity sha512-Zt+VMw9qX7Um/cYOaywOQvXipDw/U3U83L6MFHocbjVIhLd+x5G4SSDmKm8sW2/HlaTno2Cazub8USrDvJ4DLA==
   dependencies:
-    postcss "^7.0.2"
-    postcss-selector-parser "^5.0.0-rc.3"
+    postcss-selector-parser "^6.0.7"
 
 postcss-reduce-initial@^5.0.1:
   version "5.0.1"
@@ -9507,66 +9952,29 @@ postcss-reduce-transforms@^5.0.1:
     cssnano-utils "^2.0.1"
     postcss-value-parser "^4.1.0"
 
-postcss-replace-overflow-wrap@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz#61b360ffdaedca84c7c918d2b0f0d0ea559ab01c"
-  integrity sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw==
-  dependencies:
-    postcss "^7.0.2"
+postcss-replace-overflow-wrap@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz#d2df6bed10b477bf9c52fab28c568b4b29ca4319"
+  integrity sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==
 
 postcss-resolve-nested-selector@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"
   integrity sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=
 
-postcss-safe-parser@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz#a6d4e48f0f37d9f7c11b2a581bf00f8ba4870b96"
-  integrity sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==
-  dependencies:
-    postcss "^7.0.26"
-
-postcss-sass@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.4.4.tgz#91f0f3447b45ce373227a98b61f8d8f0785285a3"
-  integrity sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==
-  dependencies:
-    gonzales-pe "^4.3.0"
-    postcss "^7.0.21"
-
-postcss-scss@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.1.1.tgz#ec3a75fa29a55e016b90bf3269026c53c1d2b383"
-  integrity sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==
-  dependencies:
-    postcss "^7.0.6"
-
-postcss-selector-matches@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz#71c8248f917ba2cc93037c9637ee09c64436fcff"
-  integrity sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww==
-  dependencies:
-    balanced-match "^1.0.0"
-    postcss "^7.0.2"
-
-postcss-selector-not@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-4.0.1.tgz#263016eef1cf219e0ade9a913780fc1f48204cbf"
-  integrity sha512-YolvBgInEK5/79C+bdFMyzqTg6pkYqDbzZIST/PDMqa/o3qtXenD05apBG2jLgT0/BQ77d4U2UK12jWpilqMAQ==
-  dependencies:
-    balanced-match "^1.0.0"
-    postcss "^7.0.2"
+postcss-safe-parser@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz#bb4c29894171a94bc5c996b9a30317ef402adaa1"
+  integrity sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==
 
-postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4:
+postcss-selector-not@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c"
-  integrity sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==
+  resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-5.0.0.tgz#ac5fc506f7565dd872f82f5314c0f81a05630dc7"
+  integrity sha512-/2K3A4TCP9orP4TNS7u3tGdRFVKqz/E6pX3aGnriPG0jU78of8wsUcqE4QAhWEU0d+WnMSF93Ah3F//vUtK+iQ==
   dependencies:
-    cssesc "^2.0.0"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
+    balanced-match "^1.0.0"
 
-postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5:
+postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5:
   version "6.0.6"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea"
   integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==
@@ -9574,6 +9982,14 @@ postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
+postcss-selector-parser@^6.0.6, postcss-selector-parser@^6.0.7:
+  version "6.0.7"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.7.tgz#48404830a635113a71fd79397de8209ed05a66fc"
+  integrity sha512-U+b/Deoi4I/UmE6KOVPpnhS7I7AYdKbhGcat+qTQ27gycvaACvNEw11ba6RrkwVmDVRW7sigWgLj4/KbbJjeDA==
+  dependencies:
+    cssesc "^3.0.0"
+    util-deprecate "^1.0.2"
+
 postcss-sorting@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/postcss-sorting/-/postcss-sorting-4.1.0.tgz#a107f0bf3852977fa64e4442bc340c88d5aacdb3"
@@ -9590,11 +10006,6 @@ postcss-svgo@^5.0.2:
     postcss-value-parser "^4.1.0"
     svgo "^2.3.0"
 
-postcss-syntax@^0.36.2:
-  version "0.36.2"
-  resolved "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.36.2.tgz#f08578c7d95834574e5593a82dfbfa8afae3b51c"
-  integrity sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==
-
 postcss-unique-selectors@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.1.tgz#3be5c1d7363352eff838bd62b0b07a0abad43bfc"
@@ -9614,16 +10025,20 @@ postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
 
-postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz#da8b472d901da1e205b47bdc98637b9e9e550e5f"
-  integrity sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==
+postcss-value-parser@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
+  integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
+
+"postcss@5 - 7":
+  version "7.0.39"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309"
+  integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
   dependencies:
-    flatten "^1.0.2"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
+    picocolors "^0.2.1"
+    source-map "^0.6.1"
 
-postcss@7.x.x, postcss@^7, postcss@^7.0.0, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.5, postcss@^7.0.6:
+postcss@7.x.x, postcss@^7.0.0, postcss@^7.0.2:
   version "7.0.36"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.36.tgz#056f8cffa939662a8f5905950c07d5285644dfcb"
   integrity sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==
@@ -9641,10 +10056,19 @@ postcss@^8.2.15, postcss@^8.3.5:
     nanoid "^3.1.23"
     source-map-js "^0.6.2"
 
+postcss@^8.3.0, postcss@^8.3.11:
+  version "8.4.5"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.5.tgz#bae665764dfd4c6fcc24dc0fdf7e7aa00cc77f95"
+  integrity sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==
+  dependencies:
+    nanoid "^3.1.30"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.1"
+
 potpack@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/potpack/-/potpack-1.0.1.tgz#d1b1afd89e4c8f7762865ec30bd112ab767e2ebf"
-  integrity sha512-15vItUAbViaYrmaB/Pbw7z6qX2xENbFSTA7Ii4tgbPtasxm5v6ryKhKtL91tpWovDJzTiZqdwzhcFBCwiMVdVw==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/potpack/-/potpack-1.0.2.tgz#23b99e64eb74f5741ffe7656b5b5c4ddce8dfc14"
+  integrity sha512-choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ==
 
 prelude-ls@^1.2.1:
   version "1.2.1"
@@ -9661,13 +10085,13 @@ pretty-bytes@^5.3.0, pretty-bytes@^5.4.1:
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
   integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
 
-pretty-error@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-3.0.4.tgz#94b1d54f76c1ed95b9c604b9de2194838e5b574e"
-  integrity sha512-ytLFLfv1So4AO1UkoBF6GXQgJRaKbiSiGFICaOPNwQ3CMvBvXpLRubeQWyPGnsbV/t9ml9qto6IeCsho0aEvwQ==
+pretty-error@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6"
+  integrity sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==
   dependencies:
     lodash "^4.17.20"
-    renderkid "^2.0.6"
+    renderkid "^3.0.0"
 
 process-nextick-args@~2.0.0:
   version "2.0.1"
@@ -9701,9 +10125,9 @@ prop-types@^15.5.10, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
     react-is "^16.8.1"
 
 protocol-buffers-schema@^3.3.1:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/protocol-buffers-schema/-/protocol-buffers-schema-3.5.2.tgz#38ad35ba768607a5ed2375f8db4c2ecc5ea293c8"
-  integrity sha512-LPzSaBYp/TcbuSlpGwqT5jR9kvJ3Zp5ic2N5c2ybx6XB/lSfEHq2D7ja8AgoxHoMD91wXFALJoXsvshKPuXyew==
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz#77bc75a48b2ff142c1ad5b5b90c94cd0fa2efd03"
+  integrity sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw==
 
 proxy-addr@~2.0.5:
   version "2.0.7"
@@ -9713,11 +10137,6 @@ proxy-addr@~2.0.5:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
-prr@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
-
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@@ -9753,16 +10172,6 @@ querystring@0.2.0:
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
-querystring@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd"
-  integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==
-
-querystringify@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
-  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
-
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -9844,17 +10253,12 @@ react-ga@^3.3.0:
   resolved "https://registry.yarnpkg.com/react-ga/-/react-ga-3.3.0.tgz#c91f407198adcb3b49e2bc5c12b3fe460039b3ca"
   integrity sha512-o8RScHj6Lb8cwy3GMrVH6NJvL+y0zpJvKtc0+wmH7Bt23rszJmnqEQxRbyrqUzk9DTJIHoP42bfO5rswC9SWBQ==
 
-react-icons@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-4.2.0.tgz#6dda80c8a8f338ff96a1851424d63083282630d0"
-  integrity sha512-rmzEDFt+AVXRzD7zDE21gcxyBizD/3NqjbX6cmViAgdqfJ2UiLer8927/QhhrXQV7dEj/1EGuOTPp7JnLYVJKQ==
-
-react-is@16.10.2:
-  version "16.10.2"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.10.2.tgz#984120fd4d16800e9a738208ab1fba422d23b5ab"
-  integrity sha512-INBT1QEgtcCCgvccr5/86CfD71fw9EPmDxgiJX4I2Ddr6ZsV6iFXsuby+qWJPtmNuMY0zByTsG4468P7nHuNWA==
+react-icons@^4.2.0, react-icons@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-4.3.1.tgz#2fa92aebbbc71f43d2db2ed1aed07361124e91ca"
+  integrity sha512-cB10MXLTs3gVuXimblAdI71jrJx8njrJZmNMEMC+sQu5B/BIOmlsAjskdqpn81y8UBVEGuHODd7/ci5DvoSzTQ==
 
-react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1:
+react-is@^16.10.2, react-is@^16.7.0, react-is@^16.8.1:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
@@ -9871,49 +10275,35 @@ react-org-tree@^1.0.0:
   dependencies:
     classnames "^2.2.6"
 
-react-refresh@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.10.0.tgz#2f536c9660c0b9b1d500684d9e52a65e7404f7e3"
-  integrity sha512-PgidR3wST3dDYKr6b4pJoqQFpPGNKDSCDx4cZoshjXipw3LzO7mG1My2pwEzz2JVkF+inx3xRpDeQLFQGH/hsQ==
+react-refresh@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046"
+  integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==
 
 react-resize-detector@^6.6.3, react-resize-detector@^6.7.4:
-  version "6.7.4"
-  resolved "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-6.7.4.tgz#594cc026115af05484e8011157b5dc2137492680"
-  integrity sha512-wzvGmUdEDMhiUHVZGnl4kuyj/TEQhvbB5LyAGkbYXetwJ2O+u/zftmPvU+kxiO1h+d9aUqQBKcNLS7TvB3ytqA==
+  version "6.7.6"
+  resolved "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-6.7.6.tgz#4416994e5ead7eba76606e3a248a1dfca49b67a3"
+  integrity sha512-/6RZlul1yePSoYJxWxmmgjO320moeLC/khrwpEVIL+D2EjLKhqOwzFv+H8laMbImVj7Zu4FlMa0oA7au3/ChjQ==
   dependencies:
-    "@types/resize-observer-browser" "^0.1.5"
+    "@types/resize-observer-browser" "^0.1.6"
     lodash.debounce "^4.0.8"
     lodash.throttle "^4.1.1"
     resize-observer-polyfill "^1.5.1"
 
-react-router-dom@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz#9e65a4d0c45e13289e66c7b17c7e175d0ea15662"
-  integrity sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==
+react-router-dom@^6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.2.1.tgz#32ec81829152fbb8a7b045bf593a22eadf019bec"
+  integrity sha512-I6Zax+/TH/cZMDpj3/4Fl2eaNdcvoxxHoH1tYOREsQ22OKDYofGebrNm6CTPUcvLvZm63NL/vzCYdjf9CUhqmA==
   dependencies:
-    "@babel/runtime" "^7.1.2"
-    history "^4.9.0"
-    loose-envify "^1.3.1"
-    prop-types "^15.6.2"
-    react-router "5.2.0"
-    tiny-invariant "^1.0.2"
-    tiny-warning "^1.0.0"
+    history "^5.2.0"
+    react-router "6.2.1"
 
-react-router@5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.0.tgz#424e75641ca8747fbf76e5ecca69781aa37ea293"
-  integrity sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==
+react-router@6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.2.1.tgz#be2a97a6006ce1d9123c28934e604faef51448a3"
+  integrity sha512-2fG0udBtxou9lXtK97eJeET2ki5//UWfQSl1rlJ7quwe6jrktK9FCCc8dQb5QY6jAv3jua8bBQRhhDOM/kVRsg==
   dependencies:
-    "@babel/runtime" "^7.1.2"
-    history "^4.9.0"
-    hoist-non-react-statics "^3.1.0"
-    loose-envify "^1.3.1"
-    mini-create-react-context "^0.4.0"
-    path-to-regexp "^1.7.0"
-    prop-types "^15.6.2"
-    react-is "^16.6.0"
-    tiny-invariant "^1.0.2"
-    tiny-warning "^1.0.0"
+    history "^5.2.0"
 
 react-smooth@^2.0.0:
   version "2.0.0"
@@ -9934,10 +10324,10 @@ react-transition-group@2.9.0:
     prop-types "^15.6.2"
     react-lifecycles-compat "^3.0.4"
 
-react-zoom-pan-pinch@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/react-zoom-pan-pinch/-/react-zoom-pan-pinch-1.6.1.tgz#da16267c258ab37e8ebcdc7c252794a9633e91ec"
-  integrity sha512-J2eM0gZ04XiUWvmKZrOhSAB2zjyoK7kw2POIeN1X0yTTlmp6HPGV0zYfjnlkhgt8nQwpvXAbsF/oAnkuiwk1kA==
+react-zoom-pan-pinch@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/react-zoom-pan-pinch/-/react-zoom-pan-pinch-2.1.3.tgz#3b84594200343136c0d4397c33fec38dc0ee06ad"
+  integrity sha512-a5AChOWhjo0RmxsNZXGQIlNh3e3nLU6m4V6M+6dlbPNk5d+MtMxgKWyA5zpR06Lp3OZkZVF9nR8JeWSvKwck9g==
 
 react@^17.0.2:
   version "17.0.2"
@@ -9954,14 +10344,6 @@ reactcss@^1.2.0:
   dependencies:
     lodash "^4.0.1"
 
-read-pkg-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
-  integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=
-  dependencies:
-    find-up "^2.0.0"
-    read-pkg "^3.0.0"
-
 read-pkg-up@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
@@ -9971,15 +10353,6 @@ read-pkg-up@^7.0.1:
     read-pkg "^5.2.0"
     type-fest "^0.8.1"
 
-read-pkg@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
-  dependencies:
-    load-json-file "^4.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^3.0.0"
-
 read-pkg@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
@@ -9990,7 +10363,7 @@ read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-readable-stream@^2.0.1, readable-stream@^2.0.2:
+readable-stream@^2.0.1:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -10003,7 +10376,7 @@ readable-stream@^2.0.1, readable-stream@^2.0.2:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.0.6, readable-stream@^3.1.1:
+readable-stream@^3.0.6:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -10012,15 +10385,6 @@ readable-stream@^3.0.6, readable-stream@^3.1.1:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readdirp@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
-  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
-  dependencies:
-    graceful-fs "^4.1.11"
-    micromatch "^3.1.10"
-    readable-stream "^2.0.2"
-
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
@@ -10035,20 +10399,21 @@ recharts-scale@^0.4.4:
   dependencies:
     decimal.js-light "^2.4.1"
 
-recharts@*, recharts@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/recharts/-/recharts-2.1.0.tgz#1d54110b992f8a0149ed0bea0e140a359ab42d35"
-  integrity sha512-Eq2AlhaLmYL8DMNXkGMAylgGvNmHFdb6BDmN3pAK31s9ty4P9ApYrpKJ1eW3222nayQxoaMJHxcxoaswo5AuqA==
+recharts@^2.1.6:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/recharts/-/recharts-2.1.8.tgz#ca8774fcec5f5d7ec15dedd638db9ee12faf1c09"
+  integrity sha512-Wi7ufdDGyvy/BPf1za1Ok7VeWB2KtEejaewO9ulmlUhvn5l5RPS4AOkrUfhtMRTTjgJ4K6AbWMDpwtDjczUHJA==
   dependencies:
+    "@types/d3-interpolate" "^2.0.0"
     "@types/d3-scale" "^3.0.0"
     "@types/d3-shape" "^2.0.0"
     classnames "^2.2.5"
-    d3-interpolate "^2.0.1"
-    d3-scale "^3.2.3"
+    d3-interpolate "^2.0.0"
+    d3-scale "^3.0.0"
     d3-shape "^2.0.0"
     eventemitter3 "^4.0.1"
     lodash "^4.17.19"
-    react-is "16.10.2"
+    react-is "^16.10.2"
     react-resize-detector "^6.6.3"
     react-smooth "^2.0.0"
     recharts-scale "^0.4.4"
@@ -10089,11 +10454,16 @@ regenerate@^1.4.0:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7:
+regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.7:
   version "0.13.7"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
   integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
 
+regenerator-runtime@^0.13.4:
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
+  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
+
 regenerator-transform@^0.14.2:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
@@ -10101,14 +10471,6 @@ regenerator-transform@^0.14.2:
   dependencies:
     "@babel/runtime" "^7.8.4"
 
-regex-not@^1.0.0, regex-not@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
-  dependencies:
-    extend-shallow "^3.0.2"
-    safe-regex "^1.1.0"
-
 regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
@@ -10117,7 +10479,7 @@ regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.1:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-regexpp@^3.1.0:
+regexpp@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
@@ -10165,58 +10527,37 @@ relateurl@^0.2.7:
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
   integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
 
-relay-compiler@10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/relay-compiler/-/relay-compiler-10.1.0.tgz#fb4672cdbe9b54869a3a79759edd8c2d91609cbe"
-  integrity sha512-HPqc3N3tNgEgUH5+lTr5lnLbgnsZMt+MRiyS0uAVNhuPY2It0X1ZJG+9qdA3L9IqKFUNwVn6zTO7RArjMZbARQ==
+relay-compiler@12.0.0:
+  version "12.0.0"
+  resolved "https://registry.yarnpkg.com/relay-compiler/-/relay-compiler-12.0.0.tgz#9f292d483fb871976018704138423a96c8a45439"
+  integrity sha512-SWqeSQZ+AMU/Cr7iZsHi1e78Z7oh00I5SvR092iCJq79aupqJ6Ds+I1Pz/Vzo5uY5PY0jvC4rBJXzlIN5g9boQ==
   dependencies:
-    "@babel/core" "^7.0.0"
-    "@babel/generator" "^7.5.0"
-    "@babel/parser" "^7.0.0"
+    "@babel/core" "^7.14.0"
+    "@babel/generator" "^7.14.0"
+    "@babel/parser" "^7.14.0"
     "@babel/runtime" "^7.0.0"
-    "@babel/traverse" "^7.0.0"
+    "@babel/traverse" "^7.14.0"
     "@babel/types" "^7.0.0"
-    babel-preset-fbjs "^3.3.0"
+    babel-preset-fbjs "^3.4.0"
     chalk "^4.0.0"
     fb-watchman "^2.0.0"
     fbjs "^3.0.0"
     glob "^7.1.1"
     immutable "~3.7.6"
+    invariant "^2.2.4"
     nullthrows "^1.1.1"
-    relay-runtime "10.1.0"
+    relay-runtime "12.0.0"
     signedsource "^1.0.0"
     yargs "^15.3.1"
 
-relay-runtime@10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/relay-runtime/-/relay-runtime-10.1.0.tgz#4753bf36e95e8d862cef33608e3d98b4ed730d16"
-  integrity sha512-bxznLnQ1ST6APN/cFi7l0FpjbZVchWQjjhj9mAuJBuUqNNCh9uV+UTRhpQF7Q8ycsPp19LHTpVyGhYb0ustuRQ==
+relay-runtime@12.0.0:
+  version "12.0.0"
+  resolved "https://registry.yarnpkg.com/relay-runtime/-/relay-runtime-12.0.0.tgz#1e039282bdb5e0c1b9a7dc7f6b9a09d4f4ff8237"
+  integrity sha512-QU6JKr1tMsry22DXNy9Whsq5rmvwr3LSZiiWV/9+DFpuTWvp+WFhobWMc8TC4OjKFfNhEZy7mOiqUAn5atQtug==
   dependencies:
     "@babel/runtime" "^7.0.0"
     fbjs "^3.0.0"
-
-remark-parse@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-9.0.0.tgz#4d20a299665880e4f4af5d90b7c7b8a935853640"
-  integrity sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==
-  dependencies:
-    mdast-util-from-markdown "^0.8.0"
-
-remark-stringify@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-9.0.1.tgz#576d06e910548b0a7191a71f27b33f1218862894"
-  integrity sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==
-  dependencies:
-    mdast-util-to-markdown "^0.6.0"
-
-remark@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/remark/-/remark-13.0.0.tgz#d15d9bf71a402f40287ebe36067b66d54868e425"
-  integrity sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==
-  dependencies:
-    remark-parse "^9.0.0"
-    remark-stringify "^9.0.0"
-    unified "^9.1.0"
+    invariant "^2.2.4"
 
 remedial@^1.0.7:
   version "1.0.8"
@@ -10233,26 +10574,16 @@ remove-trailing-spaces@^1.0.6:
   resolved "https://registry.yarnpkg.com/remove-trailing-spaces/-/remove-trailing-spaces-1.0.8.tgz#4354d22f3236374702f58ee373168f6d6887ada7"
   integrity sha512-O3vsMYfWighyFbTd8hk8VaSj9UAGENxAtX+//ugIst2RMk5e03h6RoIS+0ylsFxY1gvmPuAY/PO4It+gPEeySA==
 
-renderkid@^2.0.6:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.7.tgz#464f276a6bdcee606f4a15993f9b29fc74ca8609"
-  integrity sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==
+renderkid@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-3.0.0.tgz#5fd823e4d6951d37358ecc9a58b1f06836b6268a"
+  integrity sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==
   dependencies:
     css-select "^4.1.3"
     dom-converter "^0.2.0"
     htmlparser2 "^6.1.0"
     lodash "^4.17.21"
-    strip-ansi "^3.0.1"
-
-repeat-element@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
-  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
-
-repeat-string@^1.0.0, repeat-string@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+    strip-ansi "^6.0.1"
 
 replaceall@^0.1.6:
   version "0.1.6"
@@ -10289,13 +10620,6 @@ resize-observer-polyfill@^1.5.1:
   resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
   integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
 
-resolve-cwd@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
-  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
-  dependencies:
-    resolve-from "^3.0.0"
-
 resolve-cwd@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
@@ -10308,21 +10632,11 @@ resolve-from@5.0.0, resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve-from@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
-  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
-
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-resolve-pathname@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd"
-  integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==
-
 resolve-protobuf-schema@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz#9ca9a9e69cf192bbdaf1006ec1973948aa4a3758"
@@ -10330,11 +10644,6 @@ resolve-protobuf-schema@^2.1.0:
   dependencies:
     protocol-buffers-schema "^3.3.1"
 
-resolve-url@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-
 resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.9.0:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
@@ -10382,15 +10691,10 @@ restore-cursor@^3.1.0:
     onetime "^5.1.0"
     signal-exit "^3.0.2"
 
-ret@~0.1.10:
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
-
-retry@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
-  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
+retry@^0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
+  integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
 
 reusify@^1.0.4:
   version "1.0.4"
@@ -10407,13 +10711,6 @@ rgba-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
   integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
 
-rimraf@^2.6.3:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
@@ -10477,13 +10774,6 @@ safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-regex@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
-  dependencies:
-    ret "~0.1.10"
-
 "safer-buffer@>= 2.1.2 < 3":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
@@ -10507,15 +10797,6 @@ scheduler@^0.20.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-schema-utils@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
-  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-errors "^1.0.0"
-    ajv-keywords "^3.1.0"
-
 schema-utils@^2.6.5:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
@@ -10534,6 +10815,25 @@ schema-utils@^3.0.0:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
+schema-utils@^3.1.0, schema-utils@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
+  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
+  dependencies:
+    "@types/json-schema" "^7.0.8"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
+schema-utils@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7"
+  integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    ajv "^8.8.0"
+    ajv-formats "^2.1.1"
+    ajv-keywords "^5.0.0"
+
 scuid@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/scuid/-/scuid-1.1.0.tgz#d3f9f920956e737a60f72d0e4ad280bf324d5dab"
@@ -10544,14 +10844,14 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
-selfsigned@^1.10.8:
+selfsigned@^1.10.11:
   version "1.10.11"
   resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9"
   integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==
   dependencies:
     node-forge "^0.10.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -10641,17 +10941,7 @@ serve-static@1.14.1:
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
-set-value@^2.0.0, set-value@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
-  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.3"
-    split-string "^3.0.1"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
 setimmediate@^1.0.5:
   version "1.0.5"
@@ -10675,13 +10965,6 @@ shallow-clone@^3.0.0:
   dependencies:
     kind-of "^6.0.2"
 
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
-  dependencies:
-    shebang-regex "^1.0.0"
-
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -10689,11 +10972,6 @@ shebang-command@^2.0.0:
   dependencies:
     shebang-regex "^3.0.0"
 
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
-
 shebang-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
@@ -10708,7 +10986,7 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
+signal-exit@^3.0.2, signal-exit@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
   integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
@@ -10745,48 +11023,6 @@ snake-case@^3.0.4:
     dot-case "^3.0.4"
     tslib "^2.0.3"
 
-snapdragon-node@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
-  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
-  dependencies:
-    define-property "^1.0.0"
-    isobject "^3.0.0"
-    snapdragon-util "^3.0.1"
-
-snapdragon-util@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
-  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
-  dependencies:
-    kind-of "^3.2.0"
-
-snapdragon@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
-  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
-  dependencies:
-    base "^0.11.1"
-    debug "^2.2.0"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    map-cache "^0.2.2"
-    source-map "^0.5.6"
-    source-map-resolve "^0.5.0"
-    use "^3.1.0"
-
-sockjs-client@^1.5.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.1.tgz#256908f6d5adfb94dabbdbd02c66362cca0f9ea6"
-  integrity sha512-VnVAb663fosipI/m6pqRXakEOw7nvd7TUgdr3PlR/8V2I95QIdwT8L4nMxhyU8SmDBHYXU1TOElaKOmKLfYzeQ==
-  dependencies:
-    debug "^3.2.6"
-    eventsource "^1.0.7"
-    faye-websocket "^0.11.3"
-    inherits "^2.0.4"
-    json3 "^3.3.3"
-    url-parse "^1.5.1"
-
 sockjs@^0.3.21:
   version "0.3.21"
   resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz#b34ffb98e796930b60a0cfa11904d6a339a7d417"
@@ -10796,7 +11032,7 @@ sockjs@^0.3.21:
     uuid "^3.4.0"
     websocket-driver "^0.7.4"
 
-source-list-map@^2.0.0, source-list-map@^2.0.1:
+source-list-map@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
@@ -10806,18 +11042,12 @@ source-map-js@^0.6.2:
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"
   integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==
 
-source-map-resolve@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
-  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
-  dependencies:
-    atob "^2.1.2"
-    decode-uri-component "^0.2.0"
-    resolve-url "^0.2.1"
-    source-map-url "^0.4.0"
-    urix "^0.1.0"
+source-map-js@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf"
+  integrity sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==
 
-source-map-support@^0.5.17, source-map-support@~0.5.12, source-map-support@~0.5.19:
+source-map-support@^0.5.17, source-map-support@~0.5.19:
   version "0.5.19"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
   integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
@@ -10825,12 +11055,20 @@ source-map-support@^0.5.17, source-map-support@~0.5.12, source-map-support@~0.5.
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
+source-map-support@~0.5.20:
+  version "0.5.21"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
+  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-url@^0.4.0:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
   integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
 
-source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
+source-map@^0.5.0, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
@@ -10911,13 +11149,6 @@ specificity@^0.4.1:
   resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.4.1.tgz#aab5e645012db08ba182e151165738d00887b019"
   integrity sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==
 
-split-string@^3.0.1, split-string@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
-  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
-  dependencies:
-    extend-shallow "^3.0.0"
-
 sponge-case@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sponge-case/-/sponge-case-1.0.1.tgz#260833b86453883d974f84854cdb63aecc5aef4c"
@@ -10925,11 +11156,6 @@ sponge-case@^1.0.1:
   dependencies:
     tslib "^2.0.3"
 
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
 stable@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
@@ -10940,14 +11166,6 @@ stackframe@^1.1.1:
   resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz#52429492d63c62eb989804c11552e3d22e779303"
   integrity sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA==
 
-static-extend@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
-  dependencies:
-    define-property "^0.2.5"
-    object-copy "^0.1.0"
-
 "statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
@@ -10980,16 +11198,7 @@ string-width@^2.1.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^3.0.0, string-width@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2:
+string-width@^4.1.0, string-width@^4.2.0:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
   integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
@@ -10998,14 +11207,23 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
-string.prototype.matchall@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz#59370644e1db7e4c0c045277690cf7b01203c4da"
-  integrity sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q==
+string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string.prototype.matchall@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa"
+  integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.2"
+    es-abstract "^1.19.1"
     get-intrinsic "^1.1.1"
     has-symbols "^1.0.2"
     internal-slot "^1.0.3"
@@ -11065,13 +11283,6 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
-
 strip-ansi@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
@@ -11079,6 +11290,20 @@ strip-ansi@^6.0.0:
   dependencies:
     ansi-regex "^5.0.0"
 
+strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2"
+  integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==
+  dependencies:
+    ansi-regex "^6.0.1"
+
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -11089,11 +11314,6 @@ strip-comments@^2.0.1:
   resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b"
   integrity sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==
 
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
-
 strip-final-newline@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
@@ -11116,13 +11336,10 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-style-loader@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-2.0.0.tgz#9669602fd4690740eaaec137799a03addbbc393c"
-  integrity sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ==
-  dependencies:
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
+style-loader@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575"
+  integrity sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==
 
 style-search@^0.1.0:
   version "0.1.0"
@@ -11144,10 +11361,10 @@ stylelint-config-concentric@^2.0.2:
   dependencies:
     stylelint-order "^1.0.0"
 
-stylelint-config-recommended@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-5.0.0.tgz#fb5653f495a60b4938f2ad3e77712d9e1039ae78"
-  integrity sha512-c8aubuARSu5A3vEHLBeOSJt1udOdS+1iue7BmJDTSXoCBmfEQmmWX+59vYIj3NQdJBY6a/QRv1ozVFpaB9jaqA==
+stylelint-config-recommended@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz#fd2523a322836005ad9bf473d3e5534719c09f9d"
+  integrity sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==
 
 stylelint-order@^1.0.0:
   version "1.0.0"
@@ -11158,73 +11375,74 @@ stylelint-order@^1.0.0:
     postcss "^7.0.2"
     postcss-sorting "^4.0.0"
 
-stylelint-webpack-plugin@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/stylelint-webpack-plugin/-/stylelint-webpack-plugin-2.2.2.tgz#ecd241fb689346ee471c125fb0ef149488bd1980"
-  integrity sha512-zfIsAF13xe6xuhwxZDFWQEmuVcxnRk9JFovyRL/23CWjPK1HLRw4QZdvo0Bz1bQZaDQA+6ha7cU0NO+LXaw4Mw==
+stylelint-webpack-plugin@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/stylelint-webpack-plugin/-/stylelint-webpack-plugin-3.1.0.tgz#97cf140c0973515a13e2db970e3f94a8f13e9c56"
+  integrity sha512-qKBj9s2BVnxwQXdqRKd637gtASYel6FA/a9PfyfsplUqiBmBjJeeTrcJPp9v/HEN4FRw2CJDNbO2xuYUF7DsuA==
   dependencies:
-    "@types/stylelint" "^13.13.0"
-    arrify "^2.0.1"
+    "@types/stylelint" "^13.13.3"
     globby "^11.0.4"
-    jest-worker "^27.0.2"
+    jest-worker "^27.3.1"
     micromatch "^4.0.4"
     normalize-path "^3.0.0"
-    schema-utils "^3.0.0"
+    schema-utils "^3.1.1"
 
-stylelint@^13.13.1:
-  version "13.13.1"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.13.1.tgz#fca9c9f5de7990ab26a00f167b8978f083a18f3c"
-  integrity sha512-Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ==
+stylelint@^14.2.0:
+  version "14.2.0"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.2.0.tgz#da4f0f4580e66911c38c376ed82447b78e32b0fb"
+  integrity sha512-i0DrmDXFNpDsWiwx6SPRs4/pyw4kvZgqpDGvsTslQMY7hpUl6r33aQvNSn6cnTg2wtZ9rreFElI7XAKpOWi1vQ==
   dependencies:
-    "@stylelint/postcss-css-in-js" "^0.37.2"
-    "@stylelint/postcss-markdown" "^0.36.2"
-    autoprefixer "^9.8.6"
     balanced-match "^2.0.0"
-    chalk "^4.1.1"
-    cosmiconfig "^7.0.0"
-    debug "^4.3.1"
+    colord "^2.9.2"
+    cosmiconfig "^7.0.1"
+    debug "^4.3.3"
     execall "^2.0.0"
-    fast-glob "^3.2.5"
+    fast-glob "^3.2.7"
     fastest-levenshtein "^1.0.12"
     file-entry-cache "^6.0.1"
     get-stdin "^8.0.0"
     global-modules "^2.0.0"
-    globby "^11.0.3"
+    globby "^11.0.4"
     globjoin "^0.1.4"
     html-tags "^3.1.0"
-    ignore "^5.1.8"
+    ignore "^5.2.0"
     import-lazy "^4.0.0"
     imurmurhash "^0.1.4"
-    known-css-properties "^0.21.0"
-    lodash "^4.17.21"
-    log-symbols "^4.1.0"
+    is-plain-object "^5.0.0"
+    known-css-properties "^0.24.0"
     mathml-tag-names "^2.1.3"
     meow "^9.0.0"
     micromatch "^4.0.4"
+    normalize-path "^3.0.0"
     normalize-selector "^0.2.0"
-    postcss "^7.0.35"
-    postcss-html "^0.36.0"
-    postcss-less "^3.1.4"
+    picocolors "^1.0.0"
+    postcss "^8.3.11"
     postcss-media-query-parser "^0.2.3"
     postcss-resolve-nested-selector "^0.1.1"
-    postcss-safe-parser "^4.0.2"
-    postcss-sass "^0.4.4"
-    postcss-scss "^2.1.1"
-    postcss-selector-parser "^6.0.5"
-    postcss-syntax "^0.36.2"
+    postcss-safe-parser "^6.0.0"
+    postcss-selector-parser "^6.0.7"
     postcss-value-parser "^4.1.0"
     resolve-from "^5.0.0"
-    slash "^3.0.0"
     specificity "^0.4.1"
-    string-width "^4.2.2"
-    strip-ansi "^6.0.0"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
     style-search "^0.1.0"
-    sugarss "^2.0.0"
     svg-tags "^1.0.0"
-    table "^6.6.0"
+    table "^6.7.5"
     v8-compile-cache "^2.3.0"
     write-file-atomic "^3.0.3"
 
+subscriptions-transport-ws@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.11.0.tgz#baf88f050cba51d52afe781de5e81b3c31f89883"
+  integrity sha512-8D4C6DIH5tGiAIpp5I0wD/xRlNiZAPGHygzCe7VzyzUoxHtawzjNAY9SUTXU05/EY2NMY9/9GF0ycizkXr1CWQ==
+  dependencies:
+    backo2 "^1.0.2"
+    eventemitter3 "^3.1.0"
+    iterall "^1.2.1"
+    symbol-observable "^1.0.4"
+    ws "^5.2.0 || ^6.0.0 || ^7.0.0"
+
 subscriptions-transport-ws@^0.9.18:
   version "0.9.19"
   resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.19.tgz#10ca32f7e291d5ee8eb728b9c02e43c52606cdcf"
@@ -11236,17 +11454,10 @@ subscriptions-transport-ws@^0.9.18:
     symbol-observable "^1.0.4"
     ws "^5.2.0 || ^6.0.0 || ^7.0.0"
 
-sugarss@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-2.0.0.tgz#ddd76e0124b297d40bf3cca31c8b22ecb43bc61d"
-  integrity sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==
-  dependencies:
-    postcss "^7.0.2"
-
-supercluster@^7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-7.1.3.tgz#8c5412c7d7e53b010f7514e87f279544babc3425"
-  integrity sha512-7+bR4FbF5SYsmkHfDp61QiwCKtwNDyPsddk9TzfsDA5DQr5Goii5CVD2SXjglweFCxjrzVZf945ahqYfUIk8UA==
+supercluster@^7.1.4:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-7.1.4.tgz#6762aabfd985d3390b49f13b815567d5116a828a"
+  integrity sha512-GhKkRM1jMR6WUwGPw05fs66pOFWhf59lXq+Q3J3SxPvhNcmgOtLRV6aVQPMRsmXdpaeFJGivt+t7QXUPL3ff4g==
   dependencies:
     kdbush "^3.0.0"
 
@@ -11283,11 +11494,6 @@ supports-color@^8.0.0:
   dependencies:
     has-flag "^4.0.0"
 
-svg-injector@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/svg-injector/-/svg-injector-1.1.3.tgz#8fba18d7419e5f818e712c4f82d83ee357610e61"
-  integrity sha1-j7oY10GeX4GOcSxPgtg+41dhDmE=
-
 svg-tags@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
@@ -11331,17 +11537,24 @@ sync-fetch@0.3.0:
     buffer "^5.7.0"
     node-fetch "^2.6.1"
 
-table@^6.0.9, table@^6.6.0:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2"
-  integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==
+sync-fetch@0.3.1, sync-fetch@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/sync-fetch/-/sync-fetch-0.3.1.tgz#62aa82c4b4d43afd6906bfd7b5f92056458509f0"
+  integrity sha512-xj5qiCDap/03kpci5a+qc5wSJjc8ZSixgG2EUmH1B8Ea2sfWclQA7eH40hiHPCtkCn6MCk4Wb+dqcXdCy2PP3g==
+  dependencies:
+    buffer "^5.7.0"
+    node-fetch "^2.6.1"
+
+table@^6.7.5:
+  version "6.7.5"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.7.5.tgz#f04478c351ef3d8c7904f0e8be90a1b62417d238"
+  integrity sha512-LFNeryOqiQHqCVKzhkymKwt6ozeRhlm8IL1mE8rNUurkir4heF6PzMyRgaTa4tlyPTGGgXuvVOF/OLWiH09Lqw==
   dependencies:
     ajv "^8.0.1"
-    lodash.clonedeep "^4.5.0"
     lodash.truncate "^4.4.2"
     slice-ansi "^4.0.0"
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
 
 tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:
   version "2.2.0"
@@ -11377,7 +11590,7 @@ tempy@^0.6.0:
     type-fest "^0.16.0"
     unique-string "^2.0.0"
 
-terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.1.4:
+terser-webpack-plugin@^5.1.3:
   version "5.1.4"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.4.tgz#c369cf8a47aa9922bd0d8a94fe3d3da11a7678a1"
   integrity sha512-C2WkFwstHDhVEmsmlCxrXUtVklS+Ir1A7twrYzrDrQQOIMOaVAYykaoo/Aq1K0QRkMoY2hhvDQY1cm4jnIMFwA==
@@ -11389,14 +11602,16 @@ terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.1.4:
     source-map "^0.6.1"
     terser "^5.7.0"
 
-terser@^4.6.3:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
-  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
+terser-webpack-plugin@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz#21641326486ecf91d8054161c816e464435bae9f"
+  integrity sha512-LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ==
   dependencies:
-    commander "^2.20.0"
-    source-map "~0.6.1"
-    source-map-support "~0.5.12"
+    jest-worker "^27.4.1"
+    schema-utils "^3.1.1"
+    serialize-javascript "^6.0.0"
+    source-map "^0.6.1"
+    terser "^5.7.2"
 
 terser@^5.0.0, terser@^5.7.0:
   version "5.7.1"
@@ -11407,6 +11622,15 @@ terser@^5.0.0, terser@^5.7.0:
     source-map "~0.7.2"
     source-map-support "~0.5.19"
 
+terser@^5.10.0, terser@^5.7.2:
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc"
+  integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.7.2"
+    source-map-support "~0.5.20"
+
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -11432,16 +11656,6 @@ timsort@^0.3.0:
   resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
   integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
 
-tiny-invariant@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz#634c5f8efdc27714b7f386c35e6760991d230875"
-  integrity sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw==
-
-tiny-warning@^1.0.0, tiny-warning@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
-  integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
-
 tinycolor2@^1.4.1:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.2.tgz#3f6a4d1071ad07676d7fa472e1fac40a719d8803"
@@ -11471,26 +11685,11 @@ to-fast-properties@^2.0.0:
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
-to-object-path@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
-  dependencies:
-    kind-of "^3.0.2"
-
 to-readable-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
   integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
 
-to-regex-range@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
-  dependencies:
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -11498,16 +11697,6 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-to-regex@^3.0.1, to-regex@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
-  dependencies:
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    regex-not "^1.0.2"
-    safe-regex "^1.1.0"
-
 toidentifier@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
@@ -11520,6 +11709,11 @@ tr46@^1.0.1:
   dependencies:
     punycode "^2.1.0"
 
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
+
 traverse@~0.6.6:
   version "0.6.6"
   resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
@@ -11530,11 +11724,6 @@ trim-newlines@^3.0.0:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
   integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
-trough@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
-  integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
-
 ts-dedent@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-2.1.1.tgz#6dd56870bb5493895171334fa5d7e929107e5bbc"
@@ -11561,6 +11750,13 @@ ts-invariant@^0.8.0:
   dependencies:
     tslib "^2.1.0"
 
+ts-invariant@^0.9.4:
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.9.4.tgz#42ac6c791aade267dd9dc65276549df5c5d71cac"
+  integrity sha512-63jtX/ZSwnUNi/WhXjnK8kz4cHHpYS60AnmA6ixz17l7E12a5puCWFlNpkne5Rl0J8TBPVHpGjsj4fxs8ObVLQ==
+  dependencies:
+    tslib "^2.1.0"
+
 ts-log@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/ts-log/-/ts-log-2.2.3.tgz#4da5640fe25a9fb52642cd32391c886721318efb"
@@ -11578,12 +11774,13 @@ ts-node@^9:
     source-map-support "^0.5.17"
     yn "3.1.1"
 
-tsconfig-paths@^3.9.0:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz#79ae67a68c15289fdf5c51cb74f397522d795ed7"
-  integrity sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==
+tsconfig-paths@^3.11.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b"
+  integrity sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==
   dependencies:
-    json5 "^2.2.0"
+    "@types/json5" "^0.0.29"
+    json5 "^1.0.1"
     minimist "^1.2.0"
     strip-bom "^3.0.0"
 
@@ -11592,11 +11789,16 @@ tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2, tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@~2.3.0:
+tslib@^2, tslib@^2.0.0, tslib@^2.0.3, tslib@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
   integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
 
+tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
+  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
+
 tslib@~2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"
@@ -11671,10 +11873,10 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@^4.3.5:
-  version "4.3.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4"
-  integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==
+typescript@^4.5.4:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.4.tgz#a17d3a0263bf5c8723b9c52f43c5084edf13c2e8"
+  integrity sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==
 
 ua-parser-js@^0.7.18:
   version "0.7.28"
@@ -11696,6 +11898,11 @@ unc-path-regex@^0.1.2:
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
   integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
 
+undici@^4.9.3:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-4.12.0.tgz#89dfd99f0257c89a971b933b195188747864c730"
+  integrity sha512-sJ4CyO3ZPaoxWpLQTJpH/gWD+tCIra2OJ9UPvrX1siyJkgh8NOAybRejJ/g2xHyOdAuoSE0lPRJwRl8AZSXYJQ==
+
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
@@ -11719,33 +11926,6 @@ unicode-property-aliases-ecmascript@^1.0.4:
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
   integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
 
-unified@^9.1.0:
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.2.tgz#67649a1abfc3ab85d2969502902775eb03146975"
-  integrity sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==
-  dependencies:
-    bail "^1.0.0"
-    extend "^3.0.0"
-    is-buffer "^2.0.0"
-    is-plain-obj "^2.0.0"
-    trough "^1.0.0"
-    vfile "^4.0.0"
-
-union-value@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
-  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
-  dependencies:
-    arr-union "^3.1.0"
-    get-value "^2.0.6"
-    is-extendable "^0.1.1"
-    set-value "^2.0.1"
-
-uniq@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
-
 uniqs@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
@@ -11758,31 +11938,12 @@ unique-string@^2.0.0:
   dependencies:
     crypto-random-string "^2.0.0"
 
-unist-util-find-all-after@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz#fdfecd14c5b7aea5e9ef38d5e0d5f774eeb561f6"
-  integrity sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==
-  dependencies:
-    unist-util-is "^4.0.0"
-
-unist-util-is@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.1.0.tgz#976e5f462a7a5de73d94b706bac1b90671b57797"
-  integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==
-
-unist-util-stringify-position@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da"
-  integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==
-  dependencies:
-    "@types/unist" "^2.0.2"
-
 universalify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
   integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
-unixify@1.0.0:
+unixify@1.0.0, unixify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unixify/-/unixify-1.0.0.tgz#3a641c8c2ffbce4da683a5c70f03a462940c2090"
   integrity sha1-OmQcjC/7zk2mg6XHDwOkYpQMIJA=
@@ -11794,15 +11955,7 @@ unpipe@1.0.0, unpipe@~1.0.0:
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
-unset-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
-  dependencies:
-    has-value "^0.3.1"
-    isobject "^3.0.0"
-
-upath@^1.1.1, upath@^1.2.0:
+upath@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
@@ -11828,11 +11981,6 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-urix@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-
 url-parse-lax@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
@@ -11840,14 +11988,6 @@ url-parse-lax@^3.0.0:
   dependencies:
     prepend-http "^2.0.0"
 
-url-parse@^1.4.3, url-parse@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b"
-  integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==
-  dependencies:
-    querystringify "^2.1.1"
-    requires-port "^1.0.0"
-
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -11856,11 +11996,6 @@ url@^0.11.0:
     punycode "1.3.2"
     querystring "0.2.0"
 
-use@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
-  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
-
 utif@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/utif/-/utif-2.0.1.tgz#9e1582d9bbd20011a6588548ed3266298e711759"
@@ -11883,12 +12018,12 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@^3.3.2, uuid@^3.4.0:
+uuid@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-v8-compile-cache@^2.0.3, v8-compile-cache@^2.2.0, v8-compile-cache@^2.3.0:
+v8-compile-cache@^2.0.3, v8-compile-cache@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
@@ -11906,10 +12041,10 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-value-equal@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c"
-  integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==
+value-or-promise@1.0.11, value-or-promise@^1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.11.tgz#3e90299af31dd014fe843fe309cefa7c1d94b140"
+  integrity sha512-41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg==
 
 value-or-promise@1.0.6:
   version "1.0.6"
@@ -11926,25 +12061,7 @@ vendors@^1.0.3:
   resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
   integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==
 
-vfile-message@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a"
-  integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    unist-util-stringify-position "^2.0.0"
-
-vfile@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624"
-  integrity sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    is-buffer "^2.0.0"
-    unist-util-stringify-position "^2.0.0"
-    vfile-message "^2.0.0"
-
-vt-pbf@^3.1.1:
+vt-pbf@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/vt-pbf/-/vt-pbf-3.1.3.tgz#68fd150756465e2edae1cc5c048e063916dcfaac"
   integrity sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==
@@ -11960,10 +12077,10 @@ warning@^4.0.3:
   dependencies:
     loose-envify "^1.0.0"
 
-watchpack@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz#47d78f5415fe550ecd740f99fe2882323a58b1ce"
-  integrity sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==
+watchpack@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25"
+  integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
@@ -11975,87 +12092,85 @@ wbuf@^1.1.0, wbuf@^1.7.3:
   dependencies:
     minimalistic-assert "^1.0.0"
 
+web-streams-polyfill@4.0.0-beta.1:
+  version "4.0.0-beta.1"
+  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.1.tgz#3b19b9817374b7cee06d374ba7eeb3aeb80e8c95"
+  integrity sha512-3ux37gEX670UUphBF9AMCq8XM6iQ8Ac6A+DSRRjDoRBm1ufCkaCDdNVbaqq60PsEkdNlLKrGtv/YBP4EJXqNtQ==
+
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+
 webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
   integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
-webpack-cli@^4.5.0:
-  version "4.7.2"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.2.tgz#a718db600de6d3906a4357e059ae584a89f4c1a5"
-  integrity sha512-mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw==
+webpack-cli@^4.9.1:
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.1.tgz#b64be825e2d1b130f285c314caa3b1ba9a4632b3"
+  integrity sha512-JYRFVuyFpzDxMDB+v/nanUdQYcZtqFPGzmlW4s+UkPMFhSpfRNmf1z4AwYcHJVdvEFAM7FFCQdNTpsBYhDLusQ==
   dependencies:
     "@discoveryjs/json-ext" "^0.5.0"
-    "@webpack-cli/configtest" "^1.0.4"
-    "@webpack-cli/info" "^1.3.0"
-    "@webpack-cli/serve" "^1.5.1"
-    colorette "^1.2.1"
+    "@webpack-cli/configtest" "^1.1.0"
+    "@webpack-cli/info" "^1.4.0"
+    "@webpack-cli/serve" "^1.6.0"
+    colorette "^2.0.14"
     commander "^7.0.0"
     execa "^5.0.0"
     fastest-levenshtein "^1.0.12"
     import-local "^3.0.2"
     interpret "^2.2.0"
     rechoir "^0.7.0"
-    v8-compile-cache "^2.2.0"
     webpack-merge "^5.7.3"
 
-webpack-dev-middleware@^3.7.2:
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz#0639372b143262e2b84ab95d3b91a7597061c2c5"
-  integrity sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==
+webpack-dev-middleware@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.0.tgz#8fc02dba6e72e1d373eca361623d84610f27be7c"
+  integrity sha512-MouJz+rXAm9B1OTOYaJnn6rtD/lWZPy2ufQCH3BPs8Rloh/Du6Jze4p7AeLYHkVi0giJnYLaSGDC7S+GM9arhg==
   dependencies:
-    memory-fs "^0.4.1"
-    mime "^2.4.4"
-    mkdirp "^0.5.1"
+    colorette "^2.0.10"
+    memfs "^3.2.2"
+    mime-types "^2.1.31"
     range-parser "^1.2.1"
-    webpack-log "^2.0.0"
+    schema-utils "^4.0.0"
 
-webpack-dev-server@^3.11.3:
-  version "3.11.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.3.tgz#8c86b9d2812bf135d3c9bce6f07b718e30f7c3d3"
-  integrity sha512-3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA==
-  dependencies:
-    ansi-html-community "0.0.8"
+webpack-dev-server@^4.6.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.0.tgz#658aae4902dc920e90dbb8ad8b4eaf6491ac33af"
+  integrity sha512-ldR+a54iygMxUawTzMlWD/JblePhNRVGHxTHQz9EAvsbH7HZbX53OxV6Y092x+tgN5umv885i2X4wfdo/ynEQA==
+  dependencies:
+    "@types/bonjour" "^3.5.9"
+    "@types/connect-history-api-fallback" "^1.3.5"
+    "@types/serve-index" "^1.9.1"
+    "@types/sockjs" "^0.3.33"
+    "@types/ws" "^8.2.2"
+    ansi-html-community "^0.0.8"
     bonjour "^3.5.0"
-    chokidar "^2.1.8"
+    chokidar "^3.5.2"
+    colorette "^2.0.10"
     compression "^1.7.4"
     connect-history-api-fallback "^1.6.0"
-    debug "^4.1.1"
-    del "^4.1.1"
+    default-gateway "^6.0.3"
+    del "^6.0.0"
     express "^4.17.1"
-    html-entities "^1.3.1"
-    http-proxy-middleware "0.19.1"
-    import-local "^2.0.0"
-    internal-ip "^4.3.0"
-    ip "^1.1.5"
-    is-absolute-url "^3.0.3"
-    killable "^1.0.1"
-    loglevel "^1.6.8"
-    opn "^5.5.0"
-    p-retry "^3.0.1"
-    portfinder "^1.0.26"
-    schema-utils "^1.0.0"
-    selfsigned "^1.10.8"
-    semver "^6.3.0"
+    graceful-fs "^4.2.6"
+    html-entities "^2.3.2"
+    http-proxy-middleware "^2.0.0"
+    ipaddr.js "^2.0.1"
+    open "^8.0.9"
+    p-retry "^4.5.0"
+    portfinder "^1.0.28"
+    schema-utils "^4.0.0"
+    selfsigned "^1.10.11"
     serve-index "^1.9.1"
     sockjs "^0.3.21"
-    sockjs-client "^1.5.0"
     spdy "^4.0.2"
-    strip-ansi "^3.0.1"
-    supports-color "^6.1.0"
+    strip-ansi "^7.0.0"
     url "^0.11.0"
-    webpack-dev-middleware "^3.7.2"
-    webpack-log "^2.0.0"
-    ws "^6.2.1"
-    yargs "^13.3.2"
-
-webpack-log@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
-  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
-  dependencies:
-    ansi-colors "^3.0.0"
-    uuid "^3.3.2"
+    webpack-dev-middleware "^5.3.0"
+    ws "^8.1.0"
 
 webpack-merge@^5.7.3, webpack-merge@^5.8.0:
   version "5.8.0"
@@ -12082,18 +12197,15 @@ webpack-sources@^1.4.3:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack-sources@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.0.tgz#9ed2de69b25143a4c18847586ad9eccb19278cfa"
-  integrity sha512-WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ==
-  dependencies:
-    source-list-map "^2.0.1"
-    source-map "^0.6.1"
+webpack-sources@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.2.tgz#d88e3741833efec57c4c789b6010db9977545260"
+  integrity sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw==
 
-webpack@^5.27.0:
-  version "5.44.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.44.0.tgz#97b13a02bd79fb71ac6301ce697920660fa214a1"
-  integrity sha512-I1S1w4QLoKmH19pX6YhYN0NiSXaWY8Ou00oA+aMcr9IUGeF5azns+IKBkfoAAG9Bu5zOIzZt/mN35OffBya8AQ==
+webpack@^5.65.0:
+  version "5.65.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.65.0.tgz#ed2891d9145ba1f0d318e4ea4f89c3fa18e6f9be"
+  integrity sha512-Q5or2o6EKs7+oKmJo7LaqZaMOlDWQse9Tm5l1WAfU/ujLGN5Pb0SqGeVkN/4bpPmEqEP5RnVhiqsOtWtUVwGRw==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.50"
@@ -12101,10 +12213,11 @@ webpack@^5.27.0:
     "@webassemblyjs/wasm-edit" "1.11.1"
     "@webassemblyjs/wasm-parser" "1.11.1"
     acorn "^8.4.1"
+    acorn-import-assertions "^1.7.6"
     browserslist "^4.14.5"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.8.0"
-    es-module-lexer "^0.7.1"
+    enhanced-resolve "^5.8.3"
+    es-module-lexer "^0.9.0"
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
@@ -12113,11 +12226,11 @@ webpack@^5.27.0:
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
-    schema-utils "^3.0.0"
+    schema-utils "^3.1.0"
     tapable "^2.1.1"
     terser-webpack-plugin "^5.1.3"
-    watchpack "^2.2.0"
-    webpack-sources "^2.3.0"
+    watchpack "^2.3.1"
+    webpack-sources "^3.2.2"
 
 websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
   version "0.7.4"
@@ -12143,6 +12256,14 @@ whatwg-fetch@^3.4.1:
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c"
   integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==
 
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
 whatwg-url@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
@@ -12168,7 +12289,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@^1.2.9, which@^1.3.1:
+which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -12192,33 +12313,35 @@ word-wrap@^1.2.3:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
-workbox-background-sync@^6.1.5:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.1.5.tgz#83904fc6487722db98ed9b19eaa39ab5f826c33e"
-  integrity sha512-VbUmPLsdz+sLzuNxHvMylzyRTiM4q+q7rwLBk3p2mtRL5NZozI8j/KgoGbno96vs84jx4b9zCZMEOIKEUTPf6w==
+workbox-background-sync@6.4.2:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.4.2.tgz#bb31b95928d376abcb9bde0de3a0cef9bae46cf7"
+  integrity sha512-P7c8uG5X2k+DMICH9xeSA9eUlCOjHHYoB42Rq+RtUpuwBxUOflAXR1zdsMWj81LopE4gjKXlTw7BFd1BDAHo7g==
   dependencies:
-    workbox-core "^6.1.5"
+    idb "^6.1.4"
+    workbox-core "6.4.2"
 
-workbox-broadcast-update@^6.1.5:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.1.5.tgz#49a2a4cc50c7b1cfe86bed6d8f15edf1891d1e79"
-  integrity sha512-zGrTTs+n4wHpYtqYMqBg6kl/x5j1UrczGCQnODSHTxIDV8GXLb/GtA1BCZdysNxpMmdVSeLmTcgIYAAqWFamrA==
+workbox-broadcast-update@6.4.2:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.4.2.tgz#5094c4767dfb590532ac03ee07e9e82b2ac206bc"
+  integrity sha512-qnBwQyE0+PWFFc/n4ISXINE49m44gbEreJUYt2ldGH3+CNrLmJ1egJOOyUqqu9R4Eb7QrXcmB34ClXG7S37LbA==
   dependencies:
-    workbox-core "^6.1.5"
+    workbox-core "6.4.2"
 
-workbox-build@^6.1.5:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.1.5.tgz#31c3034a38527f1f7697335c15af9c5593168841"
-  integrity sha512-P+fakR5QFVqJN9l9xHVXtmafga72gh9I+jM3A9HiB/6UNRmOAejXnDgD+RMegOHgQHPwnB44TalMToFaXKWIyA==
+workbox-build@6.4.2:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.4.2.tgz#47f9baa946c3491533cd5ccb1f194a7160e8a6e3"
+  integrity sha512-WMdYLhDIsuzViOTXDH+tJ1GijkFp5khSYolnxR/11zmfhNDtuo7jof72xPGFy+KRpsz6tug39RhivCj77qqO0w==
   dependencies:
+    "@apideck/better-ajv-errors" "^0.3.1"
     "@babel/core" "^7.11.1"
     "@babel/preset-env" "^7.11.0"
     "@babel/runtime" "^7.11.2"
-    "@hapi/joi" "^16.1.8"
     "@rollup/plugin-babel" "^5.2.0"
     "@rollup/plugin-node-resolve" "^11.2.1"
     "@rollup/plugin-replace" "^2.4.1"
-    "@surma/rollup-plugin-off-main-thread" "^1.4.1"
+    "@surma/rollup-plugin-off-main-thread" "^2.2.3"
+    ajv "^8.6.0"
     common-tags "^1.8.0"
     fast-json-stable-stringify "^2.1.0"
     fs-extra "^9.0.1"
@@ -12233,131 +12356,133 @@ workbox-build@^6.1.5:
     strip-comments "^2.0.1"
     tempy "^0.6.0"
     upath "^1.2.0"
-    workbox-background-sync "^6.1.5"
-    workbox-broadcast-update "^6.1.5"
-    workbox-cacheable-response "^6.1.5"
-    workbox-core "^6.1.5"
-    workbox-expiration "^6.1.5"
-    workbox-google-analytics "^6.1.5"
-    workbox-navigation-preload "^6.1.5"
-    workbox-precaching "^6.1.5"
-    workbox-range-requests "^6.1.5"
-    workbox-recipes "^6.1.5"
-    workbox-routing "^6.1.5"
-    workbox-strategies "^6.1.5"
-    workbox-streams "^6.1.5"
-    workbox-sw "^6.1.5"
-    workbox-window "^6.1.5"
-
-workbox-cacheable-response@^6.1.5:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.1.5.tgz#2772e09a333cba47b0923ed91fd022416b69e75c"
-  integrity sha512-x8DC71lO/JCgiaJ194l9le8wc8lFPLgUpDkLhp2si7mXV6S/wZO+8Osvw1LLgYa8YYTWGbhbFhFTXIkEMknIIA==
-  dependencies:
-    workbox-core "^6.1.5"
-
-workbox-core@^6.1.5:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.1.5.tgz#424ff600e2c5448b14ebd58b2f5ac8ed91b73fb9"
-  integrity sha512-9SOEle7YcJzg3njC0xMSmrPIiFjfsFm9WjwGd5enXmI8Lwk8wLdy63B0nzu5LXoibEmS9k+aWF8EzaKtOWjNSA==
-
-workbox-expiration@^6.1.5:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.1.5.tgz#a62a4ac953bb654aa969ede13507ca5bd154adc2"
-  integrity sha512-6cN+FVbh8fNq56LFKPMchGNKCJeyboHsDuGBqmhDUPvD4uDjsegQpDQzn52VaE0cpywbSIsDF/BSq9E9Yjh5oQ==
-  dependencies:
-    workbox-core "^6.1.5"
-
-workbox-google-analytics@^6.1.5:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.1.5.tgz#895fcc50e4976c176b5982e1a8fd08776f18d639"
-  integrity sha512-LYsJ/VxTkYVLxM1uJKXZLz4cJdemidY7kPyAYtKVZ6EiDG89noASqis75/5lhqM1m3HwQfp2DtoPrelKSpSDBA==
-  dependencies:
-    workbox-background-sync "^6.1.5"
-    workbox-core "^6.1.5"
-    workbox-routing "^6.1.5"
-    workbox-strategies "^6.1.5"
-
-workbox-navigation-preload@^6.1.5:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.1.5.tgz#47a0d3a6d2e74bd3a52b58b72ca337cb5b654310"
-  integrity sha512-hDbNcWlffv0uvS21jCAC/mYk7NzaGRSWOQXv1p7bj2aONAX5l699D2ZK4D27G8TO0BaLHUmW/1A5CZcsvweQdg==
-  dependencies:
-    workbox-core "^6.1.5"
-
-workbox-precaching@^6.1.5:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.1.5.tgz#9e0fecb5c567192f46783323fccea10bffc9f79e"
-  integrity sha512-yhm1kb6wgi141JeM5X7z42XJxCry53tbMLB3NgrxktrZbwbrJF8JILzYy+RFKC9tHC6u2bPmL789GPLT2NCDzw==
-  dependencies:
-    workbox-core "^6.1.5"
-    workbox-routing "^6.1.5"
-    workbox-strategies "^6.1.5"
-
-workbox-range-requests@^6.1.5:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.1.5.tgz#047ccd12838bebe51a720256a4ca0cfa7197dfd3"
-  integrity sha512-iACChSapzB0yuIum3ascP/+cfBNuZi5DRrE+u4u5mCHigPlwfSWtlaY+y8p+a8EwcDTVTZVtnrGrRnF31SiLqQ==
-  dependencies:
-    workbox-core "^6.1.5"
-
-workbox-recipes@^6.1.5:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.1.5.tgz#bb1f8976bcdb202618d967596e9f248e6077e69a"
-  integrity sha512-MD1yabHca6O/oj1hrRdfj9cRwhKA5zqIE53rWOAg/dKMMzWQsf9nyRbXRgzK3a13iQvYKuQzURU4Cx58tdnR+Q==
-  dependencies:
-    workbox-cacheable-response "^6.1.5"
-    workbox-core "^6.1.5"
-    workbox-expiration "^6.1.5"
-    workbox-precaching "^6.1.5"
-    workbox-routing "^6.1.5"
-    workbox-strategies "^6.1.5"
-
-workbox-routing@^6.1.5:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.1.5.tgz#15884d6152dba03faef83f0b23331846d8b6ef8e"
-  integrity sha512-uC/Ctz+4GXGL42h1WxUNKxqKRik/38uS0NZ6VY/EHqL2F1ObLFqMHUZ4ZYvyQsKdyI82cxusvhJZHOrY0a2fIQ==
-  dependencies:
-    workbox-core "^6.1.5"
-
-workbox-strategies@^6.1.5:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.1.5.tgz#2549a3e78f0eda371b760c4db21feb0d26143573"
-  integrity sha512-QhiOn9KT9YGBdbfWOmJT6pXZOIAxaVrs6J6AMYzRpkUegBTEcv36+ZhE/cfHoT0u2fxVtthHnskOQ/snEzaXQw==
-  dependencies:
-    workbox-core "^6.1.5"
-
-workbox-streams@^6.1.5:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.1.5.tgz#bb7678677275fc23c9627565a1f238e4ca350290"
-  integrity sha512-OI1kLvRHGFXV+soDvs6aEwfBwdAkvPB0mRryqdh3/K17qUj/1gRXc8QtpgU+83xqx/I/ar2bTCIj0KPzI/ChCQ==
-  dependencies:
-    workbox-core "^6.1.5"
-    workbox-routing "^6.1.5"
-
-workbox-sw@^6.1.5:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.1.5.tgz#06eb0c91f22e207422175b3f815cd2181c7074a0"
-  integrity sha512-IMDiqxYbKzPorZLGMUMacLB6r76iVQbdTzYthIZoPfy+uFURJFUtqiWQJKg1L+RMyuYXwKXTahCIGkgFs4jBeg==
-
-workbox-webpack-plugin@^6.1.5:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-6.1.5.tgz#d573f959417c3dae49e112dae9c6b82cc1679229"
-  integrity sha512-tsgeNAYiFP4STNPDxBVT58eiU8nGUmcv7Lq9FFJkQf5MMu6tPw1OLp+KpszhbCWP+R/nEdu85Gjexs6fY647Kg==
+    workbox-background-sync "6.4.2"
+    workbox-broadcast-update "6.4.2"
+    workbox-cacheable-response "6.4.2"
+    workbox-core "6.4.2"
+    workbox-expiration "6.4.2"
+    workbox-google-analytics "6.4.2"
+    workbox-navigation-preload "6.4.2"
+    workbox-precaching "6.4.2"
+    workbox-range-requests "6.4.2"
+    workbox-recipes "6.4.2"
+    workbox-routing "6.4.2"
+    workbox-strategies "6.4.2"
+    workbox-streams "6.4.2"
+    workbox-sw "6.4.2"
+    workbox-window "6.4.2"
+
+workbox-cacheable-response@6.4.2:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.4.2.tgz#ebcabb3667019da232e986a9927af97871e37ccb"
+  integrity sha512-9FE1W/cKffk1AJzImxgEN0ceWpyz1tqNjZVtA3/LAvYL3AC5SbIkhc7ZCO82WmO9IjTfu8Vut2X/C7ViMSF7TA==
+  dependencies:
+    workbox-core "6.4.2"
+
+workbox-core@6.4.2:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.4.2.tgz#f99fd36a211cc01dce90aa7d5f2c255e8fe9d6bc"
+  integrity sha512-1U6cdEYPcajRXiboSlpJx6U7TvhIKbxRRerfepAJu2hniKwJ3DHILjpU/zx3yvzSBCWcNJDoFalf7Vgd7ey/rw==
+
+workbox-expiration@6.4.2:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.4.2.tgz#61613459fd6ddd1362730767618d444c6b9c9139"
+  integrity sha512-0hbpBj0tDnW+DZOUmwZqntB/8xrXOgO34i7s00Si/VlFJvvpRKg1leXdHHU8ykoSBd6+F2KDcMP3swoCi5guLw==
+  dependencies:
+    idb "^6.1.4"
+    workbox-core "6.4.2"
+
+workbox-google-analytics@6.4.2:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.4.2.tgz#eea7d511b3078665a726dc2ee9f11c6b7a897530"
+  integrity sha512-u+gxs3jXovPb1oul4CTBOb+T9fS1oZG+ZE6AzS7l40vnyfJV79DaLBvlpEZfXGv3CjMdV1sT/ltdOrKzo7HcGw==
+  dependencies:
+    workbox-background-sync "6.4.2"
+    workbox-core "6.4.2"
+    workbox-routing "6.4.2"
+    workbox-strategies "6.4.2"
+
+workbox-navigation-preload@6.4.2:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.4.2.tgz#35cd4ba416a530796af135410ca07db5bee11668"
+  integrity sha512-viyejlCtlKsbJCBHwhSBbWc57MwPXvUrc8P7d+87AxBGPU+JuWkT6nvBANgVgFz6FUhCvRC8aYt+B1helo166g==
+  dependencies:
+    workbox-core "6.4.2"
+
+workbox-precaching@6.4.2:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.4.2.tgz#8d87c05d54f32ac140f549faebf3b4d42d63621e"
+  integrity sha512-CZ6uwFN/2wb4noHVlALL7UqPFbLfez/9S2GAzGAb0Sk876ul9ukRKPJJ6gtsxfE2HSTwqwuyNVa6xWyeyJ1XSA==
+  dependencies:
+    workbox-core "6.4.2"
+    workbox-routing "6.4.2"
+    workbox-strategies "6.4.2"
+
+workbox-range-requests@6.4.2:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.4.2.tgz#050f0dfbb61cd1231e609ed91298b6c2442ae41b"
+  integrity sha512-SowF3z69hr3Po/w7+xarWfzxJX/3Fo0uSG72Zg4g5FWWnHpq2zPvgbWerBZIa81zpJVUdYpMa3akJJsv+LaO1Q==
+  dependencies:
+    workbox-core "6.4.2"
+
+workbox-recipes@6.4.2:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.4.2.tgz#68de41fa3a77b444b0f93c9c01a76ba1d41fd2bf"
+  integrity sha512-/oVxlZFpAjFVbY+3PoGEXe8qyvtmqMrTdWhbOfbwokNFtUZ/JCtanDKgwDv9x3AebqGAoJRvQNSru0F4nG+gWA==
+  dependencies:
+    workbox-cacheable-response "6.4.2"
+    workbox-core "6.4.2"
+    workbox-expiration "6.4.2"
+    workbox-precaching "6.4.2"
+    workbox-routing "6.4.2"
+    workbox-strategies "6.4.2"
+
+workbox-routing@6.4.2:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.4.2.tgz#65b1c61e8ca79bb9152f93263c26b1f248d09dcc"
+  integrity sha512-0ss/n9PAcHjTy4Ad7l2puuod4WtsnRYu9BrmHcu6Dk4PgWeJo1t5VnGufPxNtcuyPGQ3OdnMdlmhMJ57sSrrSw==
+  dependencies:
+    workbox-core "6.4.2"
+
+workbox-strategies@6.4.2:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.4.2.tgz#50c02bf2d116918e1a8052df5f2c1e4103c62d5d"
+  integrity sha512-YXh9E9dZGEO1EiPC3jPe2CbztO5WT8Ruj8wiYZM56XqEJp5YlGTtqRjghV+JovWOqkWdR+amJpV31KPWQUvn1Q==
+  dependencies:
+    workbox-core "6.4.2"
+
+workbox-streams@6.4.2:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.4.2.tgz#3bc615cccebfd62dedf28315afb7d9ee177912a5"
+  integrity sha512-ROEGlZHGVEgpa5bOZefiJEVsi5PsFjJG9Xd+wnDbApsCO9xq9rYFopF+IRq9tChyYzhBnyk2hJxbQVWphz3sog==
+  dependencies:
+    workbox-core "6.4.2"
+    workbox-routing "6.4.2"
+
+workbox-sw@6.4.2:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.4.2.tgz#9a6db5f74580915dc2f0dbd47d2ffe057c94a795"
+  integrity sha512-A2qdu9TLktfIM5NE/8+yYwfWu+JgDaCkbo5ikrky2c7r9v2X6DcJ+zSLphNHHLwM/0eVk5XVf1mC5HGhYpMhhg==
+
+workbox-webpack-plugin@^6.4.2:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-6.4.2.tgz#aad9f11b028786d5b781420e68f4e8f570ea9936"
+  integrity sha512-CiEwM6kaJRkx1cP5xHksn13abTzUqMHiMMlp5Eh/v4wRcedgDTyv6Uo8+Hg9MurRbHDosO5suaPyF9uwVr4/CQ==
   dependencies:
     fast-json-stable-stringify "^2.1.0"
     pretty-bytes "^5.4.1"
     source-map-url "^0.4.0"
     upath "^1.2.0"
     webpack-sources "^1.4.3"
-    workbox-build "^6.1.5"
+    workbox-build "6.4.2"
 
-workbox-window@^6.1.5:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.1.5.tgz#017b22342e10c6df6b9672326b575ec950b6cd80"
-  integrity sha512-akL0X6mAegai2yypnq78RgfazeqvKbsllRtEI4dnbhPcRINEY1NmecFmsQk8SD+zWLK1gw5OdwAOX+zHSRVmeA==
+workbox-window@6.4.2:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.4.2.tgz#5319a3e343fa1e4bd15a1f53a07b58999d064c8a"
+  integrity sha512-KVyRKmrJg7iB+uym/B/CnEUEFG9CvnTU1Bq5xpXHbtgD9l+ShDekSl1wYpqw/O0JfeeQVOFb8CiNfvnwWwqnWQ==
   dependencies:
-    workbox-core "^6.1.5"
+    "@types/trusted-types" "^2.0.2"
+    workbox-core "6.4.2"
 
 wrap-ansi@^3.0.1:
   version "3.0.1"
@@ -12367,15 +12492,6 @@ wrap-ansi@^3.0.1:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
 
-wrap-ansi@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
-  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
-
 wrap-ansi@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
@@ -12419,12 +12535,10 @@ ws@7.4.5:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74"
   integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==
 
-ws@^6.2.1:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
-  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
-  dependencies:
-    async-limiter "~1.0.0"
+ws@^8.1.0, ws@^8.3.0:
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.4.0.tgz#f05e982a0a88c604080e8581576e2a063802bed6"
+  integrity sha512-IHVsKe2pjajSUIl4KYMQOdlyliovpEPquKkqbwswulszzI7r0SfQrxnXdWAEqOlDCLrVSJzo+O1hAwdog2sKSQ==
 
 xhr@^2.0.1:
   version "2.6.0"
@@ -12479,19 +12593,11 @@ yaml-ast-parser@^0.0.43:
   resolved "https://registry.yarnpkg.com/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz#e8a23e6fb4c38076ab92995c5dca33f3d3d7c9bb"
   integrity sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==
 
-yaml@^1.10.0, yaml@^1.7.2:
+yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yargs-parser@^13.1.2:
-  version "13.1.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
-  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
 yargs-parser@^18.1.2:
   version "18.1.3"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
@@ -12505,22 +12611,6 @@ yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs@^13.3.2:
-  version "13.3.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
-  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
-  dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.2"
-
 yargs@^15.3.1:
   version "15.4.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
@@ -12569,12 +12659,14 @@ zen-observable-ts@^0.8.21:
     tslib "^1.9.3"
     zen-observable "^0.8.0"
 
-zen-observable@^0.8.0, zen-observable@^0.8.14:
+zen-observable-ts@^1.2.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.2.3.tgz#c2f5ccebe812faf0cfcde547e6004f65b1a6d769"
+  integrity sha512-hc/TGiPkAWpByykMwDcem3SdUgA4We+0Qb36bItSuJC9xD0XVBZoFHYoadAomDSNf64CG8Ydj0Qb8Od8BUWz5g==
+  dependencies:
+    zen-observable "0.8.15"
+
+zen-observable@0.8.15, zen-observable@^0.8.0, zen-observable@^0.8.14:
   version "0.8.15"
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15"
   integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==
-
-zwitch@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"
-  integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==