12 files changed, 129 insertions, 47 deletions
diff --git a/site/content/pages/about/assets/adam-harvey-3d.jpg b/site/content/pages/about/assets/adam-harvey-3d.jpg
new file mode 100644
index 00000000..2d7cbd80
--- /dev/null
+++ b/site/content/pages/about/assets/adam-harvey-3d.jpg
diff --git a/site/content/pages/about/assets/adam-harvey-3d.png b/site/content/pages/about/assets/adam-harvey-3d.png
new file mode 100644
index 00000000..3616e851
--- /dev/null
+++ b/site/content/pages/about/assets/adam-harvey-3d.png
diff --git a/site/content/pages/about/assets/adam-harvey.jpg b/site/content/pages/about/assets/adam-harvey.jpg
index e0ab893a..38a484d1 100644
--- a/site/content/pages/about/assets/adam-harvey.jpg
+++ b/site/content/pages/about/assets/adam-harvey.jpg
diff --git a/site/content/pages/about/assets/jules-laplace-3d.jpg b/site/content/pages/about/assets/jules-laplace-3d.jpg
new file mode 100644
index 00000000..d51e0933
--- /dev/null
+++ b/site/content/pages/about/assets/jules-laplace-3d.jpg
diff --git a/site/content/pages/about/assets/jules-laplace.jpg b/site/content/pages/about/assets/jules-laplace.jpg
index 310b2783..18fc1170 100644
--- a/site/content/pages/about/assets/jules-laplace.jpg
+++ b/site/content/pages/about/assets/jules-laplace.jpg
diff --git a/site/content/pages/about/credits.md b/site/content/pages/about/credits.md
new file mode 100644
index 00000000..bc2283fd
--- /dev/null
+++ b/site/content/pages/about/credits.md
@@ -0,0 +1,48 @@
+------------
+
+status: published
+title: MegaPixels Press and News
+desc: MegaPixels Press and News
+slug: press
+cssclass: about
+published: 2018-12-04
+updated: 2018-12-04
+authors: Adam Harvey
+ 
+------------
+ 
+# Credits
+
+<section class="about-menu">
+<ul>
+    <li><a href="/about/">About</a></li>
+    <li><a href="/about/press/">Press</a></li>
+    <li><a class="current" href="/about/credits/">Credits</a></li>
+    <li><a href="/about/disclaimer/">Disclaimer</a></li>
+    <li><a href="/about/terms/">Terms and Conditions</a></li>
+    <li><a href="/about/privacy/">Privacy Policy</a></li>
+</ul>
+</section>
+
+
+#### Team
+
+- Research and image analysis: Adam Harvey
+- Development and visualizations: Jules LaPlace
+- Produced in Partnership with Mozilla
+- Contributing researchers: Berit Gilma, Mathana Stender
+
+#### Code
+
+<<<<<<< HEAD
+- This site uses D3.js, C3.js, and ThreeJS for visualizations.
+- Data aggregation uses Pandas and PDFMiner.Six.
+=======
+- This site uses D3 and C2 for visuzations
+- Add more here
+>>>>>>> 26646e6adf3833f6282e9515c14ad61e485440c0
+
+#### Data
+
+- link to github
+- how it was gathered
+\ No newline at end of file
diff --git a/site/content/pages/about/disclaimer.md b/site/content/pages/about/disclaimer.md
index c0baad71..f82a09a0 100644
--- a/site/content/pages/about/disclaimer.md
+++ b/site/content/pages/about/disclaimer.md
@@ -13,15 +13,18 @@ authors: Adam Harvey
 
 # Disclaimer
 
-- [About](/about/)
-- [Press](/about/press/)
-- [Disclaimer](/about/disclaimer/)
-- [Terms and Conditions](/about/terms/)
-- [Privacy Policy](/about/privacy/)
+<section class="about-menu">
+<ul>
+<li><a href="/about/">About</a></li>
+<li><a href="/about/press/">Press</a></li>
+<li><a href="/about/credits/">Credits</a></li>
+<li><a class="current" href="/about/disclaimer/">Disclaimer</a></li>
+<li><a href="/about/terms/">Terms and Conditions</a></li>
+<li><a href="/about/privacy/">Privacy Policy</a></li>
+</ul>
+</section>
 
-### Sidebar
-
-## End Sidebar
+(TEMPORARY PAGE)
 
 Last updated: December 04, 2018
 
diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md
index ccb6ed0d..4fec0777 100644
--- a/site/content/pages/about/index.md
+++ b/site/content/pages/about/index.md
@@ -13,28 +13,44 @@ authors: Adam Harvey
 
 # About MegaPixels
 
-{% include 'about_navigation.html' %}
+<section class="about-menu">
+<ul>
+<li><a class="current" href="/about/">About</a></li>
+<li><a href="/about/press/">Press</a></li>
+<li><a href="/about/credits/">Credits</a></li>
+<li><a href="/about/disclaimer/">Disclaimer</a></li>
+<li><a href="/about/terms/">Terms and Conditions</a></li>
+<li><a href="/about/privacy/">Privacy Policy</a></li>
+</ul>
+</section>
 
-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?
+(PAGE UNDER DEVELOPMENT)
 
-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.
+<p><div style="font-size:20px;line-height:36px">Ever since government agencies began developing face recognition in the early 1960's, datasets of face images have always been central to technological advancements. Today, these datasets no longer originate in labs, but instead from family photo albums posted on photo sharing sites, surveillance cameras on college campuses, search engine queries for celebrities, cafe livestreams, and <a href="https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset">personal videos</a> posted on YouTube. </div></p>
 
-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.
+Collectively, facial recognition datasets are now gathered "in the wild".
 
-Notes
+<p>MegaPixels is art and research by <a href="https://ahprojects.com">Adam Harvey</a> about facial recognition datasets that unravels their histories, futures, geographies, and meanings. Throughout 2019 this site this site will publish research reports, visualizations, raw data, and interactive tools to explore how publicly available facial recognition datasets contribute to a global supply chain of biometric data that powers the global facial recognition industry.</p>
 
-- critical but informative
-- not anti-dataset
-- pro-sharing, pro-public dataset
-- w/o data
-- not generally anti-researcher, their parent organization should have checks in place to prevent dubious dataset collection methods
-- 
+During the last year, hundreds of these facial analysis datasets created "in the wild" have been collected to understand how they contribute to a global supply chain of biometric data that is powering the global facial recognition industry.
 
+The MegaPixels website is produced in partnership with [Mozilla](https://mozilla.org).
 
-![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.
-
-![sideimage:Jules LaPlace](assets/jules-laplace.jpg)**Jules LaPlace** is an American artist and technologist also based in Berlin. He was previously the CTO of a NYC digital agency and currently works at VFRAME, developing computer vision for human rights groups, and building creative software for artists.
-
-## Partnership 
-
-MegaPixels is produced in partnership with **Mozilla**, a free software community founded in 1998 by members of Netscape. The Mozilla community uses, develops, spreads and supports Mozilla products, thereby promoting exclusively free software and open standards, with only minor exceptions. The community is supported institutionally by the not-for-profit Mozilla Foundation and its tax-paying subsidiary, the Mozilla Corporation.
+<div class="flex-container team-photos-container">
+    <div class="team-member">
+        <img src="https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/adam-harvey-3d.jpg" />
+        <h3>Adam Harvey</h3>
+        <p>is Berlin-based American artist and researcher. 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 grants, and is a researcher in residence at Karlsruhe HfG. 
+        <br>
+        <a href="https://ahprojects.com">ahprojects.com</a>
+        </p>
+    </div>
+    <div class="team-member">
+        <img src="https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/jules-laplace-3d.jpg" />
+        <h3>Jules LaPlace</h3>
+        <p>is an American creative technologist also based in Berlin. He was previously the CTO of a digital agency in NYC and now also works at VFRAME, developing computer vision for human rights groups. Jules also builds creative software for artists and musicians.
+        <br>
+        <a href="https://asdf.us/">asdf.us</a>
+        </p>
+    </div>
+</div>
diff --git a/site/content/pages/about/press.md b/site/content/pages/about/press.md
index abd4d823..47e1af52 100644
--- a/site/content/pages/about/press.md
+++ b/site/content/pages/about/press.md
@@ -2,7 +2,7 @@
 
 status: published
 title: MegaPixels Press and News
-desc: MegaPixels in The News
+desc: MegaPixels Press and News
 slug: press
 cssclass: about
 published: 2018-12-04
@@ -13,8 +13,17 @@ authors: Adam Harvey
  
 # Press
 
-{% include 'about_navigation.html' %}
+<section class="about-menu">
+<ul>
+<li><a href="/about/">About</a></li>
+<li><a class="current" href="/about/press/">Press</a></li>
+<li><a href="/about/credits/">Credits</a></li>
+<li><a href="/about/disclaimer/">Disclaimer</a></li>
+<li><a href="/about/terms/">Terms and Conditions</a></li>
+<li><a href="/about/privacy/">Privacy Policy</a></li>
+</ul>
+</section>
 
-(list of press articles and images will go here)
+(TEMPORARY PAGE)
 
 - Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent <https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset>
 \ No newline at end of file
diff --git a/site/content/pages/about/privacy.md b/site/content/pages/about/privacy.md
index a47b74cc..e36daf2a 100644
--- a/site/content/pages/about/privacy.md
+++ b/site/content/pages/about/privacy.md
@@ -13,7 +13,18 @@ authors: Adam Harvey
 
 # Privacy Policy
 
-{% include 'about_navigation.html' %}
+<section class="about-menu">
+<ul>
+<li><a href="/about/">About</a></li>
+<li><a href="/about/press/">Press</a></li>
+<li><a href="/about/credits/">Credits</a></li>
+<li><a href="/about/disclaimer/">Disclaimer</a></li>
+<li><a href="/about/terms/">Terms and Conditions</a></li>
+<li><a class="current" href="/about/privacy/">Privacy Policy</a></li>
+</ul>
+</section>
+
+(TEMPORARY PAGE)
 
 A summary of our privacy policy is as follows:
 
diff --git a/site/content/pages/about/research.md b/site/content/pages/about/research.md
deleted file mode 100644
index 8f001cc9..00000000
--- a/site/content/pages/about/research.md
+++ /dev/null
@@ -1,16 +0,0 @@
-------------
-
-status: published
-title: About MegaPixels Research Methodologies
-desc: About MegaPixels Research Methodologies
-slug: resewarch
-cssclass: about
-published: 2018-12-04
-updated: 2018-12-04
-authors: Adam Harvey
-
-------------
-
-# Research Methodologies
-
-{% include 'about_navigation.html' %}
-\ No newline at end of file
diff --git a/site/content/pages/about/terms.md b/site/content/pages/about/terms.md
index 38d43735..7ae6dac7 100644
--- a/site/content/pages/about/terms.md
+++ b/site/content/pages/about/terms.md
@@ -14,7 +14,18 @@ authors: Adam Harvey
 
 # Terms and Conditions ("Terms")
 
-{% include 'about_navigation.html' %}
+<section class="about-menu">
+<ul>
+<li><a href="/about/">About</a></li>
+<li><a href="/about/press/">Press</a></li>
+<li><a href="/about/credits/">Credits</a></li>
+<li><a href="/about/disclaimer/">Disclaimer</a></li>
+<li><a class="current" href="/about/terms/">Terms and Conditions</a></li>
+<li><a href="/about/privacy/">Privacy Policy</a></li>
+</ul>
+</section>
+
+(TEMPORARY PAGE)
 
 (FPO: this is only example text)