diff --git a/config.toml b/config.toml
index b3c0a6e..e7f7c5f 100644
--- a/config.toml
+++ b/config.toml
@@ -5,6 +5,11 @@ title = 'Pranav Karawale'
 [taxonomies]
 tag = 'tags'
 
+[Params]
+# This should be the same as baseURL. This is used in some places because
+# during development using `hugo server`, the baseURL changes to localhost.
+realBaseURL = 'https://karawale.in/staging'
+
 [Params.indieweb]
 micropub = 'https://karawale.in/lilac/micropub'
 authorization_endpoint = 'https://indieauth.com/auth'
diff --git a/layouts/notes/single.html b/layouts/notes/single.html
new file mode 100644
index 0000000..4549663
--- /dev/null
+++ b/layouts/notes/single.html
@@ -0,0 +1,5 @@
+{{- define "main" }}
+{{ partial "post-start" . }}
+<section class="e-content">{{ .Content }}</section>
+{{ partial "post-end" . }}
+{{- end }}
diff --git a/layouts/partials/post-end.html b/layouts/partials/post-end.html
index c05f84e..e050ec0 100644
--- a/layouts/partials/post-end.html
+++ b/layouts/partials/post-end.html
@@ -1,21 +1,35 @@
 {{- /* Continued from post-start.html */ -}}
-  <a href="{{ .Permalink }}">
-  Published on <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">
-      {{ .Date.Format "02 January, 2006" }}
-    </time>
-    {{ if .Lastmod | and (.Lastmod.After .Date) }}
-      , edited <time datetime="{{ .Lastmod.Format "2006-01-02T15:04:05Z" }}">
-        {{ .Lastmod.Format "02 January, 2006" }}
-      </time>
-    {{ end }}
+{{ if .Param "photo" }}
+{{ range $photo := .Param "photo" }}
+  {{ $image := resources.Get (strings.TrimPrefix $.Site.Params.RealBaseURL $photo.value) }}
+  {{ if eq $image nil }}
+	{{ $image = resources.GetRemote $photo.value }}
+  {{ end }}
+  {{ $image := $image.Fit "800x600" }}
+  <a href="{{ $photo.value }}">
+	  <img src="{{ $image.RelPermalink }}" width="{{ $image.Width }}" height="{{ $image.Height }}" alt="{{ $photo.alt }}"
+		  class="u-photo" />
   </a>
-  <ul>
-    {{ range $tag := .Param "tags" }}
-      <li>
-        <a href="/tags/{{ $tag }}">
-          #<span class="p-category">{{ $tag }}</span>
-        </a>
-      </li>
-    {{ end }}
-  </ul>
-</div>
+  {{ end }}
+{{ end }}
+
+<a class="u-url" href="{{ .Permalink }}">
+	Published on <time class="dt-published" datetime="{{ .Date.Format " 2006-01-02T15:04:05Z" }}">
+		{{ .Date.Format "02 January, 2006" }}
+	</time>
+	{{ if .Lastmod | and (.Lastmod.After .Date) }}
+	, edited <time class="dt-updated" datetime="{{ .Lastmod.Format " 2006-01-02T15:04:05Z" }}">
+		{{ .Lastmod.Format "02 January, 2006" }}
+	</time>
+	{{ end }}
+</a>
+<ul>
+	{{ range $tag := .Param "tags" }}
+	<li>
+		<a href="/tags/{{ $tag }}">
+			#<span class="p-category">{{ $tag }}</span>
+		</a>
+	</li>
+	{{ end }}
+</ul>
+</article>
diff --git a/layouts/partials/post-start.html b/layouts/partials/post-start.html
index 94125cb..e678fe6 100644
--- a/layouts/partials/post-start.html
+++ b/layouts/partials/post-start.html
@@ -1,10 +1,10 @@
 {{- $me := .Site.Params.Me -}}
 
-<div class="h-entry">
-  <div class="h-card">
-    <img src="{{ $me.photo }}" height="48" width="48" alt="A close-up photo of my face.">
-    <a href="{{ .Site.BaseURL }}" class="u-name u-url">
-      {{ $me.Name }}
-    </a>    
-  </div>
-{{- /* Continued in ./post-end.html */ -}}
+<article class="h-entry">
+	<section class="h-card">
+		<img class="u-photo" src="{{ $me.photo }}" height="48" width="48" alt="A close-up photo of my face." />
+		<a href="{{ .Site.BaseURL }}" class="u-name u-url">
+			{{ $me.Name }}
+		</a>
+	</section>
+	{{- /* Continued in ./post-end.html */ -}}