diff --git a/packages/ui/src/App.tsx b/packages/ui/src/App.tsx
index 8db3ea361..be44d354e 100644
--- a/packages/ui/src/App.tsx
+++ b/packages/ui/src/App.tsx
@@ -2,9 +2,9 @@ import { SignInMode } from '@logto/schemas';
 import { useEffect, useRef } from 'react';
 import { Route, Routes, BrowserRouter, Navigate } from 'react-router-dom';
 
-import AppBoundary from './containers/AppBoundary';
-import AppContent from './containers/AppContent';
-import LoadingLayerProvider from './containers/LoadingLayerProvider';
+import AppLayout from './Layout/AppLayout';
+import AppBoundary from './Providers/AppBoundary';
+import LoadingLayerProvider from './Providers/LoadingLayerProvider';
 import usePageContext from './hooks/use-page-context';
 import usePreview from './hooks/use-preview';
 import initI18n from './i18n/init';
@@ -74,7 +74,7 @@ const App = () => {
       <Provider value={context}>
         <AppBoundary>
           <Routes>
-            <Route element={<AppContent />}>
+            <Route element={<AppLayout />}>
               <Route
                 path="unknown-session"
                 element={<ErrorPage message="error.invalid_session" />}
diff --git a/packages/ui/src/containers/AppContent/index.module.scss b/packages/ui/src/Layout/AppLayout/index.module.scss
similarity index 100%
rename from packages/ui/src/containers/AppContent/index.module.scss
rename to packages/ui/src/Layout/AppLayout/index.module.scss
diff --git a/packages/ui/src/containers/AppContent/index.tsx b/packages/ui/src/Layout/AppLayout/index.tsx
similarity index 89%
rename from packages/ui/src/containers/AppContent/index.tsx
rename to packages/ui/src/Layout/AppLayout/index.tsx
index 876e54100..3a1eb0058 100644
--- a/packages/ui/src/containers/AppContent/index.tsx
+++ b/packages/ui/src/Layout/AppLayout/index.tsx
@@ -7,7 +7,7 @@ import { parseHtmlTitle } from '@/utils/sign-in-experience';
 
 import * as styles from './index.module.scss';
 
-const AppContent = () => {
+const AppLayout = () => {
   const { isMobile } = usePlatform();
   const location = useLocation();
 
@@ -25,7 +25,7 @@ const AppContent = () => {
     <div className={styles.viewBox}>
       <div className={styles.container}>
         <div className={styles.placeHolder} />
-        <main className={styles.main}>
+        <main id="main-form" className={styles.main}>
           <Outlet />
           {isMobile && <LogtoSignature />}
         </main>
@@ -36,4 +36,4 @@ const AppContent = () => {
   );
 };
 
-export default AppContent;
+export default AppLayout;
diff --git a/packages/ui/src/containers/LandingPageContainer/index.module.scss b/packages/ui/src/Layout/LandingPageLayout/index.module.scss
similarity index 100%
rename from packages/ui/src/containers/LandingPageContainer/index.module.scss
rename to packages/ui/src/Layout/LandingPageLayout/index.module.scss
diff --git a/packages/ui/src/containers/LandingPageContainer/index.tsx b/packages/ui/src/Layout/LandingPageLayout/index.tsx
similarity index 87%
rename from packages/ui/src/containers/LandingPageContainer/index.tsx
rename to packages/ui/src/Layout/LandingPageLayout/index.tsx
index a2075e5f5..3b54777d5 100644
--- a/packages/ui/src/containers/LandingPageContainer/index.tsx
+++ b/packages/ui/src/Layout/LandingPageLayout/index.tsx
@@ -7,7 +7,7 @@ import BrandingHeader from '@/components/BrandingHeader';
 import { PageContext } from '@/hooks/use-page-context';
 import { getBrandingLogoUrl } from '@/utils/logo';
 
-import AppNotification from '../AppNotification';
+import AppNotification from '../../containers/AppNotification';
 import * as styles from './index.module.scss';
 
 type Props = {
@@ -16,7 +16,7 @@ type Props = {
   title?: TFuncKey;
 };
 
-const LandingPageContainer = ({ children, className, title }: Props) => {
+const LandingPageLayout = ({ children, className, title }: Props) => {
   const { experienceSettings, theme, platform } = useContext(PageContext);
 
   if (!experienceSettings) {
@@ -45,4 +45,4 @@ const LandingPageContainer = ({ children, className, title }: Props) => {
   );
 };
 
-export default LandingPageContainer;
+export default LandingPageLayout;
diff --git a/packages/ui/src/components/SecondaryPageWrapper/index.module.scss b/packages/ui/src/Layout/SecondaryPageLayout/index.module.scss
similarity index 100%
rename from packages/ui/src/components/SecondaryPageWrapper/index.module.scss
rename to packages/ui/src/Layout/SecondaryPageLayout/index.module.scss
diff --git a/packages/ui/src/components/SecondaryPageWrapper/index.tsx b/packages/ui/src/Layout/SecondaryPageLayout/index.tsx
similarity index 90%
rename from packages/ui/src/components/SecondaryPageWrapper/index.tsx
rename to packages/ui/src/Layout/SecondaryPageLayout/index.tsx
index ca0b43553..d851695ce 100644
--- a/packages/ui/src/components/SecondaryPageWrapper/index.tsx
+++ b/packages/ui/src/Layout/SecondaryPageLayout/index.tsx
@@ -4,7 +4,7 @@ import type { TFuncKey } from 'react-i18next';
 import NavBar from '@/components/NavBar';
 import usePlatform from '@/hooks/use-platform';
 
-import { InlineNotification } from '../Notification';
+import { InlineNotification } from '../../components/Notification';
 import * as styles from './index.module.scss';
 
 type Props = {
@@ -16,7 +16,7 @@ type Props = {
   children: React.ReactNode;
 };
 
-const SecondaryPageWrapper = ({
+const SecondaryPageLayout = ({
   title,
   description,
   titleProps,
@@ -50,4 +50,4 @@ const SecondaryPageWrapper = ({
   );
 };
 
-export default SecondaryPageWrapper;
+export default SecondaryPageLayout;
diff --git a/packages/ui/src/Layout/StaticPageLayout/index.module.scss b/packages/ui/src/Layout/StaticPageLayout/index.module.scss
new file mode 100644
index 000000000..27eea5237
--- /dev/null
+++ b/packages/ui/src/Layout/StaticPageLayout/index.module.scss
@@ -0,0 +1,7 @@
+@use '@/scss/underscore' as _;
+
+
+.wrapper {
+  @include _.full-page;
+  @include _.flex-column;
+}
diff --git a/packages/ui/src/Layout/StaticPageLayout/index.tsx b/packages/ui/src/Layout/StaticPageLayout/index.tsx
new file mode 100644
index 000000000..edf19da5f
--- /dev/null
+++ b/packages/ui/src/Layout/StaticPageLayout/index.tsx
@@ -0,0 +1,11 @@
+import * as styles from './index.module.scss';
+
+type Props = {
+  children: React.ReactNode;
+};
+
+const StaticPageLayout = ({ children }: Props) => {
+  return <div className={styles.wrapper}>{children}</div>;
+};
+
+export default StaticPageLayout;
diff --git a/packages/ui/src/containers/AppBoundary/index.module.scss b/packages/ui/src/Providers/AppBoundary/index.module.scss
similarity index 100%
rename from packages/ui/src/containers/AppBoundary/index.module.scss
rename to packages/ui/src/Providers/AppBoundary/index.module.scss
diff --git a/packages/ui/src/containers/AppBoundary/index.tsx b/packages/ui/src/Providers/AppBoundary/index.tsx
similarity index 74%
rename from packages/ui/src/containers/AppBoundary/index.tsx
rename to packages/ui/src/Providers/AppBoundary/index.tsx
index 36ef98761..4c3def0d3 100644
--- a/packages/ui/src/containers/AppBoundary/index.tsx
+++ b/packages/ui/src/Providers/AppBoundary/index.tsx
@@ -1,13 +1,13 @@
 import { conditionalString } from '@silverhand/essentials';
 import type { ReactNode } from 'react';
-import { useCallback, useContext, useEffect } from 'react';
+import { useContext, useEffect } from 'react';
 
-import Toast from '@/components/Toast';
 import useColorTheme from '@/hooks/use-color-theme';
 import { PageContext } from '@/hooks/use-page-context';
 import useTheme from '@/hooks/use-theme';
 
 import ConfirmModalProvider from '../ConfirmModalProvider';
+import ToastProvider from '../ToastProvider';
 import * as styles from './index.module.scss';
 
 type Props = {
@@ -18,7 +18,7 @@ const AppBoundary = ({ children }: Props) => {
   // Set Primary Color
   useColorTheme();
   const theme = useTheme();
-  const { platform, toast, setToast } = useContext(PageContext);
+  const { platform } = useContext(PageContext);
 
   // Set Theme Mode
   useEffect(() => {
@@ -32,15 +32,9 @@ const AppBoundary = ({ children }: Props) => {
     document.body.classList.add(platform === 'mobile' ? 'mobile' : 'desktop');
   }, [platform]);
 
-  // Prevent internal eventListener rebind
-  const hideToast = useCallback(() => {
-    setToast('');
-  }, [setToast]);
-
   return (
     <ConfirmModalProvider>
-      <Toast message={toast} callback={hideToast} />
-      {children}
+      <ToastProvider>{children}</ToastProvider>
     </ConfirmModalProvider>
   );
 };
diff --git a/packages/ui/src/containers/ConfirmModalProvider/index.tsx b/packages/ui/src/Providers/ConfirmModalProvider/index.tsx
similarity index 100%
rename from packages/ui/src/containers/ConfirmModalProvider/index.tsx
rename to packages/ui/src/Providers/ConfirmModalProvider/index.tsx
diff --git a/packages/ui/src/containers/ConfirmModalProvider/indext.test.tsx b/packages/ui/src/Providers/ConfirmModalProvider/indext.test.tsx
similarity index 100%
rename from packages/ui/src/containers/ConfirmModalProvider/indext.test.tsx
rename to packages/ui/src/Providers/ConfirmModalProvider/indext.test.tsx
diff --git a/packages/ui/src/containers/LoadingLayerProvider/index.tsx b/packages/ui/src/Providers/LoadingLayerProvider/index.tsx
similarity index 100%
rename from packages/ui/src/containers/LoadingLayerProvider/index.tsx
rename to packages/ui/src/Providers/LoadingLayerProvider/index.tsx
diff --git a/packages/ui/src/Providers/ToastProvider/index.tsx b/packages/ui/src/Providers/ToastProvider/index.tsx
new file mode 100644
index 000000000..34fce7f1e
--- /dev/null
+++ b/packages/ui/src/Providers/ToastProvider/index.tsx
@@ -0,0 +1,27 @@
+import type { ReactNode } from 'react';
+import { useCallback, useContext } from 'react';
+
+import Toast from '@/components/Toast';
+import { PageContext } from '@/hooks/use-page-context';
+
+type Props = {
+  children: ReactNode;
+};
+
+const ToastProvider = ({ children }: Props) => {
+  const { toast, setToast } = useContext(PageContext);
+
+  // Prevent internal eventListener rebind
+  const hideToast = useCallback(() => {
+    setToast('');
+  }, [setToast]);
+
+  return (
+    <>
+      {children}
+      <Toast message={toast} callback={hideToast} />
+    </>
+  );
+};
+
+export default ToastProvider;
diff --git a/packages/ui/src/hooks/use-confirm-modal.ts b/packages/ui/src/hooks/use-confirm-modal.ts
index d6df97059..81521b481 100644
--- a/packages/ui/src/hooks/use-confirm-modal.ts
+++ b/packages/ui/src/hooks/use-confirm-modal.ts
@@ -1,7 +1,7 @@
 import { useContext } from 'react';
 
-import { ConfirmModalContext } from '@/containers/ConfirmModalProvider';
+import { ConfirmModalContext } from '@/Providers/ConfirmModalProvider';
 
-export type { ModalContentRenderProps } from '@/containers/ConfirmModalProvider';
+export type { ModalContentRenderProps } from '@/Providers/ConfirmModalProvider';
 
 export const useConfirmModal = () => useContext(ConfirmModalContext);
diff --git a/packages/ui/src/hooks/use-preview.ts b/packages/ui/src/hooks/use-preview.ts
index 77ac05ddf..7b9b56024 100644
--- a/packages/ui/src/hooks/use-preview.ts
+++ b/packages/ui/src/hooks/use-preview.ts
@@ -2,8 +2,8 @@ import { ConnectorPlatform } from '@logto/schemas';
 import { conditionalString } from '@silverhand/essentials';
 import { useEffect, useState } from 'react';
 
-import * as appStyles from '@/containers/AppBoundary/index.module.scss';
-import * as styles from '@/containers/AppContent/index.module.scss';
+import * as styles from '@/Layout/AppLayout/index.module.scss';
+import * as appStyles from '@/Providers/AppBoundary/index.module.scss';
 import type { Context } from '@/hooks/use-page-context';
 import initI18n from '@/i18n/init';
 import { changeLanguage } from '@/i18n/utils';
diff --git a/packages/ui/src/pages/Callback/index.module.scss b/packages/ui/src/pages/Callback/index.module.scss
index 05aacdf36..8467405e5 100644
--- a/packages/ui/src/pages/Callback/index.module.scss
+++ b/packages/ui/src/pages/Callback/index.module.scss
@@ -1,12 +1,6 @@
 @use '@/scss/underscore' as _;
 
 
-.wrapper {
-  @include _.full-page;
-  @include _.flex-column;
-}
-
-
 .connectorContainer {
   flex: 1;
 }
diff --git a/packages/ui/src/pages/Callback/index.tsx b/packages/ui/src/pages/Callback/index.tsx
index 54822e2ba..dc85b705e 100644
--- a/packages/ui/src/pages/Callback/index.tsx
+++ b/packages/ui/src/pages/Callback/index.tsx
@@ -1,6 +1,7 @@
 import { useEffect } from 'react';
 import { useParams } from 'react-router-dom';
 
+import StaticPageLayout from '@/Layout/StaticPageLayout';
 import SocialLanding from '@/containers/SocialLanding';
 import useSocialCallbackHandler from '@/hooks/use-social-callback-handler';
 
@@ -28,9 +29,9 @@ const Callback = () => {
   }
 
   return (
-    <div className={styles.wrapper}>
+    <StaticPageLayout>
       <SocialLanding isLoading className={styles.connectorContainer} connectorId={connectorId} />
-    </div>
+    </StaticPageLayout>
   );
 };
 
diff --git a/packages/ui/src/pages/Consent/index.module.scss b/packages/ui/src/pages/Consent/index.module.scss
index ef463ed6c..c7b03c58a 100644
--- a/packages/ui/src/pages/Consent/index.module.scss
+++ b/packages/ui/src/pages/Consent/index.module.scss
@@ -1,13 +1,8 @@
 @use '@/scss/underscore' as _;
 
-.wrapper {
-  @include _.full-page;
-  @include _.flex-column;
-
-  img {
-    width: 96px;
-    height: 96px;
-    @include _.image-align-center;
-    margin-bottom: _.unit(4);
-  }
+.img {
+  width: 96px;
+  height: 96px;
+  @include _.image-align-center;
+  margin-bottom: _.unit(4);
 }
diff --git a/packages/ui/src/pages/Consent/index.tsx b/packages/ui/src/pages/Consent/index.tsx
index baeed3fe4..6fc2e47cc 100644
--- a/packages/ui/src/pages/Consent/index.tsx
+++ b/packages/ui/src/pages/Consent/index.tsx
@@ -1,6 +1,7 @@
 import { conditional } from '@silverhand/essentials';
 import { useEffect, useContext, useState } from 'react';
 
+import StaticPageLayout from '@/Layout/StaticPageLayout';
 import { consent } from '@/apis/consent';
 import { LoadingIcon } from '@/components/LoadingLayer';
 import useApi from '@/hooks/use-api';
@@ -41,10 +42,10 @@ const Consent = () => {
   }, [asyncConsent, handleError]);
 
   return (
-    <div className={styles.wrapper}>
-      {brandingLogo && <img alt="logo" src={brandingLogo} />}
+    <StaticPageLayout>
+      {brandingLogo && <img alt="logo" className={styles.img} src={brandingLogo} />}
       {loading && <LoadingIcon />}
-    </div>
+    </StaticPageLayout>
   );
 };
 
diff --git a/packages/ui/src/pages/Continue/SetEmailOrPhone/index.tsx b/packages/ui/src/pages/Continue/SetEmailOrPhone/index.tsx
index 0faeda4f9..ce6daa978 100644
--- a/packages/ui/src/pages/Continue/SetEmailOrPhone/index.tsx
+++ b/packages/ui/src/pages/Continue/SetEmailOrPhone/index.tsx
@@ -2,7 +2,7 @@ import type { MissingProfile } from '@logto/schemas';
 import { SignInIdentifier } from '@logto/schemas';
 import type { TFuncKey } from 'react-i18next';
 
-import SecondaryPageWrapper from '@/components/SecondaryPageWrapper';
+import SecondaryPageLayout from '@/Layout/SecondaryPageLayout';
 import useSendVerificationCode from '@/hooks/use-send-verification-code';
 import type { VerificationCodeIdentifier } from '@/types';
 import { UserFlow } from '@/types';
@@ -69,7 +69,7 @@ const SetEmailOrPhone = ({ missingProfile, notification }: Props) => {
   };
 
   return (
-    <SecondaryPageWrapper {...pageContent[missingProfile]} notification={notification}>
+    <SecondaryPageLayout {...pageContent[missingProfile]} notification={notification}>
       <IdentifierProfileForm
         autoFocus
         errorMessage={errorMessage}
@@ -78,7 +78,7 @@ const SetEmailOrPhone = ({ missingProfile, notification }: Props) => {
         onSubmit={handleSubmit}
       />
       <SocialIdentityNotification missingProfileTypes={formSettings[missingProfile].enabledTypes} />
-    </SecondaryPageWrapper>
+    </SecondaryPageLayout>
   );
 };
 
diff --git a/packages/ui/src/pages/Continue/SetPassword/index.tsx b/packages/ui/src/pages/Continue/SetPassword/index.tsx
index 2b4308716..f2ac7ed8b 100644
--- a/packages/ui/src/pages/Continue/SetPassword/index.tsx
+++ b/packages/ui/src/pages/Continue/SetPassword/index.tsx
@@ -1,4 +1,4 @@
-import SecondaryPageWrapper from '@/components/SecondaryPageWrapper';
+import SecondaryPageLayout from '@/Layout/SecondaryPageLayout';
 import SetPasswordForm from '@/containers/SetPassword';
 import { passwordMinLength } from '@/utils/form';
 
@@ -8,13 +8,13 @@ const SetPassword = () => {
   const { setPassword } = useSetPassword();
 
   return (
-    <SecondaryPageWrapper
+    <SecondaryPageLayout
       title="description.set_password"
       description="error.invalid_password"
       descriptionProps={{ min: passwordMinLength }}
     >
       <SetPasswordForm autoFocus onSubmit={setPassword} />
-    </SecondaryPageWrapper>
+    </SecondaryPageLayout>
   );
 };
 
diff --git a/packages/ui/src/pages/Continue/SetUsername/index.tsx b/packages/ui/src/pages/Continue/SetUsername/index.tsx
index 0819bb456..abe62ad09 100644
--- a/packages/ui/src/pages/Continue/SetUsername/index.tsx
+++ b/packages/ui/src/pages/Continue/SetUsername/index.tsx
@@ -1,7 +1,7 @@
 import { SignInIdentifier } from '@logto/schemas';
 import type { TFuncKey } from 'react-i18next';
 
-import SecondaryPageWrapper from '@/components/SecondaryPageWrapper';
+import SecondaryPageLayout from '@/Layout/SecondaryPageLayout';
 
 import IdentifierProfileForm from '../IdentifierProfileForm';
 import useSetUsername from './use-set-username';
@@ -22,7 +22,7 @@ const SetUsername = (props: Props) => {
   };
 
   return (
-    <SecondaryPageWrapper
+    <SecondaryPageLayout
       title="description.enter_username"
       description="description.enter_username_description"
       {...props}
@@ -35,7 +35,7 @@ const SetUsername = (props: Props) => {
         enabledTypes={[SignInIdentifier.Username]}
         onSubmit={handleSubmit}
       />
-    </SecondaryPageWrapper>
+    </SecondaryPageLayout>
   );
 };
 
diff --git a/packages/ui/src/pages/ErrorPage/index.module.scss b/packages/ui/src/pages/ErrorPage/index.module.scss
index 1f5be4472..d7b0b964a 100644
--- a/packages/ui/src/pages/ErrorPage/index.module.scss
+++ b/packages/ui/src/pages/ErrorPage/index.module.scss
@@ -1,24 +1,19 @@
 @use '@/scss/underscore' as _;
 
-.wrapper {
-  @include _.full-page;
+.container {
+  flex: 1;
   @include _.flex-column;
+  @include _.full-width;
+}
 
-  .container {
-    flex: 1;
-    @include _.flex-column;
-    @include _.full-width;
-  }
+.title {
+  margin-top: _.unit(8);
+  text-align: center;
+}
 
-  .title {
-    margin-top: _.unit(8);
-    text-align: center;
-  }
-
-  .message {
-    @include _.text-hint;
-    text-align: center;
-  }
+.message {
+  @include _.text-hint;
+  text-align: center;
 }
 
 
diff --git a/packages/ui/src/pages/ErrorPage/index.tsx b/packages/ui/src/pages/ErrorPage/index.tsx
index 961b6eaca..933e67194 100644
--- a/packages/ui/src/pages/ErrorPage/index.tsx
+++ b/packages/ui/src/pages/ErrorPage/index.tsx
@@ -3,6 +3,7 @@ import type { TFuncKey } from 'react-i18next';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 
+import StaticPageLayout from '@/Layout/StaticPageLayout';
 import EmptyStateDark from '@/assets/icons/empty-state-dark.svg';
 import EmptyState from '@/assets/icons/empty-state.svg';
 import Button from '@/components/Button';
@@ -25,7 +26,7 @@ const ErrorPage = ({ title = 'description.not_found', message, rawMessage }: Pro
   const errorMessage = rawMessage ?? (message && t(message));
 
   return (
-    <div className={styles.wrapper}>
+    <StaticPageLayout>
       <NavBar />
       <div className={styles.container}>
         {theme === 'light' ? <EmptyState /> : <EmptyStateDark />}
@@ -39,7 +40,7 @@ const ErrorPage = ({ title = 'description.not_found', message, rawMessage }: Pro
           navigate(-1);
         }}
       />
-    </div>
+    </StaticPageLayout>
   );
 };
 
diff --git a/packages/ui/src/pages/ForgotPassword/index.tsx b/packages/ui/src/pages/ForgotPassword/index.tsx
index d12680080..30ca00eee 100644
--- a/packages/ui/src/pages/ForgotPassword/index.tsx
+++ b/packages/ui/src/pages/ForgotPassword/index.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { useLocation } from 'react-router-dom';
 import { validate } from 'superstruct';
 
-import SecondaryPageWrapper from '@/components/SecondaryPageWrapper';
+import SecondaryPageLayout from '@/Layout/SecondaryPageLayout';
 import { useForgotPasswordSettings } from '@/hooks/use-sie';
 import { passwordIdentifierStateGuard } from '@/types/guard';
 import { identifierInputDescriptionMap } from '@/utils/form';
@@ -47,7 +47,7 @@ const ForgotPassword = () => {
   const defaultValue = (identifierState?.identifier === defaultType && identifierState.value) || '';
 
   return (
-    <SecondaryPageWrapper
+    <SecondaryPageLayout
       title="description.reset_password"
       description="description.reset_password_description"
       descriptionProps={{
@@ -60,7 +60,7 @@ const ForgotPassword = () => {
         defaultValue={defaultValue}
         enabledTypes={enabledMethods}
       />
-    </SecondaryPageWrapper>
+    </SecondaryPageLayout>
   );
 };
 
diff --git a/packages/ui/src/pages/Register/IdentifierRegisterForm/index.test.tsx b/packages/ui/src/pages/Register/IdentifierRegisterForm/index.test.tsx
index ae15aaede..c2bc3045a 100644
--- a/packages/ui/src/pages/Register/IdentifierRegisterForm/index.test.tsx
+++ b/packages/ui/src/pages/Register/IdentifierRegisterForm/index.test.tsx
@@ -2,11 +2,11 @@ import { SignInIdentifier } from '@logto/schemas';
 import { assert } from '@silverhand/essentials';
 import { fireEvent, act, waitFor } from '@testing-library/react';
 
+import ConfirmModalProvider from '@/Providers/ConfirmModalProvider';
 import renderWithPageContext from '@/__mocks__/RenderWithPageContext';
 import SettingsProvider from '@/__mocks__/RenderWithPageContext/SettingsProvider';
 import { registerWithUsernamePassword } from '@/apis/interaction';
 import { sendVerificationCodeApi } from '@/apis/utils';
-import ConfirmModalProvider from '@/containers/ConfirmModalProvider';
 import { UserFlow } from '@/types';
 import { getDefaultCountryCallingCode } from '@/utils/country-code';
 
diff --git a/packages/ui/src/pages/Register/index.tsx b/packages/ui/src/pages/Register/index.tsx
index 68d519d64..c87966616 100644
--- a/packages/ui/src/pages/Register/index.tsx
+++ b/packages/ui/src/pages/Register/index.tsx
@@ -1,9 +1,9 @@
 import { SignInMode } from '@logto/schemas';
 import { useTranslation } from 'react-i18next';
 
+import LandingPageLayout from '@/Layout/LandingPageLayout';
 import Divider from '@/components/Divider';
 import TextLink from '@/components/TextLink';
-import LandingPageContainer from '@/containers/LandingPageContainer';
 import SocialSignInList from '@/containers/SocialSignInList';
 import TermsAndPrivacy from '@/containers/TermsAndPrivacy';
 import { useSieMethods } from '@/hooks/use-sie';
@@ -21,7 +21,7 @@ const Register = () => {
   }
 
   return (
-    <LandingPageContainer title="description.create_your_account">
+    <LandingPageLayout title="description.create_your_account">
       {signUpMethods.length > 0 && (
         <IdentifierRegisterForm signUpMethods={signUpMethods} className={styles.main} />
       )}
@@ -48,7 +48,7 @@ const Register = () => {
           </>
         )
       }
-    </LandingPageContainer>
+    </LandingPageLayout>
   );
 };
 
diff --git a/packages/ui/src/pages/RegisterPassword/index.tsx b/packages/ui/src/pages/RegisterPassword/index.tsx
index 101c8315d..c02e65e6e 100644
--- a/packages/ui/src/pages/RegisterPassword/index.tsx
+++ b/packages/ui/src/pages/RegisterPassword/index.tsx
@@ -1,6 +1,6 @@
 import { SignInIdentifier } from '@logto/schemas';
 
-import SecondaryPageWrapper from '@/components/SecondaryPageWrapper';
+import SecondaryPageLayout from '@/Layout/SecondaryPageLayout';
 import SetPassword from '@/containers/SetPassword';
 import { useSieMethods } from '@/hooks/use-sie';
 import { passwordMinLength } from '@/utils/form';
@@ -17,7 +17,7 @@ const RegisterPassword = () => {
   }
 
   return (
-    <SecondaryPageWrapper
+    <SecondaryPageLayout
       title="description.new_password"
       description="error.invalid_password"
       descriptionProps={{ min: passwordMinLength }}
@@ -28,7 +28,7 @@ const RegisterPassword = () => {
           void setPassword(password);
         }}
       />
-    </SecondaryPageWrapper>
+    </SecondaryPageLayout>
   );
 };
 
diff --git a/packages/ui/src/pages/ResetPassword/index.tsx b/packages/ui/src/pages/ResetPassword/index.tsx
index ed1d644c3..08e853472 100644
--- a/packages/ui/src/pages/ResetPassword/index.tsx
+++ b/packages/ui/src/pages/ResetPassword/index.tsx
@@ -1,4 +1,4 @@
-import SecondaryPageWrapper from '@/components/SecondaryPageWrapper';
+import SecondaryPageLayout from '@/Layout/SecondaryPageLayout';
 import SetPassword from '@/containers/SetPassword';
 import { passwordMinLength } from '@/utils/form';
 
@@ -8,7 +8,7 @@ const ResetPassword = () => {
   const { resetPassword, errorMessage, clearErrorMessage } = useResetPassword();
 
   return (
-    <SecondaryPageWrapper
+    <SecondaryPageLayout
       title="description.new_password"
       description="error.invalid_password"
       descriptionProps={{ min: passwordMinLength }}
@@ -19,7 +19,7 @@ const ResetPassword = () => {
         clearErrorMessage={clearErrorMessage}
         onSubmit={resetPassword}
       />
-    </SecondaryPageWrapper>
+    </SecondaryPageLayout>
   );
 };
 
diff --git a/packages/ui/src/pages/SignIn/index.tsx b/packages/ui/src/pages/SignIn/index.tsx
index 5b6f75983..e515627e3 100644
--- a/packages/ui/src/pages/SignIn/index.tsx
+++ b/packages/ui/src/pages/SignIn/index.tsx
@@ -1,9 +1,9 @@
 import { SignInMode } from '@logto/schemas';
 import { useTranslation } from 'react-i18next';
 
+import LandingPageLayout from '@/Layout/LandingPageLayout';
 import Divider from '@/components/Divider';
 import TextLink from '@/components/TextLink';
-import LandingPageContainer from '@/containers/LandingPageContainer';
 import SocialSignInList from '@/containers/SocialSignInList';
 import TermsAndPrivacyLinks from '@/containers/TermsAndPrivacyLinks';
 import { useSieMethods } from '@/hooks/use-sie';
@@ -21,7 +21,7 @@ const SignIn = () => {
   }
 
   return (
-    <LandingPageContainer title="description.welcome_to_sign_in">
+    <LandingPageLayout title="description.welcome_to_sign_in">
       <Main signInMethods={signInMethods} socialConnectors={socialConnectors} />
       {
         // Create Account footer
@@ -42,7 +42,7 @@ const SignIn = () => {
         )
       }
       <TermsAndPrivacyLinks className={styles.terms} />
-    </LandingPageContainer>
+    </LandingPageLayout>
   );
 };
 
diff --git a/packages/ui/src/pages/SignInPassword/index.tsx b/packages/ui/src/pages/SignInPassword/index.tsx
index 2ae749caa..1fe14ec58 100644
--- a/packages/ui/src/pages/SignInPassword/index.tsx
+++ b/packages/ui/src/pages/SignInPassword/index.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import { useLocation } from 'react-router-dom';
 import { validate } from 'superstruct';
 
-import SecondaryPageWrapper from '@/components/SecondaryPageWrapper';
+import SecondaryPageLayout from '@/Layout/SecondaryPageLayout';
 import { useSieMethods } from '@/hooks/use-sie';
 import ErrorPage from '@/pages/ErrorPage';
 import { passwordIdentifierStateGuard } from '@/types/guard';
@@ -33,7 +33,7 @@ const SignInPassword = () => {
   }
 
   return (
-    <SecondaryPageWrapper
+    <SecondaryPageLayout
       title="description.enter_password"
       description="description.enter_password_for"
       descriptionProps={{
@@ -50,7 +50,7 @@ const SignInPassword = () => {
         value={value}
         isVerificationCodeEnabled={methodSetting.verificationCode}
       />
-    </SecondaryPageWrapper>
+    </SecondaryPageLayout>
   );
 };
 
diff --git a/packages/ui/src/pages/SocialLanding/index.module.scss b/packages/ui/src/pages/SocialLanding/index.module.scss
index 05aacdf36..dcd308cfc 100644
--- a/packages/ui/src/pages/SocialLanding/index.module.scss
+++ b/packages/ui/src/pages/SocialLanding/index.module.scss
@@ -1,12 +1,5 @@
 @use '@/scss/underscore' as _;
 
-
-.wrapper {
-  @include _.full-page;
-  @include _.flex-column;
-}
-
-
 .connectorContainer {
   flex: 1;
 }
diff --git a/packages/ui/src/pages/SocialLanding/index.tsx b/packages/ui/src/pages/SocialLanding/index.tsx
index 17f86923b..0909e99ab 100644
--- a/packages/ui/src/pages/SocialLanding/index.tsx
+++ b/packages/ui/src/pages/SocialLanding/index.tsx
@@ -1,6 +1,7 @@
 import { useEffect } from 'react';
 import { useParams } from 'react-router-dom';
 
+import StaticPageLayout from '@/Layout/StaticPageLayout';
 import SocialLandingContainer from '@/containers/SocialLanding';
 import useSocialLandingHandler from '@/hooks/use-social-landing-handler';
 
@@ -27,13 +28,13 @@ const SocialLanding = () => {
   }
 
   return (
-    <div className={styles.wrapper}>
+    <StaticPageLayout>
       <SocialLandingContainer
         className={styles.connectorContainer}
         connectorId={connectorId}
         isLoading={loading}
       />
-    </div>
+    </StaticPageLayout>
   );
 };
 
diff --git a/packages/ui/src/pages/SocialLinkAccount/index.tsx b/packages/ui/src/pages/SocialLinkAccount/index.tsx
index 826096a76..52a17c1d6 100644
--- a/packages/ui/src/pages/SocialLinkAccount/index.tsx
+++ b/packages/ui/src/pages/SocialLinkAccount/index.tsx
@@ -3,7 +3,7 @@ import type { TFuncKey } from 'react-i18next';
 import { useParams, useLocation } from 'react-router-dom';
 import { is } from 'superstruct';
 
-import SecondaryPageWrapper from '@/components/SecondaryPageWrapper';
+import SecondaryPageLayout from '@/Layout/SecondaryPageLayout';
 import SocialLinkAccountContainer from '@/containers/SocialLinkAccount';
 import { useSieMethods } from '@/hooks/use-sie';
 import ErrorPage from '@/pages/ErrorPage';
@@ -48,9 +48,9 @@ const SocialLinkAccount = () => {
   const { relatedUser } = state;
 
   return (
-    <SecondaryPageWrapper title={getPageTitle(signUpMethods)}>
+    <SecondaryPageLayout title={getPageTitle(signUpMethods)}>
       <SocialLinkAccountContainer connectorId={connectorId} relatedUser={relatedUser} />
-    </SecondaryPageWrapper>
+    </SecondaryPageLayout>
   );
 };
 
diff --git a/packages/ui/src/pages/VerificationCode/index.tsx b/packages/ui/src/pages/VerificationCode/index.tsx
index cc6d9c2dd..9d66d6bab 100644
--- a/packages/ui/src/pages/VerificationCode/index.tsx
+++ b/packages/ui/src/pages/VerificationCode/index.tsx
@@ -2,7 +2,7 @@ import { t } from 'i18next';
 import { useParams, useLocation } from 'react-router-dom';
 import { validate } from 'superstruct';
 
-import SecondaryPageWrapper from '@/components/SecondaryPageWrapper';
+import SecondaryPageLayout from '@/Layout/SecondaryPageLayout';
 import VerificationCodeContainer from '@/containers/VerificationCode';
 import { useSieMethods } from '@/hooks/use-sie';
 import ErrorPage from '@/pages/ErrorPage';
@@ -40,7 +40,7 @@ const VerificationCode = () => {
   }
 
   return (
-    <SecondaryPageWrapper
+    <SecondaryPageLayout
       title="action.enter_passcode"
       description="description.enter_passcode"
       descriptionProps={{
@@ -54,7 +54,7 @@ const VerificationCode = () => {
         target={value}
         hasPasswordButton={useFlow === UserFlow.signIn && methodSettings?.password}
       />
-    </SecondaryPageWrapper>
+    </SecondaryPageLayout>
   );
 };