diff --git a/pages/anime/amv.scarlet b/pages/anime/amv.scarlet
new file mode 100644
index 00000000..2dae71fe
--- /dev/null
+++ b/pages/anime/amv.scarlet
@@ -0,0 +1,17 @@
+.amvs
+	vertical
+	margin-top 1rem
+
+.amv
+	width 100%
+	margin calc(content-padding / 2)
+	box-shadow shadow-medium
+
+> 500px
+	.amvs
+		horizontal-wrap
+		justify-content flex-start
+		margin-top 0
+
+	.amv
+		max-width 380px
\ No newline at end of file
diff --git a/pages/anime/anime.pixy b/pages/anime/anime.pixy
index e4f2c630..c2e0267b 100644
--- a/pages/anime/anime.pixy
+++ b/pages/anime/anime.pixy
@@ -31,16 +31,19 @@ component AnimeMainColumn(anime *arn.Anime, listItem *arn.AnimeListItem, tracks
 
 	if user != nil && (user.Role == "editor" || user.Role == "admin")
 		if anime.ID == "LbbCcKiig"
-			h3.mountable AMVs
-			.video-container.amv.mountable
-				video.video(controls="controls", controlsList="nodownload")
-					source(src="/videos/unchained.webm", type="video/webm")
+			section.anime-section.mountable
+				h3.anime-section-name AMVs
+
+				.amvs
+					.amv.mountable
+						.video-container
+							video.video
+								source(src="/videos/unchained.webm", type="video/webm")
 		
-		if anime.ID == "7VjCpFiiR"
-			h3.mountable AMVs
-			.video-container.amv.mountable
-				video.video(controls="controls", controlsList="nodownload")
-					source(src="/videos/sunlight.webm", type="video/webm")
+					.amv.mountable
+						.video-container
+							video.video
+								source(src="/videos/sunlight.webm", type="video/webm")
 
 	AnimeEpisodes(anime, episodes, user, false)
 
diff --git a/pages/anime/anime.scarlet b/pages/anime/anime.scarlet
index 12745fd4..7d9ca32b 100644
--- a/pages/anime/anime.scarlet
+++ b/pages/anime/anime.scarlet
@@ -69,17 +69,10 @@
 
 	.soundtrack
 		flex-basis auto
-		// 	vertical
-		// 	flex-grow 1
-		// 	margin-bottom 0.5rem
-		// 	min-width 200px
 
 	.soundtrack-anime-image
 		display none
 
-// 	.video-container
-// 		box-shadow shadow-light
-
 > 500px
 	.anime-soundtracks
 		horizontal-wrap
@@ -159,9 +152,6 @@
 	margin-top 0.6rem
 	margin-bottom 0.4rem
 
-.amv
-	//
-
 < 800px
 	.anime-rating-categories
 		vertical