cosmetics

8 files changed, 24 insertions, 43 deletions

diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md
index 7f034d57..17302118 100644
--- a/site/content/pages/about/index.md
+++ b/site/content/pages/about/index.md
@@ -13,22 +13,7 @@ authors: Adam Harvey
 
 # About This Project
 
-- [About](/about/)
-- [Press](/about/press/)
-- [Research Methodology](/about/research/)
-- [Disclaimer](/about/disclaimer/)
-- [Terms and Conditions](/about/terms/)
-- [Privacy Policy](/about/privacy/)
-
-### Sidebar
-
-### Recent Press
-
-- [TheVerge: Transgender YouTubers had their videos grabbed to train facial recognition software](https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset) by James Vincent 
-- [TheVerge: Transgender YouTubers had their videos grabbed to train facial recognition software](https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset) by James Vincent 
-- [change to small button]Read more [press](/about/press)
- 
-## End Sidebar
+{% include 'about_navigation.html' %}
 
 MegaPixels is an art and research project by Adam Harvey about the origins and ethics of facial analysis datasets. Where do they come from? Who's included? Who created it and for what reason?
 
@@ -36,7 +21,6 @@ MegaPixels sets out to answer to these questions and reveal the stories behind t
 
 MegaPixels sets out to answer to these questions and reveal the stories behind the millions of images used to train, evaluate, and power the facial recognition surveillance algorithms used today. MegaPixels is authored by Adam Harvey, developed in collaboration with Jules LaPlace, and produced in partnership with Mozilla.
 
-MegaPixels sets out to answer to these questions and reveal the stories behind the millions of images used to train, evaluate, and power the facial recognition surveillance algorithms used today. MegaPixels is authored by Adam Harvey, developed in collaboration with Jules LaPlace, and produced in partnership with Mozilla.
 
 ![sideimage:Adam Harvey](assets/adam-harvey.jpg) **Adam Harvey** is an American artist and researcher based in Berlin. His previous projects (CV Dazzle, Stealth Wear, and SkyLift) explore the potential for countersurveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups), the recipient of 2 PrototypeFund awards, and is currently a researcher in residence at Karlsruhe HfG studying artifical intelligence and datasets.
 
diff --git a/site/content/pages/datasets/brainwash/assets/00425000_640x480.jpg b/site/content/pages/datasets/brainwash/assets/00425000_640x480.jpg
new file mode 100644
index 00000000..de62175a
--- /dev/null
+++ b/site/content/pages/datasets/brainwash/assets/00425000_640x480.jpg
diff --git a/site/content/pages/datasets/brainwash/assets/00818000_640x480.jpg b/site/content/pages/datasets/brainwash/assets/00818000_640x480.jpg
new file mode 100644
index 00000000..30c0fcb1
--- /dev/null
+++ b/site/content/pages/datasets/brainwash/assets/00818000_640x480.jpg
diff --git a/site/content/pages/datasets/brainwash/assets/background.jpg b/site/content/pages/datasets/brainwash/assets/background.jpg
index d971a331..f6efb253 100755..100644
--- a/site/content/pages/datasets/brainwash/assets/background.jpg
+++ b/site/content/pages/datasets/brainwash/assets/background.jpg
diff --git a/site/content/pages/datasets/brainwash/assets/background_02.jpg b/site/content/pages/datasets/brainwash/assets/background_02.jpg
deleted file mode 100644
index eada1779..00000000
--- a/site/content/pages/datasets/brainwash/assets/background_02.jpg
+++ /dev/null
diff --git a/site/content/pages/datasets/brainwash/assets/index.jpg b/site/content/pages/datasets/brainwash/assets/index.jpg
index c903baea..e85f75c2 100644
--- a/site/content/pages/datasets/brainwash/assets/index.jpg
+++ b/site/content/pages/datasets/brainwash/assets/index.jpg
diff --git a/site/content/pages/datasets/brainwash/index.md b/site/content/pages/datasets/brainwash/index.md
index b12f4bd5..a99dce3a 100644
--- a/site/content/pages/datasets/brainwash/index.md
+++ b/site/content/pages/datasets/brainwash/index.md
@@ -15,9 +15,9 @@ authors: Adam Harvey
 
 ### Statistics
 
-+ Published: 2015
 + Collected: 2014
-+ Location: San Franscisco
++ Published: 2015
++ Location: 1122 Folsom Street​ San Franscisco
 + Images: 11,917
 + Faces: 91,146
 + Created by: Stanford Department of Computer Science
@@ -26,35 +26,36 @@ authors: Adam Harvey
 + Origin: Angelcam IP Cam
 + Purpose: Training face detection
 
-### Insights
+- more info1
+- more info2
+- more info3
 
-- more insights here
+## Brainwash Dataset
 
-- facts about Brainwash 2
+*Brainwash* is a face detection dataset created from the Brainwash Cafe's livecam footage. The stream is It was published in 2015 by researchers at the Stanford University and has been used 1122 Folsom Street​ | USA
 
-## Brainwash Dataset
+The photos were collected on
+- Oct 27, 2014
+- Nov 11, 2014
+- Nov 245, 2017
 
-*Brainwash* is a face detection dataset created from the Brainwash Cafe's livecam footage. The stream is It was published in 2015 by researchers at the Stanford University and has been used
- 1122 Folsom Street​ | USA
+Sed ut perspiciatis, unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam eaque ipsa, quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt, explicabo. Nemo enim ipsam voluptatem, quia voluptas sit, aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos, qui ratione voluptatem sequi nesciunt, neque porro quisquam est, qui dolorem ipsum, quia dolor sit amet consectetur adipisci[ng] velit, sed quia non-numquam [do] eius modi tempora inci[di]dunt, ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam.
 
-# Map
+![Example images from the Brainwash dataset](assets/00425000_640x480.jpg)
+![Example images from the Brainwash dataset](assets/00818000_640x480.jpg)
 
-{% include 'map.html' %}
+porro quisquam est, qui dolorem ipsum, quia dolor sit amet consectetur adipisci[ng] velit, sed quia non-numquam [do] eius modi tempora inci[di]dunt, ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum[d] exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit, qui in ea voluptate velit esse, quam nihil molestiae consequatur, vel illum, qui dolorem eum fugiat, quo voluptas nulla pariatur?
 
-### Synthetic Faces
 
-```
-synthetic_faces_intro
-```
+{% include 'map.html' %}
 
-To visualize the types of photos in the dataset without explicitly publishing individual's identities a generative adversarial network (GAN) was trained on the entire dataset. The images in this video show a neural network learning the visual latent space and then interpolating between archetypical identities within the LFW dataset.
+<hr class="supp">
 
-![Synthetically generated face from the visual space of LFW dataset](assets/synthetic_01.jpg)
-![Synthetically generated face from the visual space of LFW dataset](assets/synthetic_02.jpg)
-![Synthetically generated face from the visual space of LFW dataset](assets/synthetic_03.jpg)
+## Supplementary Information for Brainwash Dataset
 
 {% include 'citations.html' %}
 
+
 --------
 
 RESEARCH below this line
diff --git a/site/content/pages/datasets/lfw/index.md b/site/content/pages/datasets/lfw/index.md
index 04fe775c..1af263dc 100644
--- a/site/content/pages/datasets/lfw/index.md
+++ b/site/content/pages/datasets/lfw/index.md
@@ -3,7 +3,7 @@
 status: published
 title: Labeled Faces in The Wild
 desc: <span style="color:#ff0000">Labeled Faces in The Wild (LFW)</span> is a database of face photographs designed for studying the problem of unconstrained face recognition.
-subdesc: It includes 13,456 images of 4,432 people’s images copied from the Internet during 2002-2004.
+subdesc: It includes 13,456 images of 4,432 people's images copied from the Internet during 2002-2004.
 image: assets/background.jpg
 caption: A few of the 5,749 people in the Labeled Faces in the Wild Dataset, thee most widely used face dataset for benchmarking face recognition algorithms.
 slug: lfw
@@ -19,7 +19,7 @@ authors: Adam Harvey
 + Images: 13,233
 + Identities: 5,749
 + Origin: Yahoo! News Images
-+ Funding: IARPA*, CIA*
++ Used by: Facebook, Google, Microsoft, Baidu, Tencent, SenseTime, Face++, CIA, NSA, IARPA
 + Website: <a href="http://vis-www.cs.umass.edu/lfw">vis-www.cs.umass.edu/lfw</a>
 
 - There are about 3 men for every 1 woman in the LFW dataset[^lfw_www]
@@ -56,9 +56,7 @@ The *Names and Faces* dataset was the first face recognition dataset created ent
 
 {% include 'citations.html' %}
 
-### Synthetic Faces
-
-To visualize the types of photos in the dataset without explicitly publishing individual's identities a generative adversarial network (GAN) was trained on the entire dataset. The images in this video show a neural network learning the visual latent space and then interpolating between archetypical identities within the LFW dataset.
+{% include 'synthetic_faces_intro.html' %}
 
 ![Synthetically generated face from the visual space of LFW dataset](assets/synthetic_01.jpg)
 ![Synthetically generated face from the visual space of LFW dataset](assets/synthetic_02.jpg)
@@ -70,14 +68,12 @@ To visualize the types of photos in the dataset without explicitly publishing in
 
 Add a paragraph about how usage extends far beyond academia into research centers for largest companies in the world. And even funnels into CIA funded research in the US and defense industry usage in China.
 
-
 ```
 load_file assets/lfw_commercial_use.csv
 name_display, company_url, example_url, country, description
 ```
 
-
-## Code
+### Code
 
 The LFW dataset is so widely used that access to the facial data has built directly into a popular code library called Sci-Kit Learn. It includes a function called `fetch_lfw_people` to download the faces in the LFW dataset.