diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40e8a025..f1e7da50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 * When a post has an `image_header` parameter this image is set as an attachment
     to ActivityPub posts
+* Fixed some poor CSS rendering for quote-box.
 
 ## 2.1.0
 
diff --git a/layouts/shortcodes/quote-box.html b/layouts/shortcodes/quote-box.html
index 178400cf..3a6739e7 100644
--- a/layouts/shortcodes/quote-box.html
+++ b/layouts/shortcodes/quote-box.html
@@ -2,5 +2,5 @@
   <blockquote>
        {{ .Inner }}
   </blockquote>
-  <cite>{{ .Get "source" }}</cite>
+  {{ if .Get "source" }}<cite>{{ .Get "source" }}</cite>{{ end }}
 </div>
diff --git a/static/css/main.css b/static/css/main.css
index 35f2a149..61351ce4 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -603,6 +603,11 @@ p {
   overflow: auto;
 }
 
+section {
+  margin-top: 3em;
+  margin-bottom: 3em;
+}
+
 @-webkit-keyframes nprogress-spinner{
     0%{
         -webkit-transform:rotate(0)
@@ -2267,7 +2272,7 @@ div#ch-tooltip {
 
 .quote-box > blockquote:after {
 	content: '”';
-	right: -5rem;
+	right: 0;
 	bottom: 1rem;
 }