diff --git a/apps/frontend/src/app/global.scss b/apps/frontend/src/app/global.scss
index da791348..ac18deaa 100644
--- a/apps/frontend/src/app/global.scss
+++ b/apps/frontend/src/app/global.scss
@@ -10,7 +10,6 @@ html {
 }
 .box {
   position: relative;
-  padding: 8px 24px;
 }
 .box span {
   position: relative;
diff --git a/apps/frontend/src/components/analytics/chart-social.tsx b/apps/frontend/src/components/analytics/chart-social.tsx
index f51db426..b4191ba8 100644
--- a/apps/frontend/src/components/analytics/chart-social.tsx
+++ b/apps/frontend/src/components/analytics/chart-social.tsx
@@ -2,7 +2,6 @@
 import { FC, useEffect, useMemo, useRef } from 'react';
 import DrawChart from 'chart.js/auto';
 import { TotalList } from '@gitroom/frontend/components/analytics/stars.and.forks.interface';
-import dayjs from 'dayjs';
 import { chunk } from 'lodash';
 
 function mergeDataPoints(data: TotalList[], numPoints: number): TotalList[] {
diff --git a/apps/frontend/src/components/analytics/chart.tsx b/apps/frontend/src/components/analytics/chart.tsx
index 06ff4354..7d46d349 100644
--- a/apps/frontend/src/components/analytics/chart.tsx
+++ b/apps/frontend/src/components/analytics/chart.tsx
@@ -1,5 +1,5 @@
 'use client';
-import { FC, useEffect, useMemo, useRef } from 'react';
+import { FC, useEffect, useRef } from 'react';
 import DrawChart from 'chart.js/auto';
 import {
   ForksList,
diff --git a/apps/frontend/src/components/billing/main.billing.component.tsx b/apps/frontend/src/components/billing/main.billing.component.tsx
index b2107c3a..69c49ab0 100644
--- a/apps/frontend/src/components/billing/main.billing.component.tsx
+++ b/apps/frontend/src/components/billing/main.billing.component.tsx
@@ -3,8 +3,6 @@
 import { Slider } from '@gitroom/react/form/slider';
 import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
 import { Button } from '@gitroom/react/form/button';
-import { sortBy } from 'lodash';
-import { Track } from '@gitroom/react/form/track';
 import { useFetch } from '@gitroom/helpers/utils/custom.fetch';
 import { Subscription } from '@prisma/client';
 import { useDebouncedCallback } from 'use-debounce';
@@ -21,7 +19,6 @@ import interClass from '@gitroom/react/helpers/inter.font';
 import { useRouter } from 'next/navigation';
 import { useVariables } from '@gitroom/react/helpers/variable.context';
 import { useModals } from '@mantine/modals';
-import { AddProviderComponent } from '@gitroom/frontend/components/launches/add.provider.component';
 import { TopTitle } from '@gitroom/frontend/components/launches/helpers/top.title.component';
 import { Textarea } from '@gitroom/react/form/textarea';
 import { useFireEvents } from '@gitroom/helpers/utils/use.fire.events';
diff --git a/apps/frontend/src/components/launches/add.edit.model.tsx b/apps/frontend/src/components/launches/add.edit.model.tsx
index 966a2db8..8b2389fc 100644
--- a/apps/frontend/src/components/launches/add.edit.model.tsx
+++ b/apps/frontend/src/components/launches/add.edit.model.tsx
@@ -385,14 +385,15 @@ export const AddEditModal: FC<{
           instructions="You are an assistant that help the user to schedule their social media posts, everytime somebody write something, try to use a function call, if not prompt the user that the request is invalid and you are here to assists with social media posts"
         />
       )}
-      <div
-        className={clsx('flex p-[10px] rounded-[4px] bg-primary gap-[20px]')}
+      <div 
+        id="add-edit-modal"
+        className={clsx('flex flex-col md:flex-row p-[10px] rounded-[4px] bg-primary gap-[20px]')}
       >
         <div
           className={clsx(
             'flex flex-col gap-[16px] transition-all duration-700 whitespace-nowrap',
             !expend.expend
-              ? 'flex-1 w-1 animate-overflow'
+              ? 'flex-1 animate-overflow'
               : 'w-0 overflow-hidden'
           )}
         >
@@ -540,10 +541,10 @@ export const AddEditModal: FC<{
             ) : null}
           </div>
           <div className="relative h-[68px] flex flex-col rounded-[4px] border border-customColor6 bg-sixth">
-            <div className="flex flex-1 gap-[10px] relative">
-              <div className="absolute w-full h-full flex gap-[10px] justify-end items-center right-[16px]">
+            <div className="gap-[10px] relative">
+              <div id = "add-edit-post-dialog-buttons" className="flex flex-row flex-wrap w-full h-full gap-[10px] justify-end items-center right-[16px]">
                 <Button
-                  className="bg-transparent text-inputText"
+                  className="rounded-[4px]"
                   onClick={askClose}
                 >
                   Cancel
diff --git a/apps/frontend/src/components/launches/bot.picture.tsx b/apps/frontend/src/components/launches/bot.picture.tsx
index fadac522..cca8f426 100644
--- a/apps/frontend/src/components/launches/bot.picture.tsx
+++ b/apps/frontend/src/components/launches/bot.picture.tsx
@@ -6,10 +6,7 @@ import { Input } from '@gitroom/react/form/input';
 import { Button } from '@gitroom/react/form/button';
 import { useFetch } from '@gitroom/helpers/utils/custom.fetch';
 import { useToaster } from '@gitroom/react/toaster/toaster';
-import {
-  MediaComponent,
-  showMediaBox,
-} from '@gitroom/frontend/components/media/media.component';
+import { showMediaBox } from '@gitroom/frontend/components/media/media.component';
 
 export const BotPicture: FC<{
   integration: Integrations;
diff --git a/apps/frontend/src/components/launches/calendar.context.tsx b/apps/frontend/src/components/launches/calendar.context.tsx
index 03373f25..1bad55b0 100644
--- a/apps/frontend/src/components/launches/calendar.context.tsx
+++ b/apps/frontend/src/components/launches/calendar.context.tsx
@@ -19,8 +19,9 @@ import { useSearchParams } from 'next/navigation';
 import isoWeek from 'dayjs/plugin/isoWeek';
 import weekOfYear from 'dayjs/plugin/weekOfYear';
 
-dayjs.extend(isoWeek);
-dayjs.extend(weekOfYear);
+import { extend } from 'dayjs';
+extend(isoWeek);
+extend(weekOfYear);
 
 export const CalendarContext = createContext({
   currentDay: dayjs().day() as 0 | 1 | 2 | 3 | 4 | 5 | 6,
diff --git a/apps/frontend/src/components/launches/calendar.tsx b/apps/frontend/src/components/launches/calendar.tsx
index 93ea124b..6aac17c6 100644
--- a/apps/frontend/src/components/launches/calendar.tsx
+++ b/apps/frontend/src/components/launches/calendar.tsx
@@ -26,8 +26,9 @@ import isSameOrAfter from 'dayjs/plugin/isSameOrAfter';
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
 import { groupBy, sortBy } from 'lodash';
 import Image from 'next/image';
-dayjs.extend(isSameOrAfter);
-dayjs.extend(isSameOrBefore);
+import { extend } from 'dayjs';
+extend(isSameOrAfter);
+extend(isSameOrBefore);
 
 export const days = [
   'Monday',
@@ -499,7 +500,10 @@ export const CalendarColumn: FC<{
                   className={`w-full h-full rounded-[10px] hover:border hover:border-seventh flex justify-center items-center gap-[20px] opacity-30 grayscale hover:grayscale-0 hover:opacity-100`}
                 >
                   {integrations.map((selectedIntegrations) => (
-                    <div className="relative" key={selectedIntegrations.identifier}>
+                    <div
+                      className="relative"
+                      key={selectedIntegrations.identifier}
+                    >
                       <div
                         className={clsx(
                           'relative w-[34px] h-[34px] rounded-full flex justify-center items-center bg-fifth filter transition-all duration-500'
diff --git a/apps/frontend/src/components/launches/editor.tsx b/apps/frontend/src/components/launches/editor.tsx
index 8d7d4ba2..e2906b01 100644
--- a/apps/frontend/src/components/launches/editor.tsx
+++ b/apps/frontend/src/components/launches/editor.tsx
@@ -1,9 +1,8 @@
-import { forwardRef, useCallback, useRef } from 'react';
+import { forwardRef } from 'react';
 import type { MDEditorProps } from '@uiw/react-md-editor/src/Types';
 import { RefMDEditor } from '@uiw/react-md-editor/src/Editor';
 import MDEditor from '@uiw/react-md-editor';
 import { useCopilotAction, useCopilotReadable } from '@copilotkit/react-core';
-import dayjs from 'dayjs';
 import { CopilotTextarea } from '@copilotkit/react-textarea';
 import clsx from 'clsx';
 import { useUser } from '@gitroom/frontend/components/layout/user.context';
diff --git a/apps/frontend/src/components/launches/filters.tsx b/apps/frontend/src/components/launches/filters.tsx
index f87cea68..e469153d 100644
--- a/apps/frontend/src/components/launches/filters.tsx
+++ b/apps/frontend/src/components/launches/filters.tsx
@@ -145,74 +145,78 @@ export const Filters = () => {
     week.currentDay,
   ]);
   return (
-    <div className="text-textColor flex gap-[8px] items-center select-none">
-      <div onClick={previous} className="cursor-pointer">
-        <svg
-          xmlns="http://www.w3.org/2000/svg"
-          width="20"
-          height="20"
-          viewBox="0 0 20 20"
-          fill="none"
-        >
-          <path
-            d="M13.1644 15.5866C13.3405 15.7628 13.4395 16.0016 13.4395 16.2507C13.4395 16.4998 13.3405 16.7387 13.1644 16.9148C12.9883 17.0909 12.7494 17.1898 12.5003 17.1898C12.2513 17.1898 12.0124 17.0909 11.8363 16.9148L5.58629 10.6648C5.49889 10.5777 5.42954 10.4742 5.38222 10.3602C5.3349 10.2463 5.31055 10.1241 5.31055 10.0007C5.31055 9.87732 5.3349 9.75515 5.38222 9.64119C5.42954 9.52724 5.49889 9.42375 5.58629 9.33665L11.8363 3.08665C12.0124 2.91053 12.2513 2.81158 12.5003 2.81158C12.7494 2.81158 12.9883 2.91053 13.1644 3.08665C13.3405 3.26277 13.4395 3.50164 13.4395 3.75071C13.4395 3.99978 13.3405 4.23865 13.1644 4.41477L7.57925 9.99993L13.1644 15.5866Z"
-            fill="#E9E9F1"
-          />
-        </svg>
-      </div>
-      <div className="w-[80px] text-center">
-        {week.display === 'day'
-          ? `${dayjs()
-              .month(week.currentMonth)
-              .week(week.currentWeek)
-              .day(week.currentDay)
-              .format('dddd')}`
-          : week.display === 'week'
-          ? `Week ${week.currentWeek}`
-          : `${dayjs().month(week.currentMonth).format('MMMM')}`}
-      </div>
-      <div onClick={next} className="cursor-pointer">
-        <svg
-          xmlns="http://www.w3.org/2000/svg"
-          width="20"
-          height="20"
-          viewBox="0 0 20 20"
-          fill="none"
-        >
-          <path
-            d="M14.4137 10.6633L8.16374 16.9133C7.98761 17.0894 7.74874 17.1884 7.49967 17.1884C7.2506 17.1884 7.01173 17.0894 6.83561 16.9133C6.65949 16.7372 6.56055 16.4983 6.56055 16.2492C6.56055 16.0002 6.65949 15.7613 6.83561 15.5852L12.4223 10L6.83717 4.41331C6.74997 4.3261 6.68079 4.22257 6.6336 4.10863C6.5864 3.99469 6.56211 3.87257 6.56211 3.74925C6.56211 3.62592 6.5864 3.5038 6.6336 3.38986C6.68079 3.27592 6.74997 3.17239 6.83717 3.08518C6.92438 2.99798 7.02791 2.9288 7.14185 2.88161C7.25579 2.83441 7.37791 2.81012 7.50124 2.81012C7.62456 2.81012 7.74668 2.83441 7.86062 2.88161C7.97456 2.9288 8.07809 2.99798 8.1653 3.08518L14.4153 9.33518C14.5026 9.42238 14.5718 9.52596 14.619 9.63997C14.6662 9.75398 14.6904 9.87618 14.6903 9.99957C14.6901 10.123 14.6656 10.2451 14.6182 10.359C14.5707 10.4729 14.5012 10.5763 14.4137 10.6633Z"
-            fill="#E9E9F1"
-          />
-        </svg>
-      </div>
-      <div className="flex-1">{betweenDates}</div>
-      <div
-        className={clsx(
-          'border border-tableBorder p-[10px] cursor-pointer',
-          week.display === 'day' && 'bg-tableBorder'
-        )}
-        onClick={setDay}
-      >
-        Day
-      </div>
-      <div
-        className={clsx(
-          'border border-tableBorder p-[10px] cursor-pointer',
-          week.display === 'week' && 'bg-tableBorder'
-        )}
-        onClick={setWeek}
-      >
-        Week
-      </div>
-      <div
-        className={clsx(
-          'border border-tableBorder p-[10px] cursor-pointer',
-          week.display === 'month' && 'bg-tableBorder'
-        )}
-        onClick={setMonth}
-      >
-        Month
-      </div>
+    <div className="text-textColor flex flex-col md:flex-row gap-[8px] items-center select-none">
+	  <div className = "flex flex-grow flex-row">
+		<div onClick={previous} className="cursor-pointer">
+		  <svg
+			xmlns="http://www.w3.org/2000/svg"
+			width="20"
+			height="20"
+			viewBox="0 0 20 20"
+			fill="none"
+		  >
+			<path
+			  d="M13.1644 15.5866C13.3405 15.7628 13.4395 16.0016 13.4395 16.2507C13.4395 16.4998 13.3405 16.7387 13.1644 16.9148C12.9883 17.0909 12.7494 17.1898 12.5003 17.1898C12.2513 17.1898 12.0124 17.0909 11.8363 16.9148L5.58629 10.6648C5.49889 10.5777 5.42954 10.4742 5.38222 10.3602C5.3349 10.2463 5.31055 10.1241 5.31055 10.0007C5.31055 9.87732 5.3349 9.75515 5.38222 9.64119C5.42954 9.52724 5.49889 9.42375 5.58629 9.33665L11.8363 3.08665C12.0124 2.91053 12.2513 2.81158 12.5003 2.81158C12.7494 2.81158 12.9883 2.91053 13.1644 3.08665C13.3405 3.26277 13.4395 3.50164 13.4395 3.75071C13.4395 3.99978 13.3405 4.23865 13.1644 4.41477L7.57925 9.99993L13.1644 15.5866Z"
+			  fill="#E9E9F1"
+			/>
+		  </svg>
+		</div>
+		<div className="w-[80px] text-center">
+		  {week.display === 'day'
+			? `${dayjs()
+				.month(week.currentMonth)
+				.week(week.currentWeek)
+				.day(week.currentDay)
+				.format('dddd')}`
+			: week.display === 'week'
+			? `Week ${week.currentWeek}`
+			: `${dayjs().month(week.currentMonth).format('MMMM')}`}
+		</div>
+		<div onClick={next} className="cursor-pointer">
+		  <svg
+			xmlns="http://www.w3.org/2000/svg"
+			width="20"
+			height="20"
+			viewBox="0 0 20 20"
+			fill="none"
+		  >
+			<path
+			  d="M14.4137 10.6633L8.16374 16.9133C7.98761 17.0894 7.74874 17.1884 7.49967 17.1884C7.2506 17.1884 7.01173 17.0894 6.83561 16.9133C6.65949 16.7372 6.56055 16.4983 6.56055 16.2492C6.56055 16.0002 6.65949 15.7613 6.83561 15.5852L12.4223 10L6.83717 4.41331C6.74997 4.3261 6.68079 4.22257 6.6336 4.10863C6.5864 3.99469 6.56211 3.87257 6.56211 3.74925C6.56211 3.62592 6.5864 3.5038 6.6336 3.38986C6.68079 3.27592 6.74997 3.17239 6.83717 3.08518C6.92438 2.99798 7.02791 2.9288 7.14185 2.88161C7.25579 2.83441 7.37791 2.81012 7.50124 2.81012C7.62456 2.81012 7.74668 2.83441 7.86062 2.88161C7.97456 2.9288 8.07809 2.99798 8.1653 3.08518L14.4153 9.33518C14.5026 9.42238 14.5718 9.52596 14.619 9.63997C14.6662 9.75398 14.6904 9.87618 14.6903 9.99957C14.6901 10.123 14.6656 10.2451 14.6182 10.359C14.5707 10.4729 14.5012 10.5763 14.4137 10.6633Z"
+			  fill="#E9E9F1"
+			/>
+		  </svg>
+		</div>
+      	<div className="flex-1">{betweenDates}</div>
+	  </div>
+	  <div className="flex flex-row">
+		<div
+		  className={clsx(
+			'border border-tableBorder p-[10px] cursor-pointer',
+			week.display === 'day' && 'bg-tableBorder'
+		  )}
+		  onClick={setDay}
+		>
+		  Day
+		</div>
+		<div
+		  className={clsx(
+			'border border-tableBorder p-[10px] cursor-pointer',
+			week.display === 'week' && 'bg-tableBorder'
+		  )}
+		  onClick={setWeek}
+		>
+		  Week
+		</div>
+		<div
+		  className={clsx(
+			'border border-tableBorder p-[10px] cursor-pointer',
+			week.display === 'month' && 'bg-tableBorder'
+		  )}
+		  onClick={setMonth}
+		>
+		  Month
+		</div>
+	  </div>
     </div>
   );
 };
diff --git a/apps/frontend/src/components/launches/general.preview.component.tsx b/apps/frontend/src/components/launches/general.preview.component.tsx
index ac55c38e..a1abdaa2 100644
--- a/apps/frontend/src/components/launches/general.preview.component.tsx
+++ b/apps/frontend/src/components/launches/general.preview.component.tsx
@@ -19,7 +19,7 @@ export const GeneralPreviewComponent: FC<{maximumCharacters?: number}> = (props)
   });
 
   return (
-    <div className={clsx('w-[555px] px-[16px]')}>
+    <div className={clsx('w-full md:w-[555px] px-[16px]')}>
       <div className="w-full h-full relative flex flex-col">
         {newValues.map((value, index) => (
           <div
diff --git a/apps/frontend/src/components/launches/generator/generator.tsx b/apps/frontend/src/components/launches/generator/generator.tsx
index dc6b20dd..e75b32c1 100644
--- a/apps/frontend/src/components/launches/generator/generator.tsx
+++ b/apps/frontend/src/components/launches/generator/generator.tsx
@@ -1,5 +1,4 @@
 import React, {
-  ChangeEventHandler,
   FC,
   useCallback,
   useMemo,
diff --git a/apps/frontend/src/components/launches/helpers/linkedin.component.tsx b/apps/frontend/src/components/launches/helpers/linkedin.component.tsx
index af1c36a2..7870013e 100644
--- a/apps/frontend/src/components/launches/helpers/linkedin.component.tsx
+++ b/apps/frontend/src/components/launches/helpers/linkedin.component.tsx
@@ -13,8 +13,6 @@ import {
 import { useFetch } from '@gitroom/helpers/utils/custom.fetch';
 import { Input } from '@gitroom/react/form/input';
 import { Button } from '@gitroom/react/form/button';
-import { useCustomProviderFunction } from '@gitroom/frontend/components/launches/helpers/use.custom.provider.function';
-import dayjs from 'dayjs';
 
 const postUrlEmitter = new EventEmitter();
 
diff --git a/apps/frontend/src/components/launches/launches.component.tsx b/apps/frontend/src/components/launches/launches.component.tsx
index 29666236..b03566b3 100644
--- a/apps/frontend/src/components/launches/launches.component.tsx
+++ b/apps/frontend/src/components/launches/launches.component.tsx
@@ -4,7 +4,6 @@ import { AddProviderButton } from '@gitroom/frontend/components/launches/add.pro
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import Image from 'next/image';
 import { orderBy } from 'lodash';
-// import { Calendar } from '@gitroom/frontend/components/launches/calendar';
 import { CalendarWeekProvider } from '@gitroom/frontend/components/launches/calendar.context';
 import { Filters } from '@gitroom/frontend/components/launches/filters';
 import { useFetch } from '@gitroom/helpers/utils/custom.fetch';
@@ -116,8 +115,8 @@ export const LaunchesComponent = () => {
     <CalendarWeekProvider integrations={sortedIntegrations}>
       <div className="flex flex-1 flex-col">
         <div className="flex flex-1 relative">
-          <div className="outline-none w-full h-full grid grid-cols-[220px_minmax(0,1fr)] gap-[30px] scrollbar scrollbar-thumb-tableBorder scrollbar-track-secondary">
-            <div className="w-[220px] bg-third p-[16px] flex flex-col gap-[24px] min-h-[100%]">
+          <div className="outline-none w-full h-full grid grid-cols[1fr] md:grid-cols-[220px_minmax(0,1fr)] gap-[30px] scrollbar scrollbar-thumb-tableBorder scrollbar-track-secondary">
+            <div className="bg-third p-[16px] flex flex-col gap-[24px] min-h-[100%]">
               <h2 className="text-[20px]">Channels</h2>
               <div className="gap-[16px] flex flex-col">
                 {sortedIntegrations.length === 0 && (
diff --git a/apps/frontend/src/components/layout/impersonate.tsx b/apps/frontend/src/components/layout/impersonate.tsx
index 13874b9b..06834105 100644
--- a/apps/frontend/src/components/layout/impersonate.tsx
+++ b/apps/frontend/src/components/layout/impersonate.tsx
@@ -107,7 +107,7 @@ export const Impersonate = () => {
   }, [data]);
 
   return (
-    <div className="px-[23px]">
+    <div className="md:px-[23px]">
       <div className="bg-forth h-[52px] flex justify-center items-center border-input border rounded-[8px]">
         <div className="relative flex flex-col w-[600px]">
           <div className="relative z-[999]">
diff --git a/apps/frontend/src/components/layout/layout.context.tsx b/apps/frontend/src/components/layout/layout.context.tsx
index 9e75b9f2..145edb36 100644
--- a/apps/frontend/src/components/layout/layout.context.tsx
+++ b/apps/frontend/src/components/layout/layout.context.tsx
@@ -3,7 +3,6 @@
 import { ReactNode, useCallback } from 'react';
 import { FetchWrapperComponent } from '@gitroom/helpers/utils/custom.fetch';
 import { deleteDialog } from '@gitroom/react/helpers/delete.dialog';
-import { isGeneral } from '@gitroom/react/helpers/is.general';
 import { useReturnUrl } from '@gitroom/frontend/app/auth/return.url.component';
 import { useVariables } from '@gitroom/react/helpers/variable.context';
 
diff --git a/apps/frontend/src/components/layout/layout.settings.tsx b/apps/frontend/src/components/layout/layout.settings.tsx
index 4e80c5e8..38ce4d9d 100644
--- a/apps/frontend/src/components/layout/layout.settings.tsx
+++ b/apps/frontend/src/components/layout/layout.settings.tsx
@@ -15,7 +15,6 @@ import NotificationComponent from '@gitroom/frontend/components/notifications/no
 import Link from 'next/link';
 import useSWR from 'swr';
 import { useFetch } from '@gitroom/helpers/utils/custom.fetch';
-import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc';
 import weekOfYear from 'dayjs/plugin/weekOfYear';
 import isoWeek from 'dayjs/plugin/isoWeek';
@@ -37,10 +36,12 @@ const ModeComponent = dynamic(
   { ssr: false }
 );
 
-dayjs.extend(utc);
-dayjs.extend(weekOfYear);
-dayjs.extend(isoWeek);
-dayjs.extend(isBetween);
+import { extend } from 'dayjs';
+
+extend(utc);
+extend(weekOfYear);
+extend(isoWeek);
+extend(isBetween);
 
 export const LayoutSettings = ({ children }: { children: ReactNode }) => {
   const fetch = useFetch();
@@ -77,12 +78,12 @@ export const LayoutSettings = ({ children }: { children: ReactNode }) => {
             {user.tier !== 'FREE' && <Onboarding />}
             <Support />
             <ContinueProvider />
-            <div className="min-h-[100vh] w-full max-w-[1440px] mx-auto bg-primary px-[12px] text-textColor flex flex-col">
+            <div className="min-h-[100vh] w-full max-w-[1440px] mx-auto bg-primary sm:px-6 px-0 text-textColor flex flex-col">
               {user?.admin && <Impersonate />}
-              <div className="px-[23px] flex h-[80px] items-center justify-between z-[200] sticky top-0 bg-primary">
+              <nav className="px-0 md:px-[23px] gap-2 grid grid-rows-[repeat(2,_auto)] grid-cols-2 md:grid-rows-1 md:grid-cols-[repeat(3,_auto)] items-center justify-between z-[200] sticky top-0 bg-primary">
                 <Link
                   href="/"
-                  className="text-2xl flex items-center gap-[10px] text-textColor"
+                  className="text-2xl flex items-center gap-[10px] text-textColor order-1"
                 >
                   <div className="min-w-[55px]">
                     <Image
@@ -93,9 +94,7 @@ export const LayoutSettings = ({ children }: { children: ReactNode }) => {
                     />
                   </div>
                   <div
-                    className={clsx(
-                      !isGeneral ? 'mt-[12px]' : 'min-w-[80px]'
-                    )}
+                    className={clsx(!isGeneral ? 'mt-[12px]' : 'min-w-[80px]')}
                   >
                     {isGeneral ? (
                       <svg
@@ -127,21 +126,22 @@ export const LayoutSettings = ({ children }: { children: ReactNode }) => {
                     )}
                   </div>
                 </Link>
-                {user?.orgId && (user.tier !== 'FREE' || !isGeneral || !billingEnabled) ? (
+                {user?.orgId &&
+                (user.tier !== 'FREE' || !isGeneral || !billingEnabled) ? (
                   <TopMenu />
                 ) : (
                   <div />
                 )}
-                <div className="flex items-center gap-[8px]">
+                <div id = "systray-buttons" className="flex items-center justify-self-end gap-[8px] order-2 md:order-3">
                   <ModeComponent />
                   <SettingsComponent />
                   <NotificationComponent />
                   <OrganizationSelector />
                 </div>
-              </div>
+              </nav>
               <div className="flex-1 flex">
-                <div className="flex-1 rounded-3xl px-[23px] py-[17px] flex flex-col">
-                  {(user.tier === 'FREE' && isGeneral) && billingEnabled ? (
+                <div className="flex-1 rounded-3xl px-0 md:px-[23px] py-[17px] flex flex-col">
+                  {user.tier === 'FREE' && isGeneral && billingEnabled ? (
                     <>
                       <div className="text-center mb-[20px] text-xl">
                         <h1 className="text-3xl">
diff --git a/apps/frontend/src/components/layout/top.menu.tsx b/apps/frontend/src/components/layout/top.menu.tsx
index 52b3711b..11c7ba6e 100644
--- a/apps/frontend/src/components/layout/top.menu.tsx
+++ b/apps/frontend/src/components/layout/top.menu.tsx
@@ -70,8 +70,8 @@ export const TopMenu: FC = () => {
   const menuItems = useMenuItems();
 
   return (
-    <div className="flex flex-col h-full animate-normalFadeDown">
-      <ul className="gap-5 flex flex-1 items-center text-[18px]">
+    <div className="flex flex-col h-full animate-normalFadeDown order-3 md:order-2 col-span-2 md:col-span-1">
+      <ul className="gap-0 md:gap-5 flex flex-1 items-center text-[18px]">
         {menuItems
           .filter((f) => {
             if (f.requireBilling && !billingEnabled) {
@@ -88,7 +88,7 @@ export const TopMenu: FC = () => {
                 prefetch={true}
                 href={item.path}
                 className={clsx(
-                  'flex gap-2 items-center box',
+                  'flex gap-2 items-center box px-[6px] md:px-[24px] py-[8px]',
                   menuItems
                     .filter((f) => {
                       if (f.role) {
diff --git a/apps/frontend/src/components/marketplace/preview.popup.dynamic.tsx b/apps/frontend/src/components/marketplace/preview.popup.dynamic.tsx
index c806bcd8..09c7bd0d 100644
--- a/apps/frontend/src/components/marketplace/preview.popup.dynamic.tsx
+++ b/apps/frontend/src/components/marketplace/preview.popup.dynamic.tsx
@@ -1,5 +1,5 @@
 import 'reflect-metadata';
-import { FC, useCallback } from 'react';
+import { FC } from 'react';
 import { Post as PrismaPost } from '.prisma/client';
 import { Providers } from '@gitroom/frontend/components/launches/providers/show.all.providers';
 
diff --git a/apps/frontend/src/components/notifications/notification.component.tsx b/apps/frontend/src/components/notifications/notification.component.tsx
index 037eae43..ecab2113 100644
--- a/apps/frontend/src/components/notifications/notification.component.tsx
+++ b/apps/frontend/src/components/notifications/notification.component.tsx
@@ -42,7 +42,7 @@ export const NotificationOpenComponent = () => {
   const { data, isLoading } = useSWR('notifications', loadNotifications);
 
   return (
-    <div className="opacity-0 animate-normalFadeDown mt-[10px] absolute w-[420px] min-h-[200px] top-[100%] right-0 bg-third text-textColor rounded-[16px] flex flex-col border border-tableBorder">
+    <div id="notification-popup" className="opacity-0 animate-normalFadeDown mt-[10px] absolute w-[420px] min-h-[200px] top-[100%] right-0 bg-third text-textColor rounded-[16px] flex flex-col border border-tableBorder z-[2]">
       <div className={`p-[16px] border-b border-tableBorder ${interClass} font-bold`}>
         Notifications
       </div>
diff --git a/apps/frontend/src/components/onboarding/connect.channels.tsx b/apps/frontend/src/components/onboarding/connect.channels.tsx
index 65e5c7f7..a7bf5234 100644
--- a/apps/frontend/src/components/onboarding/connect.channels.tsx
+++ b/apps/frontend/src/components/onboarding/connect.channels.tsx
@@ -5,7 +5,6 @@ import React, {
   useCallback,
   useEffect,
   useMemo,
-  useRef,
   useState,
 } from 'react';
 import { useFetch } from '@gitroom/helpers/utils/custom.fetch';
diff --git a/apps/frontend/src/components/platform-analytics/render.analytics.tsx b/apps/frontend/src/components/platform-analytics/render.analytics.tsx
index 6b2e2608..233af868 100644
--- a/apps/frontend/src/components/platform-analytics/render.analytics.tsx
+++ b/apps/frontend/src/components/platform-analytics/render.analytics.tsx
@@ -1,4 +1,4 @@
-import { FC, useCallback, useEffect, useMemo, useState } from 'react';
+import { FC, useCallback, useMemo, useState } from 'react';
 import { Integration } from '@prisma/client';
 import useSWR from 'swr';
 import { useFetch } from '@gitroom/helpers/utils/custom.fetch';
diff --git a/libraries/helpers/src/configuration/configuration.checker.ts b/libraries/helpers/src/configuration/configuration.checker.ts
index 425de8ad..7703b666 100644
--- a/libraries/helpers/src/configuration/configuration.checker.ts
+++ b/libraries/helpers/src/configuration/configuration.checker.ts
@@ -30,12 +30,7 @@ export class ConfigurationChecker {
     this.checkIsValidUrl('FRONTEND_URL')
     this.checkIsValidUrl('NEXT_PUBLIC_BACKEND_URL')
     this.checkIsValidUrl('BACKEND_INTERNAL_URL')
-    this.checkNonEmpty('CLOUDFLARE_ACCOUNT_ID', 'Needed to setup providers.')
-    this.checkNonEmpty('CLOUDFLARE_ACCESS_KEY', 'Needed to setup providers.')
-    this.checkNonEmpty('CLOUDFLARE_SECRET_ACCESS_KEY', 'Needed to setup providers.')
-    this.checkNonEmpty('CLOUDFLARE_BUCKETNAME', 'Needed to setup providers.')
-    this.checkNonEmpty('CLOUDFLARE_BUCKET_URL', 'Needed to setup providers.')
-    this.checkNonEmpty('CLOUDFLARE_REGION', 'Needed to setup providers.')
+    this.checkNonEmpty('STORAGE_PROVIDER', 'Needed to setup storage.')
   }
 
   checkNonEmpty (key: string, description?: string): boolean {