diff --git a/src/components/screens/Characters.vue b/src/components/screens/Characters.vue
index 36d94f6..dc1e742 100644
--- a/src/components/screens/Characters.vue
+++ b/src/components/screens/Characters.vue
@@ -6,8 +6,8 @@
       <div class="flex gap-14 w-full max-h-[650px] overflow-x-auto" v-if="!isLoading">
         <!-- CHARACTER LIST -->
         <div v-for="character in characters" :key="character.id" class="group first:ml-auto last:mr-auto m-4 w-[170px] h-[275px] flex flex-col shrink-0 relative shadow-character" :class="{ active: selected_character == character.id }">
-          <img src="/assets/ui-elements/ui-box-outer.svg" class="absolute w-full h-full" />
-          <img src="/assets/ui-elements/ui-box-inner.svg" class="absolute left-2 bottom-2 w-[calc(100%_-_16px)] h-[calc(100%_-_40px)]" />
+          <img src="/assets/ui-elements/ui-box-outer.svg" class="absolute w-full h-full" alt="UI box outer" />
+          <img src="/assets/ui-elements/ui-box-inner.svg" class="absolute left-2 bottom-2 w-[calc(100%_-_16px)] h-[calc(100%_-_40px)]" alt="UI box inner" />
           <input class="opacity-0 h-full w-full absolute m-0 z-10" type="radio" :id="character.id" name="character" :value="character.id" v-model="selected_character" />
           <label class="font-bold absolute left-1/2 top-4 max-w-32 -translate-x-1/2 -translate-y-1/2 text-center text-ellipsis overflow-hidden whitespace-nowrap drop-shadow-text" :for="character.id">{{ character.name }}</label>
 
@@ -103,10 +103,10 @@ import Modal from '@/components/utilities/Modal.vue'
 import { type Character as CharacterT } from '@/types'
 import ConfirmationModal from '@/components/utilities/ConfirmationModal.vue'
 
-const isLoading = ref(true)
-const characters = ref([])
 const gameStore = useGameStore()
-const deletingCharacter = ref(null)
+const isLoading = ref(true)
+const characters = ref([] as CharacterT[])
+const deletingCharacter = ref(null as CharacterT | null)
 
 // Fetch characters
 gameStore.connection?.on('character:list', (data: any) => {
diff --git a/src/components/screens/Login.vue b/src/components/screens/Login.vue
index 17a6e3a..3242945 100644
--- a/src/components/screens/Login.vue
+++ b/src/components/screens/Login.vue
@@ -26,8 +26,8 @@
 import { onMounted, ref } from 'vue'
 import { useGameStore } from '@/stores/gameStore'
 import { useCookies } from '@vueuse/integrations/useCookies'
-import LoginForm from '@/components/screens/partials/LoginForm.vue'
-import RegisterForm from '@/components/screens/partials/RegisterForm.vue'
+import LoginForm from '@/components/screens/partials/login/LoginForm.vue'
+import RegisterForm from '@/components/screens/partials/login/RegisterForm.vue'
 import ResetPassword from '@/components/utilities/ResetPassword.vue'
 
 const isPasswordResetFormShown = ref(false)
diff --git a/src/components/screens/partials/LoginForm.vue b/src/components/screens/partials/login/LoginForm.vue
similarity index 100%
rename from src/components/screens/partials/LoginForm.vue
rename to src/components/screens/partials/login/LoginForm.vue
diff --git a/src/components/screens/partials/NewPasswordForm.vue b/src/components/screens/partials/login/NewPasswordForm.vue
similarity index 100%
rename from src/components/screens/partials/NewPasswordForm.vue
rename to src/components/screens/partials/login/NewPasswordForm.vue
diff --git a/src/components/screens/partials/RegisterForm.vue b/src/components/screens/partials/login/RegisterForm.vue
similarity index 100%
rename from src/components/screens/partials/RegisterForm.vue
rename to src/components/screens/partials/login/RegisterForm.vue