diff --git a/templates/themes/default-v2/watch.html b/templates/themes/default-v2/watch.html
index 721f06a..7076ef2 100644
--- a/templates/themes/default-v2/watch.html
+++ b/templates/themes/default-v2/watch.html
@@ -12,7 +12,7 @@
 				Uploaded by <b><a href='/channel/{{.channel_id}}'>{{.uploader}}</a></b> on <b>{{.upload_date}}</b><br>
 				<br>
 				{{start ?fav}}<a href='fav.shs?v={{.id}}' target='_blank'>Add to favourites</a><br>{{end ?fav}}
-				{{start ?unfav}}<a href='unfav.shs?v={{.id}}' target='_blank'>Remove from favourites</a><br>{{else ?unfav}}{{end ?unfav}}
+				{{start ?unfav}}<a href='unfav.shs?v={{.id}}' target='_blank' style="color:#d00;">Remove from favourites</a><br>{{else ?unfav}}{{end ?unfav}}
 				{{start ?sub}}<a href='subscribe.shs?id={{.channel_id}}' target='_blank'>Subscribe to {{.uploader}}!</a><br>{{end ?sub}}
 				{{start ?unsub}}<a href='unsubscribe.shs?id={{.channel_id}}' target='_blank'>Unsubscribe from {{.uploader}}!</a><br>{{end ?unsub}}
 				{{start ?login}}<b><a href='/login.shs?r={{.login_r}}'>Log in</a> to add this video to your favourites and/or subscribe to this channel!</b><br>{{end ?login}}
@@ -26,17 +26,6 @@
 </div>
 <pre><i>Description</i>:<br>{{.description}}</pre>
 </div>
-<h1>Recommended</h1>
-<div style='display: grid; grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));'>
-{{start _recommended}}
-
-<div><a href='/watch?v={{.id}}'><img src='https://i.ytimg.com/vi/{{.id}}/mqdefault.jpg'>{{.title}}</a></div>
-
-{{end _recommended}}
-</div><h1>Comments</h1>
-<div class='comments'></div>
-<script src='/js/watch.js'></script>
-
 
 {{start ?playlist}}
 <h1>Playlist</h1>
@@ -49,9 +38,25 @@
 		});
 	});
 </script>
+
+<div style='display: grid; grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));'>
 	{{start _playlist}}
-
-	<a href='watch?v={{.id}}&playlist={{.playlist_id}}'><img src='//i.ytimg.com/vi/{{.id}}/mqdefault.jpg'><br>{{.title}}</a><br>
-
+	<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>
 {{end ?playlist}}
+
+<h1>Recommended</h1>
+<div style='display: grid; grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));'>
+{{start _recommended}}
+
+<div><a href='/watch?v={{.id}}'><img src='https://i.ytimg.com/vi/{{.id}}/mqdefault.jpg'><br>{{.title}}</a></div>
+
+{{end _recommended}}
+</div><h1>Comments</h1>
+<div class='comments'></div>
+<script src='/js/watch.js'></script>