diff --git a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss
index a5a7b3e2..baa8b2ed 100644
--- a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss
+++ b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss
@@ -172,7 +172,8 @@
 
       .executor {
         display: flex;
-        justify-content: space-between;
+        column-gap: 5px;
+        align-items: center;
         &:hover {
           font-weight: 600;
         }
diff --git a/src/components/ProfileCalendar/profileCalendar.scss b/src/components/ProfileCalendar/profileCalendar.scss
index da29f8b0..ceb1f733 100644
--- a/src/components/ProfileCalendar/profileCalendar.scss
+++ b/src/components/ProfileCalendar/profileCalendar.scss
@@ -1,12 +1,16 @@
 .profile__calendar {
   background: #f1f1f1;
-  height: 100%;
+  display: flex;
+  flex-direction: column;
   min-height: 100vh;
   font-family: "LabGrotesque", sans-serif;
 
   .container {
     max-width: 1160px;
     margin-top: 23px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
 
     @media (max-width: 570px) {
       margin-top: 0;
diff --git a/src/pages/PartnerSettings/partnerSettings.scss b/src/pages/PartnerSettings/partnerSettings.scss
index e32f518a..bc4fcae3 100644
--- a/src/pages/PartnerSettings/partnerSettings.scss
+++ b/src/pages/PartnerSettings/partnerSettings.scss
@@ -1,7 +1,8 @@
 .settings {
-  background: #f1f1f1;
-  height: 100%;
+  display: flex;
+  flex-direction: column;
   min-height: 100vh;
+  background: #f1f1f1;
   font-family: "LabGrotesque", sans-serif;
 
   .info-personal__title {
@@ -12,7 +13,9 @@
   }
 
   &__page {
-    min-height: 750px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
     max-width: 1160px !important;
     margin-top: 23px;
   }
@@ -129,7 +132,10 @@
 }
 
 .partner-settings {
-  margin-bottom: 110px;
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  margin-bottom: 10px;
 
   &__body {
     display: flex;
diff --git a/src/pages/Tracker/tracker.scss b/src/pages/Tracker/tracker.scss
index d6ca2af1..88b56c33 100644
--- a/src/pages/Tracker/tracker.scss
+++ b/src/pages/Tracker/tracker.scss
@@ -1,6 +1,7 @@
 .tracker {
   background: #f1f1f1;
-  height: 100%;
+  display: flex;
+  flex-direction: column;
   min-height: 100vh;
   font-family: "LabGrotesque", sans-serif;
   position: relative;
@@ -34,9 +35,9 @@
   }
 
   &__tabs {
-    min-height: 600px;
     display: flex;
     flex-direction: column;
+    flex: 1;
 
     &__head {
       display: flex;