diff --git a/src/components/AlbumView/Header.vue b/src/components/AlbumView/Header.vue
index 768e1fe..e66eb7e 100644
--- a/src/components/AlbumView/Header.vue
+++ b/src/components/AlbumView/Header.vue
@@ -92,7 +92,7 @@ import HeartSvg from "../shared/HeartSvg.vue";
 
 import PlayBtnRect from "../shared/PlayBtnRect.vue";
 
-const props = defineProps<{
+defineProps<{
   album: Album;
 }>();
 
diff --git a/src/components/ArtistView/Header.vue b/src/components/ArtistView/Header.vue
index 03c0a58..cc90001 100644
--- a/src/components/ArtistView/Header.vue
+++ b/src/components/ArtistView/Header.vue
@@ -31,7 +31,7 @@
       </section>
       <div class="buttons">
         <PlayBtnRect :source="playSources.artist" :store="useArtistPageStore" />
-        <HeartSvg />
+        <HeartSvg @handleFav="handleFav" :state="is_fav" />
       </div>
     </div>
     <div class="artist-img no-select">
@@ -56,10 +56,34 @@ import PlayBtnRect from "../shared/PlayBtnRect.vue";
 import formatSeconds from "@/utils/useFormatSeconds";
 import { isLight } from "@/composables/colors/album";
 import { paths } from "@/config";
-import { playSources } from "@/composables/enums";
+import { favType, playSources } from "@/composables/enums";
 import HeartSvg from "@/components/shared/HeartSvg.vue";
+import { ref } from "vue";
+import { addFavorite, removeFavorite } from "@/composables/fetch/favorite";
 
 const artist = useArtistPageStore();
+const is_fav = ref(artist.info.is_favorite);
+
+async function handleFav() {
+  if (is_fav.value) {
+    const removed = await removeFavorite(
+      favType.artist,
+      artist.info.artisthash
+    );
+
+    if (removed) {
+      is_fav.value = false;
+    }
+
+    return;
+  }
+
+  const added = await addFavorite(favType.artist, artist.info.artisthash);
+
+  if (added) {
+    is_fav.value = true;
+  }
+}
 </script>
 
 <style lang="scss">
diff --git a/src/components/nav/Titles/Folder.vue b/src/components/nav/Titles/Folder.vue
index a3efa7f..15d5203 100644
--- a/src/components/nav/Titles/Folder.vue
+++ b/src/components/nav/Titles/Folder.vue
@@ -70,6 +70,8 @@ onUpdated(() => {
       padding-right: $smaller;
       width: fit-content;
       max-width: 100%;
+      overflow: scroll;
+      scrollbar-width: none;
 
       .icon {
         height: 2rem;
@@ -82,9 +84,6 @@ onUpdated(() => {
       .paths {
         display: flex;
         gap: $smaller;
-        overflow: hidden;
-        height: 100%;
-        scrollbar-width: none;
 
         &::-webkit-scrollbar {
           display: none;
@@ -100,10 +99,11 @@ onUpdated(() => {
           }
 
           &::before {
-            content: "/";
+            content: "∕";
             font-size: small;
             margin-right: $smaller;
-            opacity: 0.25;
+            color: $gray;
+            font-size: 1rem;
           }
 
           &:first-child {
diff --git a/src/components/shared/HeartSvg.vue b/src/components/shared/HeartSvg.vue
index 4720d55..7ce3822 100644
--- a/src/components/shared/HeartSvg.vue
+++ b/src/components/shared/HeartSvg.vue
@@ -1,14 +1,26 @@
 <template>
-  <button class="heart-button circular"><HeartSvg /></button>
+  <button class="heart-button circular" @click="emit('handleFav')">
+    <HeartFillSvg v-if="state" />
+    <HeartSvg v-else />
+  </button>
 </template>
 
 <script setup lang="ts">
 import HeartSvg from "@/assets/icons/heart.svg";
+import HeartFillSvg from "@/assets/icons/heart.fill.svg";
+
+defineProps<{
+  state: boolean | undefined;
+}>();
+
+const emit = defineEmits<{
+  (event: "handleFav"): void;
+}>();
 </script>
 
 <style lang="scss">
 .heart-button {
-  $bg: rgb(247, 149, 149);
+  $bg: rgb(255, 184, 184);
   background: $bg;
   align-items: center;
   padding: 0 1rem;
diff --git a/src/composables/fetch/artists.ts b/src/composables/fetch/artists.ts
index 5470f47..ef1da75 100644
--- a/src/composables/fetch/artists.ts
+++ b/src/composables/fetch/artists.ts
@@ -25,7 +25,7 @@ const getArtistData = async (hash: string, limit: number = 5) => {
   return data as ArtistData;
 };
 
-const getArtistAlbums = async (hash: string, all = false, limit = 6) => {
+const getArtistAlbums = async (hash: string, limit = 6, all = false) => {
   interface ArtistAlbums {
     albums: Album[];
     eps: Album[];
diff --git a/src/contexts/track_context.ts b/src/contexts/track_context.ts
index 2126322..9dea41c 100644
--- a/src/contexts/track_context.ts
+++ b/src/contexts/track_context.ts
@@ -31,18 +31,6 @@ export default async (
   const single_artist = track.artist.length === 1;
   const single_album_artist = track.albumartist.length === 1;
 
-  let playlists = <Option[]>[];
-  const p = await getAllPlaylists();
-
-  playlists = p.map((playlist: Playlist) => {
-    return <Option>{
-      label: playlist.name,
-      action: () => {
-        addTrackToPlaylist(playlist, track);
-      },
-    };
-  });
-
   const goToArtist = (artists: Artist[]) => {
     if (artists.length === 1) {
       return false;
@@ -62,7 +50,7 @@ export default async (
     });
   };
 
-  function addToPlaylist() {
+  async function addToPlaylist() {
     const new_playlist = <Option>{
       label: "New playlist",
       action: () => {
@@ -70,12 +58,24 @@ export default async (
       },
     };
 
+    let playlists = <Option[]>[];
+    const p = await getAllPlaylists();
+
+    playlists = p.map((playlist: Playlist) => {
+      return <Option>{
+        label: playlist.name,
+        action: () => {
+          addTrackToPlaylist(playlist, track);
+        },
+      };
+    });
+
     return [new_playlist, separator, ...playlists];
   }
 
   const add_to_playlist: Option = {
     label: "Add to Playlist",
-    children: addToPlaylist(),
+    children: await addToPlaylist(),
     icon: "plus",
   };
 
@@ -99,7 +99,7 @@ export default async (
     label: "Go to Folder",
     action: () => {
       Router.push({
-        name: "FolderView",
+        name: Routes.folder,
         params: { path: track.folder },
       });
     },
@@ -142,7 +142,7 @@ export default async (
     label: "Go to Album",
     action: () => {
       Router.push({
-        name: "AlbumView",
+        name: Routes.album,
         params: { hash: track.albumhash },
       });
     },
@@ -170,12 +170,15 @@ export default async (
     separator,
     go_to_album,
     go_to_folder,
-    // add_to_fav,
+    separator,
     go_to_artist,
     go_to_alb_artist,
+    // add_to_fav,
     // separator,
     // del_track,
   ];
 
   return options;
 };
+
+// TODO: Find a way to fetch playlists lazily. ie. When the "Add to playlist" option is triggered.
diff --git a/src/interfaces.ts b/src/interfaces.ts
index c26da5f..c9bce20 100644
--- a/src/interfaces.ts
+++ b/src/interfaces.ts
@@ -65,6 +65,7 @@ export interface Artist {
   albumcount: number;
   duration: number;
   colors: string[];
+  is_favorite?: boolean;
 }
 
 export interface Option {
diff --git a/src/stores/context.ts b/src/stores/context.ts
index 8ac50fc..4d91532 100644
--- a/src/stores/context.ts
+++ b/src/stores/context.ts
@@ -40,8 +40,6 @@ export default defineStore("context-menu", {
         getBoundingClientRect: generateGetBoundingClientRect(e.x, e.y),
       } as VirtualElement;
 
-      console.log(virtualElement.contextElement)
-
       getContextOptions()
         .then((options) => {
           this.options = options;