diff --git a/src/components/NewUpdateModal/NewUpdateModal.module.scss b/src/components/NewUpdateModal/NewUpdateModal.module.scss
index ac6f05c..62db2a5 100644
--- a/src/components/NewUpdateModal/NewUpdateModal.module.scss
+++ b/src/components/NewUpdateModal/NewUpdateModal.module.scss
@@ -19,16 +19,3 @@
   top: 21%;
   cursor: pointer;
 }
-
-.closeBtn {
-  border-radius: 0;
-  background-color: #000;
-  color: #fff;
-  margin-top: 32px;
-  border: 1px solid #000 !important;
-
-  &:hover {
-    border: 1px solid #000 !important;
-    color: #fff !important;
-  }
-}
diff --git a/src/components/NewUpdateModal/NewUpdateModal.tsx b/src/components/NewUpdateModal/NewUpdateModal.tsx
index a241f97..35fb473 100644
--- a/src/components/NewUpdateModal/NewUpdateModal.tsx
+++ b/src/components/NewUpdateModal/NewUpdateModal.tsx
@@ -50,13 +50,7 @@ const NewUpdateModal: FC<NewUpdateModalProps> = ({ data, onClose }) => {
         >
           {data.description}
         </ReactMarkdown>
-        <div className={styles.btnWrapper}>
-          <Button
-            label={closeText}
-            onClick={onClose}
-            className={styles['closeBtn']}
-          />
-        </div>
+        <Button label={closeText} onClick={onClose} type={'orange'} />
       </div>
     </Modal>
   );
diff --git a/src/components/ToolHeader/ToolHeader.tsx b/src/components/ToolHeader/ToolHeader.tsx
index 329fc44..28f973a 100644
--- a/src/components/ToolHeader/ToolHeader.tsx
+++ b/src/components/ToolHeader/ToolHeader.tsx
@@ -46,6 +46,8 @@ const SettingsModal = dynamic(() => import('@components/SettingsModal'), {
   ssr: false,
 });
 
+type ActivePage = 'uxcore' | 'uxcg' | 'uxcp' | 'uxcat' | null;
+
 type TToolHeader = {
   homepageLinkTarget?: '_blank' | '_self';
   openPodcast?: boolean;
@@ -98,9 +100,6 @@ const ToolHeader: FC<TToolHeader> = ({
   const [token, setToken] = useState<string | null>(null);
   const [usernameIsTakenError, setUsernameIsTakenError] = useState('');
   const [changedTitle, setChangedTitle] = useState(false);
-  const [activePage, setActivePage] = useState<
-    'uxcore' | 'uxcg' | 'uxcp' | 'uxcat'
-  >(null);
 
   const {
     ourProjects,
@@ -143,22 +142,26 @@ const ToolHeader: FC<TToolHeader> = ({
   };
 
   const title = changedTitle ? userInfo?.title : userInfo?.user?.title;
+  const normalizePath = (p: string) => p.replace(/\/+$/, '') || '/';
+
+  const getActiveFromPath = (pathname: string): ActivePage => {
+    const path = normalizePath(pathname);
 
-  const normalizedPath = pathname.replace(/\/+$/, '');
-  const pathnameWithBypass = /^\/uxcp$/i.test(normalizedPath)
-    ? '/uxcp/'
-    : normalizedPath;
-  const path = pathnameWithBypass.replace(/\/+$/, '');
-
-  const getActiveFromPath = (pathname: string) => {
-    if (pathname.includes('/uxcore')) return 'uxcore';
-    if (pathname.includes('/uxcg')) return 'uxcg';
-    if (path.includes('/uxcp')) return 'uxcp';
-    if (pathname.includes('/uxcat') || pathname.includes('/user'))
+    const pathWithBypass = /^\/uxcp$/i.test(path) ? '/uxcp/' : path;
+
+    if (pathWithBypass.includes('/uxcore')) return 'uxcore';
+    if (pathWithBypass.includes('/uxcg')) return 'uxcg';
+    if (pathWithBypass.includes('/uxcp')) return 'uxcp';
+    if (pathWithBypass.includes('/uxcat') || pathWithBypass.includes('/user'))
       return 'uxcat';
+
     return null;
   };
 
+  const activePage = useMemo(() => {
+    return getActiveFromPath(pathname);
+  }, [pathname]);
+
   const openPodcastHandler = useCallback(() => {
     setOpenPodcast(prev => !prev);
   }, []);
@@ -242,11 +245,6 @@ const ToolHeader: FC<TToolHeader> = ({
     }
   }, [title, locale, userInfo]);
 
-  useEffect(() => {
-    const next = getActiveFromPath(pathname);
-    if (router.isReady && next) setActivePage(next);
-  }, [pathname, router]);
-
   return (
     <header className={cn(styles.ToolHeader, { [styles.Hidden]: hidden })}>
       <div className={styles.mobile}>