6 files changed, 14 insertions, 95 deletions
diff --git a/site/public/about/credits/index.html b/site/public/about/credits/index.html
deleted file mode 100644
index 7f3da564..00000000
--- a/site/public/about/credits/index.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <title>MegaPixels</title>
-  <meta charset="utf-8" />
-  <meta name="author" content="Adam Harvey" />
-  <meta name="description" content="MegaPixels Project Team Credits" />
-  <meta name="referrer" content="no-referrer" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-  <link rel='stylesheet' href='/assets/css/fonts.css' />
-  <link rel='stylesheet' href='/assets/css/tabulator.css' />
-  <link rel='stylesheet' href='/assets/css/css.css' />
-  <link rel='stylesheet' href='/assets/css/leaflet.css' />
-  <link rel='stylesheet' href='/assets/css/applets.css' />
-</head>
-<body>
-  <header>
-    <a class='slogan' href="/">
-      <div class='logo'></div>
-      <div class='site_name'>MegaPixels</div>
-    </a>
-    <div class='links'>
-      <a href="/datasets/">Datasets</a>
-      <a href="/research/">Research</a>
-      <a href="/about/">About</a>
-    </div>
-  </header>
-  <div class="content">
-    
-  <section><h1>Credits</h1>
-</section><section><div class='right-sidebar'><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 href="/about/privacy/">Privacy Policy</a></li>
-</ul>
-</div></section>
-
-  </div>
-  <footer>
-    <div>
-      <a href="/">MegaPixels.cc</a>
-      <a href="/about/disclaimer/">Disclaimer</a>
-      <a href="/about/terms/">Terms of Use</a>
-      <a href="/about/privacy/">Privacy</a>
-      <a href="/about/">About</a>
-      <a href="/about/team/">Team</a>
-    </div>
-    <div>
-      MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
-      <a href="https://ahprojects.com">ahprojects.com</a>
-    </div>
-  </footer>
-</body>
-
-<script src="/assets/js/dist/index.js"></script>
-</html>
-\ No newline at end of file
diff --git a/site/public/about/index.html b/site/public/about/index.html
index ed80691a..a1370663 100644
--- a/site/public/about/index.html
+++ b/site/public/about/index.html
@@ -27,10 +27,19 @@
   </header>
   <div class="content content-about">
     
-  <section><h1>About This Project</h1>
+  <section><h1>About MegaPixels</h1>
 </section><section class="about-menu"><ul><li><a href="/about/">About</a></li><li><a href="/about/press/">Press</a></li><li><a href="/about/research/">Research Methodology</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><section><p>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?</p>
 <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.</p>
 <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.</p>
+<p>Notes</p>
+<ul>
+<li>critical but informative</li>
+<li>not anti-dataset</li>
+<li>pro-sharing, pro-public dataset</li>
+<li>w/o data</li>
+<li>not generally anti-researcher, their parent organization should have checks in place to prevent dubious dataset collection methods</li>
+<li></li>
+</ul>
 </section><section class='images'><div class='sideimage'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/adam-harvey.jpg' alt='Adam Harvey'><div><p><strong>Adam Harvey</strong> 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.</p>
 </div></div></section><section class='images'><div class='sideimage'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/jules-laplace.jpg' alt='Jules LaPlace'><div><p><strong>Jules LaPlace</strong> 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.</p>
 </div></div></section><section><h2>Partnership</h2>
diff --git a/site/public/about/press/index.html b/site/public/about/press/index.html
index 0791d2a2..1efe1999 100644
--- a/site/public/about/press/index.html
+++ b/site/public/about/press/index.html
@@ -28,14 +28,7 @@
   <div class="content content-about">
     
   <section><h1>Press</h1>
-<ul>
-<li><a href="/about/">About</a></li>
-<li><a href="/about/press/">Press</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><section><p>(list of press articles and images will go here)</p>
+</section><section class="about-menu"><ul><li><a href="/about/">About</a></li><li><a href="/about/press/">Press</a></li><li><a href="/about/research/">Research Methodology</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><section><p>(list of press articles and images will go here)</p>
 <ul>
 <li>Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent <a href="https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset">https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset</a></li>
 </ul>
diff --git a/site/public/about/privacy/index.html b/site/public/about/privacy/index.html
index 1d9b2252..9a0836a1 100644
--- a/site/public/about/privacy/index.html
+++ b/site/public/about/privacy/index.html
@@ -28,14 +28,7 @@
   <div class="content content-about">
     
   <section><h1>Privacy Policy</h1>
-<ul>
-<li><a href="/about/">About</a></li>
-<li><a href="/about/press/">Press</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>
-<p>A summary of our privacy policy is as follows:</p>
+</section><section class="about-menu"><ul><li><a href="/about/">About</a></li><li><a href="/about/press/">Press</a></li><li><a href="/about/research/">Research Methodology</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><section><p>A summary of our privacy policy is as follows:</p>
 <p>The MegaPixels site does not use any analytics programs or collect any data besides the necessary IP address of your connection, which are deleted every 30 days and used only for security and to prevent misuse.</p>
 <p>The image processing sections of the site do not collect any data whatsoever. All processing takes place in temporary memory (RAM) and then is displayed back to the user over a SSL secured HTTPS connection. It is the sole responsibility of the user whether they discard, by closing the page, or share their analyzed information and any potential consequences that may arise from doing so.</p>
 <p>A more complete legal version is below:</p>
diff --git a/site/public/about/research/index.html b/site/public/about/research/index.html
index 94b4e2ee..db21fbc3 100644
--- a/site/public/about/research/index.html
+++ b/site/public/about/research/index.html
@@ -28,15 +28,7 @@
   <div class="content content-about">
     
   <section><h1>Research Methodologies</h1>
-<ul>
-<li><a href="/about/">About</a></li>
-<li><a href="/about/press/">Press</a></li>
-<li><a href="/about/research/">Research Methodology</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>
+</section><section class="about-menu"><ul><li><a href="/about/">About</a></li><li><a href="/about/press/">Press</a></li><li><a href="/about/research/">Research Methodology</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>
 
   </div>
   <footer>
diff --git a/site/public/about/terms/index.html b/site/public/about/terms/index.html
index 650366e0..b5b9a457 100644
--- a/site/public/about/terms/index.html
+++ b/site/public/about/terms/index.html
@@ -28,16 +28,7 @@
   <div class="content content-about">
     
   <section><h1>Terms and Conditions ("Terms")</h1>
-</section><section><div class='left-sidebar'><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/research/">Research Methodology</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>
-</div><p>(FPO: this is only example text)</p>
+</section><section class="about-menu"><ul><li><a href="/about/">About</a></li><li><a href="/about/press/">Press</a></li><li><a href="/about/research/">Research Methodology</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><section><p>(FPO: this is only example text)</p>
 <p>Last updated: December 04, 2018</p>
 <p>Please read these Terms and Conditions ("Terms", "Terms and Conditions") carefully before using the MegaPixels website (the "Service") operated by megapixels.cc ("us", "we", or "our").</p>
 <p>Your access to and use of the Service is conditioned on your acceptance of and compliance with these Terms.</p>