diff --git a/content/persons/artemikoev.md b/content/persons/artemikoev.md
index fc70fe5..fa900e5 100644
--- a/content/persons/artemikoev.md
+++ b/content/persons/artemikoev.md
@@ -1,7 +1,7 @@
 ---
 title: "Artem Ikoev"
-member: "yadro"
 image: "artemikoev-200.jpg"
+member: yadro
 date: 2021-03-03
 draft: false
 ---
diff --git a/content/persons/hughblemings.md b/content/persons/hughblemings.md
index aa9b9f5..4c0e06e 100644
--- a/content/persons/hughblemings.md
+++ b/content/persons/hughblemings.md
@@ -1,7 +1,7 @@
 ---
 title: "Hugh Blemings"
 image: "hughblemings-200.jpg"
-member: individual
+member: hughblemings
 date: 2021-03-13
 draft: false
 ---
diff --git a/content/persons/jameshuang.md b/content/persons/jameshuang.md
index 5046f3f..198219a 100644
--- a/content/persons/jameshuang.md
+++ b/content/persons/jameshuang.md
@@ -1,7 +1,7 @@
 ---
 title: "James Huang"
-member: Inspur Power Systems
 image: "jameshuang-200.jpg"
+member: inspurpowersystems
 date: 2021-03-03
 draft: false
 ---
diff --git a/content/persons/sameershende.md b/content/persons/sameershende.md
index bce911f..1109668 100644
--- a/content/persons/sameershende.md
+++ b/content/persons/sameershende.md
@@ -1,7 +1,7 @@
 ---
 title: "Sameer Shende"
 image: "sameershende-200.jpg"
-member: University of Oregon
+member: universityoforegon
 date: 2021-03-03
 draft: false
 ---
diff --git a/content/persons/timothypearson.md b/content/persons/timothypearson.md
index e628ae8..f974c25 100644
--- a/content/persons/timothypearson.md
+++ b/content/persons/timothypearson.md
@@ -1,7 +1,7 @@
 ---
 title: "Timothy Pearson"
 image: "timothypearson-200.jpg"
-member: "Raptor Computing Systems"
+member: raptorcomputingsystems
 date: 2021-03-03
 draft: false
 ---
diff --git a/themes/openpowerfoundation/layouts/boardofdirectors/list.html b/themes/openpowerfoundation/layouts/boardofdirectors/list.html
index a67cab5..2084ed1 100644
--- a/themes/openpowerfoundation/layouts/boardofdirectors/list.html
+++ b/themes/openpowerfoundation/layouts/boardofdirectors/list.html
@@ -1,59 +1,39 @@
 {{ partial "header.html" . }}
 {{ partial "navbar.html" . }}
-
- <main id="main" class="main boardofdirectors">
-		<div class="container">
-			<div class="row">
-			<h1 class="section-header my-3 my-md-5 pb-2 pb-md-3 text-center">{{ .Title }}</h1>
-			{{ range .Data.Pages.ByWeight }}
+<main id="main" class="main boardofdirectors">
+<div class="container">
+	<div class="row">
+		<h1 class="section-header my-3 my-md-5 pb-2 pb-md-3 text-center">{{ .Title }}</h1>
+		{{ range .Data.Pages.ByWeight }}
+			{{ $personfilename := .File.BaseFileName }}
+			{{ $personfile := printf "%s/%s" "persons" $personfilename }}
 			<article class="post__article col-10 offset-1 row mb-4 pt-4">
 				<div class="col-md-2 mb-4 mb-md-0 pt-md-3 pl-4 pl-lg-0">
-				{{ $personfile := .File.BaseFileName }}
-				{{ range where .Site.Pages "Section" "persons" }}
-					{{ $person := .File.BaseFileName }}
-					{{ if eq $personfile $person }}
-						{{ if .Param "image" }}
-							{{ $imagename := .Param "image" }}
-							{{ $imagelocation := (printf "%s/%s" "images/persons/" $imagename) }}
-							{{ $imageresource := resources.Get $imagelocation }}
-							{{ $image := $imageresource.Fit "390x390 webp" }}
-							<img class="img-fluid"  src="{{ $image.RelPermalink }}" alt="{{ .Title }}" title="{{ .Title }}">
-						{{ else }}
-							{{ .Title }}
-						{{ end }}
+				{{ with $.Site.GetPage $personfile }}
+					{{ if .Param "image" }}
+						{{ $imagename := .Param "image" }}
+						{{ $imagelocation := (printf "%s/%s" "images/persons/" $imagename) }}
+						{{ $imageresource := resources.Get $imagelocation }}
+						{{ $image := $imageresource.Fit "390x390 webp" }}
+						<img class="img-fluid"  src="{{ $image.RelPermalink }}" alt="{{ .Title }}" title="{{ .Title }}">
+					{{ else }}
+						{{ .Title }}
 					{{ end }}
 				{{ end }}
 				</div>
 				<div class="col-md-10 pl-4 mb-4 mb-lg-6 person">
 					<h2>{{ .Title }}, {{ .Param "position" }}</h2>
-					{{ $personfile := .File.BaseFileName }}
-					{{ $persontitle := .Title }}
-					{{ range where .Site.RegularPages "Section" "persons" }}
-						{{ $person := .File.BaseFileName }}
-						{{ $company_member := .Param "member" }}
-						{{ $company_member := upper $company_member }}
-						{{ if eq $personfile $person }}
-					<h3>
-						{{ if eq $persontitle "Hugh Blemings" }}
-							<a class="disabled" href="{{ .Param "link" }}">Individual</a>
-						{{ else if eq $persontitle "James Kulina"}}
-							<a href="https://openpowerfoundation.org" target="_blank">OpenPOWER Foundation</a>
-						{{ else }}
-							{{ range where .Site.Pages "Section" "members" }}
-							{{ $company_title := upper .Title }}
-							{{ if eq $company_member $company_title }}
-								<a href="{{ .Param "link" }}" target="_blank">{{ $company_member }}</a>
-							{{ end }}
+					{{ with $.Site.GetPage $personfile }}
+						{{ $memberfile := printf "%s/%s" "members" (.Param "member") }}
+						{{ with $.Site.GetPage $memberfile }}
+							<h3><a href="{{ .Permalink }}">{{ .Title }}</a></h3>
 						{{ end }}
+						<p>{{ .Content }}</p>
 					{{ end }}
-					</h3>
-					<p>{{ .Content }}</p>
 				</div>
 			</article>
-			{{ end }}
-			{{ end }}
 		{{ end }}
-		</div>
-  </div>
+	</div>
+</div>
 </main>
 {{ partial "footer.html" . }}