diff --git a/src/main.ts b/src/main.ts
index 19622abc..72589134 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -2,30 +2,32 @@ import { createApp } from "vue";
 import { createPinia } from "pinia";
 
 import {
-    RecycleScroller,
-    DynamicScroller,
-    DynamicScrollerItem,
-    // @ts-ignore
+  RecycleScroller,
+  DynamicScroller,
+  DynamicScrollerItem,
+  // @ts-ignore
 } from "vue-virtual-scroller";
 
 import { autoAnimatePlugin } from "@formkit/auto-animate/vue";
 import piniaPluginPersistedstate from "pinia-plugin-persistedstate";
 
-import "./assets/scss/index.scss";
-import "vue-virtual-scroller/dist/vue-virtual-scroller.css";
 
 import App from "./App.vue";
 import router from "./router";
 import vTooltip from "./directives/vTooltip";
 
+import "./assets/scss/index.scss";
+import "vue-virtual-scroller/dist/vue-virtual-scroller.css";
+
 const app = createApp(App);
 const pinia = createPinia();
 pinia.use(piniaPluginPersistedstate);
 
 app.use(pinia);
 app.use(router);
-app.directive("tooltip", vTooltip);
 app.use(autoAnimatePlugin);
+
+app.directive("tooltip", vTooltip);
 app.component("RecycleScroller", RecycleScroller);
 app.component("DynamicScroller", DynamicScroller);
 app.component("DynamicScrollerItem", DynamicScrollerItem);
diff --git a/src/utils/index.ts b/src/utils/index.ts
index e57c261b..e498a205 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -5,6 +5,7 @@ import useFuse from "./useFuse";
 import { readLocalStorage, writeLocalStorage } from "./useLocalStorage";
 import putCommas from "./usePutCommas";
 import useVisibility from "./useVisibility";
+import useCreateTrackProps from "./useCreateTrackProps";
 
 export {
     readLocalStorage,
@@ -13,6 +14,7 @@ export {
     focusElemByClass,
     useVisibility,
     formatSeconds,
+    useCreateTrackProps as createTrackProps,
     putCommas,
     useFuse,
 };
diff --git a/src/utils/useCreateTrackProps.ts b/src/utils/useCreateTrackProps.ts
new file mode 100644
index 00000000..7e3561fd
--- /dev/null
+++ b/src/utils/useCreateTrackProps.ts
@@ -0,0 +1,12 @@
+import { Track } from "@/interfaces";
+import queue from "@/stores/queue";
+
+export default function createTrackProps(track: Track) {
+  return {
+    track,
+    index: track.index + 1,
+    isCurrent: queue().currenttrack?.hash === track.hash,
+    isCurrentPlaying:
+      queue().currenttrack?.hash === track.hash && queue().playing,
+  };
+}
diff --git a/src/views/AlbumView/index.vue b/src/views/AlbumView/index.vue
index 5d02e789..cf2d9f85 100644
--- a/src/views/AlbumView/index.vue
+++ b/src/views/AlbumView/index.vue
@@ -1,43 +1,89 @@
 <template>
-  <Layout
-    :tracks="album.tracks"
-    @playFromPage="playFromAlbum"
-    :on_album_page="true"
-  >
-    <template #header>
-      <Header :album="album.info" />
-    </template>
-  </Layout>
+  <div class="album-virtual-scroller v-scroll-page">
+    <RecycleScroller
+      class="scroller"
+      :items="scrollerItems"
+      :item-size="null"
+      key-field="id"
+      v-slot="{ item }"
+    >
+      <component
+        :is="item.component"
+        v-bind="item.props"
+        @playThis="playFromAlbum(item.props.index - item.props.track.disc - 1)"
+      />
+    </RecycleScroller>
+  </div>
 </template>
 
 <script setup lang="ts">
-// @libs
 import {
   onBeforeRouteLeave,
   onBeforeRouteUpdate,
   RouteLocationNormalized,
 } from "vue-router";
+import { computed } from "@vue/reactivity";
+
+import { Track } from "@/interfaces";
+import { createTrackProps } from "@/utils";
 
-// @stores
 import useQueueStore from "@/stores/queue";
-import useAStore from "@/stores/pages/album";
+import useAlbumStore from "@/stores/pages/album";
 
-// @components
 import Header from "@/components/AlbumView/Header.vue";
-import Layout from "@/layouts/HeaderAndVList.vue";
+import SongItem from "@/components/shared/SongItem.vue";
+import AlbumDiscBar from "@/components/AlbumView/AlbumDiscBar.vue";
 
-// @vars
-const album = useAStore();
+const album = useAlbumStore();
 const queue = useQueueStore();
 
-// @methods
+interface ScrollerItem {
+  id: string;
+  component: typeof Header | typeof SongItem;
+  props: Record<string, unknown>;
+  size: number;
+}
+
+class songItem {
+  id: number;
+  props = {};
+  size = 64;
+  component: typeof SongItem | typeof AlbumDiscBar;
+
+  constructor(track: Track) {
+    this.id = Math.random();
+    this.props = track.is_album_disc_number
+      ? { album_disc: track }
+      : createTrackProps(track);
+    this.component = track.is_album_disc_number ? AlbumDiscBar : SongItem;
+  }
+}
+
+function getSongItems() {
+  return album.tracks.map((track) => {
+    return new songItem(track);
+  });
+}
+
+const scrollerItems = computed(() => {
+  const header: ScrollerItem = {
+    id: "album-header",
+    component: Header,
+    props: {
+      album: album.info,
+    },
+    size: 18 * 16,
+  };
+
+  return [header, ...getSongItems()];
+});
+
 function playFromAlbum(index: number) {
   const { title, artist, hash } = album.info;
   queue.playFromAlbum(title, artist, hash, album.allTracks);
   queue.play(index);
 }
 
-// @hooks
 onBeforeRouteUpdate(async (to: RouteLocationNormalized) => {
   await album
     .fetchTracksAndArtists(to.params.hash.toString())
@@ -50,3 +96,12 @@ onBeforeRouteLeave(() => {
   }, 500);
 });
 </script>
+
+<style lang="scss">
+.album-virtual-scroller {
+  height: 100%;
+  .scroller {
+    padding-bottom: $content-padding-bottom;
+  }
+}
+</style>
diff --git a/src/views/FolderView.vue b/src/views/FolderView.vue
index f224a402..91fa4791 100644
--- a/src/views/FolderView.vue
+++ b/src/views/FolderView.vue
@@ -48,8 +48,8 @@ interface ScrollerItem {
 
 class songItem {
   id: string;
-  component = SongItem;
   props: any;
+  component = SongItem;
 
   constructor(track: Track) {
     this.id = track.trackid;