.

4 files changed, 27 insertions, 17 deletions

diff --git a/site/public/about/faq/index.html b/site/public/about/faq/index.html
index b86dac22..168abd0b 100644
--- a/site/public/about/faq/index.html
+++ b/site/public/about/faq/index.html
@@ -8,7 +8,6 @@
   <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' />
@@ -18,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
diff --git a/site/public/about/index.html b/site/public/about/index.html
index d228b830..c379ec43 100644
--- a/site/public/about/index.html
+++ b/site/public/about/index.html
@@ -8,7 +8,6 @@
   <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' />
@@ -18,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
@@ -30,8 +30,10 @@
 <section class="about-menu">
 <ul>
 <li><a class="current" href="/about/">About</a></li>
+<li><a href="/about/faq/">FAQs</a></li>
 <li><a href="/about/press/">Press</a></li>
-<li><a href="/about/legal/">Legal / Privacy</a></li>
+<li><a href="/about/terms/">Terms</a></li>
+<li><a href="/about/privacy/">Privacy</a></li>
 </ul>
 </section><p>MegaPixels is an independent art and research project by Adam Harvey and Jules LaPlace investigating the ethics and individual privacy implications of publicly available face recognition datasets, and their role in industry and governmental expansion into biometric surveillance technologies.</p>
 <p>The MegaPixels site is made possible with support from <a href="http://mozilla.org">Mozilla</a></p>
@@ -77,10 +79,11 @@
   <footer>
     <div>
       <a href="/">MegaPixels.cc</a>
-      <a href="/datasets/">Datasets</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/press/">Press</a>
-      <a href="/about/legal/">Legal and Privacy</a>
+      <a href="/about/team/">Team</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/about/legal/index.html b/site/public/about/legal/index.html
index d5f384ab..4e84a601 100644
--- a/site/public/about/legal/index.html
+++ b/site/public/about/legal/index.html
@@ -8,7 +8,6 @@
   <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' />
@@ -18,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
@@ -30,8 +30,10 @@
 <section class="about-menu">
 <ul>
 <li><a href="/about/">About</a></li>
+<li><a href="/about/faq/">FAQs</a></li>
 <li><a href="/about/press/">Press</a></li>
-<li><a class="current" href="/about/legal/">Legal / Privacy</a></li>
+<li><a href="/about/terms/">Terms</a></li>
+<li><a class="current" href="/about/privacy/">Privacy</a></li>
 </ul>
 </section><p>MegaPixels.cc Terms and Privacy</p>
 <p>MegaPixels is an independent art and research project about the origins and ethics of publicly available face analysis image datasets. By accessing MegaPixels (the <em>Service</em> or <em>Services</em>) you agree to the terms and conditions set forth below.</p>
@@ -70,10 +72,11 @@
   <footer>
     <div>
       <a href="/">MegaPixels.cc</a>
-      <a href="/datasets/">Datasets</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/press/">Press</a>
-      <a href="/about/legal/">Legal and Privacy</a>
+      <a href="/about/team/">Team</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;
diff --git a/site/public/about/press/index.html b/site/public/about/press/index.html
index 6dc6faa4..610fda6e 100644
--- a/site/public/about/press/index.html
+++ b/site/public/about/press/index.html
@@ -8,7 +8,6 @@
   <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' />
@@ -18,6 +17,7 @@
     <a class='slogan' href="/">
       <div class='logo'></div>
       <div class='site_name'>MegaPixels</div>
+      
     </a>
     <div class='links'>
       <a href="/datasets/">Datasets</a>
@@ -30,10 +30,13 @@
 <section class="about-menu">
 <ul>
 <li><a href="/about/">About</a></li>
+<li><a href="/about/faq/">FAQs</a></li>
 <li><a class="current" href="/about/press/">Press</a></li>
-<li><a href="/about/legal/">Legal / Privacy</a></li>
+<li><a href="/about/terms/">Terms</a></li>
+<li><a href="/about/privacy/">Privacy</a></li>
 </ul>
-</section><ul>
+</section><p>(TEMPORARY PAGE)</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>
 </section>
@@ -42,10 +45,11 @@
   <footer>
     <div>
       <a href="/">MegaPixels.cc</a>
-      <a href="/datasets/">Datasets</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/press/">Press</a>
-      <a href="/about/legal/">Legal and Privacy</a>
+      <a href="/about/team/">Team</a>
     </div>
     <div>
       MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;