diff --git a/app/layouts/admin.vue b/app/layouts/admin.vue
index fe3dcb0..5746e30 100644
--- a/app/layouts/admin.vue
+++ b/app/layouts/admin.vue
@@ -18,6 +18,15 @@
 			<div class="category">
 				<p>Manage</p>
 
+				<Button
+					full
+					variant="ghost"
+					to="/admin/genre"
+					type="link"
+					icon-name="lucide:disc-3"
+				>
+					Genres
+				</Button>
 				<Button
 					full
 					variant="ghost"
@@ -25,7 +34,7 @@
 					type="link"
 					icon-name="lucide:mic-vocal"
 				>
-					Manage Artists
+					Artists
 				</Button>
 				<Button
 					full
@@ -34,7 +43,7 @@
 					type="link"
 					icon-name="lucide:gallery-vertical-end"
 				>
-					Manage Albums
+					Albums
 				</Button>
 				<Button
 					full
@@ -43,7 +52,7 @@
 					type="link"
 					icon-name="lucide:music"
 				>
-					Manage Songs
+					Songs
 				</Button>
 			</div>
 
diff --git a/app/pages/admin/albums.vue b/app/pages/admin/albums.vue
index 17ee0b0..8e75250 100644
--- a/app/pages/admin/albums.vue
+++ b/app/pages/admin/albums.vue
@@ -14,7 +14,7 @@ const tableRows: Row[] = [
 		name: "file",
 		displayName: "Cover",
 		type: "image",
-		imagePrefix: `${import.meta.env.VITE_PUBLIC_BACKEND}/static/`,
+		prefix: `${BACKEND_SERVE}/static/`,
 	},
 	{
 		name: "name",
diff --git a/app/pages/admin/artists.vue b/app/pages/admin/artists.vue
index dba835b..5af9242 100644
--- a/app/pages/admin/artists.vue
+++ b/app/pages/admin/artists.vue
@@ -14,7 +14,7 @@ const tableRows: Row[] = [
 		name: "file",
 		displayName: "Cover",
 		type: "image",
-		imagePrefix: `${import.meta.env.VITE_PUBLIC_BACKEND}/static/`,
+		prefix: `${BACKEND_SERVE}/static/`,
 	},
 	{
 		name: "name",
diff --git a/app/pages/admin/index.vue b/app/pages/admin/index.vue
index 773d3dd..e519b41 100644
--- a/app/pages/admin/index.vue
+++ b/app/pages/admin/index.vue
@@ -1 +1,3 @@
-<template>Hello</template>
+<script setup lang="ts"></script>
+
+<template></template>
diff --git a/app/pages/admin/songs.vue b/app/pages/admin/songs.vue
index 2a3c1dd..b441a8e 100644
--- a/app/pages/admin/songs.vue
+++ b/app/pages/admin/songs.vue
@@ -2,17 +2,29 @@
 import type { Field } from "~/components/Admin/ModalForm.vue"
 import type { Row } from "~/ui/Table.vue"
 
-const { data, status } = useApiFetch<Track[]>("/all/tracks")
+const { data, refresh } = useApiFetch<Album[]>("/all/tracks")
+const toast = useToast()
 
 const tableRows: Row[] = [
 	{
 		name: "_id",
 		displayName: "ID",
 	},
+	{
+		name: "fileDir",
+		displayName: "Audio File",
+		type: "audio",
+		prefix: `${BACKEND_SERVE}/static/`,
+		suffix: "/original.m4a",
+	},
 	{
 		name: "name",
 		displayName: "Name",
 	},
+	{
+		name: "album.name",
+		displayName: "Album",
+	},
 	{
 		name: "action",
 	},
@@ -20,28 +32,76 @@ const tableRows: Row[] = [
 
 import { type Option } from "~/ui/SearchSelect.vue"
 
-const options: Option[] = [
-	{ label: "A", value: "a" },
-	{ label: "B", value: "b" },
-]
+const { data: artistData } = useApiFetch<Genre[]>("/all/artists")
+const artistFetchOptions = async (q?: string): Promise<Option[]> => {
+	return artistData.value.map<Option>((g) => ({
+		label: g.name,
+		value: g._id,
+	}))
+}
 
-const fetchOptions = async (q: string): Promise<Option[]> => {
-	return options
+const { data: albumData } = useApiFetch<Genre[]>("/all/albums")
+const albumFetchOptions = async (q?: string): Promise<Option[]> => {
+	return albumData.value.map<Option>((g) => ({
+		label: g.name,
+		value: g._id,
+	}))
 }
 
 const modalFields: Field[] = [
 	{ key: "name", label: "Name" },
-	{ key: "album", label: "Album", type: "search-select", fetchOptions },
 	{ key: "file", label: "Audio file", type: "file" },
+	{
+		key: "artists",
+		label: "Artists",
+		type: "search-select-array",
+		fetchOptions: artistFetchOptions,
+	},
+	{
+		key: "album",
+		label: "Album",
+		type: "search-select",
+		fetchOptions: albumFetchOptions,
+	},
 ]
 
 const showModal = ref<boolean>(false)
 const item = ref<Track | undefined>(undefined)
 
-const save = (value: any) => {
-	console.log(value)
+const save = async (value: any) => {
+	if (value._id) {
+		try {
+			await cfetch("/admin/track", {
+				method: "PATCH",
+				data: value,
+				params: { id: value._id },
+				forceFormData: true,
+			})
 
-	return false
+			toast.show("Song updated successfully", "success")
+		} catch {
+			toast.show("Failed to update song", "error")
+
+			return false
+		}
+	} else {
+		try {
+			await cfetch("/admin/track", {
+				method: "POST",
+				data: value,
+			})
+
+			toast.show("Song added successfully", "success")
+		} catch {
+			toast.show("Failed to add song", "error")
+
+			return false
+		}
+	}
+
+	refresh()
+
+	return true
 }
 
 /**
@@ -51,6 +111,8 @@ const show = (id?: string) => {
 	if (!id) {
 		item.value = undefined
 		showModal.value = true
+
+		return
 	}
 
 	const curItem: any = data.value.filter((i) => i._id == id)[0]
@@ -65,13 +127,23 @@ const show = (id?: string) => {
 			label: curItem.album.name,
 		}
 
+	if (transformed.artists)
+		transformed.artists = transformed.artists.map((a: Artist) => ({
+			value: a._id,
+			label: a.name,
+		}))
+
 	item.value = transformed
 
 	showModal.value = true
 }
+
+watch(data, () => console.log(data))
 </script>
 
 <template>
+	<h1 class="title">Manage songs</h1>
+
 	<Table :rows="tableRows" :data="data" class="table">
 		<template #action="{ item, index }">
 			<div class="action">
@@ -87,11 +159,18 @@ const show = (id?: string) => {
 		@save="save"
 		:fields="modalFields"
 		:item="item"
-		title="Add new song"
+		:title="item ? 'Edit song' : 'Add new song'"
 	/>
 </template>
 
 <style lang="scss" scoped>
+@use "@/styles/util" as *;
+
+.title {
+	@include fontSize(24px);
+	margin-bottom: 0.4rem;
+}
+
 .action {
 	display: flex;
 	gap: 0.2rem;