diff --git a/app/views/anime/cover.php b/app/views/anime/cover.php
index b3526d68..b43dc9d3 100644
--- a/app/views/anime/cover.php
+++ b/app/views/anime/cover.php
@@ -6,6 +6,12 @@
 <h3>There's nothing here!</h3>
 <?php else: ?>
 	<?php foreach ($sections as $name => $items): ?>
+	<?php if (empty($items)): ?>
+		<section class="status">
+			<h2><?= $escape->html($name) ?></h2>
+			<h3>There's nothing here!</h3>
+		</section>
+	<?php else: ?>
 		<section class="status">
 			<h2><?= $escape->html($name) ?></h2>
 			<section class="media-wrap">
@@ -88,6 +94,7 @@
 				<?php endforeach ?>
 			</section>
 		</section>
+	<?php endif ?>
 	<?php endforeach ?>
 <?php endif ?>
 </main>
diff --git a/app/views/anime/list.php b/app/views/anime/list.php
index f898125a..2f67c626 100644
--- a/app/views/anime/list.php
+++ b/app/views/anime/list.php
@@ -7,86 +7,90 @@
 <?php else: ?>
 	<?php foreach ($sections as $name => $items): ?>
 	<h2><?= $name ?></h2>
-	<table>
-		<thead>
-			<tr>
-				<?php if($auth->isAuthenticated()): ?>
-				<td class="no_border">&nbsp;</td>
-				<?php endif ?>
-				<th>Title</th>
-				<th>Airing Status</th>
-				<th>Score</th>
-				<th>Type</th>
-				<th>Progress</th>
-				<th>Rated</th>
-				<th colspan="2">Attributes</th>
-				<th>Notes</th>
-				<th>Genres</th>
-			</tr>
-		</thead>
-		<tbody>
-			<?php foreach($items as $item): ?>
-			<?php if ($item['private'] && ! $auth->isAuthenticated()) continue; ?>
-			<tr id="a-<?= $item['id'] ?>">
-				<?php if ($auth->isAuthenticated()): ?>
-				<td>
-					<a class="bracketed" href="<?= $url->generate('edit', [
-						'controller' => 'anime',
-						'id' => $item['id'],
-						'status' => $item['watching_status']
-					]) ?>">Edit</a>
-				</td>
-				<?php endif ?>
-				<td class="justify">
-					<a href="<?= $url->generate('anime.details', ['id' => $item['anime']['slug']]) ?>">
-						<?= array_shift($item['anime']['titles']) ?>
-					</a>
-                    <?php foreach($item['anime']['titles'] as $title): ?>
-                        <br /><?= $title ?>
-                    <?php endforeach ?>
-				</td>
-				<td><?= $item['airing']['status'] ?></td>
-				<td><?= $item['user_rating'] ?> / 10 </td>
-				<td><?= $item['anime']['type'] ?></td>
-				<td id="<?= $item['anime']['slug'] ?>">
-					Episodes: <br />
-					<span class="completed_number"><?= $item['episodes']['watched'] ?></span>&nbsp;/&nbsp;<span class="total_number"><?= $item['episodes']['total'] ?></span>
-				</td>
-				<td><?= $item['anime']['age_rating'] ?></td>
-				<td>
-                    <ul>
-					<?php if ($item['rewatched'] > 0): ?>
-                        <li>Rewatched <?= $item['rewatched'] ?> time(s)</li>
+	<?php if (empty($items)): ?>
+		<h3>There's nothing here!</h3>
+	<?php else: ?>
+		<table>
+			<thead>
+				<tr>
+					<?php if($auth->isAuthenticated()): ?>
+					<td class="no_border">&nbsp;</td>
 					<?php endif ?>
-					<?php foreach(['private','rewatching'] as $attr): ?>
-						<?php if($item[$attr]): ?>
-                            <li><?= ucfirst($attr); ?></li>
+					<th>Title</th>
+					<th>Airing Status</th>
+					<th>Score</th>
+					<th>Type</th>
+					<th>Progress</th>
+					<th>Rated</th>
+					<th colspan="2">Attributes</th>
+					<th>Notes</th>
+					<th>Genres</th>
+				</tr>
+			</thead>
+			<tbody>
+				<?php foreach($items as $item): ?>
+				<?php if ($item['private'] && ! $auth->isAuthenticated()) continue; ?>
+				<tr id="a-<?= $item['id'] ?>">
+					<?php if ($auth->isAuthenticated()): ?>
+					<td>
+						<a class="bracketed" href="<?= $url->generate('edit', [
+							'controller' => 'anime',
+							'id' => $item['id'],
+							'status' => $item['watching_status']
+						]) ?>">Edit</a>
+					</td>
+					<?php endif ?>
+					<td class="justify">
+						<a href="<?= $url->generate('anime.details', ['id' => $item['anime']['slug']]) ?>">
+							<?= array_shift($item['anime']['titles']) ?>
+						</a>
+	                    <?php foreach($item['anime']['titles'] as $title): ?>
+	                        <br /><?= $title ?>
+	                    <?php endforeach ?>
+					</td>
+					<td><?= $item['airing']['status'] ?></td>
+					<td><?= $item['user_rating'] ?> / 10 </td>
+					<td><?= $item['anime']['type'] ?></td>
+					<td id="<?= $item['anime']['slug'] ?>">
+						Episodes: <br />
+						<span class="completed_number"><?= $item['episodes']['watched'] ?></span>&nbsp;/&nbsp;<span class="total_number"><?= $item['episodes']['total'] ?></span>
+					</td>
+					<td><?= $item['anime']['age_rating'] ?></td>
+					<td>
+	                    <ul>
+						<?php if ($item['rewatched'] > 0): ?>
+	                        <li>Rewatched <?= $item['rewatched'] ?> time(s)</li>
 						<?php endif ?>
-					<?php endforeach ?>
-                    </ul>
-				</td>
-				<td>
-					<?php foreach($item['anime']['streaming_links'] as $link): ?>
-						<?php if ($link['meta']['link'] !== FALSE): ?>
-							<a href="<?= $link['link'] ?>" title="Stream '<?= $item['anime']['title'] ?>' on <?= $link['meta']['name'] ?>">
+						<?php foreach(['private','rewatching'] as $attr): ?>
+							<?php if($item[$attr]): ?>
+	                            <li><?= ucfirst($attr); ?></li>
+							<?php endif ?>
+						<?php endforeach ?>
+	                    </ul>
+					</td>
+					<td>
+						<?php foreach($item['anime']['streaming_links'] as $link): ?>
+							<?php if ($link['meta']['link'] !== FALSE): ?>
+								<a href="<?= $link['link'] ?>" title="Stream '<?= $item['anime']['title'] ?>' on <?= $link['meta']['name'] ?>">
+									<img class="streaming-logo" width="50" height="50" src="<?= $urlGenerator->assetUrl('images', $link['meta']['image']) ?>" alt="<?= $link['meta']['name'] ?> logo" />
+								</a>
+							<?php else: ?>
 								<img class="streaming-logo" width="50" height="50" src="<?= $urlGenerator->assetUrl('images', $link['meta']['image']) ?>" alt="<?= $link['meta']['name'] ?> logo" />
-							</a>
-						<?php else: ?>
-							<img class="streaming-logo" width="50" height="50" src="<?= $urlGenerator->assetUrl('images', $link['meta']['image']) ?>" alt="<?= $link['meta']['name'] ?> logo" />
-						<?php endif ?>
-					<?php endforeach ?>
-				</td>
-				<td>
-					<p><?= $escape->html($item['notes']) ?></p>
-				</td>
-				<td class="align_left">
-					<?php sort($item['anime']['genres']) ?>
-					<?= implode(', ', $item['anime']['genres']) ?>
-				</td>
-			</tr>
-			<?php endforeach ?>
-		</tbody>
-	</table>
+							<?php endif ?>
+						<?php endforeach ?>
+					</td>
+					<td>
+						<p><?= $escape->html($item['notes']) ?></p>
+					</td>
+					<td class="align_left">
+						<?php sort($item['anime']['genres']) ?>
+						<?= implode(', ', $item['anime']['genres']) ?>
+					</td>
+				</tr>
+				<?php endforeach ?>
+			</tbody>
+		</table>
+	<?php endif ?>
 	<?php endforeach ?>
 <?php endif ?>
 </main>
diff --git a/app/views/manga/cover.php b/app/views/manga/cover.php
index e334ba74..90d02e97 100644
--- a/app/views/manga/cover.php
+++ b/app/views/manga/cover.php
@@ -6,6 +6,12 @@
 <h3>There's nothing here!</h3>
 <?php else: ?>
 	<?php foreach ($sections as $name => $items): ?>
+	<?php if (empty($items)): ?>
+		<section class="status">
+			<h2><?= $escape->html($name) ?></h2>
+			<h3>There's nothing here!</h3>
+		</section>
+	<?php else: ?>
 		<section class="status">
 			<h2><?= $escape->html($name) ?></h2>
 			<section class="media-wrap">
@@ -78,6 +84,7 @@
 				<?php endforeach ?>
 			</section>
 		</section>
+	<?php endif ?>
 	<?php endforeach ?>
 <?php endif ?>
 </main>
diff --git a/app/views/manga/list.php b/app/views/manga/list.php
index 8edbc7db..89c2fe19 100644
--- a/app/views/manga/list.php
+++ b/app/views/manga/list.php
@@ -7,64 +7,68 @@
 <?php else: ?>
 	<?php foreach ($sections as $name => $items): ?>
 	<h2><?= $name ?></h2>
-	<table>
-		<thead>
-			<tr>
-				<?php if ($auth->isAuthenticated()): ?>
-				<th>&nbsp;</th>
-				<?php endif ?>
-				<th>Title</th>
-				<th>Rating</th>
-				<th>Completed Chapters</th>
-				<th># of Volumes</th>
-				<th>Attributes</th>
-				<th>Type</th>
-				<th>Genres</th>
-			</tr>
-		</thead>
-		<tbody>
-			<?php foreach($items as $item): ?>
-			<tr id="manga-<?= $item['id'] ?>">
-				<?php if($auth->isAuthenticated()): ?>
-				<td>
-					<a class="bracketed" href="<?= $url->generate('edit', [
-						'controller' => 'manga',
-						'id' => $item['id'],
-						'status' => $name
-					]) ?>">Edit</a>
-				</td>
-				<?php endif ?>
-				<td class="align_left">
-					<a href="<?= $url->generate('manga.details', ['id' => $item['manga']['slug']]) ?>">
-						<?= array_shift($item['manga']['titles']) ?>
-					</a>
-					<?php foreach($item['manga']['titles'] as $title): ?>
-                        <br /><?= $title ?>
-					<?php endforeach ?>
-				</td>
-				<td><?= $item['user_rating'] ?> / 10</td>
-				<td><?= $item['chapters']['read'] ?> / <?= $item['chapters']['total'] ?></td>
-				<td><?= $item['volumes']['total'] ?></td>
-				<td>
-                    <ul>
-					<?php if ($item['reread'] > 0): ?>
-                        <li>Reread <?= $item['reread'] ?> time(s)</li>
+	<?php if (empty($items)): ?>
+		<h3>There's nothing here!</h3>
+	<?php else: ?>
+		<table>
+			<thead>
+				<tr>
+					<?php if ($auth->isAuthenticated()): ?>
+					<th>&nbsp;</th>
 					<?php endif ?>
-					<?php foreach(['rereading'] as $attr): ?>
-						<?php if($item[$attr]): ?>
-                            <li><?= ucfirst($attr); ?></li>
+					<th>Title</th>
+					<th>Rating</th>
+					<th>Completed Chapters</th>
+					<th># of Volumes</th>
+					<th>Attributes</th>
+					<th>Type</th>
+					<th>Genres</th>
+				</tr>
+			</thead>
+			<tbody>
+				<?php foreach($items as $item): ?>
+				<tr id="manga-<?= $item['id'] ?>">
+					<?php if($auth->isAuthenticated()): ?>
+					<td>
+						<a class="bracketed" href="<?= $url->generate('edit', [
+							'controller' => 'manga',
+							'id' => $item['id'],
+							'status' => $name
+						]) ?>">Edit</a>
+					</td>
+					<?php endif ?>
+					<td class="align_left">
+						<a href="<?= $url->generate('manga.details', ['id' => $item['manga']['slug']]) ?>">
+							<?= array_shift($item['manga']['titles']) ?>
+						</a>
+						<?php foreach($item['manga']['titles'] as $title): ?>
+	                        <br /><?= $title ?>
+						<?php endforeach ?>
+					</td>
+					<td><?= $item['user_rating'] ?> / 10</td>
+					<td><?= $item['chapters']['read'] ?> / <?= $item['chapters']['total'] ?></td>
+					<td><?= $item['volumes']['total'] ?></td>
+					<td>
+	                    <ul>
+						<?php if ($item['reread'] > 0): ?>
+	                        <li>Reread <?= $item['reread'] ?> time(s)</li>
 						<?php endif ?>
-					<?php endforeach ?>
-                    </ul>
-				</td>
-				<td><?= $item['manga']['type'] ?></td>
-				<td class="align_left">
-					<?= implode(', ', $item['manga']['genres']) ?>
-				</td>
-			</tr>
-			<?php endforeach ?>
-		</tbody>
-	</table>
+						<?php foreach(['rereading'] as $attr): ?>
+							<?php if($item[$attr]): ?>
+	                            <li><?= ucfirst($attr); ?></li>
+							<?php endif ?>
+						<?php endforeach ?>
+	                    </ul>
+					</td>
+					<td><?= $item['manga']['type'] ?></td>
+					<td class="align_left">
+						<?= implode(', ', $item['manga']['genres']) ?>
+					</td>
+				</tr>
+				<?php endforeach ?>
+			</tbody>
+		</table>
+	<?php endif ?>
 	<?php endforeach ?>
 <?php endif ?>
 </main>