diff --git a/src/page-file.rkt b/src/page-file.rkt
index 466de49..d3b808d 100644
--- a/src/page-file.rkt
+++ b/src/page-file.rkt
@@ -51,8 +51,8 @@
    `(div
      (p
        ,(if (non-empty-string? video-embed-code)
-           `(span (a (@ (href ,(u-proxy-url raw-image-url))) "View original file") ". ")
-           `(return-no-element))
+           `""
+           `(span (a (@ (href ,(u-proxy-url raw-image-url))) "View original file") ". "))
        "Added by "
        (a (@ (href ,(u-proxy-url user-page-url))) ,username)
        "."
@@ -62,10 +62,14 @@
                  (λ (article)
                    (define page-path (jp "/title" article))
                    (define title (jp "/titleText" article page-path))
-                   `(a (@ (href ,(format "/~a/wiki/~a" wikiname page-path)))
-                        ,title))
+                   `(span
+                     (a (@ (href ,(format "/~a/wiki/~a" wikiname page-path)))
+                          ,title)
+                     `(if (eq? (car smaller-article-list) article))
+                         ""
+                         ", "))
                  smaller-article-list))
-              `(if (= article-list-is-smaller 1)
+              `(if (eq? article-list-is-smaller 1)
                   "…"
                   "."))))
 ;     ,(update-tree-wiki image-description wikiname)