diff --git a/src/assets/scss/_variables.scss b/src/assets/scss/_variables.scss
index d3fde811..2a192509 100644
--- a/src/assets/scss/_variables.scss
+++ b/src/assets/scss/_variables.scss
@@ -13,7 +13,7 @@ $medium: 0.75rem;
 $large: 1.5rem;
 $larger: 2rem;
 
-$banner-height: 18rem;
+$banner-height: 23rem;
 
 // apple human design guideline colors
 $black: #181a1c;
diff --git a/src/components/AlbumView/Header.vue b/src/components/AlbumView/Header.vue
index 0f295a40..10bf844e 100644
--- a/src/components/AlbumView/Header.vue
+++ b/src/components/AlbumView/Header.vue
@@ -104,7 +104,7 @@ useVisibility(albumheaderthing, handleVisibilityState);
   grid-template-columns: max-content 1fr;
   gap: 1rem;
   padding: 1rem;
-  height: 100% !important;
+  height: $banner-height;
   background-color: $black;
   overflow: hidden;
 
diff --git a/src/components/PlaylistView/Header.vue b/src/components/PlaylistView/Header.vue
index df6eebf7..536e3ed5 100644
--- a/src/components/PlaylistView/Header.vue
+++ b/src/components/PlaylistView/Header.vue
@@ -67,7 +67,7 @@ function editPlaylist() {
 .p-header {
   display: grid;
   grid-template-columns: 1fr;
-  height: 100%;
+  height: $banner-height;
   position: relative;
   background-color: $gray5;
 
diff --git a/src/views/FolderView.vue b/src/views/FolderView.vue
index ada48c01..9e43f05a 100644
--- a/src/views/FolderView.vue
+++ b/src/views/FolderView.vue
@@ -15,7 +15,6 @@ import useLoaderStore from "@/stores/loader";
 import useFolderStore from "@/stores/pages/folder";
 
 import Layout from "@/layouts/HeaderAndVList.vue";
-import SongList from "@/components/FolderView/SongList.vue";
 import FolderList from "@/components/FolderView/FolderList.vue";
 
 const loader = useLoaderStore();
diff --git a/src/views/album/Header.vue b/src/views/album/Header.vue
deleted file mode 100644
index 8d68119f..00000000
--- a/src/views/album/Header.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<template>
-    <Header :album="album" />
-</template>
-
-<script setup lang="ts">
-import Header from "@/components/AlbumView/Header.vue";
-import { AlbumInfo } from "@/interfaces";
-
-defineProps<{
-  album: AlbumInfo;
-}>();
-</script>
diff --git a/src/views/album/index.vue b/src/views/album/index.vue
index 45acaf73..5d02e789 100644
--- a/src/views/album/index.vue
+++ b/src/views/album/index.vue
@@ -5,7 +5,7 @@
     :on_album_page="true"
   >
     <template #header>
-      <Header :album="album.info" :bio="album.bio" />
+      <Header :album="album.info" />
     </template>
   </Layout>
 </template>
@@ -23,7 +23,7 @@ import useQueueStore from "@/stores/queue";
 import useAStore from "@/stores/pages/album";
 
 // @components
-import Header from "./Header.vue";
+import Header from "@/components/AlbumView/Header.vue";
 import Layout from "@/layouts/HeaderAndVList.vue";
 
 // @vars
diff --git a/src/views/playlist/Content.vue b/src/views/playlist/Content.vue
deleted file mode 100644
index 06f914ae..00000000
--- a/src/views/playlist/Content.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-  <div class="songlist rounded">
-    <div v-if="tracks.length">
-      <SongList
-        :tracks="tracks"
-        :pname="name"
-        :playlistid="playlistid"
-        @playFromPage="playFromPlaylistPage"
-      />
-    </div>
-    <div v-else-if="tracks.length === 0 && count > 0">
-      <div class="no-results">
-        <div class="text">We can't find your music 🦋</div>
-      </div>
-    </div>
-    <div v-else-if="tracks.length === 0 && count == 0">
-      <div class="no-results">
-        <div class="text">Nothing here</div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import useQueueStore from "@/stores/queue";
-import usePlaylistStore from "@/stores/pages/playlist";
-
-import SongList from "@/components/FolderView/SongList.vue";
-import { Track } from "@/interfaces";
-import { onUpdated } from "vue";
-
-const props = defineProps<{
-  tracks: Track[];
-  count: number;
-  name: string;
-  playlistid: string;
-}>();
-
-const queue = useQueueStore();
-const playlist = usePlaylistStore();
-
-function playFromPlaylistPage(index: number) {
-  const { name, playlistid } = playlist.info;
-  queue.playFromPlaylist(name, playlistid, playlist.allTracks);
-  queue.play(index);
-}
-</script>
diff --git a/src/views/playlist/index.vue b/src/views/playlist/index.vue
index 011f6a69..f536329b 100644
--- a/src/views/playlist/index.vue
+++ b/src/views/playlist/index.vue
@@ -1,37 +1,32 @@
 <template>
-  <Page>
+  <Layout :tracks="playlist.tracks" @playFromPage="playFromPlaylistPage">
     <template #header>
-      <Header :info="playlist" />
+      <Header :info="playlist.info" />
     </template>
-    <template #content>
-      <Content
-        :tracks="tracks"
-        :count="playlist.count"
-        :name="playlist.name"
-        :playlistid="playlist.playlistid"
-      />
-    </template>
-  </Page>
+  </Layout>
 </template>
 
 <script setup lang="ts">
-import { storeToRefs } from "pinia";
-import Page from "@/layouts/HeaderContentBottom.vue";
-
-import Header from "@/components/PlaylistView/Header.vue";
-import Content from "./Content.vue";
-
-import usePlaylistStore from "@/stores/pages/playlist";
 import { onBeforeRouteLeave } from "vue-router";
 
-const store = usePlaylistStore();
-const { info: playlist, tracks } = storeToRefs(store);
+import useQueueStore from "@/stores/queue";
+import usePlaylistStore from "@/stores/pages/playlist";
+
+import Layout from "@/layouts/HeaderAndVList.vue";
+import Header from "@/components/PlaylistView/Header.vue";
+
+const queue = useQueueStore();
+const playlist = usePlaylistStore();
+
+function playFromPlaylistPage(index: number) {
+  const { name, playlistid } = playlist.info;
+  queue.playFromPlaylist(name, playlistid, playlist.allTracks);
+  queue.play(index);
+}
 
 onBeforeRouteLeave(() => {
   setTimeout(() => {
-    store.resetQuery();
+    playlist.resetQuery();
   }, 500);
 });
 </script>
-
-<style lang="scss"></style>