diff --git a/pages/soundtracks/soundtracks.pixy b/pages/soundtracks/soundtracks.pixy
index f6e85fe9..b85717f7 100644
--- a/pages/soundtracks/soundtracks.pixy
+++ b/pages/soundtracks/soundtracks.pixy
@@ -26,9 +26,15 @@ component SoundTracksScrollable(tracks []*arn.SoundTrack, user *arn.User)
 		SoundTrack(track)
 
 component SoundTracksTabs(tag string)
-	.tabs
-		Tab("Latest", "music", "/soundtracks")
-		Tab("Best", "heart", "/soundtracks/best")
+	.tab-groups
+		.tabs
+			Tab("Latest", "music", "/soundtracks")
+			Tab("Best", "heart", "/soundtracks/best")
+		
+		.tabs
+			Tab("opening", "tag", "/soundtracks/tag/opening")
+			Tab("ending", "tag", "/soundtracks/tag/ending")
 
-		if tag != ""
-			Tab(tag, "tag", "/soundtracks/tag/" + tag)
\ No newline at end of file
+		if tag != "" && tag != "opening" && tag != "ending"
+			.tabs
+				Tab(tag, "tag", "/soundtracks/tag/" + tag)
\ No newline at end of file
diff --git a/styles/tabs.scarlet b/styles/tabs.scarlet
index ee85cf6e..fab35c7d 100644
--- a/styles/tabs.scarlet
+++ b/styles/tabs.scarlet
@@ -29,29 +29,20 @@
 		border-top-right-radius ui-element-border-radius
 		border-bottom-right-radius ui-element-border-radius
 
-	// color text-color !important
-	// :hover
-	// 	color white !important
-	// &.active
-	// 	color white !important
-	// 	background-color link-hover-color
-
 < 920px
 	.tab
 		.icon
 			margin-right 0
-	
+
 	.tab-text
 		display none
 
 .tabs
 	horizontal
 	justify-content center
-	// margin-left calc(content-padding * -1)
-	// margin-top calc(content-padding * -1)
-	// margin-right calc(content-padding * -2)
-	margin-bottom content-padding
-	// background-color rgba(0, 0, 0, 0.02)
-	// justify-content flex-start !important
-	// margin-bottom 1rem
-	// margin-top -0.6rem
\ No newline at end of file
+	margin content-padding calc(content-padding / 4)
+	margin-top 0
+
+.tab-groups
+	horizontal
+	justify-content center
\ No newline at end of file