diff --git a/client/src/components/AddToGroupModal/index.jsx b/client/src/components/AddToGroupModal/index.jsx
index 0b94c7a..9ecaab5 100644
--- a/client/src/components/AddToGroupModal/index.jsx
+++ b/client/src/components/AddToGroupModal/index.jsx
@@ -154,66 +154,76 @@ export default function AddToGroupModal({ onCancel, updateUser, user }) {
       overlayClassName={style.overlay}
     >
       <h1 className={style.title}>Add to Group</h1>
-      <div className={style.searchRow}>
-        <ZoomIcon className={style.zoomIcon} />
-        <input
-          className={style.search}
-          onChange={({ target }) => {
-            setFilter(target.value);
-            setImmediate(() => target.focus());
-          }}
-          placeholder="Search or create group"
-          value={filter}
-          disabled={loadingGroups}
-        />
-        <Button
-          className={style.createButton}
-          onClick={createGroup}
-          disabled={creatingGroup}
-        >
-          {creatingGroup ? "Creating..." : "+ Create"}
-        </Button>
-      </div>
-      <h3 className={style.subTitle}>
-        My groups{loadingGroups && " (Loading...)"}
-      </h3>
-      <div className={style.groups}>
-        {!loadingGroups &&
-          myGroups
-            .filter((g) => g.name.toLowerCase().includes(filter.toLowerCase()))
-            .map((g) => (
-              <Group
-                checked={g.isSelected === true}
-                group={g}
-                key={g.id}
-                onSwitch={() => switchSelected(g)}
-              />
-            ))}
-      </div>
-      {myGroups.filter((g) =>
-        g.name.toLowerCase().includes(filter.toLowerCase())
-      ).length === 0 &&
-        !loadingGroups && <div className={style.message}>No results found</div>}
-      <h3 className={style.subTitle}>
-        Other Groups{loadingGroups && " (Loading...)"}
-      </h3>
       <div className={style.groups}>
-        {!loadingGroups &&
-          otherGroups
-            .filter((g) => g.name.toLowerCase().includes(filter.toLowerCase()))
-            .map((g) => (
-              <Group
-                checked={g.isSelected === true}
-                group={g}
-                key={g.id}
-                onSwitch={() => switchSelected(g)}
-              />
-            ))}
+        <div className={style.searchRow}>
+          <ZoomIcon className={style.zoomIcon} />
+          <input
+            className={style.search}
+            onChange={({ target }) => {
+              setFilter(target.value);
+              setImmediate(() => target.focus());
+            }}
+            placeholder="Search or create group"
+            value={filter}
+            disabled={loadingGroups}
+          />
+          <Button
+            className={style.createButton}
+            onClick={createGroup}
+            disabled={creatingGroup}
+          >
+            {creatingGroup ? "Creating..." : "+ Create"}
+          </Button>
+        </div>
+        <h3 className={style.subTitle}>
+          My groups{loadingGroups && " (Loading...)"}
+        </h3>
+        <div>
+          {!loadingGroups &&
+            myGroups
+              .filter((g) =>
+                g.name.toLowerCase().includes(filter.toLowerCase())
+              )
+              .map((g) => (
+                <Group
+                  checked={g.isSelected === true}
+                  group={g}
+                  key={g.id}
+                  onSwitch={() => switchSelected(g)}
+                />
+              ))}
+        </div>
+        {myGroups.filter((g) =>
+          g.name.toLowerCase().includes(filter.toLowerCase())
+        ).length === 0 &&
+          !loadingGroups && (
+            <div className={style.message}>No results found</div>
+          )}
+        <h3 className={style.subTitle}>
+          Other Groups{loadingGroups && " (Loading...)"}
+        </h3>
+        <div>
+          {!loadingGroups &&
+            otherGroups
+              .filter((g) =>
+                g.name.toLowerCase().includes(filter.toLowerCase())
+              )
+              .map((g) => (
+                <Group
+                  checked={g.isSelected === true}
+                  group={g}
+                  key={g.id}
+                  onSwitch={() => switchSelected(g)}
+                />
+              ))}
+        </div>
+        {otherGroups.filter((g) =>
+          g.name.toLowerCase().includes(filter.toLowerCase())
+        ).length === 0 &&
+          !loadingGroups && (
+            <div className={style.message}>No results found</div>
+          )}
       </div>
-      {otherGroups.filter((g) =>
-        g.name.toLowerCase().includes(filter.toLowerCase())
-      ).length === 0 &&
-        !loadingGroups && <div className={style.message}>No results found</div>}
       <div className={style.buttons}>
         <Button onClick={onCancel} disabled={updatingGroups || creatingGroup}>
           Cancel
diff --git a/client/src/components/AddToGroupModal/style.module.scss b/client/src/components/AddToGroupModal/style.module.scss
index e6a6036..aaf755d 100644
--- a/client/src/components/AddToGroupModal/style.module.scss
+++ b/client/src/components/AddToGroupModal/style.module.scss
@@ -44,7 +44,7 @@
 
 .groups {
   margin: 0 -30px;
-  max-height: 150px;
+  max-height: calc(95vh - 157px);
   overflow-y: auto;
 }
 
@@ -68,10 +68,12 @@
 .searchRow {
   display: flex;
   position: relative;
+  margin: 0 30px;
 }
 
 .subTitle {
   @include h3;
+  margin-left: 30px;
 }
 
 .title {
@@ -88,4 +90,5 @@
 .message {
   color: $textColor2;
   font: 400 12pt/1.25 Inter;
+  margin-left: 30px;
 }
diff --git a/client/src/components/EditProfileModal/index.jsx b/client/src/components/EditProfileModal/index.jsx
index da657ef..103abe1 100644
--- a/client/src/components/EditProfileModal/index.jsx
+++ b/client/src/components/EditProfileModal/index.jsx
@@ -114,132 +114,136 @@ export default function EditProfileModal({
             {isSavingChanges ? "Saving changes, please wait..." : "Save"}
           </Button>
         </div>
-        <h3>General</h3>
-        <div className={style.inputs}>
-          <Input
-            label="First name"
-            onChange={({ target }) => {
-              setLocalUser({
-                ...localUser,
-                firstName: target.value,
-              });
-              setImmediate(() => target.focus());
-            }}
-            value={localUser.firstName}
-          />
-          <Input
-            label="Last name"
-            onChange={({ target }) => {
-              setLocalUser({
-                ...localUser,
-                lastName: target.value,
-              });
-              setImmediate(() => target.focus());
-            }}
-            value={localUser.lastName}
-          />
-          <Input
-            label="Current role"
-            onChange={({ target }) => {
-              setLocalUser({
-                ...localUser,
-                title: {
-                  id: localUser.title.id,
-                  value: target.value,
-                },
-              });
-              setImmediate(() => target.focus());
-            }}
-            value={localUser.title.value}
-          />
-          <Input
-            label="Company"
-            onChange={({ target }) => {
-              setLocalUser({
-                ...localUser,
-                company: {
-                  id: localUser.company.id,
-                  value: target.value,
-                },
-              });
-              setImmediate(() => target.focus());
-            }}
-            value={localUser.company.value}
-          />
-          <Input
-            label="Location"
-            onChange={({ target }) => {
-              setLocalUser({
-                ...localUser,
-                location: {
-                  id: localUser.location.id,
-                  value: target.value,
-                },
-              });
-              setImmediate(() => target.focus());
-            }}
-            value={localUser.location.value}
-          />
-        </div>
-        <h3>Skills</h3>
-        <div className={style.pillGroup}>
-          <SuggestionBox
-            placeholder={"Search skill to add"}
-            onSelect={addSkill}
-            purpose="skills"
-          />
-          {localUser.skills
-            .filter((item) => !item.isDeleted)
-            .map((item) => (
-              <Pill
-                key={`${item.skillProviderId}-${item.externalId}`}
-                name={item.name}
-                onRemove={() => {
-                  deleteSkill(item.externalId);
-                }}
-              />
-            ))}
-        </div>
-        <h3>Achievements</h3>
-        <div className={style.pillGroup}>
-          {localUser.achievements.length > 0 &&
-            localUser.achievements.map((value, key) => (
-              <Pill key={key} name={value} removable={false} />
-            ))}
-          {localUser.achievements.length === 0 && (
-            <span className={style.message}>
-              {"This user has no achievements"}
-            </span>
-          )}
-        </div>
-        <h3>Custom attributes</h3>
-        <div className={style.companyAttributes}>
-          {localUser.companyAttributes.map((attr, key) => (
+        <div className={style.body}>
+          <h3>General</h3>
+          <div className={style.inputs}>
             <Input
-              key={key}
-              label={attr.name}
+              label="First name"
               onChange={({ target }) => {
                 setLocalUser({
                   ...localUser,
-                  companyAttributes: localUser.companyAttributes.map((el) =>
-                    el.id === attr.id ? { ...el, value: target.value } : el
-                  ),
+                  firstName: target.value,
                 });
                 setImmediate(() => target.focus());
               }}
-              value={localUser.companyAttributes[key].value}
+              value={localUser.firstName}
             />
-          ))}
+            <Input
+              label="Last name"
+              onChange={({ target }) => {
+                setLocalUser({
+                  ...localUser,
+                  lastName: target.value,
+                });
+                setImmediate(() => target.focus());
+              }}
+              value={localUser.lastName}
+            />
+            <Input
+              label="Current role"
+              onChange={({ target }) => {
+                setLocalUser({
+                  ...localUser,
+                  title: {
+                    id: localUser.title.id,
+                    value: target.value,
+                  },
+                });
+                setImmediate(() => target.focus());
+              }}
+              value={localUser.title.value}
+            />
+            <Input
+              label="Company"
+              onChange={({ target }) => {
+                setLocalUser({
+                  ...localUser,
+                  company: {
+                    id: localUser.company.id,
+                    value: target.value,
+                  },
+                });
+                setImmediate(() => target.focus());
+              }}
+              value={localUser.company.value}
+            />
+            <Input
+              label="Location"
+              onChange={({ target }) => {
+                setLocalUser({
+                  ...localUser,
+                  location: {
+                    id: localUser.location.id,
+                    value: target.value,
+                  },
+                });
+                setImmediate(() => target.focus());
+              }}
+              value={localUser.location.value}
+            />
+          </div>
+          <h3>Skills</h3>
+          <div className={style.pillGroup}>
+            <SuggestionBox
+              placeholder={"Search skill to add"}
+              onSelect={addSkill}
+              purpose="skills"
+            />
+            {localUser.skills
+              .filter((item) => !item.isDeleted)
+              .map((item) => (
+                <Pill
+                  key={`${item.skillProviderId}-${item.externalId}`}
+                  name={item.name}
+                  onRemove={() => {
+                    deleteSkill(item.externalId);
+                  }}
+                />
+              ))}
+          </div>
+          <h3>Achievements</h3>
+          <div className={style.pillGroup}>
+            {localUser.achievements.length > 0 &&
+              localUser.achievements.map((value, key) => (
+                <Pill key={key} name={value} removable={false} />
+              ))}
+            {localUser.achievements.length === 0 && (
+              <span className={style.message}>
+                {"This user has no achievements"}
+              </span>
+            )}
+          </div>
+          <h3>Custom attributes</h3>
+          <div className={style.companyAttributes}>
+            {localUser.companyAttributes.map((attr, key) => (
+              <Input
+                key={key}
+                label={attr.name}
+                onChange={({ target }) => {
+                  setLocalUser({
+                    ...localUser,
+                    companyAttributes: localUser.companyAttributes.map((el) =>
+                      el.id === attr.id ? { ...el, value: target.value } : el
+                    ),
+                  });
+                  setImmediate(() => target.focus());
+                }}
+                value={localUser.companyAttributes[key].value}
+              />
+            ))}
+          </div>
+          <Button
+            className={
+              isDeactivatingUser
+                ? style.disabledDangerButton
+                : style.dangerButton
+            }
+            onClick={confirmDeactivateUser}
+            disabled={isDeactivatingUser || isSavingChanges}
+          >
+            {isDeactivatingUser ? "Deactivating" : "Deactivate this user"}
+          </Button>
         </div>
-        <Button
-          className={
-            isDeactivatingUser ? style.disabledDangerButton : style.dangerButton
-          }
-          onClick={confirmDeactivateUser}
-          disabled={isDeactivatingUser || isSavingChanges}
-        >
-          {isDeactivatingUser ? "Deactivating" : "Deactivate this user"}
-        </Button>
       </div>
     </Modal>
   );
diff --git a/client/src/components/EditProfileModal/style.module.scss b/client/src/components/EditProfileModal/style.module.scss
index 5a94a64..b28f2a6 100644
--- a/client/src/components/EditProfileModal/style.module.scss
+++ b/client/src/components/EditProfileModal/style.module.scss
@@ -2,9 +2,6 @@
 
 .container {
   display: flex;
-  height: 791px;
-  max-height: 791px;
-  overflow-y: auto;
 }
 
 .editor {
@@ -37,6 +34,18 @@
 .header {
   align-items: center;
   display: flex;
+  margin-bottom: 20px;
+}
+
+.body {
+  max-height: calc(95vh - 102px);
+  padding: 0 20px;
+  margin: 0 -20px;
+  overflow-y: auto;
+
+  h3:first-child {
+    margin-top: 0;
+  }
 }
 
 .input {
@@ -63,8 +72,8 @@
 
 .companyAttributes {
   margin: 0 -20px;
-  height: 80px;
-  overflow-y: auto;
+  // height: 80px;
+  // overflow-y: auto;
 }
 
 .pillGroup {
diff --git a/client/src/components/ProfileCard/profileCard.module.css b/client/src/components/ProfileCard/profileCard.module.css
index e68d88c..b430565 100644
--- a/client/src/components/ProfileCard/profileCard.module.css
+++ b/client/src/components/ProfileCard/profileCard.module.css
@@ -23,6 +23,7 @@
   border-radius: 8px 0 0 8px;
   border-right: 1px solid #eee;
   box-shadow: none;
+  max-height: calc(95vh - 20px);
   margin: -30px;
   margin-right: 0;
   padding-left: 10px;
@@ -145,6 +146,8 @@
   align-self: flex-end;
   border-top: 1px solid gray1_025;
   min-height: 97px;
+  overflow-y: auto;
+  overflow-x: hidden;
   width: 100%;
 }
 
diff --git a/client/src/components/editFiltersPopup/index.js b/client/src/components/editFiltersPopup/index.js
index 87871e8..59c14b0 100644
--- a/client/src/components/editFiltersPopup/index.js
+++ b/client/src/components/editFiltersPopup/index.js
@@ -111,15 +111,17 @@ export default function EditFiltersPopup({ onCancel, onDone }) {
         <div className={styles.popupContent}>
           <div className={styles.popupHeader}>
             <div className={styles.popupTitle}>Manage Filters</div>
-            <div className={utilityStyles.mt16}>
-              <SearchBox
-                name="editFiltersSearchbox"
-                placeholder="Search filter"
-                onChange={handleSearch}
-              />
-            </div>
           </div>
           <div className={styles.popupBoby}>
+            <div className={styles.searchBox}>
+              <div className={utilityStyles.mt16}>
+                <SearchBox
+                  name="editFiltersSearchbox"
+                  placeholder="Search filter"
+                  onChange={handleSearch}
+                />
+              </div>
+            </div>
             {sections.map((section, index) => {
               const filters = filterGroups[section];
               return (
@@ -200,7 +202,7 @@ function PopupSection({ title, filters, onFilterValueChange }) {
   return (
     <>
       <PopupSectionTitle text={title} />
-      <div className={styles.popupSectionBody}>
+      <div>
         {filters.map((filter, index) => {
           return (
             <PopupSectionRow
diff --git a/client/src/components/editFiltersPopup/popup.module.css b/client/src/components/editFiltersPopup/popup.module.css
index 7589d0e..380bf45 100644
--- a/client/src/components/editFiltersPopup/popup.module.css
+++ b/client/src/components/editFiltersPopup/popup.module.css
@@ -21,9 +21,9 @@
 }
 
 .popup {
-  margin: 60px auto;
+  margin: 2.5vh auto;
   border-radius: 5px;
-  width: 30%;
+  width: 500px;
   position: relative;
   transition: all 5s ease-in-out;
 
@@ -56,9 +56,14 @@
   color: gray2;
 }
 
-.popupSectionBody {
-  max-height: 188px;
+.popupBoby {
+  max-height: calc(95vh - 141px);
   overflow-y: auto;
+  margin-top: 16px;
+}
+
+.searchBox {
+  margin: -16px 25px 0 25px;
 }
 
 .popupSectionTitle {