diff --git a/mixins/Quote.pixy b/mixins/Quote.pixy
index 3b3e950f..4eca694f 100644
--- a/mixins/Quote.pixy
+++ b/mixins/Quote.pixy
@@ -5,14 +5,14 @@ component Quote(quote *arn.Quote)
 
 component QuoteContent(quote *arn.Quote)
 	.quote-content
-		a.quotation.ajax(href="/quote/" + quote.ID)
+		a.quotation.ajax(href=quote.Link())
 			blockquote
 				p
 					q= quote.Description
 		if quote.Character() != nil
 			footer.quote-character
 				span= "by"
-				a.ajax(href="/character/" + quote.Character().ID)= quote.Character().Name
+				a.ajax(href=quote.Character().Link())= quote.Character().Name
 				CharacterSmall(quote.Character())
 
 component QuoteFooter(quote *arn.Quote)
diff --git a/pages/character/character.go b/pages/character/character.go
index cc7100ea..2ed5ac1b 100644
--- a/pages/character/character.go
+++ b/pages/character/character.go
@@ -38,7 +38,7 @@ func Get(ctx *aero.Context) string {
 
 	// Quotes
 	quotes := arn.FilterQuotes(func(quote *arn.Quote) bool {
-		return !quote.IsDraft && len(quote.Description) > 0 && quote.CharacterId == character.ID
+		return !quote.IsDraft && len(quote.Description) > 0 && quote.CharacterID == character.ID
 	})
 
 	arn.SortQuotesPopularFirst(quotes)
diff --git a/pages/character/character.pixy b/pages/character/character.pixy
index 53adfcda..ca598cdd 100644
--- a/pages/character/character.pixy
+++ b/pages/character/character.pixy
@@ -19,7 +19,8 @@ component CharacterDetails(character *arn.Character, characterAnime []*arn.Anime
 						h3 Quotes
 						.character-quotes
 							each quote in quotes
-								Quote(quote)
+								.character-quote
+									Quote(quote)
 
 		if len(character.Attributes) > 0
 			.character-sidebar
diff --git a/pages/character/character.scarlet b/pages/character/character.scarlet
index c57d0588..0da011c3 100644
--- a/pages/character/character.scarlet
+++ b/pages/character/character.scarlet
@@ -45,11 +45,11 @@
 	horizontal-wrap
 	justify-content space-around
 
-	.quote
-		flex-basis 400px !important
+.character-quote
+	flex-basis 400px
 
-		footer
-			display none !important
+	footer
+		display none
 
 > 1250px
 	.character-page
diff --git a/pages/quote/edit.go b/pages/quote/edit.go
index e7f72841..ad1f521b 100644
--- a/pages/quote/edit.go
+++ b/pages/quote/edit.go
@@ -10,7 +10,7 @@ import (
 	"github.com/animenotifier/notify.moe/utils/editform"
 )
 
-// Edit track.
+// Edit quote.
 func Edit(ctx *aero.Context) string {
 	user := utils.GetUser(ctx)
 	id := ctx.Get("id")
diff --git a/pages/quote/quote.go b/pages/quote/quote.go
index 36090c86..5e1dcd7a 100644
--- a/pages/quote/quote.go
+++ b/pages/quote/quote.go
@@ -9,7 +9,7 @@ import (
 	"github.com/animenotifier/notify.moe/utils"
 )
 
-// Get company.
+// Get quote.
 func Get(ctx *aero.Context) string {
 	user := utils.GetUser(ctx)
 	id := ctx.Get("id")
@@ -19,7 +19,7 @@ func Get(ctx *aero.Context) string {
 		return ctx.Error(http.StatusNotFound, "Quote not found", err)
 	}
 
-	character, err := arn.GetCharacter(quote.CharacterId)
+	character, err := arn.GetCharacter(quote.CharacterID)
 	if err != nil {
 		return ctx.Error(http.StatusNotFound, "Quote not found", err)
 	}
diff --git a/pages/quote/quote.pixy b/pages/quote/quote.pixy
index 9ffc5141..913b4a1c 100644
--- a/pages/quote/quote.pixy
+++ b/pages/quote/quote.pixy
@@ -1,8 +1,6 @@
 component QuotePage(quote *arn.Quote, character *arn.Character, user *arn.User)
 	QuoteTabs(quote, user)
-
 	.quote-full-page
-
 		.quote-main-column
 			QuoteMainColumn(quote, user)
 		.quote-side-column
@@ -38,10 +36,10 @@ component QuoteInformation(quote *arn.Quote, user *arn.User)
 					td.quote-info-value
 						QuoteAnime(quote.Anime(), user)
 
-			if quote.Episode != 0
+			if quote.EpisodeNumber != 0
 				tr.mountable(data-mountable-type="info")
 					td.quote-info-key Episode:
-					td.quote-info-value= quote.Episode
+					td.quote-info-value= quote.EpisodeNumber
 
 			if quote.Time != 0
 				tr.mountable(data-mountable-type="info")
diff --git a/pages/quote/quote.scarlet b/pages/quote/quote.scarlet
index a131d964..d46ebe77 100644
--- a/pages/quote/quote.scarlet
+++ b/pages/quote/quote.scarlet
@@ -25,8 +25,6 @@ quote-full-page
 
 .quote-info-table
 	margin 0
-// width 100%
-// max-width 600px
 
 .quote-info-value
 	text-align right