diff --git a/css/home.css b/css/home.css
index cc10959..7044bbd 100644
--- a/css/home.css
+++ b/css/home.css
@@ -107,18 +107,3 @@
 	font-size: .85rem;
 	text-align: right;
 }
-
-/* Handling for sample data and wip stuff */
-.draft h3,
-.draft p {
-	opacity: .5;
-}
-
-.wip {
-	border-top: solid var(--color-pink);
-	border-bottom: solid var(--color-pink);
-	border-left: .5rem solid var(--color-cyan);
-	border-right: .5rem solid var(--color-cyan);
-	padding: 1rem 1rem 0;
-	margin: 1rem 0 2rem;
-}
diff --git a/css/nav.css b/css/nav.css
index dc2c8af..a6568b5 100644
--- a/css/nav.css
+++ b/css/nav.css
@@ -1,4 +1,7 @@
-nav,
+nav {
+	padding: .25rem 0 1rem;
+}
+
 footer {
 	padding: 1rem 0;
 }
diff --git a/eleventy.config.js b/eleventy.config.js
index e2968e7..25ae0c5 100644
--- a/eleventy.config.js
+++ b/eleventy.config.js
@@ -31,6 +31,13 @@ export default async function(eleventyConfig) {
 	/* `id` attributes */
 	eleventyConfig.addPlugin(IdAttributePlugin);
 
+	/* Draft handling */
+	eleventyConfig.addPreprocessor("drafts", "*", (data, content) => {
+		if(data.draft) {
+			return false;
+		}
+	});
+
 	/* Shortcodes */
 	eleventyConfig.addShortcode("currentBuildDate", () => {
 		return (new Date()).toISOString();
diff --git a/src/index.njk b/src/index.njk
index 0235eb8..05db413 100644
--- a/src/index.njk
+++ b/src/index.njk
@@ -4,14 +4,6 @@ title: Fediverse Skillshare Classifieds
 ---
 {% css %}{% include "css/home.css" %}{% endcss %}
 
-<div class="wip">
-  <p>
-    Hey! This is in early days, so please forgive the sparsity. Any listing
-    that is greyed out is sample data, and should be ignored. As I get more real
-    listings, I'll replace the samples!
-  </p>
-</div>
-
 <div id="jump-links">
   <h2>jump to...</h2>
   <ul>
@@ -30,6 +22,9 @@ title: Fediverse Skillshare Classifieds
         <h2>{{ tag }}</h2>
         <p>{{ tag | getTagline }}</p>
       </div>
+      {% if collections[tag].length == 0 %}
+      <p>No listings.</p>
+      {% endif %}
       {% for listing in collections[tag] %}
         <div class="listing{% if listing.data.draft %} draft{% endif %}">
           <h3>{{ listing.data.title }}</h3>