diff --git a/app/views/collection/_media-list.php b/app/views/collection/_media-select-list.php
similarity index 100%
rename from app/views/collection/_media-list.php
rename to app/views/collection/_media-select-list.php
diff --git a/app/views/collection/add.php b/app/views/collection/add.php
index 0faa46df..7a8bca88 100644
--- a/app/views/collection/add.php
+++ b/app/views/collection/add.php
@@ -19,7 +19,7 @@
 				<tr>
 					<td class="align-right"><label for="media_id">Media</label></td>
 					<td class='align-left'>
-						<?php include '_media-list.php' ?>
+						<?php include '_media-select-list.php' ?>
 					</td>
 				</tr>
 				<tr>
diff --git a/app/views/collection/cover-item.php b/app/views/collection/cover-item.php
index 5e740899..13b50728 100644
--- a/app/views/collection/cover-item.php
+++ b/app/views/collection/cover-item.php
@@ -18,7 +18,9 @@
 		</div>
 		<?php endif ?>
 		<div class="row">
+			<?php if ($item['episode_count'] > 1): ?>
 			<div class="completion">Episodes: <?= $item['episode_count'] ?></div>
+			<?php endif ?>
 			<div class="media_type"><?= $item['show_type'] ?></div>
 			<div class="age-rating"><?= $item['age_rating'] ?></div>
 		</div>
diff --git a/app/views/collection/cover.php b/app/views/collection/cover.php
index 77be67fd..0d4c1345 100644
--- a/app/views/collection/cover.php
+++ b/app/views/collection/cover.php
@@ -11,7 +11,7 @@
 	<div class="tabs">
 	<?php $i = 0; ?>
 	<?php foreach ($sections as $name => $items): ?>
-		<input <?= $i === 0 ? 'checked="checked"' : '' ?> type="radio" id="collection-tab-<?= $i ?>" name="collection-tabs" />
+		<input type="radio" id="collection-tab-<?= $i ?>" name="collection-tabs" />
 		<label for="collection-tab-<?= $i ?>"><h2><?= $name ?></h2></label>
 		<div class="content full-height">
 			<section class="media-wrap">
@@ -23,17 +23,14 @@
 		<?php $i++; ?>
 	<?php endforeach ?>
 	<!-- All Tab -->
-	<input type='radio' id='collection-tab-<?= $i ?>' name='collection-tabs' />
+	<input type='radio' checked='checked' id='collection-tab-<?= $i ?>' name='collection-tabs' />
 	<label for='collection-tab-<?= $i ?>'><h2>All</h2></label>
 	<div class='content full-height'>
-	<?php foreach ($sections as $name => $items): ?>
-		<h3><?= $name ?></h3>
 		<section class="media-wrap">
-			<?php foreach ($items as $item): ?>
+			<?php foreach ($all as $item): ?>
 				<?php include __DIR__ . '/cover-item.php'; ?>
 			<?php endforeach ?>
 		</section>
-	<?php endforeach ?>
 	</div>
 	</div>
 <?php endif ?>
diff --git a/app/views/collection/edit.php b/app/views/collection/edit.php
index 16a1c38c..c3b8f2b0 100644
--- a/app/views/collection/edit.php
+++ b/app/views/collection/edit.php
@@ -24,7 +24,7 @@
 				<tr>
 					<td class="align-right"><label for="media_id">Media</label></td>
 					<td class="align-left">
-						<?php include '_media-list.php' ?>
+						<?php include '_media-select-list.php' ?>
 					</td>
 				</tr>
 				<tr>
diff --git a/app/views/collection/list-all.php b/app/views/collection/list-all.php
new file mode 100644
index 00000000..c7ff2d3d
--- /dev/null
+++ b/app/views/collection/list-all.php
@@ -0,0 +1,44 @@
+<input type='radio' checked='checked' id='collection-tab-<?= $i ?>' name='collection-tabs' />
+<label for='collection-tab-<?= $i ?>'><h2>All</h2></label>
+<div class="content full-height">
+	<table class="full-width media-wrap">
+		<thead>
+		<tr>
+			<?php if ($auth->isAuthenticated()): ?><td>&nbsp;</td><?php endif ?>
+			<th>Title</th>
+			<th>Media</th>
+			<th>Episode Count</th>
+			<th>Episode Length</th>
+			<th>Show Type</th>
+			<th>Age Rating</th>
+			<th>Notes</th>
+			<th>Genres</th>
+		</tr>
+		</thead>
+		<tbody>
+		<?php foreach ($all as $item): ?>
+			<?php $editLink = $url->generate($collection_type . '.collection.edit.get', ['id' => $item['hummingbird_id']]); ?>
+			<tr>
+				<?php if ($auth->isAuthenticated()): ?>
+					<td>
+						<a class="bracketed" href="<?= $editLink ?>">Edit</a>
+					</td>
+				<?php endif ?>
+				<td class="align-left">
+					<a href="<?= $url->generate('anime.details', ['id' => $item['slug']]) ?>">
+						<?= $item['title'] ?>
+					</a>
+					<?= ! empty($item['alternate_title']) ? ' <br /><small> ' . $item['alternate_title'] . '</small>' : '' ?>
+				</td>
+				<td><?= implode(', ', $item['media']) ?></td>
+				<td><?= ($item['episode_count'] > 1) ? $item['episode_count'] : '-'  ?></td>
+				<td><?= $item['episode_length'] ?></td>
+				<td><?= $item['show_type'] ?></td>
+				<td><?= $item['age_rating'] ?></td>
+				<td class="align-left"><?= $item['notes'] ?></td>
+				<td class="align-left"><?= implode(', ', $item['genres']) ?></td>
+			</tr>
+		<?php endforeach ?>
+		</tbody>
+	</table>
+</div>
\ No newline at end of file
diff --git a/app/views/collection/list-item.php b/app/views/collection/list-item.php
index 1c758dca..d163ae42 100644
--- a/app/views/collection/list-item.php
+++ b/app/views/collection/list-item.php
@@ -12,9 +12,9 @@
 		<?= ! empty($item['alternate_title']) ? ' <br /><small> ' . $item['alternate_title'] . '</small>' : '' ?>
 	</td>
 	<td><?= $item['episode_count'] ?></td>
-	<td><?= $item['episode_length'] ?></td>
+	<td><?= ($item['episode_count'] > 1) ? $item['episode_count'] : '-'  ?></td>
 	<td><?= $item['show_type'] ?></td>
 	<td><?= $item['age_rating'] ?></td>
+	<?php if ($hasNotes): ?><td class="align-left"><?= $item['notes'] ?></td><?php endif ?>
 	<td class="align-left"><?= implode(', ', $item['genres']) ?></td>
-	<td class="align-left"><?= $item['notes'] ?></td>
 </tr>
\ No newline at end of file
diff --git a/app/views/collection/list.php b/app/views/collection/list.php
index d1c2dea8..092d307c 100644
--- a/app/views/collection/list.php
+++ b/app/views/collection/list.php
@@ -1,3 +1,4 @@
+<?php use function Aviat\AnimeClient\col_not_empty; ?>
 <main>
 	<?php if ($auth->isAuthenticated()): ?>
 		<a class="bracketed" href="<?= $url->generate($collection_type . '.collection.add.get') ?>">Add Item</a>
@@ -11,28 +12,26 @@
 		<?php $i = 0; ?>
 		<div class="tabs">
 			<?php foreach ($sections as $name => $items): ?>
-				<input <?= $i === 0 ? 'checked="checked"' : '' ?> type="radio" id="collection-tab-<?= $i ?>"
-																  name="collection-tabs"/>
+				<?php $hasNotes = col_not_empty($items, 'notes') ?>
+				<input type="radio" id="collection-tab-<?= $i ?>" name="collection-tabs" />
 				<label for="collection-tab-<?= $i ?>"><h2><?= $name ?></h2></label>
 				<div class="content full-height">
 					<table class="full-width media-wrap">
 						<thead>
-						<tr>
-							<?php if ($auth->isAuthenticated()): ?>
-								<td>Actions</td>
-							<?php endif ?>
-							<th>Title</th>
-							<th>Episode Count</th>
-							<th>Episode Length</th>
-							<th>Show Type</th>
-							<th>Age Rating</th>
-							<th>Genres</th>
-							<th>Notes</th>
-						</tr>
+							<tr>
+								<?php if ($auth->isAuthenticated()): ?><td>&nbsp;</td><?php endif ?>
+								<th>Title</th>
+								<th>Episode Count</th>
+								<th>Episode Length</th>
+								<th>Show Type</th>
+								<th>Age Rating</th>
+								<?php if ($hasNotes): ?><th>Notes</th><?php endif ?>
+								<th>Genres</th>
+							</tr>
 						</thead>
 						<tbody>
 						<?php foreach ($items as $item): ?>
-							<?php include __DIR__ . '/list-item.php' ?>
+							<?php include 'list-item.php' ?>
 						<?php endforeach ?>
 						</tbody>
 					</table>
@@ -40,34 +39,7 @@
 				<?php $i++ ?>
 			<?php endforeach ?>
 			<!-- All -->
-			<input type='radio' id='collection-tab-<?= $i ?>' name='collection-tabs' />
-			<label for='collection-tab-<?= $i ?>'><h2>All</h2></label>
-			<div class="content full-height">
-				<?php foreach ($sections as $name => $items): ?>
-				<h3><?= $name ?></h3>
-				<table class="full-width media-wrap">
-					<thead>
-					<tr>
-						<?php if ($auth->isAuthenticated()): ?>
-							<td>Actions</td>
-						<?php endif ?>
-						<th>Title</th>
-						<th>Episode Count</th>
-						<th>Episode Length</th>
-						<th>Show Type</th>
-						<th>Age Rating</th>
-						<th>Genres</th>
-						<th>Notes</th>
-					</tr>
-					</thead>
-					<tbody>
-					<?php foreach ($items as $item): ?>
-						<?php include __DIR__ . '/list-item.php' ?>
-					<?php endforeach ?>
-					</tbody>
-				</table>
-				<?php endforeach; ?>
-			</div>
+			<?php include 'list-all.php' ?>
 		</div>
 	<?php endif ?>
 </main>