diff --git a/src/components/Notification.vue b/src/components/Notification.vue
index 1ca181e7..86a5494f 100644
--- a/src/components/Notification.vue
+++ b/src/components/Notification.vue
@@ -18,6 +18,7 @@ import ErrorSvg from "../assets/icons/toast/error.svg";
 import InfoSvg from "../assets/icons/toast/info.svg";
 import SuccessSvg from "../assets/icons/toast/ok.svg";
 import WorkingSvg from "../assets/icons/toast/working.svg";
+import HeartSvg from "../assets/icons/heart.svg";
 
 const notifStore = useNotifStore();
 
@@ -31,6 +32,8 @@ function getSvg(notif: NotifType) {
       return SuccessSvg;
     case NotifType.Working:
       return WorkingSvg;
+    case NotifType.Favorite:
+      return HeartSvg;
   }
 }
 </script>
@@ -70,7 +73,7 @@ function getSvg(notif: NotifType) {
   background-image: linear-gradient(275deg, $bg, $bg1 74%);
 }
 
-.new-notif.info {
+.new-notif.info, .new-notif.favorite {
   $bg: rgb(28, 102, 238);
   $bg1: rgba(31, 144, 236, 0.15);
   background-image: linear-gradient(275deg, $bg, $bg1 74%);
@@ -78,7 +81,7 @@ function getSvg(notif: NotifType) {
 
 .new-notif.success {
   $bg: rgb(5, 167, 53);
-  $bg1: rgba(5, 167, 54, .15);
+  $bg1: rgba(5, 167, 54, 0.15);
   background-image: linear-gradient(275deg, $bg, $bg1 74%);
 }
 
diff --git a/src/components/nav/Titles/ArtistDiscographyTitle.vue b/src/components/nav/Titles/ArtistDiscographyTitle.vue
index 78b03437..967a612c 100644
--- a/src/components/nav/Titles/ArtistDiscographyTitle.vue
+++ b/src/components/nav/Titles/ArtistDiscographyTitle.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="artist-discography-nav">
-    <h1 class="ellip">Creedence Clearwater Revival</h1>
+    <h1 class="ellip">{{ store.artistname }}</h1>
     <div class="buttons">
       <div class="select rounded-sm" v-auto-animate="{ duration: 10 }">
         <button class="selected" @click.prevent="showDropDown = !showDropDown">
@@ -21,7 +21,6 @@
           </div>
         </div>
       </div>
-      <button class="rounded-sm"><GridSvg /></button>
     </div>
   </div>
 </template>
@@ -69,7 +68,6 @@ onClickOutside(dropOptionsRef, (e) => {
 
   .buttons {
     display: flex;
-    gap: $small;
   }
 
   .selected {
@@ -86,7 +84,7 @@ onClickOutside(dropOptionsRef, (e) => {
 
   .select {
     position: relative;
-    width: 7rem;
+    width: 8rem;
     display: flex;
     align-items: center;
     font-size: calc($medium + 2px);
@@ -103,7 +101,7 @@ onClickOutside(dropOptionsRef, (e) => {
     .option {
       padding: $small;
       border-bottom: 1px solid $gray4;
-      width: 6.5rem;
+      width: 7.5rem;
 
       &:hover {
         border-radius: $smaller;
diff --git a/src/components/shared/SongItem.vue b/src/components/shared/SongItem.vue
index 5ca42be9..6902705e 100644
--- a/src/components/shared/SongItem.vue
+++ b/src/components/shared/SongItem.vue
@@ -5,11 +5,18 @@
     @dblclick.prevent="emitUpdate"
     @contextmenu.prevent="showMenu"
   >
-    <div class="index t-center ellip" @dblclick.prevent.stop="() => {}">
-      <span class="text">
+    <div
+      class="index t-center ellip"
+      @click.prevent="addToFav(track.trackhash)"
+      @dblclick.prevent.stop="() => {}"
+    >
+      <div class="text">
         {{ index }}
-      </span>
-      <HeartSvg />
+      </div>
+      <div class="heart-icon">
+        <HeartFillSvg v-if="fav" />
+        <HeartSvg v-else />
+      </div>
     </div>
     <div class="flex">
       <div @click.prevent="emitUpdate" class="thumbnail">
@@ -71,10 +78,13 @@ import { Track } from "@/interfaces";
 import { formatSeconds } from "@/utils";
 
 import HeartSvg from "@/assets/icons/heart.svg";
+import HeartFillSvg from "@/assets/icons/heart.fill.svg";
 import OptionSvg from "@/assets/icons/more.svg";
 import ArtistName from "./ArtistName.vue";
 
 import useQueueStore from "@/stores/queue";
+import { addFavorite, removeFavorite } from "@/composables/fetch/favorite";
+import { favType } from "@/composables/enums";
 
 const imguri = paths.images.thumb.small;
 const context_menu_showing = ref(false);
@@ -107,6 +117,26 @@ function isCurrent() {
 function isCurrentPlaying() {
   return isCurrent() && queue.playing;
 }
+
+const fav = ref(props.track.is_favorite);
+
+async function addToFav(trackhash: string) {
+  if (fav.value) {
+    const removed = await removeFavorite(favType.track, trackhash);
+
+    if (removed) {
+      fav.value = false;
+    }
+
+    return;
+  }
+
+  const added = await addFavorite(favType.track, trackhash);
+
+  if (added) {
+    fav.value = true;
+  }
+}
 </script>
 
 <style lang="scss">
@@ -137,7 +167,6 @@ function isCurrentPlaying() {
     }
 
     cursor: pointer;
-    // outline: solid 1px;
 
     .title {
       margin-bottom: 2px;
@@ -149,11 +178,15 @@ function isCurrentPlaying() {
 
     .index {
       .text {
+        transition-delay: 500ms;
+
         transform: translateX($smaller);
         opacity: 0;
       }
 
-      svg {
+      .heart-icon {
+        transition-delay: 500ms;
+
         transform: translateX(0);
         opacity: 1;
       }
@@ -189,17 +222,17 @@ function isCurrentPlaying() {
       display: block;
       margin: auto 0;
       transition: all 0.25s;
-      transform: translateX(0);
+      width: 100%;
     }
 
-    svg {
+    .heart-icon {
       position: absolute;
-      left: 0;
+      left: -2px;
+      display: grid;
+      height: 100%;
+      align-content: center;
       transition: all 0.2s;
-      top: $medium;
-      opacity: 0;
-      transform: translateX(-1rem);
-      cursor: pointer;
+      transform: translateX(-1.5rem);
     }
   }
 
diff --git a/src/composables/enums.ts b/src/composables/enums.ts
index b6542c7e..7d061762 100644
--- a/src/composables/enums.ts
+++ b/src/composables/enums.ts
@@ -12,6 +12,7 @@ export enum NotifType {
   Info = "info",
   Error = "error",
   Working = "working",
+  Favorite = "favorite",
 }
 
 export enum FromOptions {
@@ -51,3 +52,9 @@ export enum discographyAlbumTypes {
   eps = "EPs",
   appearances = "Appearances",
 }
+
+export enum favType {
+  artist = "artist",
+  album = "album",
+  track = "track",
+}
diff --git a/src/composables/fetch/artists.ts b/src/composables/fetch/artists.ts
index f473b290..17099775 100644
--- a/src/composables/fetch/artists.ts
+++ b/src/composables/fetch/artists.ts
@@ -26,6 +26,7 @@ const getArtistAlbums = async (hash: string, all = false, limit = 6) => {
     eps: Album[];
     singles: Album[];
     appearances: Album[];
+    artistname: string;
   }
 
   const { data, error } = await useAxios({
diff --git a/src/composables/fetch/favorite.ts b/src/composables/fetch/favorite.ts
new file mode 100644
index 00000000..c27eed0d
--- /dev/null
+++ b/src/composables/fetch/favorite.ts
@@ -0,0 +1,47 @@
+import useAxios from "./useAxios";
+import { paths } from "@/config";
+import { favType, NotifType } from "@/composables/enums";
+
+import { useNotifStore as notif } from "@/stores/notification";
+
+export async function addFavorite(favtype: favType, itemhash: string) {
+  const { data, error } = await useAxios({
+    url: paths.api.favorite,
+    props: {
+      type: favtype,
+      hash: itemhash,
+    },
+  });
+
+  if (error) {
+    notif().showNotification("Something funny happened!", NotifType.Error);
+    return false;
+  }
+
+  if (data) {
+    notif().showNotification("Added to favorites!", NotifType.Success);
+  }
+
+  return true;
+}
+
+export async function removeFavorite(favtype: favType, itemhash: string) {
+  const { data, error } = await useAxios({
+    url: paths.api.removeFavorite,
+    props: {
+      type: favtype,
+      hash: itemhash,
+    },
+  });
+
+  if (error) {
+    notif().showNotification("Something funny happened!", NotifType.Error);
+    return false;
+  }
+
+  if (data) {
+    notif().showNotification("Removed from favorites!", NotifType.Error);
+  }
+
+  return true;
+}
diff --git a/src/composables/fetch/playlists.ts b/src/composables/fetch/playlists.ts
index ddac88e8..e72e6168 100644
--- a/src/composables/fetch/playlists.ts
+++ b/src/composables/fetch/playlists.ts
@@ -7,7 +7,7 @@ const {
   new: newPlaylistUrl,
   all: allPlaylistsUrl,
   base: basePlaylistUrl,
-  artists: playlistArtistsUrl
+  artists: playlistArtistsUrl,
 } = paths.api.playlist;
 
 /**
@@ -109,7 +109,7 @@ async function getPlaylist(pid: string) {
 async function updatePlaylist(pid: string, playlist: FormData, pStore: any) {
   const uri = `${basePlaylistUrl}/${pid}/update`;
 
-  const { data, error } = await useAxios({
+  const { data, status } = await useAxios({
     url: uri,
     put: true,
     props: playlist,
@@ -118,8 +118,9 @@ async function updatePlaylist(pid: string, playlist: FormData, pStore: any) {
     },
   });
 
-  if (error) {
-    new Notification("Something funny happened!", NotifType.Error);
+  if (status == 400) {
+    new Notification("Failed: Unsupported image", NotifType.Error);
+    return;
   }
 
   if (data) {
diff --git a/src/composables/useKeyboard.ts b/src/composables/useKeyboard.ts
index 206e412f..cb1e5bfc 100644
--- a/src/composables/useKeyboard.ts
+++ b/src/composables/useKeyboard.ts
@@ -21,7 +21,7 @@ export default function (queue: typeof useQStore) {
     let ctrlKey = e.ctrlKey;
 
     function FocusedOnInput(target: HTMLElement) {
-      return target.tagName === "INPUT" || target.tagName === "TEXTAREA" || target.tagName === "BUTTON";
+      return target.tagName === "INPUT" || target.tagName === "TEXTAREA";
     }
 
     if (FocusedOnInput(target)) return;
diff --git a/src/config.ts b/src/config.ts
index 986d807c..6c64fdb1 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -12,7 +12,6 @@ const domains: D = {
 
 const ports = {
   api: 1970,
-  images: 1971,
 };
 
 const imageRoutes = {
@@ -34,7 +33,7 @@ function toggleMode() {
 
 const domain = () => domains[mode];
 
-const baseImgUrl = domain() + ports.images;
+const baseImgUrl = domain() + ports.api + "/img";
 
 const baseApiUrl = domain() + ports.api;
 
@@ -42,6 +41,10 @@ const paths = {
   api: {
     album: baseApiUrl + "/album",
     artist: baseApiUrl + "/artist",
+    favorite: baseApiUrl + "/favorite",
+    get removeFavorite() {
+      return this.favorite + "/remove";
+    },
     get albumartists() {
       return this.album + "/artists";
     },
@@ -95,6 +98,4 @@ const paths = {
   },
 };
 
-
-
 export { paths, toggleMode };
diff --git a/src/interfaces.ts b/src/interfaces.ts
index 0fa80797..38245d99 100644
--- a/src/interfaces.ts
+++ b/src/interfaces.ts
@@ -24,6 +24,7 @@ export interface Track extends AlbumDisc {
   trackhash: string;
   copyright?: string;
   filetype: string;
+  is_favorite: boolean;
 }
 
 export interface Folder {
diff --git a/src/stores/pages/artistDiscog.ts b/src/stores/pages/artistDiscog.ts
index b81daa74..7855c8b5 100644
--- a/src/stores/pages/artistDiscog.ts
+++ b/src/stores/pages/artistDiscog.ts
@@ -5,7 +5,7 @@ import { getArtistAlbums } from "@/composables/fetch/artists";
 
 export default defineStore("artistDiscography", {
   state: () => ({
-    artist: <string>"",
+    artistname: <string>"",
     page: discographyAlbumTypes.all,
 
     toShow: <Album[]>[],
@@ -17,6 +17,7 @@ export default defineStore("artistDiscography", {
   }),
   actions: {
     setAlbums(page: discographyAlbumTypes) {
+      this.setPage(page);
       switch (page) {
         case discographyAlbumTypes.albums:
           this.toShow = this.albums;
@@ -48,6 +49,7 @@ export default defineStore("artistDiscography", {
           this.eps = data.eps;
           this.singles = data.singles;
           this.appearances = data.appearances;
+          this.artistname = data.artistname;
         })
         .then(() => this.setAlbums(this.page));
     },
@@ -58,6 +60,7 @@ export default defineStore("artistDiscography", {
       this.appearances = [];
 
       this.toShow = [];
+      this.artistname = "";
     },
   },
 });
diff --git a/src/views/AlbumsGrid.vue b/src/views/AlbumsGrid.vue
index 6d0a3f94..c5495a35 100644
--- a/src/views/AlbumsGrid.vue
+++ b/src/views/AlbumsGrid.vue
@@ -1,12 +1,15 @@
 <template>
   <div class="album-grid-view v-scroll-page">
-    <div class="scrollable" v-auto-animate="{ duration: 100 }">
+    <div class="scrollable">
       <AlbumCard
         v-for="album in artist.toShow"
         :album="album"
         :key="album.albumhash"
       />
     </div>
+    <!-- <div class="no-albums rounded" v-if="artist.toShow.length == 0">
+      <b>No {{ artist.page }}</b>
+    </div> -->
   </div>
 </template>
 
@@ -42,5 +45,17 @@ onBeforeRouteLeave(() => {
     overflow: auto;
     max-height: 100%;
   }
+
+  .no-albums {
+    border: solid $red 1px;
+    width: 30rem;
+    display: block;
+    margin: 0 auto;
+    padding: 5rem;
+    text-align: center;
+    font-size: 1.25rem;
+    color: $red;
+    opacity: .5;
+  }
 }
 </style>