diff --git a/themes/nipponalba/layouts/_default/baseof.html b/themes/nipponalba/layouts/_default/baseof.html
index 54005be1..94b540f8 100644
--- a/themes/nipponalba/layouts/_default/baseof.html
+++ b/themes/nipponalba/layouts/_default/baseof.html
@@ -2,7 +2,6 @@
 <html lang="{{- site.Language.Lang -}}">
     {{- partial "head.html" . -}}
     <body>
-      <a href="https://webmention.io/jk.nipponalba.scot/webmention" rel="webmention" style="display:none">webmention</a>
       <input type="checkbox" id="theme-switch" class="theme-switch" autocomplete="on">
       <div id="page">
             {{ partial "navbar.html" . }}
diff --git a/themes/nipponalba/layouts/_default/single.html b/themes/nipponalba/layouts/_default/single.html
index 66973440..77b6507a 100644
--- a/themes/nipponalba/layouts/_default/single.html
+++ b/themes/nipponalba/layouts/_default/single.html
@@ -11,7 +11,8 @@
           <i class="fa fa-clock"></i><span class="reading-time">{{ .ReadingTime }}-minute read</span>
         </div>{{end}}
 
-<div class="e-content">{{ .Content }}
+<div class="e-content"><a href="https://webmention.io/jk.nipponalba.scot/webmention" rel="webmention" style="display:none">webmention</a>
+  {{ .Content }}
   {{ if eq .Type "photo"}}
     <div class="photos">
     {{ range .Page.Params.Photo }}
@@ -88,24 +89,23 @@
 {{ end }}
 {{ end }}
 {{ else }}
-{{ if .Params.inreplyto }}<article class="h-entry" id="response">{{ end }}
-{{ if .Params.likeof }}<article class="h-entry" id="response">{{ end }}
-{{ if .Params.repostof }}<article class="h-entry" id="response">{{ end }}
+<article class="h-entry" id="response">
       <div class="author">
-        <a rel="author" class="p-author  h-card" rel="me" href="https://jk.nipponalba.scot"><img src="/images/profile.jpg"/><div class="title">{{ .Site.Params.Title }}</div></a>
+        <a rel="author" class="u-author h-card" rel="me" href="https://jk.nipponalba.scot"><img src="/images/profile.jpg"/><div class="title">{{ .Site.Params.Title }}</div></a>
       </div>
-      <aside><div class="e-content">
+      <div class="e-content h-cite">
+          <a href="https://webmention.io/jk.nipponalba.scot/webmention" rel="webmention" style="display:none">webmention</a>
           {{ if .Params.inreplyto }}<p> Replied to {{ end }}
             {{ if .Params.likeof }}<p> Liked {{ end }}
           {{ if .Params.repostof }}<p>Shared {{ end }}
           someone's
-          {{ if .Params.likeof }}<a href="{{ .Params.likeof }}" class="u-like-of"> post</a>{{ end }}
-          {{ if .Params.inreplyto }}<a href="{{ .Params.inreplyto }}" class="u-in-reply-to"> post</a>{{ end }}
-          {{ if .Params.repostof }}<a href="{{ .Params.repostof }}" class="u-repost-of"> post</a>{{ end }}</p>
+          {{ if .Params.likeof }}<a href="{{ .Params.likeof }}" class="u-url u-like-of"> post</a>{{ end }}
+          {{ if .Params.inreplyto }}<a href="{{ .Params.inreplyto }}" class="u-url u-in-reply-to"> post</a>{{ end }}
+          {{ if .Params.repostof }}<a href="{{ .Params.repostof }}" class="u-url u-repost-of"> post</a>{{ end }}</p>
           {{ if .Content }}<div class="p-name p-content">{{ .Content }}</div><br/> {{end}}
-          <time class="dt-published" datetime="{{ .Date.Format "2 Jan 2006 15:04 GMT" }}">{{ .Date.Format "02/01/2006 15:04 GMT" }}</time>
-      </div></aside>
-        </article>
+          <div class="date"><a href="{{ .Permalink }}" class="u-url"><time class="dt-published" datetime="{{ .Date.Format "2 Jan 2006 15:04 GMT" }}">{{ .Date.Format "02/01/2006 15:04 GMT" }}</time></a></div>
+          </div>
+      </article>
                       {{end}}
 
 {{end}}
