diff --git a/apps/web/app/(app)/artist/ArtistComponent.tsx b/apps/web/app/(app)/artist/ArtistComponent.tsx
index 1ad8068d..49b13272 100644
--- a/apps/web/app/(app)/artist/ArtistComponent.tsx
+++ b/apps/web/app/(app)/artist/ArtistComponent.tsx
@@ -123,6 +123,7 @@ export default function ArtistComponent() {
                   album_id={album.id}
                   album_name={album.name}
                   album_cover={album.cover_url}
+                  album_songs_count={album.songs.length}
                   first_release_date={album.first_release_date}
                 />
               </div>
diff --git a/apps/web/app/(app)/explore/page.tsx b/apps/web/app/(app)/explore/page.tsx
index a60fa388..577e1249 100644
--- a/apps/web/app/(app)/explore/page.tsx
+++ b/apps/web/app/(app)/explore/page.tsx
@@ -105,6 +105,7 @@ export default function ExplorePage() {
                   album_id={albumDetails[album.id]?.id ?? ""}
                   album_name={albumDetails[album.id]?.name ?? ""}
                   album_cover={albumDetails[album.id]?.cover_url ?? ""}
+                  album_songs_count={Number(albumDetails[album.id]?.songs.length) ?? ""}
                   first_release_date={albumDetails[album.id]?.first_release_date ?? ""}
                 />
               ) : null}
diff --git a/apps/web/app/(app)/home/page.tsx b/apps/web/app/(app)/home/page.tsx
index 2d67eb5f..37ce7a07 100644
--- a/apps/web/app/(app)/home/page.tsx
+++ b/apps/web/app/(app)/home/page.tsx
@@ -1,63 +1,104 @@
-"use client";
-
-import FromYourLibrary from "@/components/Home/FromYourLibrary";
-import LandingCarousel from "@/components/Home/LandingCarousel";
-import ListenAgain from "@/components/Home/ListenAgain";
-import MusicVideos from "@/components/Home/MusicVideos";
-import RandomSongs from "@/components/Home/RandomSongs";
-import RecommendedAlbums from "@/components/Home/RecommendedAlbums";
-import SimilarTo from "@/components/Home/SimilarTo";
-import GenreButtons from "@/components/Layout/GenreButtons";
-import { useGradientHover } from "@/components/Providers/GradientHoverProvider";
-import { getConfig, hasConfig } from "@music/sdk";
-import { Button } from "@music/ui/components/button";
-import Link from "next/link";
-import { useEffect, useState } from "react";
-
-export default function Home() {
-  let [configExists, setConfigExists] = useState(true);
-
-  const { setGradient } = useGradientHover()
-
-  useEffect(() => {
-    async function checkConfig() {
-      const config = await hasConfig();
-      if (config) {
-        setConfigExists(true);
-      } else {
-        setConfigExists(false);
-        setGradient("#FFFFFF")
-      }
-    }
-
-    checkConfig();
-  }, [setGradient]);
-
-  return configExists ? (
-    <div className="min-h-screen pt-14 pb-20">
-      <GenreButtons>
-        <div className="pb-5">
-          <LandingCarousel />
+    "use client";
+    
+    import FromYourLibrary from "@/components/Home/FromYourLibrary";
+    import LandingCarousel from "@/components/Home/LandingCarousel";
+    import ListenAgain from "@/components/Home/ListenAgain";
+    import MusicVideos from "@/components/Home/MusicVideos";
+    import RandomSongs from "@/components/Home/RandomSongs";
+    import RecommendedAlbums from "@/components/Home/RecommendedAlbums";
+    import SimilarTo from "@/components/Home/SimilarTo";
+    import CustomiseFeed from "@/components/Layout/CustomiseFeed";
+    import GenreButtons from "@/components/Layout/GenreButtons";
+    import { useGradientHover } from "@/components/Providers/GradientHoverProvider";
+    import { hasConfig } from "@music/sdk";
+    import { Button } from "@music/ui/components/button";
+    import Link from "next/link";
+    import { useEffect, useState } from "react";
+    import { useLayoutConfig } from "@/components/Providers/LayoutConfigContext";
+    
+    export default function Home() {
+      const [configExists, setConfigExists] = useState(true);
+      const { components, setComponents } = useLayoutConfig();
+    
+      const { setGradient } = useGradientHover();
+    
+      useEffect(() => {
+        async function checkConfig() {
+          const config = await hasConfig();
+          if (config) {
+            setConfigExists(true);
+          } else {
+            setConfigExists(false);
+            setGradient("#FFFFFF");
+          }
+        }
+    
+        checkConfig();
+      }, [setGradient]);
+    
+      useEffect(() => {
+        const savedConfig = localStorage.getItem("layoutConfig");
+        if (savedConfig) {
+          setComponents(JSON.parse(savedConfig));
+        }
+      }, [setComponents]);
+    
+      type ComponentConfig = {
+        id: string;
+        name: string;
+        visible: boolean;
+        pinned: boolean;
+      };
+      
+      const renderComponent = (component: ComponentConfig): JSX.Element | null => {
+        if (!component.visible) return null;
+        switch (component.id) {
+          case "LandingCarousel":
+            return <LandingCarousel key={component.id} />;
+          case "ListenAgain":
+            return <ListenAgain key={component.id} />;
+          case "SimilarTo":
+            return <SimilarTo key={component.id} />;
+          case "RecommendedAlbums":
+            return <RecommendedAlbums key={component.id} />;
+          case "RandomSongs":
+            return <RandomSongs key={component.id} />;
+          case "FromYourLibrary":
+            return <FromYourLibrary key={component.id} />;
+          case "MusicVideos":
+            return <MusicVideos key={component.id} />;
+          default:
+            return null;
+        }
+      };
+    
+      return configExists ? (
+        <div className="min-h-screen pt-4 pb-20">
+          <div className="relative pr-32 pt-8 z-10 top top-14 flex flex-col items-end">
+            <CustomiseFeed />
+          </div>
+          <GenreButtons>
+            {components
+              .filter((component) => component.pinned)
+              .map(renderComponent)}
+            {components
+              .filter((component) => !component.pinned)
+              .map(renderComponent)}
+          </GenreButtons>
         </div>
-        <ListenAgain />
-        <SimilarTo />
-        <RecommendedAlbums />
-        <RandomSongs />
-        <FromYourLibrary />
-        <MusicVideos />
-      </GenreButtons>
-    </div>
-  ) : (
-    <>
-      <div className="min-h-screen flex flex-col justify-center items-center space-y-4">
-        <p className="text-5xl">No Config Found!</p>
-        <p className="font-semibold">
-          <Link href="/setup/library" className="underline">Head to the setup page to index your library</Link>
-        </p>
-        <Link href="/setup/library">
-          <Button className="bg-white text-black hover:bg-gray-500">Head to Setup Page</Button>
-        </Link>
-      </div>
-    </>
-  );
-}
\ No newline at end of file
+      ) : (
+        <div className="min-h-screen flex flex-col justify-center items-center space-y-4">
+          <p className="text-5xl">No Config Found!</p>
+          <p className="font-semibold">
+            <Link href="/setup/library" className="underline">
+              Head to the setup page to index your library
+            </Link>
+          </p>
+          <Link href="/setup/library">
+            <Button className="bg-white text-black hover:bg-gray-500">
+              Head to Setup Page
+            </Button>
+          </Link>
+        </div>
+      );
+    }
\ No newline at end of file
diff --git a/apps/web/app/(app)/main-layout.tsx b/apps/web/app/(app)/main-layout.tsx
index 203ec9e3..a8ca01d8 100644
--- a/apps/web/app/(app)/main-layout.tsx
+++ b/apps/web/app/(app)/main-layout.tsx
@@ -39,7 +39,7 @@ export default function MainLayout({ children }: any) {
         <Sidebar
           sidebarContent={
             <>
-              <Separator className="bg-gray-800" />
+              {/* <Separator className="bg-gray-800" /> */}
               <Suspense>
                 <FriendActivity />
               </Suspense>
diff --git a/apps/web/app/(app)/profile/UsernameComponent.tsx b/apps/web/app/(app)/profile/UsernameComponent.tsx
index 29d38cc5..11223342 100644
--- a/apps/web/app/(app)/profile/UsernameComponent.tsx
+++ b/apps/web/app/(app)/profile/UsernameComponent.tsx
@@ -155,6 +155,7 @@ export default function UsernameComponent() {
                 album_id={album.id}
                 album_name={album.name}
                 album_cover={album.cover_url}
+                album_songs_count={album.songs.length}
                 first_release_date={album.first_release_date}
                 key={album.id}
               />
diff --git a/apps/web/components/Artist/SongsInLibrary.tsx b/apps/web/components/Artist/SongsInLibrary.tsx
index ca2d1a2d..897f890f 100644
--- a/apps/web/components/Artist/SongsInLibrary.tsx
+++ b/apps/web/components/Artist/SongsInLibrary.tsx
@@ -48,7 +48,7 @@ export default function FromYourLibrary() {
   }, [id]);
 
   return librarySongs.length > 0 && (
-    <ScrollButtons heading="In your Library">
+    <ScrollButtons heading="In your Library" id="InYourLibrary">
       <div className="flex flex-row justify-start items-start pb-20">
         {librarySongs.map((song, index) => (
           <div key={index} className="w-full sm:w-1/2 md:w-1/3 lg:w-1/4 p-8">
diff --git a/apps/web/components/Home/FromYourLibrary.tsx b/apps/web/components/Home/FromYourLibrary.tsx
index a1de5d92..2b81429f 100644
--- a/apps/web/components/Home/FromYourLibrary.tsx
+++ b/apps/web/components/Home/FromYourLibrary.tsx
@@ -71,7 +71,7 @@ export default function FromYourLibrary({ genre }: FromYourLibraryProps) {
   if (!librarySongs || librarySongs.length === 0) return null;
 
   return (
-    <ScrollButtons heading="From Your Library">
+    <ScrollButtons heading="From Your Library" id="FromYourLibrary">
       <div className="flex flex-row pb-28">
         {librarySongs.map((song, index) => (
           <div className="mr-20" key={index}>
diff --git a/apps/web/components/Home/ListenAgain.tsx b/apps/web/components/Home/ListenAgain.tsx
index 044373a3..4fbc3bc5 100644
--- a/apps/web/components/Home/ListenAgain.tsx
+++ b/apps/web/components/Home/ListenAgain.tsx
@@ -36,7 +36,7 @@ export default function ListenAgain({ genre }: ListenAgainProps) {
   return listenHistorySongs && (
     <>
       <PageGradient imageSrc={albumCoverSrc} />
-      <ScrollButtons heading="Listen Again" showUser>
+      <ScrollButtons heading="Listen Again" showUser id="ListenAgain">
         <div className="flex flex-row pb-28">
           {listenHistorySongs.map((item, index) => {
             if (item.item_type === "album") {
@@ -48,6 +48,7 @@ export default function ListenAgain({ genre }: ListenAgainProps) {
                     album_id={item.album_id}
                     album_name={item.album_name}
                     album_cover={item.album_cover ?? ""}
+                    album_songs_count={item.album_songs_count}
                     first_release_date={item.release_date}
                   />
                 </div>
diff --git a/apps/web/components/Home/MusicVideos.tsx b/apps/web/components/Home/MusicVideos.tsx
index 72e9d411..bbe9f1ba 100644
--- a/apps/web/components/Home/MusicVideos.tsx
+++ b/apps/web/components/Home/MusicVideos.tsx
@@ -46,7 +46,7 @@ export default function MusicVideos() {
   if (loading) return null;
 
   return songs && (
-    <ScrollButtons heading="Music Videos">
+    <ScrollButtons heading="Music Videos" id="MusicVideos">
       <div className="flex flex-row">
         {songs.map((song) => (
           <MusicVideoCard key={song.id} song={song} />
diff --git a/apps/web/components/Home/RandomSongs.tsx b/apps/web/components/Home/RandomSongs.tsx
index 70f02c68..1f518ab4 100644
--- a/apps/web/components/Home/RandomSongs.tsx
+++ b/apps/web/components/Home/RandomSongs.tsx
@@ -48,7 +48,7 @@ export default function RandomSongs({ genre }: RandomSongsProps) {
   if (!randomSongs || randomSongs.length === 0) return null;
 
   return (
-    <ScrollButtons heading="Random Selection">
+    <ScrollButtons heading="Random Selection" id="RandomSongs">
       <div className="flex flex-row pb-28">
         {randomSongs.map((song, index) => (
           <div className="mr-20" key={index}>
diff --git a/apps/web/components/Home/RecommendedAlbums.tsx b/apps/web/components/Home/RecommendedAlbums.tsx
index e3cd50b3..396f8722 100644
--- a/apps/web/components/Home/RecommendedAlbums.tsx
+++ b/apps/web/components/Home/RecommendedAlbums.tsx
@@ -71,7 +71,7 @@ export default function RecommendedAlbums({ genre }: RecommendedAlbumsProps) {
   if (!librarySongs || librarySongs.length === 0) return null;
 
   return (
-    <ScrollButtons heading="Recommended Albums">
+    <ScrollButtons heading="Recommended Albums" id="RecommendedAlbums">
       <div className="flex flex-row pb-28">
         {librarySongs.map((song, index) => (
           <div className="mr-20" key={index}>
@@ -79,6 +79,7 @@ export default function RecommendedAlbums({ genre }: RecommendedAlbumsProps) {
               album_cover={song.album_object.cover_url}
               album_id={song.album_object.id}
               album_name={song.album_object.name}
+              album_songs_count={song.album_object.songs.length}
               artist_id={song.artist_object.id}
               artist_name={song.artist}
               first_release_date={song.album_object.first_release_date}
diff --git a/apps/web/components/Home/ScrollButtons.tsx b/apps/web/components/Home/ScrollButtons.tsx
index 4860b8f3..a64d5967 100644
--- a/apps/web/components/Home/ScrollButtons.tsx
+++ b/apps/web/components/Home/ScrollButtons.tsx
@@ -1,13 +1,16 @@
-"use client"
+"use client";
 
 import getSession from '@/lib/Authentication/JWT/getSession';
 import { getProfilePicture } from '@music/sdk';
 import { ScrollArea, ScrollBar } from '@music/ui/components/scroll-area';
-import { ChevronLeft, ChevronRight } from 'lucide-react';
+import { ChevronLeft, ChevronRight, Ellipsis, Pin, Eye, EyeOff } from 'lucide-react';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import Image from 'next/image';
+import { Popover, PopoverContent, PopoverTrigger } from '@music/ui/components/popover';
+import { useLayoutConfig } from '../Providers/LayoutConfigContext';
 
 type ScrollButtonsProps = {
+  id?: string;
   children: React.ReactNode;
   heading: string;
   showUser?: boolean;
@@ -15,13 +18,14 @@ type ScrollButtonsProps = {
   imageUrl?: string;
 };
 
-export default function ScrollButtons({ children, heading, showUser, topText, imageUrl }: ScrollButtonsProps) {
+export default function ScrollButtons({ id, children, heading, showUser, topText, imageUrl }: ScrollButtonsProps) {
   const scrollRef = useRef<HTMLDivElement>(null);
   const [isAtStart, setIsAtStart] = useState(true);
   const [isAtEnd, setIsAtEnd] = useState(false);
   const [canScroll, setCanScroll] = useState(false);
   const [profilePicture, setProfilePicture] = useState<string | null>(null);
   const [username, setUsername] = useState<string | null>(null);
+  const { components, setComponents } = useLayoutConfig(); // Use the context
 
   const checkScrollPosition = useCallback(() => {
     if (scrollRef.current) {
@@ -34,7 +38,7 @@ export default function ScrollButtons({ children, heading, showUser, topText, im
 
   useEffect(() => {
     const fetchUserData = async () => {
-      const session = await getSession();
+      const session = getSession();
       const profilePictureBlob = await getProfilePicture(Number(session?.sub));
       const profilePictureUrl = URL.createObjectURL(profilePictureBlob);
       setProfilePicture(profilePictureUrl);
@@ -75,11 +79,30 @@ export default function ScrollButtons({ children, heading, showUser, topText, im
     }
   }, []);
 
+  const handlePinToggle = () => {
+    const updatedComponents = components.map((component) =>
+      component.id === id ? { ...component, pinned: !component.pinned } : component
+    );
+    const pinnedComponents = updatedComponents.filter((component) => component.pinned);
+    const unpinnedComponents = updatedComponents.filter((component) => !component.pinned);
+    const newComponents = [...pinnedComponents, ...unpinnedComponents];
+    setComponents(newComponents);
+  };
+
+  const handleVisibilityToggle = () => {
+    const updatedComponents = components.map((component) =>
+      component.id === id ? { ...component, visible: !component.visible } : component
+    );
+    setComponents(updatedComponents);
+  };
+
+  const currentComponent = components.find((component) => component.id === id);
+
   return (
     <>
       <div className="flex flex-row gap-4 justify-between items-end pb-4 mr-8">
         <div className="flex flex-row items-center">
-          { (showUser || imageUrl) && 
+          {(showUser || imageUrl) && 
             <Image
               src={showUser && profilePicture ? profilePicture : imageUrl ?? ""}
               alt="Profile"
@@ -98,29 +121,42 @@ export default function ScrollButtons({ children, heading, showUser, topText, im
           </div>
         </div>
         <div className="flex flex-row gap-4 items-center">
-          {false ? (
-            <button
-              className="border border-[#4a4a4a] rounded-full px-3 py-1 text-base"
-              onClick={showAll}
-            >
-              More
-            </button>
-          ) : (
-            <div className="w-[75px] h-[32px]"></div>
+          {id && (
+            <Popover>
+              <PopoverTrigger asChild>
+                <button className="border border-[#4a4a4a] rounded-full w-8 h-8 flex items-center justify-center">
+                  <Ellipsis className="w-4 h-4" />
+                </button>
+              </PopoverTrigger>
+              <PopoverContent className="text-white bg-gray-800 bg-opacity-30 backdrop-filter backdrop-blur-lg border border-gray-700 shadow-lg rounded-lg p-4">
+                <div className="flex flex-col gap-2">
+                  <button
+                    className={`flex items-center gap-2 ${currentComponent?.pinned ? 'text-purple-400' : ''}`}
+                    onClick={handlePinToggle}
+                  >
+                    <Pin className="w-4 h-4" />
+                    {currentComponent?.pinned ? 'Unpin from Home' : 'Pin to Home'}
+                  </button>
+                  <button
+                    className={`flex items-center gap-2 ${currentComponent?.visible ? '' : 'bg-purple-400'}`}
+                    onClick={handleVisibilityToggle}
+                  >
+                    {currentComponent?.visible ? <Eye className="w-4 h-4" /> : <EyeOff className="w-4 h-4" />}
+                    {currentComponent?.visible ? 'Hide this section' : 'Show this section'}
+                  </button>
+                </div>
+              </PopoverContent>
+            </Popover>
           )}
           <button
-            className={`border border-[#4a4a4a] rounded-full w-8 h-8 flex items-center justify-center ${
-              isAtStart ? 'brightness-50 pointer-events-none' : ''
-            }`}
+            className={`border border-[#4a4a4a] rounded-full w-8 h-8 flex items-center justify-center ${isAtStart ? 'brightness-50 pointer-events-none' : ''}`}
             onClick={scrollLeft}
             disabled={isAtStart}
           >
             <ChevronLeft className="w-4 h-4" />
           </button>
           <button
-            className={`border border-[#4a4a4a] rounded-full w-8 h-8 flex items-center justify-center ${
-              isAtEnd ? 'brightness-50 pointer-events-none' : ''
-            }`}
+            className={`border border-[#4a4a4a] rounded-full w-8 h-8 flex items-center justify-center ${isAtEnd ? 'brightness-50 pointer-events-none' : ''}`}
             onClick={scrollRight}
             disabled={isAtEnd}
           >
@@ -135,4 +171,4 @@ export default function ScrollButtons({ children, heading, showUser, topText, im
       </ScrollArea>
     </>
   );
-};
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/apps/web/components/Home/SimilarTo.tsx b/apps/web/components/Home/SimilarTo.tsx
index d3604b07..1dc03ea0 100644
--- a/apps/web/components/Home/SimilarTo.tsx
+++ b/apps/web/components/Home/SimilarTo.tsx
@@ -47,7 +47,7 @@ export default function SimilarTo() {
   return similarAlbums.length !== 0 && (
     <>
       <PageGradient imageSrc={albumCoverSrc} />
-      <ScrollButtons heading={capitalizeWords(genre ?? "")} topText="SIMILAR TO" imageUrl={albumCoverSrc}>
+      <ScrollButtons heading={capitalizeWords(genre ?? "")} topText="SIMILAR TO" imageUrl={albumCoverSrc} id="SimilarTo">
         <div className="w-full h-full">
           <div className="grid grid-flow-col grid-rows-2 gap-2 w-full h-full">
             {similarAlbums.map((album, index) => (
@@ -58,6 +58,7 @@ export default function SimilarTo() {
                   album_id={album.album_id}
                   album_name={album.album_name}
                   album_cover={album.album_cover}
+                  album_songs_count={album.album_songs_count}
                   first_release_date={album.first_release_date}
                 />
               </div>
diff --git a/apps/web/components/Layout/CustomiseFeed.tsx b/apps/web/components/Layout/CustomiseFeed.tsx
new file mode 100644
index 00000000..66fe454b
--- /dev/null
+++ b/apps/web/components/Layout/CustomiseFeed.tsx
@@ -0,0 +1,105 @@
+"use client";
+
+import { useState, useEffect } from "react";
+import { Popover, PopoverContent, PopoverTrigger } from "@music/ui/components/popover";
+import { Eye, EyeOff, LayoutDashboard, Pin } from "lucide-react";
+import { Sortable, SortableDragHandle, SortableItem } from "@music/ui/components/sortable";
+import { DragHandleDots2Icon } from "@radix-ui/react-icons";
+import { arrayMove } from "@dnd-kit/sortable";
+import { useLayoutConfig } from "../Providers/LayoutConfigContext";
+import { Separator } from "@music/ui/components/separator";
+
+export default function CustomiseFeed() {
+  const { components, setComponents } = useLayoutConfig();
+
+  const handleVisibilityToggle = (id: string) => {
+    setComponents((prevComponents) => {
+      const newComponents = prevComponents.map((component) =>
+        component.id === id ? { ...component, visible: !component.visible } : component
+      );
+      saveConfig(newComponents);
+      return newComponents;
+    });
+  };
+
+  const handlePinToggle = (id: string) => {
+    setComponents((prevComponents) => {
+      const updatedComponents = prevComponents.map((component) =>
+        component.id === id ? { ...component, pinned: !component.pinned } : component
+      );
+      const pinnedComponents = updatedComponents.filter((component) => component.pinned);
+      const unpinnedComponents = updatedComponents.filter((component) => !component.pinned);
+      const newComponents = [...pinnedComponents, ...unpinnedComponents];
+      saveConfig(newComponents);
+      return newComponents;
+    });
+  };
+
+  const handleMove = ({ activeIndex, overIndex }: { activeIndex: number, overIndex: number }) => {
+    setComponents((prevComponents) => {
+      const newComponents = arrayMove(prevComponents, activeIndex, overIndex);
+      saveConfig(newComponents);
+      return newComponents;
+    });
+  };
+
+  const saveConfig = (newComponents = components) => {
+    localStorage.setItem("layoutConfig", JSON.stringify(newComponents));
+  };
+
+  return (
+    <Popover>
+      <PopoverTrigger asChild>
+        <LayoutDashboard  className="hover:text-gray-500 duration-150 transition-colors"/>
+      </PopoverTrigger>
+      <PopoverContent className="w-80 text-white bg-gray-800 bg-opacity-30 backdrop-filter backdrop-blur-lg border border-gray-700">
+        <h1 className="pb-2">Customise Feed</h1>
+        <Separator className="bg-white"/>
+
+        <div className="pt-8"/>
+
+        <Sortable
+          value={components}
+          onMove={handleMove}
+          overlay={
+            <div className="grid grid-cols-[1fr,auto] items-center gap-2">
+              <div className="h-8 w-full rounded-sm bg-primary/10" />
+              <div className="size-8 shrink-0 rounded-sm bg-primary/10" />
+            </div>
+          }
+        >
+          <div className="flex w-full flex-col gap-2">
+            {components.map((component) => (
+              <SortableItem key={component.id} value={component.id} asChild>
+                <div className="flex items-center justify-between">
+                  <div className="flex items-center">
+                    <button onClick={() => handlePinToggle(component.id)} className="mr-2">
+                      <Pin className={component.pinned ? "text-purple-400" : "text-gray-500"} />
+                    </button>
+                    <span className="ml-2">{component.name}</span>
+                  </div>
+                  <div className="flex items-center">
+                    <SortableDragHandle
+                      size="icon"
+                      className="size-8 shrink-0 mr-2 bg-transparent"
+                    >
+                      <DragHandleDots2Icon
+                        className="size-4"
+                        aria-hidden="true"
+                      />
+                    </SortableDragHandle>
+                    {component.visible ? (
+                      <Eye onClick={() => handleVisibilityToggle(component.id)} />
+                    ) : (
+                      <EyeOff onClick={() => handleVisibilityToggle(component.id)} />
+                    )}
+                  </div>
+                </div>
+              </SortableItem>
+            ))}
+          </div>
+        </Sortable>
+      </PopoverContent>
+    </Popover>
+  );
+}
\ No newline at end of file
diff --git a/apps/web/components/Layout/GenreButtons.tsx b/apps/web/components/Layout/GenreButtons.tsx
index 8393e5f9..89a86f71 100644
--- a/apps/web/components/Layout/GenreButtons.tsx
+++ b/apps/web/components/Layout/GenreButtons.tsx
@@ -36,7 +36,7 @@ export default function GenreButtons({ children }: GenreButtonsProps) {
 
   return (
     <>
-      <ScrollArea className="w-full whitespace-nowrap rounded-md pb-10">
+      <ScrollArea className="w-5/6 whitespace-nowrap rounded-md pb-10">
         <div className="flex w-max space-x-4 p-4">
           {genres.map((genre, index) => (
             <button
diff --git a/apps/web/components/Layout/LibraryButtons.tsx b/apps/web/components/Layout/LibraryButtons.tsx
index b237643d..75553e71 100644
--- a/apps/web/components/Layout/LibraryButtons.tsx
+++ b/apps/web/components/Layout/LibraryButtons.tsx
@@ -135,6 +135,7 @@ export default function LibraryButtons() {
                     album_id={album.id}
                     album_name={album.name}
                     album_cover={album.cover_url}
+                    album_songs_count={album.songs.length}
                     first_release_date={album.first_release_date}
                   />
                 </div>
@@ -180,6 +181,7 @@ export default function LibraryButtons() {
                   album_id={item.data.album_object.id}
                   album_name={item.data.album_object.name}
                   album_cover={item.data.album_object.cover_url}
+                  album_songs_count={item.data.album_object.songs.length}
                   first_release_date={item.data.album_object.first_release_date}
                 />              
               ) : item.data && <ArtistCard artist={item.data.artist_object} />
diff --git a/apps/web/components/Layout/Playlists.tsx b/apps/web/components/Layout/Playlists.tsx
index 4110dd87..9d22dacb 100644
--- a/apps/web/components/Layout/Playlists.tsx
+++ b/apps/web/components/Layout/Playlists.tsx
@@ -8,6 +8,7 @@ import { ListMusic, Plus } from "lucide-react";
 import Link from "next/link";
 import { useEffect, useState } from "react";
 import CreatePlaylistDialog from "../Music/Playlist/CreatePlaylistDialog";
+import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@music/ui/components/accordion"
 
 interface Playlist extends OriginalPlaylist {
   users: string[];
@@ -46,17 +47,26 @@ export default function Playlists() {
 
   return (
     <div>
-      <h3 className="font-heading text-white font-semibold text-xl">Playlists</h3>
-      {playlists?.map(playlist => (
-        <div className="pl-5 text-sm flex flex-row items-center gap-3 py-2 " key={playlist.id}>
-          <ListMusic className="size-4"/>
-          <Link href={"/playlist?id=" + playlist.id} key={playlist.id}>
-            <p className="text-sm" key={playlist.id}>{playlist.name}</p>
-            <p className="text-xs font-thin">Playlist • {playlist.users.join(", ")}</p>
-          </Link>
-        </div>
-      ))}
-   
+      <Accordion type="single" collapsible>
+        <AccordionItem value="playlists">
+          <AccordionTrigger className="font-heading text-white font-semibold text-sm">
+            <ListMusic className="h-6 w-6 ml-4 mr-4" />
+            Playlists
+          </AccordionTrigger>
+          <AccordionContent>
+            {playlists?.map(playlist => (
+              <div className="pl-5 text-sm flex flex-row items-center gap-3 py-2" key={playlist.id}>
+                <ListMusic className="size-4" />
+                <Link href={"/playlist?id=" + playlist.id} key={playlist.id}>
+                  <p className="text-sm" key={playlist.id}>{playlist.name}</p>
+                  <p className="text-xs font-thin">Playlist • {playlist.users.join(", ")}</p>
+                </Link>
+              </div>
+            ))}
+          </AccordionContent>
+        </AccordionItem>
+      </Accordion>
+
       <div className="mt-6 flex justify-center">
         <CreatePlaylistDialog>
           <Button style={{ backgroundColor: "#353535" }}>
@@ -66,5 +76,5 @@ export default function Playlists() {
         </CreatePlaylistDialog>
       </div>
     </div>
-  )
+  );
 }
\ No newline at end of file
diff --git a/apps/web/components/Music/Card/Album/AlbumCard.tsx b/apps/web/components/Music/Card/Album/AlbumCard.tsx
index 12454735..cfdd6013 100644
--- a/apps/web/components/Music/Card/Album/AlbumCard.tsx
+++ b/apps/web/components/Music/Card/Album/AlbumCard.tsx
@@ -5,6 +5,7 @@ import getBaseURL from "@/lib/Server/getBaseURL";
 import { FastAverageColor } from "fast-average-color";
 import Image from "next/image";
 import Link from "next/link";
+import { useState, useEffect } from "react";
 
 type AlbumCardProps = {
   artist_id: string;
@@ -12,6 +13,7 @@ type AlbumCardProps = {
   album_id: string;
   album_name: string;
   album_cover: string;
+  album_songs_count: number;
   first_release_date: string;
 };
 
@@ -21,29 +23,46 @@ export default function AlbumCard({
   album_id,
   album_name,
   album_cover,
+  album_songs_count,
   first_release_date,
 }: AlbumCardProps) {
   const albumCoverURL = (!album_cover || album_cover.length === 0) ? "/snf.png" : `${getBaseURL()}/image/${encodeURIComponent(album_cover)}`;
   let releaseDate = new Date(first_release_date).toLocaleString('default', { year: 'numeric' });
 
   const { setGradient } = useGradientHover();
+  const [dominantColor, setDominantColor] = useState<string | null>(null);
 
-  function setDominantGradient() {
+  useEffect(() => {
     const fac = new FastAverageColor();
     const getColor = async () => {
       const color = await fac.getColorAsync(albumCoverURL);
-      setGradient(color.hex);
+      setDominantColor(color.hex);
     };
     getColor();
+  }, [albumCoverURL]);
+
+  function handleMouseEnter() {
+    if (dominantColor) {
+      setGradient(dominantColor);
+    }
   }
 
   return (
-    <div className="w-44 h-44" onMouseEnter={setDominantGradient}>
+    <div className="w-44 h-44 relative group" onMouseEnter={handleMouseEnter}>
+      {dominantColor && (
+        <div
+          className="relative top-0 w-11/12 justify-center h-2 rounded-t-lg z-10 group-hover:brightness-50 duration-300 transition-filter"
+          style={{ backgroundColor: dominantColor, margin: '0 auto', marginBottom: '2px' }}
+        />
+      )}
       <Link href={`/album?id=${album_id}`}>
-        <Image src={albumCoverURL} alt={`${album_name} Image`} height={256} width={256} className="rounded cursor-pointer transition-filter duration-300 hover:brightness-50 object-fill w-full h-full" />
-        <p className="mt-3 font-bold text-white overflow-hidden text-ellipsis" title={album_name}>{album_name}</p>
+        <Image src={albumCoverURL} alt={`${album_name} Image`} height={256} width={256} className="rounded cursor-pointer transition-filter duration-300 group-hover:brightness-50 object-fill w-full h-40" style={{ height: "167px" }}/>
+        <div className="mt-3 font-bold text-white flex justify-between overflow-hidden">
+          <p className="overflow-hidden text-ellipsis whitespace-nowrap" title={album_name}>{album_name}</p>
+          <p className="ml-2 font-light text-gray-400 whitespace-nowrap">{album_songs_count}</p>
+        </div>
       </Link>
-
+  
       <Link href={`/artist?id=${artist_id}`}>
         <p className="text-gray-400">
           {artist_name} • {releaseDate}
diff --git a/apps/web/components/Music/Card/Search/TopResultsCard.tsx b/apps/web/components/Music/Card/Search/TopResultsCard.tsx
index 52256154..83cc7c37 100644
--- a/apps/web/components/Music/Card/Search/TopResultsCard.tsx
+++ b/apps/web/components/Music/Card/Search/TopResultsCard.tsx
@@ -137,6 +137,7 @@ const coverUrl = result.item_type === "song"
               album_id={album.id}
               album_name={album.name}
               album_cover={album.cover_url}
+              album_songs_count={album.songs.length}
               first_release_date={album.first_release_date}
             />
           </div>
diff --git a/apps/web/components/Music/Player.tsx b/apps/web/components/Music/Player.tsx
index 5e7a8d95..6acd6a01 100644
--- a/apps/web/components/Music/Player.tsx
+++ b/apps/web/components/Music/Player.tsx
@@ -1,5 +1,7 @@
 "use client";
 
+import React, { useState, useEffect, useRef, useContext } from "react";
+import * as Tone from "tone";
 import getSession from "@/lib/Authentication/JWT/getSession";
 import getBaseURL from "@/lib/Server/getBaseURL";
 import {
@@ -8,11 +10,11 @@ import {
   SliderThumb,
   SliderTrack,
 } from "@music/ui/components/slider";
+import { Popover, PopoverContent, PopoverTrigger } from "@music/ui/components/popover";
 import { FastAverageColor } from "fast-average-color";
 import { AudioLines, BookAudioIcon, MicVocal, SkipBack, SkipForward, Volume2, VolumeX } from "lucide-react";
 import Image from "next/image";
 import Link from "next/link";
-import { useContext, useEffect, useRef, useState } from "react";
 import { AIContext } from "../AI/AIOverlayContext";
 import ArrowPath from "../Icons/ArrowPath";
 import IconQueue from "../Icons/IconQueue";
@@ -24,10 +26,10 @@ import { useReverb } from "../Providers/SlowedReverbProvider";
 import { usePlayer } from "./Player/usePlayer";
 import VideoPlayerDialog from "./Player/VideoPlayerDialog";
 import { PanelContext } from "./Queue/QueuePanelContext";
+import { Input } from "@music/ui/components/input";
+import { Label } from "@radix-ui/react-label";
 
 export default function Player() {
-  const audioRef = useRef<HTMLAudioElement | null>(null);
-
   const [liked, setLiked] = useState(false);
   const { reverb, setReverb } = useReverb();
 
@@ -65,16 +67,18 @@ export default function Player() {
   const [isReverbClicked, setIsReverbClicked] = useState(false);
   const [isSpeakerHovered, setIsSpeakerHovered] = useState(false);
 
-  const formatTime = (time: number) => {
-    const minutes = Math.floor(time / 60);
-    const seconds = Math.floor(time % 60);
-    return `${minutes}:${seconds < 10 ? "0" : ""}${seconds}`;
-  };
+  const [slowed, setSlowed] = useState(1);
+  const [reverbEffectValue, setReverbEffectValue] = useState(0);
+  const [pitch, setPitch] = useState(0);
+  const player = useRef<Tone.Player | null>(null);
+  const reverbEffect = useRef<Tone.Reverb | null>(null);
+  const pitchShift = useRef<Tone.PitchShift | null>(null);
+  const [isLoaded, setIsLoaded] = useState(false);
 
   useEffect(() => {
-    if (isPlaying) document.title = `${song.name} | ParsonLabs Music`;
-    if (!isPlaying) document.title = `ParsonLabs Music`;
-  }, [song, artist, isPlaying]);
+    reverbEffect.current = new Tone.Reverb().toDestination();
+    pitchShift.current = new Tone.PitchShift().toDestination();
+  }, []);
 
   useEffect(() => {
     const session = getSession();
@@ -82,23 +86,110 @@ export default function Player() {
     if (reverb) {
       songURL += "&slowed_reverb=true";
     }
-    setAudioSource(songURL);
+
+    setAudioSource(songURL)    
+    // player.current = new Tone.Player({
+    //   url: songURL,
+    //   onload: () => {
+    //     player.current?.connect(pitchShift.current!);
+    //     pitchShift.current?.connect(reverbEffect.current!);
+    //     setIsLoaded(true);
+    //     console.log('Player loaded');
+    //   },
+    //   onerror: (error) => {
+    //     console.error('Error loading player:', error);
+    //   }
+    // }).toDestination();
   }, [reverb, song, setAudioSource]);
 
+  const handleFileUpload = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const file = event.target.files?.[0];
+    if (file) {
+      const url = URL.createObjectURL(file);
+      player.current = new Tone.Player({
+        url,
+        onload: () => {
+          setIsLoaded(true);
+          console.log('File loaded');
+        },
+        onerror: (error) => {
+          console.error('Error loading file:', error);
+        }
+      }).connect(pitchShift.current!);
+      pitchShift.current?.connect(reverbEffect.current!);
+    }
+  };
+
+  const handleSlowedChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const value = parseFloat(event.target.value);
+    setSlowed(value);
+    if (player.current) {
+      player.current.playbackRate = value;
+    }
+  };
+
+  const handleReverbChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const value = parseFloat(event.target.value);
+    setReverbEffectValue(value);
+    if (reverbEffect.current) {
+      reverbEffect.current.decay = value;
+    }
+  };
+
+  const handlePitchChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const value = parseFloat(event.target.value);
+    setPitch(value);
+    if (pitchShift.current) {
+      pitchShift.current.pitch = value;
+    }
+  };
+
+  const handleClick = () => {
+    console.log('handleClick called');
+    if (Tone.context.state !== 'running') {
+      Tone.context.resume();
+    }
+    if (player.current) {
+      console.log('Player is initialized');
+      if (isLoaded) {
+        console.log('Player is loaded');
+        if (player.current.state !== 'started') {
+          console.log('Starting player');
+          player.current.start();
+        } else {
+          console.log('Stopping player');
+          player.current.stop();
+        }
+      } else {
+        console.log('Player is not loaded yet');
+      }
+    } else {
+      console.log('Player is not initialized');
+    }
+  };
+
   const debounce = (func: Function, wait: number) => {
     let timeout: NodeJS.Timeout;
     return (...args: any[]) => {
       clearTimeout(timeout);
       timeout = setTimeout(() => func(...args), wait);
     };
-  };
+  }
 
   const debouncedTogglePlayPause = debounce(togglePlayPause, 300);
+
+  const formatTime = (time: number) => {
+    const minutes = Math.floor(time / 60);
+    const seconds = Math.floor(time % 60);
+    return `${minutes}:${seconds < 10 ? "0" : ""}${seconds}`;
+  };
+
   return song.id && (
     <footer className="z-50 fixed bottom-0 border-t border-gray-800 px-3 py-3 flex flex-col md:flex-row items-center justify-between md:gap-4 w-full" 
       style={{ 
         backgroundColor: "#212121",
         transition: 'background-color 0.5s ease',
+        height: "100px"
       }}>
       <Image
         className="bg-cover bg-center blur-3xl"
@@ -142,7 +233,7 @@ export default function Player() {
         </div>
         <div className="flex items-center justify-between w-full">
           <div className="flex items-center gap-3">
-            <div className="w-24 h-12 md:w-20 md:h-20 bg-gray-500 rounded-md">
+            <div className="w-full h-12 md:w-20 md:h-20 bg-gray-500 rounded-md">
               <Image
                 alt={song.name + "Image"}
                 src={imageSrc}
@@ -151,15 +242,20 @@ export default function Player() {
                 className="w-full h-full object-fill rounded"
               />
             </div>
-            <div className="w-32 md:overflow-hidden">
+            <div className="w-80 md:overflow-hidden">
               <p
                 className={`${song.name.length > 30 && "whitespace-nowrap"} ${song.name.length > 30 ? "md:animate-marquee" : ""}`}
                 title={song.name.length > 30 ? song.name : ""}
               >
-                <Link href={`/album?id={album.id}`}>{song.name}</Link>
+                <Link href={`/album?id=${album.id}`}>{song.name}</Link>
               </p>
               <p className="text-xs text-gray-400">
-                <Link href={`/artist?id={artist.id}`}>{artist.name}</Link>
+                <Link href={`/artist?id=${artist.id}`}>{artist.name}</Link>
+                {song.contributing_artists.map((artist, index) => (
+                  <span key={index}>
+                    , <Link href={`/artist?id=${song.contributing_artist_ids[index]}`}>{artist}</Link>
+                  </span>
+                ))}
               </p>
             </div>
           </div>
@@ -228,7 +324,7 @@ export default function Player() {
           </button>
         )}
   
-                <button
+        <button
           onClick={() => {
             togglePanel();
             setIsQueueClicked(!isQueueClicked);
@@ -236,14 +332,69 @@ export default function Player() {
         >
           <IconQueue color={isQueueClicked ? 'white' : 'gray'} />
         </button>
-        <button
-          onClick={() => {
-            setReverb(!reverb);
-            setIsReverbClicked(!isReverbClicked);
-          }}
-        >
-          <AudioLines color={isReverbClicked ? 'white' : 'gray'} />
-        </button>
+        {/* <Popover> */}
+          {/* <PopoverTrigger asChild> */}
+            <button
+              onClick={() => {
+                setReverb(!reverb)
+                setIsReverbClicked(!isReverbClicked);
+              }}
+            >
+              <AudioLines color={isReverbClicked ? 'white' : 'gray'} />
+            </button>
+          {/* </PopoverTrigger> */}
+          {/* <PopoverContent className="w-80"> */}
+            {/* <div className="grid gap-4">
+              <div className="space-y-2">
+                <h4 className="font-medium leading-none">Audio Effects</h4>
+                <p className="text-sm text-muted-foreground">
+                  Adjust the audio effects for the current track.
+                </p>
+              </div>
+              <div className="grid gap-2">
+                <div className="grid grid-cols-3 items-center gap-4">
+                  <Label htmlFor="slowed">Slowed</Label>
+                  <Input
+                    id="slowed"
+                    type="range"
+                    min="0.5"
+                    max="2"
+                    step="0.1"
+                    value={slowed}
+                    onInput={handleSlowedChange}
+                    className="col-span-2 h-8"
+                  />
+                </div>
+                <div className="grid grid-cols-3 items-center gap-4">
+                  <Label htmlFor="reverb">Reverb</Label>
+                  <Input
+                    id="reverb"
+                    type="range"
+                    min="0"
+                    max="10"
+                    step="0.1"
+                    value={reverbEffectValue}
+                    onInput={handleReverbChange}
+                    className="col-span-2 h-8"
+                  />
+                </div>
+                <div className="grid grid-cols-3 items-center gap-4">
+                  <Label htmlFor="pitch">Pitch</Label>
+                  <Input
+                    id="pitch"
+                    type="range"
+                    min="-12"
+                    max="12"
+                    step="1"
+                    value={pitch}
+                    onInput={handlePitchChange}
+                    className="col-span-2 h-8"
+                  />
+                </div>
+              </div>
+            </div>
+          </PopoverContent>
+        </Popover> */}
         <div className="flex items-center gap-1">
           <button
             onClick={() => toggleMute()}
@@ -272,7 +423,6 @@ export default function Player() {
           </Slider>
         </div>
       </section>
-      <audio ref={audioRef} onTimeUpdate={() => handleTimeUpdate()} />
     </footer>
   );
 }
\ No newline at end of file
diff --git a/apps/web/components/Providers/LayoutConfigContext.tsx b/apps/web/components/Providers/LayoutConfigContext.tsx
new file mode 100644
index 00000000..ac8962a5
--- /dev/null
+++ b/apps/web/components/Providers/LayoutConfigContext.tsx
@@ -0,0 +1,64 @@
+"use client"
+
+import React, { createContext, useContext, useState, useEffect } from 'react';
+
+type ComponentConfig = {
+  id: string;
+  name: string;
+  visible: boolean;
+  pinned: boolean;
+};
+
+type LayoutConfigContextType = {
+  components: ComponentConfig[];
+  setComponents: React.Dispatch<React.SetStateAction<ComponentConfig[]>>;
+};
+
+const LayoutConfigContext = createContext<LayoutConfigContextType | undefined>(undefined);
+
+export const LayoutConfigProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
+  const [components, setComponents] = useState<ComponentConfig[]>([
+    { id: "LandingCarousel", name: "Landing Carousel", visible: true, pinned: false },
+    { id: "ListenAgain", name: "Listen Again", visible: true, pinned: false },
+    { id: "SimilarTo", name: "Similar To", visible: true, pinned: false },
+    { id: "RecommendedAlbums", name: "Recommended Albums", visible: true, pinned: false },
+    { id: "RandomSongs", name: "Random Songs", visible: true, pinned: false },
+    { id: "FromYourLibrary", name: "From Your Library", visible: true, pinned: false },
+    { id: "MusicVideos", name: "Music Videos", visible: true, pinned: false },
+  ]);
+
+  useEffect(() => {
+    const savedConfig = localStorage.getItem("layoutConfig");
+    if (savedConfig) {
+      setComponents(JSON.parse(savedConfig));
+    } else {
+      setComponents([
+        { id: "LandingCarousel", name: "Landing Carousel", visible: true, pinned: false },
+        { id: "ListenAgain", name: "Listen Again", visible: true, pinned: false },
+        { id: "SimilarTo", name: "Similar To", visible: true, pinned: false },
+        { id: "RecommendedAlbums", name: "Recommended Albums", visible: true, pinned: false },
+        { id: "RandomSongs", name: "Random Songs", visible: true, pinned: false },
+        { id: "FromYourLibrary", name: "From Your Library", visible: true, pinned: false },
+        { id: "MusicVideos", name: "Music Videos", visible: true, pinned: false },
+      ]);
+    }
+  }, []);
+
+  useEffect(() => {
+    localStorage.setItem("layoutConfig", JSON.stringify(components));
+  }, [components]);
+
+  return (
+    <LayoutConfigContext.Provider value={{ components, setComponents }}>
+      {children}
+    </LayoutConfigContext.Provider>
+  );
+};
+
+export const useLayoutConfig = () => {
+  const context = useContext(LayoutConfigContext);
+  if (!context) {
+    throw new Error('useLayoutConfig must be used within a LayoutConfigProvider');
+  }
+  return context;
+};
\ No newline at end of file
diff --git a/apps/web/components/Providers/Providers.tsx b/apps/web/components/Providers/Providers.tsx
index 5331e165..3a3841a8 100644
--- a/apps/web/components/Providers/Providers.tsx
+++ b/apps/web/components/Providers/Providers.tsx
@@ -8,6 +8,7 @@ import { ScrollProvider } from './ScrollProvider';
 import SidebarProvider from './SideBarProvider';
 import { ThemeProvider } from './ThemeProvider';
 import { SlowedReverbProvider } from './SlowedReverbProvider';
+import { LayoutConfigProvider } from './LayoutConfigContext';
 
 interface ProvidersProps {
   children: ReactNode;
@@ -16,23 +17,25 @@ interface ProvidersProps {
 export default function Providers({ children }: ProvidersProps) {
   return (
     <ThemeProvider>
-      <GradientHoverProvider>
-        <ScrollProvider>
-          <SidebarProvider>
-            <SlowedReverbProvider>
-              <PlayerProvider>
-                <PanelProvider>
-                  <LyricsOverlayProvider>
-                    <AIOverlayProvider>
-                      {children}
-                    </AIOverlayProvider>
-                  </LyricsOverlayProvider>
-                </PanelProvider>
-              </PlayerProvider>
-            </SlowedReverbProvider>
-          </SidebarProvider>
-        </ScrollProvider>
-      </GradientHoverProvider>
+      <LayoutConfigProvider>
+        <GradientHoverProvider>
+          <ScrollProvider>
+            <SidebarProvider>
+              <SlowedReverbProvider>
+                <PlayerProvider>
+                  <PanelProvider>
+                    <LyricsOverlayProvider>
+                      <AIOverlayProvider>
+                        {children}
+                      </AIOverlayProvider>
+                    </LyricsOverlayProvider>
+                  </PanelProvider>
+                </PlayerProvider>
+              </SlowedReverbProvider>
+            </SidebarProvider>
+          </ScrollProvider>
+        </GradientHoverProvider>
+      </LayoutConfigProvider>
     </ThemeProvider>
   );
 }
\ No newline at end of file
diff --git a/apps/web/package.json b/apps/web/package.json
index 9484e33a..ce448b74 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -6,8 +6,8 @@
   "author": "ParsonLabs",
   "scripts": {
     "dev": "next dev",
-    "electron": "cross-env NEXT_PUBLIC_BASE_URL=http://localhost:3001 concurrently -n \"NEXT,ELECTRON\" -c \"yellow,blue\" --kill-others \"next dev\" \"electron .\"",
-    "electron-build": "cross-env NEXT_PUBLIC_BASE_URL=http://localhost:3001 next build && electron-builder",
+    "electron": "concurrently -n \"NEXT,ELECTRON\" -c \"yellow,blue\" --kill-others \"next dev\" \"electron .\"",
+    "electron-build": "next build && electron-builder",
     "tauri": "tauri dev",
     "tauri-build": "tauri build",
     "type-check": "tsc --pretty --noEmit",
@@ -23,9 +23,7 @@
     "@radix-ui/react-context-menu": "^2.2.1",
     "@radix-ui/react-dialog": "^1.1.1",
     "@radix-ui/react-label": "^2.1.0",
-    "@radix-ui/react-slider": "^1.2.0",
-    "@radix-ui/react-slot": "^1.1.0",
-    "@types/crypto-js": "^4.2.2",
+    "@dnd-kit/sortable": "8.0.0",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "crypto-js": "^4.2.0",
@@ -42,6 +40,7 @@
     "react-hook-form": "^7.52.1",
     "react-tweet": "3.2.1",
     "jwt-decode": "4.0.0",
+    "tone": "15.0.4",
     "electron-serve": "2.0.0",
     "sharp": "^0.32.6",
     "sonner": "^1.5.0",
diff --git a/crates/backend/src/routes/web.rs b/crates/backend/src/routes/web.rs
index 615320fc..94307f2e 100644
--- a/crates/backend/src/routes/web.rs
+++ b/crates/backend/src/routes/web.rs
@@ -23,6 +23,7 @@ struct SongInfo {
     album_id: String,
     album_name: String,
     album_cover: String,
+    album_songs_count: usize,
     release_date: String,
     item_type: String,
 }
@@ -34,6 +35,7 @@ struct AlbumCardProps {
     album_id: String,
     album_name: String,
     album_cover: String,
+    album_songs_count: usize,
     first_release_date: String,
 }
 
@@ -54,6 +56,7 @@ async fn find_song_info_min(song_id: String) -> Result<SongInfo, ()> {
                         album_name: album.name.clone(),
                         album_cover: album.cover_url.clone(),
                         release_date: album.first_release_date.clone(),
+                        album_songs_count: album.songs.len().clone(),
                         item_type: "song".to_string(),
                     });
                 }
@@ -112,6 +115,7 @@ async fn fetch_listen_history_songs(user_id: u32) -> Result<Vec<SongInfo>, ()> {
                 album_id: album_id.clone(),
                 album_name: songs[0].album_name.clone(),
                 album_cover: songs[0].album_cover.clone(),
+                album_songs_count: songs[0].album_songs_count.clone(),
                 release_date: songs[0].release_date.clone(),
                 item_type: "album".to_string(),
             });
@@ -165,6 +169,7 @@ async fn fetch_similar_albums(user_id: u32) -> Result<(Vec<AlbumCardProps>, Stri
             album_id: album.id,
             album_name: album.name,
             album_cover: album.cover_url,
+            album_songs_count: album.songs.len(),
             first_release_date: album.first_release_date,
         }
     }).collect();
diff --git a/packages/music-sdk/src/lib/web.ts b/packages/music-sdk/src/lib/web.ts
index ab8d2f53..3b45224e 100644
--- a/packages/music-sdk/src/lib/web.ts
+++ b/packages/music-sdk/src/lib/web.ts
@@ -9,6 +9,7 @@ export interface SongInfo {
   album_id: string;
   album_name: string;
   album_cover: string;
+  album_songs_count: number;
   release_date: string;
   item_type: 'song' | 'album';
 }
@@ -19,6 +20,7 @@ export interface AlbumCardProps {
   album_id: string;
   album_name: string;
   album_cover: string;
+  album_songs_count: number,
   first_release_date: string;
 }
 
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 7db15fba..3f351c57 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -34,10 +34,16 @@
     "@tanstack/react-table": "8.17.3",
     "@radix-ui/react-navigation-menu": "^1.1.4",
     "@radix-ui/react-slider": "1.2.0",
+    "@radix-ui/react-popover": "1.1.1",
     "@radix-ui/react-scroll-area": "^1.0.5",
     "@radix-ui/react-checkbox": "1.1.1",
     "@radix-ui/react-collapsible": "1.1.0",
     "@radix-ui/react-tooltip": "^1.0.7",
+    "@radix-ui/react-accordion": "1.2.0",
+    "@dnd-kit/core": "6.1.0",
+    "@dnd-kit/modifiers": "7.0.0",
+    "@dnd-kit/sortable": "8.0.0",
+    "@dnd-kit/utilities": "3.2.2",
     "react-resizable-panels": "^2.0.19"
   }
 }
diff --git a/packages/ui/src/components/accordion.tsx b/packages/ui/src/components/accordion.tsx
new file mode 100644
index 00000000..417c96c5
--- /dev/null
+++ b/packages/ui/src/components/accordion.tsx
@@ -0,0 +1,60 @@
+"use client"
+
+import * as React from "react"
+import * as AccordionPrimitive from "@radix-ui/react-accordion"
+import { ChevronDown } from "lucide-react"
+
+import { cn } from "../lib/utils"
+
+const Accordion = AccordionPrimitive.Root
+
+const AccordionItem = React.forwardRef<
+  React.ElementRef<typeof AccordionPrimitive.Item>,
+  React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Item>
+>(({ className, ...props }, ref) => (
+  <AccordionPrimitive.Item
+    ref={ref}
+    className={cn(className)}
+    {...props}
+  />
+))
+AccordionItem.displayName = "AccordionItem"
+
+const AccordionTrigger = React.forwardRef<
+  React.ElementRef<typeof AccordionPrimitive.Trigger>,
+  React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Trigger>
+>(({ className, children, ...props }, ref) => (
+  <AccordionPrimitive.Header className="flex">
+    <AccordionPrimitive.Trigger
+      ref={ref}
+      className={cn(
+        "flex items-center justify-between w-full py-4 font-medium transition-all",
+        className
+      )}
+      {...props}
+    >
+      <div className="flex items-center">
+        {children}
+      </div>
+      <ChevronDown className="h-4 w-4 shrink-0 transition-transform duration-200 ml-2" />
+    </AccordionPrimitive.Trigger>
+  </AccordionPrimitive.Header>
+))
+AccordionTrigger.displayName = AccordionPrimitive.Trigger.displayName
+
+const AccordionContent = React.forwardRef<
+  React.ElementRef<typeof AccordionPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Content>
+>(({ className, children, ...props }, ref) => (
+  <AccordionPrimitive.Content
+    ref={ref}
+    className="overflow-hidden text-sm transition-all data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down"
+    {...props}
+  >
+    <div className={cn("pb-4 pt-0", className)}>{children}</div>
+  </AccordionPrimitive.Content>
+))
+
+AccordionContent.displayName = AccordionPrimitive.Content.displayName
+
+export { Accordion, AccordionItem, AccordionTrigger, AccordionContent }
\ No newline at end of file
diff --git a/packages/ui/src/components/popover.tsx b/packages/ui/src/components/popover.tsx
new file mode 100644
index 00000000..6580309e
--- /dev/null
+++ b/packages/ui/src/components/popover.tsx
@@ -0,0 +1,31 @@
+"use client"
+
+import * as React from "react"
+import * as PopoverPrimitive from "@radix-ui/react-popover"
+
+import { cn } from "../lib/utils"
+
+const Popover = PopoverPrimitive.Root
+
+const PopoverTrigger = PopoverPrimitive.Trigger
+
+const PopoverContent = React.forwardRef<
+  React.ElementRef<typeof PopoverPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content>
+>(({ className, align = "center", sideOffset = 4, ...props }, ref) => (
+  <PopoverPrimitive.Portal>
+    <PopoverPrimitive.Content
+      ref={ref}
+      align={align}
+      sideOffset={sideOffset}
+      className={cn(
+        "z-50 w-72 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+        className
+      )}
+      {...props}
+    />
+  </PopoverPrimitive.Portal>
+))
+PopoverContent.displayName = PopoverPrimitive.Content.displayName
+
+export { Popover, PopoverTrigger, PopoverContent }
diff --git a/packages/ui/src/components/sortable.tsx b/packages/ui/src/components/sortable.tsx
new file mode 100644
index 00000000..611d950f
--- /dev/null
+++ b/packages/ui/src/components/sortable.tsx
@@ -0,0 +1,371 @@
+"use client"
+
+import * as React from "react"
+import type {
+  DndContextProps,
+  DraggableSyntheticListeners,
+  DropAnimation,
+  UniqueIdentifier,
+} from "@dnd-kit/core"
+import {
+  closestCenter,
+  defaultDropAnimationSideEffects,
+  DndContext,
+  DragOverlay,
+  KeyboardSensor,
+  MouseSensor,
+  TouchSensor,
+  useSensor,
+  useSensors,
+} from "@dnd-kit/core"
+import {
+  restrictToHorizontalAxis,
+  restrictToParentElement,
+  restrictToVerticalAxis,
+} from "@dnd-kit/modifiers"
+import {
+  arrayMove,
+  horizontalListSortingStrategy,
+  SortableContext,
+  useSortable,
+  verticalListSortingStrategy,
+  type SortableContextProps,
+} from "@dnd-kit/sortable"
+import { CSS } from "@dnd-kit/utilities"
+import { Slot, type SlotProps } from "@radix-ui/react-slot"
+
+import { cn } from "../lib/utils"
+import { Button, type ButtonProps } from "./button"
+
+// @see https://github.com/radix-ui/primitives/blob/main/packages/react/compose-refs/src/composeRefs.tsx
+
+type PossibleRef<T> = React.Ref<T> | undefined
+
+/**
+ * Set a given ref to a given value
+ * This utility takes care of different types of refs: callback refs and RefObject(s)
+ */
+function setRef<T>(ref: PossibleRef<T>, value: T) {
+  if (typeof ref === "function") {
+    ref(value)
+  } else if (ref !== null && ref !== undefined) {
+    ;(ref as React.MutableRefObject<T>).current = value
+  }
+}
+
+/**
+ * A utility to compose multiple refs together
+ * Accepts callback refs and RefObject(s)
+ */
+function composeRefs<T>(...refs: PossibleRef<T>[]) {
+  return (node: T) => refs.forEach((ref) => setRef(ref, node))
+}
+
+/**
+ * A custom hook that composes multiple refs
+ * Accepts callback refs and RefObject(s)
+ */
+function useComposedRefs<T>(...refs: PossibleRef<T>[]) {
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  return React.useCallback(composeRefs(...refs), refs)
+}
+
+export { composeRefs, useComposedRefs }
+
+
+const orientationConfig = {
+  vertical: {
+    modifiers: [restrictToVerticalAxis, restrictToParentElement],
+    strategy: verticalListSortingStrategy,
+  },
+  horizontal: {
+    modifiers: [restrictToHorizontalAxis, restrictToParentElement],
+    strategy: horizontalListSortingStrategy,
+  },
+  mixed: {
+    modifiers: [restrictToParentElement],
+    strategy: undefined,
+  },
+}
+
+interface SortableProps<TData extends { id: UniqueIdentifier }>
+  extends DndContextProps {
+  /**
+   * An array of data items that the sortable component will render.
+   * @example
+   * value={[
+   *   { id: 1, name: 'Item 1' },
+   *   { id: 2, name: 'Item 2' },
+   * ]}
+   */
+  value: TData[]
+
+  /**
+   * An optional callback function that is called when the order of the data items changes.
+   * It receives the new array of items as its argument.
+   * @example
+   * onValueChange={(items) => console.log(items)}
+   */
+  onValueChange?: (items: TData[]) => void
+
+  /**
+   * An optional callback function that is called when an item is moved.
+   * It receives an event object with `activeIndex` and `overIndex` properties, representing the original and new positions of the moved item.
+   * This will override the default behavior of updating the order of the data items.
+   * @type (event: { activeIndex: number; overIndex: number }) => void
+   * @example
+   * onMove={(event) => console.log(`Item moved from index ${event.activeIndex} to index ${event.overIndex}`)}
+   */
+  onMove?: (event: { activeIndex: number; overIndex: number }) => void
+
+  /**
+   * A collision detection strategy that will be used to determine the closest sortable item.
+   * @default closestCenter
+   * @type DndContextProps["collisionDetection"]
+   */
+  collisionDetection?: DndContextProps["collisionDetection"]
+
+  /**
+   * An array of modifiers that will be used to modify the behavior of the sortable component.
+   * @default
+   * [restrictToVerticalAxis, restrictToParentElement]
+   * @type Modifier[]
+   */
+  modifiers?: DndContextProps["modifiers"]
+
+  /**
+   * A sorting strategy that will be used to determine the new order of the data items.
+   * @default verticalListSortingStrategy
+   * @type SortableContextProps["strategy"]
+   */
+  strategy?: SortableContextProps["strategy"]
+
+  /**
+   * Specifies the axis for the drag-and-drop operation. It can be "vertical", "horizontal", or "both".
+   * @default "vertical"
+   * @type "vertical" | "horizontal" | "mixed"
+   */
+  orientation?: "vertical" | "horizontal" | "mixed"
+
+  /**
+   * An optional React node that is rendered on top of the sortable component.
+   * It can be used to display additional information or controls.
+   * @default null
+   * @type React.ReactNode | null
+   * @example
+   * overlay={<Skeleton className="w-full h-8" />}
+   */
+  overlay?: React.ReactNode | null
+}
+
+function Sortable<TData extends { id: UniqueIdentifier }>({
+  value,
+  onValueChange,
+  collisionDetection = closestCenter,
+  modifiers,
+  strategy,
+  onMove,
+  orientation = "vertical",
+  overlay,
+  children,
+  ...props
+}: SortableProps<TData>) {
+  const [activeId, setActiveId] = React.useState<UniqueIdentifier | null>(null)
+  const sensors = useSensors(
+    useSensor(MouseSensor),
+    useSensor(TouchSensor),
+    useSensor(KeyboardSensor)
+  )
+
+  const config = orientationConfig[orientation]
+
+  return (
+    <DndContext
+      modifiers={modifiers ?? config.modifiers}
+      sensors={sensors}
+      onDragStart={({ active }) => setActiveId(active.id)}
+      onDragEnd={({ active, over }) => {
+        if (over && active.id !== over?.id) {
+          const activeIndex = value.findIndex((item) => item.id === active.id)
+          const overIndex = value.findIndex((item) => item.id === over.id)
+
+          if (onMove) {
+            onMove({ activeIndex, overIndex })
+          } else {
+            onValueChange?.(arrayMove(value, activeIndex, overIndex))
+          }
+        }
+        setActiveId(null)
+      }}
+      onDragCancel={() => setActiveId(null)}
+      collisionDetection={collisionDetection}
+      {...props}
+    >
+      <SortableContext items={value} strategy={strategy ?? config.strategy}>
+        {children}
+      </SortableContext>
+      {overlay ? (
+        <SortableOverlay activeId={activeId}>{overlay}</SortableOverlay>
+      ) : null}
+    </DndContext>
+  )
+}
+
+const dropAnimationOpts: DropAnimation = {
+  sideEffects: defaultDropAnimationSideEffects({
+    styles: {
+      active: {
+        opacity: "0.4",
+      },
+    },
+  }),
+}
+
+interface SortableOverlayProps
+  extends React.ComponentPropsWithRef<typeof DragOverlay> {
+  activeId?: UniqueIdentifier | null
+}
+
+const SortableOverlay = React.forwardRef<HTMLDivElement, SortableOverlayProps>(
+  (
+    { activeId, dropAnimation = dropAnimationOpts, children, ...props },
+    ref
+  ) => {
+    return (
+      <DragOverlay dropAnimation={dropAnimation} {...props}>
+        {activeId ? (
+          <SortableItem
+            ref={ref}
+            value={activeId}
+            className="cursor-grabbing"
+            asChild
+          >
+            {children}
+          </SortableItem>
+        ) : null}
+      </DragOverlay>
+    )
+  }
+)
+SortableOverlay.displayName = "SortableOverlay"
+
+interface SortableItemContextProps {
+  attributes: React.HTMLAttributes<HTMLElement>
+  listeners: DraggableSyntheticListeners | undefined
+  isDragging?: boolean
+}
+
+const SortableItemContext = React.createContext<SortableItemContextProps>({
+  attributes: {},
+  listeners: undefined,
+  isDragging: false,
+})
+
+function useSortableItem() {
+  const context = React.useContext(SortableItemContext)
+
+  if (!context) {
+    throw new Error("useSortableItem must be used within a SortableItem")
+  }
+
+  return context
+}
+
+interface SortableItemProps extends SlotProps {
+  /**
+   * The unique identifier of the item.
+   * @example "item-1"
+   * @type UniqueIdentifier
+   */
+  value: UniqueIdentifier
+
+  /**
+   * Specifies whether the item should act as a trigger for the drag-and-drop action.
+   * @default false
+   * @type boolean | undefined
+   */
+  asTrigger?: boolean
+
+  /**
+   * Merges the item's props into its immediate child.
+   * @default false
+   * @type boolean | undefined
+   */
+  asChild?: boolean
+}
+
+const SortableItem = React.forwardRef<HTMLDivElement, SortableItemProps>(
+  ({ value, asTrigger, asChild, className, ...props }, ref) => {
+    const {
+      attributes,
+      listeners,
+      setNodeRef,
+      transform,
+      transition,
+      isDragging,
+    } = useSortable({ id: value })
+
+    const context = React.useMemo<SortableItemContextProps>(
+      () => ({
+        attributes,
+        listeners,
+        isDragging,
+      }),
+      [attributes, listeners, isDragging]
+    )
+    const style: React.CSSProperties = {
+      opacity: isDragging ? 0.5 : 1,
+      transform: CSS.Translate.toString(transform),
+      transition,
+    }
+
+    const Comp = asChild ? Slot : "div"
+
+    return (
+      <SortableItemContext.Provider value={context}>
+        <Comp
+          data-state={isDragging ? "dragging" : undefined}
+          className={cn(
+            "data-[state=dragging]:cursor-grabbing",
+            { "cursor-grab": !isDragging && asTrigger },
+            className
+          )}
+          ref={composeRefs(ref, setNodeRef as React.Ref<HTMLDivElement>)}
+          style={style}
+          {...(asTrigger ? attributes : {})}
+          {...(asTrigger ? listeners : {})}
+          {...props}
+        />
+      </SortableItemContext.Provider>
+    )
+  }
+)
+SortableItem.displayName = "SortableItem"
+
+interface SortableDragHandleProps extends ButtonProps {
+  withHandle?: boolean
+}
+
+const SortableDragHandle = React.forwardRef<
+  HTMLButtonElement,
+  SortableDragHandleProps
+>(({ className, ...props }, ref) => {
+  const { attributes, listeners, isDragging } = useSortableItem()
+
+  return (
+    <Button
+      ref={composeRefs(ref)}
+      data-state={isDragging ? "dragging" : undefined}
+      className={cn(
+        "cursor-grab data-[state=dragging]:cursor-grabbing",
+        className
+      )}
+      {...attributes}
+      {...listeners}
+      {...props}
+    />
+  )
+})
+SortableDragHandle.displayName = "SortableDragHandle"
+
+export { Sortable, SortableDragHandle, SortableItem, SortableOverlay }