diff --git a/src/containers/alert/index.tsx b/src/containers/alert/index.tsx
index e5ae515e7..4bfa4e860 100644
--- a/src/containers/alert/index.tsx
+++ b/src/containers/alert/index.tsx
@@ -7,7 +7,6 @@ import { useRouter } from 'next/router';
 import { analysisAlertAtom, analysisAtom, skipAnalysisAlertAtom } from 'store/analysis';
 import { drawingToolAtom, drawingUploadToolAtom } from 'store/drawing-tool';
 import { locationsModalAtom } from 'store/locations';
-import { printModeState } from 'store/print-mode';
 import { locationToolAtom } from 'store/sidebar';
 
 import { useRecoilState, useRecoilValue, useResetRecoilState, useSetRecoilState } from 'recoil';
@@ -23,7 +22,6 @@ const AnalysisAlert = () => {
   const { asPath, replace } = useRouter();
 
   const locationTool = useRecoilValue(locationToolAtom);
-  const isPrintingMode = useRecoilValue(printModeState);
   const setLocationsModalIsOpen = useSetRecoilState(locationsModalAtom);
   const [isAnalysisAlertOpen, setAnalysisAlert] = useRecoilState(analysisAlertAtom);
   const [skipAnalysisAlert, setSkipAnalysisAlert] = useRecoilState(skipAnalysisAlertAtom);
@@ -33,8 +31,7 @@ const AnalysisAlert = () => {
 
   const queryParams = useMemo(() => asPath.split('?')[1], [asPath]);
 
-  const isPrintingId = isPrintingMode ? 'print-mode' : 'no-print';
-  const { [`default-desktop-${isPrintingId}`]: map } = useMap();
+  const { [`default-desktop`]: map } = useMap();
 
   const handleCancelResetPage = useCallback(() => {
     setAnalysisAlert(false);
diff --git a/src/containers/datasets/drawing-tool/index.tsx b/src/containers/datasets/drawing-tool/index.tsx
index d04412469..2cd413f88 100644
--- a/src/containers/datasets/drawing-tool/index.tsx
+++ b/src/containers/datasets/drawing-tool/index.tsx
@@ -23,8 +23,7 @@ const WidgetDrawingTool = () => {
   const [{ enabled: isDrawingToolEnabled }, setDrawingToolState] = useRecoilState(drawingToolAtom);
   const resetDrawingUploadToolState = useResetRecoilState(drawingUploadToolAtom);
 
-  const [{ enabled: isDrawingUploadToolEnabled, uploadedGeojson }] =
-    useRecoilState(drawingUploadToolAtom);
+  const [{ uploadedGeojson }] = useRecoilState(drawingUploadToolAtom);
   const setAnalysisState = useSetRecoilState(analysisAtom);
   const setMapCursor = useSetRecoilState(mapCursorAtom);
 
@@ -57,12 +56,7 @@ const WidgetDrawingTool = () => {
       ...drawingToolState,
       enabled: !isDrawingToolEnabled,
     }));
-  }, [
-    setDrawingToolState,
-    isDrawingToolEnabled,
-    isDrawingUploadToolEnabled,
-    resetDrawingUploadToolState,
-  ]);
+  }, [setDrawingToolState, isDrawingToolEnabled, resetDrawingUploadToolState]);
 
   useUploadFile(acceptedFiles?.[0], onUploadFile);
 
@@ -82,7 +76,7 @@ const WidgetDrawingTool = () => {
       <button
         type="button"
         className={cn({
-          'flex w-[128px] cursor-pointer flex-col items-center justify-center space-y-1 rounded-3xl p-2':
+          'mb-2 flex w-[128px] cursor-pointer flex-col items-center justify-center space-y-1 rounded-3xl p-2':
             true,
           ' bg-white ': isDrawingToolEnabled && !uploadedGeojson,
           'cursor-default opacity-40': !!uploadedGeojson,
diff --git a/src/containers/datasets/drawing-upload-tool/index.tsx b/src/containers/datasets/drawing-upload-tool/index.tsx
index 21730f34c..bfd9e7a39 100644
--- a/src/containers/datasets/drawing-upload-tool/index.tsx
+++ b/src/containers/datasets/drawing-upload-tool/index.tsx
@@ -107,7 +107,7 @@ const WidgetDrawingUploadTool = () => {
           </div>
         )}
         {(uploadedGeojson || isDrawingUploadToolEnabled) && (
-          <div className="w-[128px] cursor-pointer rounded-3xl bg-white p-2">
+          <div className="mb-2 w-[128px] cursor-pointer rounded-3xl bg-white p-2">
             <DeleteDrawingButton size="sm">
               <p className="whitespace-nowrap font-sans text-sm text-brand-800">Delete area</p>
             </DeleteDrawingButton>
diff --git a/src/containers/location-widget/index.tsx b/src/containers/location-widget/index.tsx
index facdbea52..39faa3492 100644
--- a/src/containers/location-widget/index.tsx
+++ b/src/containers/location-widget/index.tsx
@@ -85,21 +85,21 @@ const LocationWidget = () => {
 
   return (
     <>
-      <div className="relative flex h-52 flex-col rounded-4xl bg-brand-600 bg-[url('/images/location-bg.svg')] bg-cover bg-center text-center shadow-control print:hidden">
+      <div className="relative flex h-52 flex-col justify-between rounded-4xl bg-brand-600 bg-[url('/images/location-bg.svg')] bg-cover bg-center text-center shadow-control print:hidden">
         <Dialog open={isOpen}>
           <DialogTrigger asChild>
             <button onClick={handleOnClickTitle} disabled={isGuideActive || !locationName}>
               {!!locationName ? (
                 <div
                   className={cn({
-                    'inline-block px-10 pb-10 pt-8 text-6xl font-light text-black/85 first-letter:uppercase':
+                    'inline-block h-[128px] flex-1 grow px-10 pt-8 text-6xl font-light text-black/85 first-letter:uppercase':
                       true,
                     'text-2.75xl': width >= 540,
 
                     'text-5xl': locationName.length > 10,
-                    'text-4xl': locationName.length > 30,
-                    'text-2xl': locationName.length > 60,
-                    'break-all text-xl': locationName.length > 120,
+                    'text-4xl': locationName.length > 30 && locationName.length <= 55,
+                    'text-2xl': locationName.length > 55 && locationName.length <= 120,
+                    'break-all text-base': locationName.length > 120,
                   })}
                 >
                   <h1 className="text-white" ref={titleRef}>
@@ -115,14 +115,7 @@ const LocationWidget = () => {
           </DialogTrigger>
           <LocationDialogContent close={closeMenu} />
         </Dialog>
-        <div
-          className={cn({
-            'absolute bottom-2 left-0 w-full pb-2': true,
-            'bottom-0': locationName?.length > 20,
-          })}
-        >
-          <LocationTools />
-        </div>
+        <LocationTools />
       </div>
       <AnalysisAlert />
     </>
diff --git a/src/containers/map/legend/index.tsx b/src/containers/map/legend/index.tsx
index 6c916810a..a984d2b5f 100644
--- a/src/containers/map/legend/index.tsx
+++ b/src/containers/map/legend/index.tsx
@@ -42,7 +42,7 @@ const Legend = ({ embedded = false }: { embedded?: boolean }) => {
   const activeLayerNoPlanet = activeLayers.filter((l) => !l.id.includes('planet'));
 
   return (
-    <div>
+    <div className="print:hidden">
       {!!activeLayerNoPlanet.length && (
         <>
           <button
diff --git a/src/containers/map/legend/mobile/index.tsx b/src/containers/map/legend/mobile/index.tsx
index 498ae28a0..03a88408f 100644
--- a/src/containers/map/legend/mobile/index.tsx
+++ b/src/containers/map/legend/mobile/index.tsx
@@ -29,7 +29,7 @@ const Legend = () => {
   };
 
   return (
-    <div className="flex w-screen justify-center">
+    <div className="flex w-screen justify-center print:hidden">
       {!!activeLayers.length && (
         <>
           <button
diff --git a/src/containers/navigation/location-tools/index.tsx b/src/containers/navigation/location-tools/index.tsx
index db7d706e0..0189cfc45 100644
--- a/src/containers/navigation/location-tools/index.tsx
+++ b/src/containers/navigation/location-tools/index.tsx
@@ -9,7 +9,6 @@ import { locationToolAtom } from 'store/sidebar';
 
 import { useRecoilState, useRecoilValue } from 'recoil';
 
-import AnalysisAlert from 'containers/alert';
 import WidgetDrawingTool from 'containers/datasets/drawing-tool';
 import WidgetDrawingUploadTool from 'containers/datasets/drawing-upload-tool';
 import Helper from 'containers/guide/helper';
@@ -67,52 +66,47 @@ const LocationTools = () => {
   ]);
 
   return (
-    <div className="flex space-y-2 text-center">
-      <div className="mx-auto flex space-x-2 md:space-x-8">
-        {/* //*FIND LOCATIONS* */}
-        <Dialog open={locationTool === 'search' && locationsModalIsOpen}>
-          <DialogTrigger className="flex w-[128px] items-center justify-center p-2" asChild>
-            <>
-              <Helper
-                className={{
-                  button: '-top-1 right-9 z-20',
-                  tooltip: 'w-fit-content max-w-[400px]',
-                }}
-                tooltipPosition={{ top: -65, left: -10 }}
-                message="use this button to search for a country or a protected area. Countries can also be selected by clicking on the map or on the name of the area selected (on top of the widgets)"
+    <div className="mx-auto flex w-full items-center justify-center space-x-2 md:space-x-8">
+      {/* //*FIND LOCATIONS* */}
+      <Dialog open={locationTool === 'search' && locationsModalIsOpen}>
+        <DialogTrigger asChild>
+          <>
+            <Helper
+              className={{
+                button: '-top-1 right-9 z-20',
+                tooltip: 'w-fit-content max-w-[400px]',
+              }}
+              tooltipPosition={{ top: -65, left: -10 }}
+              message="use this button to search for a country or a protected area. Countries can also be selected by clicking on the map or on the name of the area selected (on top of the widgets)"
+            >
+              <button
+                onClick={handleOnClickSearch}
+                className="mb-2 flex w-[128px] cursor-pointer flex-col items-center justify-center space-y-1 rounded-3xl p-2"
+                data-testid="search-button"
+                disabled={guideIsActive}
               >
-                <button
-                  onClick={handleOnClickSearch}
-                  className="flex w-[128px] cursor-pointer items-center justify-center"
-                  data-testid="search-button"
-                  disabled={guideIsActive}
-                >
-                  <div className="flex flex-col items-center space-y-1">
-                    <Icon
-                      icon={GLASS_SVG}
-                      className={cn({
-                        'h-8 w-8 fill-current text-white': true,
-                      })}
-                      description="Glass"
-                    />
-                    <p className="whitespace-nowrap font-sans text-sm text-white">Find locations</p>
-                  </div>
-                </button>
-              </Helper>
-            </>
-          </DialogTrigger>
-
-          <LocationDialogContent close={closeMenu} />
-        </Dialog>
-
-        {/* //*DRAW AREA* */}
-
-        <WidgetDrawingTool />
-
-        {/* //*UPLOAD SHAPEFILE* */}
-        <WidgetDrawingUploadTool />
-      </div>
-      <AnalysisAlert />
+                <Icon
+                  icon={GLASS_SVG}
+                  className={cn({
+                    'h-8 w-8 fill-current text-white': true,
+                  })}
+                  description="Glass"
+                />
+                <p className="whitespace-nowrap font-sans text-sm text-white">Find locations</p>
+              </button>
+            </Helper>
+          </>
+        </DialogTrigger>
+
+        <LocationDialogContent close={closeMenu} />
+      </Dialog>
+
+      {/* //*DRAW AREA* */}
+
+      <WidgetDrawingTool />
+
+      {/* //*UPLOAD SHAPEFILE* */}
+      <WidgetDrawingUploadTool />
     </div>
   );
 };
diff --git a/src/containers/widget/index.tsx b/src/containers/widget/index.tsx
index 7f0d5b152..681e3d05f 100644
--- a/src/containers/widget/index.tsx
+++ b/src/containers/widget/index.tsx
@@ -2,6 +2,7 @@ import React, { useCallback, ReactElement, FC } from 'react';
 
 import cn from 'lib/classnames';
 
+import { drawingToolAtom, drawingUploadToolAtom } from 'store/drawing-tool';
 import { widgetsCollapsedAtom } from 'store/widgets';
 
 import { AnimatePresence, motion } from 'framer-motion';
@@ -28,10 +29,12 @@ type WidgetLayoutProps = {
 
 const WidgetWrapper: FC<WidgetLayoutProps> = (props: WidgetLayoutProps) => {
   const { children, title, id, className, applicability, info } = props;
-
+  const { enabled: isDrawingToolEnabled } = useRecoilValue(drawingToolAtom);
+  const { enabled: isDrawingUploadToolEnabled } = useRecoilValue(drawingUploadToolAtom);
   const isLayerActive = useRecoilValue(getLayerActive(id));
 
-  const [widgetsCollapsed, setWidgetsCollapsed] = useRecoilState(widgetsCollapsedAtom);
+  const [widgetsCollapsed, setWidgetsCollapsed] =
+    useRecoilState<Record<string, boolean>>(widgetsCollapsedAtom);
 
   const handleWidgetCollapsed = useCallback(() => {
     const updatedWidgetsCollapsed = {
@@ -54,12 +57,15 @@ const WidgetWrapper: FC<WidgetLayoutProps> = (props: WidgetLayoutProps) => {
 
   if (Boolean(children.type() === null)) return null;
 
+  const isCollapsed: boolean =
+    isDrawingToolEnabled || isDrawingUploadToolEnabled ? false : widgetsCollapsed[id];
+
   return (
     <AnimatePresence>
       <motion.div
         initial={false}
         variants={widgetVariants}
-        animate={widgetsCollapsed[id] ? 'collapsed' : 'expanded'}
+        animate={isCollapsed ? 'collapsed' : 'expanded'}
         exit="expanded"
         transition={{ type: 'tween', bounce: 0, duration: 0.6 }}
         className={cn({
@@ -92,8 +98,8 @@ const WidgetWrapper: FC<WidgetLayoutProps> = (props: WidgetLayoutProps) => {
             data-testid={`widget-${id}-content`}
             className={cn({
               'group-last-of-type:block': true,
-              hidden: widgetsCollapsed[id],
-              block: !widgetsCollapsed[id],
+              hidden: isCollapsed,
+              block: !isCollapsed,
             })}
           >
             {children}
@@ -101,9 +107,9 @@ const WidgetWrapper: FC<WidgetLayoutProps> = (props: WidgetLayoutProps) => {
           {applicability && (
             <p
               className={cn({
-                'block flex text-sm text-black/85 md:whitespace-nowrap md:text-center': true,
-                hidden: widgetsCollapsed[id],
-                block: !widgetsCollapsed[id],
+                'flex text-sm text-black/85 md:whitespace-nowrap md:text-center': true,
+                hidden: isCollapsed,
+                block: !isCollapsed,
               })}
             >
               <span className="font-normal">Data applicability:</span>{' '}
diff --git a/src/containers/widgets/index.tsx b/src/containers/widgets/index.tsx
index d1d2fbda3..09d8c481e 100644
--- a/src/containers/widgets/index.tsx
+++ b/src/containers/widgets/index.tsx
@@ -85,7 +85,7 @@ const WidgetsContainer: FC = () => {
     return enabledWidgets.filter(
       ({ slug }) => activeWidgets?.includes(slug) || slug === 'widgets_deck_tool'
     );
-  }, [activeWidgets, enabledWidgets]) satisfies WidgetTypes[];
+  }, [activeWidgets, enabledWidgets, customGeojson, uploadedGeojson]) satisfies WidgetTypes[];
 
   const setPrintingMode = useSetRecoilState(printModeState);
   const cat = useWidgetsIdsByCategory(activeWidgets);
@@ -121,21 +121,11 @@ const WidgetsContainer: FC = () => {
     setWidgetsCollapsed(updateWidgetsCollapsed);
   }, [widgetsCollapsed, widgetsCollapsedChecker, setWidgetsCollapsed]);
 
-  const expandedWidgets = Object.keys(widgetsCollapsed).reduce((acc, key) => {
-    acc[key] = false;
-    return acc;
-  }, {});
-
   const onClickDownload = useCallback(() => {
-    // setWidgetsCollapsed(expandedWidgets);
-    // setPrintingMode(true);
     setTimeout(() => {
       window.print();
     }, 2000);
-    // setTimeout(() => {
-    //   setPrintingMode(false);
-    // }, 4000);
-  }, [expandedWidgets, setPrintingMode, setWidgetsCollapsed]);
+  }, []);
 
   return (
     <WidgetsLayout>