diff --git a/assets/images/governance/governance.jpg b/assets/images/about/governance.jpg
similarity index 100%
rename from assets/images/governance/governance.jpg
rename to assets/images/about/governance.jpg
diff --git a/assets/images/missionstatement.jpg b/assets/images/about/missionstatement.jpg
similarity index 100%
rename from assets/images/missionstatement.jpg
rename to assets/images/about/missionstatement.jpg
diff --git a/content/about/governance.md b/content/about/governance.md
index 61a71df..18834f0 100644
--- a/content/about/governance.md
+++ b/content/about/governance.md
@@ -1,11 +1,7 @@
 ---
 title: Governance
+image: governance.jpg
 date: 2021-09-25
-image: 
-  name: governance.jpg
-  alt: Governance
-type: governance
-layout: single
 draft: false
 ---
 
diff --git a/content/about/missionstatement.md b/content/about/missionstatement.md
index 12cf4f2..9c2b3d1 100644
--- a/content/about/missionstatement.md
+++ b/content/about/missionstatement.md
@@ -1,9 +1,7 @@
 ---
-title: "Mission Statement"
+title: Mission Statement
+image: missionstatement.jpg
 date: 2021-03-06
-image:
-  file: missionstatement.jpg
-  size: 350x350
 draft: false
 ---
 
diff --git a/themes/openpowerfoundation/layouts/about/single.html b/themes/openpowerfoundation/layouts/about/single.html
new file mode 100644
index 0000000..63c558b
--- /dev/null
+++ b/themes/openpowerfoundation/layouts/about/single.html
@@ -0,0 +1,28 @@
+{{ partial "header.html" . }}
+{{ partial "navbar.html" . }}
+<main id="main" class="main governance">
+<div class="container">
+	<div class="row no-gutters">
+		<div class="col-md-6 pr-3 pl-0">
+			<h1 class="h2 section-header my-3 my-md-5 pb-2">{{ .Title }}</h1>
+			<div class="content">{{ .Content }}</div>
+		</div>
+		<div class="col-md-6 pt-3 pt-lg-5 pl-0 pl-lg-3 pr-0">
+			{{ if .Param "image" }}
+				{{ $imagename := .Param "image" }}
+				{{ $imagelocation := (printf "%s/%s" "images/about/" $imagename) }}
+				{{ $imageresource := resources.Get $imagelocation }}
+				{{ if $imageresource }}
+					<figure class="figure d-flex pt-0 pt-lg-3">
+					{{ $image := $imageresource.Fit "600x600" }}
+					<img class="img-fluid" src="{{  $image.RelPermalink }}" alt="{{ .Title }}" title="{{ .Title }}">
+					</figure>
+				{{ end }}
+			{{ else }}
+				{{ .Title }}
+			{{ end }}
+		</div>
+	</div>
+</div>
+</main>
+{{ partial "footer.html" . }}
diff --git a/themes/openpowerfoundation/layouts/governance/single.html b/themes/openpowerfoundation/layouts/governance/single.html
deleted file mode 100644
index 3867e83..0000000
--- a/themes/openpowerfoundation/layouts/governance/single.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{{ partial "header.html" . }}
-
-{{ partial "navbar.html" . }}
-
-<main id="main" class="main governance" >
-		<div class="container">
-			<div class="row no-gutters"> 
-				<div class="col-md-6 pr-3 pl-0">
-					<h1 class="h2 section-header my-3 my-md-5 pb-2">{{ .Title }}</h1>
-					<div class="content">
-							{{ .Content }}
-					</div>   
-				</div>
-				<div class="col-md-6 pt-3 pt-lg-5 pl-0 pl-lg-3 pr-0">
-				{{ if .Param "image.name" }}
-					<figure class="figure d-flex pt-0 pt-lg-3">      
-					{{ $imagename := .Param "image.name" }}
-					{{ $imagelocation := (printf "%s/%s" "images/governance/" $imagename) }}
-					{{ $imageresource := resources.Get $imagelocation }}
-					{{ if $imageresource }}
-							{{ $image := $imageresource.Fit "600x600" }}
-							<img class="img-fluid" src="{{  $image.RelPermalink }}" alt="{{ .Param "image.alt" }}" title="{{ .Param "image.alt" }}">
-					{{ end }}
-					</figure>
-				{{ else }}
-					{{ .Title }}
-				{{ end }}
-				</div>
-			</div>
-		</div>
-</main>
-
-{{ partial "footer.html" . }}