diff --git a/app/views/anime/add.php b/app/views/anime/add.php
index c471026b..d378f00a 100644
--- a/app/views/anime/add.php
+++ b/app/views/anime/add.php
@@ -2,6 +2,7 @@
 <main>
 	<h2>Add Anime to your List</h2>
 	<form action="<?= $action_url ?>" method="post">
+		<?php include realpath(__DIR__ . '/../js-warning.php') ?>
 		<section>
 			<div class="cssload-loader" hidden="hidden">
 				<div class="cssload-inner cssload-one"></div>
diff --git a/app/views/collection/_media-list.php b/app/views/collection/_media-list.php
new file mode 100644
index 00000000..855bb617
--- /dev/null
+++ b/app/views/collection/_media-list.php
@@ -0,0 +1,11 @@
+<select name="media_id[]" id="media_id" multiple size="13">
+	<?php foreach ($media_items as $group => $items): ?>
+		<optgroup label='<?= $group ?>'>
+			<?php foreach ($items as $id => $name): ?>
+				<option <?= in_array($id, ($item['media_id'] ?? []), FALSE) ? 'selected="selected"' : '' ?> value="<?= $id ?>">
+					<?= $name ?>
+				</option>
+			<?php endforeach ?>
+		</optgroup>
+	<?php endforeach ?>
+</select>
\ No newline at end of file
diff --git a/app/views/collection/add.php b/app/views/collection/add.php
index 59d93fce..0faa46df 100644
--- a/app/views/collection/add.php
+++ b/app/views/collection/add.php
@@ -2,6 +2,7 @@
 <main>
 	<h2>Add <?= ucfirst($collection_type) ?> to your Collection</h2>
 	<form action="<?= $action_url ?>" method="post">
+		<?php include realpath(__DIR__ . '/../js-warning.php') ?>
 		<section>
 			<div class="cssload-loader" hidden="hidden">
 				<div class="cssload-inner cssload-one"></div>
@@ -16,13 +17,9 @@
 		<table class="invisible form">
 			<tbody>
 				<tr>
-					<td><label for="media_id">Media</label></td>
-					<td>
-						<select name="media_id" id="media_id">
-						<?php foreach($media_items as $id => $name): ?>
-							<option value="<?= $id ?>"><?= $name ?></option>
-						<?php endforeach ?>
-						</select>
+					<td class="align-right"><label for="media_id">Media</label></td>
+					<td class='align-left'>
+						<?php include '_media-list.php' ?>
 					</td>
 				</tr>
 				<tr>
diff --git a/app/views/collection/edit.php b/app/views/collection/edit.php
index 1a56900b..16a1c38c 100644
--- a/app/views/collection/edit.php
+++ b/app/views/collection/edit.php
@@ -24,11 +24,7 @@
 				<tr>
 					<td class="align-right"><label for="media_id">Media</label></td>
 					<td class="align-left">
-						<select name="media_id" id="media_id">
-						<?php foreach($media_items as $id => $name): ?>
-							<option <?= $item['media_id'] === $id ? 'selected="selected"' : '' ?> value="<?= $id ?>"><?= $name ?></option>
-						<?php endforeach ?>
-						</select>
+						<?php include '_media-list.php' ?>
 					</td>
 				</tr>
 				<tr>
diff --git a/app/views/js-warning.php b/app/views/js-warning.php
new file mode 100644
index 00000000..d59f9a6a
--- /dev/null
+++ b/app/views/js-warning.php
@@ -0,0 +1,6 @@
+<noscript>
+<div class="message error">
+	<span class="icon"></span>
+	This feature requires Javascript to function :(
+</div>
+</noscript>
\ No newline at end of file
diff --git a/app/views/manga/add.php b/app/views/manga/add.php
index 76d431dd..dd19697d 100644
--- a/app/views/manga/add.php
+++ b/app/views/manga/add.php
@@ -2,6 +2,7 @@
 <main>
 	<h2>Add Manga to your List</h2>
 	<form action="<?= $action_url ?>" method="post">
+		<?php include realpath(__DIR__ . '/../js-warning.php') ?>
 		<section>
 			<div class="cssload-loader" hidden="hidden">
 				<div class="cssload-inner cssload-one"></div>
diff --git a/src/AnimeClient/Controller/AnimeCollection.php b/src/AnimeClient/Controller/AnimeCollection.php
index f8650c27..3ef9687c 100644
--- a/src/AnimeClient/Controller/AnimeCollection.php
+++ b/src/AnimeClient/Controller/AnimeCollection.php
@@ -152,28 +152,7 @@ final class AnimeCollection extends BaseController {
 	public function edit(): void
 	{
 		$this->checkAuth();
-
-		$data = $this->request->getParsedBody();
-		if (array_key_exists('hummingbird_id', $data))
-		{
-			$this->animeCollectionModel->update($data);
-
-			// Verify the item was actually updated
-			if ($this->animeCollectionModel->wasUpdated($data))
-			{
-				$this->setFlashMessage('Successfully updated collection item.', 'success');
-			}
-			else
-			{
-				$this->setFlashMessage('Failed to update collection item.', 'error');
-			}
-		}
-		else
-		{
-			$this->setFlashMessage('No item id to update. Update failed.', 'error');
-		}
-
-		$this->sessionRedirect();
+		$this->update($this->request->getParsedBody());
 	}
 
 	/**
@@ -192,11 +171,24 @@ final class AnimeCollection extends BaseController {
 		if (array_key_exists('id', $data))
 		{
 			// Check for existing entry
-			if ($this->animeCollectionModel->get($data['id']) !== FALSE)
+			if ($this->animeCollectionModel->has($data['id']))
 			{
-				// Redirect to the edit screen, because that's probably what you want!
-				$this->setFlashMessage('Anime already exists, update instead.', 'info');
-				$this->redirect("/anime-collection/edit/{$data['id']}", 303);
+				// Let's just update with the data we have
+				// if the entry already exists.
+				$data['hummingbird_id'] = $data['id'];
+				unset(
+					$data['id'],
+					$data['mal_id'],
+					$data['search']
+				);
+
+				// Don't overwrite notes if the box is empty
+				if (trim($data['notes']) === '')
+				{
+					unset($data['notes']);
+				}
+
+				$this->update($data);
 				return;
 			}
 
@@ -207,13 +199,12 @@ final class AnimeCollection extends BaseController {
 			{
 				$this->setFlashMessage('Successfully added collection item', 'success');
 				$this->sessionRedirect();
+				return;
 			}
 		}
-		else
-		{
-			$this->setFlashMessage('Failed to add collection item.', 'error');
-			$this->redirect('/anime-collection/add', 303);
-		}
+
+		$this->setFlashMessage('Failed to add collection item.', 'error');
+		$this->redirect('/anime-collection/add', 303);
 	}
 
 	/**
@@ -235,16 +226,30 @@ final class AnimeCollection extends BaseController {
 		$this->animeCollectionModel->delete($data);
 
 		// Verify that item was actually deleted
-		if ($this->animeCollectionModel->wasDeleted($data))
-		{
-			$this->setFlashMessage('Successfully removed anime from collection.', 'success');
-		}
-		else
-		{
-			$this->setFlashMessage('Failed to delete item from collection.', 'error');
-		}
+		($this->animeCollectionModel->wasDeleted($data))
+			? $this->setFlashMessage('Successfully removed anime from collection.', 'success')
+			: $this->setFlashMessage('Failed to delete item from collection.', 'error');
 
 		$this->redirect('/anime-collection/view', 303);
 	}
+
+	protected function update($data): void
+	{
+		if (array_key_exists('hummingbird_id', $data))
+		{
+			$this->animeCollectionModel->update($data);
+
+			// Verify the item was actually updated
+			($this->animeCollectionModel->wasUpdated($data))
+				? $this->setFlashMessage('Successfully updated collection item.', 'success')
+				: $this->setFlashMessage('Failed to update collection item.', 'error');
+		}
+		else
+		{
+			$this->setFlashMessage('No item id to update. Update failed.', 'error');
+		}
+
+		$this->sessionRedirect();
+	}
 }
 // End of AnimeCollection.php
\ No newline at end of file
diff --git a/src/AnimeClient/Model/AnimeCollection.php b/src/AnimeClient/Model/AnimeCollection.php
index 87a354f1..0b70f3c2 100644
--- a/src/AnimeClient/Model/AnimeCollection.php
+++ b/src/AnimeClient/Model/AnimeCollection.php
@@ -19,6 +19,7 @@ namespace Aviat\AnimeClient\Model;
 use Aviat\Ion\Di\ContainerInterface;
 use PDO;
 use PDOException;
+use function in_array;
 
 /**
  * Model for getting anime collection data
@@ -80,7 +81,7 @@ final class AnimeCollection extends Collection {
 			return [];
 		}
 
-		$output = [];
+		$flatList = [];
 
 		$query = $this->db->select('id, type')
 			->from('media')
@@ -88,49 +89,28 @@ final class AnimeCollection extends Collection {
 
 		foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row)
 		{
-			$output[$row['id']] = $row['type'];
+			$flatList[$row['id']] = $row['type'];
 		}
 
-		return $output;
-	}
-
-	/**
-	 * Get full collection from the database
-	 *
-	 * @return array
-	 */
-	private function getCollectionFromDatabase(): array
-	{
-		if ( ! $this->validDatabase)
-		{
-			return [];
-		}
-
-		$query = $this->db->select('hummingbird_id, slug, title, alternate_title, show_type,
-			 age_rating, episode_count, episode_length, cover_image, notes, media.type as media')
-			->from('anime_set a')
-			->join('media', 'media.id=a.media_id', 'inner')
-			->order_by('media')
-			->order_by('title')
-			->group_by('a.hummingbird_id, media.type')
-			->get();
-
-		// Add genres associated with each item
-		$rows = $query->fetchAll(PDO::FETCH_ASSOC);
-		$genres = $this->getGenreList();
-
-		foreach($rows as &$row)
-		{
-			$id = $row['hummingbird_id'];
-
-			$row['genres'] = array_key_exists($id, $genres)
-				? $genres[$id]
-				: [];
-
-			sort($row['genres']);
-		}
-
-		return $rows;
+		// Organize the media types into groups
+		return [
+			'Common' => [
+				2 => $flatList[2], // Blu-ray
+				3 => $flatList[3], // DVD
+				7 => $flatList[7], // Digital
+				4 => $flatList[4], // Bootleg
+			],
+			'Retro' => [
+				5 => $flatList[5], // LaserDisc
+				6 => $flatList[6], // VHS
+				9 => $flatList[9], // Betamax
+				8 => $flatList[8], // Video CD
+			],
+			'Other' => [
+				10 => $flatList[10], // UMD
+				11 => $flatList[11], // Other
+			]
+		];
 	}
 
 	/**
@@ -146,18 +126,16 @@ final class AnimeCollection extends Collection {
 			return;
 		}
 
-		$id = $data['id'];
-
 		// Check that the anime doesn't already exist
-		$existing = $this->get($id);
-		if ( ! empty($existing))
+		if ($this->has($data['id']))
 		{
 			return;
 		}
 
+		$id = $data['id'];
 		$anime = (object)$this->animeModel->getAnimeById($id);
 		$this->db->set([
-			'hummingbird_id' => $data['id'],
+			'hummingbird_id' => $id,
 			'slug' => $anime->slug,
 			'title' => array_shift($anime->titles),
 			'alternate_title' => implode('<br />', $anime->titles),
@@ -166,11 +144,12 @@ final class AnimeCollection extends Collection {
 			'cover_image' => $anime->cover_image,
 			'episode_count' => $anime->episode_count,
 			'episode_length' => $anime->episode_length,
-			'media_id' => $data['media_id'],
 			'notes' => $data['notes']
 		])->insert('anime_set');
 
-		$this->updateGenre($id);
+		$this->updateMediaLink($id, $data['media_id']);
+
+		$this->updateGenres($id);
 	}
 
 	/**
@@ -211,14 +190,22 @@ final class AnimeCollection extends Collection {
 		}
 
 		$id = $data['hummingbird_id'];
-		unset($data['hummingbird_id']);
+		$media = $data['media_id'];
+		unset($data['hummingbird_id'], $data['media_id']);
 
-		$this->db->set($data)
-			->where('hummingbird_id', $id)
-			->update('anime_set');
+		// If updating from the 'add' page, there
+		// might be no data to actually update in
+		// the anime_set table
+		if ( ! empty($data))
+		{
+			$this->db->set($data)
+				->where('hummingbird_id', $id)
+				->update('anime_set');
+		}
 
-		// Just in case, also update genres
-		$this->updateGenre($id);
+		// Update media and genres
+		$this->updateMediaLink($id, $media);
+		$this->updateGenres($id);
 	}
 
 	/**
@@ -239,6 +226,16 @@ final class AnimeCollection extends Collection {
 
 		foreach ($data as $key => $value)
 		{
+			if (is_array($row[$key]))
+			{
+				if ($row[$key] === $value)
+				{
+					continue;
+				}
+
+				return FALSE;
+			}
+
 			if ((string)$row[$key] !== (string)$value)
 			{
 				return FALSE;
@@ -285,29 +282,60 @@ final class AnimeCollection extends Collection {
 			return FALSE;
 		}
 
-		$animeRow = $this->get($data['hummingbird_id']);
-
-		return empty($animeRow);
+		return $this->has($data['hummingbird_id']) === FALSE;
 	}
 
 	/**
 	 * Get the details of a collection item
 	 *
-	 * @param int $kitsuId
-	 * @return array | false
+	 * @param int|string $kitsuId
+	 * @return array
 	 */
-	public function get($kitsuId)
+	public function get($kitsuId): array
+	{
+		if ($this->validDatabase === FALSE)
+		{
+			return [];
+		}
+
+		// Get the main row data
+		$row = $this->db->from('anime_set')
+			->where('hummingbird_id', $kitsuId)
+			->get()
+			->fetch(PDO::FETCH_ASSOC);
+
+		// Get the media ids
+		$mediaRows = $this->db->select('media_id')
+			->from('anime_set_media_link')
+			->where('hummingbird_id', $kitsuId)
+			->get()
+			->fetchAll(PDO::FETCH_ASSOC);
+
+		$row['media_id'] = array_column($mediaRows, 'media_id');
+
+		return $row;
+	}
+
+	/**
+	 * Does this anime already exist in the collection?
+	 *
+	 * @param int|string $kitsuId
+	 * @return bool
+	 */
+	public function has($kitsuId): bool
 	{
 		if ($this->validDatabase === FALSE)
 		{
 			return FALSE;
 		}
 
-		$query = $this->db->from('anime_set')
+		$row = $this->db->select('hummingbird_id')
+			->from('anime_set')
 			->where('hummingbird_id', $kitsuId)
-			->get();
+			->get()
+			->fetch(PDO::FETCH_ASSOC);
 
-		return $query->fetch(PDO::FETCH_ASSOC);
+		return ! empty($row);
 	}
 
 	/**
@@ -372,13 +400,32 @@ final class AnimeCollection extends Collection {
 		return $output;
 	}
 
+	private function updateMediaLink(string $animeId, array $media): void
+	{
+		// Delete the old entries
+		$this->db->where('hummingbird_id', $animeId)
+			->delete('anime_set_media_link');
+
+		// Add the new entries
+		$entries = [];
+		foreach ($media as $id)
+		{
+			$entries[] = [
+				'hummingbird_id' => $animeId,
+				'media_id' => $id,
+			];
+		}
+
+		$this->db->insertBatch('anime_set_media_link', $entries);
+	}
+
 	/**
 	 * Update genre information for selected anime
 	 *
 	 * @param string $animeId The current anime
 	 * @return void
 	 */
-	private function updateGenre($animeId): void
+	private function updateGenres($animeId): void
 	{
 		if ($this->validDatabase === FALSE)
 		{
@@ -405,7 +452,7 @@ final class AnimeCollection extends Collection {
 
 			$animeLinks = $links[$animeId] ?? [];
 
-			if ( ! \in_array($flippedGenres[$animeGenre], $animeLinks, TRUE))
+			if ( ! in_array($flippedGenres[$animeGenre], $animeLinks, TRUE))
 			{
 				$linksToInsert[] = [
 					'hummingbird_id' => $animeId,
@@ -416,7 +463,17 @@ final class AnimeCollection extends Collection {
 
 		if ( ! empty($linksToInsert))
 		{
-			$this->db->insertBatch('genre_anime_set_link', $linksToInsert);
+			try
+			{
+				$this->db->insertBatch('genre_anime_set_link', $linksToInsert);
+			}
+			catch (PDOException $e)
+			{
+				// This often results in a unique constraint violation
+				// So swallow this for now
+				// @TODO Fix properly
+			}
+
 		}
 	}
 
@@ -450,7 +507,7 @@ final class AnimeCollection extends Collection {
 		}
 		catch (PDOException $e)
 		{
-			dump($e);
+			// dump($e);
 		}
 	}
 
@@ -520,5 +577,45 @@ final class AnimeCollection extends Collection {
 
 		return $links;
 	}
+
+	/**
+	 * Get full collection from the database
+	 *
+	 * @return array
+	 */
+	private function getCollectionFromDatabase(): array
+	{
+		if ( ! $this->validDatabase)
+		{
+			return [];
+		}
+
+		$query = $this->db->select('a.hummingbird_id, slug, title, alternate_title, show_type,
+			 age_rating, episode_count, episode_length, cover_image, notes, media.type as media')
+			->from('anime_set a')
+			->join('anime_set_media_link ml', 'ml.hummingbird_id=a.hummingbird_id', 'inner')
+			->join('media', 'media.id=ml.media_id', 'inner')
+			->orderBy('media')
+			->orderBy('title')
+			->groupBy('a.hummingbird_id, media.type')
+			->get();
+
+		// Add genres associated with each item
+		$rows = $query->fetchAll(PDO::FETCH_ASSOC);
+		$genres = $this->getGenreList();
+
+		foreach($rows as &$row)
+		{
+			$id = $row['hummingbird_id'];
+
+			$row['genres'] = array_key_exists($id, $genres)
+				? $genres[$id]
+				: [];
+
+			sort($row['genres']);
+		}
+
+		return $rows;
+	}
 }
 // End of AnimeCollectionModel.php
\ No newline at end of file