diff --git a/layouts/all/single.html b/layouts/all/single.html
index 3d9dad3e..da39b9ee 100644
--- a/layouts/all/single.html
+++ b/layouts/all/single.html
@@ -1,13 +1,15 @@
 {{ define "main" }}
 <section class="stream h-feed">
   <section class="author" style="display:none;">
-    <a rel="author" class="p-author h-card" rel="me" href="https://jon.kelbie.scot">{{ .Site.Params.Author }}<img src="/images/profile1.jpg"/></a>
+    <a rel="author" class="u-author h-card" rel="me" href="https://jk.nipponalba.scot">{{ .Site.Params.Title }}<img src="/images/profile.jpg"/></a>
   </section>
-            {{ range where .Site.Pages "Kind" "page"}}
+              {{ range where .Site.Pages "Kind" "page"}}
               {{ if not (eq .Type "response")}}<section data-post-type="{{ .Type }}" class="feed h-entry {{.Type }}">
-                {{ with .Page.Params.Image }}<center>{{ partial "image.html" . }}</center>{{ end }}
+                <section class="author" style="display:none;">
+                  <a rel="author" class="u-author h-card" rel="me" href="https://jk.nipponalba.scot">{{ .Site.Params.Title }}<img src="/images/profile.jpg"/></a>
+                </section>
                 <article class="index_content">
-                  {{if eq .Type "article"}}<a href="{{ .Permalink }}" class="u-url"><h3 class="p-name entry-title">{{ .Title }}</h3></a><b>{{ .Description }}</b>{{ end }}
+                  {{if eq .Type "article" }}<br/>{{ with .Page.Params.Image }}{{ partial "taxonomy/image.html" . }}{{ end }}<a href="{{ .Permalink }}" class="u-url"><h3 class="p-name entry-title">{{ .Title }}</h3></a><b>{{ .Description }}</b>{{ end }}
                   {{ if eq .Type "article" }}<section class="info">
                   <span class="blogs_span">{{ with .Page.Params.Blog }}Blog: {{ partial "taxonomy/blog.html" . }}{{ end }}</span><span class="info-date"><time class="dt-published" datetime="{{ .Date.Format "2 Jan 2006 15:04 GMT" }}">{{ .Date.Format "02/01/2006 15:04 GMT" }}</time></span><br/>
                   <span class="categories_span">{{ with .Page.Params.category }}Categories: {{ partial "taxonomy/categories.html" . }}{{ end }}</span><span class="reading-time">{{ .ReadingTime }}-minute read</span><br/>
@@ -17,14 +19,14 @@
                     {{ .Content }}
                     {{ if eq .Type "photo"}}
                     <section class="photogrid">
-                  {{$link := .Permalink}}
-                  {{$summary := .Content}}
-                    {{ range .Page.Params.Photo }}
-                    {{ if isset . "value" }}
-                      <a href="{{ $link }}" class="u-url"><img class="u-photo thumb" src="{{ replace .value "800." "300."}}" title="{{ $summary }}" alt="{{ .alt }}"/></a>
-                      {{ else }}
-                      <a href="{{ $link }}" class="u-url"><img class="u-photo thumb" src="{{ replace . "800." "300."}}" title="{{ $summary }}" alt="Alt not yet added, will fix!"/></a>
-                    {{end}}{{end}}
+                      {{$link := .Permalink}}
+                      {{$summary := .Content}}
+                      {{ range .Page.Params.Photo }}
+                      {{ if isset . "value" }}
+                        <a href="{{ $link }}" class="u-url"><img class="u-photo thumb" src="{{ replace .value "800." "300."}}" title="{{ $summary }}" alt="{{ .alt }}"/></a>
+                        {{ else }}
+                        <a href="{{ $link }}" class="u-url"><img class="u-photo thumb" src="{{ replace . "800." "300."}}" title="{{ $summary }}" alt="Alt not yet added, will fix!"/></a>
+                      {{end}}{{end}}
                     </section>
                       {{end}}
                   </section><br/>
@@ -32,19 +34,22 @@
                     <span class="categories_span">{{ with .Page.Params.category }}Categories: {{ partial "taxonomy/categories.html" . }}{{ end }}</span><span class="info-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></span><br/>
                       </section>{{ end }}
                 </article>
-                </section>
+                </section><hr/>
                 {{ else }}
                 <section data-post-type="{{ .Params.posttype }}" data-post-id="{{ .Params.slug }}" class="h-entry" id="response">
-                      <article class="h-cite"><p class="response-top">{{ .Site.Params.Firstname }}
-                        {{ if eq .Params.posttype "in-reply-to" }} replied to <a href="{{ index .Params "in-reply-to" }}" class="u-in-reply-to">{{ index .Params "in-reply-to" }}</a>{{ end }}
-                        {{ if eq .Params.posttype "like-of" }}  liked <a href="{{ index .Params "like-of" }}" class="u-like-of">{{ index .Params "like-of" }}</a>{{ end }}
-                        {{  if eq .Params.posttype "repost-of"  }}  shared <a href="{{ index .Params "repost-of" }}" class="u-repost-of">{{ index .Params "repost-of" }}</a>{{ end }}</p>
+                      <section class="author" style="display:none;">
+                        <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>
+                      </section>
+                      <article class="h-cite"><p>{{ .Site.Params.Title }}
+                          {{ if eq .Params.posttype "like-of" }}  liked <a href="{{ index .Params "like-of" }}" class="u-like-of">{{ index .Params "like-of" }}</a>{{ end }}
+                          {{ if eq .Params.posttype "in-reply-to" }} replied to <a href="{{ index .Params "in-reply-to" }}" class="u-in-reply-to">{{ index .Params "in-reply-to" }}</a>{{ end }}
+                          {{  if eq .Params.posttype "repost-of"  }}  shared <a href="{{ index .Params "repost-of" }}" class="u-repost-of">{{ index .Params "repost-of" }}</a>{{ end }}</p>
                           {{ if .Content }}<section class="p-name p-content">{{ .Content }}</section>{{end}}
                           {{ if not (eq .Type "article") }}<section class="info">
                               <span class="categories_span">{{ with .Page.Params.category }}Categories: {{ partial "taxonomy/categories.html" . }}{{ end }}</span><span class="info-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></span><br/>
                               </section>{{ end }}
                         </article>
-                      </section>
+                      </section><hr/>
                       {{end}}
             {{ end }}