diff --git a/templates/themes/default-v2/playlist.html b/templates/themes/default-v2/playlist.html
index 99dd566..3850ab6 100644
--- a/templates/themes/default-v2/playlist.html
+++ b/templates/themes/default-v2/playlist.html
@@ -1,6 +1,17 @@
-{{start _playlist}}
-<a href='watch?v={{.id}}&playlist={{.playlist}}")'>
-	<img src='https://i.ytimg.com/vi/{{.id}}/mqdefault.jpg'><br>
-	{{.title}}
-</a><br>
-{{end _playlist}}
+{{start ?playlist}}
+	<h1>Playlist "{{.playlistname}}"</h1>
+	<div style='display: grid; grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));'>
+	{{start _playlist}}
+	<div class='video-image-container'>
+		<a href='watch?v={{.id}}&playlist={{.playlist}}"'>
+			<div class='video-image' style='background-image: url(http://i.ytimg.com/vi/{{.id}}/mqdefault.jpg)'></div>
+			<b>{{.title}}</b></a>
+	</div>
+	{{end _playlist}}
+	</div>
+{{else ?playlist}}
+<h1>First of all, how did you get here?!</h1>
+<p>Second of all, you need to give me a playlist ID, so that I know what playlist to look for. :p<br>
+<i>(If you did supply one, then something went south in the backend. Sorry about that.)</i></p>
+<p><a href="/">Go back to the home page</a></p>
+{{end ?playlist}}
\ No newline at end of file
diff --git a/webroot/playlist.shs b/webroot/playlist.shs
index 4952826..d95e8ef 100644
--- a/webroot/playlist.shs
+++ b/webroot/playlist.shs
@@ -3,6 +3,11 @@ title=$(curl -s "https://www.youtube.com/feeds/videos.xml?playlist_id=${get_data
 
 declare -A strings
 
+if [[ "${get_data[list]}" ]]; then
+	strings[playlistname]="$title"
+	strings[?playlist]=true
+fi
+
 if [[ ${cfg[template]} != 'retro' ]]; then
 	meta[title]="$title"
 	#source templates/head.sh
@@ -12,7 +17,7 @@ fi
 if [[ "${get_data[list]}" ]]; then
 	data=$(yt-dlp --cookies ${cfg[_cookies]} -j --flat-playlist "https://www.youtube.com/playlist?list=${get_data[list]}")
 else
-	strings[playlist]="Please specify id"
+	strings[playlist]="Please specify an ID"
 fi
 
 IFS=$'\n'