diff --git a/FrontEnd/src/components/CompanyCard/CompanyCard.module.css b/FrontEnd/src/components/CompanyCard/CompanyCard.module.css
index 1bfb82efb..d2725ec9c 100644
--- a/FrontEnd/src/components/CompanyCard/CompanyCard.module.css
+++ b/FrontEnd/src/components/CompanyCard/CompanyCard.module.css
@@ -55,7 +55,7 @@
   align-items: flex-start;
   gap: 16px;
   border-radius: 0 0 12px 12px;
-  background: var(--main_light-color);
+  background: var(--company-card-color);
 }
 
 .company-card__text-block__header {
@@ -125,7 +125,7 @@
 }
 
 .company-card__badge-text {
-  color: var(--main_light-color);
+  color: var(--company-card-color);
   text-align: center;
   font-feature-settings: 'calt' off;
   font-family: var(--font-main);
@@ -148,7 +148,7 @@
   width: 64px;
   height: 64px;
   flex-shrink: 0;
-  background: var(--main_light-color);
+  background: var(--company-card-color);
   left: 0;
   top: 0;
   border-radius: 9999px;
@@ -160,7 +160,7 @@
   height: 54px;
   flex-shrink: 0;
   border-radius: 26px;
-  background: var(--main_light-color);
+  background: var(--company-card-color);
   left: 5px;
   top: 5px;
   position: absolute;
@@ -170,7 +170,7 @@
 .company-card__buttons {
   color: var(--companies-card-button);
   border: none;
-  background-color: var(--main_light-color);
+  background-color: var(--company-card-color);
 }
 
 .company-card__buttons:hover {
diff --git a/FrontEnd/src/components/Header/Navbar/DropdownMenu.module.css b/FrontEnd/src/components/Header/Navbar/DropdownMenu.module.css
index 038086a3a..a88ba8037 100644
--- a/FrontEnd/src/components/Header/Navbar/DropdownMenu.module.css
+++ b/FrontEnd/src/components/Header/Navbar/DropdownMenu.module.css
@@ -29,8 +29,8 @@
 
   position: absolute;
   z-index: 1;
-  top: 44px;
-  left: 1321px;
+  top: calc(var(--navbar-content-height) + 20px);
+  left: 1140px;
   border-radius: 2px;
   background: var(--conditional-pop-over, #fff);
   box-shadow: 0px 9px 28px 8px rgba(0, 0, 0, 0.05),
diff --git a/FrontEnd/src/components/Header/Navbar/Navbar.module.css b/FrontEnd/src/components/Header/Navbar/Navbar.module.css
index 8c983b0d9..2a44534c1 100644
--- a/FrontEnd/src/components/Header/Navbar/Navbar.module.css
+++ b/FrontEnd/src/components/Header/Navbar/Navbar.module.css
@@ -3,6 +3,7 @@
   padding: 8px 104px;
   align-items: center;
   justify-content: space-between;
+  height: var(--navbar-content-height);
 }
 
 .navbar-logo__text{
diff --git a/FrontEnd/src/components/Loader/Loader.jsx b/FrontEnd/src/components/Loader/Loader.jsx
index 0532a6522..1d1952465 100644
--- a/FrontEnd/src/components/Loader/Loader.jsx
+++ b/FrontEnd/src/components/Loader/Loader.jsx
@@ -3,7 +3,7 @@ import css from './Loader.module.css';
 
 export default function Loader() {
   return (
-    <div className={css.container}>
+    <div className={css.loader__container}>
         <Carousel autoplay autoplaySpeed={1000} infinite dotPosition="top">
           <div>
             <span />
diff --git a/FrontEnd/src/components/Loader/Loader.module.css b/FrontEnd/src/components/Loader/Loader.module.css
index d5a82319a..c24dedb7a 100644
--- a/FrontEnd/src/components/Loader/Loader.module.css
+++ b/FrontEnd/src/components/Loader/Loader.module.css
@@ -1,4 +1,4 @@
-.container {
-  padding: 190px;
-  max-width: 1132px;
-}
\ No newline at end of file
+.loader__container {
+  padding-top: 30%;
+  min-height: var(--min-height-block-main);
+}
diff --git a/FrontEnd/src/global.css b/FrontEnd/src/global.css
index 614e00176..18708495a 100644
--- a/FrontEnd/src/global.css
+++ b/FrontEnd/src/global.css
@@ -69,6 +69,7 @@
   --toastify-custom-close-button: rgba(0, 0, 0, 0.85);
 
   /* Header */
+  --navbar-content-height: 32px;
 
   /* Footer */
   --footer-backround: #3C4044;
@@ -108,4 +109,10 @@
   --main-black-90: #292e32;
   --primary-green-80: #1f9a7c;
   --character-title-85: rgba(0, 0, 0, 0.85);
+
+  --wf-base-white: #FFF;
+  
+  --profile-min-height-block: calc(100vh - 565px);
+  --min-height-block-main: calc(100vh - 305px);
+  --company-card-color: #FFF;
 }
diff --git a/FrontEnd/src/pages/Authorization/AuthorizationPage.module.css b/FrontEnd/src/pages/Authorization/AuthorizationPage.module.css
index ef68583ba..c7788d9ce 100644
--- a/FrontEnd/src/pages/Authorization/AuthorizationPage.module.css
+++ b/FrontEnd/src/pages/Authorization/AuthorizationPage.module.css
@@ -1,7 +1,7 @@
 .auth-page {
     display: flex;
     width: var(--main-block-size);
-    height: 725px;
+    min-height: var(--min-height-block-main);
     flex-shrink: 0;
     background: #f1fff7;
   }
diff --git a/FrontEnd/src/pages/CustomThemes/customProfileTooltipThemes.js b/FrontEnd/src/pages/CustomThemes/customProfileTooltipThemes.js
new file mode 100644
index 000000000..9ec6d6a4d
--- /dev/null
+++ b/FrontEnd/src/pages/CustomThemes/customProfileTooltipThemes.js
@@ -0,0 +1,11 @@
+const tooltipInnerContentStyles = {
+    display: 'flex',
+    borderRadius: '2px',
+    background: 'var(--main-grey-90, #25292C)',
+    color: 'var(--main-white, #FFF)',
+    fontFeatureSettings: 'calt',
+    fontFamily: 'Inter',
+    letterSpacing: '-0.14px',
+};
+
+export default tooltipInnerContentStyles;
diff --git a/FrontEnd/src/pages/ErrorPages/ErrorPage404.jsx b/FrontEnd/src/pages/ErrorPages/ErrorPage404.jsx
index 08a498686..3be512e1c 100644
--- a/FrontEnd/src/pages/ErrorPages/ErrorPage404.jsx
+++ b/FrontEnd/src/pages/ErrorPages/ErrorPage404.jsx
@@ -4,19 +4,19 @@ import { Button } from 'antd';
 
 export default function ErrorPage404() {
   return (
-    <div className={css.page}>
-      <div className={css.container}>
-        <div className={css.text404}>404</div>
-        <div className={css.block}>
-          <div className={css.explanation}>
-            <p className={css['main-text']}>Щось пішло не так</p>
-            <p className={css.details}>
+    <div className={css.ErrorPage404__page}>
+      <div className={css.ErrorPage404__container}>
+        <div className={css.ErrorPage404__text404}>404</div>
+        <div className={css.ErrorPage404__block}>
+          <div className={css.ErrorPage404__explanation}>
+            <p className={css['ErrorPage404__main-text']}>Щось пішло не так</p>
+            <p className={css.ErrorPage404__details}>
               Схоже, це неправильна адреса, ця сторінка видалена, перейменована
               або тимчасово недоступна.
             </p>
           </div>
           <Button>
-            <Link className={css['button-text']} to="/">Повернутися на Головну</Link>
+            <Link className={css['ErrorPage404__button-text']} to="/">Повернутися на Головну</Link>
           </Button>
         </div>
       </div>
diff --git a/FrontEnd/src/pages/ErrorPages/ErrorPage404.module.css b/FrontEnd/src/pages/ErrorPages/ErrorPage404.module.css
index b36b6dcd7..22aac1b6d 100644
--- a/FrontEnd/src/pages/ErrorPages/ErrorPage404.module.css
+++ b/FrontEnd/src/pages/ErrorPages/ErrorPage404.module.css
@@ -1,11 +1,12 @@
-.page {
-  height: 800px;
+.ErrorPage404__page {
+  min-height: var(--min-height-block-main);
   display: flex;
   justify-content: center;
   background: var(--primary-green-80, #1f9a7c);
+  
 }
 
-.container {
+.ErrorPage404__container {
   display: flex;
   align-items: center;
   gap: 80px;
@@ -15,7 +16,7 @@
   font-style: normal;
 }
 
-.text404 {
+.ErrorPage404__text404 {
   display: flex;
   height: 178px;
   flex-direction: column;
@@ -26,28 +27,28 @@
   letter-spacing: -2px;
 }
 
-.block {
+.ErrorPage404__block {
   display: flex;
   flex-direction: column;
   align-items: flex-start;
   gap: 36px;
 }
 
-.explanation {
+.ErrorPage404__explanation {
   display: flex;
   flex-direction: column;
   align-items: flex-start;
   gap: 24px;
 }
 
-.main-text {
+.ErrorPage404__main-text {
   font-size: 48px;
   font-weight: 700;
   line-height: 120%;
   letter-spacing: 0.48px;
 }
 
-.details {
+.ErrorPage404__details {
   width: 548px;
   font-size: 16px;
   font-weight: 400;
@@ -55,6 +56,6 @@
   letter-spacing: -0.16px;
 }
 
-.button-text {
+.ErrorPage404__button-text {
   font-family: var(--font-main);
 }
diff --git a/FrontEnd/src/pages/ProfileDetail/ProfileDetailPage.jsx b/FrontEnd/src/pages/ProfileDetail/ProfileDetailPage.jsx
index 3760e220b..4d1b6d3da 100644
--- a/FrontEnd/src/pages/ProfileDetail/ProfileDetailPage.jsx
+++ b/FrontEnd/src/pages/ProfileDetail/ProfileDetailPage.jsx
@@ -29,37 +29,45 @@ function ProfileDetailPage({ isAuthorized }) {
     isLoading,
   } = useSWR(urlProfile, fetcher);
 
-  const notRequiredData = ['address', 'banner', 'logo', 'common_info', 'edrpou', 'rnokpp', 'founded', 'official_name', 'product_info', 'service_info', 'startup_idea', 'logistics', 'cooperation'];
-  const containsNotRequiredData = fetchedProfile ? Object.keys(fetchedProfile).some(key => notRequiredData.includes(key) && fetchedProfile[key] !== '' && fetchedProfile[key] !== null) : false;
+  const notRequiredData = [
+    'address', 'banner', 'logo', 'common_info', 'edrpou',
+    'rnokpp', 'founded', 'official_name', 'product_info',
+    'service_info', 'startup_idea', 'logistics', 'cooperation'
+  ];
+
+  const containsNotRequiredData = fetchedProfile ?
+    Object.keys(fetchedProfile).some(key => notRequiredData.includes(key) &&
+      fetchedProfile[key] !== '' &&
+      fetchedProfile[key] !== null) : false;
 
   return (error && error.status !== 401) ? (
     <ErrorPage404 />
   ) : (
-    <div className={isLoading ? classes['loader-content'] : null}>
+    <div className={isLoading ? classes['profile-detail__loader-content'] : classes['profile-detail__main'] }>
       {isLoading ? (
         <Loader />
       ) : (
-          <ActiveLinksContext.Provider value={{ activeLinks, setActiveLinks }}>
-            <div className={classes['banner-tooltip']}>
+        <ActiveLinksContext.Provider value={{ activeLinks, setActiveLinks }}>
+          <div className={classes['profile-detail__banner-tooltip']}>
             <PendingStatus profile={fetchedProfile} elementType="banner" />
+          </div>
+          <BannerImage data={fetchedProfile} />
+          <div className={classes['profile-detail__page']}>
+            <MainInfoSection
+              containsNotRequiredData={containsNotRequiredData}
+              isAuthorized={isAuthorized}
+              data={fetchedProfile}
+            />
+            <div className={classes['profile-detail__logo-tooltip']}>
+              <PendingStatus profile={fetchedProfile} elementType="logo" />
             </div>
-            <BannerImage data={fetchedProfile} />
-            <div className={classes['profile-page']}>
-              <MainInfoSection
-                containsNotRequiredData={containsNotRequiredData}
-                isAuthorized={isAuthorized}
-                data={fetchedProfile}
-              />
-              <div className={classes['logo-tooltip']}>
-                <PendingStatus profile={fetchedProfile} elementType="logo" />
-              </div>
-              <DetailedInfoSection
-                containsNotRequiredData={containsNotRequiredData}
-                isAuthorized={isAuthorized}
-                data={fetchedProfile}
-              />
-            </div>
-          </ActiveLinksContext.Provider>
+            <DetailedInfoSection
+              containsNotRequiredData={containsNotRequiredData}
+              isAuthorized={isAuthorized}
+              data={fetchedProfile}
+            />
+          </div>
+        </ActiveLinksContext.Provider>
       )}
     </div>
   );
diff --git a/FrontEnd/src/pages/ProfileDetail/ProfileDetailPage.module.css b/FrontEnd/src/pages/ProfileDetail/ProfileDetailPage.module.css
index 1403e9e27..a5a3bdbb7 100644
--- a/FrontEnd/src/pages/ProfileDetail/ProfileDetailPage.module.css
+++ b/FrontEnd/src/pages/ProfileDetail/ProfileDetailPage.module.css
@@ -1,28 +1,31 @@
-.loader-content {
-    width: 1305px;
-    margin-left: auto;
-    margin-right: auto;
+.profile-detail__main {
+    display: flex;
+    flex-direction: column;
+    min-height: var(--min-height-block-main);
+    align-content: center;
+}
+
+.profile-detail__loader-content {
+    display: flex;
 }
 
-.profile-page {
+.profile-detail__banner-tooltip {
+    display: flex;
+    position: absolute;
+    padding-top: 12px;
+    padding-left: 112px;
+}
+
+.profile-detail__page {
     display: inline-flex;
     flex-direction: column;
-    align-items: flex-start;
+    align-items: center;
     gap: 16px;
-    margin-left: 104px;
-    margin-right: 104px;
 }
 
-.logo-tooltip{
+.profile-detail__logo-tooltip {
     display: flex;
-    position:absolute;
+    position: absolute;
     padding-top: 5px;
     padding-left: 3px;
 }
-
-.banner-tooltip{
-    display: flex;
-    position:absolute;
-    padding-top: 12px;
-    padding-left: 112px;
-}
diff --git a/FrontEnd/src/pages/ProfileList/ProfileListPage.module.css b/FrontEnd/src/pages/ProfileList/ProfileListPage.module.css
index 816922a4c..dae96ee5a 100644
--- a/FrontEnd/src/pages/ProfileList/ProfileListPage.module.css
+++ b/FrontEnd/src/pages/ProfileList/ProfileListPage.module.css
@@ -2,6 +2,7 @@
   min-height: 470px;
   border-radius: 8px;
   background: var(--wf-base-white, #fff);
+  flex-grow: 1;
 }
 
 .page-content {
diff --git a/FrontEnd/src/pages/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfileModal.module.css b/FrontEnd/src/pages/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfileModal.module.css
index 2c001fbef..8d59d822d 100644
--- a/FrontEnd/src/pages/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfileModal.module.css
+++ b/FrontEnd/src/pages/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfileModal.module.css
@@ -163,4 +163,4 @@
     font-style: normal;
     font-weight: 400;
     line-height: 22px;
-}
\ No newline at end of file
+}
diff --git a/FrontEnd/src/pages/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfilePage.jsx b/FrontEnd/src/pages/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfilePage.jsx
index 58b8da18f..eef063fa3 100644
--- a/FrontEnd/src/pages/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfilePage.jsx
+++ b/FrontEnd/src/pages/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfilePage.jsx
@@ -14,7 +14,7 @@ const DeleteProfilePage = (props) => {
     setModal(false);
   };
   return (
-    <div>
+    <div className={css['button__delete-main']}>
       <div className={css['text__for__delete']}>Видалити акаунт</div>
       <button className={css['button__delete']} onClick={() => setModal(true)}>
         Видалити
diff --git a/FrontEnd/src/pages/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfilePage.module.css b/FrontEnd/src/pages/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfilePage.module.css
index e0c18644c..92ca3d4ba 100644
--- a/FrontEnd/src/pages/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfilePage.module.css
+++ b/FrontEnd/src/pages/ProfilePage/FormComponents/DeleteProfileComponent/DeleteProfilePage.module.css
@@ -1,3 +1,7 @@
+.button__delete-main {
+   height: calc(var(--profile-min-height-block) + 42px);
+}
+
 .button__delete {
     color: #F15831;
     cursor: pointer;
@@ -5,6 +9,7 @@
     height: 32px;
     padding: 5px 15px 5px 15px;
     margin-top: 8px;
+    margin-bottom: 10px;
     border-radius: 4px;
     gap: 10px;
     background: linear-gradient(0deg, #FFFFFF, #FFFFFF),
@@ -16,7 +21,6 @@
     line-height: 20px;
     letter-spacing: -0.01em;
     text-align: center;
-    margin-bottom: 400px;
 }
 
 .text__for__delete {
diff --git a/FrontEnd/src/pages/ProfilePage/ProfilePage.module.css b/FrontEnd/src/pages/ProfilePage/ProfilePage.module.css
index 37ed7b71d..5fc31f3e5 100644
--- a/FrontEnd/src/pages/ProfilePage/ProfilePage.module.css
+++ b/FrontEnd/src/pages/ProfilePage/ProfilePage.module.css
@@ -1,8 +1,6 @@
 .container {
-    word-wrap: break-word;
-    width: var(--main-block-size);
-    margin-top: 32px;
-    margin-right: 488px;
+    display: flex;
+    flex-direction: column;
+    padding-top: 32px;
     left: 192px;
-    gap: 40px;
 }
diff --git a/FrontEnd/src/pages/ProfilePage/ProfilePageComponents/ProfileContent.jsx b/FrontEnd/src/pages/ProfilePage/ProfilePageComponents/ProfileContent.jsx
index ff66ae8a8..0e4e89ee0 100644
--- a/FrontEnd/src/pages/ProfilePage/ProfilePageComponents/ProfileContent.jsx
+++ b/FrontEnd/src/pages/ProfilePage/ProfilePageComponents/ProfileContent.jsx
@@ -2,7 +2,7 @@ import { Tooltip } from 'antd';
 import { PropTypes } from 'prop-types';
 import { Link, NavLink, Route, Routes, useBlocker } from 'react-router-dom';
 import { useEffect, useState } from 'react';
-import { DirtyFormContext } from  '../../../context/DirtyFormContext';
+import { DirtyFormContext } from '../../../context/DirtyFormContext';
 import AdditionalInfo from '../FormComponents/AdditionalInfo';
 import ContactsInfo from '../FormComponents/ContactsInfo';
 import DeleteProfilePage from '../FormComponents/DeleteProfileComponent/DeleteProfilePage';
@@ -15,68 +15,19 @@ import MyModal from '../UI/MyModal/MyModal';
 import WarnUnsavedDataModal from '../FormComponents/WarnUnsavedDataModal';
 import ChangePassword from '../FormComponents/ChangePassword';
 import css from './ProfileContent.module.css';
+import tooltipInnerContentStyles from '../../CustomThemes/customProfileTooltipThemes';
+import INFOLINKS from './TextInfoLinks';
+import FORM_NAMES from './TextFormNames';
 
 
-const INFOLINKS = [
-    {
-        title: 'Інформація про користувача',
-        link: '/user-info',
-    },
-    {
-        title: 'Загальна інформація',
-        link: '/general-info',
-    },
-    {
-        title: 'Контакти',
-        link: '/contacts',
-    },
-    {
-        title: 'Інформація про товари/ послуги',
-        link: '/products-service-info',
-        tooltipText: 'Цей розділ доступний, коли обрано опцію "Зареєстрована компанія" у розділі Загальна інформація'
-    },
-    {
-        title: 'Додаткова інформація',
-        link: '/additional-info',
-        tooltipText: 'Цей розділ доступний, коли обрано опцію "Зареєстрована компанія" у розділі Загальна інформація'
-    },
-    {
-        title: 'Стартап',
-        link: '/startup',
-        tooltipText: 'Цей розділ доступний, коли обрано опцію "Стартап проект" у розділі Загальна інформація'
-    },
-];
-
-const FORM_NAMES = [
-    'UserInfo',
-    'GeneralInfo',
-    'ContactsInfo',
-    'ProductServiceInfo',
-    'AdditionalInfo',
-    'StartupInfo',
-    'Delete',
-    'ChangePassword'
-];
-
 const ProfileContent = (props) => {
-
-    const tooltipInnerContentStyles = {
-            display: 'flex',
-            borderRadius: '2px',
-            background: 'var(--main-grey-90, #25292C)',
-            color: 'var(--main-white, #FFF)',
-            fontFeatureSettings: 'calt',
-            fontFamily: 'Inter',
-            letterSpacing: '-0.14px',
-    };
-
     const [modal, setModal] = useState(false);
     const [formIsDirty, setFormIsDirty] = useState(false);
     const blocker = useBlocker(
         ({ currentLocation, nextLocation }) =>
-          formIsDirty &&
-          currentLocation.pathname !== nextLocation.pathname
-      );
+            formIsDirty &&
+            currentLocation.pathname !== nextLocation.pathname
+    );
 
     useEffect(() => {
         if (blocker.state === 'blocked') {
@@ -90,79 +41,76 @@ const ProfileContent = (props) => {
         setFormIsDirty(false);
         blocker.proceed();
         setModal(false);
-      };
+    };
 
     const cancelNavigation = () => {
         blocker.reset();
         setModal(false);
-      };
+    };
 
-    useEffect (() => {
+    useEffect(() => {
         const onBeforeUnload = (e) => {
             if (formIsDirty) {
-              e.preventDefault();
-              e.returnValue = '';
+                e.preventDefault();
+                e.returnValue = '';
             }
-          };
-          window.addEventListener('beforeunload', onBeforeUnload);
-          return () => {
+        };
+        window.addEventListener('beforeunload', onBeforeUnload);
+        return () => {
             window.removeEventListener('beforeunload', onBeforeUnload);
-          };
-        }, [formIsDirty]);
+        };
+    }, [formIsDirty]);
 
     return (
-        <div className={css['content__container']}>
-            <div className={css['content']}>
-                <div className={css['info-links-profile']}>
-                {INFOLINKS.map((element) => {
-                    const isLinkEnabled =
-                        (props.profile.is_registered && props.profile.is_startup) ||
-                        (props.profile.is_registered && element.title !== 'Стартап') ||
-                        (props.profile.is_startup && element.title !== 'Інформація про товари/ послуги' && element.title !== 'Додаткова інформація');
-                    return isLinkEnabled ? (
-                        <NavLink
-                            className={({ isActive }) => (`${css['infolink']} ${isActive && css['infolink__active']}`)}
-                            to={`/profile${element.link}`}
-                            key={element.title}
-                        >
-                            {element.title}
-                        </NavLink>
-                    ) : (
-                        <Tooltip
-                            key={element.title}
-                            placement="bottomLeft"
-                            title={element.tooltipText}
-                            overlayInnerStyle={tooltipInnerContentStyles}
-                        >
+        <div className={css['profile__main']}>
+            <div className={css['profile__content']}>
+                <div className={css['profile__info-links']}>
+                    {INFOLINKS.map((element) => {
+                        const isLinkEnabled =
+                            (props.profile.is_registered && props.profile.is_startup) ||
+                            (props.profile.is_registered && element.title !== 'Стартап') ||
+                            (props.profile.is_startup && element.title !== 'Інформація про товари/ послуги'
+                                && element.title !== 'Додаткова інформація');
+                        return isLinkEnabled ? (
+                            <NavLink
+                                className={({ isActive }) =>
+                                    (`${css['profile__infolink']} ${isActive && css['profile__infolink-active']}`)}
+                                to={`/profile${element.link}`}
+                                key={element.title}
+                            >
+                                {element.title}
+                            </NavLink>
+                        ) : (
+                            <Tooltip
+                                key={element.title}
+                                placement="bottomLeft"
+                                title={element.tooltipText}
+                                overlayInnerStyle={tooltipInnerContentStyles}
+                            >
                                 <NavLink
-                                    className={`${css['infolink']} ${css['infolink__disabled']}`}
+                                    className={`${css['profile__infolink']} ${css['profile__infolink-disabled']}`}
                                     key={element.title}
                                     disabled
                                 >
                                     {element.title}
                                 </NavLink>
-                        </Tooltip>
-                    );
-                })}
-                    <div className={css['divider']}></div>
+                            </Tooltip>
+                        );
+                    })}
+                    <div className={css['profile__divider']}></div>
                     <Link
                         to="/profile/change-password"
-                        className={`${css['infolink']}`}>
+                        className={`${css['profile__infolink']}`}>
                         Змінити пароль
                     </Link>
                     <Link
                         to="/profile/delete"
-                        className={`${css['infolink']} ${css['delete']}`}>
+                        className={`${css['profile__infolink']} ${css['profile__delete']}`}>
                         Видалити профіль
                     </Link>
                 </div>
                 <DirtyFormContext.Provider value={{ formIsDirty, setFormIsDirty }}>
                     <Routes>
-                        <Route
-                            path="/delete"
-                            element={<DeleteProfilePage
-                                currentFormNameHandler={props.currentFormNameHandler}
-                                curForm={FORM_NAMES[6]} />} />
                         <Route
                             path="/user-info"
                             element={<UserInfo user={props.user}
@@ -198,6 +146,11 @@ const ProfileContent = (props) => {
                                 profile={props.profile}
                                 currentFormNameHandler={props.currentFormNameHandler}
                                 curForm={FORM_NAMES[5]} />} />
+                        <Route
+                            path="/delete"
+                            element={<DeleteProfilePage
+                                currentFormNameHandler={props.currentFormNameHandler}
+                                curForm={FORM_NAMES[6]} />} />
                         <Route
                             path="/change-password"
                             element={<ChangePassword
@@ -207,16 +160,14 @@ const ProfileContent = (props) => {
                     </Routes>
                 </DirtyFormContext.Provider>
             </div>
-
-            {props.formName !== 'Delete' && <ProfileFormButton formName={props.formName} formState={formIsDirty}/>}
-
-            {blocker.state === 'blocked' &&
-                (
-                <MyModal visible={modal}>
-                    <WarnUnsavedDataModal onCancel={cancelNavigation} onConfirm={confirmNavigation} />
-                </MyModal>)
-            }
-
+                {props.formName !== 'Delete' && <ProfileFormButton formName={props.formName} formState={formIsDirty} />}
+
+                {blocker.state === 'blocked' &&
+                    (
+                        <MyModal visible={modal}>
+                            <WarnUnsavedDataModal onCancel={cancelNavigation} onConfirm={confirmNavigation} />
+                        </MyModal>)
+                }
         </div>
     );
 };
@@ -249,4 +200,4 @@ ProfileContent.propTypes = {
     }).isRequired,
     currentFormNameHandler: PropTypes.func,
     formName: PropTypes.string,
-  };
\ No newline at end of file
+};
diff --git a/FrontEnd/src/pages/ProfilePage/ProfilePageComponents/ProfileContent.module.css b/FrontEnd/src/pages/ProfilePage/ProfilePageComponents/ProfileContent.module.css
index b71f2cab5..a0b3b80a5 100644
--- a/FrontEnd/src/pages/ProfilePage/ProfilePageComponents/ProfileContent.module.css
+++ b/FrontEnd/src/pages/ProfilePage/ProfilePageComponents/ProfileContent.module.css
@@ -1,28 +1,27 @@
-.content__container {
+.profile__main {
     margin-top: 40px;
     display: flex;
     align-items: flex-start;
-    gap: 80px;
     flex-direction: column;
 }
 
-.content {
-    padding-left: 192px;
+.profile__content {
+    min-height: var(--profile-min-height-block);
     display: flex;
-    align-items: flex-start;
+    padding-bottom: 45px;
+    padding-left: 192px;
     gap: 16px;
 }
 
-.info-links-profile {
+.profile__info-links {
     display: flex;
     flex-direction: column;
     align-items: flex-start;
     width: 222px;
-    height: 240px;
     gap: 12px;
 }
 
-.infolink {
+.profile__infolink {
     color: #4F585F;
     font-family: var(--font-main);
     font-size: 14px;
@@ -33,14 +32,14 @@
     text-decoration: none;
 }
 
-.infolink__active {
+.profile__infolink-active {
     font-family: var(--font-main);
     font-weight: 600;
     color: #000000;
     text-decoration: none;
 }
 
-.infolink__disabled {
+.profile__infolink-disabled {
     color: var(--main-grey-50, #8D959C);
     font-feature-settings: 'calt' off;
     font-family: var(--font-main);
@@ -51,11 +50,11 @@
     letter-spacing: -0.14px;
 }
 
-.delete {
+.profile__delete {
     color: #F15831;
 }
 
-.divider {
+.profile__divider {
     width: 222px;
     border-bottom: 1px #E2E5EB solid;
-}
\ No newline at end of file
+}
diff --git a/FrontEnd/src/pages/ProfilePage/ProfilePageComponents/TextFormNames.js b/FrontEnd/src/pages/ProfilePage/ProfilePageComponents/TextFormNames.js
new file mode 100644
index 000000000..6431a433b
--- /dev/null
+++ b/FrontEnd/src/pages/ProfilePage/ProfilePageComponents/TextFormNames.js
@@ -0,0 +1,12 @@
+const FORM_NAMES = [
+    'UserInfo',
+    'GeneralInfo',
+    'ContactsInfo',
+    'ProductServiceInfo',
+    'AdditionalInfo',
+    'StartupInfo',
+    'Delete',
+    'ChangePassword'
+];
+
+export default FORM_NAMES;
\ No newline at end of file
diff --git a/FrontEnd/src/pages/ProfilePage/ProfilePageComponents/TextInfoLinks.js b/FrontEnd/src/pages/ProfilePage/ProfilePageComponents/TextInfoLinks.js
new file mode 100644
index 000000000..f5ec2a511
--- /dev/null
+++ b/FrontEnd/src/pages/ProfilePage/ProfilePageComponents/TextInfoLinks.js
@@ -0,0 +1,31 @@
+const INFOLINKS = [
+    {
+        title: 'Інформація про користувача',
+        link: '/user-info',
+    },
+    {
+        title: 'Загальна інформація',
+        link: '/general-info',
+    },
+    {
+        title: 'Контакти',
+        link: '/contacts',
+    },
+    {
+        title: 'Інформація про товари/ послуги',
+        link: '/products-service-info',
+        tooltipText: 'Цей розділ доступний, коли обрано опцію "Зареєстрована компанія" у розділі Загальна інформація'
+    },
+    {
+        title: 'Додаткова інформація',
+        link: '/additional-info',
+        tooltipText: 'Цей розділ доступний, коли обрано опцію "Зареєстрована компанія" у розділі Загальна інформація'
+    },
+    {
+        title: 'Стартап',
+        link: '/startup',
+        tooltipText: 'Цей розділ доступний, коли обрано опцію "Стартап проект" у розділі Загальна інформація'
+    },
+];
+
+export default INFOLINKS;
\ No newline at end of file
diff --git a/FrontEnd/src/pages/ProfilePage/UI/ProfileFormButton/ProfileFormButton.module.css b/FrontEnd/src/pages/ProfilePage/UI/ProfileFormButton/ProfileFormButton.module.css
index 37bfb9dbc..a30e8a64a 100644
--- a/FrontEnd/src/pages/ProfilePage/UI/ProfileFormButton/ProfileFormButton.module.css
+++ b/FrontEnd/src/pages/ProfilePage/UI/ProfileFormButton/ProfileFormButton.module.css
@@ -3,7 +3,6 @@
     align-items: flex-start;
     padding: 6px 0px;
     background: #EFFFF6;
-    margin-top: 140px;
     width: var(--main-block-size);
 }
 
@@ -36,4 +35,4 @@
 
 .sign-up__button:active {
     transform: translateY(2px);
-}
\ No newline at end of file
+}
diff --git a/FrontEnd/src/pages/SearchPage/Search.jsx b/FrontEnd/src/pages/SearchPage/Search.jsx
index 61bfb7ccb..5fa418371 100644
--- a/FrontEnd/src/pages/SearchPage/Search.jsx
+++ b/FrontEnd/src/pages/SearchPage/Search.jsx
@@ -72,9 +72,9 @@ export function Search({ isAuthorized }) {
 
       <BreadCrumbs currentPage="Пошук" />
       <div className={styles['main_block']}>
-      <img className={styles['dot-img-right']}
-        src={`${process.env.REACT_APP_PUBLIC_URL}/img/dots_7x6.png`}
-        alt="dots_7x6.png" />
+        <img className={styles['dot-img-right']}
+          src={`${process.env.REACT_APP_PUBLIC_URL}/img/dots_7x6.png`}
+          alt="dots_7x6.png" />
         <div className={styles['new-companies-search_count']}>
           {searchResults && (
             <div>
@@ -85,10 +85,8 @@ export function Search({ isAuthorized }) {
                 </span>
                 : {searchResults.length > 0 ? searchResults.length : 0}
               </h3>
-              <br />
             </div>
           )}
-          <br />
         </div>
         <div className={styles['new-companies-main']}>
           {!error && searchResults.length > 0 ? (
@@ -100,14 +98,12 @@ export function Search({ isAuthorized }) {
                 isAuthorized={isAuthorized}
                 changeCompanies={changeCompanies}
               />
-              <br />
             </>
           ) : (
-            <div>
-              <br />
+            <div className={styles['new-companies-main__error']}>
               <p className={styles['search_result_error']}>
                 Пошук не дав результатів: компанії з іменем
-                <span className={styles['.search_result_error']}>
+                <span className={styles['search_result_error_color']}>
                   {` ${searchTerm} `}
                 </span>
                 не було виявлено на даний момент
@@ -141,7 +137,7 @@ export function Search({ isAuthorized }) {
                     <button
                       key={i}
                       onClick={() => handlePageChange(i + 1)}
-                      className={currentPage === i + 1 ? 'active' : ''}
+                      className={currentPage === i + 1 ? styles['active'] : ''}
                     >
                       {i + 1}
                     </button>
diff --git a/FrontEnd/src/pages/SearchPage/SearchField/SearchResults.jsx b/FrontEnd/src/pages/SearchPage/SearchField/SearchResults.jsx
index 32e0a9835..531812b65 100644
--- a/FrontEnd/src/pages/SearchPage/SearchField/SearchResults.jsx
+++ b/FrontEnd/src/pages/SearchPage/SearchField/SearchResults.jsx
@@ -1,5 +1,5 @@
 import CompanyCard from '../../../components/CompanyCard/CompanyCard';
-import styles from './SearchResulys.module.css';
+import styles from './SearchResults.module.css';
 import PropTypes from 'prop-types';
 
 const SearchResults = ({
diff --git a/FrontEnd/src/pages/SearchPage/SearchField/SearchResulys.module.css b/FrontEnd/src/pages/SearchPage/SearchField/SearchResults.module.css
similarity index 57%
rename from FrontEnd/src/pages/SearchPage/SearchField/SearchResulys.module.css
rename to FrontEnd/src/pages/SearchPage/SearchField/SearchResults.module.css
index cd7c350c7..169ede0ee 100644
--- a/FrontEnd/src/pages/SearchPage/SearchField/SearchResulys.module.css
+++ b/FrontEnd/src/pages/SearchPage/SearchField/SearchResults.module.css
@@ -1,6 +1,6 @@
 .new-companies-block {
   display: flex;
-  width: 1412px;
+  margin-top: 3%;
   padding: 16px 8px;
   flex-direction: column;
   align-items: center;
@@ -11,10 +11,15 @@
   display: grid;
   grid-template-columns: 1fr 1fr 1fr;
   justify-content: space-between;
-  margin: -10px; /* spacess beetwen ecompanies */
+  margin: 20px; 
+  position: relative;
+  z-index: 100;
 }
 
 .col-md-4 {
-  flex-basis: calc(33, 3% - 80px); /* 3 companies per row */
-  margin: 10px; /* spacess beetwen ecompanies */
+  flex-basis: calc(33.3% - 80px);
+  margin: 20px;
+  z-index: 1000;
+  position: relative;
+  z-index: 100;
 }
diff --git a/FrontEnd/src/pages/SearchPage/search.module.css b/FrontEnd/src/pages/SearchPage/search.module.css
index 3eed4c45e..e2c7e6e04 100644
--- a/FrontEnd/src/pages/SearchPage/search.module.css
+++ b/FrontEnd/src/pages/SearchPage/search.module.css
@@ -1,12 +1,19 @@
 .main_block_outer {
   padding-top: 10px;
-  width: var(--main-block-size);
+  min-height: var(--min-height-block-main);
 }
 
 .new-companies-main {
   background-color: var(--search-new-companies-main);
 }
 
+.new-companies-main__error {
+  display: flex;
+  min-height: 539px;
+  margin-top: 3%;
+  align-content: center;
+}
+
 .main_block {
   position: relative;
 }
@@ -20,21 +27,30 @@
 
 .search_field_entered_value {
   color: #0b6c61;
-  font: normal normal normal 20px/2 Inter;
+  font: normal normal normal 20px/2 var(--font-main);
   font-weight: 600;
   font-style: italic;
 }
 
 .search_results_text {
-  font: Inter;
+  font: var(--font-main);
   font-weight: 700;
 }
 
 .search_result_error {
+  margin-left: 140px;
+  margin-top: 15%;
+  width: 80%;
+  flex-direction: row;
   font-weight: 600;
   color: var(--search-text-color);
-  font: normal normal bold 20px/2 Inter;
-  margin: 145px;
+  font: normal normal bold 20px/2 var(--font-main);
+}
+
+.search_result_error_color {
+  color: #0b6c61;
+  font: normal normal normal 20px/2 var(--font-main);
+  font-weight: 600;
 }
 
 .dot-img-right {
@@ -44,8 +60,10 @@
   flex-direction: column;
   align-items: flex-start;
   gap: 24px;
-  margin: 0px 354px 473px 1330px;
+  margin-top: 1%;
+  margin-left: 87%;
   position: absolute;
+  z-index: 10;
 }
 
 .new-companies-result_pages {
@@ -53,7 +71,6 @@
 }
 
 .pagination {
-  background-color: var(--main_light-color);
   display: flex;
   justify-content: center;
   align-items: center;
@@ -62,7 +79,7 @@
 
 .pagination button {
   all: unset;
-  border: none;
+  /* border: none; */
   font-size: 16px;
   font-weight: 500;
   padding: 8px 16px;
@@ -71,7 +88,7 @@
 }
 
 .pagination button.active {
-  background-color: none;
+  background-color: transparent;
   color: var(--search-pagination-style-color);
   border: 1px solid var(--search-pagination-style-color);
   border-radius: 5px;
diff --git a/FrontEnd/src/routes/ClientRouter.jsx b/FrontEnd/src/routes/ClientRouter.jsx
index b8c14c1ed..4598d5854 100644
--- a/FrontEnd/src/routes/ClientRouter.jsx
+++ b/FrontEnd/src/routes/ClientRouter.jsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ToastContainer } from 'react-toastify';
 import { Route, Routes, Navigate } from 'react-router-dom';
 import { ConfigProvider } from 'antd';
diff --git a/FrontEnd/src/routes/Router.js b/FrontEnd/src/routes/Router.js
index 90931631f..d98a89f2c 100644
--- a/FrontEnd/src/routes/Router.js
+++ b/FrontEnd/src/routes/Router.js
@@ -2,7 +2,6 @@ import {createBrowserRouter} from 'react-router-dom';
 import {AuthProvider} from '../context';
 import AdminRouter from './AdminRouter';
 import ClientRouter from './ClientRouter';
-import React from 'react';
 
 
 const router = createBrowserRouter([
@@ -24,4 +23,4 @@ const router = createBrowserRouter([
     },
   ]);
 
-export default router;
\ No newline at end of file
+export default router;