diff --git a/package.json b/package.json
index 624d9ad6..e755f5ed 100644
--- a/package.json
+++ b/package.json
@@ -56,6 +56,7 @@
     "ts-check": "tsc -p tsconfig.json --noEmit",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
     "prepare": "husky install",
+    "next:dev": "next dev",
     "next:build": "next build",
     "next:start": "next start -p 80"
   },
diff --git a/src/sprites/boris_robot.svg b/public/images/boris_robot.svg
similarity index 100%
rename from src/sprites/boris_robot.svg
rename to public/images/boris_robot.svg
diff --git a/src/components/common/LoadingProgress/index.tsx b/src/components/common/LoadingProgress/index.tsx
index 004dcccd..e5c387b2 100644
--- a/src/components/common/LoadingProgress/index.tsx
+++ b/src/components/common/LoadingProgress/index.tsx
@@ -7,7 +7,7 @@ import styles from './styles.module.scss';
 interface LoadingProgressProps {}
 
 const LoadingProgress: VFC<LoadingProgressProps> = () => {
-  const shown = useSSRLoadingIndicator(300);
+  const shown = useSSRLoadingIndicator(700);
 
   return shown ? (
     <>
diff --git a/src/containers/boris/BorisComments/index.tsx b/src/containers/boris/BorisComments/index.tsx
index d21c11c0..8779c594 100644
--- a/src/containers/boris/BorisComments/index.tsx
+++ b/src/containers/boris/BorisComments/index.tsx
@@ -10,8 +10,6 @@ import { CommentContextProvider, useCommentContext } from '~/utils/context/Comme
 import { useNodeContext } from '~/utils/context/NodeContextProvider';
 import { useUserContext } from '~/utils/context/UserContextProvider';
 
-import styles from './styles.module.scss';
-
 interface IProps {}
 
 const BorisComments: FC<IProps> = () => {
@@ -30,29 +28,27 @@ const BorisComments: FC<IProps> = () => {
   const { node } = useNodeContext();
 
   return (
-    <>
-      <Group className={styles.grid}>
+    <CommentContextProvider
+      onSaveComment={onSaveComment}
+      comments={comments}
+      hasMore={hasMore}
+      onDeleteComment={onDeleteComment}
+      onLoadMoreComments={onLoadMoreComments}
+      onShowImageModal={onShowImageModal}
+      isLoading={isLoading}
+    >
+      <Group>
         {isUser && <NodeCommentForm user={user} nodeId={node.id} saveComment={onSaveComment} />}
 
-        {isLoading ? (
+        {isLoading || !comments?.length ? (
           <NodeNoComments is_loading count={7} />
         ) : (
-          <CommentContextProvider
-            onSaveComment={onSaveComment}
-            comments={comments}
-            hasMore={hasMore}
-            onDeleteComment={onDeleteComment}
-            onLoadMoreComments={onLoadMoreComments}
-            onShowImageModal={onShowImageModal}
-            isLoading={isLoading}
-          >
-            <NodeComments order="ASC" />
-          </CommentContextProvider>
+          <NodeComments order="ASC" />
         )}
-      </Group>
 
-      <Footer />
-    </>
+        <Footer />
+      </Group>
+    </CommentContextProvider>
   );
 };
 
diff --git a/src/containers/boris/BorisComments/styles.module.scss b/src/containers/boris/BorisComments/styles.module.scss
deleted file mode 100644
index fa190d28..00000000
--- a/src/containers/boris/BorisComments/styles.module.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-@import "src/styles/variables.scss";
-
-.content {
-  flex: 4;
-  z-index: 2;
-  border-radius: $radius;
-  padding: $gap;
-  background: $node_bg;
-  box-shadow: inset transparentize(mix($wisegreen, white, 60%), 0.6) 0 1px;
-
-  @include desktop {
-    flex: 2.5;
-  }
-
-  @media(max-width: 1024px) {
-    flex: 2;
-  }
-}
diff --git a/src/layouts/BorisLayout/index.tsx b/src/layouts/BorisLayout/index.tsx
index 9d75877e..76442bc5 100644
--- a/src/layouts/BorisLayout/index.tsx
+++ b/src/layouts/BorisLayout/index.tsx
@@ -1,16 +1,12 @@
 import React, { FC } from 'react';
 
 import { BorisSidebar } from '~/components/boris/BorisSidebar';
-import { BorisUIDemo } from '~/components/boris/BorisUIDemo';
-import { Superpower } from '~/components/boris/Superpower';
 import { Card } from '~/components/containers/Card';
 import { Group } from '~/components/containers/Group';
 import { Sticky } from '~/components/containers/Sticky';
-import { Tabs } from '~/components/dialogs/Tabs';
 import { BorisComments } from '~/containers/boris/BorisComments';
 import { Container } from '~/containers/main/Container';
 import { SidebarRouter } from '~/containers/main/SidebarRouter';
-import boris from '~/sprites/boris_robot.svg';
 import { BorisUsageStats } from '~/types/boris';
 import { useAuthProvider } from '~/utils/providers/AuthProvider';
 
@@ -37,23 +33,12 @@ const BorisLayout: FC<IProps> = ({ title, setIsBetaTester, isTester, stats, isLo
             <div className={styles.caption_text}>{title}</div>
           </div>
 
-          <img src={boris} alt="Борис" />
+          <img src="/images/boris_robot.svg" alt="Борис" />
         </div>
 
         <div className={styles.container}>
           <Card className={styles.content}>
-            <Tabs>
-              <Superpower>
-                <Tabs.List items={['Комментарии', 'ЮАЙ ПЛЭЙГРАУНД']} />
-              </Superpower>
-
-              <Tabs.Content>
-                <BorisComments />
-                <Superpower>
-                  <BorisUIDemo />
-                </Superpower>
-              </Tabs.Content>
-            </Tabs>
+            <BorisComments />
           </Card>
 
           <Group className={styles.stats}>