diff --git a/src/assets/scss/_variables.scss b/src/assets/scss/_variables.scss
index 810e3ecc..d3fde811 100644
--- a/src/assets/scss/_variables.scss
+++ b/src/assets/scss/_variables.scss
@@ -53,3 +53,5 @@ $track-btn-svg: $accent;
 $side-nav-svg: $red;
 
 
+$overshoot: cubic-bezier(0.68, -0.55, 0.265, 1.55);
+
diff --git a/src/components/FolderView/FolderItem.vue b/src/components/FolderView/FolderItem.vue
index 547ff2fb..ee65b802 100644
--- a/src/components/FolderView/FolderItem.vue
+++ b/src/components/FolderView/FolderItem.vue
@@ -1,5 +1,5 @@
 <template>
-  <router-link :to="{ name: 'FolderView', params: { path: folder.path } }">
+  <router-link :to="{ name: Routes.folder, params: { path: folder.path } }">
     <div class="f-item">
       <div class="icon">
         <FolderSvg v-if="!folder.is_sym" />
@@ -16,8 +16,10 @@
 
 <script setup lang="ts">
 import { Folder } from "@/interfaces";
-import FolderSvg from "../../assets/icons/folder.svg";
-import SymLinkSvg from "../../assets/icons/symlink.svg";
+import { Routes } from "@/composables/enums";
+
+import FolderSvg from "@/assets/icons/folder.svg";
+import SymLinkSvg from "@/assets/icons/symlink.svg";
 
 defineProps<{
   folder: Folder;
diff --git a/src/components/LeftSidebar/NP/SongCard.vue b/src/components/LeftSidebar/NP/SongCard.vue
index dd91ebf6..69aeee82 100644
--- a/src/components/LeftSidebar/NP/SongCard.vue
+++ b/src/components/LeftSidebar/NP/SongCard.vue
@@ -13,7 +13,6 @@
           :src="imguri + track?.image"
           alt=""
           class="l-image rounded force-lm"
-          loading="lazy"
         />
         <div id="bitrate" v-if="track?.bitrate">
           {{ track.filetype }}• {{ track.bitrate }}
diff --git a/src/components/LeftSidebar/Navigation.vue b/src/components/LeftSidebar/Navigation.vue
index 948acd6d..eda883b0 100644
--- a/src/components/LeftSidebar/Navigation.vue
+++ b/src/components/LeftSidebar/Navigation.vue
@@ -22,18 +22,12 @@
 </template>
 
 <script setup lang="ts">
-import { computed } from "@vue/reactivity";
-
 import { Routes } from "@/composables/enums";
-import useSettingsStore from "@/stores/settings";
-
 import PlaylistSvg from "../../assets/icons/playlist.svg";
 import FolderSvg from "../../assets/icons/folder.svg";
 import SettingsSvg from "../../assets/icons/settings.svg";
 import SearchSvg from "../../assets/icons/search.svg";
 
-const settings = useSettingsStore();
-
 const menus = [
   {
     name: "playlists",
@@ -101,7 +95,7 @@ const menus = [
     margin: 0 $small 0 $small;
     border-radius: $small;
     transform: scale(0.9);
-    opacity: .75;
+    opacity: 0.75;
   }
 }
 </style>
diff --git a/src/components/PlaylistsList/PlaylistCard.vue b/src/components/PlaylistsList/PlaylistCard.vue
index 69232b4d..0e2b3a9a 100644
--- a/src/components/PlaylistsList/PlaylistCard.vue
+++ b/src/components/PlaylistsList/PlaylistCard.vue
@@ -5,8 +5,8 @@
   >
     <img
       :src="imguri + playlist.thumb"
-      class="rounded border"
-      :class="{ noimg: !playlist.thumb }"
+      class="rounded"
+      :class="{ border: !playlist.thumb }"
     />
     <div class="overlay rounded">
       <div class="p-name ellip">{{ playlist.name }}</div>
@@ -42,11 +42,6 @@ const props = defineProps<{
     object-fit: cover;
     transition: all 0.5s ease;
   }
-
-  img.noimg {
-    outline: 1px solid $gray2;
-  }
-
   .overlay {
     display: flex;
     flex-direction: column;
diff --git a/src/components/modals/updatePlaylist.vue b/src/components/modals/updatePlaylist.vue
index 37011807..a61328a3 100644
--- a/src/components/modals/updatePlaylist.vue
+++ b/src/components/modals/updatePlaylist.vue
@@ -1,6 +1,6 @@
 <template>
   <form
-    @submit="update_playlist"
+    @submit.prevent="update_playlist"
     class="new-p-form"
     enctype="multipart/form-data"
   >
@@ -34,7 +34,9 @@
         }"
       />
     </div>
-    <button type="submit" id="updateplaylistsubmit">Update</button>
+    <button>
+      {{ clicked ? "Updating" : "Update" }}
+    </button>
   </form>
 </template>
 
@@ -42,7 +44,7 @@
 import { updatePlaylist } from "@/composables/fetch/playlists";
 import { Playlist } from "@/interfaces";
 import usePStore from "@/stores/pages/playlist";
-import { onMounted } from "vue";
+import { onMounted, ref } from "vue";
 import { paths } from "@/config";
 
 const pStore = usePStore();
@@ -96,27 +98,27 @@ function handleFile(file: File) {
   image = file;
 }
 
-let clicked = false;
+let clicked = ref(false);
 
 function update_playlist(e: Event) {
-  e.preventDefault();
-
-  if (!clicked) {
-    clicked = true;
-    const elem = document.getElementById(
-      "updateplaylistsubmit"
-    ) as HTMLButtonElement;
-    elem.innerText = "Updating";
-  } else {
-    return;
-  }
-
   const form = e.target as HTMLFormElement;
   const formData = new FormData(form);
 
+  const name = formData.get("name") as string;
+
+  const nameChanged = name !== props.playlist.name;
+  const imgChanged = image !== undefined;
+
+  if (!nameChanged && !imgChanged) {
+    emit("hideModal");
+    return;
+  }
+
+  clicked.value = true;
+
   formData.append("image", image);
 
-  if (formData.get("name").toString().trim() !== "") {
+  if (name && name.toString().trim() !== "") {
     updatePlaylist(props.playlist.playlistid, formData, pStore).then(() => {
       emit("hideModal");
     });
diff --git a/src/components/shared/AlbumCard.vue b/src/components/shared/AlbumCard.vue
index 48bc095d..0293fdef 100644
--- a/src/components/shared/AlbumCard.vue
+++ b/src/components/shared/AlbumCard.vue
@@ -18,7 +18,7 @@
 import { AlbumInfo } from "../../interfaces";
 import { paths } from "../../config";
 
-const imguri = paths.images.thumb;
+const imguri = paths.images.thumb.large;
 defineProps<{
   album: AlbumInfo;
 }>();
diff --git a/src/components/shared/ArtistName.vue b/src/components/shared/ArtistName.vue
index f85b564c..36f00dc7 100644
--- a/src/components/shared/ArtistName.vue
+++ b/src/components/shared/ArtistName.vue
@@ -1,13 +1,6 @@
 <template>
   <div v-tooltip="returnArtists()" style="width: auto">
-    <div
-      class="ellip"
-      v-if="
-        artists === null ||
-        artists.length === 0 ||
-        (artists[0] === '' && artists.length === 1)
-      "
-    >
+    <div class="ellip" v-if="artists === null || artists.length === 0">
       <span>{{ albumartist }}</span>
     </div>
     <div class="ellip" v-else>
@@ -27,12 +20,9 @@ const props = defineProps<{
 }>();
 
 function returnArtists() {
-  if (props.artists === null) return props.albumartist;
+  if (props.artists === null || props.artists.length === 0)
+    return props.albumartist;
 
-  if (props.artists[0] !== "" && props.artists.length > 1) {
-    return props.artists.join(", ");
-  }
-
-  return props.albumartist;
+  return props.artists.join(", ");
 }
 </script>
diff --git a/src/components/shared/Input.vue b/src/components/shared/Input.vue
index 2c634003..93067b8c 100644
--- a/src/components/shared/Input.vue
+++ b/src/components/shared/Input.vue
@@ -1,20 +1,31 @@
 <template>
-  <input
-    type="search"
-    class="header-input rounded-sm pad-sm"
-    placeholder="Search here"
-    v-model.trim="source"
-    id="page-search"
-  />
+  <div class="header-input-wrapper rounded-sm" :class="{ showInput: clicked }">
+    <div class="search-svg" @click="clicked = !clicked">
+      <SearchSvg />
+    </div>
+    <input
+      type="search"
+      class="header-input rounded-sm pad-sm"
+      :class="{ showInput: clicked }"
+      placeholder="Search here"
+      v-model.trim="source"
+      id="page-search"
+    />
+  </div>
 </template>
 
 <script setup lang="ts">
-import usePStore from "@/stores/pages/playlist";
-import useFolderStore from "@/stores/pages/folder";
-import useAlbumStore from "@/stores/pages/album";
-
+import { ref } from "vue";
 import { storeToRefs } from "pinia";
+
+import usePStore from "@/stores/pages/playlist";
+import useAlbumStore from "@/stores/pages/album";
+import useFolderStore from "@/stores/pages/folder";
+
 import { Routes } from "@/composables/enums";
+import SearchSvg from "@/assets/icons/search.svg";
+
+const clicked = ref(false);
 
 const { query: playlistQuery } = storeToRefs(usePStore());
 const { query: folderQuery } = storeToRefs(useFolderStore());
@@ -44,6 +55,18 @@ const source = getRef();
 </script>
 
 <style lang="scss">
+.header-input-wrapper {
+  display: flex;
+  flex-direction: row-reverse;
+  width: 1.5rem;
+  transition: all 0.25s;
+
+  &.showInput {
+    width: 15rem;
+  }
+}
+
+
 .header-input {
   background-color: $gray3;
   outline: none;
@@ -51,9 +74,35 @@ const source = getRef();
   color: inherit;
   font-size: 1rem;
   z-index: 200;
-
+  transition: all 0.25s $overshoot;
+  opacity: 0;
+  transform: translateY(-1rem);
+  
   &:focus {
     outline: solid;
   }
+  
+  &.showInput {
+    opacity: 1;
+    transform: translateY(0);
+    transition-delay: .1s;
+  }
+}
+
+.search-svg {
+  // outline: solid;
+  margin-top: $smaller;
+  cursor: pointer;
+  // padding-left: ;
+  width: 2.25rem;
+  height: 2rem;
+  // aspect-ratio: 1;
+  z-index: 100;
+
+  svg {
+    display: block;
+    margin: 0 auto;
+    // outline: solid;
+  }
 }
 </style>
diff --git a/src/composables/fetch/searchMusic.ts b/src/composables/fetch/searchMusic.ts
index e233fe77..6d2cf264 100644
--- a/src/composables/fetch/searchMusic.ts
+++ b/src/composables/fetch/searchMusic.ts
@@ -1,5 +1,4 @@
 import { paths } from "@/config";
-import state from "../state";
 import axios from "axios";
 import useAxios from "./useAxios";
 
@@ -81,5 +80,4 @@ export {
   loadMoreArtists,
 };
 
-// TODO:
-// Rewrite this module using `useAxios` hook
+// TODO: Rewrite this module using `useAxios` hook
diff --git a/src/config.ts b/src/config.ts
index 04ad909f..6cda61c1 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -85,6 +85,4 @@ const paths = {
   },
 };
 
-export { paths, toggleMode };
-
-// TODO: Add setting to toggle between extending to edges or not
+export { paths, toggleMode };
\ No newline at end of file
diff --git a/src/router/index.ts b/src/router/index.ts
index a222d53c..481c1736 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,121 +1,10 @@
-import state from "@/composables/state";
-import useAStore from "@/stores/pages/album";
-import useFStore from "@/stores/pages/folder";
-import usePTrackStore from "@/stores/pages/playlist";
-import usePStore from "@/stores/pages/playlists";
-import AlbumsExplorer from "@/views/AlbumsExplorer.vue";
-import AlbumView from "@/views/album/index.vue";
-import ArtistsExplorer from "@/views/ArtistsExplorer.vue";
-import FolderView from "@/views/FolderView.vue";
-import Home from "@/views/Home.vue";
-import PlaylistList from "@/views/PlaylistList.vue";
-import PlaylistView from "@/views/playlist/index.vue";
-import SettingsView from "@/views/SettingsView.vue";
-import SearchView from "@/views/Search.vue";
-import QueueView from "@/views/QueueView.vue";
-
-import { createRouter, createWebHashHistory } from "vue-router";
-
-const routes = [
-  {
-    path: "/",
-    name: "Home",
-    component: Home,
-    redirect: "/folder/$home",
-  },
-  {
-    path: "/folder/:path",
-    name: "FolderView",
-    component: FolderView,
-    beforeEnter: async (to: any) => {
-      state.loading.value = true;
-      await useFStore()
-        .fetchAll(to.params.path)
-        .then(() => {
-          state.loading.value = false;
-        });
-    },
-  },
-  {
-    path: "/folder/",
-    redirect: "/folder/home",
-  },
-  {
-    path: "/playlists",
-    name: "PlaylistList",
-    component: PlaylistList,
-    beforeEnter: async () => {
-      state.loading.value = true;
-      await usePStore()
-        .fetchAll()
-        .then(() => {
-          state.loading.value = false;
-        });
-    },
-  },
-  {
-    path: "/playlist/:pid",
-    name: "PlaylistView",
-    component: PlaylistView,
-    beforeEnter: async (to: any) => {
-      state.loading.value = true;
-      await usePTrackStore()
-        .fetchAll(to.params.pid)
-        .then(() => {
-          state.loading.value = false;
-        });
-    },
-  },
-  {
-    path: "/albums",
-    name: "AlbumsView",
-    component: AlbumsExplorer,
-  },
-  {
-    path: "/albums/:hash",
-    name: "AlbumView",
-    component: AlbumView,
-    beforeEnter: async (to: any) => {
-      state.loading.value = true;
-      const store = useAStore();
-
-      await store
-        .fetchTracksAndArtists(to.params.hash)
-        .then(() => {
-          state.loading.value = false;
-        });
-    },
-  },
-  {
-    path: "/artists",
-    name: "ArtistsView",
-    component: ArtistsExplorer,
-  },
-  {
-    path: "/settings",
-    name: "SettingsView",
-    component: SettingsView,
-  },
-  {
-    path: "/search",
-    name: "SearchView",
-    component: SearchView,
-  },
-  {
-    path: "/queue",
-    name: "QueueView",
-    component: QueueView,
-  },
-  {
-    path: "/:pathMatch(.*)",
-    component: () => import("../views/NotFound.vue"),
-  },
-];
+import { routes } from "./routes";
+import { createRouter, createWebHashHistory, RouterOptions } from "vue-router";
 
 const router = createRouter({
   mode: "hash",
   history: createWebHashHistory(import.meta.env.BASE_URL),
   routes,
-});
+} as RouterOptions);
 
 export default router;
diff --git a/src/router/routes.ts b/src/router/routes.ts
new file mode 100644
index 00000000..c2b56c4b
--- /dev/null
+++ b/src/router/routes.ts
@@ -0,0 +1,121 @@
+import state from "@/composables/state";
+import useAStore from "@/stores/pages/album";
+import useFStore from "@/stores/pages/folder";
+import usePTrackStore from "@/stores/pages/playlist";
+import usePStore from "@/stores/pages/playlists";
+
+import Home from "@/views/Home.vue";
+
+const routes = [
+  {
+    path: "/",
+    name: "Home",
+    component: Home,
+    redirect: "/folder/$home",
+  },
+  {
+    path: "/folder/:path",
+    name: "FolderView",
+    component: () => import("@/views/FolderView.vue"),
+    beforeEnter: async (to: any) => {
+      state.loading.value = true;
+      await useFStore()
+        .fetchAll(to.params.path)
+        .then(() => {
+          state.loading.value = false;
+        });
+    },
+  },
+  {
+    path: "/playlists",
+    name: "PlaylistList",
+    component: () => import("@/views/PlaylistList.vue"),
+    beforeEnter: async () => {
+      state.loading.value = true;
+      await usePStore()
+        .fetchAll()
+        .then(() => {
+          state.loading.value = false;
+        });
+    },
+  },
+  {
+    path: "/playlist/:pid",
+    name: "PlaylistView",
+    component: () => import("@/views/playlist/index.vue"),
+    beforeEnter: async (to: any) => {
+      state.loading.value = true;
+      await usePTrackStore()
+        .fetchAll(to.params.pid)
+        .then(() => {
+          state.loading.value = false;
+        });
+    },
+  },
+  {
+    path: "/albums",
+    name: "AlbumsView",
+    component: () => import("@/views/AlbumsExplorer.vue"),
+  },
+  {
+    path: "/albums/:hash",
+    name: "AlbumView",
+    component: () => import("@/views/album/index.vue"),
+    beforeEnter: async (to: any) => {
+      state.loading.value = true;
+      const store = useAStore();
+
+      await store.fetchTracksAndArtists(to.params.hash).then(() => {
+        state.loading.value = false;
+      });
+    },
+  },
+  {
+    path: "/artists",
+    name: "ArtistsView",
+    component: () => import("@/views/ArtistsExplorer.vue"),
+  },
+  {
+    path: "/settings",
+    name: "SettingsView",
+    component: () => import("@/views/SettingsView.vue"),
+  },
+  {
+    path: "/search",
+    name: "SearchView",
+    component: () => import("@/views/Search.vue"),
+  },
+  {
+    path: "/queue",
+    name: "QueueView",
+    component: () => import("@/views/QueueView.vue"),
+  },
+  {
+    name: "NotFound",
+    path: "/:pathMatch(.*)",
+    component: () => import("../views/NotFound.vue"),
+  },
+];
+
+const keys = [
+  "home",
+  "folder",
+  "playlists",
+  "playlist",
+  "albums",
+  "album",
+  "artists",
+  "settings",
+  "search",
+  "queue",
+  "notfound",
+];
+
+const routesList = routes.map((route, index) => {
+  const key = keys[index];
+  return { route: route.name };
+});
+
+// TODO: Use dynamic keys in routesList
+
+export { routes, routesList };
diff --git a/src/stores/pages/folder.ts b/src/stores/pages/folder.ts
index a432f946..f093b543 100644
--- a/src/stores/pages/folder.ts
+++ b/src/stores/pages/folder.ts
@@ -19,7 +19,6 @@ export default defineStore("FolderDirs&Tracks", {
       const { tracks, folders } = await fetchThem(path);
 
       [this.path, this.allDirs, this.allTracks] = [path, folders, tracks];
-
     },
     resetQuery() {
       this.query = "";