diff --git a/src/components/ApplicationLayout/ApplicationLayout.tsx b/src/components/ApplicationLayout/ApplicationLayout.tsx
index 0f51fd2..b1a394d 100644
--- a/src/components/ApplicationLayout/ApplicationLayout.tsx
+++ b/src/components/ApplicationLayout/ApplicationLayout.tsx
@@ -1,12 +1,14 @@
 import { FC, ReactNode } from 'react';
 
+import { useUnit } from 'effector-react';
+import { ThemeProvider } from '@gravity-ui/uikit';
 import { cn } from '@bem-react/classname';
+import { $theme } from '@/model';
+
 import '@gravity-ui/uikit/styles/fonts.css';
 import '@gravity-ui/uikit/styles/styles.css';
 
 import './ApplicationLayout.css';
-import { $theme } from '@/model';
-import { useUnit } from 'effector-react';
 
 const bem = cn('ApplicationLayout');
 
@@ -17,5 +19,9 @@ type ApplicationLayoutProps = {
 export const ApplicationLayout: FC<ApplicationLayoutProps> = ({ children }) => {
   const theme = useUnit($theme);
 
-  return <div className={bem(null, ['g-root', `g-root_theme_${theme}`])}>{children}</div>;
+  return (
+    <ThemeProvider theme={theme}>
+      <div className={bem()}>{children}</div>
+    </ThemeProvider>
+  );
 };
diff --git a/src/components/Header/Header.css b/src/components/Header/Header.css
index 02c469d..90941b2 100644
--- a/src/components/Header/Header.css
+++ b/src/components/Header/Header.css
@@ -1,9 +1,16 @@
 .Header {
+  position: sticky;
+  top: 0;
+
   padding: var(--g-spacing-4) var(--g-spacing-8);
 
   display: flex;
   gap: var(--g-spacing-6);
   justify-content: space-between;
+
+  background: var(--g-color-base-background);
+
+  z-index: 1;
 }
 
 .Header-Left,
diff --git a/src/components/ProjectLayout/ProjectLayout.css b/src/components/ProjectLayout/ProjectLayout.css
index 30bd871..563b4dc 100644
--- a/src/components/ProjectLayout/ProjectLayout.css
+++ b/src/components/ProjectLayout/ProjectLayout.css
@@ -4,6 +4,9 @@
   flex: 1;
   min-height: 0;
   background-color: var(--g-color-base-background);
+
+  max-height: 100vh;
+  box-sizing: border-box;
 }
 
 .ProjectLayout-Content {
diff --git a/src/index.css b/src/index.css
index 755b8c0..c9952aa 100644
--- a/src/index.css
+++ b/src/index.css
@@ -1,9 +1,6 @@
 html,
 body,
 .root {
-  overflow: hidden;
-
-  height: 100%;
   margin: 0;
   padding: 0;
 }