diff --git a/apps/web/components/getting-started/components/CalendarItem.tsx b/apps/web/components/getting-started/components/CalendarItem.tsx
index ed63c6063c..b3662168a3 100644
--- a/apps/web/components/getting-started/components/CalendarItem.tsx
+++ b/apps/web/components/getting-started/components/CalendarItem.tsx
@@ -27,7 +27,7 @@ const CalendarItem = (props: ICalendarItem) => {
             type="button"
             onClick={(event) => {
               // Save cookie key to return url step
-              document.cookie = `return-to=${window.location.href};path=/;max-age=3600`;
+              document.cookie = `return-to=${window.location.href};path=/;max-age=3600;SameSite=Lax`;
               buttonProps && buttonProps.onClick && buttonProps?.onClick(event);
             }}
             className="ml-auto rounded-md border border-gray-200 py-[10px] px-4 text-sm font-bold">
diff --git a/apps/web/components/getting-started/components/ConnectedCalendarItem.tsx b/apps/web/components/getting-started/components/ConnectedCalendarItem.tsx
index 68ce96ca7f..06f60db445 100644
--- a/apps/web/components/getting-started/components/ConnectedCalendarItem.tsx
+++ b/apps/web/components/getting-started/components/ConnectedCalendarItem.tsx
@@ -31,10 +31,11 @@ const ConnectedCalendarItem = (prop: IConnectedCalendarItem) => {
         <img src={logo} alt={name} className="m-1 h-8 w-8" />
         <div className="mx-4">
           <p className="font-sans text-sm font-bold leading-5">
-            {name}{" "}
-            <span className="mx-1 rounded-[4px] bg-green-100 py-[2px] px-[6px] font-sans text-xs font-medium text-green-600">
+            {name}
+            {/* Temporarily removed till we use it on another place */}
+            {/* <span className="mx-1 rounded-[4px] bg-green-100 py-[2px] px-[6px] font-sans text-xs font-medium text-green-600">
               {t("default")}
-            </span>
+            </span> */}
           </p>
           <div className="fle-row flex">
             <span
@@ -44,13 +45,13 @@ const ConnectedCalendarItem = (prop: IConnectedCalendarItem) => {
             </span>
           </div>
         </div>
-
-        <Button
+        {/* Temporarily removed */}
+        {/* <Button
           color="minimal"
           type="button"
           className="ml-auto flex rounded-md border border-gray-200 py-[10x] px-4 font-sans text-sm">
           {t("edit")}
-        </Button>
+        </Button> */}
       </div>
       <div className="h-[1px] w-full border-b border-gray-200" />
       <div>
diff --git a/apps/web/components/getting-started/steps-views/ConnectCalendars.tsx b/apps/web/components/getting-started/steps-views/ConnectCalendars.tsx
index 0022e973ec..c90382efdf 100644
--- a/apps/web/components/getting-started/steps-views/ConnectCalendars.tsx
+++ b/apps/web/components/getting-started/steps-views/ConnectCalendars.tsx
@@ -52,7 +52,7 @@ const ConnectedCalendars = (props: IConnectCalendarsProps) => {
             </List>
             {/* Create event on selected calendar */}
             <CreateEventsOnCalendarSelect calendar={destinationCalendar} />
-            <p className="mt-7 text-sm text-gray-500">{t("connect_calendars_from_app_store")}</p>
+            <p className="mt-4 text-sm text-gray-500">{t("connect_calendars_from_app_store")}</p>
           </>
         )}