diff --git a/frontend/src/Editor/LeftSidebar/SidebarPageSelector/index.jsx b/frontend/src/Editor/LeftSidebar/SidebarPageSelector/index.jsx
index afbe6b754d..85bb1f7292 100644
--- a/frontend/src/Editor/LeftSidebar/SidebarPageSelector/index.jsx
+++ b/frontend/src/Editor/LeftSidebar/SidebarPageSelector/index.jsx
@@ -119,7 +119,7 @@ const LeftSidebarPageSelector = ({
         </HeaderSection>
 
         <div className={`${darkMode && 'dark'} page-selector-panel-body`}>
-          <div className="">
+          <div>
             {allpages.length > 0 ? (
               <SortableList
                 data={allpages}
diff --git a/frontend/src/ManageGroupPermissions/ManageGroupPermissions.jsx b/frontend/src/ManageGroupPermissions/ManageGroupPermissions.jsx
index e8bacbf9b1..77542cbbe3 100644
--- a/frontend/src/ManageGroupPermissions/ManageGroupPermissions.jsx
+++ b/frontend/src/ManageGroupPermissions/ManageGroupPermissions.jsx
@@ -212,7 +212,7 @@ class ManageGroupPermissionsComponent extends React.Component {
               </div>
             </div>
 
-            <div className="page-body">
+            <div className="user-group-container-wrap">
               {(showNewGroupForm || showGroupNameUpdateForm) && (
                 <div className="container-xl animation-fade">
                   <div className="card">
diff --git a/frontend/src/ManageOrgVars/ManageOrgVars.jsx b/frontend/src/ManageOrgVars/ManageOrgVars.jsx
index b1dc7262ec..59c84adbed 100644
--- a/frontend/src/ManageOrgVars/ManageOrgVars.jsx
+++ b/frontend/src/ManageOrgVars/ManageOrgVars.jsx
@@ -281,7 +281,7 @@ class ManageOrgVarsComponent extends React.Component {
             </div>
           </div>
 
-          <div className="page-body">
+          <div className="workspace-variable-container-wrap">
             {showVariableForm ? (
               <VariableForm
                 fields={this.state.fields}
diff --git a/frontend/src/ManageSSO/ManageSSO.jsx b/frontend/src/ManageSSO/ManageSSO.jsx
index 761ed0e683..892588bc57 100644
--- a/frontend/src/ManageSSO/ManageSSO.jsx
+++ b/frontend/src/ManageSSO/ManageSSO.jsx
@@ -114,7 +114,7 @@ export function ManageSSO({ darkMode }) {
             </div>
           </div>
 
-          <div className="page-body">
+          <div>
             <div className="container-xl">
               <div className="row">
                 <div className="col-3">
diff --git a/frontend/src/OrganizationSettingsPage/index.jsx b/frontend/src/OrganizationSettingsPage/index.jsx
index 5618bfcbdf..b83ea6a099 100644
--- a/frontend/src/OrganizationSettingsPage/index.jsx
+++ b/frontend/src/OrganizationSettingsPage/index.jsx
@@ -18,7 +18,7 @@ export function OrganizationSettings(props) {
     <Layout switchDarkMode={props.switchDarkMode} darkMode={props.darkMode}>
       <div className="wrapper organization-settings-page">
         <div className="row gx-0">
-          <div className="organization-page-sidebar col p-3 border-end">
+          <div className="organization-page-sidebar col border-end p-3">
             <div className="list-group">
               {admin && (
                 <>
diff --git a/frontend/src/_styles/theme.scss b/frontend/src/_styles/theme.scss
index 1227a4aeba..af4d2850ec 100644
--- a/frontend/src/_styles/theme.scss
+++ b/frontend/src/_styles/theme.scss
@@ -1647,7 +1647,7 @@ button {
     z-index: 2;
   }
 
-  .table thead th:not(.rdtPrev):not(.rdtSwitch):not(.rdtNext):not(.dow){
+  .table thead th:not(.rdtPrev):not(.rdtSwitch):not(.rdtNext):not(.dow) {
     display: flex !important;
   }
 
@@ -6202,13 +6202,16 @@ input.hide-input-arrows {
 }
 
 .org-users-page {
-  min-height: 100vh;
-
   .page-body {
     height: 100%;
   }
 }
 
+.user-group-container-wrap,
+.workspace-variable-container-wrap {
+  margin-top: 1.25rem;
+}
+
 .dragged-column {
   z-index: 1001;
 }
@@ -6825,7 +6828,7 @@ tbody {
 
 
 .organization-page-sidebar {
-  min-height: 100vh;
+  height: calc(100vh - 48px);
   max-width: 288px;
 }