diff --git a/content/about/team.mdx b/content/about/team.mdx
index a3c7164..c93c006 100644
--- a/content/about/team.mdx
+++ b/content/about/team.mdx
@@ -9,155 +9,376 @@ import { Hero } from '/src/components/Hero';
 import { Link } from '@mui/material';
 
 
-<Hero sx={{ marginBottom: '-2rem !important' }}>
-<Grid container columnSpacing={8}>
-    <Grid item md={4} sm={6}>
-	 <Box
-    	sx={{
-    	  textAlign: 'center',
-          border: '2px dotted',
-          borderColor: 'error.main',
-          borderRadius: '16px',
-          padding: 1,
-          marginTop: '32px'
-    	}}>
-        <Box
-		  sx={{
-		    width: '100%',
-		    '& .gatsby-image-wrapper': {
-		      borderRadius: '50%',
-		    }
-		  }}
-		>
-		  ![Lavanya Ramakrishnan](../../content/images/team/lavanya-ramakrishnan.png)
+<Hero>
+
+## Organizations
+
+	<Grid container columnSpacing={4}>
+		<Grid item md={4} sm={6}>
+		<Box
+			sx={{
+			textAlign: 'center',
+			border: '2px dotted',
+			borderColor: 'error.main',
+			borderRadius: '16px',
+			padding: 1,
+			marginTop: '32px'
+			}}>
+			<Box
+			sx={{
+				maxHeight: '110px',
+				'& .gatsby-image-wrapper': {
+				borderRadius: '50%',
+				}
+			}}
+			>
+			![Lawrence Berkeley National Laboratory](../../content/images/team/logo-lbnl.png)
+			</Box>
+			Lawrence Berkeley National Laboratory<br/>
+		</Box>
+		</Grid>
+		<Grid item md={4} sm={6}>
+		<Box
+			sx={{
+			textAlign: 'center',
+			border: '2px dotted',
+			borderColor: 'error.main',
+			borderRadius: '16px',
+			padding: 1,
+			marginTop: '32px'
+			}}>
+			<Box
+			sx={{
+				maxHeight: '110px',
+				width: 'auto',
+				'& .gatsby-image-wrapper': {
+				borderRadius: '50%',
+				}
+			}}
+			>
+			![Lawrence Berkeley National Laboratory](../../content/images/team/logo-bids.png)
+			</Box>
+			BIDS<br/>
 		</Box>
-		Lavanya Ramakrishnan<br/>
-		<em>Senior Computer Scientist/SciData Division Deputy, PI</em>
-    </Box>
-    </Grid>
-    <Grid item md={4} sm={6}>
-    <Box
-    	sx={{
-    	  textAlign: 'center',
-          border: '2px dotted',
-          borderColor: 'error.main',
-          borderRadius: '16px',
-          padding: 1,
-          marginTop: '32px'
-    	}}>
-	        <Box
-			  sx={{
-			      width: '100%',
-			      '& .gatsby-image-wrapper': {
-			      borderRadius: '50%',
-			    }
-			  }}
+		</Grid>
+		<Grid item md={4} sm={6}>
+		<Box
+			sx={{
+			textAlign: 'center',
+			border: '2px dotted',
+			borderColor: 'error.main',
+			borderRadius: '16px',
+			padding: 1,
+			marginTop: '32px'
+			}}>
+			<Box
+			sx={{
+			maxHeight: '110px',
+				'& .gatsby-image-wrapper': {
+				borderRadius: '50%',
+				}
+			}}
 			>
-		  		![Dan Gunter](../../content/images/team/dan-gunter.png)
+			![Lawrence Berkeley National Laboratory](../../content/images/team/logo-superbloom.png)
 			</Box>
-			Dan Gunter<br/>
-		  	<em>Usable Data Systems Group Lead</em>
-	</Box>
-    </Grid>
-    <Grid item md={4} sm={6}>
-     <Box
-    	sx={{
-    	  textAlign: 'center',
-          border: '2px dotted',
-          borderColor: 'error.main',
-          borderRadius: '16px',
-          padding: 1,
-          marginTop: '32px'
-    	}}>
-        <Box
-		  sx={{
-		    width: '100%',
-		    '& .gatsby-image-wrapper': {
-		      borderRadius: '50%',
-		    }
-		  }}
-		>
-		  ![Sarah Poon](../../content/images/team/sarah-poon.png)
+			Superbloom<br/>
 		</Box>
-		Sarah Poon<br/>
-		  <em>Staff UX Designer</em>
-	</Box>
-    </Grid>
-	<Grid item md={4} sm={6}>
-	 <Box
-    	sx={{
-    	  textAlign: 'center',
-          border: '2px dotted',
-          borderColor: 'error.main',
-          borderRadius: '16px',
-          padding: 1,
-          marginTop: '32px'
-    	}}>
-        <Box
-		  sx={{
-		    width: '100%',
-		    '& .gatsby-image-wrapper': {
-		      borderRadius: '50%',
-		    }
-		  }}
-		>
-		  ![Drew Paine](../../content/images/team/drew-paine.png)
+		</Grid>
+		<Grid item md={4} sm={6}>
+		<Box
+			sx={{
+			textAlign: 'center',
+			border: '2px dotted',
+			borderColor: 'error.main',
+			borderRadius: '16px',
+			padding: 1,
+			marginTop: '32px'
+			}}>
+			<Box
+			sx={{
+				maxHeight: '110px',
+				'& .gatsby-image-wrapper': {
+				borderRadius: '50%',
+				}
+			}}
+			>
+			![Lawrence Berkeley National Laboratory](../../content/images/team/logo-the-carpentries.png)
+			</Box>
+			The Carpentries<br/>
 		</Box>
-		Drew Paine<br/>
-		  <em>Senior UX Researcher</em>
-    </Box>
-    </Grid>
-    <Grid item md={4} sm={6}>
-	 <Box
-    	sx={{
-    	  textAlign: 'center',
-          border: '2px dotted',
-          borderColor: 'error.main',
-          borderRadius: '16px',
-          padding: 1,
-          marginTop: '32px',
-		  minWidth: '250px',
-    	}}>
-        <Box
-		  sx={{
-		    width: '100%',
-		    '& .gatsby-image-wrapper': {
-		      borderRadius: '50%',
-		    }
-		  }}
-		>
-		  ![Cody O'Donnell](../../content/images/team/cody-o-donnell.png)
+		</Grid>
+		<Grid item md={4} sm={6}>
+		<Box
+			sx={{
+			textAlign: 'center',
+			border: '2px dotted',
+			borderColor: 'error.main',
+			borderRadius: '16px',
+			padding: 1,
+			marginTop: '32px'
+			}}>
+			<Box
+			sx={{
+				maxHeight: '110px',
+				'& .gatsby-image-wrapper': {
+				borderRadius: '50%',
+				}
+			}}
+			>
+			![Lawrence Berkeley National Laboratory](../../content/images/team/logo-2i2c.png)
+			</Box>
+			2I2C<br/>
 		</Box>
-		Cody O'Donnell<br/>
-		  <em>UX Engineer</em>
-    </Box>
-    </Grid>
-    <Grid item md={4} sm={6}>
-	 <Box
-    	sx={{
-    	  textAlign: 'center',
-          border: '2px dotted',
-          borderColor: 'error.main',
-          borderRadius: '16px',
-          padding: 1,
-          marginTop: '32px'
-    	}}>
-        <Box
-		  sx={{
-		    width: '100%',
-		    '& .gatsby-image-wrapper': {
-		      borderRadius: '50%',
-		    }
-		  }}
-		>
-		  ![Rajshree Deshmukh](../../content/images/team/rajshree-deshmukh.png)
+		</Grid>
+		<Grid item md={4} sm={6}>
+		<Box
+			sx={{
+			textAlign: 'center',
+			border: '2px dotted',
+			borderColor: 'error.main',
+			borderRadius: '16px',
+			padding: 1,
+			marginTop: '32px'
+			}}>
+			<Box
+			sx={{
+				maxHeight: '110px',
+				'& .gatsby-image-wrapper': {
+				borderRadius: '50%',
+				}
+			}}
+			>
+			![Lawrence Berkeley National Laboratory](../../content/images/team/logo-ospo.png)
+			</Box>
+			OSPO<br/>
 		</Box>
-		Rajshree Deshmukh<br/>
-		  <em>UX Designer</em>
-    </Box>
-    </Grid>
+		</Grid>
+	</Grid>
+</Hero>
+
+<PageContainer>
+
+## People
 
- </Grid>
+	<Grid container columnSpacing={8}>
+		<Grid item md={4} sm={6}>
+		<Box
+			sx={{
+			textAlign: 'center',
+			border: '2px dotted',
+			borderColor: 'error.main',
+			borderRadius: '16px',
+			padding: 1,
+			marginTop: '32px'
+			}}>
+			<Box
+			sx={{
+				width: '100%',
+				'& .gatsby-image-wrapper': {
+				borderRadius: '50%',
+				}
+			}}
+			>
+			![Lavanya Ramakrishnan](../../content/images/team/lavanya-ramakrishnan.png)
+			</Box>
+			Lavanya Ramakrishnan<br/>
+			<em>Senior Computer Scientist/SciData Division Deputy, PI, LBNL</em>
+		</Box>
+		</Grid>
+		<Grid item md={4} sm={6}>
+		<Box
+			sx={{
+			textAlign: 'center',
+			border: '2px dotted',
+			borderColor: 'error.main',
+			borderRadius: '16px',
+			padding: 1,
+			marginTop: '32px'
+			}}>
+				<Box
+				sx={{
+					width: '100%',
+					'& .gatsby-image-wrapper': {
+					borderRadius: '50%',
+					}
+				}}
+				>
+					![Dan Gunter](../../content/images/team/dan-gunter.png)
+				</Box>
+				Dan Gunter<br/>
+				<em>Usable Data Systems Group Lead, LBNL</em>
+		</Box>
+		</Grid>
+		<Grid item md={4} sm={6}>
+		<Box
+			sx={{
+			textAlign: 'center',
+			border: '2px dotted',
+			borderColor: 'error.main',
+			borderRadius: '16px',
+			padding: 1,
+			marginTop: '32px'
+			}}>
+			<Box
+			sx={{
+				width: '100%',
+				'& .gatsby-image-wrapper': {
+				borderRadius: '50%',
+				}
+			}}
+			>
+			![Sarah Poon](../../content/images/team/sarah-poon.png)
+			</Box>
+			Sarah Poon<br/>
+			<em>Staff UX Designer, LBNL</em>
+		</Box>
+		</Grid>
+		<Grid item md={4} sm={6}>
+		<Box
+			sx={{
+			textAlign: 'center',
+			border: '2px dotted',
+			borderColor: 'error.main',
+			borderRadius: '16px',
+			padding: 1,
+			marginTop: '32px'
+			}}>
+			<Box
+			sx={{
+				width: '100%',
+				'& .gatsby-image-wrapper': {
+				borderRadius: '50%',
+				}
+			}}
+			>
+			![Drew Paine](../../content/images/team/drew-paine.png)
+			</Box>
+			Drew Paine<br/>
+			<em>Senior UX Researcher, LBNL</em>
+		</Box>
+		</Grid>
+		<Grid item md={4} sm={6}>
+		<Box
+			sx={{
+			textAlign: 'center',
+			border: '2px dotted',
+			borderColor: 'error.main',
+			borderRadius: '16px',
+			padding: 1,
+			marginTop: '32px',
+			minWidth: '250px',
+			}}>
+			<Box
+			sx={{
+				width: '100%',
+				'& .gatsby-image-wrapper': {
+				borderRadius: '50%',
+				}
+			}}
+			>
+			![Cody O'Donnell](../../content/images/team/cody-o-donnell.png)
+			</Box>
+			Cody O'Donnell<br/>
+			<em>UX Engineer, LBNL</em>
+		</Box>
+		</Grid>
+		<Grid item md={4} sm={6}>
+		<Box
+			sx={{
+			textAlign: 'center',
+			border: '2px dotted',
+			borderColor: 'error.main',
+			borderRadius: '16px',
+			padding: 1,
+			marginTop: '32px'
+			}}>
+			<Box
+			sx={{
+				width: '100%',
+				'& .gatsby-image-wrapper': {
+				borderRadius: '50%',
+				}
+			}}
+			>
+			![Rajshree Deshmukh](../../content/images/team/rajshree-deshmukh.png)
+			</Box>
+			Rajshree Deshmukh<br/>
+			<em>UX Designer, LBNL</em>
+		</Box>
+		</Grid>
+		<Grid item md={4} sm={6}>
+		<Box
+			sx={{
+			textAlign: 'center',
+			border: '2px dotted',
+			borderColor: 'error.main',
+			borderRadius: '16px',
+			padding: 1,
+			marginTop: '32px'
+			}}>
+			<Box
+			sx={{
+				width: '100%',
+				'& .gatsby-image-wrapper': {
+				borderRadius: '50%',
+				}
+			}}
+			>
+			![Hannah Cohoon](../../content/images/team/hannah-cohoon.png)
+			</Box>
+			Hannah Cohoon<br/>
+			<em>UX Researcher, LBNL</em>
+		</Box>
+		</Grid>
+		<Grid item md={4} sm={6}>
+		<Box
+			sx={{
+			textAlign: 'center',
+			border: '2px dotted',
+			borderColor: 'error.main',
+			borderRadius: '16px',
+			padding: 1,
+			marginTop: '32px'
+			}}>
+			<Box
+			sx={{
+				width: '100%',
+				'& .gatsby-image-wrapper': {
+				borderRadius: '50%',
+				}
+			}}
+			>
+			![Tiffany Win](../../content/images/team/tiffany-win.png)
+			</Box>
+			Tiffany Win<br/>
+			<em>Communications Specialist, LBNL</em>
+		</Box>
+		</Grid>
+		<Grid item md={4} sm={6}>
+		<Box
+			sx={{
+			textAlign: 'center',
+			border: '2px dotted',
+			borderColor: 'error.main',
+			borderRadius: '16px',
+			padding: 1,
+			marginTop: '32px'
+			}}>
+			<Box
+			sx={{
+				width: '100%',
+				'& .gatsby-image-wrapper': {
+				borderRadius: '50%',
+				}
+			}}
+			>
+			![Maarten Lopes](../../content/images/team/maarten-lopes.png)
+			</Box>
+			Maarten Lopes<br/>
+			<em>Intern, LBNL</em>
+		</Box>
+		</Grid>
 
+	</Grid>
+</PageContainer>
 
-</Hero>
\ No newline at end of file
diff --git a/content/images/team/hannah-cohoon.png b/content/images/team/hannah-cohoon.png
new file mode 100644
index 0000000..e3eadd9
Binary files /dev/null and b/content/images/team/hannah-cohoon.png differ
diff --git a/content/images/team/logo-2i2c.png b/content/images/team/logo-2i2c.png
new file mode 100644
index 0000000..6c07f47
Binary files /dev/null and b/content/images/team/logo-2i2c.png differ
diff --git a/content/images/team/logo-bids.png b/content/images/team/logo-bids.png
new file mode 100644
index 0000000..b712beb
Binary files /dev/null and b/content/images/team/logo-bids.png differ
diff --git a/content/images/team/logo-lbnl.png b/content/images/team/logo-lbnl.png
new file mode 100644
index 0000000..3fa6d9a
Binary files /dev/null and b/content/images/team/logo-lbnl.png differ
diff --git a/content/images/team/logo-ospo.png b/content/images/team/logo-ospo.png
new file mode 100644
index 0000000..0ede8ea
Binary files /dev/null and b/content/images/team/logo-ospo.png differ
diff --git a/content/images/team/logo-superbloom.png b/content/images/team/logo-superbloom.png
new file mode 100644
index 0000000..2b9fabb
Binary files /dev/null and b/content/images/team/logo-superbloom.png differ
diff --git a/content/images/team/logo-the-carpentries.png b/content/images/team/logo-the-carpentries.png
new file mode 100644
index 0000000..c3cbc4f
Binary files /dev/null and b/content/images/team/logo-the-carpentries.png differ
diff --git a/content/images/team/maarten-lopes.png b/content/images/team/maarten-lopes.png
new file mode 100644
index 0000000..c2fe51a
Binary files /dev/null and b/content/images/team/maarten-lopes.png differ
diff --git a/content/images/team/tiffany-win.png b/content/images/team/tiffany-win.png
new file mode 100644
index 0000000..2b76773
Binary files /dev/null and b/content/images/team/tiffany-win.png differ