diff --git a/packages/pl-fe/src/components/ui/layout.tsx b/packages/pl-fe/src/components/ui/layout.tsx
index 25c84986d..c010a3daa 100644
--- a/packages/pl-fe/src/components/ui/layout.tsx
+++ b/packages/pl-fe/src/components/ui/layout.tsx
@@ -25,13 +25,12 @@ interface LayoutComponent extends React.FC<ILayout> {
 
 /** Layout container, to hold Sidebar, Main, and Aside. */
 const Layout: LayoutComponent = ({ children, fullWidth }) => (
-  <div className='relative flex grow flex-col black:pt-0 sm:pt-4'>
+  <div className='⁂-layout'>
     <div
       className={clsx(
-        'mx-auto w-full max-w-3xl grow sm:px-6 md:gap-8 md:px-8',
+        '⁂-layout__content',
         {
-          'flex md:max-w-full': fullWidth,
-          'md:grid md:max-w-7xl md:grid-cols-12 xl:max-w-[1440px]': !fullWidth,
+          '⁂-layout__content--full-width': fullWidth,
         },
       )}
     >
@@ -42,8 +41,8 @@ const Layout: LayoutComponent = ({ children, fullWidth }) => (
 
 /** Left sidebar container in the UI. */
 const Sidebar: React.FC<ISidebar> = ({ children, shrink }) => (
-  <div className={clsx('hidden lg:block', { 'lg:col-span-3': !shrink, 'w-fit': shrink })}>
-    <StickyBox offsetTop={16} className='pb-4'>
+  <div className={clsx('⁂-layout__sidebar', { '⁂-layout__sidebar--shrink': shrink })}>
+    <StickyBox offsetTop={16} className='⁂-layout__sidebar__content'>
       {children}
     </StickyBox>
   </div>
@@ -56,8 +55,8 @@ const Main: React.FC<React.HTMLAttributes<HTMLDivElement>> = ({ children, classN
   return (
     <main
       className={clsx({
-        'md:col-span-12 lg:col-span-9 xl:col-span-6 pb-14 lg:pb-0 xl:pb-16 black:border-gray-800 lg:black:border-l xl:black:border-r': true,
-        'xl:pb-16': features.chats,
+        '⁂-layout__main': true,
+        '⁂-layout__main--chats-page': features.chats,
       }, className)}
     >
       {children}
@@ -67,8 +66,8 @@ const Main: React.FC<React.HTMLAttributes<HTMLDivElement>> = ({ children, classN
 
 /** Right sidebar container in the UI. */
 const Aside: React.FC<IAside> = ({ children }) => (
-  <aside className='hidden xl:col-span-3 xl:block'>
-    <StickyBox offsetTop={16} className='space-y-6 pb-12'>
+  <aside className='⁂-layout__aside'>
+    <StickyBox offsetTop={16} className='⁂-layout__aside__content'>
       <Suspense>
         {children}
       </Suspense>
diff --git a/packages/pl-fe/src/features/ui/index.tsx b/packages/pl-fe/src/features/ui/index.tsx
index f8bf48cfc..4c0d25778 100644
--- a/packages/pl-fe/src/features/ui/index.tsx
+++ b/packages/pl-fe/src/features/ui/index.tsx
@@ -498,7 +498,7 @@ const UI: React.FC<IUI> = React.memo(({ children }) => {
 
         {(theme?.backgroundGradient ?? true) && <BackgroundShapes />}
 
-        <div className='⁂-layout'>
+        <div className='⁂-layout__container'>
           <Layout fullWidth={fullWidth}>
             <Layout.Sidebar shrink={fullWidth}>
               {!(standalone && !me) && <SidebarNavigation shrink={fullWidth} />}
diff --git a/packages/pl-fe/src/styles/new/layout.scss b/packages/pl-fe/src/styles/new/layout.scss
index b6b7fbc8d..337407b36 100644
--- a/packages/pl-fe/src/styles/new/layout.scss
+++ b/packages/pl-fe/src/styles/new/layout.scss
@@ -173,7 +173,7 @@ body {
 
   &__icon {
     @apply relative rounded-lg inline-flex p-2.5 transition-colors duration-200;
-  
+
     svg {
       width: 1.25rem;
       height: 1.25rem;
@@ -269,8 +269,57 @@ body {
 
 .⁂-layout {
   display: flex;
-  min-height: 100vh;
-  flex-direction: column;
+  flex-grow: 1;
+
+  &__content {
+    @apply mx-auto w-full max-w-3xl grow black:pt-0 sm:px-6 sm:pt-4 md:gap-8 md:px-8;
+
+    &--full-width {
+      @apply flex md:max-w-full;
+    }
+
+    &:not(&--full-width) {
+      @apply md:grid md:max-w-7xl md:grid-cols-12 xl:max-w-[1440px];
+    }
+  }
+  
+  &__container {
+    display: flex;
+    min-height: 100vh;
+    flex-direction: column;
+  }
+
+  &__sidebar {
+    @apply hidden lg:block;
+
+    &--shrink {
+      @apply w-fit;
+    }
+
+    &:not(&--shrink) {
+      @apply lg:col-span-3;
+    }
+
+    &__content {
+      @apply pb-4;
+    }
+  }
+
+  &__main {
+    @apply md:col-span-12 lg:col-span-9 xl:col-span-6 pb-14 lg:pb-0 xl:pb-16 black:border-gray-800 lg:black:border-l xl:black:border-r;
+
+    &--chats-page {
+      @apply xl:pb-16;
+    }
+  }
+
+  &__aside {
+    @apply hidden xl:col-span-3 xl:block;
+
+    &__content {
+      @apply space-y-6 pb-12;
+    }
+  }
 }
 
 .⁂-background-shapes {