diff --git a/src/components/Layout/Layout.tsx b/src/components/Layout/Layout.tsx
index 5c93a4c85112..46e07ef0f01b 100644
--- a/src/components/Layout/Layout.tsx
+++ b/src/components/Layout/Layout.tsx
@@ -76,7 +76,7 @@ export const Layout: React.FC<LayoutProps> = ({
                     <Menu />
                 </div>
             )}
-            <div className={b('wrapper')} id={CONTENT_WRAPPER_ID}>
+            <div className={b('wrapper')} id={noScroll ? undefined : CONTENT_WRAPPER_ID}>
                 <div className={b('content', {'no-scroll': noScroll})}>{children}</div>
                 {!showOnlyContent && !hideFooter && <Footer />}
             </div>
diff --git a/src/components/LibraryVersion/LibraryVersion.tsx b/src/components/LibraryVersion/LibraryVersion.tsx
index c31b3b06f238..295c34d9d113 100644
--- a/src/components/LibraryVersion/LibraryVersion.tsx
+++ b/src/components/LibraryVersion/LibraryVersion.tsx
@@ -18,11 +18,9 @@ const LibraryVersion: FC<Props> = ({id}) => {
     }
 
     return (
-        <>
-            <Card className={b()} theme="warning" view="outlined">
-                <Text color="warning">{libraryVersion}</Text>
-            </Card>
-        </>
+        <Card className={b()} theme="warning" view="outlined">
+            <Text color="warning">{libraryVersion}</Text>
+        </Card>
     );
 };
 
diff --git a/src/components/NavigationLayout/NavigationLayout.tsx b/src/components/NavigationLayout/NavigationLayout.tsx
index 8cb536158af4..9e1979c1d67f 100644
--- a/src/components/NavigationLayout/NavigationLayout.tsx
+++ b/src/components/NavigationLayout/NavigationLayout.tsx
@@ -110,7 +110,7 @@ export const NavigationLayout: React.FC<NavigationLayoutProps> = ({
                     />
                 </div>
             </div>
-            <div className={b('content-wrap')}>
+            <div className={b('content-wrap')} id={CONTENT_WRAPPER_ID}>
                 <div className={b('content')}>
                     {children}
                     <Footer containerClass={b('footer')} />
diff --git a/src/components/NavigationLayout/SectionBlock/SectionBlock.scss b/src/components/NavigationLayout/SectionBlock/SectionBlock.scss
index 728f9bfc9ac2..1a8a37d04f7e 100644
--- a/src/components/NavigationLayout/SectionBlock/SectionBlock.scss
+++ b/src/components/NavigationLayout/SectionBlock/SectionBlock.scss
@@ -64,6 +64,7 @@ $block: '.#{variables.$ns}navigation-layout-section-block';
         display: flex;
         align-items: center;
         padding: 12px 20px;
+        margin-top: 4px;
         border-radius: 12px;
         font-size: 15px;
         line-height: 20px;