diff --git a/templates/comment.gohtml b/templates/comment.gohtml
index 92fe807..9d3515e 100644
--- a/templates/comment.gohtml
+++ b/templates/comment.gohtml
@@ -9,9 +9,9 @@
       {{ string .Blog.Lang "acommentby" }}
       {{ if .Data.Website }}<a href="{{ .Data.Website }}" class="p-name u-url" target="_blank" rel="nofollow noopener noreferrer ugc">{{ .Data.Name }}</a>{{ else }}<span class="p-name">{{ .Data.Name }}</span>{{ end }}:
     </div>
-    <div class="e-content p">
+    <p class="e-content">
       {{ html .Data.Comment }}
-    </div>
+    </p>
   </main>
   {{ if commentsenabled .Blog }}
     {{ include "interactions" . }}
diff --git a/templates/commentsadmin.gohtml b/templates/commentsadmin.gohtml
index 101f0d6..76493c6 100644
--- a/templates/commentsadmin.gohtml
+++ b/templates/commentsadmin.gohtml
@@ -9,10 +9,12 @@
     {{ range $i, $comment := .Data.Comments }}
       <div class="p">
         <p>
+          ID: {{ $comment.ID }}<br/>
           Target: <a href="{{ $comment.Target }}" target="_blank">{{ $comment.Target }}</a><br/>
-          Name: {{ $comment.Name }}<br/>
-          Website: {{ $comment.Website }}<br/>
-          Comment: {{ html $comment.Comment }}
+          Name: {{ if $comment.Website }}<a href="{{ $comment.Website }}" target="_blank" rel="nofollow noopener noreferrer ugc">{{ $comment.Name }}</a>{{ else }}{{ $comment.Name }}{{ end }}
+        </p>
+        <p class="e-content">
+          {{ html $comment.Comment }}
         </p>
         <form method="post">
           <input type="hidden" name="commentid" value="{{ $comment.ID }}">
diff --git a/templates/postactions.gohtml b/templates/postactions.gohtml
index 2cfedd0..41cc022 100644
--- a/templates/postactions.gohtml
+++ b/templates/postactions.gohtml
@@ -1,7 +1,7 @@
 {{ define "postactions" }}
     <div class="p flex" id="post-actions">
 	<a href="https://www.addtoany.com/share#url={{ absolute .Data.Path }}{{ with title .Data }}&title={{ . }}{{ end }}" target="_blank" rel="nofollow noopener noreferrer" class="button invert">{{ string .Blog.Lang "share" }}</a>&nbsp;
-	<button id="speakBtn" class="button invert hide" data-speak="{{ string .Blog.Lang "speak" }}" data-stopspeak="{{ string .Blog.Lang "stopspeak" }}"></button>
+	<button id="speakBtn" class="invert hide" data-speak="{{ string .Blog.Lang "speak" }}" data-stopspeak="{{ string .Blog.Lang "stopspeak" }}"></button>
 	<script defer src="{{ asset "js/speak.js" }}"></script>
 </div>
 {{ end }}
\ No newline at end of file