diff --git a/src/app/deals/components/desktop/Boards/Boards.tsx b/src/app/deals/components/desktop/Boards/Boards.tsx
index 10f848b..b41e9d2 100644
--- a/src/app/deals/components/desktop/Boards/Boards.tsx
+++ b/src/app/deals/components/desktop/Boards/Boards.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import React from "react";
-import { Group, ScrollArea } from "@mantine/core";
+import { Group } from "@mantine/core";
 import Board from "@/app/deals/components/desktop/Board/Board";
 import CreateBoardButton from "@/app/deals/components/desktop/CreateBoardButton/CreateBoardButton";
 import { useBoardsContext } from "@/app/deals/contexts/BoardsContext";
@@ -24,31 +24,28 @@ const Boards = () => {
     };
 
     return (
-        <ScrollArea
-            offsetScrollbars={"x"}
-            scrollbars={"x"}
-            scrollbarSize={0}
-            w={"100%"}>
-            <Group
-                pr={"xs"}
-                wrap={"nowrap"}
-                gap={0}>
-                <SortableDnd
-                    initialItems={boards}
-                    renderItem={renderBoard}
-                    onDragEnd={onDragEnd}
-                    onItemClick={selectBoard}
-                    containerStyle={{
-                        flexWrap: "nowrap",
-                        gap: "var(--mantine-spacing-md)",
-                        margin: "var(--mantine-spacing-md)",
-                    }}
-                    dragHandleStyle={{ cursor: "pointer" }}
-                    disabled={isMobile}
-                />
-                <CreateBoardButton />
-            </Group>
-        </ScrollArea>
+        <Group
+            wrap={"nowrap"}
+            gap={"md"}
+            pr={"sm"}
+            style={{ maxWidth: "100%", overflow: "hidden" }}>
+            <SortableDnd
+                initialItems={boards}
+                renderItem={renderBoard}
+                onDragEnd={onDragEnd}
+                onItemClick={selectBoard}
+                containerStyle={{
+                    flexWrap: "nowrap",
+                    gap: "var(--mantine-spacing-md)",
+                    paddingBlock: "var(--mantine-spacing-md)",
+                    paddingLeft: "var(--mantine-spacing-md)",
+                }}
+                dragHandleStyle={{ cursor: "pointer" }}
+                disabled={isMobile}
+                swiperEnabled
+            />
+            <CreateBoardButton />
+        </Group>
     );
 };
 
diff --git a/src/app/deals/components/shared/Header/Header.tsx b/src/app/deals/components/shared/Header/Header.tsx
index c2b6eec..1c9c87f 100644
--- a/src/app/deals/components/shared/Header/Header.tsx
+++ b/src/app/deals/components/shared/Header/Header.tsx
@@ -28,12 +28,14 @@ const Header = () => {
                 wrap={"nowrap"}
                 pr={"md"}>
                 <Boards />
-                <ColorSchemeToggle />
-                <ProjectSelect
-                    data={projects}
-                    value={selectedProject}
-                    onChange={value => value && setSelectedProject(value)}
-                />
+                <Group wrap={"nowrap"}>
+                    <ColorSchemeToggle />
+                    <ProjectSelect
+                        data={projects}
+                        value={selectedProject}
+                        onChange={value => value && setSelectedProject(value)}
+                    />
+                </Group>
             </Group>
         );
     };
diff --git a/src/components/dnd/FunnelDnd/FunnelDnd.module.css b/src/components/dnd/FunnelDnd/FunnelDnd.module.css
index 6615dc3..72b3f81 100644
--- a/src/components/dnd/FunnelDnd/FunnelDnd.module.css
+++ b/src/components/dnd/FunnelDnd/FunnelDnd.module.css
@@ -13,7 +13,7 @@
     }
 }
 
-.swiperContainer :global(.swiper-scrollbar-drag) {
+.swiper-container :global(.swiper-scrollbar-drag) {
     @mixin dark {
         background-color: var(--mantine-color-dark-9);
     }
@@ -22,6 +22,6 @@
     }
 }
 
-.swiperContainer :global(.swiper-slide) {
+.swiper-container :global(.swiper-slide) {
     padding-bottom: 20px;
 }
diff --git a/src/components/dnd/FunnelDnd/FunnelDnd.tsx b/src/components/dnd/FunnelDnd/FunnelDnd.tsx
index e6efe15..4861c34 100644
--- a/src/components/dnd/FunnelDnd/FunnelDnd.tsx
+++ b/src/components/dnd/FunnelDnd/FunnelDnd.tsx
@@ -101,7 +101,7 @@ const FunnelDnd = <
             return (
                 <Swiper
                     ref={swiperRef}
-                    className={classes.swiperContainer}
+                    className={classes["swiper-container"]}
                     slidesPerView={1.2}
                     modules={[Pagination]}
                     freeMode={{ enabled: false }}
@@ -118,7 +118,7 @@ const FunnelDnd = <
         return (
             <Swiper
                 ref={swiperRef}
-                className={classes.swiperContainer}
+                className={classes["swiper-container"]}
                 modules={[Scrollbar, Mousewheel, FreeMode]}
                 spaceBetween={15}
                 slidesPerView={"auto"}
diff --git a/src/components/dnd/SortableDnd/SortableDnd.tsx b/src/components/dnd/SortableDnd/SortableDnd.tsx
index f859d58..9e31d5a 100644
--- a/src/components/dnd/SortableDnd/SortableDnd.tsx
+++ b/src/components/dnd/SortableDnd/SortableDnd.tsx
@@ -11,6 +11,8 @@ import { Active, DndContext, DragEndEvent } from "@dnd-kit/core";
 import { restrictToHorizontalAxis } from "@dnd-kit/modifiers";
 import { SortableContext } from "@dnd-kit/sortable";
 import { LexoRank } from "lexorank";
+import { FreeMode, Mousewheel, Scrollbar } from "swiper/modules";
+import { Swiper, SwiperSlide } from "swiper/react";
 import { Box, Flex } from "@mantine/core";
 import useDndSensors from "@/app/deals/hooks/useSensors";
 import { SortableOverlay } from "@/components/dnd/SortableDnd/SortableOverlay";
@@ -35,6 +37,7 @@ type Props<T extends BaseItem> = {
     containerStyle?: CSSProperties;
     vertical?: boolean;
     disabled?: boolean;
+    swiperEnabled?: boolean;
 };
 
 const SortableDnd = <T extends BaseItem>({
@@ -45,8 +48,9 @@ const SortableDnd = <T extends BaseItem>({
     onDragEnd,
     onItemClick,
     containerStyle,
-    vertical,
+    vertical = false,
     disabled = false,
+    swiperEnabled = false,
 }: Props<T>) => {
     const [active, setActive] = useState<Active | null>(null);
     const [items, setItems] = useState<T[]>([]);
@@ -98,6 +102,81 @@ const SortableDnd = <T extends BaseItem>({
         setActive(null);
     };
 
+    const renderWithSwiper = () => (
+        <Swiper
+            modules={[Scrollbar, Mousewheel, FreeMode]}
+            spaceBetween={15}
+            slidesPerView={"auto"}
+            scrollbar={{ hide: false }}
+            mousewheel={{
+                enabled: true,
+                sensitivity: 0.2,
+            }}
+            style={containerStyle}
+            direction={vertical ? "vertical" : "horizontal"}
+            freeMode={{ enabled: true }}
+            grabCursor>
+            {items.map((item, index) => (
+                <SwiperSlide
+                    style={{ width: "fit-content" }}
+                    key={index}
+                    onClick={e => {
+                        if (!onItemClick) return;
+                        e.stopPropagation();
+                        onItemClick(item);
+                    }}>
+                    <SortableItem
+                        id={item.id}
+                        disabled={disabled}
+                        renderItem={renderDraggable =>
+                            renderItem(item, renderDraggable)
+                        }
+                        renderDraggable={
+                            renderDraggable
+                                ? () => renderDraggable(item)
+                                : undefined
+                        }
+                        dragHandleStyle={dragHandleStyle}
+                    />
+                </SwiperSlide>
+            ))}
+        </Swiper>
+    );
+
+    const renderWithFlex = () => (
+        <Flex
+            style={{
+                gap: 0,
+                flexWrap: "nowrap",
+                flexDirection: vertical ? "column" : "row",
+                ...containerStyle,
+            }}>
+            {items.map((item, index) => (
+                <Box
+                    key={index}
+                    onClick={e => {
+                        if (!onItemClick) return;
+                        e.stopPropagation();
+                        onItemClick(item);
+                    }}>
+                    <SortableItem
+                        id={item.id}
+                        disabled={disabled}
+                        renderItem={renderDraggable =>
+                            renderItem(item, renderDraggable)
+                        }
+                        renderDraggable={
+                            renderDraggable
+                                ? () => renderDraggable(item)
+                                : undefined
+                        }
+                        dragHandleStyle={dragHandleStyle}
+                    />
+                </Box>
+            ))}
+        </Flex>
+    );
+
     return (
         <DndContext
             modifiers={[restrictToHorizontalAxis]}
@@ -108,37 +187,7 @@ const SortableDnd = <T extends BaseItem>({
             <SortableContext
                 items={items}
                 disabled={disabled}>
-                <Flex
-                    style={{
-                        gap: 0,
-                        flexWrap: "nowrap",
-                        flexDirection: vertical ? "column" : "row",
-                        ...containerStyle,
-                    }}>
-                    {items.map((item, index) => (
-                        <Box
-                            key={index}
-                            onClick={e => {
-                                if (!onItemClick) return;
-                                e.stopPropagation();
-                                onItemClick(item);
-                            }}>
-                            <SortableItem
-                                id={item.id}
-                                disabled={disabled}
-                                renderItem={renderDraggable =>
-                                    renderItem(item, renderDraggable)
-                                }
-                                renderDraggable={
-                                    renderDraggable
-                                        ? () => renderDraggable(item)
-                                        : undefined
-                                }
-                                dragHandleStyle={dragHandleStyle}
-                            />
-                        </Box>
-                    ))}
-                </Flex>
+                {swiperEnabled ? renderWithSwiper() : renderWithFlex()}
             </SortableContext>
             <SortableOverlay>
                 {activeItem ? renderItem(activeItem, renderDraggable) : null}