diff --git a/mixins/Comments.pixy b/mixins/Comments.pixy
index 8f760c5c..90933d52 100644
--- a/mixins/Comments.pixy
+++ b/mixins/Comments.pixy
@@ -1,8 +1,11 @@
 component Comments(parent arn.PostParent, user *arn.User)
 	.thread
 		.posts
-			each post in parent.Posts()
-				Postable(post.ToPostable(), user, "")
+			if user == nil && parent.CountPosts() == 0
+				p.no-data.mountable No comments have been written yet.
+			else
+				each post in parent.Posts()
+					Postable(post.ToPostable(), user, "")
 			
 			if user != nil
 				if parent.IsLocked()
diff --git a/pages/amv/amv.pixy b/pages/amv/amv.pixy
index d9e4609a..59ef62a3 100644
--- a/pages/amv/amv.pixy
+++ b/pages/amv/amv.pixy
@@ -52,6 +52,10 @@ component AMVPage(amv *arn.AMV, user *arn.User)
 					each tag in amv.Tags
 						.tag.mountable= tag
 		
+		.widget
+			h3.widget-title.mountable Comments
+			Comments(amv, user)
+		
 	if amv.File != "" && amv.Info.Video.Width > 0
 		.footer.amv-details.mountable
 			p= fmt.Sprintf("Video: %dx%d | %.0f FPS | %s", amv.Info.Video.Width, amv.Info.Video.Height, amv.Info.Video.FPS, amv.Info.Video.Codec)
diff --git a/pages/quote/quote.pixy b/pages/quote/quote.pixy
index b7e92389..8765f776 100644
--- a/pages/quote/quote.pixy
+++ b/pages/quote/quote.pixy
@@ -4,13 +4,19 @@ component QuotePage(quote *arn.Quote, character *arn.Character, user *arn.User)
 	.quote-full-page
 		.quote-main-column
 			QuoteMainColumn(quote, user)
-		.quote-side-column
-			QuoteSideColumn(quote, user)
 
 component QuoteMainColumn(quote *arn.Quote, user *arn.User)
 	.widget-form.mountable
 		QuoteContent(quote, user)
 
+		if quote.Anime() != nil
+			p.quote-anime
+				a(href=quote.Anime().Link())= quote.Anime().Title.ByUser(user)
+
+		.widget.mountable
+			h3.widget-title Comments
+			Comments(quote, user)
+
 	.footer.mountable
 		if quote.EditedBy != ""
 			span Edited 
@@ -24,30 +30,6 @@ component QuoteMainColumn(quote *arn.Quote, user *arn.User)
 			a(href=quote.Creator().Link())= quote.Creator().Nick
 			span .
 
-component QuoteSideColumn(quote *arn.Quote, user *arn.User)
-	QuoteInformation(quote, user)
-
-component QuoteInformation(quote *arn.Quote, user *arn.User)
-	section.quote-section.mountable
-		h3.quote-section-name Information
-		
-		table.quote-info-table
-			if quote.AnimeID != "" && quote.Anime() != nil
-				tr.mountable(data-mountable-type="info")
-					td.quote-info-key Anime:
-					td.quote-info-value
-						QuoteAnime(quote.Anime(), user)
-
-			if quote.EpisodeNumber != -1
-				tr.mountable(data-mountable-type="info")
-					td.quote-info-key Episode:
-					td.quote-info-value= quote.EpisodeNumber
-
-			if quote.Time != -1
-				tr.mountable(data-mountable-type="info")
-					td.anime-info-key Time:
-					td.anime-info-value= strconv.Itoa(quote.Time) + " min"
-
 component QuoteTabs(quote *arn.Quote, user *arn.User)
 	.tabs
 		LikeTab(strconv.Itoa(len(quote.Likes)), "heart", "quote", quote, user)
diff --git a/pages/quote/quote.scarlet b/pages/quote/quote.scarlet
index 4b644e52..84bcfd5c 100644
--- a/pages/quote/quote.scarlet
+++ b/pages/quote/quote.scarlet
@@ -5,25 +5,11 @@
 	vertical
 	flex 1
 
-.quote-side-column
-	sidebar
-
-> 1250px
-	.quote-full-page
-		horizontal
-
-	.quote-side-column
-		sidebar-medium
-
-> 1400px
-	.quote-side-column
-		sidebar-big
-
-.quote-info-table
-	margin 0
-
-.quote-info-value
-	text-align right
+.quote-anime
+	horizontal
+	justify-content center
+	margin-bottom 1rem
+	font-size 0.9rem
 
 .quote-section
 	margin-top 1rem