diff --git a/.cspell.json b/.cspell.json
index cc7ff3552..2a0e1004f 100644
--- a/.cspell.json
+++ b/.cspell.json
@@ -331,7 +331,8 @@
 		"nodesource",
 		"Koyeb",
 		"Northflank",
-		"prebuild"
+		"prebuild",
+		"dataToDisplay"
 	],
 	"useGitignore": true,
 	"ignorePaths": [
diff --git a/apps/web/app/[locale]/page-component.tsx b/apps/web/app/[locale]/page-component.tsx
index dd2727d1c..24e9ef2ba 100644
--- a/apps/web/app/[locale]/page-component.tsx
+++ b/apps/web/app/[locale]/page-component.tsx
@@ -50,7 +50,6 @@ function MainPage() {
 		{ title: t(`common.${view}`), href: `/` }
 	];
 	const { online } = useNetworkState();
-	console.log(path, 'path');
 	useEffect(() => {
 		if (view == IssuesView.KANBAN && path == '/') {
 			setView(IssuesView.CARDS);
diff --git a/apps/web/app/[locale]/profile/[memberId]/page.tsx b/apps/web/app/[locale]/profile/[memberId]/page.tsx
index 2a68f67a5..d2415ed75 100644
--- a/apps/web/app/[locale]/profile/[memberId]/page.tsx
+++ b/apps/web/app/[locale]/profile/[memberId]/page.tsx
@@ -122,7 +122,7 @@ const Profile = React.memo(function ProfilePage({ params }: { params: { memberId
 				)}
 
 				<Container fullWidth={fullWidth} className="mb-10">
-					{hook.tab !== 'worked' ? (
+					{hook.tab !== 'worked' || activityFilter == 'Tasks' ? (
 						<UserProfileTask profile={profile} tabFiltered={hook} />
 					) : (
 						activityScreens[activityFilter] ?? null
diff --git a/apps/web/app/[locale]/settings/layout.tsx b/apps/web/app/[locale]/settings/layout.tsx
index 4e03ee4b1..b38a32b6a 100644
--- a/apps/web/app/[locale]/settings/layout.tsx
+++ b/apps/web/app/[locale]/settings/layout.tsx
@@ -24,32 +24,30 @@ const SettingsLayout = ({ children }: { children: JSX.Element }) => {
 		return <SettingsPersonalSkeleton />;
 	} else {
 		return (
-			<div className="">
-				<MainLayout
-					className="items-start pb-1  h-auto w-full"
-					childrenClassName="flex h-[calc(100vh-_300px)] flex w-full items-start"
-				>
-					<div className="flex flex-col">
-						<div className="pt-12 w-full pb-4 bg-white dark:bg-dark--theme">
-							<Container fullWidth={fullWidth}>
-								<div className="flex flex-row items-center justify-start gap-8">
-									<Link href="/">
-										<ArrowLeftIcon className="w-6 h-6" />
-									</Link>
+			<MainLayout
+				className="items-start pb-1 overflow-hidden w-full"
+				childrenClassName="h-[calc(100vh-_300px)] overflow-hidden w-full"
+			>
+				<div>
+					<div className="pt-12 w-full pb-4 bg-white dark:bg-dark--theme">
+						<Container fullWidth={fullWidth}>
+							<div className="flex flex-row items-center justify-start gap-8">
+								<Link href="/">
+									<ArrowLeftIcon className="w-6 h-6" />
+								</Link>
 
-									<Breadcrumb paths={breadcrumb} className="text-sm" />
-								</div>
-							</Container>
-						</div>
-						<div className="flex">
-							<div className="w-96 ml-8">
-								<LeftSideSettingMenu />
+								<Breadcrumb paths={breadcrumb} className="text-sm" />
 							</div>
+						</Container>
+					</div>
+					<div className="flex">
+						<div className="w-96 ml-8">
+							<LeftSideSettingMenu />
 						</div>
+						<div className="h-[calc(100vh-_186px)] mt-3 p-10 overflow-y-auto  w-full">{children}</div>
 					</div>
-					<div className="h-[calc(100vh-_186px)] mt-3 p-10 overflow-y-auto  w-full">{children}</div>
-				</MainLayout>
-			</div>
+				</div>
+			</MainLayout>
 		);
 	}
 };
diff --git a/apps/web/app/[locale]/settings/personal/page.tsx b/apps/web/app/[locale]/settings/personal/page.tsx
index fa65fe4b1..4646d5c2f 100644
--- a/apps/web/app/[locale]/settings/personal/page.tsx
+++ b/apps/web/app/[locale]/settings/personal/page.tsx
@@ -12,40 +12,37 @@ const Personal = () => {
 
 	return (
 		<>
-
-								<Link href={'/settings/team'} className="w-full">
-									<button className="w-full lg:hidden hover:bg-white rounded-xl border border-dark text-dark p-4 mt-2">
-										Go to Team settings
-									</button>
-								</Link>
-								<Accordian
-									title={t('pages.settingsPersonal.HEADING_TITLE')}
-									className="w-full max-w-[96vw] overflow-y-hidden p-4 mt-8 dark:bg-dark--theme"
-									id="general"
-								>
-									{/* <Text className="text-base font-normal text-center text-gray-400 sm:text-left">
-										{t('pages.settings.HEADING_DESCRIPTION')}
-									</Text> */}
-									<ProfileAvatar />
-									<PersonalSettingForm />
-								</Accordian>
-								<Accordian
-									title={t('pages.settingsPersonal.DATA_SYNCHRONIZATION')}
-									className="p-4 mt-4 dark:bg-dark--theme"
-									id="sync-zone"
-								>
-									<SyncZone />
-								</Accordian>
-								<Accordian
-									title={t('pages.settings.DANDER_ZONE')}
-									className="p-4 mt-4 dark:bg-dark--theme"
-									isDanger={true}
-									id="danger-zone"
-								>
-									<DangerZone />
-								</Accordian>
-
-
+			<Link href={'/settings/team'} className="w-full">
+				<button className="w-full lg:hidden hover:bg-white rounded-xl border border-dark text-dark p-4 mt-2">
+					Go to Team settings
+				</button>
+			</Link>
+			<Accordian
+				title={t('pages.settingsPersonal.HEADING_TITLE')}
+				className="w-full max-w-[96vw] overflow-y-hidden p-4 mt-8 dark:bg-dark--theme"
+				id="general"
+			>
+				{/* <Text className="text-base font-normal text-center text-gray-400 sm:text-left">
+					{t('pages.settings.HEADING_DESCRIPTION')}
+				</Text> */}
+				<ProfileAvatar />
+				<PersonalSettingForm />
+			</Accordian>
+			<Accordian
+				title={t('pages.settingsPersonal.DATA_SYNCHRONIZATION')}
+				className="p-4 mt-4 dark:bg-dark--theme"
+				id="sync-zone"
+			>
+				<SyncZone />
+			</Accordian>
+			<Accordian
+				title={t('pages.settings.DANDER_ZONE')}
+				className="p-4 mt-4 dark:bg-dark--theme"
+				isDanger={true}
+				id="danger-zone"
+			>
+				<DangerZone />
+			</Accordian>
 		</>
 	);
 };
diff --git a/apps/web/app/[locale]/settings/team/page.tsx b/apps/web/app/[locale]/settings/team/page.tsx
index 029a0128e..f523a31de 100644
--- a/apps/web/app/[locale]/settings/team/page.tsx
+++ b/apps/web/app/[locale]/settings/team/page.tsx
@@ -17,7 +17,6 @@ import { InvitationSetting } from 'lib/settings/invitation-setting';
 import { IssuesSettings } from 'lib/settings/issues-settings';
 import { MemberSetting } from 'lib/settings/member-setting';
 
-
 const Team = () => {
 	const t = useTranslations();
 	const [user] = useRecoilState(userState);
@@ -25,94 +24,92 @@ const Team = () => {
 	const { isTeamManager } = useIsMemberManager(user);
 	return (
 		<>
+			{isTeamMember ? (
+				<>
+					<Link href={'/settings/personal'} className="w-full">
+						<button className="w-full lg:hidden hover:bg-white rounded-xl border border-dark text-dark p-4 mt-2">
+							Go to Personnal settings
+						</button>
+					</Link>
+					{/* General Settings */}
+					<Accordian
+						title={t('pages.settingsTeam.HEADING_TITLE')}
+						className="w-full p-4 mt-8 dark:bg-dark--theme"
+						id="general-settings"
+					>
+						<div className="flex flex-col">
+							<TeamAvatar disabled={!isTeamManager} bgColor={activeTeam?.color} />
+							<TeamSettingForm />
+						</div>
+					</Accordian>
 
-							{isTeamMember ? (
-								< >
-									<Link href={'/settings/personal'} className="w-full">
-										<button className="w-full lg:hidden hover:bg-white rounded-xl border border-dark text-dark p-4 mt-2">
-											Go to Personnal settings
-										</button>
-									</Link>
-									{/* General Settings */}
-									<Accordian
-										title={t('pages.settingsTeam.HEADING_TITLE')}
-										className="w-full p-4 mt-8 dark:bg-dark--theme"
-										id="general-settings"
-									>
-										<div className="flex flex-col">
-											<TeamAvatar disabled={!isTeamManager} bgColor={activeTeam?.color} />
-											<TeamSettingForm />
-										</div>
-									</Accordian>
-
-									{/* Invitations */}
-									{isTeamManager ? (
-										<Accordian
-											title={t('pages.settingsTeam.INVITATION_HEADING_TITLE')}
-											className="w-full p-4 mt-4 dark:bg-dark--theme"
-											id="invitations"
-										>
-											<InvitationSetting />
-										</Accordian>
-									) : null}
-
-									{/* Members */}
-									{isTeamManager ? (
-										<Accordian
-											title={t('pages.settingsTeam.MEMBER_HEADING_TITLE')}
-											className="w-full p-4 mt-4 dark:bg-dark--theme"
-											id="member"
-										>
-											<MemberSetting />
-										</Accordian>
-									) : null}
+					{/* Invitations */}
+					{isTeamManager ? (
+						<Accordian
+							title={t('pages.settingsTeam.INVITATION_HEADING_TITLE')}
+							className="w-full p-4 mt-4 dark:bg-dark--theme"
+							id="invitations"
+						>
+							<InvitationSetting />
+						</Accordian>
+					) : null}
 
-									{isTeamManager && (
-										<Accordian
-											title={t('pages.settingsTeam.INTEGRATIONS')}
-											className="w-full p-4 mt-4 dark:bg-dark--theme"
-											id="integrations"
-										>
-											<IntegrationSetting />
-										</Accordian>
-									)}
+					{/* Members */}
+					{isTeamManager ? (
+						<Accordian
+							title={t('pages.settingsTeam.MEMBER_HEADING_TITLE')}
+							className="w-full p-4 mt-4 dark:bg-dark--theme"
+							id="member"
+						>
+							<MemberSetting />
+						</Accordian>
+					) : null}
 
-									{/* Issues Settings */}
-									<Accordian
-										title={t('pages.settingsTeam.ISSUES_HEADING_TITLE')}
-										className="w-full p-4 mt-4 dark:bg-dark--theme"
-										id="issues-settings"
-									>
-										<IssuesSettings />
-									</Accordian>
+					{isTeamManager && (
+						<Accordian
+							title={t('pages.settingsTeam.INTEGRATIONS')}
+							className="w-full p-4 mt-4 dark:bg-dark--theme"
+							id="integrations"
+						>
+							<IntegrationSetting />
+						</Accordian>
+					)}
 
-									{/* TODO */}
-									{/* Notification Settings */}
-									{/* <Accordian
-										title={t('pages.settingsTeam.NOTIFICATION_HEADING_TITLE')}
-										className="p-4 mt-4 dark:bg-dark--theme"
-									>
-										<NotificationSettings />
-									</Accordian> */}
+					{/* Issues Settings */}
+					<Accordian
+						title={t('pages.settingsTeam.ISSUES_HEADING_TITLE')}
+						className="w-full p-4 mt-4 dark:bg-dark--theme"
+						id="issues-settings"
+					>
+						<IssuesSettings />
+					</Accordian>
 
-									{/* Danger Zone */}
-									<Accordian
-										title={t('pages.settings.DANDER_ZONE')}
-										className="w-full p-4 mt-4 dark:bg-dark--theme"
-										isDanger={true}
-										id="danger-zones"
-									>
-										<DangerZoneTeam />
-									</Accordian>
-								</>
-							) : (
-								<div className="flex flex-col w-full sm:mr-[20px] lg:mr-0">
-									<Card className="dark:bg-dark--theme p-[32px] mt-[36px]" shadow="bigger">
-										<NoTeam className="p-5 mt-0 xs:mt-0" />
-									</Card>
-								</div>
-							)}
+					{/* TODO */}
+					{/* Notification Settings */}
+					{/* <Accordian
+						title={t('pages.settingsTeam.NOTIFICATION_HEADING_TITLE')}
+						className="p-4 mt-4 dark:bg-dark--theme"
+					>
+						<NotificationSettings />
+					</Accordian> */}
 
+					{/* Danger Zone */}
+					<Accordian
+						title={t('pages.settings.DANDER_ZONE')}
+						className="w-full p-4 mt-4 dark:bg-dark--theme"
+						isDanger={true}
+						id="danger-zones"
+					>
+						<DangerZoneTeam />
+					</Accordian>
+				</>
+			) : (
+				<div className="flex flex-col w-full sm:mr-[20px] lg:mr-0">
+					<Card className="dark:bg-dark--theme p-[32px] mt-[36px]" shadow="bigger">
+						<NoTeam className="p-5 mt-0 xs:mt-0" />
+					</Card>
+				</div>
+			)}
 		</>
 	);
 };
diff --git a/apps/web/lib/features/task/task-input.tsx b/apps/web/lib/features/task/task-input.tsx
index 9e8cac2be..495328456 100644
--- a/apps/web/lib/features/task/task-input.tsx
+++ b/apps/web/lib/features/task/task-input.tsx
@@ -573,7 +573,7 @@ function TaskCard({
 
 				<Divider className="mt-4" />
 				{/* Task list */}
-				<ul className="py-6 max-h-56 overflow-scroll">
+				<ul className="py-6 max-h-56 overflow-auto">
 					{forParentChildRelationship &&
 						data?.map((task, i) => {
 							const last = (datas.filteredTasks?.length || 0) - 1 === i;
diff --git a/apps/web/lib/features/user-profile-tasks.tsx b/apps/web/lib/features/user-profile-tasks.tsx
index 220eec776..38fcbfe6d 100644
--- a/apps/web/lib/features/user-profile-tasks.tsx
+++ b/apps/web/lib/features/user-profile-tasks.tsx
@@ -31,7 +31,8 @@ export function UserProfileTask({ profile, tabFiltered }: Props) {
 		profile.member?.running == true ? t.id !== profile.activeUserTeamTask?.id : t
 	);
 	const { nextOffset, data } = useInfinityScrolling(otherTasks);
-	const dataTodisplay = otherTasks.length > 10 ? otherTasks : data;
+	const dataToDisplay = otherTasks.length < 10 ? otherTasks : data;
+
 	// const { total, onPageChange, itemsPerPage, itemOffset, endOffset, setItemsPerPage, currentItems } =
 	// 	usePagination(otherTasks);
 
@@ -85,7 +86,7 @@ export function UserProfileTask({ profile, tabFiltered }: Props) {
 			)}
 
 			<ul className="flex flex-col gap-6">
-				{dataTodisplay.map((task, index) => {
+				{dataToDisplay.map((task, index) => {
 					return (
 						<li key={task.id}>
 							<ObserverComponent isLast={index === data.length - 1} getNextData={nextOffset} />
diff --git a/apps/web/lib/settings/invitation-table.tsx b/apps/web/lib/settings/invitation-table.tsx
index 12bc99c9c..7d2fd6267 100644
--- a/apps/web/lib/settings/invitation-table.tsx
+++ b/apps/web/lib/settings/invitation-table.tsx
@@ -19,7 +19,7 @@ export const InvitationTable = ({ invitations }: { invitations: (IInvitation | I
 
 	return (
 		<div>
-			<div className="overflow-x-auto sm:rounded-lg">
+			<div className=" sm:rounded-lg">
 				<table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
 					<thead className="text-xs text-gray-700 uppercase border-b">
 						<tr>
@@ -31,31 +31,31 @@ export const InvitationTable = ({ invitations }: { invitations: (IInvitation | I
 							</th>
 							<th
 								scope="col"
-								className="text-sm min-w-[15rem] font-normal capitalize py-3 text-[#B1AEBC]"
+								className="text-sm min-w-[10rem] font-normal capitalize py-3 text-[#B1AEBC]"
 							>
 								{t('pages.invite.invitationTable.POSITION')}
 							</th>
 							<th
 								scope="col"
-								className="text-sm min-w-[15rem] font-normal capitalize py-3 text-[#B1AEBC]"
+								className="text-sm min-w-[10rem] font-normal capitalize py-3 text-[#B1AEBC]"
 							>
 								{t('pages.invite.invitationTable.DATE_AND_TIME_REQUEST')}
 							</th>
 							<th
 								scope="col"
-								className="text-sm min-w-[15rem] font-normal capitalize py-3 text-[#B1AEBC]"
+								className="text-sm min-w-[10rem] font-normal capitalize py-3 text-[#B1AEBC]"
 							>
 								{t('pages.invite.invitationTable.CV_OR_ATTACHMENT')}
 							</th>
 							<th
 								scope="col"
-								className="text-sm min-w-[15rem] font-normal capitalize py-3 text-[#B1AEBC]"
+								className="text-sm min-w-[10rem] font-normal capitalize py-3 text-[#B1AEBC]"
 							>
 								{t('common.LINK')}
 							</th>
 							<th
 								scope="col"
-								className="text-sm min-w-[15rem] font-normal capitalize py-3 text-[#B1AEBC]"
+								className="text-sm min-w-[10rem] font-normal capitalize py-3 text-[#B1AEBC]"
 							>
 								{t('common.STATUS')}
 							</th>
@@ -64,7 +64,7 @@ export const InvitationTable = ({ invitations }: { invitations: (IInvitation | I
 					</thead>
 					<tbody className="dark:bg-dark--theme-light">
 						{currentItems.map((invitation, index) => (
-							<tr className="bg-white dark:bg-dark--theme-light dark:border-gray-700" key={index}>
+							<tr className="bg-white dark:bg-dark--theme-light dark:border-gray-700 max-w-" key={index}>
 								<th
 									scope="row"
 									className="flex items-center  py-4 pl-0 text-gray-900 whitespace-nowrap dark:text-white"