diff --git a/src/components/CastList.vue b/src/components/CastList.vue
index 53ba5c2..879abf7 100644
--- a/src/components/CastList.vue
+++ b/src/components/CastList.vue
@@ -13,10 +13,16 @@
 <script setup lang="ts">
   import { defineProps } from "vue";
   import CastListItem from "src/components/CastListItem.vue";
-  import type { MediaTypes, CreditTypes } from "../interfaces/IList";
+  import type {
+    IMovie,
+    IShow,
+    IPerson,
+    ICast,
+    ICrew
+  } from "../interfaces/IList";
 
   interface Props {
-    cast: Array<MediaTypes | CreditTypes>;
+    cast: Array<IMovie | IShow | IPerson | ICast | ICrew>;
   }
 
   defineProps<Props>();
diff --git a/src/components/CastListItem.vue b/src/components/CastListItem.vue
index 10dba53..35b6ce7 100644
--- a/src/components/CastListItem.vue
+++ b/src/components/CastListItem.vue
@@ -11,10 +11,10 @@
 <script setup lang="ts">
   import { defineProps, computed } from "vue";
   import { useStore } from "vuex";
-  import type { MediaTypes, CreditTypes } from "../interfaces/IList";
+  import type { ICast, ICrew, IMovie, IShow } from "../interfaces/IList";
 
   interface Props {
-    creditItem: MediaTypes | CreditTypes;
+    creditItem: ICast | ICrew | IMovie | IShow;
   }
 
   const props = defineProps<Props>();
diff --git a/src/components/Popup.vue b/src/components/Popup.vue
index 18b68a5..0151932 100644
--- a/src/components/Popup.vue
+++ b/src/components/Popup.vue
@@ -14,13 +14,12 @@
   import { useStore } from "vuex";
   import Movie from "@/components/popup/Movie.vue";
   import Person from "@/components/popup/Person.vue";
-  import { ListTypes } from "../interfaces/IList";
-  import type { MediaTypes } from "../interfaces/IList";
+  import { MediaTypes } from "../interfaces/IList";
   import type { Ref } from "vue";
 
   interface URLQueryParameters {
     id: number;
-    type: ListTypes;
+    type: MediaTypes;
   }
 
   const store = useStore();
@@ -41,14 +40,23 @@
   });
 
   function getFromURLQuery(): URLQueryParameters {
-    let id, type;
+    let id: number;
+    let type: MediaTypes;
 
     const params = new URLSearchParams(window.location.search);
     params.forEach((value, key) => {
-      if (!(key in ListTypes)) return;
+      if (
+        !(
+          key === MediaTypes.Movie ||
+          key === MediaTypes.Show ||
+          key === MediaTypes.Person
+        )
+      ) {
+        return;
+      }
 
       id = Number(params.get(key));
-      type = key;
+      type = MediaTypes[key];
     });
 
     return { id, type };
diff --git a/src/components/ResultsList.vue b/src/components/ResultsList.vue
index e78c446..08a940e 100644
--- a/src/components/ResultsList.vue
+++ b/src/components/ResultsList.vue
@@ -7,7 +7,7 @@
     >
       <results-list-item
         v-for="(result, index) in results"
-        :key="`${result.type}-${result.id}-${index}`"
+        :key="generateResultKey(index, `${result.type}-${result.id}`)"
         :listItem="result"
       />
     </ul>
@@ -28,6 +28,10 @@
   }
 
   const props = defineProps<Props>();
+
+  function generateResultKey(index: string | number | symbol, value: string) {
+    return `${String(index)}-${value}`;
+  }
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/ResultsListItem.vue b/src/components/ResultsListItem.vue
index b37e051..7f9703a 100644
--- a/src/components/ResultsListItem.vue
+++ b/src/components/ResultsListItem.vue
@@ -38,10 +38,10 @@
   import { useStore } from "vuex";
   import { buildImageProxyUrl } from "../utils";
   import type { Ref } from "vue";
-  import type { MediaTypes } from "../interfaces/IList";
+  import type { IMovie, IShow, IPerson, IRequest } from "../interfaces/IList";
 
   interface Props {
-    listItem: MediaTypes;
+    listItem: IMovie | IShow | IPerson;
   }
 
   const props = defineProps<Props>();
diff --git a/src/components/header/SearchInput.vue b/src/components/header/SearchInput.vue
index c195cba..ba78317 100644
--- a/src/components/header/SearchInput.vue
+++ b/src/components/header/SearchInput.vue
@@ -52,13 +52,13 @@
   import IconClose from "@/icons/IconClose.vue";
   import config from "../../config";
   import type { Ref } from "vue";
-  import type { ListTypes } from "../../interfaces/IList";
+  import type { MediaTypes } from "../../interfaces/IList";
 
   interface ISearchResult {
     title: string;
     id: number;
     adult: boolean;
-    type: ListTypes;
+    type: MediaTypes;
   }
 
   const store = useStore();
diff --git a/src/components/popup/Movie.vue b/src/components/popup/Movie.vue
index bd4853d..57357be 100644
--- a/src/components/popup/Movie.vue
+++ b/src/components/popup/Movie.vue
@@ -15,7 +15,7 @@
       </figure>
 
       <div v-if="media" class="movie__title">
-        <h1>{{ media.title || media.name }}</h1>
+        <h1>{{ media.title }}</h1>
         <i>{{ media.tagline }}</i>
       </div>
       <loading-placeholder v-else :count="2" />
@@ -111,9 +111,13 @@
               title="Release date"
               :detail="media.year"
             />
-            <Detail v-if="media.rating" title="Rating" :detail="media.rating" />
             <Detail
-              v-if="media.type == ListTypes.Show"
+              v-if="media.type === MediaTypes.Movie && media.rating"
+              title="Rating"
+              :detail="media.rating"
+            />
+            <Detail
+              v-if="media.type == MediaTypes.Show"
               title="Seasons"
               :detail="media.seasons"
             />
@@ -184,7 +188,7 @@
     IMediaCredits,
     ICast
   } from "../../interfaces/IList";
-  import { ListTypes } from "../../interfaces/IList";
+  import { MediaTypes } from "../../interfaces/IList";
 
   import { humanMinutes } from "../../utils";
   import {
@@ -200,7 +204,7 @@
 
   interface Props {
     id: number;
-    type: ListTypes.Movie | ListTypes.Show;
+    type: MediaTypes.Movie | MediaTypes.Show;
   }
 
   const props = defineProps<Props>();
@@ -243,10 +247,10 @@
     let apiFunction: Function;
     let parameters: object;
 
-    if (props.type === ListTypes.Movie) {
+    if (props.type === MediaTypes.Movie) {
       apiFunction = getMovie;
       parameters = { checkExistance: true, credits: false };
-    } else if (props.type === ListTypes.Show) {
+    } else if (props.type === MediaTypes.Show) {
       apiFunction = getShow;
       parameters = { checkExistance: true, credits: false };
     }
@@ -260,11 +264,11 @@
   }
 
   function getCredits(
-    type: ListTypes.Movie | ListTypes.Show
+    type: MediaTypes.Movie | MediaTypes.Show
   ): Promise<IMediaCredits> {
-    if (type === ListTypes.Movie) {
+    if (type === MediaTypes.Movie) {
       return getMovieCredits(props.id);
-    } else if (type === ListTypes.Show) {
+    } else if (type === MediaTypes.Show) {
       return getShowCredits(props.id);
     }
 
@@ -301,7 +305,7 @@
   }
 
   function openTmdb() {
-    const tmdbType = props.type === ListTypes.Show ? "tv" : props.type;
+    const tmdbType = props.type === MediaTypes.Show ? "tv" : props.type;
     const tmdbURL = "https://www.themoviedb.org/" + tmdbType + "/" + props.id;
     window.location.href = tmdbURL;
   }
diff --git a/src/components/popup/Person.vue b/src/components/popup/Person.vue
index c778de8..f2b6c36 100644
--- a/src/components/popup/Person.vue
+++ b/src/components/popup/Person.vue
@@ -3,7 +3,7 @@
     <header ref="header">
       <div class="info">
         <h1 v-if="person">
-          {{ person.title || person.name }}
+          {{ person.name }}
         </h1>
         <div v-else>
           <loading-placeholder :count="1" />
@@ -84,7 +84,7 @@
     IMovie,
     IShow
   } from "../../interfaces/IList";
-  import { ListTypes } from "../../interfaces/IList";
+  import { MediaTypes } from "../../interfaces/IList";
 
   interface Props {
     id: number;
@@ -137,12 +137,12 @@
 
   function personCreditedFrom(cast: Array<IMovie | IShow>): void {
     creditedMovies.value = cast
-      .filter(credit => credit.type === ListTypes.Movie)
+      .filter(credit => credit.type === MediaTypes.Movie)
       .filter(alreadyExists)
       .sort(sortPopularity);
 
     creditedShows.value = cast
-      .filter(credit => credit.type === ListTypes.Show)
+      .filter(credit => credit.type === MediaTypes.Show)
       .filter(alreadyExists)
       .sort(sortPopularity);
   }
diff --git a/src/components/profile/ChangePassword.vue b/src/components/profile/ChangePassword.vue
index bb7de88..9ae2f7b 100644
--- a/src/components/profile/ChangePassword.vue
+++ b/src/components/profile/ChangePassword.vue
@@ -34,8 +34,9 @@
   import SeasonedInput from "@/components/ui/SeasonedInput.vue";
   import SeasonedButton from "@/components/ui/SeasonedButton.vue";
   import SeasonedMessages from "@/components/ui/SeasonedMessages.vue";
+  import { ErrorMessageTypes } from "../../interfaces/IErrorMessage";
   import type { Ref } from "vue";
-  import type IErrorMessage from "../../interfaces/IErrorMessage";
+  import type { IErrorMessage } from "../../interfaces/IErrorMessage";
 
   interface ResetPasswordPayload {
     old_password: string;
@@ -52,7 +53,11 @@
   }
 
   function addWarningMessage(message: string, title?: string) {
-    messages.value.push({ message, title, type: "warning" });
+    messages.value.push({
+      message,
+      title,
+      type: ErrorMessageTypes.Warning
+    } as IErrorMessage);
   }
 
   function validate() {
diff --git a/src/components/profile/LinkPlexAccount.vue b/src/components/profile/LinkPlexAccount.vue
index 67319f4..2e6c16c 100644
--- a/src/components/profile/LinkPlexAccount.vue
+++ b/src/components/profile/LinkPlexAccount.vue
@@ -49,8 +49,9 @@
   import SeasonedButton from "@/components/ui/SeasonedButton.vue";
   import SeasonedMessages from "@/components/ui/SeasonedMessages.vue";
   import { linkPlexAccount, unlinkPlexAccount } from "../../api";
+  import { ErrorMessageTypes } from "../../interfaces/IErrorMessage";
   import type { Ref, ComputedRef } from "vue";
-  import type IErrorMessage from "../../interfaces/IErrorMessage";
+  import type { IErrorMessage } from "../../interfaces/IErrorMessage";
 
   interface Emit {
     (e: "reload");
@@ -89,10 +90,10 @@
     }
 
     messages.value.push({
-      type: success ? "success" : "error",
+      type: success ? ErrorMessageTypes.Success : ErrorMessageTypes.Error,
       title: success ? "Authenticated with plex" : "Something went wrong",
       message: message
-    });
+    } as IErrorMessage);
   }
 
   async function unauthenticatePlex() {
@@ -103,12 +104,14 @@
     }
 
     messages.value.push({
-      type: response.success ? "success" : "error",
+      type: response.success
+        ? ErrorMessageTypes.Success
+        : ErrorMessageTypes.Error,
       title: response.success
         ? "Unlinked plex account "
         : "Something went wrong",
       message: response.message
-    });
+    } as IErrorMessage);
   }
 </script>
 
diff --git a/src/components/ui/SeasonedInput.vue b/src/components/ui/SeasonedInput.vue
index 383bb5a..d8405fa 100644
--- a/src/components/ui/SeasonedInput.vue
+++ b/src/components/ui/SeasonedInput.vue
@@ -39,7 +39,7 @@
 
   interface Emit {
     (e: "change");
-    (e: "enter");
+    (e: "enter", event?: KeyboardEvent);
     (e: "update:modelValue", value: string);
   }
 
diff --git a/src/components/ui/SeasonedMessages.vue b/src/components/ui/SeasonedMessages.vue
index 0670aac..b2d7271 100644
--- a/src/components/ui/SeasonedMessages.vue
+++ b/src/components/ui/SeasonedMessages.vue
@@ -3,34 +3,32 @@
     <div
       class="card"
       v-for="(message, index) in messages"
-      :key="`${index}-${message.title}-${message.type}}`"
+      :key="generateMessageKey(index, message)"
       :class="message.type || 'warning'"
     >
       <span class="pinstripe"></span>
       <div class="content">
         <h2 class="title">
-          {{ message.title || defaultTitles[message.type] }}
+          {{ message.title }}
         </h2>
         <span v-if="message.message" class="message">{{
           message.message
         }}</span>
       </div>
 
-      <button class="dismiss" @click="dismiss(index)">X</button>
+      <button class="dismiss" @click="dismiss(Number(index))">X</button>
     </div>
   </transition-group>
 </template>
 
 <script setup lang="ts">
   import { defineProps, defineEmits } from "vue";
+  import type {
+    ErrorMessageTypes,
+    IErrorMessage
+  } from "../../interfaces/IErrorMessage";
   import type { Ref } from "vue";
 
-  interface IErrorMessage {
-    title: string;
-    message: string;
-    type: "error" | "success" | "warning";
-  }
-
   interface Props {
     messages: IErrorMessage[];
   }
@@ -45,14 +43,25 @@
   const defaultTitles = {
     error: "Unexpected error",
     warning: "Something went wrong",
-    success: "",
+    success: "Success!",
     undefined: "Something went wrong"
   };
 
+  function titleFromType(type: ErrorMessageTypes) {
+    return defaultTitles[type];
+  }
+
   function dismiss(index: number) {
     props.messages.splice(index, 1);
     emit("update:messages", [...props.messages]);
   }
+
+  function generateMessageKey(
+    index: string | number | symbol,
+    errorMessage: IErrorMessage
+  ) {
+    return `${String(index)}-${errorMessage.title}-${errorMessage.type}`;
+  }
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/interfaces/IErrorMessage.ts b/src/interfaces/IErrorMessage.ts
index 810d1e2..6a9c2aa 100644
--- a/src/interfaces/IErrorMessage.ts
+++ b/src/interfaces/IErrorMessage.ts
@@ -1,5 +1,12 @@
-export default interface IErrorMessage {
+export enum ErrorMessageTypes {
+  Error = "error",
+  Success = "success",
+  Warning = "warning"
+}
+
+export interface IErrorMessage {
+  id: string;
   title: string;
   message: string;
-  type: "error" | "success" | "warning";
+  type: ErrorMessageTypes;
 }
diff --git a/src/interfaces/IStatePopup.ts b/src/interfaces/IStatePopup.ts
index 3932759..6014858 100644
--- a/src/interfaces/IStatePopup.ts
+++ b/src/interfaces/IStatePopup.ts
@@ -11,7 +11,7 @@ import type { MediaTypes } from "./IList";
 // }
 
 export interface IStatePopup {
-  id: number | null;
-  type: MediaTypes | null;
+  id: number;
+  type: MediaTypes;
   open: boolean;
 }
diff --git a/src/modules/popup.ts b/src/modules/popup.ts
index 1d73150..97060d0 100644
--- a/src/modules/popup.ts
+++ b/src/modules/popup.ts
@@ -1,5 +1,5 @@
 import router from "../routes";
-import { ListTypes } from "../interfaces/IList";
+import { MediaTypes } from "../interfaces/IList";
 import type { IStatePopup } from "../interfaces/IStatePopup";
 
 const removeIncludedQueryParams = (params, key) => {
@@ -16,7 +16,7 @@ function paramsToObject(entries) {
   return result;
 }
 
-const updateQueryParams = (id: number | null = null, type: string = "") => {
+const updateQueryParams = (id: number = null, type: MediaTypes = null) => {
   let params = new URLSearchParams(window.location.search);
   params = removeIncludedQueryParams(params, "movie");
   params = removeIncludedQueryParams(params, "show");
@@ -59,7 +59,7 @@ export default {
     }
   },
   actions: {
-    open: ({ commit }, { id, type = "movie" }) => {
+    open: ({ commit }, { id, type }: { id: number; type: MediaTypes }) => {
       if (!isNaN(id)) id = Number(id);
       commit("SET_OPEN", { id, type });
       updateQueryParams(id, type);
diff --git a/src/pages/Home.vue b/src/pages/Home.vue
index 261456d..1ba36bb 100644
--- a/src/pages/Home.vue
+++ b/src/pages/Home.vue
@@ -2,7 +2,7 @@
   <section>
     <LandingBanner />
 
-    <div v-for="list in lists" :key="list.name">
+    <div v-for="list in lists" :key="list.title">
       <ResultsSection
         :apiFunction="list.apiFunction"
         :title="list.title"
diff --git a/src/pages/RegisterPage.vue b/src/pages/RegisterPage.vue
index 33ae639..aad27b7 100644
--- a/src/pages/RegisterPage.vue
+++ b/src/pages/RegisterPage.vue
@@ -46,8 +46,9 @@
   import SeasonedMessages from "@/components/ui/SeasonedMessages.vue";
   import { register } from "../api";
   import { focusFirstFormInput, focusOnNextElement } from "../utils";
+  import { ErrorMessageTypes } from "../interfaces/IErrorMessage";
   import type { Ref } from "vue";
-  import type IErrorMessage from "../interfaces/IErrorMessage";
+  import type { IErrorMessage } from "../interfaces/IErrorMessage";
 
   const username: Ref<string> = ref("");
   const password: Ref<string> = ref("");
@@ -65,11 +66,19 @@
   }
 
   function addErrorMessage(message: string, title?: string) {
-    messages.value.push({ message, title, type: "error" });
+    messages.value.push({
+      message,
+      title,
+      type: ErrorMessageTypes.Error
+    } as IErrorMessage);
   }
 
   function addWarningMessage(message: string, title?: string) {
-    messages.value.push({ message, title, type: "warning" });
+    messages.value.push({
+      message,
+      title,
+      type: ErrorMessageTypes.Warning
+    } as IErrorMessage);
   }
 
   function validate(): Promise<boolean> {
diff --git a/src/pages/SearchPage.vue b/src/pages/SearchPage.vue
index 4d87e4b..3bddf4e 100644
--- a/src/pages/SearchPage.vue
+++ b/src/pages/SearchPage.vue
@@ -26,7 +26,7 @@
   import PageHeader from "@/components/PageHeader.vue";
   import ToggleButton from "@/components/ui/ToggleButton.vue";
   import type { Ref } from "vue";
-  import { ListTypes } from "../interfaces/IList";
+  import { MediaTypes } from "../interfaces/IList";
 
   // interface ISearchParams {
   //   query: string;
@@ -38,11 +38,11 @@
   const route = useRoute();
   const router = useRouter();
 
-  const toggleOptions = ["all", ...Object.values(ListTypes)];
+  const toggleOptions = ["all", ...Object.values(MediaTypes)];
   const query: Ref<string> = ref(null);
   const page: Ref<number> = ref(1);
   const adult: Ref<boolean> = ref(false);
-  const mediaType: Ref<ListTypes> = ref(null);
+  const mediaType: Ref<MediaTypes> = ref(null);
 
   const title = computed(() => `Search results: ${query.value}`);
 
@@ -51,7 +51,7 @@
     query.value = decodeURIComponent(urlQuery?.query?.toString());
     page.value = Number(urlQuery?.page) || 1;
     adult.value = Boolean(urlQuery?.adult) || adult.value;
-    mediaType.value = (urlQuery?.media_type as ListTypes) || mediaType.value;
+    mediaType.value = (urlQuery?.media_type as MediaTypes) || mediaType.value;
   }
 
   let search = (
diff --git a/src/pages/SigninPage.vue b/src/pages/SigninPage.vue
index 4987466..f5ba26a 100644
--- a/src/pages/SigninPage.vue
+++ b/src/pages/SigninPage.vue
@@ -37,8 +37,9 @@
   import SeasonedMessages from "@/components/ui/SeasonedMessages.vue";
   import { login } from "../api";
   import { focusFirstFormInput, focusOnNextElement } from "../utils";
+  import { ErrorMessageTypes } from "../interfaces/IErrorMessage";
   import type { Ref } from "vue";
-  import type IErrorMessage from "../interfaces/IErrorMessage";
+  import type { IErrorMessage } from "../interfaces/IErrorMessage";
 
   const username: Ref<string> = ref("");
   const password: Ref<string> = ref("");
@@ -55,11 +56,19 @@
   }
 
   function addErrorMessage(message: string, title?: string) {
-    messages.value.push({ message, title, type: "error" });
+    messages.value.push({
+      message,
+      title,
+      type: ErrorMessageTypes.Error
+    } as IErrorMessage);
   }
 
   function addWarningMessage(message: string, title?: string) {
-    messages.value.push({ message, title, type: "warning" });
+    messages.value.push({
+      message,
+      title,
+      type: ErrorMessageTypes.Warning
+    } as IErrorMessage);
   }
 
   function validate(): Promise<boolean> {