diff --git a/airbyte-webapp/src/components/MainPageWithScroll/MainPageWithScroll.tsx b/airbyte-webapp/src/components/MainPageWithScroll/MainPageWithScroll.tsx
index 3827fb5f8322..d431f08125f9 100644
--- a/airbyte-webapp/src/components/MainPageWithScroll/MainPageWithScroll.tsx
+++ b/airbyte-webapp/src/components/MainPageWithScroll/MainPageWithScroll.tsx
@@ -3,14 +3,15 @@ import styled from "styled-components";
 
 const Content = styled.div`
   overflow-y: auto;
-  height: calc(100% - 67px);
-  margin-top: -17px;
   padding-top: 17px;
+  height: 100%;
 `;
 
 const Page = styled.div`
   overflow-y: hidden;
   height: 100%;
+  display: flex;
+  flex-direction: column;
 `;
 
 /**
diff --git a/airbyte-webapp/src/components/PageTitle/PageTitle.tsx b/airbyte-webapp/src/components/PageTitle/PageTitle.tsx
index fefb65609e3f..bea1ea889431 100644
--- a/airbyte-webapp/src/components/PageTitle/PageTitle.tsx
+++ b/airbyte-webapp/src/components/PageTitle/PageTitle.tsx
@@ -14,7 +14,6 @@ export const MainContainer = styled.div<{ withLine?: boolean }>`
   padding: 20px 32px 18px;
   border-bottom: ${({ theme, withLine }) =>
     withLine ? `1px solid ${theme.greyColor20}` : "none"};
-  margin-bottom: ${({ withLine }) => (withLine ? "17px" : 0)};
   position: relative;
   z-index: 2;
   color: ${({ theme }) => theme.darkPrimaryColor};
diff --git a/airbyte-webapp/src/pages/SettingsPage/SettingsPage.tsx b/airbyte-webapp/src/pages/SettingsPage/SettingsPage.tsx
index b558eb6dccd5..5ca6d0be209f 100644
--- a/airbyte-webapp/src/pages/SettingsPage/SettingsPage.tsx
+++ b/airbyte-webapp/src/pages/SettingsPage/SettingsPage.tsx
@@ -20,9 +20,9 @@ import { CategoryItem } from "components/SideMenu/SideMenu";
 
 const Content = styled.div`
   margin: 0 33px 0 27px;
-  height: 100%;
   display: flex;
   flex-direction: row;
+  padding-bottom: 15px;
 `;
 const MainView = styled.div`
   width: 100%;