diff --git a/internal/format/nomark.go b/internal/format/nomark.go
index 9ab3b0d..a0bde3b 100644
--- a/internal/format/nomark.go
+++ b/internal/format/nomark.go
@@ -667,7 +667,7 @@ func nomark(cfg *config.Config, title string, text string) (string, string, stri
 			nextLine(&s)
 			blockBegin(&s, blockParagraph)
 			s.text.WriteString("}}}")
-			s.html.WriteString("<span class=\"markup\">}}}</span><br />\n")
+			s.html.WriteString("<span class=\"markup\">}}}</span>")
 		} else if s.block != blockMath && s.block != blockRaw && string(line) == "%%%" {
 			blockEnd(&s, blockMath)
 			nextLine(&s)
diff --git a/internal/util/templates/view.html b/internal/util/templates/view.html
index 71a22d1..42125a7 100644
--- a/internal/util/templates/view.html
+++ b/internal/util/templates/view.html
@@ -33,14 +33,12 @@
 <a href="/?a=upload">Upload</a>
 <a href="/?a=info">Info</a>
 </div>
-
 {{if .Diff}}
 <h1>Diff</h1>
-<div><code>
-{{.Diff | fmtdiff}}
-</code></div>
-{{end}}
 
+<div><code>
+{{.Diff | fmtdiff}}</code></div>
+{{end}}
 <h1><a href="/?a=search&t=content&w={{.Name | urlquery}}">{{.Title}}</a></h1>
 
 <div>