diff --git a/src/assets/css/global.scss b/src/assets/css/global.scss
index 66873038..945ee6b6 100644
--- a/src/assets/css/global.scss
+++ b/src/assets/css/global.scss
@@ -72,8 +72,11 @@ a {
     "l-sidebar content r-sidebar"
     "l-sidebar content r-sidebar"
     "l-sidebar content tabs";
-  width: 100vw;
+  width: 100%;
+  align-content: center;
+  max-width: 2720px;
   height: 100vh;
+  margin: 0 auto;
 }
 
 .tabs {
@@ -87,8 +90,6 @@ a {
 
 #gsearch-input {
   grid-area: search-input;
-  // border-left: solid 1px $gray3;
-  // border-bottom: 1px solid $gray3;
 }
 
 .topnav {
@@ -131,7 +132,7 @@ a {
 #acontent {
   grid-area: content;
   width: 100%;
-  max-width: 1504px;
+  max-width: 1955px;
   padding: $small;
   padding-left: 0;
   overflow: auto;
diff --git a/src/components/modals/NewPlaylist.vue b/src/components/modals/NewPlaylist.vue
index ba677e68..15e96728 100644
--- a/src/components/modals/NewPlaylist.vue
+++ b/src/components/modals/NewPlaylist.vue
@@ -18,7 +18,7 @@
 <script setup lang="ts">
 import { onMounted } from "vue";
 import { useRoute } from "vue-router";
-import { createNewPlaylist } from "../../composables/fetch/playlists";
+import { createNewPlaylist } from "../../composables/pages/playlists";
 import { Track } from "../../interfaces";
 import { Notification, NotifType } from "../../stores/notification";
 import usePlaylistStore from "@/stores/pages/playlists";
diff --git a/src/components/modals/updatePlaylist.vue b/src/components/modals/updatePlaylist.vue
index 2f6ee1f0..a36e88fc 100644
--- a/src/components/modals/updatePlaylist.vue
+++ b/src/components/modals/updatePlaylist.vue
@@ -55,7 +55,7 @@
 <script setup lang="ts">
 import usePStore from "@/stores/pages/playlist";
 import { onMounted } from "vue";
-import { updatePlaylist } from "../../composables/fetch/playlists";
+import { updatePlaylist } from "../../composables/pages/playlists";
 import { Playlist } from "../../interfaces";
 
 const pStore = usePStore();
diff --git a/src/composables/normalizeContextMenu.js b/src/composables/normalizeContextMenu.ts
similarity index 95%
rename from src/composables/normalizeContextMenu.js
rename to src/composables/normalizeContextMenu.ts
index ed5f67b1..ddc17f9c 100644
--- a/src/composables/normalizeContextMenu.js
+++ b/src/composables/normalizeContextMenu.ts
@@ -1,6 +1,6 @@
 import { getElem } from "./perks";
 
-export default (mouseX, mouseY) => {
+export default (mouseX: number, mouseY: number) => {
   const scope = getElem("app", "id");
   const contextMenu = getElem("context-menu", "class");
   // ? compute what is the mouse position relative to the container element
diff --git a/src/composables/fetch/album.ts b/src/composables/pages/album.ts
similarity index 100%
rename from src/composables/fetch/album.ts
rename to src/composables/pages/album.ts
diff --git a/src/composables/getFilesAndFolders.ts b/src/composables/pages/folders.ts
similarity index 74%
rename from src/composables/getFilesAndFolders.ts
rename to src/composables/pages/folders.ts
index 8c20d89d..b75fcf3a 100644
--- a/src/composables/getFilesAndFolders.ts
+++ b/src/composables/pages/folders.ts
@@ -1,7 +1,6 @@
-import axios from "axios";
-import { Folder, Track } from "../interfaces";
-import state from "./state";
-import useAxios from "./useAxios";
+import { Folder, Track } from "@/interfaces";
+import state from "../state";
+import useAxios from "../useAxios";
 
 export default async function (path: string) {
   interface FolderData {
diff --git a/src/composables/fetch/playlists.ts b/src/composables/pages/playlists.ts
similarity index 100%
rename from src/composables/fetch/playlists.ts
rename to src/composables/pages/playlists.ts
diff --git a/src/composables/state.ts b/src/composables/state.ts
index 5751c261..e39c15a8 100644
--- a/src/composables/state.ts
+++ b/src/composables/state.ts
@@ -1,11 +1,11 @@
+import { Track, AlbumInfo, Artist } from "./../interfaces";
 import { ref } from "@vue/reactivity";
 import { reactive } from "vue";
-import * as i from "../interfaces";
 
 const search_query = ref("");
 
 const queue = ref(
-  Array<i.Track>({
+  Array<Track>({
     title: "Nothing played yet",
     artists: ["... blah blah blah"],
     image: "http://127.0.0.1:8900/images/thumbnails/4.webp",
@@ -16,14 +16,14 @@ const queue = ref(
 const folder_song_list = ref([]);
 const folder_list = ref([]);
 
-const current = ref(<i.Track>{
+const current = ref(<Track>{
   title: "Nothing played yet",
   artists: ["... blah blah blah"],
   image: "http://127.0.0.1:8900/images/thumbnails/4.webp",
   trackid: "",
 });
 
-const prev = ref(<i.Track>{
+const prev = ref(<Track>{
   title: "Nothing played yet",
   artists: ["... blah blah blah"],
   image: "http://127.0.0.1:8900/images/thumbnails/4.webp",
@@ -31,9 +31,9 @@ const prev = ref(<i.Track>{
 });
 
 const album = reactive({
-  tracklist: Array<i.Track>(),
-  info: <i.AlbumInfo>{},
-  artists: Array<i.Artist>(),
+  tracklist: Array<Track>(),
+  info: <AlbumInfo>{},
+  artists: Array<Artist>(),
   bio: "",
 });
 
diff --git a/src/contexts/track_context.ts b/src/contexts/track_context.ts
index 7f5ab07f..d45f5a14 100644
--- a/src/contexts/track_context.ts
+++ b/src/contexts/track_context.ts
@@ -1,7 +1,7 @@
 import { Playlist, Track } from "../interfaces";
 import Router from "../router";
 import { Option } from "../interfaces";
-import { getAllPlaylists, addTrackToPlaylist } from "../composables/fetch/playlists";
+import { getAllPlaylists, addTrackToPlaylist } from "../composables/pages/playlists";
 
 import useQueueStore from "../stores/queue";
 import useModalStore from "../stores/modal";
diff --git a/src/stores/pages/album.ts b/src/stores/pages/album.ts
index a45e502e..aa391c81 100644
--- a/src/stores/pages/album.ts
+++ b/src/stores/pages/album.ts
@@ -4,7 +4,7 @@ import {
   getAlbumTracks,
   getAlbumArtists,
   getAlbumBio,
-} from "../../composables/fetch/album";
+} from "../../composables/pages/album";
 
 export default defineStore("album", {
   state: () => ({
@@ -21,7 +21,6 @@ export default defineStore("album", {
      * @param albumartist artist of the album
      */
     async fetchTracksAndArtists(title: string, albumartist: string) {
-
       const tracks = await getAlbumTracks(title, albumartist);
       const artists = await getAlbumArtists(title, albumartist);
 
diff --git a/src/stores/pages/folder.ts b/src/stores/pages/folder.ts
index 6cd7fc5e..6ea9498e 100644
--- a/src/stores/pages/folder.ts
+++ b/src/stores/pages/folder.ts
@@ -1,7 +1,7 @@
 import { defineStore } from "pinia";
 import { Folder, Track } from "../../interfaces";
 
-import fetchThem from "../../composables/getFilesAndFolders";
+import fetchThem from "../../composables/pages/folders";
 
 export default defineStore("FolderDirs&Tracks", {
   state: () => ({
@@ -13,9 +13,7 @@ export default defineStore("FolderDirs&Tracks", {
     async fetchAll(path: string) {
       const { tracks, folders } = await fetchThem(path);
 
-      this.path = path;
-      this.dirs = folders;
-      this.tracks = tracks;
+      [this.path, this.dirs, this.tracks] = [path, folders, tracks];
     },
   },
 });
diff --git a/src/stores/pages/playlist.ts b/src/stores/pages/playlist.ts
index 390b3907..ea67c136 100644
--- a/src/stores/pages/playlist.ts
+++ b/src/stores/pages/playlist.ts
@@ -1,5 +1,5 @@
 import { defineStore } from "pinia";
-import { getPlaylist } from "../../composables/fetch/playlists";
+import { getPlaylist } from "../../composables/pages/playlists";
 import { Track, Playlist } from "../../interfaces";
 
 export default defineStore("playlist-tracks", {
diff --git a/src/stores/pages/playlists.ts b/src/stores/pages/playlists.ts
index 6fb46440..48509a04 100644
--- a/src/stores/pages/playlists.ts
+++ b/src/stores/pages/playlists.ts
@@ -1,6 +1,6 @@
 import { defineStore } from "pinia";
 import { Playlist } from "../../interfaces";
-import { getAllPlaylists } from "../../composables/fetch/playlists";
+import { getAllPlaylists } from "../../composables/pages/playlists";
 
 export default defineStore("playlists", {
   state: () => ({