diff --git a/layouts/_default/frag/metadata.html b/layouts/_default/frag/metadata.html
index d91dc35..d65c6b3 100644
--- a/layouts/_default/frag/metadata.html
+++ b/layouts/_default/frag/metadata.html
@@ -1,3 +1,4 @@
+{{ partial "status" . }}
 <div class="page-date">
     <strong>Date:</strong>
     <time>{{ .Date.Format .Site.Params.DateFormat }}</time>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 1ef6dc9..cdcf61e 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -9,7 +9,6 @@
 			<div class="columns">
 				<div class="column is-2">
 					{{ .Render "frag/metadata" }}
-					{{ partial "status" . }}
 				</div>
 				<div class="column is-8">
 					{{ partial "series-items" . }}
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index d59089a..56a22dd 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -11,7 +11,6 @@
 		<div class="columns">
 			<div class="column is-2">
 				{{ .Render "frag/metadata" }}
-				{{ partial "status" . }}
 			</div>
 			<div class="column is-8 content">
 				{{ .Render "frag/summary-content" }}
diff --git a/layouts/page/frag/metadata.html b/layouts/page/frag/metadata.html
index 4fba398..0fef108 100644
--- a/layouts/page/frag/metadata.html
+++ b/layouts/page/frag/metadata.html
@@ -1 +1,2 @@
+{{ partial "status" . }}
 {{ partial "tags" .Params.tags }}
diff --git a/layouts/partials/status.html b/layouts/partials/status.html
index 3beaea6..8d25836 100644
--- a/layouts/partials/status.html
+++ b/layouts/partials/status.html
@@ -1 +1 @@
-{{ if .Params.draft }}<p><em>DRAFT ✏️</em></p>{{ end }}
+{{ if .Params.draft }}<div><strong>Status:</strong> DRAFT ✏️</div>{{ end }}